Reordered the output of some Mercurial dialogs.

Fri, 16 Sep 2011 18:56:43 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 16 Sep 2011 18:56:43 +0200
changeset 1326
bf3fcb446da5
parent 1325
8dd723182a16
child 1327
8da240d10f91

Reordered the output of some Mercurial dialogs.

Plugins/VcsPlugins/vcsMercurial/HgDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Fri Sep 16 18:55:43 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Fri Sep 16 18:56:43 2011 +0200
@@ -156,10 +156,10 @@
             
             out, err = self.__hgClient.runcommand(args)
             
+            if err:
+                self.__showError(err)
             if out:
                 self.__showOutput(out)
-            if err:
-                self.__showError(err)
             
             self.normal = True
             
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Sep 16 18:55:43 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Sep 16 18:56:43 2011 +0200
@@ -154,15 +154,14 @@
             
             out, err = self.__hgClient.runcommand(args)
             
+            if err:
+                self.__showError(err)
             if out:
                 for line in out.splitlines(True):
                     self.__processOutputLine(line)
                     if self.__hgClient.wasCanceled():
                         break
             
-            if err:
-                self.__showError(err)
-            
             self.__finish()
         else:
             # find the root of the repo
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Fri Sep 16 18:55:43 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Fri Sep 16 18:56:43 2011 +0200
@@ -159,15 +159,14 @@
             
             out, err = self.__hgClient.runcommand(args)
             
+            if err:
+                self.__showError(err)
             if out and self.isVisible():
                 for line in out.splitlines(True):
                     self.__processOutputLine(line)
                     if self.__hgClient.wasCanceled():
                         break
             
-            if err:
-                self.__showError(err)
-            
             self.__finish()
         else:
             self.process.kill()

eric ide

mercurial