Mercurial Repositories > eric / file diff

diff -r 09c6155ee612 -r dfb9609caf51 Plugins/VcsPlugins/vcsMercurial/HgDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Sun Aug 28 20:08:21 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Mon Aug 29 18:06:35 2011 +0200
@@ -82,7 +82,10 @@
         if button == self.buttonBox.button(QDialogButtonBox.Close):
             self.close()
         elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
-            self.__finish()
+            if self.__hgClient:
+                self.__hgClient.cancel()
+            else:
+                self.__finish()
     
     def __procFinished(self, exitCode, exitStatus):
         """
@@ -117,6 +120,9 @@
             self.__updateCommand = False
         
         if showArgs:
+            self.inputGroup.setEnabled(False)
+            self.inputGroup.hide()
+            
             self.resultbox.append(' '.join(args))
             self.resultbox.append('')