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.
Martin Geisler <mg@aragost.com> [Fri, 25 Feb 2011 12:32:15 +0100] rev 13475
eol: handle LockUnavailable error (issue2569)
If the repository is not locked when clearing the dirstate, then
running test-eol.t in a loop fails sooner or later with:
ERROR: /home/mg/src/mercurial-crew/tests/test-eol.t output changed
--- /home/mg/src/mercurial-crew/tests/test-eol.t
+++ /home/mg/src/mercurial-crew/tests/test-eol.t.err
@@ -343,6 +343,7 @@
% hg status (eol activated)
M win.txt
% hg commit
+ nothing changed
% hg status
$ testmixed CRLF
However, if we cannot lock the repository, then we can also not make a
commit and so we can simply ignore a LockUnavailable error.
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 19:15:00 +0100] rev 13474
tests: check if the bookmarks extension is ignored
Jonathan Nieder <jrnieder@gmail.com> [Fri, 11 Feb 2011 21:17:27 -0600] rev 13473
backout: clarify which changesets are new in help text
Plus another wording tweak ("default behavior -> "behavior without
--merge").
Suggested by Kevin Bullock.
Martin Geisler <mg@aragost.com> [Fri, 25 Feb 2011 11:39:19 +0100] rev 13472
commands: update year to 2011 in version string
Martin Geisler <mg@aragost.com> [Fri, 25 Feb 2011 10:52:37 +0100] rev 13471
eol: clarify where the .hgeol file is located
Martin Geisler <mg@aragost.com> [Thu, 24 Feb 2011 15:35:22 +0100] rev 13470
commands: mark strings for translation