[PATCH 2 of 2] rebase: re-add patches to mq repo after rebase

Nicolas Dumazet nicdumz at gmail.com
Mon Jul 12 04:59:15 CDT 2010


# HG changeset patch
# User Nicolas Dumazet <nicdumz.commits at gmail.com>
# Date 1278928640 -32400
# Branch stable
# Node ID 39c43ecd084d59c4567af5e0550910b3467e68a2
# Parent  cc85aed7e8df69d1fca77899dc8aadf30b147197
rebase: re-add patches to mq repo after rebase

Since 1b82a26635d7, we are adding patches after the qimport call, and not
inside it anymore. Correct updatemq to match the new behaviour.

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -364,6 +364,10 @@
                 repo.mq.qimport(repo, (), patchname=mqrebase[rev][0],
                             git=mqrebase[rev][1],rev=[str(state[rev])])
         repo.mq.save_dirty()
+        qrepo = repo.mq.qrepo()
+        if qrepo:
+            qrepo[None].add(repo.mq.added)
+        repo.mq.added = []
 
 def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches,
                                                                 external):


More information about the Mercurial-devel mailing list