Wed, 17 Feb 2010 21:56:15 +0100 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.
Wed, 17 Feb 2010 11:15:18 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 11:15:18 +0100] rev 684
Merge with stable
Tue, 09 Feb 2010 14:12:22 -0600 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 ]
Sat, 06 Feb 2010 15:18:36 +0100 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 ]
Thu, 10 Dec 2009 17:21:31 +0900 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 ]
Mon, 25 Jan 2010 00:05:27 -0600 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 ]
Tue, 16 Feb 2010 21:04:04 +0100 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 ]
Fri, 05 Feb 2010 18:08:07 +0000 (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
Fri, 05 Feb 2010 17:57:36 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 17:57:36 +0000] rev 677
Merge with stable
Fri, 05 Feb 2010 16:50:31 +0000 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.
Wed, 20 Jan 2010 10:14:36 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Jan 2010 10:14:36 +0100] rev 675
Merge with stable
Tue, 19 Jan 2010 22:20:08 -0600 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 ]
Thu, 24 Dec 2009 11:02:48 +0000 (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 ="
Thu, 24 Dec 2009 10:54:00 +0000 (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.
Thu, 24 Dec 2009 10:15:49 +0000 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:15:49 +0000] rev 671
(stable) merge
Thu, 24 Dec 2009 10:14:36 +0000 run-tests.py: update
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:14:36 +0000] rev 670
run-tests.py: update
Wed, 23 Dec 2009 17:46:48 +0000 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 ="
Wed, 23 Dec 2009 12:04:17 +0000 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.
Wed, 23 Dec 2009 12:04:04 +0000 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.
Sun, 29 Nov 2009 11:27:33 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Nov 2009 11:27:33 +0000] rev 666
Merge with stable
Fri, 27 Nov 2009 18:26:25 +0000 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 ]
Sat, 28 Nov 2009 19:51:21 +0000 (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.
Fri, 27 Nov 2009 18:04:02 +0000 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:04:02 +0000] rev 663
(stable) merge
Thu, 26 Nov 2009 10:51:17 +0100 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.
Fri, 27 Nov 2009 18:03:29 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:03:29 +0000] rev 661
Merge with stable
Thu, 26 Nov 2009 20:50:16 +0100 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 ]
Mon, 19 Oct 2009 22:42:05 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:42:05 +0200] rev 659
Merge with stable
Mon, 19 Oct 2009 22:40:48 +0200 (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
Fri, 16 Oct 2009 23:57:34 +0200 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 ]
Wed, 24 Jun 2009 15:32:37 +0200 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 ]
Mon, 19 Oct 2009 22:37:14 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:37:14 +0200] rev 655
(stable) merge
Thu, 01 Oct 2009 13:39:15 +0200 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.
Thu, 01 Oct 2009 13:39:15 +0200 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.
Thu, 01 Oct 2009 13:39:15 +0200 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.
Thu, 01 Oct 2009 13:39:15 +0200 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.
Thu, 01 Oct 2009 20:42:39 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 20:42:39 +0200] rev 650
Merge with stable
Thu, 17 Sep 2009 22:39:38 -0700 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 ]
Sat, 19 Sep 2009 12:06:50 +0200 (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
Sat, 19 Sep 2009 12:04:38 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:04:38 +0200] rev 647
Merge with stable
Sat, 19 Sep 2009 01:15:38 +0200 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 ]
Sat, 19 Sep 2009 12:00:41 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:41 +0200] rev 645
(stable) merge with default
Sat, 19 Sep 2009 12:00:02 +0200 (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.
Thu, 10 Sep 2009 23:15:37 +0200 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.
Fri, 28 Aug 2009 16:18:28 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 28 Aug 2009 16:18:28 +0100] rev 642
Merge with stable
Thu, 27 Aug 2009 00:00:15 +0200 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 ]
Wed, 05 Aug 2009 17:25:33 +0200 (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
Wed, 05 Aug 2009 17:18:32 +0200 (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.
Wed, 05 Aug 2009 17:01:55 +0200 (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
Wed, 05 Aug 2009 16:57:21 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:57:21 +0200] rev 637
(stable) merge
Wed, 05 Aug 2009 16:56:49 +0200 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
Wed, 05 Aug 2009 16:56:44 +0200 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
Wed, 05 Aug 2009 16:56:36 +0200 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.
Sun, 26 Jul 2009 10:45:35 +0100 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.).
Mon, 03 Aug 2009 11:53:13 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:53:13 +0200] rev 632
(stable) merge
Mon, 03 Aug 2009 11:51:41 +0200 Update copyright
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:51:41 +0200] rev 631
Update copyright
Mon, 03 Aug 2009 11:49:46 +0200 (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
Mon, 03 Aug 2009 11:09:02 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:09:02 +0200] rev 629
Merge with stable
Mon, 03 Aug 2009 00:01:50 +0200 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 ]
Sun, 02 Aug 2009 17:17:17 +0200 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 ]
Sun, 26 Jul 2009 10:40:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Jul 2009 10:40:59 +0100] rev 626
Merge with stable
Sun, 26 Jul 2009 01:53:06 +0200 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 ]
Thu, 16 Jul 2009 23:25:26 +0200 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 ]
Thu, 23 Jul 2009 20:00:23 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 20:00:23 +0100] rev 623
(stable) merge
Thu, 23 Jul 2009 07:37:09 +0100 (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)
Thu, 23 Jul 2009 07:26:16 +0100 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)
Wed, 22 Jul 2009 08:28:30 +0100 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
Sat, 11 Jul 2009 01:25:51 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Jul 2009 01:25:51 +0200] rev 619
Merge with stable
Thu, 09 Jul 2009 23:59:03 +0200 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 ]
Fri, 10 Jul 2009 12:40:24 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:40:24 +0200] rev 617
Merge with stable
Fri, 10 Jul 2009 12:39:58 +0200 (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
Fri, 10 Jul 2009 12:37:34 +0200 (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
Thu, 09 Jul 2009 22:52:39 +0200 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 ]
Fri, 10 Jul 2009 01:52:11 +0200 (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.
Fri, 10 Jul 2009 01:33:01 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 01:33:01 +0200] rev 612
(stable) merge
Thu, 09 Jul 2009 11:59:12 +0200 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.
Wed, 08 Jul 2009 03:25:07 +0200 (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
Tue, 07 Jul 2009 23:30:53 +0200 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.
Wed, 08 Jul 2009 03:09:07 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 03:09:07 +0200] rev 608
Merge with stable
Wed, 08 Jul 2009 02:50:01 +0200 (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
Tue, 07 Jul 2009 23:54:42 +0200 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 ]
Wed, 08 Jul 2009 01:02:51 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 01:02:51 +0200] rev 605
(stable) merge
Sat, 04 Jul 2009 15:26:14 +0200 Remove unused import
Christian Ebert <blacktrash@gmx.net> [Sat, 04 Jul 2009 15:26:14 +0200] rev 604
Remove unused import
Thu, 02 Jul 2009 10:56:01 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Jul 2009 10:56:01 +0200] rev 603
(stable) merge
Mon, 29 Jun 2009 23:46:28 +0200 Break overlong line
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 23:46:28 +0200] rev 602
Break overlong line
Wed, 01 Jul 2009 17:36:36 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 01 Jul 2009 17:36:36 +0200] rev 601
(stable) merge
Wed, 01 Jul 2009 17:34:39 +0200 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.
Mon, 29 Jun 2009 19:10:48 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 19:10:48 +0200] rev 599
(stable) merge
Mon, 29 Jun 2009 18:55:09 +0200 (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.
Mon, 29 Jun 2009 18:37:08 +0200 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.
Mon, 29 Jun 2009 18:37:08 +0200 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).
Sat, 27 Jun 2009 15:59:18 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:59:18 +0200] rev 595
Merge with stable
Sat, 27 Jun 2009 15:58:46 +0200 (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
Sat, 27 Jun 2009 13:05:25 +0200 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
Sat, 27 Jun 2009 15:50:52 +0200 Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:50:52 +0200] rev 592
Improve help for kwfiles
Thu, 25 Jun 2009 12:00:30 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 12:00:30 +0200] rev 591
(stable) merge
Thu, 25 Jun 2009 11:58:30 +0200 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
Wed, 24 Jun 2009 14:29:48 +0200 (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
Wed, 24 Jun 2009 14:27:27 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Jun 2009 14:27:27 +0200] rev 588
Merge with stable
Wed, 24 Jun 2009 13:42:34 +0200 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 ]
Wed, 24 Jun 2009 12:25:56 +0200 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 ]
Tue, 23 Jun 2009 18:12:44 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Jun 2009 18:12:44 +0200] rev 585
Merge with stable
Mon, 22 Jun 2009 15:48:08 +0200 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 ]
Sun, 21 Jun 2009 23:17:37 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 21 Jun 2009 23:17:37 +0100] rev 583
Merge with stable
Sat, 20 Jun 2009 20:57:13 +0200 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 ]
Thu, 18 Jun 2009 12:45:39 +0100 (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
Thu, 18 Jun 2009 12:43:19 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 12:43:19 +0100] rev 580
(stable) merge
Thu, 18 Jun 2009 01:21:26 +0100 Concise help title
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 01:21:26 +0100] rev 579
Concise help title
Mon, 15 Jun 2009 11:10:15 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Jun 2009 11:10:15 +0100] rev 578
Merge with stable
Mon, 15 Jun 2009 00:03:26 +0200 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 ]
Tue, 09 Jun 2009 22:42:39 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:42:39 +0200] rev 576
Merge with stable
Tue, 09 Jun 2009 22:42:23 +0200 (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
Tue, 09 Jun 2009 22:32:14 +0200 (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
Tue, 09 Jun 2009 09:25:34 -0400 keyword: improve English stable
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:34 -0400] rev 573
keyword: improve English [ original upstream message ]
Tue, 09 Jun 2009 10:34:01 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 10:34:01 +0200] rev 572
Merge with stable
Mon, 08 Jun 2009 18:14:44 -0500 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 ]
Sun, 07 Jun 2009 19:25:53 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:53 +0200] rev 570
(stable) merge
Sun, 07 Jun 2009 19:25:10 +0200 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.
Sun, 07 Jun 2009 19:23:23 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:23:23 +0200] rev 568
Merge with stable
Sun, 17 May 2009 01:24:45 +0200 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 ]
Thu, 25 Dec 2008 17:49:08 +0100 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 ]
(0) -120 +120 tip