Fixed a few issues in the Mercurial plug-in. 5_1_x

Mon, 05 Sep 2011 18:40:32 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 05 Sep 2011 18:40:32 +0200
branch
5_1_x
changeset 1285
544520790fdd
parent 1281
80a974cf4f14
child 1286
2f118d4d9c5c

Fixed a few issues in the Mercurial plug-in.
(transplanted from 5766284d439392d94770ff77ae8f6f7095d764db)

Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/hg.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Sep 04 18:02:38 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Mon Sep 05 18:40:32 2011 +0200
@@ -118,7 +118,7 @@
         args.append(self.mode)
         self.vcs.addArguments(args, self.vcs.options['global'])
         self.vcs.addArguments(args, self.vcs.options['log'])
-        if noEntries:
+        if noEntries and self.mode == "log":
             args.append('--limit')
             args.append(str(noEntries))
         if self.mode in ("incoming", "outgoing"):
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sun Sep 04 18:02:38 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Mon Sep 05 18:40:32 2011 +0200
@@ -1035,7 +1035,14 @@
         """
         Protected slot used to apply changegroup files.
         """
-        self.vcs.hgUnbundle(self.project.ppath)
+        shouldReopen = self.vcs.hgUnbundle(self.project.ppath)
+        if shouldReopen:
+            res = E5MessageBox.yesNo(self.parent(),
+                self.trUtf8("Unbundle"),
+                self.trUtf8("""The project should be reread. Do this now?"""),
+                yesDefault=True)
+            if res:
+                self.project.reopenProject()
     
     def __hgBisectGood(self):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Sep 04 18:02:38 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Mon Sep 05 18:40:32 2011 +0200
@@ -1838,6 +1838,8 @@
         Public method to apply changegroup files.
         
         @param name directory name (string)
+        @return flag indicating, that the update contained an add
+            or delete (boolean)
         """
         dname, fname = self.splitPath(name)
         
@@ -1848,6 +1850,7 @@
             if repodir == os.sep:
                 return
         
+        res = False
         files = E5FileDialog.getOpenFileNames(
             None,
             self.trUtf8("Apply changegroups"),
@@ -1863,12 +1866,16 @@
             args.append('unbundle')
             if update:
                 args.append("--update")
+                args.append("--verbose")
             args.extend(files)
             
             dia = HgDialog(self.trUtf8('Apply changegroups'))
             res = dia.startProcess(args, repodir)
             if res:
                 dia.exec_()
+                res = dia.hasAddOrDelete()
+            self.checkVCSStatus()
+        return res
     
     def hgBisect(self, name, subcommand):
         """

eric ide

mercurial