rebase: move bookmarks as needed with pull --rebase (issue3285)

hgext/rebase.py

@@ -628,6 +628,7 def pullrebase(orig, ui, repo, *args, **
             ui.debug('--update and --rebase are not compatible, ignoring '
                      'the update flag\n')
 
+        movemarkfrom = repo['.'].node()
         cmdutil.bailifchanged(repo)
         revsprepull = len(repo)
         origpostincoming = commands.postincoming
@@ -646,6 +647,9 def pullrebase(orig, ui, repo, *args, **
             if dest != repo['.'].rev():
                 # there was nothing to rebase we force an update
                 hg.update(repo, dest)
+                if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
+                    ui.status(_("updating bookmark %s\n")
+                              % repo._bookmarkcurrent)
     else:
         if opts.get('tool'):
             raise util.Abort(_('--tool can only be used with --rebase'))

tests/test-rebase-pull.t

@@ -77,6 +77,7 Invoke pull --rebase and nothing to reba
 
   $ cd ../c
 
+  $ hg book norebase
   $ hg pull --rebase
   pulling from $TESTTMP/a (glob)
   searching for changes
@@ -86,6 +87,7 Invoke pull --rebase and nothing to reba
   added 1 changesets with 1 changes to 1 files
   nothing to rebase
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  updating bookmark norebase
 
   $ hg tglog -l 1
   @  2: 'R1'