Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Fri Aug 03 17:56:44 2018 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Sat Aug 04 13:38:50 2018 +0200
@@ -17,7 +17,6 @@
 from ..HgDialog import HgDialog
 
 
-# TODO: Mercurial 4.7: add support for --confirm and --dry-run flags
 class Rebase(HgExtension):
     """
     Class implementing the rebase extension interface.
@@ -48,10 +47,11 @@
         from .HgRebaseDialog import HgRebaseDialog
         dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir),
                              self.vcs.hgGetBranchesList(repodir),
-                             self.vcs.hgGetBookmarksList(repodir))
+                             self.vcs.hgGetBookmarksList(repodir),
+                             self.vcs.version)
         if dlg.exec_() == QDialog.Accepted:
             (indicator, sourceRev, destRev, collapse, keep, keepBranches,
-             detach) = dlg.getData()
+             detach, dryRunOnly, dryRunConfirm) = dlg.getData()
             
             args = self.vcs.initCommand("rebase")
             if indicator == "S":
@@ -71,6 +71,10 @@
                 args.append("--keepbranches")
             if detach:
                 args.append("--detach")
+            if dryRunOnly:
+                args.append("--dry-run")
+            elif dryRunConfirm:
+                args.append("--confirm")
             args.append("--verbose")
             
             dia = HgDialog(self.tr('Rebase Changesets'), self.vcs)