Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py

branch
Py2 comp.
changeset 3060
5883ce99ee12
parent 3057
10516539f238
parent 3036
30c81c9e88b8
child 3145
a9de05d4a22f
diff -r 0a02c433f52d -r 5883ce99ee12 Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Sun Nov 03 15:58:22 2013 +0100
@@ -91,13 +91,13 @@
         
         self.bookmarksList = []
         for line in output.splitlines():
-            l = line.strip().split()
-            if l[-1][0] in "1234567890":
+            li = line.strip().split()
+            if li[-1][0] in "1234567890":
                 # last element is a rev:changeset
-                del l[-1]
-                if l[0] == "*":
-                    del l[0]
-                name = " ".join(l)
+                del li[-1]
+                if li[0] == "*":
+                    del li[0]
+                name = " ".join(li)
                 self.bookmarksList.append(name)
         
         return self.bookmarksList[:]
@@ -288,9 +288,9 @@
         
         for line in output.splitlines():
             if line.startswith(" "):
-                l = line.strip().split()
-                del l[-1]
-                name = " ".join(l)
+                li = line.strip().split()
+                del li[-1]
+                name = " ".join(li)
                 bookmarksList.append(name)
         
         return bookmarksList
@@ -323,7 +323,7 @@
             args.append(bookmark)
             
             dia = HgDialog(self.trUtf8(
-                    'Pulling bookmark from a remote Mercurial repository'),
+                'Pulling bookmark from a remote Mercurial repository'),
                 self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
@@ -357,7 +357,7 @@
             args.append(bookmark)
             
             dia = HgDialog(self.trUtf8(
-                    'Pushing bookmark to a remote Mercurial repository'),
+                'Pushing bookmark to a remote Mercurial repository'),
                 self.vcs)
             res = dia.startProcess(args, repodir)
             if res:

eric ide

mercurial