Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:21:30 -0700] rev 712
rollback: improve message
[ original upstream message ]
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 ]
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.
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 14:12:56 +0200] rev 709
Merge with 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
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
Christian Ebert <blacktrash@gmx.net> [Tue, 30 Mar 2010 11:08:13 +0100] rev 706
Merge with 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 ]
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Mar 2010 23:16:44 +0100] rev 704
(0.9.2compat) get applicable changes from default
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.
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.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:23 +0100] rev 701
1 variable name for overwriting candidates
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.
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.
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:56:41 +0100] rev 698
(0.9.2compat) update copyright _and_ licence
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:48:38 +0100] rev 697
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:41 +0100] rev 696
Update copyright
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:14 +0100] rev 695
Remove deprecated options
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:57:55 +0100] rev 694
Merge with 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 ]
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 ]
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:48:01 +0100] rev 691
(stable) merge
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.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 21:09:04 +0100] rev 689
(0.9.2compat) use status' names for readability
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.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 19:56:37 +0100] rev 687
Use status' names instead of index
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 21:57:52 +0100] rev 686
(stable) merge
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.
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 11:15:18 +0100] rev 684
Merge with 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 ]