eric: comparison Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py

-:1b59c4ba121e
+:8cd4d08fa9f6
 from .SvnDiffDialog import SvnDiffDialog
 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog
 import Preferences
 class SvnStatusDialog(QWidget, Ui_SvnStatusDialog):
 """
 Class implementing a dialog to show the output of the svn status command
 process.
 """
-def __init__(self, vcs, parent = None):
+def __init__(self, vcs, parent=None):
 """
 Constructor
 @param vcs reference to the vcs object
 @param parent parent widget (QWidget)
 self.process = None
 self.vcs = vcs
 self.vcs.committed.connect(self.__committed)
 self.statusList.headerItem().setText(self.__lastColumn, "")
 self.statusList.header().setSortIndicator(self.__pathColumn,
 Qt.AscendingOrder)
 if self.vcs.versionStr < '1.5.0':
 self.statusList.header().hideSection(self.__changelistColumn)
 self.menuactions = []
 self.statusList.setContextMenuPolicy(Qt.CustomContextMenu)
 self.statusList.customContextMenuRequested.connect(
 self.__showContextMenu)
 self.modifiedIndicators = [
 self.trUtf8('added'),
 self.trUtf8('deleted'),
 self.trUtf8('modified'),
 ]
 self.missingIndicators = [
 self.trUtf8('missing'),
 ]
 self.unversionedIndicators = [
 self.trUtf8('unversioned'),
 ]
 self.lockedIndicators = [
 self.trUtf8('locked'),
 ]
 self.stealBreakLockIndicators = [
 self.trUtf8('other lock'),
 self.trUtf8('stolen lock'),
 self.trUtf8('broken lock'),
 ]
 self.unlockedIndicators = [
 self.trUtf8('not locked'),
 ]
 self.status = {
-' ' : self.trUtf8('normal'),
+' ': self.trUtf8('normal'),
-'A' : self.trUtf8('added'),
+'A': self.trUtf8('added'),
-'D' : self.trUtf8('deleted'),
+'D': self.trUtf8('deleted'),
-'M' : self.trUtf8('modified'),
+'M': self.trUtf8('modified'),
-'R' : self.trUtf8('replaced'),
+'R': self.trUtf8('replaced'),
-'C' : self.trUtf8('conflict'),
+'C': self.trUtf8('conflict'),
-'X' : self.trUtf8('external'),
+'X': self.trUtf8('external'),
-'I' : self.trUtf8('ignored'),
+'I': self.trUtf8('ignored'),
-'?' : self.trUtf8('unversioned'),
+'?': self.trUtf8('unversioned'),
-'!' : self.trUtf8('missing'),
+'!': self.trUtf8('missing'),
-'~' : self.trUtf8('type error'),
+'~': self.trUtf8('type error'),
 }
 self.propStatus = {
-' ' : self.trUtf8('normal'),
+' ': self.trUtf8('normal'),
-'M' : self.trUtf8('modified'),
+'M': self.trUtf8('modified'),
-'C' : self.trUtf8('conflict'),
+'C': self.trUtf8('conflict'),
 }
 self.locked = {
-' ' : self.trUtf8('no'),
+' ': self.trUtf8('no'),
-'L' : self.trUtf8('yes'),
+'L': self.trUtf8('yes'),
 }
 self.history = {
-' ' : self.trUtf8('no'),
+' ': self.trUtf8('no'),
-'+' : self.trUtf8('yes'),
+'+': self.trUtf8('yes'),
 }
 self.switched = {
-' ' : self.trUtf8('no'),
+' ': self.trUtf8('no'),
-'S' : self.trUtf8('yes'),
+'S': self.trUtf8('yes'),
 }
 self.lockinfo = {
-' ' : self.trUtf8('not locked'),
+' ': self.trUtf8('not locked'),
-'K' : self.trUtf8('locked'),
+'K': self.trUtf8('locked'),
-'O' : self.trUtf8('other lock'),
+'O': self.trUtf8('other lock'),
-'T' : self.trUtf8('stolen lock'),
+'T': self.trUtf8('stolen lock'),
-'B' : self.trUtf8('broken lock'),
+'B': self.trUtf8('broken lock'),
 }
 self.uptodate = {
-' ' : self.trUtf8('yes'),
+' ': self.trUtf8('yes'),
-'*' : self.trUtf8('no'),
+'*': self.trUtf8('no'),
 }
 self.rx_status = \
 QRegExp('(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
 # flags (8 anything), revision, changed rev, author, path
 def __resort(self):
 """
 Private method to resort the tree.
 """
 self.statusList.sortItems(self.statusList.sortColumn(),
 self.statusList.header().sortIndicatorOrder())
 def __resizeColumns(self):
 """
 Private method to resize the list columns.
 self.currentChangelist == "":
 return
 statusText = self.status[status]
 itm = QTreeWidgetItem(self.statusList, [
 self.currentChangelist,
 statusText,
 self.propStatus[propStatus],
 self.locked[locked],
 self.history[history],
 self.switched[switched],
 self.lockinfo[lockinfo],
 self.uptodate[uptodate],
 "{0:7}".format(str(revision)),
 "{0:7}".format(str(change)),
 author,
 path,
 ])
 itm.setTextAlignment(1, Qt.AlignLeft)
 itm.setTextAlignment(2, Qt.AlignHCenter)
 itm.setTextAlignment(3, Qt.AlignHCenter)
 self.statusList.doItemsLayout()
 self.__resort()
 self.__resizeColumns()
 self.statusList.setColumnHidden(self.__changelistColumn,
 not self.changelistFound)
 self.statusList.setColumnHidden(self.__propStatusColumn,
 self.hidePropertyStatusColumn)
 self.statusList.setColumnHidden(self.__lockedColumn,
 self.hideLockColumns)
 self.statusList.setColumnHidden(self.__lockinfoColumn,
 self.hideLockColumns)
 self.statusList.setColumnHidden(self.__upToDateColumn,
 self.hideUpToDateColumn)
 self.statusList.setColumnHidden(self.__historyColumn,
 self.hideHistoryColumn)
 self.statusList.setColumnHidden(self.__switchedColumn,
 self.hideSwitchedColumn)
 self.__updateButtons()
 self.__updateCommitButton()
 """
 if self.process is not None:
 self.process.setReadChannel(QProcess.StandardOutput)
 while self.process.canReadLine():
 s = str(self.process.readLine(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 if self.rx_status.exactMatch(s):
 flags = self.rx_status.cap(1)
 rev = self.rx_status.cap(2)
 change = self.rx_status.cap(3)
 It reads the error output of the process and inserts it into the
 error pane.
 """
 if self.process is not None:
 self.errorGroup.show()
 s = str(self.process.readAllStandardError(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 self.errors.insertPlainText(s)
 self.errors.ensureCursorVisible()
 def on_passwordCheckBox_toggled(self, isOn):
 self.trUtf8("Lock"),
 self.trUtf8("""There are no unlocked files"""
 """ available/selected."""))
 return
-self.vcs.svnLock(names, parent = self)
+self.vcs.svnLock(names, parent=self)
 self.on_refreshButton_clicked()
 def __unlock(self):
 """
 Private slot to handle the Unlock context menu entry.
 self.trUtf8("Unlock"),
 self.trUtf8("""There are no locked files"""
 """ available/selected."""))
 return
-self.vcs.svnUnlock(names, parent = self)
+self.vcs.svnUnlock(names, parent=self)
 self.on_refreshButton_clicked()
 def __breakLock(self):
 """
 Private slot to handle the Break Lock context menu entry.
 self.trUtf8("Break Lock"),
 self.trUtf8("""There are no locked files"""
 """ available/selected."""))
 return
-self.vcs.svnUnlock(names, parent = self, breakIt = True)
+self.vcs.svnUnlock(names, parent=self, breakIt=True)
 self.on_refreshButton_clicked()
 def __stealLock(self):
 """
 Private slot to handle the Break Lock context menu entry.

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py

Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py