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

-:16cecff8614d
+:65585df1d52c
 # Copyright (c) 2003 - 2011 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 """
-Module implementing a dialog to show the output of the svn status command process.
+Module implementing a dialog to show the output of the svn status command
+process.
 """
 import os
 import pysvn
 import Preferences
 class SvnStatusDialog(QWidget, SvnDialogMixin, Ui_SvnStatusDialog):
 """
-Class implementing a dialog to show the output of the svn status command process.
+Class implementing a dialog to show the output of the svn status command
+process.
 """
 def __init__(self, vcs, parent = None):
 """
 Constructor
 SvnDialogMixin.__init__(self)
 self.__changelistColumn = 0
 self.__statusColumn = 1
 self.__propStatusColumn = 2
+self.__lockedColumn = 3
+self.__historyColumn = 4
+self.__switchedColumn = 5
 self.__lockinfoColumn = 6
+self.__upToDateColumn = 7
 self.__pathColumn = 11
 self.__lastColumn = self.statusList.columnCount()
 self.refreshButton = \
-self.buttonBox.addButton(self.trUtf8("Refresh"), QDialogButtonBox.ActionRole)
+self.buttonBox.addButton(self.trUtf8("Refresh"),
-self.refreshButton.setToolTip(self.trUtf8("Press to refresh the status display"))
+QDialogButtonBox.ActionRole)
+self.refreshButton.setToolTip(
+self.trUtf8("Press to refresh the status display"))
 self.refreshButton.setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
 self.vcs = vcs
 self.vcs.committed.connect(self.__committed)
 self.statusList.headerItem().setText(self.__lastColumn, "")
-self.statusList.header().setSortIndicator(self.__pathColumn, Qt.AscendingOrder)
+self.statusList.header().setSortIndicator(self.__pathColumn,
+Qt.AscendingOrder)
 if pysvn.svn_version < (1, 5, 0) or pysvn.version < (1, 6, 0):
 self.statusList.header().hideSection(self.__changelistColumn)
 self.menuactions = []
 self.menu = QMenu()
 if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0):
 self.menu.addSeparator()
 self.menuactions.append(self.menu.addAction(
 self.trUtf8("Add to Changelist"), self.__addToChangelist))
 self.menuactions.append(self.menu.addAction(
-self.trUtf8("Remove from Changelist"), self.__removeFromChangelist))
+self.trUtf8("Remove from Changelist"),
+self.__removeFromChangelist))
 if self.vcs.versionStr >= '1.2.0':
 self.menu.addSeparator()
 self.menuactions.append(self.menu.addAction(self.trUtf8("Lock"),
 self.__lock))
 self.menuactions.append(self.menu.addAction(self.trUtf8("Unlock"),
 self.__unlock))
-self.menuactions.append(self.menu.addAction(self.trUtf8("Break lock"),
+self.menuactions.append(self.menu.addAction(
+self.trUtf8("Break lock"),
 self.__breakLock))
-self.menuactions.append(self.menu.addAction(self.trUtf8("Steal lock"),
+self.menuactions.append(self.menu.addAction(
+self.trUtf8("Steal lock"),
 self.__stealLock))
 self.menu.addSeparator()
-self.menuactions.append(self.menu.addAction(self.trUtf8("Adjust column sizes"),
+self.menuactions.append(self.menu.addAction(
+self.trUtf8("Adjust column sizes"),
 self.__resizeColumns))
 for act in self.menuactions:
 act.setEnabled(False)
 self.statusList.setContextMenuPolicy(Qt.CustomContextMenu)
-self.statusList.customContextMenuRequested.connect(self.__showContextMenu)
+self.statusList.customContextMenuRequested.connect(
+self.__showContextMenu)
 self.modifiedIndicators = [
 self.trUtf8(svnStatusMap[pysvn.wc_status_kind.added]),
 self.trUtf8(svnStatusMap[pysvn.wc_status_kind.deleted]),
 self.trUtf8(svnStatusMap[pysvn.wc_status_kind.modified])
 Private method to resize the list columns.
 """
 self.statusList.header().resizeSections(QHeaderView.ResizeToContents)
 self.statusList.header().setStretchLastSection(True)
-def __generateItem(self, changelist, status, propStatus, locked, history, switched,
+def __generateItem(self, changelist, status, propStatus, locked, history,
-lockinfo, uptodate, revision, change, author, path):
+switched, lockinfo, uptodate, revision, change, author,
+path):
 """
 Private method to generate a status item in the status list.
 @param changelist name of the changelist (string)
 @param status text status (pysvn.wc_status_kind)
 opts = self.vcs.options['global'] + self.vcs.options['status']
 verbose = "--verbose" in opts
 recurse = "--non-recursive" not in opts
 update = "--show-updates" in opts
+hidePropertyStatusColumn = True
+hideLockColumns = True
+hideUpToDateColumn = True
+hideHistoryColumn = True
+hideSwitchedColumn = True
 locker = QMutexLocker(self.vcs.vcsExecutionMutex)
 cwd = os.getcwd()
 os.chdir(self.dname)
 try:
 for name in fnames:
 if hasattr(self.client, 'get_changelist'):
 if recurse:
 depth = pysvn.depth.infinity
 else:
 depth = pysvn.depth.immediate
-changelists = self.client.get_changelist(name, depth = depth)
+changelists = self.client.get_changelist(name, depth=depth)
 for entry in changelists:
 changelistsDict[entry[0]] = entry[1]
 self.statusList.setColumnHidden(self.__changelistColumn,
 len(changelistsDict) == 0)
 # step 2: determine status of files
-allFiles = self.client.status(name, recurse = recurse, get_all = verbose,
+allFiles = self.client.status(name, recurse = recurse,
-ignore = True, update = update)
+get_all=verbose, ignore=True,
+update = update)
 counter = 0
 for file in allFiles:
 uptodate = True
 if file.repos_text_status != pysvn.wc_status_kind.none:
-uptodate = uptodate and file.repos_text_status == file.text_status
+uptodate = uptodate and \
+file.repos_text_status == file.text_status
 if file.repos_prop_status != pysvn.wc_status_kind.none:
-uptodate = uptodate and file.repos_prop_status == file.prop_status
+uptodate = uptodate and \
+file.repos_prop_status == file.prop_status
 lockState = " "
 if file.entry is not None and \
 hasattr(file.entry, 'lock_token') and \
 file.entry.lock_token is not None:
 if hasattr(file, 'repos_lock') and update:
 if lockState == "L" and file.repos_lock is None:
 lockState = "B"
 elif lockState == " " and file.repos_lock is not None:
 lockState = "O"
-elif lockState == "L" and file.repos_lock is not None and \
+elif lockState == "L" and \
+file.repos_lock is not None and \
 file.entry.lock_token != file.repos_lock["token"]:
 lockState = "S"
 if file.path in changelistsDict:
 changelist = changelistsDict[file.path]
 else:
 changelist = ""
+hidePropertyStatusColumn = hidePropertyStatusColumn and \
+file.prop_status in [
+pysvn.wc_status_kind.none,
+pysvn.wc_status_kind.normal
+]
+hideLockColumns = hideLockColumns and \
+not file.is_locked and lockState == " "
+hideUpToDateColumn = hideUpToDateColumn and uptodate
+hideHistoryColumn = hideHistoryColumn and \
+not file.is_copied
+hideSwitchedColumn = hideSwitchedColumn and \
+not file.is_switched
 self.__generateItem(
 changelist,
 file.text_status,
 file.prop_status,
 break
 if self._clientCancelCallback():
 break
 except pysvn.ClientError as e:
 self.__showError(e.args[0]+'\n')
+self.statusList.setColumnHidden(self.__propStatusColumn,
+hidePropertyStatusColumn)
+self.statusList.setColumnHidden(self.__lockedColumn,
+hideLockColumns)
+self.statusList.setColumnHidden(self.__lockinfoColumn,
+hideLockColumns)
+self.statusList.setColumnHidden(self.__upToDateColumn,
+hideUpToDateColumn)
+self.statusList.setColumnHidden(self.__historyColumn,
+hideHistoryColumn)
+self.statusList.setColumnHidden(self.__switchedColumn,
+hideSwitchedColumn)
 locker.unlock()
 self.__finish()
 os.chdir(cwd)
 def __finish(self):
 """
-Private slot called when the process finished or the user pressed the button.
+Private slot called when the process finished or the user pressed
+the button.
 """
 QApplication.restoreOverrideCursor()
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
 """
 self.errorGroup.show()
 self.errors.insertPlainText(msg)
 self.errors.ensureCursorVisible()
-############################################################################
+###########################################################################
 ## Context menu handling methods
-############################################################################
+###########################################################################
 def __showContextMenu(self, coord):
 """
 Protected slot to show the context menu of the status list.
 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
 for itm in self.__getModifiedItems()]
 if not names:
 E5MessageBox.information(self,
 self.trUtf8("Commit"),
-self.trUtf8("""There are no uncommitted changes available/selected."""))
+self.trUtf8("""There are no uncommitted changes"""
+""" available/selected."""))
 return
 if Preferences.getVCS("AutoSaveFiles"):
 vm = e5App().getObject("ViewManager")
 for name in names:
 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
 for itm in self.__getUnversionedItems()]
 if not names:
 E5MessageBox.information(self,
 self.trUtf8("Add"),
-self.trUtf8("""There are no unversioned entries available/selected."""))
+self.trUtf8("""There are no unversioned entries"""
+""" available/selected."""))
 return
 self.vcs.vcsAdd(names)
 self.on_refreshButton_clicked()
 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
 for itm in self.__getModifiedItems()]
 if not names:
 E5MessageBox.information(self,
 self.trUtf8("Revert"),
-self.trUtf8("""There are no uncommitted changes available/selected."""))
+self.trUtf8("""There are no uncommitted changes"""
+""" available/selected."""))
 return
 self.vcs.vcsRevert(names)
 self.on_refreshButton_clicked()
 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
 for itm in self.__getLockActionItems(self.unlockedIndicators)]
 if not names:
 E5MessageBox.information(self,
 self.trUtf8("Lock"),
-self.trUtf8("""There are no unlocked files available/selected."""))
+self.trUtf8("""There are no unlocked files"""
+""" available/selected."""))
 return
 self.vcs.svnLock(names, parent = self)
 self.on_refreshButton_clicked()
 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
 for itm in self.__getLockActionItems(self.lockedIndicators)]
 if not names:
 E5MessageBox.information(self,
 self.trUtf8("Unlock"),
-self.trUtf8("""There are no locked files available/selected."""))
+self.trUtf8("""There are no locked files"""
+""" available/selected."""))
 return
 self.vcs.svnUnlock(names, parent = self)
 self.on_refreshButton_clicked()
 def __breakLock(self):
 """
 Private slot to handle the Break Lock context menu entry.
 """
-names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+names = [os.path.join(self.dname, itm.text(self.__pathColumn))
-for itm in self.__getLockActionItems(self.stealBreakLockIndicators)]
+for itm in self.__getLockActionItems(
+self.stealBreakLockIndicators)]
 if not names:
 E5MessageBox.information(self,
 self.trUtf8("Break Lock"),
-self.trUtf8("""There are no locked files available/selected."""))
+self.trUtf8("""There are no locked files"""
+""" available/selected."""))
 return
 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.
 """
-names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+names = [os.path.join(self.dname, itm.text(self.__pathColumn))
-for itm in self.__getLockActionItems(self.stealBreakLockIndicators)]
+for itm in self.__getLockActionItems(
+self.stealBreakLockIndicators)]
 if not names:
 E5MessageBox.information(self,
 self.trUtf8("Steal Lock"),
-self.trUtf8("""There are no locked files available/selected."""))
+self.trUtf8("""There are no locked files"""
+""" available/selected."""))
 return
 self.vcs.svnLock(names, parent=self, stealIt=True)
 self.on_refreshButton_clicked()
 for itm in self.__getChangelistItems()]
 if not names:
 E5MessageBox.information(self,
 self.trUtf8("Remove from Changelist"),
 self.trUtf8(
-"""There are no files available/selected belonging to a changelist."""
+"""There are no files available/selected belonging"""
+""" to a changelist."""
 )
 )
 return
 self.vcs.svnRemoveFromChangelist(names)
 self.on_refreshButton_clicked()
 modifiedItems.append(itm)
 return modifiedItems
 def __getUnversionedItems(self):
 """
-Private method to retrieve all entries, that have an unversioned status.
+Private method to retrieve all entries, that have an
+unversioned status.
 @return list of all items with an unversioned status
 """
 unversionedItems = []
 for itm in self.statusList.selectedItems():
 lockitems.append(itm)
 return lockitems
 def __getChangelistItems(self):
 """
-Private method to retrieve all entries, that are members of a changelist.
+Private method to retrieve all entries, that are members of
+a changelist.
 @return list of all items belonging to a changelist
 """
 clitems = []
 for itm in self.statusList.selectedItems():
 clitems.append(itm)
 return clitems
 def __getNonChangelistItems(self):
 """
-Private method to retrieve all entries, that are not members of a changelist.
+Private method to retrieve all entries, that are not members of
+a changelist.
 @return list of all items not belonging to a changelist
 """
 clitems = []
 for itm in self.statusList.selectedItems():

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py

Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py