Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Apr 30 16:23:24 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Apr 30 16:45:56 2010 +0000
@@ -106,11 +106,11 @@
         args.append('diff')
         self.vcs.addArguments(args, self.vcs.options['global'])
         self.vcs.addArguments(args, self.vcs.options['diff'])
-        
+        
         if bundle:
             args.append('--repository')
             args.append(bundle)
-        elif self.vcs.bundleFile:
+        elif self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile):
             args.append('--repository')
             args.append(self.vcs.bundleFile)
         

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Fri Apr 30 16:23:24 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Fri Apr 30 16:45:56 2010 +0000
@@ -45,7 +45,7 @@
         Constructor
         
         @param vcs reference to the vcs object
-        @param mode mode of the dialog (string; one of log, incoming, outgoing)
+        @param mode mode of the dialog (string; one of log, incoming, outgoing)
         @param bundle name of a bundle file (string)
         @param parent parent widget (QWidget)
         """
@@ -62,7 +62,7 @@
         if mode in ("log", "incoming", "outgoing"):
             self.commandMode = mode
         else:
-            self.commandMode = "log"
+            self.commandMode = "log"
         self.bundle = bundle
         
         self.__maxDate = QDate()
@@ -294,13 +294,13 @@
         process = QProcess()
         args = []
         args.append("parents")
-        if self.commandMode == "incoming":
+        if self.commandMode == "incoming":
             if self.bundle:
                 args.append("--repository")
-                args.append(self.bundle)
-            elif self.vcs.bundleFile:
+                args.append(self.bundle)
+            elif self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile):
                 args.append("--repository")
-                args.append(self.vcs.bundleFile)
+                args.append(self.vcs.bundleFile)
         args.append("--template")
         args.append("{rev}\n")
         args.append("-r")
@@ -458,9 +458,9 @@
             args.append('--copies')
         args.append('--style')
         args.append(os.path.join(os.path.dirname(__file__), "styles", "logBrowser.style"))
-        if self.commandMode == "incoming":
-            if self.bundle:
-                args.append(self.bundle)
+        if self.commandMode == "incoming":
+            if self.bundle:
+                args.append(self.bundle)
             else:
                 project = e5App().getObject("Project")
                 self.vcs.bundleFile = os.path.join(

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Fri Apr 30 16:23:24 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Fri Apr 30 16:45:56 2010 +0000
@@ -172,7 +172,7 @@
             if self.bundle:
                 args.append("--repository")
                 args.append(self.bundle)
-            elif self.vcs.bundleFile:
+            elif self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile):
                 args.append("--repository")
                 args.append(self.vcs.bundleFile)
         args.append("--template")