A little change to the Mercurial side-by-side diff function indicating the work area version of the file. 5_5_x

Sun, 26 Oct 2014 18:45:15 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 26 Oct 2014 18:45:15 +0100
branch
5_5_x
changeset 3884
e4764ef5f71b
parent 3881
788a2185eabb
child 3885
f914af657e47

A little change to the Mercurial side-by-side diff function indicating the work area version of the file.
(grafted from 0326270f6f1e91ebd9dcb78ef3687f9ca84cd09a)

Plugins/VcsPlugins/vcsMercurial/hg.py file | annotate | diff | comparison | revisions
diff -r 788a2185eabb -r e4764ef5f71b Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Oct 25 10:51:37 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Oct 26 18:45:15 2014 +0100
@@ -1872,7 +1872,7 @@
                 f1 = open(name, "r", encoding="utf-8")
                 output2 = f1.read()
                 f1.close()
-                name2 = name
+                name2 = "{0} (Work)".format(name)
             except IOError:
                 E5MessageBox.critical(
                     self.__ui,

eric ide

mercurial