Martin Geisler <mg@aragost.com> [Wed, 23 Feb 2011 15:35:44 +0100] rev 13485
i18n-da: synchronize with 14a699ed774b
Martin Geisler <mg@aragost.com> [Wed, 23 Feb 2011 15:31:49 +0100] rev 13484
i18n: merge with main
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 23 Feb 2011 23:15:02 +0900] rev 13483
i18n-ja: synchronized with 7458b7e0d8d5
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 23 Feb 2011 22:52:38 +0900] rev 13482
i18n-ja: synchronized with ba50f1600131
Matt Mackall <mpm@selenic.com> [Fri, 25 Feb 2011 15:31:32 -0600] rev 13481
context: be even more careful about result order in ancestors() (issue2642)
The earlier patch could be confused by more complicated topologies.
Azhagu Selvan SP <tamizhgeek@gmail.com> [Thu, 24 Feb 2011 01:14:15 +0530] rev 13480
convert/svn: abort operation when python bindings are not available
Subversion python bindings check was not present in svn_sink source
class which made it fail while using svn as destination repository.
Added a more maintainble svn bindings check for svn_source and svn_sink
classes.
Azhagu Selvan SP <tamizhgeek@gmail.com> [Thu, 24 Feb 2011 00:45:02 +0530] rev 13479
convert/svn: handle MissingTool exception from converter_sink class
The converter_sink class had no way of handling MissingTool
exception. This change makes it to abort when there is a
MissingTool exception.
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 14:38:50 +0100] rev 13478
bookmarks: restrict moving a bookmark to its descendants (issue1502)
A bookmark can only move to a descendant on commit, pull or
unbundle. Bookmarks cannot jump between heads anymore. This fixese
issue 1502.
We explicitly use new.node(), to emphasise that we are updating the
current bookmark to the new node.
Kevin Bullock <kbullock@ringworld.org> [Fri, 18 Feb 2011 17:09:08 -0600] rev 13477
id: add bookmarks to id
Since bookmarks are no longer merged with repo.tags() as of
d012d95499f7, they don't show up in `hg id` as they used to. This adds
them back into the summary that `hg id` prints, and adds a
-B/--bookmarks flag alongside the -t/--tags and -b/--branch options.
Note this introduces a slight backwards-incompatibility: the summary
printed by `hg id` now separates bookmarks from tags with a space, as
seen below, instead of running it into the tags list.
Default summary output:
$ hg id
db815d6d32e6 tip/tag1 bm1/bm2
Output with --bookmarks:
$ hg id --bookmarks
bm1 bm2
See also afc84a879ac8 which adds bookmarks back into `hg summary`.
Kevin Bullock <kbullock@ringworld.org> [Wed, 23 Feb 2011 20:47:00 -0600] rev 13476
workingctx: overload bookmarks() to return parents' bookmarks
This implements workingctx.bookmarks() parallel to workingctx.tags(),
overloading the implementation from changectx.