Martin Geisler <mg@aragost.com> [Mon, 22 Nov 2010 18:15:58 +0100] rev 866
code style: prefer 'is' and 'is not' tests with singletons
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Mon, 22 Nov 2010 20:45:42 +0100] rev 865
Merge with default
Christian Ebert <blacktrash@gmx.net> [Mon, 22 Nov 2010 20:44:36 +0100] rev 864
s/config/configuration/ in help
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Nov 2010 16:59:06 +0100] rev 863
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 16 Nov 2010 10:33:19 +0900] rev 862
run-tests: fix --debug for .t tests
When --debug is given to the test runner, run() returns (retcode, None).
Do not try to use None output as a string, and return directly, similarly
as other testers.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Nov 2010 10:31:54 +0000] rev 861
Merge with stable
Erik Zielke <ez@aragost.com> [Mon, 08 Nov 2010 10:56:47 +0100] rev 860
run-test: fixed wrong parenthesis
Fixed wrong placement of end parenthesis, from b911cb80c671
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Nov 2010 11:11:23 +0000] rev 859
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:41 +0100] rev 858
tests: use (esc) markup for string-escape
This makes test output less ambiguous.
Failing test output will be escaped and marked up if necessary. A Python
string-escape compatible encoding is used, but not everything is encoded -
especially not \n and \t and '.
[ original upstream message ]
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:40 +0100] rev 857
tests: (no-eol) markup for command output without trailing LF
Output chunks without a trailing LF will now work but get (no-eol) appended.
This change mostly moves code around so we can handle that an output line
starts with data from previous command, followed by salt and the next command.
[ original upstream message ]
Mads Kiilerich <mads@kiilerich.com> [Sat, 06 Nov 2010 00:31:44 +0100] rev 856
tests: handle .t files without trailing LF
9a2de8dae27b made this simple test-test.t succeed silently:
$ printf ' $ true' > test-test.t
but did not give a usable .err in this case:
$ printf ' $ false' > test-test.t
The missing LF will now be fixed in the test output and it will thus give a
test failure and a solution in the .err file.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Nov 2010 10:01:23 +0000] rev 855
Merge with default
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Nov 2010 10:00:11 +0000] rev 854
Turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net> [Tue, 02 Nov 2010 14:04:21 +0100] rev 853
Merge with stable
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 10:24:07 +0100] rev 852
run-tests: use regex when searching for $HGPORT in test output
This prevents spurious errors when a changeset hash happens to match
the port number. Before, this invocation gave a test failure:
$ ./run-tests.py test-log.t --port 24427
ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed
--- /home/mg/src/mercurial-crew/tests/test-log.t
+++ /home/mg/src/mercurial-crew/tests/test-log.t.err
@@ -626,12 +626,12 @@
$ hg log -b default
changeset: 2:c3a4f03cc9a7
- parent: 0:24427303d56f
+ parent: 0:$HGPORT303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
...
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 27 Oct 2010 11:15:31 +0100] rev 851
Merge with stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 20 Oct 2010 17:38:21 -0500] rev 850
pull: silence spurious 'requesting all changes' message
When issuing `hg pull -r REV` in a repo with no common ancestor with the
remote repo, the message 'requesting all changes' is printed, even though only
the changese that are ancestors of REV are actually requested. This can be
confusing for users (see
http://www.selenic.com/pipermail/mercurial/2010-October/035508.html).
This silences the message if (and only if) the '-r' option was passed.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 19:21:06 +0100] rev 849
Function to look up changectx for expansion
Similarly rename variable in kwtemplater.overwrite().
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 19:21:06 +0100] rev 848
Compile regexes on demand
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 20:00:18 +0100] rev 847
Merge with default
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 19:21:06 +0100] rev 846
Fix regressions introduced in 9d01f9cab5e2
- dirstate of overwritten files must be forced to normal
with kwexpand/kwshrink, not commit.
- recorded files must be weeded before overwriting.
- add test cases.
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Oct 2010 22:46:09 +0100] rev 845
Merge with stable
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Oct 2010 22:57:25 +0900] rev 844
tests: accept \-escaped test output
It changes tsttest to accept expected outputs in python-style \-escapes.
It aims to avoid trouble with outputs for non-ascii, color and progress
tests.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Oct 2010 00:36:45 +0200] rev 843
Merge with default
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Oct 2010 22:53:17 +0200] rev 842
Only use expensive fctx.cmp when needed
Restrict expensive cmp to cases when:
- comparing against working directory
and
- encode filters active
or
- path is configured for keyword expansion
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Oct 2010 09:21:19 +0100] rev 841
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 27 Jul 2010 23:07:30 +0900] rev 840
filectx: use ctx.size comparisons to speed up ctx.cmp
Comparing sizes is cheaper than comparing file contents, as it does not
involve reading the file on disk or from the filelog.
It is however not always possible: some extensions, or encode filters,
change data when extracting it to the working directory.
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Oct 2010 09:18:46 +0100] rev 839
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Oct 2010 16:29:32 +0100] rev 838
Code cleanup
- move preselection of expansion candidates for rollback
and record into helper function
- same overwrite order in rollback and record:
1. modified, 2. added
- self.wlock() inside kwrepo class instead of repo.wlock()
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 01:07:16 +0100] rev 837
enforce subn method via boolean switch
There are only 2 patterns to choose, and so far only 1 case
where kwtemplater.re_kw.subn is applied on data read from
the working directory: when recording added files.
With this change the code reflects more closely the boolean
character of the switch and underlines the special case.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 01:07:16 +0100] rev 836
Fix weeding of expansion candidates when recording
Rearrange tests to check this, i.e. that there are changes
in other files, not only the recorded one.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 01:10:13 +0100] rev 835
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 16:27:10 -0500] rev 834
run-tests.py: remove support for .bat files
[ original upstream message ]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 16:25:28 -0500] rev 833
run-tests.py: do not install hg when the tests do no exist
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 15:47:19 +0100] rev 832
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 07:13:51 -0500] rev 831
test-keyword: ignore subject in notify hook mails
Long tmpdir names caused truncation of subject anyway, and that made $TESTTMP
replacement fail.
[ original upstream description ]
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 07:13:49 -0500] rev 830
test-keyword: fix test glob to ACL/SELinux flag
[ original upstream description ]
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:11 -0500] rev 829
tests: reintroduce ":$HGPORT" in test output
This reduces the number of patterns that must be adjusted when writing tests.
[ original upstream description ]
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:10 -0500] rev 828
tests: remove redundant globs
Many globs now just match $TESTTMP and is no longer needed.
[ original upstream description ]
Erik Zielke <ez@aragost.com> [Thu, 30 Sep 2010 09:49:40 +0200] rev 827
tests: removed test names in tests
The name of the test files is replaced with a glob * expression,
thereby the tests does not depend on the filename of the file they are
in.
[ original upstream description ]
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:10 -0500] rev 826
tests: replace test tmp directory with $TESTTMP in test output
This reduces the number of patterns that must be adjusted when writing tests.
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 12:26:56 +0100] rev 825
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Fri, 08 Oct 2010 17:00:38 -0500] rev 824
run-tests: handle .tst not ending with an LF
[ original upstream description ]
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 27 Sep 2010 22:49:30 +0200] rev 823
tests: show skip reason instead of "irrelevant" with unified tests, too
parsehghaveoutput expects just the test output, not the merged test/output,
so for skipped unified tests e.g.:
Skipped test-convert-darcs.t: missing feature: irrelevant
was shown instead of:
Skipped test-convert-darcs.t: missing feature: darcs client
[ original upstream description ]
Martin Geisler <mg@lazybytes.net> [Sun, 26 Sep 2010 22:22:59 +0200] rev 822
run-tests: move build/ directory to HGTMP
Before, running a test would give you a build/ directory in the root
of your Mercurial source tree. The directory had a full copy of the
the source, so a grep in '**/*.py' would find files inside build/.
[ original upstream description ]
Matt Mackall <mpm@selenic.com> [Fri, 08 Oct 2010 20:12:40 -0500] rev 821
keyword: fix test glob
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:52:32 +0100] rev 820
Merge with default
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:35:31 +0100] rev 819
Switch kwtemplater.record in kw_dorecord()
Obsoletes the need for a global recordcommands variable.
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:35:24 +0100] rev 818
Specific regular expressions depending on read mode
More safeguarding against accidental (un)expansion:
Reading filelog: act only on \$(kw1|kw2|..)\$ as keywords are always
stored unexpanded.
Reading wdir: act only on \$(kw1|kw2|..): [^$\n\r]*? \$ as we only
are interested in expanded keywords in this situation.
Note: we cannot use ..): [^$\n\r]+? \$ because e.g.
the {branch} template might be empty.
hg record is a special case as we read from the working directory and
need one regex each for modified and added files. Therefore test
recording an added file.
This way we finally also forbid sequences like $Id: $ being treated
as keywords.
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:34:55 +0100] rev 817
test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:34:39 +0100] rev 816
disable expansion in kwfilelog.read() if file renamed in node
Simplifies kwfilelog.cmp() and avoids fiddling with/importing revlog.
Reorder imports alphabetically.
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:38 +0100] rev 815
Make iskwfile() a weeding method in lieu of a boolean
Update iskwfile docstring.
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:12 +0100] rev 814
Support copy and rename
copy/rename destinations being unversioned and possibly ignored by
the extension should not contain expanded keywords.
Files copied/renamed from an ignored source are not touched.
Add tests covering both of the above cases, plus the corner case of
cp symlink foo; hg cp -A symlink foo (where foo becomes a regular file).
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:04 +0100] rev 813
Refactor kwtemplater.overwrite()
Make kwexpand, kwshrink restricted commands - i.e. read from
filelog without expansion for substition in kwtemplater.overwrite,
and set/unset restricted mode for overwrite() in in kwcommitctx
and the dorecord wrapper.
Preselect candidates when working on changed files (rollback, record)
outside kwtemplater class, and remove 6th argument from overwrite().
Avoid duplicate substitution/search in overwrite():
Only go into restricted read mode when reading from filelog.
rollback and record read from the working directory, where
restricted mode would already shrink keywords before overwrite()
either expands or shrinks them again.
This ensures that the usual automatic operations on keywords
are turned off during overwrite() and only overwrite() itself
acts on them.
Reduce manifest calculation to the cases where it is needed.
Move helper function for expansion removal outside kwtemplater class.
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 812
Use workingctx to detect modified and added files after rollback
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 811
Rename variable "cfiles" to "changed" for clarity
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 21:59:47 +0200] rev 810
Merge with default
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 809
Support rollback by restoring expansion to previous values
Prevent spurious differences in the working directory
after a rollback.
Add tests for several rollback situations.
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 808
Do not expand at all during diff
Always shrink and never expand keywords during a diff operation.
Avoid user distraction e.g. because of spurious differences
appearing in the commit editor.
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 807
Restore restricted read mode value after overwriting
Even though just enforcing expansion after overwriting files in
the working directory caused no problems that we know of, this avoids
a potential source of problems (e.g. in collaboration other extensions)
at no costs.
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 806
test: fix typo, rephrase
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 17:03:23 +0200] rev 805
Merge with default
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 16:31:38 +0200] rev 804
Use note admonition in help text
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 10:33:58 +0200] rev 803
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 18:20:47 -0500] rev 802
tests: various fixes for new unified test pattern format
[ original upstream message ]
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:02 -0500] rev 801
tests: add glob matching for unified tests
This adds a " (glob)" marker that works like a simpler version of
(re): "*" is converted to ".*", and "?" is converted to ".".
Both special characters can be escaped using "\", and the backslash
itself can be escaped as well.
Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't
supported.
[ original upstream message ]
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:00 -0500] rev 800
tests: require regexes in unified tests to be marked with " (re)"
Consider this test:
$ hg glog --template '{rev}:{node|short} "{desc}"\n'
@ 2:20c4f79fd7ac "3"
|
| o 1:38f24201dcab "2"
|/
o 0:2a18120dc1c9 "1"
Because each line beginning with "|" can be compiled as a regular
expression (equivalent to ".*|"), they will match any output.
Similarly:
$ echo foo
The blank output line can be compiled as a regular expression and will
also match any output.
With this patch, none of the above output lines will be matched as
regular expressions. A line must end in " (re)" in order to be matched
as one.
Lines are still matched literally first, so the following will pass:
$ echo 'foo (re)'
foo (re)
[ original upstream message ]
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 799
tests: ensure regexes match to the end of the string
Regular expressions in the test suite are currently written assuming
that you need a trailing ".*" to avoid matching to the end.
Instead of matching regular expressions using "^pattern", this patch
makes matching more restrictive by matching "^pattern$".
[ original upstream message ]
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 798
tests: don't match blank output lines as regexes in unified tests
Currently, the following unified test will pass:
$ echo foo
A blank output line (a line containing just two spaces) will match any
output.
The patch modifies the unified test runner to ignore empty strings
strings when do regular expression matching.
[ original upstream message ]
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:58 -0500] rev 797
tests: improve regexes in unified tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Sep 2010 23:46:57 +0200] rev 796
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 14:36:36 -0500] rev 795
tests: add hack to avoid problem with graphlog in unified tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 17 Sep 2010 20:53:56 +0200] rev 794
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 17:51:32 -0500] rev 793
tests: add exit codes to unified tests
[ original upstream message ]
Brodie Rao <brodie@bitheap.org> [Sun, 12 Sep 2010 18:05:53 -0500] rev 792
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 21:22:11 +0200] rev 791
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 16:58:13 +0200] rev 790
Explain file-wise expansion in help
Christian Ebert <blacktrash@gmx.net> [Fri, 03 Sep 2010 15:59:08 +0100] rev 789
Merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 788
diff: recurse into subrepositories with --subrepos/-S flag
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 31 Aug 2010 18:18:28 +0100] rev 787
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:15:30 +0900] rev 786
test-keyword: use regular expressions instead of grepping
[ original upstream message]
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:01:41 +0100] rev 785
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 15 Aug 2010 13:26:12 -0500] rev 784
tests: drop big sed from test-keyword.t
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:00:29 +0100] rev 783
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:57 +0100] rev 782
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:41 +0100] rev 781
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 780
rollback: fix up tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:42:14 +0100] rev 779
Merge after backout
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:30:42 +0100] rev 778
Backed out changeset bceb04857ce1 (not all upstream hunks applied)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 14:53:34 +0900] rev 777
tests: catch re.error if test line is not a valid regular expression
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 23:27:22 -0500] rev 776
tests: basic support for unified tests
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 15:44:54 -0500] rev 775
tests: move script execution in runner helpers
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Jul 2010 12:34:33 +0200] rev 774
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Jul 2010 12:32:45 +0200] rev 773
Move collecting of [keyword] patterns to reposetup (issue2303)
When cloning, prevent [keyword] filename patterns configured locally
in the source directory to persist during the update in the destination.
a) move [keyword] retrieval (back) to reposetup
b) remove the corresponding global kwtools attributes
Add test cases.
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Jul 2010 08:13:48 +0100] rev 772
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Jul 2010 10:24:31 +0200] rev 771
Add extra datefilters in a single update call
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jun 2010 11:08:43 +0200] rev 770
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jun 2010 21:58:53 +0200] rev 769
Postpone manifest calculation in kwtemplater.overwrite
We can check for file existence in the working directory (needed
in case of recording) by simply using the given context and
calculate the manifest only when there are in fact candidates
for expansion/shrinking.
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Jun 2010 11:33:01 +0100] rev 768
Merge with stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 06 Jun 2010 17:25:00 +0900] rev 767
help: show value requirement and multiple occurrence of options
this helps users to know what kind of option is:
- no value is required(flag option)
- value is required
- value is required, and multiple occurrences are allowed
each kinds are shown as below:
-f --force force push
-e --ssh CMD specify ssh command to use
-b --branch BRANCH [+] a specific branch you would like to push
if one or more 3rd type options are shown, explanation for '[+]' mark
is also shown as footnote.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jun 2010 22:50:30 +0100] rev 766
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jun 2010 01:05:45 +0200] rev 765
Force dirstate normal when all changes in a file are recorded
Before this bugfix a file whose changes were entirely recorded was still
considered modified by "hg status".
Note: the test must use hg record -l/--logfile, because this is not
reproducible with hg record -m/--message.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jun 2010 17:21:12 +0100] rev 764
Pass context to kwtemplater.overwrite
Now that we have retrieved the context in every calling function
except commit, pass it as argument to kwtemplater.overwrite to
avoid looking it up twice.
Reorder arguments to kwtemplater.overwrite to reflect their
importance.
Turn node argument into a simple boolean and rename it to iswctx.
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jun 2010 03:45:10 +0200] rev 763
Retrieve added and modified files from commitctx
Christian Ebert <blacktrash@gmx.net> [Tue, 08 Jun 2010 09:55:08 +0100] rev 762
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 07 Jun 2010 20:03:32 +0200] rev 761
move working dir/dirstate methods from localrepo to workingctx
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 06 Jun 2010 20:19:24 +0100] rev 760
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 03 Jun 2010 10:37:31 +0100] rev 759
Use context to detect uncommitted merge
Christian Ebert <blacktrash@gmx.net> [Sat, 22 May 2010 14:10:49 +0200] rev 758
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Fri, 21 May 2010 22:12:39 +0200] rev 757
Offer svn-like default keywordmaps
svn-like default keywords can be set in a new configuration section
called [keywordset] -- thanks to timeless for the name.
Move setup of default keywordmaps into dedicated function used by
kwtemplater.__init__ and demo.
HeadURL/URL is not supported (by default).
Christian Ebert <blacktrash@gmx.net> [Fri, 21 May 2010 22:12:39 +0200] rev 756
Add 2 svn-like date filters
svnisodate yields the format the date in svn's Id keyword expands to.
svnutcdate yields the format svn's Date/LastChangedDate expands to.
http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html
Christian Ebert <blacktrash@gmx.net> [Tue, 18 May 2010 22:22:59 +0200] rev 755
Merge with stable
Martin Geisler <mg@aragost.com> [Tue, 18 May 2010 16:31:10 +0200] rev 754
Use our custom hg reStructuredText role some more
I missed these occurrences on my first scan through the source.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 17:15:38 +0200] rev 753
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 752
rollback: fix up tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 10:56:47 +0200] rev 751
(stable) merge
Matt Mackall <mpm@selenic.com> [Thu, 13 May 2010 17:24:21 -0500] rev 750
commit: note new branch heads rather than topological heads
Move to using contexts while we're at it.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 09 May 2010 11:14:43 +0200] rev 749
Support extensions using dorecord, e.g. crecord
Provide extendable keyword.recordextensions variable, so other
extensions beside hgext.record which provide the dorecord function
can cooperate with hgext.keyword like so (example from crecord):
def extsetup():
try:
keyword = extensions.find('keyword')
keyword.restricted += ' crecord qcrecord'
try:
# use record support in keyword.py if present
keyword.recordcommands += ' crecord qcrecord'
keyword.recordextensions += ' crecord'
except AttributeError:
pass
except KeyError:
pass
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 17:16:00 +0200] rev 748
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 14:02:45 +0200] rev 747
Omit setting extra variable for record context
Since dc2f37864348 the context is always retrieved in
kwtemplater.overwrite().
Christian Ebert <blacktrash@gmx.net> [Tue, 04 May 2010 01:15:34 +0200] rev 746
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sun, 02 May 2010 22:39:43 +0200] rev 745
Simplify record switch in kwtemplater.overwrite
1) use kwtemplater.record attribute for clarity
2) drop optional context argument; consider the speed loss by
duplicating the dictionary lookup repo['.'] as negligible
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 23:18:42 +0200] rev 744
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 20:49:40 +0200] rev 743
Cleanup test and make it portable
- replace sed call with python command
- no need to back up hgrc before record
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 16:30:09 +0200] rev 742
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 22:04:05 -0500] rev 741
run-tests: add --view switch to use external diff viewer
[original upstream message ]
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 740
run-tests: sort options
[original upstream message ]
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 739
run-tests: add -l short option for --local
[original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 15:21:59 +0200] rev 738
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:13 +0200] rev 737
Test recording
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:07 +0200] rev 736
Support (q)record
Monkeypatch hgext.dorecord to trigger keyword expansion.
Read data from working directory, not from filelog.
Prevent keyword expansion from within record's commitfunc,
thereby fixing a bug/inconsistency where files which are clean
after recording were overwritten twice.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 03:54:18 +0200] rev 735
Remove mq commands from restricted list
Monkeypatching patch.diff takes care of this since 911f5be5d159.
Test mq more thoroughly by loosening [keywordmaps] and comparing
the output of hg cat with keyword expansion enabled and disabled.
Christian Ebert <blacktrash@gmx.net> [Fri, 16 Apr 2010 14:30:13 +0200] rev 734
Replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net> [Fri, 23 Apr 2010 10:37:08 +0200] rev 733
Merge with stable
Martin Geisler <mg@aragost.com> [Thu, 22 Apr 2010 10:24:49 +0200] rev 732
Use hg role in help strings
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 20 Apr 2010 02:37:20 +0200] rev 731
Merge with stable
Augie Fackler <durin42@gmail.com> [Sat, 17 Apr 2010 13:38:42 -0500] rev 730
keyword: monkeypatch patch so that optional args can be passed as kwargs
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Apr 2010 22:16:14 +0200] rev 729
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 20:25:07 +0200] rev 728
run-tests.py: can't remove from os.environ on solaris
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Apr 2010 15:23:22 +0200] rev 727
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 14 Apr 2010 17:58:10 +0900] rev 726
pylint, pyflakes: remove unused or duplicate imports
[ original upstream message ]
Ry4an Brase <ry4an-hg@ry4an.org> [Wed, 14 Apr 2010 00:24:47 -0500] rev 725
Fix --blacklist when --jobs > 1 in run_tests.py.
The options parsing logic replaces the options.blacklist initial value,
a list of filenames, with a dict of test names to filenames. When
runchildren rebuilds the command line to launch child processes the dict
is flattened and provided as a malformed argument when a filename is
expected.
Fix is to remove the blacklist option from child invocations since the
filtering is handled in the parent anyway.
[ original upstream message ]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 09:08:47 +0200] rev 724
run-tests.py: reset env variables set by hooks
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:28:48 +0200] rev 723
Merge with stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 15:23:04 +0100] rev 722
run-tests: force to test pure on pypy as well
[ original upstream message ]
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 15:22:17 +0100] rev 721
Fix run-tests.py -jX after 2ed667a9dfcb
[ original upstream message ]
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 11:37:31 +0100] rev 720
tests: adapt the test runner to work with jython
[ original upstream message ]
Brodie Rao <brodie@bitheap.org> [Mon, 22 Mar 2010 01:36:12 -0400] rev 719
run-tests: make sure GREP_OPTIONS isn't set
This can interfere with test output, especially for options like --color.
[ original upstream message ]
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 15:32:24 +0100] rev 718
tests: use external coverage, mandate newer version
This removes the option for including the stdlib in coverage reports.
[ original upstream message ]
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:19:54 +0100] rev 717
templater: readable dates older than 24 months revert to ISO8601 (issue1006)
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:41 +0200] rev 716
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:06 +0200] rev 715
Add forgotten comment
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 17:34:12 +0200] rev 714
Make the templater a local variable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:05:51 +0200] rev 713
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:21:30 -0700] rev 712
rollback: improve message
[ original upstream message ]
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:37 -0500] rev 711
rollback: add dry-run argument, emit transaction description
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:29:16 +0100] rev 710
Do not bother about detecting extension path in demo
Detecting and showing the path to a keyword extension in a
non-standard place only made sense while keyword.py was not
shipped with Mercurial.
The test output has changed because we do not have a spurious
space at eol anymore.
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 14:12:56 +0200] rev 709
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 708
keywords: build a new templater to work around caching interaction
Christian Ebert <blacktrash@gmx.net> [Tue, 30 Mar 2010 11:12:09 +0100] rev 707
(0.9.2compat) improve quoting of environment variable in test
Christian Ebert <blacktrash@gmx.net> [Tue, 30 Mar 2010 11:08:13 +0100] rev 706
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 24 Mar 2010 01:43:24 +0100] rev 705
Tests with spaces in paths
This allows most tests to succeed with
./run-tests.py --tmpdir='/tmp/hg test'
and introduces other tests for spaces and shell quoting
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Mar 2010 23:16:44 +0100] rev 704
(0.9.2compat) get applicable changes from default
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Mar 2010 15:04:07 +0100] rev 703
(stable) merge
Even though this is a fake standalone branch, we do not include
the patch that removed extension path detection in kwdemo.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:58 +0100] rev 702
Make kwdemo less verbose
1) Set the branchname always silently with
dirstate.setbranch().
We create a branch so that testing the {branches} template
does not come up empty. But kwdemo is hardly the place to
inform the user by inference why {branches} is empty on the
default branch.
"demobranch" is ascii and cannot be changed, so using the
internal command instead of commands.branch() is safe.
2) Do not show full path to temporary directory
(distracting long lines on Mac OS X).
3) No special debug output. Output only related to keyword,
no internals like unsetting of commit hooks etc.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:23 +0100] rev 701
1 variable name for overwriting candidates
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:27:22 +0100] rev 700
Do not customize ui.note() when overwriting
Behaviour change:
hg commit --verbose now prints out the names of the files
which are overwritten.
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Feb 2010 05:55:05 +0100] rev 699
Mark improved demo commit message for translation
s/config/configuration/
Inside the quoted command put the message in single quotes in case
the translation contains apostrophes.
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:56:41 +0100] rev 698
(0.9.2compat) update copyright _and_ licence
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:48:38 +0100] rev 697
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:41 +0100] rev 696
Update copyright
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:14 +0100] rev 695
Remove deprecated options
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:57:55 +0100] rev 694
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 09 Feb 2010 01:12:29 +0100] rev 693
run-tests.py: skipped tests shouldn't change working directory
[ original upstream message ]
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Dec 2009 19:02:26 -0200] rev 692
run-tests.py: clears http_proxy for all tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:48:01 +0100] rev 691
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 21:50:36 +0100] rev 690
(0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Switch long option name from --untracked to --unknown.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 21:09:04 +0100] rev 689
(0.9.2compat) use status' names for readability
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 20:59:43 +0100] rev 688
Remove spurious locks, improve handling of wlock
- kwcommitctx is inside the wlock of repo.commit: no lock
- _kwfwrite only needs wlock
wlock outside try block, so we don't need to import lock.release
_kwfwrite should even be safer that way, as we moved the status
call inside the try-except block.
Thanks to Benoit Boissinot for help.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 19:56:37 +0100] rev 687
Use status' names instead of index
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 21:57:52 +0100] rev 686
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 21:56:15 +0100] rev 685
Do not postpone commit hooks
With 0e64d814d7d0 in place, this hack is not needed any more.
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 11:15:18 +0100] rev 684
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 09 Feb 2010 14:12:22 -0600] rev 683
fix up a bunch of check-code warnings
[ original upstream message ]
Brendan Cully <brendan@kublai.com> [Sat, 06 Feb 2010 15:18:36 +0100] rev 682
run-tests: kill daemons on ^C with -j.
This is not perfect, but the problem is fundamentally racy.
[ original upstream message ]
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 10 Dec 2009 17:21:31 +0900] rev 681
run-tests: split tests/blacklist in tests/blacklists/*
Following discussions with Gilles Morris [1], it seems that it is preferable to
use several blacklist files in a blacklists/ directory. It is easier to add an
unversioned file for experiments than modifying a tracked file.
Also fall back to a simpler syntax, giving up ConfigParser, now that section
names are not needed anymore.
And allow --blacklist parameter to be a complete path, instead of only one
of the filenames contained in tests/blacklists/
[1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 00:05:27 -0600] rev 680
many, many trivial check-code fixups
[ original upstream message ]
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 16 Feb 2010 21:04:04 +0100] rev 679
filelog: sort meta entries, ensure deterministic order
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 18:08:07 +0000] rev 678
(0.9.2compat) fix utcdate filter
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 17:57:36 +0000] rev 677
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 16:50:31 +0000] rev 676
Fix utcdate filter
So far the utcdate filter only omitted the timezone,
now it actually converts to utc.
Thanks to Kevin Grover for pointing out the issue.
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Jan 2010 10:14:36 +0100] rev 675
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:20:08 -0600] rev 674
Update license to GPLv2+
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 11:02:48 +0000] rev 673
(0.9.2compat) load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:54:00 +0000] rev 672
(0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted
See 52b03aad673b, 13a6a2c0440f.
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:15:49 +0000] rev 671
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:14:36 +0000] rev 670
run-tests.py: update
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 17:46:48 +0000] rev 669
tests: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:17 +0000] rev 668
Go into restricted mode when transplanting
Expanded keyword is read into diff with transplant -b otherwise.
Test this scenario.
Thanks to Adam Berkes for providing an example case.
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:04 +0000] rev 667
Do not monkeypatch diff when in restricted mode
kw_diff actually disabled restricted mode when 2 revisions were given,
because it effectively disables the extension in this case.
But the commands working with diff and patch need restricted mode
always enabled, i.e. expansion enabled when writing to the
working directory and - crucial for these commands - no expansion
when reading the filelog.
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Nov 2009 11:27:33 +0000] rev 666
Merge with stable
timeless [Fri, 27 Nov 2009 18:26:25 +0000] rev 665
keyword: clarify object of backwards compatibility
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 28 Nov 2009 19:51:21 +0000] rev 664
(0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output
Keep $RCSFile$ for backwards compatibility.
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:04:02 +0000] rev 663
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 26 Nov 2009 10:51:17 +0100] rev 662
The CVS keyword is $RCSfile$, not $RCSFile$
http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords
Fix default keyword map accordingly.
Keep $RCSFile$ for Mercurial backwards compatibility.
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:03:29 +0000] rev 661
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:50:16 +0100] rev 660
keyword: sort demo output to ensure deterministic output
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:42:05 +0200] rev 659
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:40:48 +0200] rev 658
(0.9.2compat) update wiki url
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Oct 2009 23:57:34 +0200] rev 657
hg.clone: report branch name on update
[ original upstream message ]
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 15:32:37 +0200] rev 656
change wiki/bts URLs to point to new hostname
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:37:14 +0200] rev 655
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 654
Uppercase short option for kwfiles --all, like hg status -A
Deprecate kwfiles -a.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 653
Make kwfiles -u show untracked files only (like status)
Remove extra documentation of -u/--unknown, as this is covered in
the option help already.
Like commands.status the code now zips the status flags.
Add more kwfiles tests.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 652
Make kwfiles --all show unknown files too
More consistent and similar to hg status.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 651
kwfiles --unknown instead of --untracked
Use the same option name as "hg status".
Retrieve option in _status().
Mark --untracked as deprecated.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 20:42:39 +0200] rev 650
Merge with stable
Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 22:39:38 -0700] rev 649
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:06:50 +0200] rev 648
(0.9.2compat) do not mark debug message for translation
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:04:38 +0200] rev 647
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 01:15:38 +0200] rev 646
do not attempt to translate ui.debug output
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:41 +0200] rev 645
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:02 +0200] rev 644
(0.9.2compat): run kwdemo before setting up [keyword] files
Ensures that kwdemo runs correctly without further configuration.
Also no need to specify --default option.
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Sep 2009 23:15:37 +0200] rev 643
test: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.
Christian Ebert <blacktrash@gmx.net> [Fri, 28 Aug 2009 16:18:28 +0100] rev 642
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 27 Aug 2009 00:00:15 +0200] rev 641
test-keyword: update output to match 5d49fdef6fd0
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:25:33 +0200] rev 640
(0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:18:32 +0200] rev 639
(0.9.2compat) prefer util.datestr over time module import
We keep the function in this branch to catch the TypeError.
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:01:55 +0200] rev 638
(0.9.2compat) remove "help keyword" from test
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:57:21 +0200] rev 637
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:49 +0200] rev 636
Use util.datestr for utcdate filter, make it accessable in variable
lambda syntax mimicking templatefilters.py
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:44 +0200] rev 635
Reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:36 +0200] rev 634
Remove "help keyword" from test
Testing help output does not make sense as we have no way to
check for errors in content which would be the only reasonable
test here.
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Jul 2009 10:45:35 +0100] rev 633
Refactor kwdemo and make output translatable
Better reflect the actual behaviour of the extension:
- Make map arguments and -f/--rcfile not mutually exclusive but
extend the current configuration
- Map arguments and -f/--rcfile both override the defaults even
when -d/--default is specified
- -d/--default only overrides the current configuration
Inform the user about extending/overriding behaviour, but only at
the beginning; the following messages become terser, making the
output translatable without too much code clutter.
Rephrase help (use "short/long" option notation etc.).
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:53:13 +0200] rev 632
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:51:41 +0200] rev 631
Update copyright
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:49:46 +0200] rev 630
(0.9.2compat) update copyright
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:09:02 +0200] rev 629
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 03 Aug 2009 00:01:50 +0200] rev 628
help: use field lists for lists of extensions
[ original upstream message ]
Martin Geisler <mg@lazybytes.net> [Sun, 02 Aug 2009 17:17:17 +0200] rev 627
minirst: indent literal blocks with two spaces
The vast majority* of them are formatted like this in the source, so
this basically reverts the output to how it looked before we got the
minirst parser.
*: the help on templating use four spaces for some examples and will
now shown with an indentation of just two spaces.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Jul 2009 10:40:59 +0100] rev 626
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:53:06 +0200] rev 625
keyword: wrap docstrings at 70 characters
[ original upstream description ]
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:26 +0200] rev 624
commands: use minirst parser when displaying help
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 20:00:23 +0100] rev 623
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 07:37:09 +0100] rev 622
(0.9.2compat) argument to "kwdemo --rcfile" must be string (bugfix)
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 07:26:16 +0100] rev 621
Argument to "kwdemo --rcfile" must be string (bugfix)
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Jul 2009 08:28:30 +0100] rev 620
Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Jul 2009 01:25:51 +0200] rev 619
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 09 Jul 2009 23:59:03 +0200] rev 618
mq: qpop now tells which patches are popped
When navigating through a patch series by qpushing and qpopping it was easy to
get lost because qpop was silent. I found myself often running qnext after qpop
to see which patch I just dropped - especially if I was about to qrm it. This
patch makes qpop more symmetric to qpush by showing which patches are
applied/"unapplied".
I think it is a good change even though it changes output by adding a new line
of output.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:40:24 +0200] rev 617
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:39:58 +0200] rev 616
(0.9.2compat) empty string as default value for hgcmd
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:37:34 +0200] rev 615
(0.9.2compat) use all caps NOTE: in help string
Martin Geisler <mg@lazybytes.net> [Thu, 09 Jul 2009 22:52:39 +0200] rev 614
keyword: use all caps for 'note:' in help string
The diff, export, log, and status commands write it as 'NOTE:'.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 01:52:11 +0200] rev 613
(0.9.2compat) prefer self.func over repo.func in kwrepo
Avoid nesting by falling back on parent class member function.
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 01:33:01 +0200] rev 612
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 09 Jul 2009 11:59:12 +0200] rev 611
Eliminate potential reference cycles from kwrepo
- delete kwrepo.commitctx after using the tweaked version
- prefer self.hook over repo.hook to avoid nesting
Also pass arguments to commit as arbitrary list.
Thanks to Simon Heimberg and Matt Mackall for guidance.
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 03:25:07 +0200] rev 610
(0.9.2compat) kwdemo: get rid of subfunction and ease translation
Christian Ebert <blacktrash@gmx.net> [Tue, 07 Jul 2009 23:30:53 +0200] rev 609
Collect kwmaps using a generator expression
Allowed for Python 2.4.
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 03:09:07 +0200] rev 608
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 02:50:01 +0200] rev 607
(0.9.2compat) warp docstrings at 78 chars
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 606
keyword: wrapped docstrings at 78 characters
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 01:02:51 +0200] rev 605
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sat, 04 Jul 2009 15:26:14 +0200] rev 604
Remove unused import
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Jul 2009 10:56:01 +0200] rev 603
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 23:46:28 +0200] rev 602
Break overlong line
Christian Ebert <blacktrash@gmx.net> [Wed, 01 Jul 2009 17:36:36 +0200] rev 601
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Wed, 01 Jul 2009 17:34:39 +0200] rev 600
Make repo.commit use a custom commitctx wrapper
This avoids forcing the dirstate of overwritten files to normal
during a commit.
Thanks to Dan Villiom Podlaski Christiansen for the idea of a
"double wrapper", so other extensions can still wrap
repo.commitctx safely.
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 19:10:48 +0200] rev 599
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 18:55:09 +0200] rev 598
(0.9.2compat) lowercase status flags of untracked files in kwfile output
Improve help as well, like in default branch.
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 18:37:08 +0200] rev 597
Improve help for kwfiles
- just use "files" instead of "filenames" (analogous to "hg status -h")
- reference the extension help wrt pattern configuration
Kudos to timeless for helpful suggestions.
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 18:37:08 +0200] rev 596
Lowercase status flags of untracked files in kwfile output
Document the flags and their meanings in the command help
(thanks to timeless for bringing this to my attention).
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:59:18 +0200] rev 595
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:58:46 +0200] rev 594
(0.9.2compat) improve help for kwfiles
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 13:05:25 +0200] rev 593
keyword: improve help for kwfiles
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:50:52 +0200] rev 592
Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 12:00:30 +0200] rev 591
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 11:58:30 +0200] rev 590
Make kwdemo more translation friendly
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Jun 2009 14:29:48 +0200] rev 589
(0.9.2compat) update synopsis
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Jun 2009 14:27:27 +0200] rev 588
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 13:42:34 +0200] rev 587
extensions: change descriptions for hook-providing extensions
Thanks to timeless and Dave Townsend for advice!
[ original upstream message ]
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 12:25:56 +0200] rev 586
extensions: fix up description lines some more
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Jun 2009 18:12:44 +0200] rev 585
Merge with stable
C?dric Duval <cedricduval@free.fr> [Mon, 22 Jun 2009 15:48:08 +0200] rev 584
extensions: improve the consistency of synopses
Trying as much as possible to consistently:
- use a present tense predicate followed by a direct object
- verb referring directly to the functionality provided
(ie. not "add command that does this" but simple "do that")
- keep simple and to the point, leaving details for the long help
(width is tight, possibly even more so for translations)
Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom
Podlaski Christiansen and others for the helpful suggestions.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 21 Jun 2009 23:17:37 +0100] rev 583
Merge with stable
C?dric Duval <cedricduval@free.fr> [Sat, 20 Jun 2009 20:57:13 +0200] rev 582
help: remove per-extension paragraph on how to enable it
The central place to find this information is the "extensions" help topic.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 12:45:39 +0100] rev 581
(0.9.2compat) concise help title
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 12:43:19 +0100] rev 580
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 01:21:26 +0100] rev 579
Concise help title
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Jun 2009 11:10:15 +0100] rev 578
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 15 Jun 2009 00:03:26 +0200] rev 577
Add patch.eol to ignore EOLs when patching (issue1019)
The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:42:39 +0200] rev 576
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:42:23 +0200] rev 575
(0.9.2compat) update doc strings and help
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:32:14 +0200] rev 574
(0.9.2compat) improve English; from stable
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:34 -0400] rev 573
keyword: improve English
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 10:34:01 +0200] rev 572
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 571
merge: allow merging going backwards
New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.
case 1: update to .
a-w -> a-w
classic: ancestor a
missing recreated right?
rmed recreated WRONG
added forgotten WRONG
changed preserved RIGHT
conflicted can't happen
backward merge: ancestor a (NO EFFECT)
missing missing wrong?
rm'ed rm'ed RIGHT
added preserved RIGHT
changed preserved RIGHT
conflicted can't happen
case 2: update to ancestor of .
a-b-w -> b-w
\
a
classic: ancestor a
missing recreated right?
rmed recreated wrong?
added forgotten wrong?
changed preserved RIGHT
conflicted preserved wrong?
backwards merge: ancestor b
missing missing or conflict right?
rm'ed missing or conflict right?
changed preserved RIGHT
conflicted merge RIGHT
added preserved right?
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:53 +0200] rev 570
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:10 +0200] rev 569
Remove doc string for standalone version
default and stable branches only for development and history.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:23:23 +0200] rev 568
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 01:24:45 +0200] rev 567
tests: fix doc string in get-with-headers.py
[ original upstream message ]
Gilles Moris <gilles.moris@free.fr> [Thu, 25 Dec 2008 17:49:08 +0100] rev 566
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py
Note that other sed replacement commands are also filtering get-with-headers.py,
but they seem to be more test specific, hence not handled here.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:18:59 +0200] rev 565
(stable) merge for run-tests.py
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:16:14 +0200] rev 564
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:15:09 +0200] rev 563
(stable) fix import gone wrong in 43d8c042ca20
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:07:29 +0200] rev 562
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 18:59:18 +0200] rev 561
Refer users to distribution or 0.9.2compat branch
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 18:51:53 +0200] rev 560
(0.9.2compat) document Mercurial version range for standalone extension
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 01:31:03 +0200] rev 559
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 19 Dec 2008 16:47:36 -0600] rev 558
resolve: require -a switch to resolve all files
Like revert -a, this should make this command slightly safer
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Jun 2009 09:16:22 +0200] rev 557
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:11:32 -0500] rev 556
commit: drop the now-unused files parameter
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 01 Jun 2009 01:51:50 +0200] rev 555
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 14:55:51 +0200] rev 554
fixed typos found in translatable strings
This is from a spell-check of hg.pot.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:40:11 +0200] rev 553
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:34:38 +0200] rev 552
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net> [Tue, 26 May 2009 18:24:06 +0200] rev 551
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 550
match: add some default args
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 549
match: change all users of util.matcher to match.match
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 25 May 2009 20:05:25 +0200] rev 548
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 19 May 2009 03:59:58 +0200] rev 547
update --clean: do not unlink added files (issue575)
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 19 May 2009 05:48:42 +0200] rev 546
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 545
commit: move editor outside transaction
The commit editor is now invoked before files and manifest are
committed. The editor is now run with only the wlock held and aborting
an edit no longer requires rolling back a transaction. Changes to
files during a commit still result in undefined behavior.
(This is preliminary work for committing subrepositories)
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 15 May 2009 01:37:50 +0200] rev 544
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 14 May 2009 13:20:40 -0500] rev 543
commit: move commit editor to cmdutil, pass as function
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Thu, 14 May 2009 13:20:40 -0500] rev 542
commit: drop unused p1 and p2 args
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 28 Apr 2009 09:42:44 +0100] rev 541
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 01:08:54 +0200] rev 540
updated license to be explicit about GPL version 2
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 27 Apr 2009 18:35:45 +0100] rev 539
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:50:44 -0500] rev 538
replace util.sort with sorted built-in
This is marginally faster for small and moderately-sized lists
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Apr 2009 15:04:03 +0100] rev 537
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 14:29:02 +0200] rev 536
tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Apr 2009 10:28:29 +0100] rev 535
Merge with stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Wed, 22 Apr 2009 02:01:22 +0200] rev 534
switch lock releasing in the extensions from gc to explicit
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Apr 2009 11:37:50 +0100] rev 533
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Apr 2009 09:56:07 +0100] rev 532
keyword: set overwrite message only once, not for each file
[ original upstream message ]
Wagner Bruna <wbruna@yahoo.com> [Mon, 20 Apr 2009 21:16:13 -0300] rev 531
keyword, i18n: avoid untranslated strings as message parameters
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Apr 2009 23:13:51 +0200] rev 530
Merge with stable
Martin Geisler <mg@lazybytes.net> [Tue, 07 Apr 2009 22:58:05 +0200] rev 529
expand "repo" to "repository" in help texts
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 05 Apr 2009 12:15:32 +0200] rev 528
Merge with stable
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:17:53 +0200] rev 527
keyword: word-wrap help texts at 70 characters
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Mar 2009 13:37:10 +0100] rev 526
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 17 Mar 2009 13:43:11 -0500] rev 525
bundlerepo: reintroduce dirstate
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Thu, 05 Mar 2009 06:47:41 +0100] rev 524
Merge with stable
Jim Correia <jim.correia@pobox.com> [Sat, 14 Feb 2009 22:40:39 +0100] rev 523
add --git option to commands supporting --patch (log, incoming, history, tip)
No short -g form, since it would conflict with -g from the graphlog extension.
[ original upstream descrition]
Patrick Mezard <pmezard@gmail.com> [Wed, 19 Nov 2008 13:27:57 +0100] rev 522
patch: pass an opener to patchfile
[ original upstream description ]
Augie Fackler <durin42@gmail.com> [Wed, 04 Mar 2009 13:06:16 -0600] rev 521
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
[ original upstream description ]
Martin Geisler <mg@daimi.au.dk> [Sat, 03 Jan 2009 17:15:21 +0100] rev 520
mq: lowercase output
This extension produces quite a lot of informational messages during
its normal operation and it is hard to say which strings can be
changed and which cannot.
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Dec 2008 15:22:45 +0100] rev 519
(0.9.2compat) do not use builtin format
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Dec 2008 14:55:20 +0100] rev 518
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Dec 2008 09:58:41 +0100] rev 517
keyword: simplify repo.local and bundle check (as in 2f4a399a8787)
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Dec 2008 14:09:59 +0100] rev 516
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 28 Sep 2008 20:40:38 +0200] rev 515
get-with-headers: fix stream modes under Windows
[ original upstream descripton ]
Bryan O'Sullivan <bos@serpentine.com> [Wed, 28 Nov 2007 08:38:42 -0800] rev 514
hgweb: return meaningful HTTP status codes instead of nonsense
[ original upstream description ]
Eric Hopper <hopper@omnifarious.org> [Thu, 29 Jun 2006 16:44:23 -0700] rev 513
Add a test for getting raw files via the web UI.
[ original upstream description ]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Oct 2008 12:23:58 +0200] rev 512
hgweb: nodeids should be aligned in raw changesets
If they aren't it breaks hg import --exact
Thanks to Jesper Noehr for noticing it.
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Sat, 12 Jul 2008 19:12:18 +0100] rev 511
notify: mime-encode messages
- addresses will be properly encoded
- message bodies will also be encoded as we are not sending
patches that are meant to be applied
- update test output
- adapt test-keyword to ignore the new headers
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Wed, 26 Nov 2008 09:35:38 +0100] rev 510
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Nov 2008 18:13:05 +0100] rev 509
Do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Nov 2008 18:13:54 +0100] rev 508
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Nov 2008 22:29:03 +0100] rev 507
keyword: move common code out of commit condition
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Nov 2008 23:01:00 +0100] rev 506
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 19:10:09 +0100] rev 505
keyword: be more efficient about ctx usage
[ original uptstream description ]
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 13:59:25 +0100] rev 504
cmdutil: use change contexts for cset-printer and cset-templater
[ original uptstream description ]
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Nov 2008 23:16:39 +0100] rev 503
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 03 Nov 2008 16:48:23 +0100] rev 502
patch: turn patch.diff() into a generator
This should even be a little faster than passing in an fp argument.
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Oct 2008 10:25:24 +0200] rev 501
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 17:34:52 -0500] rev 500
extensions: use new wrapper functions
[ original upstream description]
Christian Ebert <blacktrash@gmx.net> [Sat, 18 Oct 2008 20:51:12 +0200] rev 499
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 18 Oct 2008 16:56:39 +0200] rev 498
help: better documentation intro for a few extensions
[ original upstream description ]
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 18 Oct 2008 16:50:03 +0200] rev 497
show enabled extensions in hg help
[ original upstream description ]
Peter Gervai <grin@grin.hu> [Wed, 15 Oct 2008 15:52:34 +0200] rev 496
untest
Peter Gervai <grin@grin.hu> [Wed, 15 Oct 2008 15:16:15 +0200] rev 495
cross them fingahs
Christian Ebert <blacktrash@gmx.net> [Tue, 02 Sep 2008 08:48:48 -0400] rev 494
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Sep 2008 01:19:12 +0200] rev 493
fix test output broken by a04d8cadb6af
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 23:44:52 +0200] rev 492
Merge with stable
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 22:32:53 +0200] rev 491
Have verbose and debug flag print the changeset rev and hash when committing.
Besides updating the tests output, I had to push back at the end the test for
issue1193 in test-commit, solved by cset 4386a7706828, because it was using the
current date for commit and was randomizing the subsequent hash.
[ original upstream description ]
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Aug 2008 22:13:39 +0200] rev 490
Backed out changeset d557749c627a
Replace this change with a better one.
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:13:45 +0200] rev 489
(0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:02:02 +0200] rev 488
(stable) merge with default
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 13:25:35 +0200] rev 487
Have verbose flag print the changeset hash when committing
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 11:53:30 +0200] rev 486
(0.9.2compat) add merge, resolve to restricted
This is not really backwards compatible (test only as comment)
and doesn't prevent extra conflicts with older Hg versions.
On the other hand it doesn't do any damage either and provides
the 3-way merge ease if possible.
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 08:26:18 +0200] rev 485
Avoid additional conflicts during merge/resolve
Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:
$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other
and will again be expanded on commit.
Demonstrate in test case.
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 21:32:06 +0200] rev 484
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 19:07:33 +0200] rev 483
(0.9.2compat) fix test compatibility
Comment out non-backwards compatible hgweb test (at default position).
Make kwexpand nonexistent work on Windows (originally by pmezard).
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 10:20:44 +0200] rev 482
Thorough hgweb testing
- test hgweb while keyword extension is _enabled_
- check expansion with hgweb.file
- besides log and diff, also check annotate for not expanding
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Aug 2008 11:20:34 +0200] rev 481
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jul 2008 20:05:14 +0200] rev 480
(0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jul 2008 16:26:38 +0200] rev 479
Add verify to nokwcommands after refactor in e79a8f36c2a5
Add test as well.
Thanks to Guy Brand for spotting this.
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jun 2008 12:42:48 +0200] rev 478
(0.9.2compat) context, status refactor keeping backwards compatible fallback
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jun 2008 12:33:36 +0200] rev 477
(0.9.2compat) ddb8a222249b is backwards compatible
Christian Ebert <blacktrash@gmx.net> [Sat, 28 Jun 2008 15:49:54 +0200] rev 476
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 27 Jun 2008 18:28:45 -0500] rev 475
util: add sort helper
[ original upstream description]
Matt Mackall <mpm@selenic.com> [Fri, 27 Jun 2008 13:43:29 -0500] rev 474
status: clean up all users for unknown files
[ original upstream description]
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 473
repo.status: eliminate list_
[ original upstream description]
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 472
add __len__ and __iter__ methods to repo and revlog
[ original upstream description]
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 471
manifest: remove execf/linkf methods
[ original upstream description]
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:46 -0500] rev 470
use repo[changeid] to get a changectx
[ original upstream description]
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 13:46:34 -0500] rev 469
simplify flag handling
add _checklink var to dirstate
introduce dirstate.flagfunc
switch users of util.execfunc/linkfunc to flagfunc
change manifestdict.set to take a flags string
change ctx.fileflags to ctx.flags
change gitmode func to a dict
remove util.execfunc/linkfunc
[ original upstream description]
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 13:46:29 -0500] rev 468
use repo.changectx(None) to get a workingctx
[ original upstream description]
Matt Mackall <mpm@selenic.com> [Wed, 25 Jun 2008 17:35:20 -0500] rev 467
context: avoid using None for working parent
[ original upstream description ]
Matt Mackall <mpm@selenic.com> [Wed, 25 Jun 2008 17:34:28 -0500] rev 466
use repo.changectx rather than context.changectx
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 02:27:06 +0200] rev 465
(stable) mimic cmdutil.bail_if_changed even more
At the check before overwriting with kwexpand, kwshrink:
- abort when in middle of merge
- give terser abort message
Christian Ebert <blacktrash@gmx.net> [Fri, 13 Jun 2008 17:41:26 +0200] rev 464
(0.9.2compat) secure keyword arguments in backwards compatible wrappers
Explicitly assign _all_ keyword args when TypeErrors must be detected.
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 11:10:04 +0200] rev 463
keyword: disable expansion for annotate
Keyword expansion should not be annotated.
Annotate revision when unexpanded keyword was inserted.
Add test.
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 16:32:16 +0200] rev 462
(0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 11:10:04 +0200] rev 461
keyword: disable expansion for annotate
Keyword expansion should not be annotated.
Annotate revision when unexpanded keyword was inserted.
Add test.
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 02:35:38 +0200] rev 460
Merge after backout
Revert to dispatch._parse for grabbing current command name.
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 02:33:41 +0200] rev 459
Backed out changeset 10ebb9f44b99
Tests with "hg annotate" reveal that dispatch._runcommand is
unreliable for our purpose.
Christian Ebert <blacktrash@gmx.net> [Fri, 06 Jun 2008 17:21:00 +0200] rev 458
(0.9.2compat) get some changes from default branch
We stay with old-fashioned command _parsing because a _*runcommand
method was introduced after 0.9.2
Christian Ebert <blacktrash@gmx.net> [Fri, 06 Jun 2008 17:08:56 +0200] rev 457
keyword: mimic cmdutil.bail_if_changed even more
At the check before overwriting with kwexpand, kwshrink:
- abort when in middle of merge
- give terser abort message
Christian Ebert <blacktrash@gmx.net> [Sun, 01 Jun 2008 13:35:12 +0200] rev 456
keyword: use dirstate.parents to obtain current first parent
This should be quicker than changectx().node()
Christian Ebert <blacktrash@gmx.net> [Sun, 01 Jun 2008 23:47:32 +0200] rev 455
keyword: monkeypatch dispatch._runcommand instead of _parse
We want the current command, and hooking into this method
makes it more transparent what we are doing.
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:47:38 +0200] rev 454
(stable) merge with default to fix import from crew
1 hunk that removed "files" argument from patch.diff forgotten by me.
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:25:52 +0200] rev 453
Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:24:40 +0200] rev 452
Fix arguments for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Tue, 13 May 2008 08:33:23 +0200] rev 451
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 May 2008 08:32:01 +0200] rev 450
(stable) ignore .DS_Store
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 449
match: remove files arg from repo.status and friends
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 448
match: remove files argument from patch.diff
[ original message from upstream ]
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 447
walk: remove remaining users of cmdutils.matchpats
[ original message from upstream ]
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Apr 2008 01:48:29 +0200] rev 446
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Apr 2008 01:46:06 +0200] rev 445
(stable) patches from default in 4b2c266bf059
Revert to util.binary, as checks entire data for \0 now.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 13:40:16 +0200] rev 444
(0.9.2compat) backwards compatible changes from default
uisetup was introduced after 0.9.3, so not used.
Therefore different handling of monkeypatches.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 09:13:17 +0200] rev 443
Reduce opt=arg syntax even more
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 00:55:21 +0200] rev 442
Check for '\0' in entire data before acting
util.binary might not be safe enough, as it fails eg. on certain
pdf files (issue1066).
In some cases this might even be a speed gain as there will be
no vain re.sub(n)/search on huge data.
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 441
Make overwrite() arguments mandatory
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 440
Compact argument passing to wrapped methods
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 439
Privatize remaining monkeypatches by moving them into reposetup
Make it more transparent if and when monkeypatches are needed.
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 14:05:20 +0200] rev 438
Collect filename patterns, wrap dispatch._parse in uisetup
Store [keyword] config in kwtools.
hgcmd defaults to empty string.
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 13:41:04 +0200] rev 437
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 11:03:23 +0200] rev 436
Adapt to new webcommands with "clean" monkey patches
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 10:50:10 +0200] rev 435
(0.9.2compat) fix and simplify webcommands monkey
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Mar 2008 18:25:25 +0200] rev 434
(0.9.2compat) add test for web changeset
web filediff has no backwards compatible url, so omit.
Also remove clone updating status from new hg versions.
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Mar 2008 17:13:02 +0200] rev 433
(0.9.2compat) fix webcommand monkey patches, and adapt to most recent changes
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Mar 2008 17:04:37 +0200] rev 432
(0.9.2compat) no conditional for web file match disabling
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 28 Mar 2008 19:40:44 +0100] rev 431
hgweb: refactor hgweb code
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Mar 2008 13:34:56 +0100] rev 430
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 18:33:10 +0100] rev 429
tests: add tests for hgweb to test-keyword
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Mar 2008 15:38:02 +0100] rev 428
Merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 21 Mar 2008 14:52:24 +0100] rev 427
clone: print "updating working directory" status message
With this change, "hg clone" looks like this:
% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
So the user sees
% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
while Mercurial is writing to disk to populate the working directory
With this change, "hg clone" looks like this:
% hg clone big big-work
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
[ original upstream description ]
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 14:14:15 -0500] rev 426
tests: remove some unnecessary sleeps
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Tue, 11 Mar 2008 23:55:38 +0100] rev 425
Ignore .DS_Store
Christian Ebert <blacktrash@gmx.net> [Tue, 11 Mar 2008 23:54:10 +0100] rev 424
(0.9.2compat) ignore .DS_Store
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Mar 2008 02:21:34 +0100] rev 423
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Mar 2008 02:17:21 +0100] rev 422
(0.9.2compat) expand * import
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:26 +0100] rev 421
Expand import * to allow Pyflakes to find problems
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Feb 2008 14:23:48 +0100] rev 420
(0.9.2compat) get fix from stable branch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Feb 2008 16:22:31 -0300] rev 419
keyword: remove "identify" and "remove" from nokwcommands
These two commands care about the list of modified files returned
by repo.status and we may need to do a full content comparison to
populate that list.
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 20:18:56 +0100] rev 418
Merge stable with default
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 20:17:33 +0100] rev 417
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 17:57:45 +0100] rev 416
Rename kwx to kwtools
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 17:54:58 +0100] rev 415
Fix getnode doc, add doc for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:55:49 +0100] rev 414
(0.9.2compat) FIX typo in hgweb monkeys
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:50:00 +0100] rev 413
Remove whitespace at eol
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:49:21 +0100] rev 412
(0.9.2compat) remove whitespace at eol
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 15:55:21 +0100] rev 411
(0.9.2compat) get changes from default branch
Note: test not yet updated, as <0.9.4 complains about symlink patch,
works "in principle" though.
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 16:11:54 +0100] rev 410
Do not inspect node1 for diff if node2 is given
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:30:17 +0100] rev 409
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:26:51 +0100] rev 408
Make main class and hg command accessible
Switch from global vars to top level dictionary.
Goal: make it easier for external tools (like tortoisehg)
to hook into keyword extension.
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:20:16 +0100] rev 407
Move expand/shrink decisions into kwtemplater
- do not clobber wrapper code
- get rid of clumsy kwtemplater attributes
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 01:38:28 +0100] rev 406
Remove obsolete variable declaration
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 01:22:22 +0100] rev 405
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Feb 2008 23:49:57 +0100] rev 404
Monkeypatch patch.diff for non-interactive diffs
Avoid clobbering diffs with expanded keywords eg. for
notify extension.
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 23:09:53 +0100] rev 403
(stable) merge with default branch
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:38:30 +0100] rev 402
(0.9.2compat) add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:37:13 +0100] rev 401
Add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 17:09:22 +0100] rev 400
(0.9.2compat) use different names for web methods
Makes it clearer that these are not redefinitions of the same
methods.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 14:57:48 +0100] rev 399
(0.9.2compat) web as in default where possible
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 08:35:55 +0100] rev 398
Switch off expansion for web diffs
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 01:28:16 +0100] rev 397
(0.9.2compat) incorporate changes from default branch
_iskwfile used by 2 functions again.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:32:14 +0100] rev 396
Make restrict entirely a kwtemplater attribute
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:15:03 +0100] rev 395
keyword: declare globals in a more compact way
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:13:57 +0100] rev 394
keyword: avoid os import by using util.splitpath
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 22:17:31 +0100] rev 393
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 20:17:09 +0100] rev 392
test-keyword: make it run under Windows
- don't cat symlink, content differs
- rewrite OS specific messages
- generate symlink with a bundle
[ original upstream message ]
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 20:17:06 +0100] rev 391
keyword: fix symlink detection under Windows
[ original upstream description ]
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 19:40:30 +0100] rev 390
keyword: fix mq repository detection under Windows
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 09:42:00 +0100] rev 389
(stable) merge with default branch
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 09:31:13 +0100] rev 388
(0.9.2compat) make patchfile monkey work with 0.9.5
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Feb 2008 10:14:47 +0100] rev 387
(0.9.2compat) incorporate changes from default branch
Testing reveals no name conflict with RuleDispatch's dispatch module.
At least not with 0.9.* release versions.
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 15:13:37 +0100] rev 386
Ignore everything starting with .hg
Tough luck for those who want keywords in .hgignore ;)
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 10:32:05 +0100] rev 385
Monkeypatch dispatch._parse to avoid running it twice
Inspired by Thomas Arendsen Hain.
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 01:49:17 +0100] rev 384
Do not set up kwrepo when pulling from bundlerepo
Spotted and test case provided by pmezard.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 23:32:21 +0100] rev 383
Fix pychecker warning about shadowed variable
Also no underscore prefix for restrict inside reposetup.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 22:26:50 +0100] rev 382
Safeguard anything under .hg, and the .hg_archival.txt file
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 18:46:49 +0100] rev 381
Prevent expansion in queue repo and for email
Saveguard needed for global [keyword] filename patterns.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 18:38:14 +0100] rev 380
(0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 18:35:16 +0100] rev 379
(0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 17:25:37 +0100] rev 378
Discard wread/wwrite approach, merge with stable
A basic "hg update" did not give correct results.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 11:32:34 +0100] rev 377
Fix filewise expansion for hgweb
Also make changectx argument to kwtemplater.expand.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 00:24:49 +0100] rev 376
Test unbundle null revision containing empty symlink
Spotted by pmezard.
Matt Mackall <mpm@selenic.com> [Tue, 05 Feb 2008 16:09:21 -0600] rev 375
keyword: fix my string pasting thinko
Spotted by Maxim Dounin
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 18:40:32 +0100] rev 374
Make nokwcommands, restricted string variables at top level
- prettier syntax conforming eg. to commands.norepo
- possibly easier to hook from outside
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 18:38:00 +0100] rev 373
Split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 18:36:23 +0100] rev 372
Add empty_ok argument to kwrepo.commit
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 18:33:55 +0100] rev 371
Allow keyword expansion on clone
If [keyword] filename patterns are specified in a global hgrc
keywords will be expanded in clone.
This behaviour is more consistent but also more dangerous.
Specifying global, and thus more complicted, [keyword] patterns
might slow things down as well.
Mention this in help?
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 17:23:24 +0100] rev 370
(0.9.2compat) expand keywords in raw web output, and other changes from default branch
Comment out import related tests, as not always available.
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 16:22:40 +0100] rev 369
Remove obsolete test message
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 16:13:15 +0100] rev 368
Fix web output: expand to requested rev; kwcat: wrap cat, avoid filelog subclass
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 12:22:48 +0100] rev 367
Expand keywords in hgweb rawfile output
Christian Ebert <blacktrash@gmx.net> [Thu, 31 Jan 2008 01:06:49 +0100] rev 366
(0.9.2compat) use templatefilters module if available; bail out in mq dir
Revert to always using full definition of repo._link.
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 08:04:50 +0100] rev 365
Disable expansion in mq directory; add test for qcommit
There might still be problems with qsave copied patch queues.
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Feb 2008 00:48:37 +0100] rev 364
Adapt to templatefilters module splitoff
Matt Mackall <mpm@selenic.com> [Thu, 31 Jan 2008 14:44:19 -0600] rev 363
templates: move filters to their own module
This eliminates just about all Mercurial dependencies in templater.py
[ original upstream description ]
Jesse Glick <jesse.glick@sun.com> [Tue, 08 Jan 2008 22:40:51 -0500] rev 362
Ensure that absolutized paths from hgrc do not contain ../ segments.
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Feb 2008 08:16:56 +0100] rev 361
stable branch: reflects latest Mercurial upstream state
Christian Ebert <blacktrash@gmx.net> [Thu, 31 Jan 2008 14:34:45 +0100] rev 360
(0.9.2compat) clean import handling when patchfile class available
Change help and test output accordingly.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jan 2008 10:38:10 +0100] rev 359
(0.9.2compat) restructure based on wwread/wwrite methods as in default branch
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jan 2008 01:24:10 +0100] rev 358
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 21:15:57 +0100] rev 357
Add empty_ok argument to commit
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:33:00 +0100] rev 356
Update test using kwcat
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:32:25 +0100] rev 355
Implement kwcat command
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:32:15 +0100] rev 354
Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:32:10 +0100] rev 353
Refactor overriding wread, wwrite, wwritedata repo methods
- restrict consistently to reading/writing in working dir
- no cludgy sys.argv parsing anymore
Eases collaboration with other extensions, or external tools
like TortoiseHg.
Changes in behaviour:
- hg cat does not expand; will be implemented with new kwcat command
- no expansion in web /display/, only in downloaded archives
Thanks to Jesse Glick for inciting this approach.
Christian Ebert <blacktrash@gmx.net> [Fri, 25 Jan 2008 21:42:52 +0000] rev 352
(0.9.2compat) fix external hook as in default branch
Christian Ebert <blacktrash@gmx.net> [Fri, 25 Jan 2008 17:31:55 +0000] rev 351
Return silently when external command triggers error
- make hook accept hg command as string or as function object.
- intercept dispatch.ParseError as well.
Kudos to Steve Borho (TortoiseHg) for testing and debugging.
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 12:33:24 +0100] rev 350
(0.9.2compat) implement external call handle and hook
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 12:31:41 +0100] rev 349
Implement handle and hook for external callers
Allows external callers that do not use the command line to
pass current hg command to keyword extension.
This implementation might change in the future, if wrapping
of patch.diff is possible to the effect of avoiding external
handles.
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 11:38:22 +0100] rev 348
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 11:36:37 +0100] rev 347
Detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 09:53:40 +0100] rev 346
Improve use of dictionaries
- iteritems() where we do iter over dicts' items
- store commithooks in dictionary
(safe, as hook.hook() sorts before execution)
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 10:02:57 +0100] rev 345
bugfix: avoid expansion with qfold
Christian Ebert <blacktrash@gmx.net> [Sun, 20 Jan 2008 14:31:00 +0100] rev 344
Prefer item in dict over dict.has_key(item)
Message-ID: <4792DB2A.7050909@serpentine.com>
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Jan 2008 18:26:17 +0100] rev 343
(0.9.2compat) get mq support, improved diff output from default branch
Reimplement _parse wrapper obtain diff options.
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jan 2008 11:22:16 +0100] rev 342
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jan 2008 11:22:16 +0100] rev 341
Avoid extra diffs when not comparing against working dir
When diffing against specified revisions expanded keywords
only get in the way.
Update test output.
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jan 2008 13:19:23 +0100] rev 340
Implement support for mq; handle (q)record more gracefully
mq:
Ensure that expanded keywords do not make it into patches.
- disable expansion when reading filelog
- shrink expanded keywords when reading from working dir (wread)
(q)record:
Avoid additional hunks due to expanded keywords. However this is
still a compromise, as keyword expansions are not updated in
working directory because record should not overwrite files.
Mention above shortcomings and "hg kwexpand" workaround in help
and update test output.
system argument parsing:
Command detection might be slightly more expensive with
dispatch._parse, but we will need this for improving "hg diff"
output.
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Jan 2008 15:21:57 +0100] rev 339
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Jan 2008 15:12:20 +0100] rev 338
Merge Solaris test compatibility
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 14 Jan 2008 09:00:23 +0100] rev 337
Solaris compatibility fixes for test-keyword:
- do not use /bin/false (yields 255 instead of 1)
- do not use "cd -", simply use "cd .." instead.
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Jan 2008 23:36:56 +0100] rev 336
Test that expansion is done filewise
Checks issue fixed in c5bba07dadd5.
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Jan 2008 14:41:22 +0100] rev 335
Fix some doc strings; update copyright
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 18:17:23 +0100] rev 334
(0.9.2compat) test: avoid "sed -i" in commented rejecttest
Will Maier <willmaier@ml1.net> [Wed, 09 Jan 2008 10:00:18 -0600] rev 333
Don't use the -i option with sed
This patch fixes test-keyword on platforms without GNU sed (like
OpenBSD).
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 12:52:59 +0100] rev 332
(0.9.2compat) Get bugfix from default branch
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 11:07:42 +0100] rev 331
Suppress keyword expansion for log commands
With previous bugfix "hg log -p" expanded keywords.
Turn off again by making log, tip nokwcommands.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 05:13:22 +0100] rev 330
fix: only set general changenode for kwtemplater when committing
kwexpand must always obtain changenode from filectx,
otherwise current changenode is expanded in every file.
Also fixes "hg cat <more than 1 file>".
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Jan 2008 12:02:23 +0100] rev 329
(0.9.2compat) obtain simplifications from default branch
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Jan 2008 11:48:51 +0100] rev 328
Just add unknown kwfiles candidates when untracked option is given
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Jan 2008 11:27:41 +0100] rev 327
Simplify temporary ui.quiet setting in kwdemo
Christian Ebert <blacktrash@gmx.net> [Sat, 05 Jan 2008 16:47:14 +0100] rev 326
(0.9.2compat) test: redirect "cd -" output to /dev/null
Christian Ebert <blacktrash@gmx.net> [Sat, 05 Jan 2008 12:33:21 +0100] rev 325
test: redirect all "cd -" output to /dev/null
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 17:27:37 +0100] rev 324
(0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 17:23:13 +0100] rev 323
test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 17:16:13 +0100] rev 322
(0.9.2compat) get backwards compatible changes from default branch
Clean commit hook handling and avoidance of import rejects
are missing from backwards compatible branch.
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 16:56:26 +0100] rev 321
README: fix help instruction
Spotted by Thomas Arendsen Hein.
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Jan 2008 16:42:17 +0100] rev 320
Compress kwfstats intitialization
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Jan 2008 16:31:49 +0100] rev 319
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jan 2008 19:16:13 +0100] rev 318
Make command line check even more private
Christian Ebert <blacktrash@gmx.net> [Sat, 29 Dec 2007 18:45:47 +0100] rev 317
Turn patch.patchfile.__init__ monkeypatch into a wrapper
While the nastiness is even more blatant, this makes us independent
from changes in patchfile.__init__.
After all we only need to potentially change patchfile.lines.
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Dec 2007 00:42:09 +0100] rev 316
Test potential import conflict
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Dec 2007 00:40:25 +0100] rev 315
Avoid import and merge conflicts caused by expanded keywords
While monkeypatching patch.patchfile.__init__ is brute force and dirty,
it seems the least intrusive method.
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Dec 2007 22:15:43 +0100] rev 314
Do not pass global _kwtemplater around in arguments
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Dec 2007 17:08:43 +0100] rev 313
Remove spurious echo from test
Christian Ebert <blacktrash@gmx.net> [Mon, 17 Dec 2007 16:43:26 +0100] rev 312
(0.9.2compat) use updated fancyopts from 88803a69b24a
Christian Ebert <blacktrash@gmx.net> [Tue, 04 Dec 2007 09:56:12 +0100] rev 311
(0.9.2compat) implement context based changes from default branch
NOTE:
Interrupted commit is broken with versions < 0.9.5!
Leave tests outcommented.
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Dec 2007 08:32:19 +0100] rev 310
Reintroduce _iskwfile with link method as argument
Rename kwtemplater.match to matcher analogous to util.matcher.
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Dec 2007 08:15:36 +0100] rev 309
Make path format output switches more compact
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Dec 2007 08:00:31 +0100] rev 308
Set kwtemplater.path at kwfilelog initialization
Christian Ebert <blacktrash@gmx.net> [Sat, 01 Dec 2007 20:31:13 +0100] rev 307
Refactor to initialize kwtemplater only once during reposetup
- when overwriting kwtemplater was initialized (and the same keyword regex
compiled) before and with every file read.
- therefore remove overwrite from kwtemplater, and make it private method.
_ matcher becomes attribute of kwtemplater.
- by making kwtemplater a global, avoid adding attribute to ui.
Christian Ebert <blacktrash@gmx.net> [Sat, 01 Dec 2007 13:15:13 +0100] rev 306
Rename kwtemplater.t to kwtemplater.ct
Christian Ebert <blacktrash@gmx.net> [Sat, 01 Dec 2007 10:32:40 +0100] rev 305
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net> [Sat, 01 Dec 2007 09:52:00 +0100] rev 304
Do not run commit hooks if there is no node
Eg. when commit is interrupted.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Nov 2007 12:52:54 +0100] rev 303
(0.9.2compat) do not bother about debug templates
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Nov 2007 12:30:50 +0100] rev 302
Do not test debug templates
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Nov 2007 12:29:23 +0100] rev 301
Make match object function private to kwtemplater.substitute
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Nov 2007 12:24:16 +0100] rev 300
Do not bother about debug templates
Speedup of debug flag toggle dubious at best.
{files}, {file_adds} etc. templates do not make sense in file context,
but leave decision to user; that's what kwdemo is for.
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Nov 2007 13:36:41 +0100] rev 299
(0.9.2compat) kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Nov 2007 13:32:33 +0100] rev 298
kwfiles print code similar to commands.status
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Nov 2007 02:06:38 +0100] rev 297
Rearrange commit hook hack
Christian Ebert <blacktrash@gmx.net> [Sun, 11 Nov 2007 11:29:50 +0100] rev 296
Commit hook handling entirely into if-condition
Christian Ebert <blacktrash@gmx.net> [Sat, 10 Nov 2007 14:33:15 +0100] rev 295
(0.9.2compat) update doc strings
Christian Ebert <blacktrash@gmx.net> [Sat, 10 Nov 2007 14:08:12 +0100] rev 294
Add commit hook test
Christian Ebert <blacktrash@gmx.net> [Sat, 10 Nov 2007 14:06:59 +0100] rev 293
Postpone commit hooks until keywords are expanded
If a commit hook acts on a file with keywords, it now does so
on the file with keywords already expanded.
Unhook all hooks with "commit" in name during kwdemo.
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Nov 2007 13:03:24 +0100] rev 292
Avoid dispatch import, revert to simple argument parser
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Nov 2007 12:59:43 +0100] rev 291
(0.9.2compat) avoid dispatch import, revert to simple argument parser
Make nokwcommands a tuple as long as it's private.
No need to import fancyopts, as we use own w/o bug.
Clean overriding of findcmd.
We only need simple argument parsing for command.
No expensive dispatch import, also avoids potential clashes with invasive
RuleDispatch (setuptools).
Christian Ebert <blacktrash@gmx.net> [Wed, 07 Nov 2007 13:40:58 +0100] rev 290
Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net> [Wed, 07 Nov 2007 13:33:19 +0100] rev 289
Branch off backwards compatible version
The default branch will contain the version without
the overhead for backwards compatibility.
This will make a standalone extension available which works
with current Mercurial.
Christian Ebert <blacktrash@gmx.net> [Tue, 06 Nov 2007 13:20:39 +0100] rev 288
Avoid name conflict with dispatch package(s)
Thanks to Marcin Kasperski for spotting and analysing this.
Message-ID: <87wsswvhbk.fsf@cauchy.softax.local> ff.
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Oct 2007 10:55:41 +0100] rev 287
Add convert to nokwcommands (fix issue802)
Is there a more general way to decide on allowed commands?
Unfortunately we don't know what commands are added by extensions.
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Oct 2007 09:43:59 +0200] rev 286
Check if there candidates before _overwrite
Potentially saves calculation of node.
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Oct 2007 00:38:27 +0200] rev 285
Arrange commands and cmdtable in alphabetical order
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Oct 2007 09:10:11 +0200] rev 284
Tell user that kwexpand/kwshrink do not run if given files contain changes
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Oct 2007 08:58:19 +0200] rev 283
Respect Mercurial conventions in kwdemo help
Christian Ebert <blacktrash@gmx.net> [Fri, 19 Oct 2007 19:37:41 +0200] rev 282
Obtaining cwd redundant in pathto wrapper
Christian Ebert <blacktrash@gmx.net> [Fri, 19 Oct 2007 16:28:56 +0200] rev 281
Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net> [Fri, 19 Oct 2007 16:09:56 +0200] rev 280
Revert to using status for kw-commands
cmdutil.bail_if_changed has to call status stat'ing working dir.
This renders the whole walk experiment mute, duh.
On the upside kwexpand/kwshrink can be applied to selected clean files,
while there are local changes in other files.
bail_if_changed compatibility wrapper not needed anymore.
Christian Ebert <blacktrash@gmx.net> [Fri, 19 Oct 2007 12:36:32 +0200] rev 279
Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Oct 2007 09:38:05 +0200] rev 278
cwd optional argument of _pathto to simplify _kwfwrite
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Oct 2007 23:53:59 +0200] rev 277
Use pathto to display nonexisting files
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Oct 2007 17:52:25 +0200] rev 276
kwexpand/kwshrink: warn about nonexisting files
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Oct 2007 17:51:36 +0200] rev 275
_overwrite method for kwrepo.commit, kwexpand, kwshrink
File selection (kwexpand/kwshrink) in _kwfwrite method.
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Oct 2007 17:06:08 +0200] rev 274
Sort files before overwriting
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Oct 2007 17:03:59 +0200] rev 273
_iskwfile checking method for kwrepo.commit, kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Oct 2007 13:22:48 +0200] rev 272
Walk manifest in kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Oct 2007 23:42:50 +0200] rev 271
For overwriting commands use node and manifest to speed up walk
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Oct 2007 07:43:55 +0200] rev 270
kwfiles: change option "ignored" to "ignore", add option "untracked"
"ignore" like corresponding config value.
"untracked" allows quick check if a new file that has not been added yet
would be target for expansion.
Update help accordingly.
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Oct 2007 11:01:00 +0200] rev 269
File collections specific to kwexpand/kwshrink vs kwfiles commands
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Oct 2007 10:25:20 +0200] rev 268
Flag kwfiles if verbose; shorten bailout code
Christian Ebert <blacktrash@gmx.net> [Sat, 13 Oct 2007 22:15:20 +0200] rev 267
Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net> [Sat, 13 Oct 2007 15:25:06 +0200] rev 266
Underscore prefixes only for names at top level, or compatibility wrappers
Christian Ebert <blacktrash@gmx.net> [Sat, 13 Oct 2007 15:01:55 +0200] rev 265
Count keywords in a customized kwfilelog read method
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Oct 2007 13:10:33 +0200] rev 264
walkopts for kwexpand, kwshrink, kwfiles commands
kwfiles optionally shows ignored files or all flagged
Use pathto method to print kw filenames if possible.
Commands abort with meaningful error
_weedcandidates renamed to _weedfiles, and only for commands.
For kwrepo.commit we could get modified + added from
kwrepo.status(match=ui.kwfmatcher) -- but this would mean
to read manifest before commit, and again after for expansion.
Christian Ebert <blacktrash@gmx.net> [Sat, 06 Oct 2007 23:11:40 +0200] rev 263
kwfiles notifies if there are no files configured for expansion
Christian Ebert <blacktrash@gmx.net> [Sat, 06 Oct 2007 19:55:30 +0200] rev 262
Bail out earlier in overwrite commands if repo has changes
Christian Ebert <blacktrash@gmx.net> [Sat, 06 Oct 2007 20:13:18 +0200] rev 261
Make kwfmatcher an ui attribute
Thus kw commands do not weed candidates twice.
Christian Ebert <blacktrash@gmx.net> [Sat, 06 Oct 2007 16:56:14 +0200] rev 260
Unlowercase command help
Christian Ebert <blacktrash@gmx.net> [Sat, 06 Oct 2007 16:19:04 +0200] rev 259
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net> [Sat, 06 Oct 2007 16:07:03 +0200] rev 258
Determine kwfiles on workingctx
Added but not yet committed files should be shown.
Removed but not yet committed files should not be shown.
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Oct 2007 15:53:28 +0200] rev 257
test: use grep instead of grep -F
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Oct 2007 15:49:32 +0200] rev 256
Test if debug flag influences expansion
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Oct 2007 14:52:39 +0200] rev 255
Turn off debug while expanding
We don't need templates like file_add etc. as keywords a file specific.
Turning off debug avoids accidental expansion of such templates.
As a side effect it speeds up expansion when running hg --debug.
Functionality of _ctxnode now in new _substitute function.
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Oct 2007 16:12:48 +0200] rev 254
Map re.escape
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Oct 2007 15:01:16 +0200] rev 253
List comprehension instead of loop to create ui template dictionary
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Oct 2007 14:55:38 +0200] rev 252
String format keyword pattern before compilation
Christian Ebert <blacktrash@gmx.net> [Wed, 03 Oct 2007 08:22:27 +0200] rev 251
Ignore errors when removing temp dir in kwdemo
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Sep 2007 12:22:13 +0100] rev 250
Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Sep 2007 20:22:21 +0100] rev 249
Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Sep 2007 20:16:53 +0100] rev 248
Use revlog.cmp to avoid checking for rename twice
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Sep 2007 21:14:40 +0100] rev 247
Test kwfiles command
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Sep 2007 19:29:11 +0100] rev 246
New command "kwfiles" prints files configured for expansion
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Sep 2007 18:13:53 +0100] rev 245
Always exclude .hgtags only
.hgtags is the only tracked file that is written to just by issuing
an hg command.
This ensures that even a very unlikely tag like "$Id$" is processed
properly.
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Sep 2007 19:26:20 +0100] rev 244
Use Mercurial's getcwd()
Christian Ebert <blacktrash@gmx.net> [Tue, 18 Sep 2007 00:08:23 +0100] rev 243
Set boolean mandatory arguments directly and comment them
Christian Ebert <blacktrash@gmx.net> [Tue, 18 Sep 2007 00:03:17 +0100] rev 242
Avoid calling kwfmatcher twice (kwtemplater.overwrite, kwrepo.file) when overwriting
_weedcandidates already checks if file is configured for
keyword substitution.
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Sep 2007 23:00:26 +0100] rev 241
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Sep 2007 22:34:47 +0100] rev 240
Arguments to kwshrink/expand must be filtered thru canonpath
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Sep 2007 06:11:07 +0200] rev 239
Rename README.txt to README
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Sep 2007 17:04:22 +0200] rev 238
Move version code into setup.py
getversion() is only needed by setup.py,
as there is no interface to query the version of an hg extension.
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Sep 2007 15:46:18 +0200] rev 237
Document revisions of interface changes
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Sep 2007 15:35:18 +0200] rev 236
Catch TypeError in repo.wwrite for Mercurial rev 656e06eebda7
This is the one revision that had the file descriptor removed,
but the flags argument not added yet.
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Sep 2007 15:16:57 +0200] rev 235
Compatible repo.dirstate.normal/update into own function
Also remove if-clause, loop over empty list instead.
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Sep 2007 15:09:56 +0200] rev 234
Compatible repo.wwrite into own function
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Sep 2007 15:01:51 +0200] rev 233
Compatible changeset_templater in own function
Christian Ebert <blacktrash@gmx.net> [Thu, 30 Aug 2007 23:22:18 +0200] rev 232
Improve doc of kwfilelog.read
Christian Ebert <blacktrash@gmx.net> [Sat, 25 Aug 2007 15:38:04 +0200] rev 231
Keep names of inherited commands
Eases interactive documentation lookup.
Except for _parse which moved from cmdutil.parse to dispatch._parse,
there prefer most recent name.
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Aug 2007 14:07:57 +0200] rev 230
Move backwards compatible commit fork into private kwrepo function
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Aug 2007 13:27:48 +0200] rev 229
Remove spurious NameError checking for locks
Overriding commit sets them to None by default already.
Christian Ebert <blacktrash@gmx.net> [Mon, 20 Aug 2007 05:08:39 +0200] rev 228
Clean up backwards compatibility
Overriding findcmd is obsolete.
Override _parse at top.
Prefix overridden functions with underbar.
Christian Ebert <blacktrash@gmx.net> [Thu, 16 Aug 2007 14:19:33 +0200] rev 227
cmdutil.parse moves to dispatch._parse; use fancyopts bugfix
Copy fancyopts from 88803a69b24a as _fancyopts to make argument
parsing reliable.
Christian Ebert <blacktrash@gmx.net> [Tue, 14 Aug 2007 16:26:22 +0200] rev 226
Removed files are detected by _weedcandidates, no need for status call
Christian Ebert <blacktrash@gmx.net> [Tue, 14 Aug 2007 09:01:20 +0200] rev 225
Document revision that fixed fancyopts
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Aug 2007 14:43:04 +0200] rev 224
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net> [Thu, 09 Aug 2007 15:54:27 +0200] rev 223
Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net> [Thu, 09 Aug 2007 14:20:03 +0200] rev 222
Shorten template setup
Christian Ebert <blacktrash@gmx.net> [Thu, 09 Aug 2007 09:49:38 +0200] rev 221
ui inheritance does not need to be fiddled with anymore
Backwards compatibility tests work with at least 0.9.2
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jul 2007 13:42:02 +0100] rev 220
Include MANIFEST.in in dist; hgignore MANIFEST
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jul 2007 13:35:02 +0100] rev 219
setup: add url, reformat
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jul 2007 08:22:01 +0100] rev 218
test: use grep -v instead of sed to delete lines
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Jul 2007 10:34:48 +0200] rev 217
try for dirstate.update instead of hasattr
Christian Ebert <blacktrash@gmx.net> [Thu, 26 Jul 2007 18:24:35 +0200] rev 216
Stricter regex; regroup kwtemplater init code
Christian Ebert <blacktrash@gmx.net> [Tue, 24 Jul 2007 15:13:16 +0200] rev 215
Test remove
Christian Ebert <blacktrash@gmx.net> [Tue, 24 Jul 2007 15:08:29 +0200] rev 214
Add forgotten status for touch copy test
Christian Ebert <blacktrash@gmx.net> [Tue, 24 Jul 2007 15:04:33 +0200] rev 213
Weed out removed and links using manifest
Weeding of expansion candidates in helper function.
No status call in commit.
All commit stuff is done after super commit.
Minus 2 backwards compatibility switches.
Get rid of os import.
Christian Ebert <blacktrash@gmx.net> [Tue, 24 Jul 2007 14:53:39 +0200] rev 212
hgignore build directory
Christian Ebert <blacktrash@gmx.net> [Mon, 23 Jul 2007 21:17:16 +0200] rev 211
help: no need for kwexpand after import, but after config change
Update test output.
Christian Ebert <blacktrash@gmx.net> [Mon, 23 Jul 2007 10:36:00 +0200] rev 210
kwdemo fixes and tweaks
Write map arguments in repo hgrc, to simulate parsing
and parsing errors.
Add branch display; change demo verbosity for branch command.
Display current [keyword] files additionally to demo.txt, as they
might influence the result.
Formatting: status indented by tab.
Christian Ebert <blacktrash@gmx.net> [Sun, 22 Jul 2007 14:56:13 +0200] rev 209
Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net> [Sat, 21 Jul 2007 21:44:33 +0200] rev 208
Show extension in kwdemo; flag helpers; rephrase doc
Update test and test output.
Christian Ebert <blacktrash@gmx.net> [Sat, 21 Jul 2007 09:41:13 +0200] rev 207
Make more args mandatory; flag keywordmatcher as helper
Christian Ebert <blacktrash@gmx.net> [Fri, 20 Jul 2007 15:20:16 +0200] rev 206
Treat wlock the recommended way
<http://www.selenic.com/mercurial/wiki/index.cgi/Dealing_With_Destructors>
Christian Ebert <blacktrash@gmx.net> [Fri, 20 Jul 2007 14:07:17 +0200] rev 205
kwdemo: clear up repo, ui inheritance; show commit log in debug output
Do not translate "hg ... ci ...".
Christian Ebert <blacktrash@gmx.net> [Fri, 20 Jul 2007 09:44:38 +0200] rev 204
Add grep, init to nokwcommands; make variables, getcmd local
Remove checking of ParseError - was done before, and might be in cmdutil.
nokwcommands as list, can be appended to.
Christian Ebert <blacktrash@gmx.net> [Thu, 19 Jul 2007 16:16:09 +0200] rev 203
Clean up logic and messages for overwrite
Obtain both findcmd, bail_if_changed via try error block.
Change test output accordingly.
Christian Ebert <blacktrash@gmx.net> [Thu, 19 Jul 2007 04:07:20 +0200] rev 202
Make test more adaptive to different Hg versions
Christian Ebert <blacktrash@gmx.net> [Thu, 19 Jul 2007 03:43:20 +0200] rev 201
Make sure there are no newlines in expansion
Note confinement to one line in help.
Adapt test output.
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:50:47 +0200] rev 200
Removed tag archive
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:50:41 +0200] rev 199
Removed tag nohook
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:50:34 +0200] rev 198
Removed tag hgkw_standalone_setup
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:50:23 +0200] rev 197
Removed tag very_cvs
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:50:17 +0200] rev 196
Removed tag r0.1
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:49:59 +0200] rev 195
Removed tag cvs_scheme
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:49:51 +0200] rev 194
Removed tag universal_scheme
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:45:50 +0200] rev 193
Discard kwmap-templates branch; keep only early forked off default
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:33:24 +0200] rev 192
Discard self_initializing_hook branch
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:28:36 +0200] rev 191
Add MANIFEST.in
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 22:24:56 +0200] rev 190
Add README
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 21:29:32 +0200] rev 189
Add backwards compatible test-suite
Without symlink testing, as older Hg versions don't handle them.
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 21:24:04 +0200] rev 188
Catch an AttributeError in wwrite triggered by older Hg versions
Thanks to Norman Walsh for reporting.
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 16:17:04 +0200] rev 187
kwdemo accepts maps as arguments, reads from optional rcfile
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Jul 2007 16:12:14 +0200] rev 186
Avoid global vars by passing opt args to kwrepo.file
"Normal" reading of filelog just expands keywords in given data.
Reading filelog for overwrite on commit, kwshrink, kwexpand triggers
kwtemplater.process, which returns read data (expanding in case of
commit, kwexpand; not expanding for kwshrink) and a count of keywords.
If kwcnt is positive file will be overwritten.
Christian Ebert <blacktrash@gmx.net> [Tue, 17 Jul 2007 14:15:47 +0200] rev 185
Implement kwshrink/kwexpand commands to deal with config, import issues
Christian Ebert <blacktrash@gmx.net> [Tue, 17 Jul 2007 09:45:36 +0200] rev 184
Set ui to repo.ui at once where needed for backwards compatibility
Christian Ebert <blacktrash@gmx.net> [Tue, 17 Jul 2007 09:24:27 +0200] rev 183
Use ui.note to get verbosity switch; tweak kwdemo help
Christian Ebert <blacktrash@gmx.net> [Tue, 17 Jul 2007 09:17:03 +0200] rev 182
Obtain filename matcher from function keywordmatcher
Future implementation of commands kwexpand/kwshrink will also need this.
Christian Ebert <blacktrash@gmx.net> [Sun, 15 Jul 2007 17:34:34 +0200] rev 181
kwdemo is demo internally; rearrange code
Christian Ebert <blacktrash@gmx.net> [Sun, 15 Jul 2007 17:28:17 +0200] rev 180
Typo in kwdemo output
Christian Ebert <blacktrash@gmx.net> [Sun, 15 Jul 2007 10:45:39 +0200] rev 179
Fix ui inheritance for kwdemo
kwdemo config changes had no effect if keyword.py was not in hgext.
For backwards compatibility we use repo.ui in reposetup,
so inside kwdemo the temporary _repo.ui has to obtain the paramters.
Christian Ebert <blacktrash@gmx.net> [Sun, 15 Jul 2007 01:19:20 +0200] rev 178
Add kwdemo command as online config help
Shorten "hg help keyword" output accordingly.
Mention utc date template filter in extension help.
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Jul 2007 20:28:45 +0200] rev 177
wwread and wwrite methods for expansion in working dir
Christian Ebert <blacktrash@gmx.net> [Fri, 13 Jul 2007 12:57:59 +0200] rev 176
Cosmetic changes for overwrite condition, single quotes
Christian Ebert <blacktrash@gmx.net> [Fri, 13 Jul 2007 12:56:09 +0200] rev 175
Change ui inheritance to stay compatible with recent Hg
Needed for rollback on interrupted commit.
Christian Ebert <blacktrash@gmx.net> [Fri, 13 Jul 2007 08:43:39 +0200] rev 174
Handle rename and copy properly
Touching a renamed or copied file made it seem modified.
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Jun 2007 16:21:48 +0200] rev 173
filectx does not need filelog; more nokwcommands
Improve docs.
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Jun 2007 01:18:49 +0200] rev 172
Revert to kwrepo methods (self) inside class kwrepo
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Jun 2007 10:15:04 +0200] rev 171
Pass filelog, not kwfilelog, to kwtemplater.expand/context.filectx
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Jun 2007 10:10:46 +0200] rev 170
More nokwcommands: add, remove, addremove
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Jun 2007 10:09:13 +0200] rev 169
Remove unused path attribute from kwfilelog
Christian Ebert <blacktrash@gmx.net> [Wed, 27 Jun 2007 13:50:06 +0200] rev 168
Reduce use of kwrepo methods
Use repo and ui arguments from reposetup where possible.
kwfmatcher doesn't need to be an attribute to repo.
Christian Ebert <blacktrash@gmx.net> [Wed, 27 Jun 2007 13:33:57 +0200] rev 167
reverse logic for detection of excluding commands
Exclude all "outgoing" commands.
rollback does not change working dir.
incoming -p does not expand anyway.
Revert ui -> repo.ui for backwards compatibiliy in reposetup.
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Jun 2007 13:22:11 +0200] rev 166
Obey Mercurial line continuation convention
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Jun 2007 13:16:38 +0200] rev 165
Remove obsolete archive mode from __doc__
Christian Ebert <blacktrash@gmx.net> [Mon, 18 Jun 2007 17:49:27 +0200] rev 164
Confine activation to specific commands; drop broken archive configuration
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Jun 2007 08:56:26 +0200] rev 163
Move findcmd switch to imports
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Jun 2007 18:45:26 +0200] rev 162
findcmd might be in cmdutil or commands, depending on hg version
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Jun 2007 16:05:44 +0200] rev 161
No need for archivemode as variable
Christian Ebert <blacktrash@gmx.net> [Fri, 20 Apr 2007 14:41:35 +0200] rev 160
Make path, node kwtemplater attribs
Avoid lambda in keyword substitution.
Christian Ebert <blacktrash@gmx.net> [Fri, 20 Apr 2007 00:24:32 +0200] rev 159
Simplify backward compatible import
For an extension it's not worth the trouble to try for demandload.
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Mar 2007 17:12:38 +0200] rev 158
kwfmatcher first check for commit
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Mar 2007 09:08:48 +0200] rev 157
Incorporate changes in self_initializing_hook branch
Implement configurable expansion based on Mercurial templates.
NOTE:
Relying on pretxncommit-hook to write in working directory
might break in the future as it relies on a buggy race condidition.
[issue273]
Christian Ebert <blacktrash@gmx.net> [Sat, 24 Mar 2007 15:57:07 +0100] rev 156
Omit keyword argument for filelog __init__
Make keyword compatible with future changes in Mercurial.
Should be safe and backwards compatible as well.
Christian Ebert <blacktrash@gmx.net> [Thu, 22 Mar 2007 12:36:51 +0100] rev 155
Work around missing link support in older Hg versions
Christian Ebert <blacktrash@gmx.net> [Wed, 07 Mar 2007 23:53:50 +0100] rev 154
Remove tests as they do not work in standalone module
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 07 Mar 2007 23:39:55 +0100] rev 153
Make keyword extension compatible with python2.3
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Mar 2007 10:22:16 +0100] rev 152
keyword: remove a comment line in help
Christian Ebert <blacktrash@gmx.net> [Sat, 24 Feb 2007 11:56:08 +0100] rev 151
Extend test for archive mode
Christian Ebert <blacktrash@gmx.net> [Sat, 24 Feb 2007 11:19:34 +0100] rev 150
Added tag archive for changeset 0c8b7e5c25a6
Christian Ebert <blacktrash@gmx.net> [Sat, 24 Feb 2007 11:10:31 +0100] rev 149
Implement archive mode by configuration
Note:
For some reason
commands.parse(ui, sys.argv[1:])
breaks "hg diff -r".
Christian Ebert <blacktrash@gmx.net> [Wed, 21 Feb 2007 02:27:15 +0100] rev 148
Extend test for symlink
Christian Ebert <blacktrash@gmx.net> [Sun, 18 Feb 2007 20:10:37 +0100] rev 147
Try making help more concise, include warning about "hg import"
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Feb 2007 17:31:45 +0100] rev 146
Move config examples into help
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Feb 2007 09:25:05 +0100] rev 145
Wrap entire commit in wlock
Message-ID: <20070213102701.GC30656@cecm.usp.br>
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Feb 2007 03:03:16 +0100] rev 144
Move kwfilelog out of reposetup; only use kwfilelog if file matches
Again: Message-ID: <20070213102701.GC30656@cecm.usp.br>
This foremost obsoletes ugly attribute checks for kwfmatcher.
We check whether we need kwfilelog in kwrepo's file().
That way kwtemplater is always an attribute of kwfilelog.
Repo references are gone from kwfilelog.
reposetup doc more verbose.
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Feb 2007 02:50:06 +0100] rev 143
Add wlock during overwrite
Message-ID: <20070213102701.GC30656@cecm.usp.br>
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Feb 2007 02:44:25 +0100] rev 142
commit: weed out removed w/o recurring to os.path, weed out symlinks
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Feb 2007 18:03:12 +0100] rev 141
Remove extra if-condition for kwtemplater setup in kwfilelog
This was over done in last cset, as repo is None by default kwarg,
and None may be tested for attribs.
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Feb 2007 00:40:49 +0100] rev 140
FIX: make repo keyword arg to kwfilelog
hg incoming breaks otherwise as only 3 arguments are passed to init.
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Feb 2007 00:38:47 +0100] rev 139
Move context into kwtemplater.expand
Update kwtemplater doc string.
Christian Ebert <blacktrash@gmx.net> [Sun, 11 Feb 2007 19:51:22 +0100] rev 138
Overwrite files inside kwtemplater method
Christian Ebert <blacktrash@gmx.net> [Fri, 09 Feb 2007 18:43:15 +0100] rev 137
Check repo attrib kwfmatcher in kwfilelog init
Christian Ebert <blacktrash@gmx.net> [Fri, 09 Feb 2007 16:16:22 +0100] rev 136
Parse templates at kwtemplater init for less overhead in matchfunction
Christian Ebert <blacktrash@gmx.net> [Fri, 09 Feb 2007 16:13:51 +0100] rev 135
Standalone compatibility fixes: demandload, changeset_templater
If demandload is present, use it, and import gettext.
changeset_templater may have extra arg for branches.
Christian Ebert <blacktrash@gmx.net> [Fri, 09 Feb 2007 14:43:01 +0100] rev 134
2 expand methods including binary check in kwtemplater
Christian Ebert <blacktrash@gmx.net> [Fri, 09 Feb 2007 13:47:11 +0100] rev 133
Keyword substitution removal into kwtemplater
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Feb 2007 15:20:34 +0100] rev 132
Merge in dangling head of first commit wrapper attempt
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Feb 2007 15:13:28 +0100] rev 131
Check dirstate after commits in test
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Feb 2007 14:40:30 +0100] rev 130
Added tag nohook for changeset 15e8cd7f5295
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Feb 2007 14:40:20 +0100] rev 129
Wrap commit instead of calling pretxncommit hook
a) probably faster
b) relying on pretxncommit hook is problematic [issue273]
This version "openly" updates dirstate after overwriting files
after commit.
Changed test output accordingly.
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Feb 2007 14:28:00 +0100] rev 128
Remove spurious spaces at EOL
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Feb 2007 07:21:32 +0100] rev 127
Discard 0.9.3-compat branch
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Feb 2007 06:52:40 +0100] rev 126
"or" for "if" in getmodulename; shorter comment on backwards compatibiliy
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Feb 2007 06:45:12 +0100] rev 125
Added tag hgkw_standalone_setup for changeset 99dc49c5bcfb
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Feb 2007 06:43:15 +0100] rev 124
Setup standalone module install, version tracking
Christian Ebert <blacktrash@gmx.net> [Wed, 07 Feb 2007 15:50:57 +0100] rev 123
Make all ui config and kwfmatcher a local repo attribute
See Mercurial changeset: 5d9ede002453
Christian Ebert <blacktrash@gmx.net> [Fri, 26 Jan 2007 12:10:53 +0000] rev 122
No reposetup when no filenames are specified for expansion
Second stab at stopping reposetup.
This time kwtemplater is still initialized in
kwfilelog and pretxnkw, and not in reposetup.
Watchout:
Giving ui an extra-attribute in reposetup might still be problematic.
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Jan 2007 15:26:33 +0000] rev 121
Add test
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Jan 2007 15:13:51 +0000] rev 120
Add licence (again)
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Jan 2007 15:13:02 +0000] rev 119
Put .hg* files in exclusion list at declaration
Christian Ebert <blacktrash@gmx.net> [Sun, 21 Jan 2007 05:04:17 +0100] rev 118
Prepare test: split doc into help and comment
Minor cleanups in function docs
Christian Ebert <blacktrash@gmx.net> [Sat, 20 Jan 2007 22:18:57 +0100] rev 117
Be silent if no filenames are configured for expansion
The debug message would only be visible on commit anyway.
Christian Ebert <blacktrash@gmx.net> [Sat, 20 Jan 2007 01:55:22 +0100] rev 116
Kill buggy branch
Christian Ebert <blacktrash@gmx.net> [Sat, 20 Jan 2007 01:52:17 +0100] rev 115
FIX: no appending of attributes to repo, back to b2cc6a8d4a18
The idea was to good/unclean to be true.
Raised unknown exception on commit when exiting $EDITOR with return 1.
Integrate "innocent" changes since then though.
Christian Ebert <blacktrash@gmx.net> [Sat, 20 Jan 2007 00:55:31 +0100] rev 114
Describe substitution mechanism in doc
Christian Ebert <blacktrash@gmx.net> [Sat, 20 Jan 2007 00:54:03 +0100] rev 113
Debug info, not warning, when no files configured for expansion
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jan 2007 03:36:40 +0100] rev 112
Cycle filename patterns only once
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jan 2007 02:17:10 +0100] rev 111
Get modulename via function; set kwrepo attribs via direct reference
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jan 2007 01:50:18 +0100] rev 110
Move all that can be done only once per repo into reposetup
Actually kwrepo is not set up if there aren't any files configured
for keyword substitution.
Stuff that now is done at reposetup and not at every filelog init or hook:
1) filename matching function
2) compilation of keyword regex
3) templates and changeset templater
kwtemplater as an appended class should prevent namespace conflicts.
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jan 2007 00:06:11 +0100] rev 109
Extend templater.common_filters in kwtemplater
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Jan 2007 23:55:54 +0100] rev 108
Document reposetup; recommend loading on per-repo basis
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Jan 2007 19:17:54 +0100] rev 107
Implement configurable exclusion of files from expansion
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Jan 2007 15:45:57 +0100] rev 106
Only initialize kwtemplater in kwfilelog if needed
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Jan 2007 12:09:37 +0100] rev 105
Use full power of util.matcher for kwfmatches()
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Jan 2007 05:02:38 +0100] rev 104
Simply dict() keywordmaps configitems
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Jan 2007 03:14:40 +0100] rev 103
Emergency brake against multiline expansion
As expansion always happens ad hoc, is not tracked, multiline or incremental
expansion do not seem worth the trouble.
If at all, it would make sense with static, hardcoded keywords.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Jan 2007 01:04:46 +0100] rev 102
More doc, link to KeywordPlan
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Jan 2007 20:18:43 +0100] rev 101
No need to read changelog in show(); node mandatory arg for expand()
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Jan 2007 19:41:18 +0100] rev 100
Just re-bin the node kwarg of the hook, instead of using changelog
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Jan 2007 15:41:59 +0100] rev 99
Same as for hardcoded branch: omit hooktype test, return w/o explicit value
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Jan 2007 15:38:36 +0100] rev 98
Omit hook test; return w/o explicit value (==False)
Christian Ebert <blacktrash@gmx.net> [Sun, 14 Jan 2007 18:38:30 +0100] rev 97
No clumsy setting of node in kwfilelog.add, pass as kwarg
Christian Ebert <blacktrash@gmx.net> [Sun, 14 Jan 2007 14:00:45 +0100] rev 96
Expansion entirely in kwfilectx.expand()
Christian Ebert <blacktrash@gmx.net> [Sun, 14 Jan 2007 12:56:52 +0100] rev 95
Implement custom keyword map templates in hgrc
More expensive than hardcoded keywords.
But, of course, more flexible.
ATM templates can only be set in hgrc, and perhaps this is enough.
Christian Ebert <blacktrash@gmx.net> [Sun, 14 Jan 2007 12:39:23 +0100] rev 94
Indentation cosmetics
Christian Ebert <blacktrash@gmx.net> [Sat, 13 Jan 2007 13:27:13 +0100] rev 93
Clean keyword arg assignment in kwfilelog.add; rename utc() to utcdate()
Christian Ebert <blacktrash@gmx.net> [Fri, 12 Jan 2007 13:58:59 +0100] rev 92
Init context.filectx only once per file with class kwfilectx
This way context.filectx is not initialized for every keyword match.
Christian Ebert <blacktrash@gmx.net> [Fri, 12 Jan 2007 01:45:22 +0100] rev 91
Added tag very_cvs for changeset 2e930f842242
Christian Ebert <blacktrash@gmx.net> [Fri, 12 Jan 2007 01:41:33 +0100] rev 90
Very CVS-like format
Christian Ebert <blacktrash@gmx.net> [Fri, 12 Jan 2007 01:20:51 +0100] rev 89
Functions instead of variables in kwexpand()
Should be slightly faster as filectx is asked only on demand.
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Jan 2007 10:37:50 +0100] rev 88
Module detection cleaner and more reliable
Stolen from mercurial.lsprof
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Jan 2007 02:22:56 +0100] rev 87
Only extend sys.path if needed
Christian Ebert <blacktrash@gmx.net> [Wed, 10 Jan 2007 18:52:09 +0100] rev 86
Discard head of modular branch
Christian Ebert <blacktrash@gmx.net> [Wed, 10 Jan 2007 18:49:29 +0100] rev 85
Discard head of decodefilter branch
Christian Ebert <blacktrash@gmx.net> [Wed, 10 Jan 2007 16:27:46 +0100] rev 84
Make pretxncommit hook work even if extension not in hgext folder
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jan 2007 16:17:30 +0100] rev 83
Cosmetics: var name kwfmatchers, remove some line continuations
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 18:32:46 +0100] rev 82
Add keyword; comment backwards compatible import
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 18:27:18 +0100] rev 81
Implement self initializing pretxncommit hook
This is more expensive than overriding commit(), but
a) uses more "official" interface
b) less code
c) easier to maintain
Get all changes up to cee5fef33cf8 in here as well.
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 17:03:08 +0100] rev 80
Fix timezone expando in doc
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 13:07:52 +0100] rev 79
Make changes from last cset 474b415433a1 available to 0.9.3
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 12:54:31 +0100] rev 78
Unexpanded storage hopefully covered now by adding kwfilelog.add (again!)
All filelog methods that act on text/data should be consistent.
Principle: read expanded kw's; unexpanded kw's for "internal" workings.
kwfilelog.iskwcandidate() to check whether keyword action required.
More doc.
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 05:47:52 +0100] rev 77
Check against keyword config in kwfilelog.cmp; be silent in kwfilelog (0.9.3)
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 05:40:34 +0100] rev 76
Check against keyword config in kwfilelog.cmp too; be silent in kwfilelog
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 03:08:24 +0100] rev 75
Keyword myself 0.9.3
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 03:05:22 +0100] rev 74
Keyword myself
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 02:51:38 +0100] rev 73
Branch for compatibility with hg-0.9.3 release
See Message-ID: <91340540@bs1.sp34.ru>.
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Jan 2007 02:13:04 +0100] rev 72
Fix indent in entire kwrepo.commit function
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jan 2007 21:51:57 +0100] rev 71
No keyword substitution in cmp(); no overriding of size() ATM
This hopefully solves the merge/no conflict issue brought up by
Boris Samorodov in Message-ID: <12807831@srv.sem.ipt.ru>.
Christian Ebert <blacktrash@gmx.net> [Sat, 06 Jan 2007 14:35:24 +0100] rev 70
Added tag pure_extension for changeset 4c5d9635b517
Christian Ebert <blacktrash@gmx.net> [Sat, 06 Jan 2007 14:34:49 +0100] rev 69
Pure extension by inserting keyword expansion localrepo.localrepository.commit
Replaced self.ui with ui in commit().
This works, or seems to work, but can it be done without a complete
copy of commit()?
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Jan 2007 14:51:58 +0100] rev 68
Remove copyright for the moment
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Jan 2007 14:51:10 +0100] rev 67
Remove kwfilelog.add() -- seems to work with current kw_re
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Jan 2007 14:18:15 +0100] rev 66
Make kwfilelog.add respect filename config
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Jan 2007 13:13:54 +0100] rev 65
Unify obtaining filename matchers; only debug messages
Christian Ebert <blacktrash@gmx.net> [Wed, 03 Jan 2007 14:14:19 +0100] rev 64
Imports specific to functions
Christian Ebert <blacktrash@gmx.net> [Sat, 30 Dec 2006 23:21:09 +0100] rev 63
Omit 1 implicit if-clause
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 17:51:54 +0100] rev 62
Added tag r0.1 for changeset 1fe48bf82d05
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 17:23:55 +0100] rev 61
Remove more internal comments
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 16:58:19 +0100] rev 60
List supported keywords in doc
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 16:34:01 +0100] rev 59
Only 1 all-purpose regex, compiled at load
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 15:36:50 +0100] rev 58
lambda m: instead of kwexpander(matchobj)
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 15:23:58 +0100] rev 57
Extract all information in kwexpand()
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 14:14:23 +0100] rev 56
Move context.filectx into if-clause where it's actually needed
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 14:06:10 +0100] rev 55
Use localrepository method to obtain full path
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 13:57:57 +0100] rev 54
Cleanup comments; refer to hybridity of script in doc
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 13:02:29 +0100] rev 53
Change location of date format comment
Christian Ebert <blacktrash@gmx.net> [Fri, 29 Dec 2006 12:58:06 +0100] rev 52
Make inheritance clearer in size() and add()
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Dec 2006 18:41:54 +0100] rev 51
Reintroduce simpler kwfilelog.add(); simplify kwfilelog.read()
Without add() strange things happen to changectx().
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Dec 2006 18:14:59 +0100] rev 50
Use self._path directly instead of assigning f to context.path()
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Dec 2006 15:06:19 +0100] rev 49
Override filelog's size(), cmp() as well; remove add()
Try whether we /really/ don't need add().
size() and cmp() are needed to avoid eg:
$ hg st
$ touch file
$ hg st
M file
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Dec 2006 19:52:25 +0100] rev 48
add header and start documentation
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Dec 2006 16:58:28 +0100] rev 47
Branch standalone extension, including pretxncommit hook function
Slower, but easier to integrate.
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Dec 2006 16:00:45 +0100] rev 46
Make keyword.py depend on resurrected kwutil.py
This makes pretxnkw perhaps a bit slower, but is more readable.
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Dec 2006 11:02:21 +0100] rev 45
Exclude import command too
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Dec 2006 00:48:56 +0100] rev 44
Exclude tag cmd from pretxcommit hook; exclude .hg files
Return unchanged data in superclass read() after every if clause.
Perhaps a bit more readable.
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Dec 2006 17:41:46 +0100] rev 43
Added tag cvs_scheme for changeset ba000e29ecf3
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Dec 2006 17:41:19 +0100] rev 42
Implement near CVS compability with more than one keyword
Keywords are set as local vars in kwexpand() and then eval'd.
TODO: (sticky) tag?
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Dec 2006 14:54:38 +0100] rev 41
Make patterns stricter again, to avoid unvolontary expansions
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Dec 2006 10:37:06 +0100] rev 40
Rename "text" to "data" always as set before call to util.binary()
Christian Ebert <blacktrash@gmx.net> [Tue, 19 Dec 2006 17:22:26 +0100] rev 39
Reflect new scheme in function docstring
Christian Ebert <blacktrash@gmx.net> [Tue, 19 Dec 2006 16:02:27 +0100] rev 38
Remove all hgkwencode, kwexpander.py and updatekw.py
This scheme should work just with:
extension keyword.py
pretxncommit-hook pretxnkw.pretxnkw
Christian Ebert <blacktrash@gmx.net> [Tue, 19 Dec 2006 15:57:03 +0100] rev 37
Standalone version for keyword.py
Check "expand" patterns in the [keyword] config section.
Removed keyword in file itself to simplify patterns.
Revert (again) to basename.
Christian Ebert <blacktrash@gmx.net> [Tue, 19 Dec 2006 15:41:45 +0100] rev 36
Change config opt "expand" to accept filename patterns
Not nice yet; but passes tests together with pretxnkw.
TODO:
Find out what filelog.add() does exactly.
Christian Ebert <blacktrash@gmx.net> [Tue, 19 Dec 2006 10:00:28 +0100] rev 35
Interim test version in connection with keyword.py
Simplify grep pattern.
Outcomment filename lookup, will be changed to configitems('keywords').
Update stuff will be removed.
And the whole thing will go into pretxncommit.
kwupdate.py will be removed.
Christian Ebert <blacktrash@gmx.net> [Tue, 19 Dec 2006 09:56:41 +0100] rev 34
Make keyword do my hgkeyword; use basename again
add() needs only str.replace().
TODO:
Make even more compatible with cvs' $Id$? (date UTC, slashes)
Check config before reading.
And!:
Use config file patterns, in cooperation with pretxnkw.
This will expand keywords alread on commit!
Christian Ebert <blacktrash@gmx.net> [Tue, 19 Dec 2006 09:39:03 +0100] rev 33
Add original keyword extension by Thomas Arendsen Hain
Christian Ebert <blacktrash@gmx.net> [Mon, 18 Dec 2006 12:10:05 +0100] rev 32
Update function descriptions
Christian Ebert <blacktrash@gmx.net> [Mon, 18 Dec 2006 12:01:26 +0100] rev 31
Add TODO for walk back through file history on update
Christian Ebert <blacktrash@gmx.net> [Mon, 18 Dec 2006 01:42:06 +0100] rev 30
Test for binary
Christian Ebert <blacktrash@gmx.net> [Sun, 17 Dec 2006 15:32:34 +0100] rev 29
Clean up variable names; do not explicitly return False
Christian Ebert <blacktrash@gmx.net> [Sun, 17 Dec 2006 14:48:08 +0100] rev 28
Do not explicitly exit False; rename node1/2 to r1/2, p1/2 to n1/2
Christian Ebert <blacktrash@gmx.net> [Sun, 17 Dec 2006 14:09:06 +0100] rev 27
Do not explicitly return False at end
Christian Ebert <blacktrash@gmx.net> [Sun, 17 Dec 2006 13:38:28 +0100] rev 26
Reparse cmdline to avoid expansion in uncommitted files
Christian Ebert <blacktrash@gmx.net> [Sun, 17 Dec 2006 10:57:55 +0100] rev 25
Make wwritekw() and all vars local
Christian Ebert <blacktrash@gmx.net> [Sun, 17 Dec 2006 10:52:47 +0100] rev 24
Throw out demandimport -- at least temporarily
Christian Ebert <blacktrash@gmx.net> [Sun, 17 Dec 2006 10:16:16 +0100] rev 23
Double check encode filtered filenames
Christian Ebert <blacktrash@gmx.net> [Sat, 16 Dec 2006 15:55:11 +0100] rev 22
Added tag universal_scheme for changeset 536c1797202d
Christian Ebert <blacktrash@gmx.net> [Sat, 16 Dec 2006 15:53:45 +0100] rev 21
Implement $Hg$ scheme with update hook
The pivotal line for update hook is:
repo.dirstate.update(kwupdates, 'n')
This forces hg to consider the freshly written files as not modified.
Thanks to wfile(), this keeps executable bits etc.
Still needs more testing.
No need to check for basename/filename in keyword trigger.
update hook does not need re.
TODO:
Walk back in history, if last change of file didn't happen in 1
of the provided changesets (update/merge?)?
Christian Ebert <blacktrash@gmx.net> [Sat, 16 Dec 2006 15:42:27 +0100] rev 20
Simplify for $Hg$ expansion scheme
Christian Ebert <blacktrash@gmx.net> [Sat, 16 Dec 2006 15:38:25 +0100] rev 19
Use the "parent1|2" kwargs to detect file state
Can parent2 be of further use? Like in parsing back history?
Adapt keyword trigger to $Hg$ scheme.
Christian Ebert <blacktrash@gmx.net> [Sat, 16 Dec 2006 15:28:42 +0100] rev 18
Simplify filter pattern for $Hg$ scheme
Adapt keyword trigger as well.
Christian Ebert <blacktrash@gmx.net> [Sat, 16 Dec 2006 15:22:56 +0100] rev 17
Start universal $Hg$ keyword expansion
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Dec 2006 01:21:56 +0100] rev 16
Rename parent1 to p
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Dec 2006 01:14:58 +0100] rev 15
Rename lr variable to repo
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 16:28:38 +0100] rev 14
Adapt to filename instead of basename style
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 16:27:30 +0100] rev 13
Short "f" for "filename" iteration variable
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 16:25:12 +0100] rev 12
Added tag filename for changeset 56a61a5c696d
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 16:24:30 +0100] rev 11
Switch to complete filename in first keyword field
This will hopefully allow to iterate over the stream in hgkwdecode,
and lookup the relatively latest revision of corresponding file.
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 13:52:53 +0100] rev 10
Use localrepository's wjoin() to obtain absolute path
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 12:58:46 +0100] rev 9
Use wfile instead of wopener; read and write string not binary
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 12:55:52 +0100] rev 8
FIX: range of status selection; copyfile using absolute path
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 10:33:35 +0100] rev 7
Add pretxnkw module for updatehook branch
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 10:18:41 +0100] rev 6
Add pretxnkw module for commits
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 08:57:40 +0100] rev 5
updatehook branch: add kwexpander and updatekw modules
WARNING: Do not use this branch for production!
Update hook changes to working directory are detected by hg.
The only /hook/ to escape hg's attention seems to be pretxcommit.
And that probably only due to bug.
Kept branch for archiving purposes.
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 08:35:24 +0100] rev 4
decodefilter branch: add decode filter with kwutil module
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Dec 2006 08:17:01 +0100] rev 3
Make pattern compilation local to function
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Dec 2006 23:35:45 +0100] rev 2
Shorten variable and function names
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Dec 2006 22:26:05 +0100] rev 1
Add simple [encode] filter in python
The aim is to go for $Hg$ without basename.
Perhaps this is feasable with update hooks &Co.
No way to detect a filename while stream writing.
Even though hg /knows/ the filenames, but does not provide
an API or hook, unfortunately.
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Dec 2006 22:11:08 +0100] rev 0
Startup hgkeyword package with .hgignore, __init__.py