--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Nov 03 15:58:22 2013 +0100
@@ -817,12 +817,12 @@
from .HgMultiRevisionSelectionDialog import \
HgMultiRevisionSelectionDialog
dlg = HgMultiRevisionSelectionDialog(
- self.hgGetTagsList(repodir),
- self.hgGetBranchesList(repodir),
- bookmarksList,
- emptyRevsOk=True,
- showLimit=True,
- limitDefault=self.getPlugin().getPreferences("LogLimit"))
+ self.hgGetTagsList(repodir),
+ self.hgGetBranchesList(repodir),
+ bookmarksList,
+ emptyRevsOk=True,
+ showLimit=True,
+ limitDefault=self.getPlugin().getPreferences("LogLimit"))
if dlg.exec_() == QDialog.Accepted:
revs, noEntries = dlg.getRevisions()
from .HgLogDialog import HgLogDialog
@@ -1362,28 +1362,28 @@
info.append(QApplication.translate(
"mercurial",
"""<tr><td><b>Parent #{0}</b></td><td></td></tr>\n"""
- """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")\
+ """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")
.format(index, changeset))
if tags:
info.append(QApplication.translate(
"mercurial",
- """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\
+ """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")
.format('<br/>'.join(tags.split())))
if bookmarks:
info.append(QApplication.translate(
"mercurial",
- """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\
+ """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")
.format('<br/>'.join(bookmarks.split())))
if branches:
info.append(QApplication.translate(
"mercurial",
- """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\
+ """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")
.format('<br/>'.join(branches.split())))
info.append(QApplication.translate(
"mercurial",
"""<tr><td><b>Last author</b></td><td>{0}</td></tr>\n"""
"""<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n"""
- """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")\
+ """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")
.format(author, cdate, ctime))
infoBlock.append("\n".join(info))
if infoBlock:
@@ -1424,7 +1424,7 @@
"""<tr><td><b>URL</b></td><td>{1}</td></tr>\n"""
"""{2}"""
"""</table></p>\n"""
- ).format(self.versionStr, url, infoStr)
+ ).format(self.versionStr, url, infoStr)
###########################################################################
## Private Mercurial specific methods are below.
@@ -1547,13 +1547,13 @@
if output:
self.tagsList = []
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]
+ del li[-1]
else:
- del l[-2:]
- name = " ".join(l)
+ del li[-2:]
+ name = " ".join(li)
if name not in ["tip", "default"]:
self.tagsList.append(name)
@@ -1589,13 +1589,13 @@
if output:
self.branchesList = []
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]
+ del li[-1]
else:
- del l[-2:]
- name = " ".join(l)
+ del li[-2:]
+ name = " ".join(li)
if name not in ["tip", "default"]:
self.branchesList.append(name)
@@ -1820,7 +1820,7 @@
self.trUtf8("Mercurial Side-by-Side Difference"),
self.trUtf8(
"""<p>The file <b>{0}</b> could not be read.</p>""")
- .format(name))
+ .format(name))
return
if self.sbsDiff is None:
@@ -2020,34 +2020,34 @@
"""<tr><td><b>Tip</b></td><td></td></tr>\n"""))
info.append(QApplication.translate(
"mercurial",
- """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")\
+ """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")
.format(changeset))
if tags:
info.append(QApplication.translate(
"mercurial",
- """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\
+ """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")
.format('<br/>'.join(tags.split())))
if bookmarks:
info.append(QApplication.translate(
"mercurial",
- """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\
+ """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")
.format('<br/>'.join(bookmarks.split())))
if branches:
info.append(QApplication.translate(
"mercurial",
- """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\
+ """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")
.format('<br/>'.join(branches.split())))
if parents:
info.append(QApplication.translate(
"mercurial",
- """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")\
+ """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")
.format('<br/>'.join(parents.split())))
info.append(QApplication.translate(
"mercurial",
"""<tr><td><b>Last author</b></td><td>{0}</td></tr>\n"""
"""<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n"""
"""<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n"""
- """</table></p>""")\
+ """</table></p>""")
.format(author, cdate, ctime))
dlg = VcsRepositoryInfoDialog(None, "\n".join(info))
@@ -2922,7 +2922,7 @@
dlg = HgGraftDialog(self, revs)
if dlg.exec_() == QDialog.Accepted:
revs, (userData, currentUser, userName), \
- (dateData, currentDate, dateStr), log, dryrun = dlg.getData()
+ (dateData, currentDate, dateStr), log, dryrun = dlg.getData()
args = []
args.append("graft")
@@ -3067,7 +3067,7 @@
self.trUtf8(
"""<p>The sub-repositories file .hgsub could not"""
""" be read.</p><p>Reason: {0}</p>""")
- .format(str(err)))
+ .format(str(err)))
return
if entry in contents:
@@ -3096,7 +3096,7 @@
self.trUtf8(
"""<p>The sub-repositories file .hgsub could not"""
""" be written to.</p><p>Reason: {0}</p>""")
- .format(str(err)))
+ .format(str(err)))
return
if needsAdd:
@@ -3128,7 +3128,7 @@
self.trUtf8("Remove Sub-repositories"),
self.trUtf8("""<p>The sub-repositories file .hgsub could not"""
""" be read.</p><p>Reason: {0}</p>""")
- .format(str(err)))
+ .format(str(err)))
return
from .HgRemoveSubrepositoriesDialog import \
@@ -3148,7 +3148,7 @@
self.trUtf8(
"""<p>The sub-repositories file .hgsub could not"""
""" be written to.</p><p>Reason: {0}</p>""")
- .format(str(err)))
+ .format(str(err)))
return
if deleteSubrepos:
