rebase: re-add patches to mq repo after rebase stable
authorNicolas Dumazet <nicdumz.commits@gmail.com>
Tue, 13 Jul 2010 20:12:32 +0900
branchstable
changeset 11531 59bd20451ab6
parent 11530 958022f0f1d5
child 11536 92342fa9fbd8
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.
hgext/rebase.py
--- a/hgext/rebase.py	Mon Jul 12 17:55:23 2010 +0900
+++ b/hgext/rebase.py	Tue Jul 13 20:12:32 2010 +0900
@@ -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):