Sune Foldager <cryo@cyanite.org> [Thu, 10 Jun 2010 12:46:09 +0200] rev 11322
improve --branch processing (and differentiate from # syntax)
Previously #foo and --branch foo were handled identically.
The behavior of #foo hasn't changed, but --branch now works like this:
1) If branchmap is not supported on the remote, the operation fails.
2) If branch is '.', substitute with branch of the working dir parent.
3) If branch exists remotely, its heads are expanded.
4) Otherwise, the operation fails.
Tests have been added for the new cases.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 06 Jun 2010 17:25:00 +0900] rev 11321
help: show value requirement and multiple occurrence of options
this helps users to know what kind of option is:
- no value is required(flag option)
- value is required
- value is required, and multiple occurrences are allowed
each kinds are shown as below:
-f --force force push
-e --ssh CMD specify ssh command to use
-b --branch BRANCH [+] a specific branch you would like to push
if one or more 3rd type options are shown, explanation for '[+]' mark
is also shown as footnote.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jun 2010 12:45:48 +0100] rev 11320
keyword: pass context to kwtemplater.overwrite
Now that we have retrieved the context in every calling function
except commit, pass it as argument to kwtemplater.overwrite to
avoid looking it up twice.
Reorder arguments to kwtemplater.overwrite to reflect their
importance.
Turn node argument into a simple boolean and rename it to iswctx.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 08 Jun 2010 16:27:59 +0200] rev 11319
parser: fix missing param in _match
Gilles Moris <gilles.moris@free.fr> [Tue, 08 Jun 2010 22:30:44 +0200] rev 11318
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr> [Tue, 08 Jun 2010 22:28:42 +0200] rev 11317
commit: fix display of 'created new head' message (issue2186)
To avoid recurrent fixes for the display of this message, a summary table with
all case combinations has been added to the code.
Basically, there is two condition for the message to be printed:
* this is not an initial (named branch or topo) root
* none of the parents are in the current branch heads
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 08 Jun 2010 18:01:07 +0200] rev 11316
rebase: --abort doesn't strip away the target changeset (issue2220)
When a changeset is skipped, rebase keeps the previous target as next
target and if the skipped cset is the first one, the recorded target is
actually the original target.
--abort did not detect this situation but simply stripped away the cset.
Jan Sorensen <js@aragost.com> [Wed, 09 Jun 2010 17:22:59 +0200] rev 11315
test-branch-option: Updated output to match rev 3f1409082720
Martin Geisler <mg@aragost.com> [Wed, 09 Jun 2010 17:50:45 +0200] rev 11314
Merge with mpm
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 09 Jun 2010 17:27:47 +0200] rev 11313
discovery: fix description line