Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:54:00 +0000] rev 672
(0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted
See 52b03aad673b, 13a6a2c0440f.
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:15:49 +0000] rev 671
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:14:36 +0000] rev 670
run-tests.py: update
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 17:46:48 +0000] rev 669
tests: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:17 +0000] rev 668
Go into restricted mode when transplanting
Expanded keyword is read into diff with transplant -b otherwise.
Test this scenario.
Thanks to Adam Berkes for providing an example case.
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:04 +0000] rev 667
Do not monkeypatch diff when in restricted mode
kw_diff actually disabled restricted mode when 2 revisions were given,
because it effectively disables the extension in this case.
But the commands working with diff and patch need restricted mode
always enabled, i.e. expansion enabled when writing to the
working directory and - crucial for these commands - no expansion
when reading the filelog.
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Nov 2009 11:27:33 +0000] rev 666
Merge with stable
timeless [Fri, 27 Nov 2009 18:26:25 +0000] rev 665
keyword: clarify object of backwards compatibility
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 28 Nov 2009 19:51:21 +0000] rev 664
(0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output
Keep $RCSFile$ for backwards compatibility.
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:04:02 +0000] rev 663
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 26 Nov 2009 10:51:17 +0100] rev 662
The CVS keyword is $RCSfile$, not $RCSFile$
http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords
Fix default keyword map accordingly.
Keep $RCSFile$ for Mercurial backwards compatibility.
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:03:29 +0000] rev 661
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:50:16 +0100] rev 660
keyword: sort demo output to ensure deterministic output
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:42:05 +0200] rev 659
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:40:48 +0200] rev 658
(0.9.2compat) update wiki url
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Oct 2009 23:57:34 +0200] rev 657
hg.clone: report branch name on update
[ original upstream message ]
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 15:32:37 +0200] rev 656
change wiki/bts URLs to point to new hostname
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:37:14 +0200] rev 655
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 654
Uppercase short option for kwfiles --all, like hg status -A
Deprecate kwfiles -a.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 653
Make kwfiles -u show untracked files only (like status)
Remove extra documentation of -u/--unknown, as this is covered in
the option help already.
Like commands.status the code now zips the status flags.
Add more kwfiles tests.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 652
Make kwfiles --all show unknown files too
More consistent and similar to hg status.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 651
kwfiles --unknown instead of --untracked
Use the same option name as "hg status".
Retrieve option in _status().
Mark --untracked as deprecated.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 20:42:39 +0200] rev 650
Merge with stable
Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 22:39:38 -0700] rev 649
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:06:50 +0200] rev 648
(0.9.2compat) do not mark debug message for translation
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:04:38 +0200] rev 647
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 01:15:38 +0200] rev 646
do not attempt to translate ui.debug output
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:41 +0200] rev 645
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:02 +0200] rev 644
(0.9.2compat): run kwdemo before setting up [keyword] files
Ensures that kwdemo runs correctly without further configuration.
Also no need to specify --default option.
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Sep 2009 23:15:37 +0200] rev 643
test: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.