Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Aug 04 14:48:27 2018 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Aug 04 15:24:58 2018 +0200
@@ -2905,12 +2905,12 @@
             if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
-        # TODO: Mercurial 4.7: add support for --bookmark flag
         from .HgExportDialog import HgExportDialog
-        dlg = HgExportDialog()
+        dlg = HgExportDialog(self.hgGetBookmarksList(repodir),
+                             self.version >= (4, 7, 0))
         if dlg.exec_() == QDialog.Accepted:
-            filePattern, revisions, switchParent, allText, noDates, git = \
-                dlg.getParameters()
+            filePattern, revisions, bookmark, switchParent, allText, noDates, \
+            git = dlg.getParameters()
             
             args = self.initCommand("export")
             args.append("--output")
@@ -2924,8 +2924,12 @@
                 args.append("--nodates")
             if git:
                 args.append("--git")
-            for rev in revisions:
-                args.append(rev)
+            if bookmark:
+                args.append ("--bookmark")
+                args.append(bookmark)
+            else:
+                for rev in revisions:
+                    args.append(rev)
             
             dia = HgDialog(self.tr("Export Patches"), self)
             res = dia.startProcess(args, repodir)