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 ]
(0) -300 -100 -50 -32 +32 +50 +100 +300 tip