diff -r 10516539f238 -r 0a02c433f52d Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Oct 18 23:00:41 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Nov 01 15:48:48 2013 +0100
@@ -136,8 +136,8 @@
self.logTree.setIconSize(
QSize(100 * self.__rowHeight, self.__rowHeight))
if self.vcs.version >= (1, 8):
- self.logTree.headerItem().setText(self.logTree.columnCount(),
- self.trUtf8("Bookmarks"))
+ self.logTree.headerItem().setText(
+ self.logTree.columnCount(), self.trUtf8("Bookmarks"))
if self.vcs.version < (2, 1):
self.logTree.setColumnHidden(self.PhaseColumn, True)
self.phaseLine.hide()
@@ -210,10 +210,10 @@
Private method to resort the changed files tree.
"""
sortColumn = self.filesTree.sortColumn()
- self.filesTree.sortItems(1,
- self.filesTree.header().sortIndicatorOrder())
- self.filesTree.sortItems(sortColumn,
- self.filesTree.header().sortIndicatorOrder())
+ self.filesTree.sortItems(
+ 1, self.filesTree.header().sortIndicatorOrder())
+ self.filesTree.sortItems(
+ sortColumn, self.filesTree.header().sortIndicatorOrder())
def __getColor(self, n):
"""
@@ -430,7 +430,8 @@
errMsg = self.trUtf8("Could not start the hg executable.")
if errMsg:
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8("Mercurial Error"),
errMsg)
@@ -472,7 +473,8 @@
errMsg = self.trUtf8("Could not start the hg executable.")
if errMsg:
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8("Mercurial Error"),
errMsg)
@@ -518,7 +520,8 @@
errMsg = self.trUtf8("Could not start the hg executable.")
if errMsg:
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8("Mercurial Error"),
errMsg)
@@ -713,7 +716,8 @@
if not procStarted:
self.inputGroup.setEnabled(False)
self.inputGroup.hide()
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8('Process Generation Error'),
self.trUtf8(
'The process {0} could not be started. '
@@ -864,7 +868,8 @@
log["message"].append(value.strip())
else:
if len(log) > 1:
- self.__generateLogItem(log["author"], log["date"],
+ self.__generateLogItem(
+ log["author"], log["date"],
log["message"], log["revision"], changedPaths,
log["parents"], log["branches"], log["tags"],
log["phase"], log["bookmarks"])
@@ -1391,7 +1396,8 @@
if revs:
shouldReopen = self.vcs.hgGraft(self.repodir, revs)
if shouldReopen:
- res = E5MessageBox.yesNo(None,
+ res = E5MessageBox.yesNo(
+ None,
self.trUtf8("Copy Changesets"),
self.trUtf8(
"""The project should be reread. Do this now?"""),
