Fixed an issue in the Mercurial summary dialog. 5_4_x

Sun, 19 Jan 2014 15:38:10 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 19 Jan 2014 15:38:10 +0100
branch
5_4_x
changeset 3219
9b95fb6bdfa8
parent 3216
001982b9acf9
child 3225
b368dbec1e0b

Fixed an issue in the Mercurial summary dialog.

Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Sun Jan 19 11:32:42 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Sun Jan 19 15:38:10 2014 +0100
@@ -269,11 +269,11 @@
                 if value.endswith("(current)"):
                     value = ("@CURRENT@", 0, 0)
                 elif value.endswith("(update)"):
-                    value = ("@UPDATE@", value.split(" ", 1)[0], 0)
+                    value = ("@UPDATE@", int(value.split(" ", 1)[0]), 0)
                 elif value.endswith("(merge)"):
                     parts = value.split(", ")
-                    value = ("@MERGE@", parts[0].split(" ", 1)[0],
-                             parts[1].split(" ", 1)[0])
+                    value = ("@MERGE@", int(parts[0].split(" ", 1)[0]),
+                             int(parts[1].split(" ", 1)[0]))
                 else:
                     value = ("@UNKNOWN@", 0, 0)
             elif name == "remote":

eric ide

mercurial