Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py

changeset 213
42bb97ff0bbb
parent 207
3f889378dede
child 215
e8978dca44af
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Wed Apr 28 17:59:38 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Apr 30 13:48:03 2010 +0000
@@ -84,12 +84,13 @@
         else:
             return str(version)
     
-    def start(self, fn, versions = None):
+    def start(self, fn, versions = None, bundle = None):
         """
         Public slot to start the hg diff command.
         
         @param fn filename to be diffed (string)
         @param versions list of versions to be diffed (list of up to 2 strings or None)
+        @param bundle name of a bundle file (string)
         """
         self.errorGroup.hide()
         self.inputGroup.show()
@@ -105,8 +106,11 @@
         args.append('diff')
         self.vcs.addArguments(args, self.vcs.options['global'])
         self.vcs.addArguments(args, self.vcs.options['diff'])
-        
-        if self.vcs.bundleFile:
+        
+        if bundle:
+            args.append('--repository')
+            args.append(bundle)
+        elif self.vcs.bundleFile:
             args.append('--repository')
             args.append(self.vcs.bundleFile)
         

eric ide

mercurial