--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Oct 18 23:00:41 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Nov 01 15:48:48 2013 +0100 @@ -138,7 +138,8 @@ """ Private method to resort the tree. """ - self.statusList.sortItems(self.statusList.sortColumn(), + self.statusList.sortItems( + self.statusList.sortColumn(), self.statusList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -281,7 +282,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. ' @@ -363,9 +365,10 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), - 'replace') + line = str( + self.process.readLine(), + Preferences.getSystem("IOEncoding"), + 'replace') self.__processOutputLine(line) def __processOutputLine(self, line): @@ -595,7 +598,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getCommitableItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Commit"), self.trUtf8("""There are no entries selected to be""" """ committed.""")) @@ -634,7 +638,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getUnversionedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Add"), self.trUtf8("""There are no unversioned entries""" """ available/selected.""")) @@ -655,7 +660,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getMissingItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Remove"), self.trUtf8("""There are no missing entries""" """ available/selected.""")) @@ -671,7 +677,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -694,7 +701,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getMissingItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no missing entries""" """ available/selected.""")) @@ -711,7 +719,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Differences"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -730,13 +739,15 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) return elif len(names) > 1: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""Only one file with uncommitted changes""" """ must be selected."""))