Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Sun Sep 04 18:12:08 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Mon Sep 05 18:40:32 2011 +0200
@@ -116,7 +116,7 @@
         self.__hasAddOrDelete = False
         if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", "transplant",
                        "update"] or \
-           (args[0] == "pull" and \
+           (args[0] in ["pull", "unbundle"] and \
             ("--update" in args[1:] or "--rebase" in args[1:])):
             self.__updateCommand = True
         else:

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Sep 04 18:12:08 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Mon Sep 05 18:40:32 2011 +0200
@@ -123,7 +123,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:12:08 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Mon Sep 05 18:40:32 2011 +0200
@@ -1173,7 +1173,14 @@
         """
         Private 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("Pull"),
+                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:12:08 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Mon Sep 05 18:40:32 2011 +0200
@@ -2137,6 +2137,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)
         
@@ -2147,6 +2149,7 @@
             if repodir == os.sep:
                 return
         
+        res = False
         files = E5FileDialog.getOpenFileNames(
             None,
             self.trUtf8("Apply changegroups"),
@@ -2162,12 +2165,16 @@
             args.append('unbundle')
             if update:
                 args.append("--update")
+                args.append("--verbose")
             args.extend(files)
             
             dia = HgDialog(self.trUtf8('Apply changegroups'), self)
             res = dia.startProcess(args, repodir)
             if res:
                 dia.exec_()
+                res = dia.hasAddOrDelete()
+            self.checkVCSStatus()
+        return res
     
     def hgBisect(self, name, subcommand):
         """