Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

changeset 1242
dfb9609caf51
parent 1241
09c6155ee612
child 1248
7d0eff6435a9
diff -r 09c6155ee612 -r dfb9609caf51 Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Aug 28 20:08:21 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Mon Aug 29 18:06:35 2011 +0200
@@ -650,6 +650,9 @@
             args.append(self.filename)
         
         if self.__hgClient:
+            self.inputGroup.setEnabled(False)
+            self.inputGroup.hide()
+            
             out, err = self.__hgClient.runcommand(args)
             self.buf = out.splitlines(True)
             if err:
@@ -937,7 +940,10 @@
             self.close()
         elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
             self.cancelled = True
-            self.__finish()
+            if self.__hgClient:
+                self.__hgClient.cancel()
+            else:
+                self.__finish()
         elif button == self.refreshButton:
             self.on_refreshButton_clicked()
     

eric ide

mercurial