2010-06-09 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jun 2010 22:50:30 +0100] rev 766
(stable) merge
2010-05-31 Force dirstate normal when all changes in a file are recorded
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.
2010-06-09 Pass context to kwtemplater.overwrite
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.
2010-06-01 Retrieve added and modified files from commitctx
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jun 2010 03:45:10 +0200] rev 763
Retrieve added and modified files from commitctx
2010-06-08 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 08 Jun 2010 09:55:08 +0100] rev 762
Merge with stable
2010-06-07 move working dir/dirstate methods from localrepo to workingctx 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 ]
2010-06-06 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 06 Jun 2010 20:19:24 +0100] rev 760
(stable) merge
2010-06-03 Use context to detect uncommitted merge
Christian Ebert <blacktrash@gmx.net> [Thu, 03 Jun 2010 10:37:31 +0100] rev 759
Use context to detect uncommitted merge
2010-05-22 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sat, 22 May 2010 14:10:49 +0200] rev 758
(stable) merge
2010-05-21 Offer svn-like default keywordmaps
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).
2010-05-21 Add 2 svn-like date filters
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
2010-05-18 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 18 May 2010 22:22:59 +0200] rev 755
Merge with stable
2010-05-18 Use our custom hg reStructuredText role some more 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 ]
2010-05-14 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 17:15:38 +0200] rev 753
Merge with stable
2010-05-14 rollback: fix up tests stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 752
rollback: fix up tests [ original upstream message ]
2010-05-14 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 10:56:47 +0200] rev 751
(stable) merge
2010-05-13 commit: note new branch heads rather than topological heads stable
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 ]
2010-05-09 Support extensions using dorecord, e.g. crecord
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
2010-05-05 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 17:16:00 +0200] rev 748
(stable) merge
2010-05-05 Omit setting extra variable for record context
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().
2010-05-03 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Tue, 04 May 2010 01:15:34 +0200] rev 746
(stable) merge
2010-05-02 Simplify record switch in kwtemplater.overwrite
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
2010-05-01 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 23:18:42 +0200] rev 744
(stable) merge
2010-05-01 Cleanup test and make it portable
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
2010-04-30 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 16:30:09 +0200] rev 742
Merge with stable
2010-04-30 run-tests: add --view switch to use external diff viewer 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 ]
2010-04-29 run-tests: sort options stable
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 740
run-tests: sort options [original upstream message ]
2010-04-29 run-tests: add -l short option for --local stable
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 ]
2010-04-30 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 15:21:59 +0200] rev 738
(stable) merge
2010-04-26 Test recording
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:13 +0200] rev 737
Test recording
2010-04-26 Support (q)record
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.
2010-04-26 Remove mq commands from restricted list
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.
2010-04-16 Replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net> [Fri, 16 Apr 2010 14:30:13 +0200] rev 734
Replace deprecated mq commands in test
2010-04-23 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 23 Apr 2010 10:37:08 +0200] rev 733
Merge with stable
2010-04-22 Use hg role in help strings 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 ]
2010-04-20 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 20 Apr 2010 02:37:20 +0200] rev 731
Merge with stable
2010-04-17 keyword: monkeypatch patch so that optional args can be passed as kwargs 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 ]
2010-04-15 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Apr 2010 22:16:14 +0200] rev 729
Merge with stable
2010-04-15 run-tests.py: can't remove from os.environ on solaris 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 ]
2010-04-14 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Apr 2010 15:23:22 +0200] rev 727
Merge with stable
2010-04-14 pylint, pyflakes: remove unused or duplicate imports 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 ]
2010-04-14 Fix --blacklist when --jobs > 1 in run_tests.py. stable
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 ]
2010-04-14 run-tests.py: reset env variables set by hooks stable
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 ]
2010-04-13 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:28:48 +0200] rev 723
Merge with stable
2010-03-23 run-tests: force to test pure on pypy as well 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 ]
2010-03-23 Fix run-tests.py -jX after 2ed667a9dfcb stable
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 ]
2010-03-23 tests: adapt the test runner to work with jython stable
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 ]
2010-03-22 run-tests: make sure GREP_OPTIONS isn't set stable
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 ]
2010-03-11 tests: use external coverage, mandate newer version stable
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 ]
2009-11-05 templater: readable dates older than 24 months revert to ISO8601 (issue1006) stable
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 ]
2010-04-13 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:41 +0200] rev 716
(stable) merge
2010-04-13 Add forgotten comment
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:06 +0200] rev 715
Add forgotten comment
2010-04-12 Make the templater a local variable
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 17:34:12 +0200] rev 714
Make the templater a local variable
2010-04-13 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:05:51 +0200] rev 713
Merge with stable
2010-04-13 rollback: improve message stable
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:21:30 -0700] rev 712
rollback: improve message [ original upstream message ]
2010-04-09 rollback: add dry-run argument, emit transaction description stable
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 ]
2010-03-16 Do not bother about detecting extension path in demo
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.
2010-04-12 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 14:12:56 +0200] rev 709
Merge with stable
2010-04-05 keywords: build a new templater to work around caching interaction 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
2010-03-30 (0.9.2compat) improve quoting of environment variable in test 0.9.2compat
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
2010-03-30 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 30 Mar 2010 11:08:13 +0100] rev 706
Merge with stable
2010-03-24 Tests with spaces in paths 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 ]
2010-03-17 (0.9.2compat) get applicable changes from default 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Mar 2010 23:16:44 +0100] rev 704
(0.9.2compat) get applicable changes from default
2010-03-17 (stable) merge stable
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.
2010-03-16 Make kwdemo less verbose
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.
2010-03-16 1 variable name for overwriting candidates
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:23 +0100] rev 701
1 variable name for overwriting candidates
2010-03-16 Do not customize ui.note() when overwriting
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.
2010-02-18 Mark improved demo commit message for translation
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.
2010-03-11 (0.9.2compat) update copyright _and_ licence 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:56:41 +0100] rev 698
(0.9.2compat) update copyright _and_ licence
2010-03-11 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:48:38 +0100] rev 697
(stable) merge
2010-03-11 Update copyright
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:41 +0100] rev 696
Update copyright
2010-03-11 Remove deprecated options
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:14 +0100] rev 695
Remove deprecated options
2010-03-07 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:57:55 +0100] rev 694
Merge with stable
2010-02-09 run-tests.py: skipped tests shouldn't change working directory 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 ]
2009-12-29 run-tests.py: clears http_proxy for all tests stable
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 ]
2010-03-07 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:48:01 +0100] rev 691
(stable) merge
2010-03-07 (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown 0.9.2compat
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.
2010-03-07 (0.9.2compat) use status' names for readability 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 21:09:04 +0100] rev 689
(0.9.2compat) use status' names for readability
2010-03-07 Remove spurious locks, improve handling of wlock
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.
2010-03-07 Use status' names instead of index
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 19:56:37 +0100] rev 687
Use status' names instead of index
2010-02-17 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 21:57:52 +0100] rev 686
(stable) merge
2010-02-17 Do not postpone commit hooks
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.
2010-02-17 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 11:15:18 +0100] rev 684
Merge with stable
2010-02-09 fix up a bunch of check-code warnings 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 ]
2010-02-06 run-tests: kill daemons on ^C with -j. stable
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 ]
2009-12-10 run-tests: split tests/blacklist in tests/blacklists/* stable
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 ]
2010-01-25 many, many trivial check-code fixups stable
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 00:05:27 -0600] rev 680
many, many trivial check-code fixups [ original upstream message ]
2010-02-16 filelog: sort meta entries, ensure deterministic order stable
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 ]
2010-02-05 (0.9.2compat) fix utcdate filter 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 18:08:07 +0000] rev 678
(0.9.2compat) fix utcdate filter
2010-02-05 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 17:57:36 +0000] rev 677
Merge with stable
2010-02-05 Fix utcdate filter 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.
2010-01-20 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Jan 2010 10:14:36 +0100] rev 675
Merge with stable
2010-01-20 Update license to GPLv2+ stable
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:20:08 -0600] rev 674
Update license to GPLv2+ [ original upstream message ]
2009-12-24 (0.9.2compat) load extensions with "ext =" 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 11:02:48 +0000] rev 673
(0.9.2compat) load extensions with "ext ="
2009-12-24 (0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted 0.9.2compat
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.
2009-12-24 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:15:49 +0000] rev 671
(stable) merge
2009-12-24 run-tests.py: update
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:14:36 +0000] rev 670
run-tests.py: update
2009-12-23 tests: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 17:46:48 +0000] rev 669
tests: load extensions with "ext ="
2009-12-23 Go into restricted mode when transplanting
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.
2009-12-23 Do not monkeypatch diff when in restricted mode
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.
2009-11-29 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Nov 2009 11:27:33 +0000] rev 666
Merge with stable
2009-11-27 keyword: clarify object of backwards compatibility stable
timeless [Fri, 27 Nov 2009 18:26:25 +0000] rev 665
keyword: clarify object of backwards compatibility [ original upstream message ]
2009-11-28 (0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output 0.9.2compat
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.
2009-11-27 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:04:02 +0000] rev 663
(stable) merge
2009-11-26 The CVS keyword is $RCSfile$, not $RCSFile$
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.
2009-11-27 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:03:29 +0000] rev 661
Merge with stable
2009-11-26 keyword: sort demo output to ensure deterministic output 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 ]
2009-10-19 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:42:05 +0200] rev 659
Merge with stable
2009-10-19 (0.9.2compat) update wiki url 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:40:48 +0200] rev 658
(0.9.2compat) update wiki url
2009-10-16 hg.clone: report branch name on update stable
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 ]
2009-06-24 change wiki/bts URLs to point to new hostname stable
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 ]
2009-10-19 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:37:14 +0200] rev 655
(stable) merge
2009-10-01 Uppercase short option for kwfiles --all, like hg status -A
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.
2009-10-01 Make kwfiles -u show untracked files only (like status)
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.
2009-10-01 Make kwfiles --all show unknown files too
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.
2009-10-01 kwfiles --unknown instead of --untracked
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.
2009-10-01 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 20:42:39 +0200] rev 650
Merge with stable
2009-09-18 hg: say 'hg update' instead of 'hg up' in merge status message 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 ]
2009-09-19 (0.9.2compat) do not mark debug message for translation 0.9.2compat
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
2009-09-19 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:04:38 +0200] rev 647
Merge with stable
2009-09-18 do not attempt to translate ui.debug output 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 ]
2009-09-19 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:41 +0200] rev 645
(stable) merge with default
2009-09-19 (0.9.2compat): run kwdemo before setting up [keyword] files 0.9.2compat
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.
2009-09-10 test: run kwdemo before setting up [keyword] files
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.
2009-08-28 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 28 Aug 2009 16:18:28 +0100] rev 642
Merge with stable
2009-08-26 test-keyword: update output to match 5d49fdef6fd0 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 ]
2009-08-05 (0.9.2compat) update and rewrap documentation 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:25:33 +0200] rev 640
(0.9.2compat) update and rewrap documentation
2009-08-05 (0.9.2compat) prefer util.datestr over time module import 0.9.2compat
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.
2009-08-05 (0.9.2compat) remove "help keyword" from test 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:01:55 +0200] rev 638
(0.9.2compat) remove "help keyword" from test
2009-08-05 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:57:21 +0200] rev 637
(stable) merge
2009-08-05 Use util.datestr for utcdate filter, make it accessable in variable
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
2009-08-05 Reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:44 +0200] rev 635
Reference templating help, add utcdate filter example
2009-08-05 Remove "help keyword" from test
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.
2009-07-26 Refactor kwdemo and make output translatable
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.).
2009-08-03 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:53:13 +0200] rev 632
(stable) merge
2009-08-03 Update copyright
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:51:41 +0200] rev 631
Update copyright
2009-08-03 (0.9.2compat) update copyright 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:49:46 +0200] rev 630
(0.9.2compat) update copyright
2009-08-03 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:09:02 +0200] rev 629
Merge with stable
2009-08-02 help: use field lists for lists of extensions 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 ]
2009-08-02 minirst: indent literal blocks with two spaces stable
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 ]
2009-07-26 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Jul 2009 10:40:59 +0100] rev 626
Merge with stable
2009-07-25 keyword: wrap docstrings at 70 characters 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 ]
2009-07-16 commands: use minirst parser when displaying help stable
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 ]
2009-07-23 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 20:00:23 +0100] rev 623
(stable) merge
2009-07-23 (0.9.2compat) argument to "kwdemo --rcfile" must be string (bugfix) 0.9.2compat
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)
2009-07-23 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)
2009-07-22 Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Jul 2009 08:28:30 +0100] rev 620
Reformat kwfiles help for minirst parser
2009-07-10 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Jul 2009 01:25:51 +0200] rev 619
Merge with stable
2009-07-09 mq: qpop now tells which patches are popped 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 ]
2009-07-10 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:40:24 +0200] rev 617
Merge with stable
2009-07-10 (0.9.2compat) empty string as default value for hgcmd 0.9.2compat
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
2009-07-10 (0.9.2compat) use all caps NOTE: in help string 0.9.2compat
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
2009-07-09 keyword: use all caps for 'note:' in help string stable
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 ]
2009-07-09 (0.9.2compat) prefer self.func over repo.func in kwrepo 0.9.2compat
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.
2009-07-09 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 01:33:01 +0200] rev 612
(stable) merge
2009-07-09 Eliminate potential reference cycles from kwrepo
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.
2009-07-08 (0.9.2compat) kwdemo: get rid of subfunction and ease translation 0.9.2compat
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
2009-07-07 Collect kwmaps using a generator expression
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.
2009-07-08 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 03:09:07 +0200] rev 608
Merge with stable
2009-07-08 (0.9.2compat) warp docstrings at 78 chars 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 02:50:01 +0200] rev 607
(0.9.2compat) warp docstrings at 78 chars
2009-07-07 keyword: wrapped docstrings at 78 characters stable
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 606
keyword: wrapped docstrings at 78 characters [ original upstream description ]
2009-07-07 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 01:02:51 +0200] rev 605
(stable) merge
2009-07-04 Remove unused import
Christian Ebert <blacktrash@gmx.net> [Sat, 04 Jul 2009 15:26:14 +0200] rev 604
Remove unused import
2009-07-02 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Jul 2009 10:56:01 +0200] rev 603
(stable) merge
2009-06-29 Break overlong line
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 23:46:28 +0200] rev 602
Break overlong line
2009-07-01 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 01 Jul 2009 17:36:36 +0200] rev 601
(stable) merge
2009-07-01 Make repo.commit use a custom commitctx wrapper
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.
2009-06-29 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 19:10:48 +0200] rev 599
(stable) merge
2009-06-29 (0.9.2compat) lowercase status flags of untracked files in kwfile output 0.9.2compat
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.
2009-06-29 Improve help for kwfiles
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.
2009-06-29 Lowercase status flags of untracked files in kwfile output
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).
2009-06-27 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:59:18 +0200] rev 595
Merge with stable
2009-06-27 (0.9.2compat) improve help for kwfiles 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:58:46 +0200] rev 594
(0.9.2compat) improve help for kwfiles
2009-06-27 keyword: improve help for kwfiles stable
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 13:05:25 +0200] rev 593
keyword: improve help for kwfiles
2009-06-27 Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:50:52 +0200] rev 592
Improve help for kwfiles
2009-06-25 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 12:00:30 +0200] rev 591
(stable) merge
2009-06-25 Make kwdemo more translation friendly
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 11:58:30 +0200] rev 590
Make kwdemo more translation friendly
2009-06-24 (0.9.2compat) update synopsis 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Jun 2009 14:29:48 +0200] rev 589
(0.9.2compat) update synopsis
2009-06-24 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Jun 2009 14:27:27 +0200] rev 588
Merge with stable
2009-06-24 extensions: change descriptions for hook-providing extensions 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 ]
2009-06-24 extensions: fix up description lines some more stable
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 ]
2009-06-23 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Jun 2009 18:12:44 +0200] rev 585
Merge with stable
2009-06-22 extensions: improve the consistency of synopses 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 ]
2009-06-21 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 21 Jun 2009 23:17:37 +0100] rev 583
Merge with stable
2009-06-20 help: remove per-extension paragraph on how to enable it 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 ]
2009-06-18 (0.9.2compat) concise help title 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 12:45:39 +0100] rev 581
(0.9.2compat) concise help title
2009-06-18 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 12:43:19 +0100] rev 580
(stable) merge
2009-06-18 Concise help title
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 01:21:26 +0100] rev 579
Concise help title
2009-06-15 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Jun 2009 11:10:15 +0100] rev 578
Merge with stable
2009-06-14 Add patch.eol to ignore EOLs when patching (issue1019) 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 ]
2009-06-09 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:42:39 +0200] rev 576
Merge with stable
2009-06-09 (0.9.2compat) update doc strings and help 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:42:23 +0200] rev 575
(0.9.2compat) update doc strings and help
2009-06-09 (0.9.2compat) improve English; from stable 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:32:14 +0200] rev 574
(0.9.2compat) improve English; from stable
2009-06-09 keyword: improve English stable
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:34 -0400] rev 573
keyword: improve English [ original upstream message ]
2009-06-09 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 10:34:01 +0200] rev 572
Merge with stable
2009-06-08 merge: allow merging going backwards 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 ]
2009-06-07 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:53 +0200] rev 570
(stable) merge
2009-06-07 Remove doc string for standalone version
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.
2009-06-07 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:23:23 +0200] rev 568
Merge with stable
2009-05-16 tests: fix doc string in get-with-headers.py 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 ]
2008-12-25 test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py stable
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 ]
2009-06-07 (stable) merge for run-tests.py stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:18:59 +0200] rev 565
(stable) merge for run-tests.py
2009-06-07 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:16:14 +0200] rev 564
Merge with stable
2009-06-07 (stable) fix import gone wrong in 43d8c042ca20 stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:15:09 +0200] rev 563
(stable) fix import gone wrong in 43d8c042ca20
2009-06-07 Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:07:29 +0200] rev 562
Add run-tests.py from main and update README
2009-06-07 Refer users to distribution or 0.9.2compat branch
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 18:59:18 +0200] rev 561
Refer users to distribution or 0.9.2compat branch
2009-06-07 (0.9.2compat) document Mercurial version range for standalone extension 0.9.2compat
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
2009-06-06 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 01:31:03 +0200] rev 559
Merge with stable
2008-12-19 resolve: require -a switch to resolve all files 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 ]
2009-06-04 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Jun 2009 09:16:22 +0200] rev 557
Merge with stable
2009-06-01 commit: drop the now-unused files parameter 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 ]
2009-05-31 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 01 Jun 2009 01:51:50 +0200] rev 555
Merge with stable
2009-05-31 fixed typos found in translatable strings 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 ]
2009-05-27 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:40:11 +0200] rev 553
(stable) merge with default
2009-05-27 keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:34:38 +0200] rev 552
keyword: rename matcher() to match() mimicking changes in main
2009-05-26 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 26 May 2009 18:24:06 +0200] rev 551
Merge with stable
2009-05-24 match: add some default args stable
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 550
match: add some default args [ original upstream message ]
2009-05-24 match: change all users of util.matcher to match.match stable
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 ]
2009-05-25 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 25 May 2009 20:05:25 +0200] rev 548
Merge with stable
2009-05-19 update --clean: do not unlink added files (issue575) 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 ]
2009-05-19 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 19 May 2009 05:48:42 +0200] rev 546
Merge with stable
2009-05-18 commit: move editor outside transaction 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 ]
2009-05-14 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 15 May 2009 01:37:50 +0200] rev 544
Merge with stable
2009-05-14 commit: move commit editor to cmdutil, pass as function 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 ]
2009-05-14 commit: drop unused p1 and p2 args stable
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 ]
2009-04-28 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 28 Apr 2009 09:42:44 +0100] rev 541
Merge with stable
2009-04-25 updated license to be explicit about GPL version 2 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 ]
2009-04-27 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 27 Apr 2009 18:35:45 +0100] rev 539
Merge with stable
2009-04-26 replace util.sort with sorted built-in 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 ]
2009-04-26 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Apr 2009 15:04:03 +0100] rev 537
Merge with stable
2009-04-26 tests: removed redundant "-d '0 0'" from test scripts 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 ]
2009-04-22 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Apr 2009 10:28:29 +0100] rev 535
Merge with stable
2009-04-22 switch lock releasing in the extensions from gc to explicit 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 ]
2009-04-21 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Apr 2009 11:37:50 +0100] rev 533
Merge with stable
2009-04-21 keyword: set overwrite message only once, not for each file 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 ]
2009-04-21 keyword, i18n: avoid untranslated strings as message parameters stable
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 ]
2009-04-08 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Apr 2009 23:13:51 +0200] rev 530
Merge with stable
2009-04-07 expand "repo" to "repository" in help texts 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 ]
2009-04-05 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 05 Apr 2009 12:15:32 +0200] rev 528
Merge with stable
2009-04-04 keyword: word-wrap help texts at 70 characters 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 ]
2009-03-18 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Mar 2009 13:37:10 +0100] rev 526
Merge with stable
2009-03-17 bundlerepo: reintroduce dirstate stable
Matt Mackall <mpm@selenic.com> [Tue, 17 Mar 2009 13:43:11 -0500] rev 525
bundlerepo: reintroduce dirstate [ original upstream description ]
2009-03-05 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 05 Mar 2009 06:47:41 +0100] rev 524
Merge with stable
2009-02-14 add --git option to commands supporting --patch (log, incoming, history, tip) 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]
2008-11-19 patch: pass an opener to patchfile stable
Patrick Mezard <pmezard@gmail.com> [Wed, 19 Nov 2008 13:27:57 +0100] rev 522
patch: pass an opener to patchfile [ original upstream description ]
2009-03-04 merge: better error messages to lead users to hg update --clean to abandon merges. stable
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 ]
2009-01-03 mq: lowercase output stable
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 ]
2008-12-17 (0.9.2compat) do not use builtin format 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Dec 2008 15:22:45 +0100] rev 519
(0.9.2compat) do not use builtin format
2008-12-17 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Dec 2008 14:55:20 +0100] rev 518
(stable) merge with default
2008-12-16 keyword: simplify repo.local and bundle check (as in 2f4a399a8787)
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)
2008-12-05 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Dec 2008 14:09:59 +0100] rev 516
Merge with stable
2008-09-28 get-with-headers: fix stream modes under Windows 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 ]
2007-11-28 hgweb: return meaningful HTTP status codes instead of nonsense stable
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 ]
2006-06-29 Add a test for getting raw files via the web UI. stable
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 ]
2008-10-19 hgweb: nodeids should be aligned in raw changesets stable
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 ]
2008-07-12 notify: mime-encode messages stable
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 ]
2008-11-26 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 26 Nov 2008 09:35:38 +0100] rev 510
(stable) merge with default
2008-11-25 Do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Nov 2008 18:13:05 +0100] rev 509
Do not shadow builtin format (detected by pychecker)
2008-11-25 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Nov 2008 18:13:54 +0100] rev 508
(stable) merge with default
2008-11-14 keyword: move common code out of commit condition
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Nov 2008 22:29:03 +0100] rev 507
keyword: move common code out of commit condition
2008-11-14 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Nov 2008 23:01:00 +0100] rev 506
Merge with stable
2008-11-14 keyword: be more efficient about ctx usage 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 ]
2008-11-14 cmdutil: use change contexts for cset-printer and cset-templater stable
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 ]
2008-11-03 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Nov 2008 23:16:39 +0100] rev 503
Merge with stable
2008-11-03 patch: turn patch.diff() into a generator 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 ]
2008-10-23 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Oct 2008 10:25:24 +0200] rev 501
Merge with stable
2008-10-22 extensions: use new wrapper functions stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 17:34:52 -0500] rev 500
extensions: use new wrapper functions [ original upstream description]
2008-10-18 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 18 Oct 2008 20:51:12 +0200] rev 499
Merge with stable
2008-10-18 help: better documentation intro for a few extensions 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 ]
2008-10-18 show enabled extensions in hg help stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 18 Oct 2008 16:50:03 +0200] rev 497
show enabled extensions in hg help [ original upstream description ]
2008-10-15 untest
Peter Gervai <grin@grin.hu> [Wed, 15 Oct 2008 15:52:34 +0200] rev 496
untest
2008-10-15 cross them fingahs
Peter Gervai <grin@grin.hu> [Wed, 15 Oct 2008 15:16:15 +0200] rev 495
cross them fingahs
2008-09-02 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 02 Sep 2008 08:48:48 -0400] rev 494
Merge with stable
2008-09-01 fix test output broken by a04d8cadb6af stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Sep 2008 01:19:12 +0200] rev 493
fix test output broken by a04d8cadb6af
2008-08-24 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 23:44:52 +0200] rev 492
Merge with stable
2008-08-22 Have verbose and debug flag print the changeset rev and hash when committing. 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 ]
2008-08-24 Backed out changeset d557749c627a stable
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 ]
2008-08-24 (0.9.2compat) remove new verbose commit message for backwards compatibility 0.9.2compat
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
2008-08-24 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:02:02 +0200] rev 488
(stable) merge with default
2008-08-22 Have verbose flag print the changeset hash when committing stable
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 ]
2008-08-22 (0.9.2compat) add merge, resolve to restricted 0.9.2compat
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.
2008-08-22 Avoid additional conflicts during merge/resolve
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.
2008-08-21 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 21:32:06 +0200] rev 484
(stable) merge with default
2008-08-21 (0.9.2compat) fix test compatibility 0.9.2compat
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).
2008-08-21 Thorough hgweb testing
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
2008-08-07 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Aug 2008 11:20:34 +0200] rev 481
(stable) merge with default
2008-07-30 (0.9.2compat) add verify to nokwcommands 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jul 2008 20:05:14 +0200] rev 480
(0.9.2compat) add verify to nokwcommands
2008-07-30 Add verify to nokwcommands after refactor in e79a8f36c2a5
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.
2008-06-30 (0.9.2compat) context, status refactor keeping backwards compatible fallback 0.9.2compat
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
2008-06-30 (0.9.2compat) ddb8a222249b is backwards compatible 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jun 2008 12:33:36 +0200] rev 477
(0.9.2compat) ddb8a222249b is backwards compatible
2008-06-28 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 28 Jun 2008 15:49:54 +0200] rev 476
Merge with stable
2008-06-27 util: add sort helper stable
Matt Mackall <mpm@selenic.com> [Fri, 27 Jun 2008 18:28:45 -0500] rev 475
util: add sort helper [ original upstream description]
2008-06-27 status: clean up all users for unknown files stable
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]
2008-06-26 repo.status: eliminate list_ stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 473
repo.status: eliminate list_ [ original upstream description]
2008-06-26 add __len__ and __iter__ methods to repo and revlog stable
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]
2008-06-26 manifest: remove execf/linkf methods stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 471
manifest: remove execf/linkf methods [ original upstream description]
2008-06-26 use repo[changeid] to get a changectx stable
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]
2008-06-26 simplify flag handling stable
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]
2008-06-26 use repo.changectx(None) to get a workingctx stable
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]
2008-06-25 context: avoid using None for working parent stable
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 ]
2008-06-25 use repo.changectx rather than context.changectx stable
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 ]
2008-06-12 (stable) mimic cmdutil.bail_if_changed even more stable
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
2008-06-13 (0.9.2compat) secure keyword arguments in backwards compatible wrappers 0.9.2compat
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.
2008-06-12 keyword: disable expansion for annotate stable
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.
2008-06-12 (0.9.2compat) disable expansion for annotate 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 16:32:16 +0200] rev 462
(0.9.2compat) disable expansion for annotate
2008-06-12 keyword: 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.
2008-06-12 Merge after backout
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.
2008-06-12 Backed out changeset 10ebb9f44b99
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.
2008-06-06 (0.9.2compat) get some changes from default branch 0.9.2compat
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
2008-06-06 keyword: mimic cmdutil.bail_if_changed even more
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
2008-06-01 keyword: use dirstate.parents to obtain current first parent
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()
2008-06-01 keyword: monkeypatch dispatch._runcommand instead of _parse
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.
2008-05-14 (stable) merge with default to fix import from crew stable
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.
2008-05-14 Incorporate latest changes in backwards compatible way 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:25:52 +0200] rev 453
Incorporate latest changes in backwards compatible way
2008-05-14 Fix arguments for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:24:40 +0200] rev 452
Fix arguments for patch.diff monkey
2008-05-13 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 May 2008 08:33:23 +0200] rev 451
Merge with stable
2008-05-13 (stable) ignore .DS_Store stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 May 2008 08:32:01 +0200] rev 450
(stable) ignore .DS_Store
2008-05-12 match: remove files arg from repo.status and friends stable
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 ]
2008-05-12 match: remove files argument from patch.diff stable
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 ]
2008-05-12 walk: remove remaining users of cmdutils.matchpats stable
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 ]
2008-04-09 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Apr 2008 01:48:29 +0200] rev 446
Merge with stable
2008-04-09 (stable) patches from default in 4b2c266bf059 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.
2008-04-09 (0.9.2compat) backwards compatible changes from default 0.9.2compat
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.
2008-04-09 Reduce opt=arg syntax even more
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 09:13:17 +0200] rev 443
Reduce opt=arg syntax even more
2008-04-08 Check for '\0' in entire data before acting
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.
2008-04-07 Make overwrite() arguments mandatory
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 441
Make overwrite() arguments mandatory
2008-04-07 Compact argument passing to wrapped methods
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 440
Compact argument passing to wrapped methods
2008-04-07 Privatize remaining monkeypatches by moving them into reposetup
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.
2008-04-07 Collect filename patterns, wrap dispatch._parse in uisetup
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.
2008-03-31 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 13:41:04 +0200] rev 437
Merge with stable
2008-03-31 Adapt to new webcommands with "clean" monkey patches
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 11:03:23 +0200] rev 436
Adapt to new webcommands with "clean" monkey patches
2008-03-31 (0.9.2compat) fix and simplify webcommands monkey 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 10:50:10 +0200] rev 435
(0.9.2compat) fix and simplify webcommands monkey
2008-03-30 (0.9.2compat) add test for web changeset 0.9.2compat
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.
2008-03-30 (0.9.2compat) fix webcommand monkey patches, and adapt to most recent changes 0.9.2compat
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
2008-03-30 (0.9.2compat) no conditional for web file match disabling 0.9.2compat
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
2008-03-28 hgweb: refactor hgweb code stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 28 Mar 2008 19:40:44 +0100] rev 431
hgweb: refactor hgweb code [ original upstream description ]
2008-03-23 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Mar 2008 13:34:56 +0100] rev 430
Merge with stable
2008-03-22 tests: add tests for hgweb to test-keyword 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 ]
2008-03-21 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Mar 2008 15:38:02 +0100] rev 428
Merge with stable
2008-03-21 clone: print "updating working directory" status message 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 ]
2008-03-20 tests: remove some unnecessary sleeps stable
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 14:14:15 -0500] rev 426
tests: remove some unnecessary sleeps [ original upstream description ]
2008-03-11 Ignore .DS_Store
Christian Ebert <blacktrash@gmx.net> [Tue, 11 Mar 2008 23:55:38 +0100] rev 425
Ignore .DS_Store
2008-03-11 (0.9.2compat) ignore .DS_Store 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 11 Mar 2008 23:54:10 +0100] rev 424
(0.9.2compat) ignore .DS_Store
2008-03-07 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Mar 2008 02:21:34 +0100] rev 423
Merge with stable
2008-03-07 (0.9.2compat) expand * import 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Mar 2008 02:17:21 +0100] rev 422
(0.9.2compat) expand * import
2008-03-06 Expand import * to allow Pyflakes to find problems stable
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 ]
2008-02-22 (0.9.2compat) get fix from stable branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Feb 2008 14:23:48 +0100] rev 420
(0.9.2compat) get fix from stable branch
2008-02-21 keyword: remove "identify" and "remove" from nokwcommands stable
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 ]
2008-02-15 Merge stable with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 20:18:56 +0100] rev 418
Merge stable with default
2008-02-15 (0.9.2compat) incorporate changes from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 20:17:33 +0100] rev 417
(0.9.2compat) incorporate changes from default branch
2008-02-15 Rename kwx to kwtools
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 17:57:45 +0100] rev 416
Rename kwx to kwtools
2008-02-15 Fix getnode doc, add doc for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 17:54:58 +0100] rev 415
Fix getnode doc, add doc for patch.diff monkey
2008-02-14 (0.9.2compat) FIX typo in hgweb monkeys 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:55:49 +0100] rev 414
(0.9.2compat) FIX typo in hgweb monkeys
2008-02-14 Remove whitespace at eol
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:50:00 +0100] rev 413
Remove whitespace at eol
2008-02-14 (0.9.2compat) remove whitespace at eol 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:49:21 +0100] rev 412
(0.9.2compat) remove whitespace at eol
2008-02-14 (0.9.2compat) get changes from default branch 0.9.2compat
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.
2008-02-14 Do not inspect node1 for diff if node2 is given
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
2008-02-14 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:30:17 +0100] rev 409
Add test for patch.diff monkey
2008-02-14 Make main class and hg command accessible
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.
2008-02-14 Move expand/shrink decisions into kwtemplater
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
2008-02-14 Remove obsolete variable declaration
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 01:38:28 +0100] rev 406
Remove obsolete variable declaration
2008-02-14 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 01:22:22 +0100] rev 405
Merge with stable
2008-02-13 Monkeypatch patch.diff for non-interactive diffs 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.
2008-02-12 (stable) merge with default branch stable
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 23:09:53 +0100] rev 403
(stable) merge with default branch
2008-02-12 (0.9.2compat) add glog to nokwcommands 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:38:30 +0100] rev 402
(0.9.2compat) add glog to nokwcommands
2008-02-12 Add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:37:13 +0100] rev 401
Add glog to nokwcommands
2008-02-10 (0.9.2compat) use different names for web methods 0.9.2compat
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.
2008-02-10 (0.9.2compat) web as in default where possible 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 14:57:48 +0100] rev 399
(0.9.2compat) web as in default where possible
2008-02-10 Switch off expansion for web diffs
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 08:35:55 +0100] rev 398
Switch off expansion for web diffs
2008-02-10 (0.9.2compat) incorporate changes from default branch 0.9.2compat
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.
2008-02-09 Make restrict entirely a kwtemplater attribute
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:32:14 +0100] rev 396
Make restrict entirely a kwtemplater attribute
2008-02-09 keyword: declare globals in a more compact way
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:15:03 +0100] rev 395
keyword: declare globals in a more compact way
2008-02-09 keyword: avoid os import by using util.splitpath
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:13:57 +0100] rev 394
keyword: avoid os import by using util.splitpath
2008-02-09 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 22:17:31 +0100] rev 393
Merge with stable
2008-02-09 test-keyword: make it run under Windows 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 ]
2008-02-09 keyword: fix symlink detection under Windows stable
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 20:17:06 +0100] rev 391
keyword: fix symlink detection under Windows [ original upstream description ]
2008-02-09 keyword: fix mq repository detection under Windows stable
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 ]
2008-02-09 (stable) merge with default branch stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 09:42:00 +0100] rev 389
(stable) merge with default branch
2008-02-09 (0.9.2compat) make patchfile monkey work with 0.9.5 0.9.2compat
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
2008-02-08 (0.9.2compat) incorporate changes from default branch 0.9.2compat
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.
2008-02-07 Ignore everything starting with .hg
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 ;)
2008-02-07 Monkeypatch dispatch._parse to avoid running it twice
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.
2008-02-07 Do not set up kwrepo when pulling from bundlerepo
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.
2008-02-06 Fix pychecker warning about shadowed variable
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.
(0) -384 +384 tip