Plugins/VcsPlugins/vcsMercurial/hg.py

changeset 6460
af9e529d0fb6
parent 6458
97480c872ea9
child 6461
48bf6c3f084f
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Aug 04 13:38:50 2018 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Aug 04 14:05:07 2018 +0200
@@ -3000,13 +3000,13 @@
             if os.path.splitdrive(repodir)[1] == os.sep:
                 return False
         
-        # TODO: Mercurial 4.7: add support for the --no-commit flag
         from .HgGraftDialog import HgGraftDialog
         res = False
         dlg = HgGraftDialog(self, revs)
         if dlg.exec_() == QDialog.Accepted:
             revs, (userData, currentUser, userName), \
-                (dateData, currentDate, dateStr), log, dryrun = dlg.getData()
+                (dateData, currentDate, dateStr), log, dryrun, \
+                noCommit = dlg.getData()
             
             args = self.initCommand("graft")
             args.append("--verbose")
@@ -3026,6 +3026,8 @@
                 args.append("--log")
             if dryrun:
                 args.append("--dry-run")
+            if noCommit:
+                args.append("--no-commit")
             args.extend(revs)
             
             dia = HgDialog(self.tr('Copy Changesets'), self)

eric ide

mercurial