Christian Ebert <blacktrash@gmx.net> [Sun, 29 Nov 2009 11:27:33 +0000] rev 666
Merge with stable
timeless [Fri, 27 Nov 2009 18:26:25 +0000] rev 665
keyword: clarify object of backwards compatibility
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 28 Nov 2009 19:51:21 +0000] rev 664
(0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output
Keep $RCSFile$ for backwards compatibility.
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:04:02 +0000] rev 663
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 26 Nov 2009 10:51:17 +0100] rev 662
The CVS keyword is $RCSfile$, not $RCSFile$
http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords
Fix default keyword map accordingly.
Keep $RCSFile$ for Mercurial backwards compatibility.
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:03:29 +0000] rev 661
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:50:16 +0100] rev 660
keyword: sort demo output to ensure deterministic output
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:42:05 +0200] rev 659
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:40:48 +0200] rev 658
(0.9.2compat) update wiki url
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Oct 2009 23:57:34 +0200] rev 657
hg.clone: report branch name on update
[ original upstream message ]
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 15:32:37 +0200] rev 656
change wiki/bts URLs to point to new hostname
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:37:14 +0200] rev 655
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 654
Uppercase short option for kwfiles --all, like hg status -A
Deprecate kwfiles -a.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 653
Make kwfiles -u show untracked files only (like status)
Remove extra documentation of -u/--unknown, as this is covered in
the option help already.
Like commands.status the code now zips the status flags.
Add more kwfiles tests.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 652
Make kwfiles --all show unknown files too
More consistent and similar to hg status.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 651
kwfiles --unknown instead of --untracked
Use the same option name as "hg status".
Retrieve option in _status().
Mark --untracked as deprecated.
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 20:42:39 +0200] rev 650
Merge with stable
Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 22:39:38 -0700] rev 649
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:06:50 +0200] rev 648
(0.9.2compat) do not mark debug message for translation
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:04:38 +0200] rev 647
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 01:15:38 +0200] rev 646
do not attempt to translate ui.debug output
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:41 +0200] rev 645
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:02 +0200] rev 644
(0.9.2compat): run kwdemo before setting up [keyword] files
Ensures that kwdemo runs correctly without further configuration.
Also no need to specify --default option.
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Sep 2009 23:15:37 +0200] rev 643
test: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.
Christian Ebert <blacktrash@gmx.net> [Fri, 28 Aug 2009 16:18:28 +0100] rev 642
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 27 Aug 2009 00:00:15 +0200] rev 641
test-keyword: update output to match 5d49fdef6fd0
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:25:33 +0200] rev 640
(0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:18:32 +0200] rev 639
(0.9.2compat) prefer util.datestr over time module import
We keep the function in this branch to catch the TypeError.
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:01:55 +0200] rev 638
(0.9.2compat) remove "help keyword" from test
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:57:21 +0200] rev 637
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:49 +0200] rev 636
Use util.datestr for utcdate filter, make it accessable in variable
lambda syntax mimicking templatefilters.py
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:44 +0200] rev 635
Reference templating help, add utcdate filter example