changeset 20281:67ee87a371b2

update: consider successor changesets when moving active bookmark Previously, when an obsolete changeset was bookmarked, successor changesets were not considered when moving the bookmark forward. Now that a bare update will move to the tip most of the successor changesets, we also update the bookmark logic to allow the bookmark to move with this update. Tests have been updated and keep issue4015 covered as well.
author Sean Farley <sean.michael.farley@gmail.com>
date Wed, 15 Jan 2014 17:48:48 -0600
parents 95b9c6149e17
children 2cfb720592fe
files mercurial/bookmarks.py tests/test-update-branches.t
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bookmarks.py	Wed Jan 15 16:41:18 2014 -0600
+++ b/mercurial/bookmarks.py	Wed Jan 15 17:48:48 2014 -0600
@@ -192,13 +192,12 @@
         return False
 
     if marks[cur] in parents:
-        old = repo[marks[cur]]
         new = repo[node]
         divs = [repo[b] for b in marks
                 if b.split('@', 1)[0] == cur.split('@', 1)[0]]
         anc = repo.changelog.ancestors([new.rev()])
         deletefrom = [b.node() for b in divs if b.rev() in anc or b == new]
-        if old.descendant(new):
+        if validdest(repo, repo[marks[cur]], new):
             marks[cur] = new.node()
             update = True
 
--- a/tests/test-update-branches.t	Wed Jan 15 16:41:18 2014 -0600
+++ b/tests/test-update-branches.t	Wed Jan 15 17:48:48 2014 -0600
@@ -229,13 +229,16 @@
   $ hg bookmarks
    * bm                        5:ff252e8273df
 
-Test that 4 is detected as the no-argument destination from 3
+Test that 4 is detected as the no-argument destination from 3 and also moves
+the bookmark with it
   $ hg up --quiet 0          # we should be able to update to 3 directly
   $ hg up --quiet --hidden 3 # but not implemented yet.
+  $ hg book -f bm
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg id
-  d047485b3896+ (b1)
+  updating bookmark bm
+  $ hg book
+   * bm                        4:d047485b3896
 
 Test that 5 is detected as a valid destination from 1
   $ hg up --quiet 0          # we should be able to update to 3 directly