eric: comparison Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py

-:96232974dcdb
+:645c12de6b0c
 process.
 """
 from __future__ import unicode_literals
 try:
-str = unicode    # __IGNORE_WARNING__
+str = unicode
-except (NameError):
+except NameError:
 pass
 import os
 from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QTimer
 self.__statusColumn = 1
 self.__pathColumn = 2
 self.__lastColumn = self.statusList.columnCount()
 self.refreshButton = self.buttonBox.addButton(
-self.trUtf8("Refresh"), QDialogButtonBox.ActionRole)
+self.tr("Refresh"), QDialogButtonBox.ActionRole)
 self.refreshButton.setToolTip(
-self.trUtf8("Press to refresh the status display"))
+self.tr("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.diff = None
 self.revertButton.setVisible(False)
 self.forgetButton.setVisible(False)
 self.restoreButton.setVisible(False)
 self.menuactions = []
+self.lfActions = []
 self.menu = QMenu()
 if not mq:
+self.__commitAct = self.menu.addAction(
+self.tr("Commit changes to repository..."), self.__commit)
+self.menuactions.append(self.__commitAct)
 self.menuactions.append(self.menu.addAction(
-self.trUtf8("Commit changes to repository..."), self.__commit))
+self.tr("Select all for commit"), self.__commitSelectAll))
 self.menuactions.append(self.menu.addAction(
-self.trUtf8("Select all for commit"), self.__commitSelectAll))
+self.tr("Deselect all from commit"),
-self.menuactions.append(self.menu.addAction(
-self.trUtf8("Deselect all from commit"),
 self.__commitDeselectAll))
 self.menu.addSeparator()
-self.menuactions.append(self.menu.addAction(
+self.__addAct = self.menu.addAction(
-self.trUtf8("Add to repository"), self.__add))
+self.tr("Add to repository"), self.__add)
-self.menuactions.append(self.menu.addAction(
+self.menuactions.append(self.__addAct)
-self.trUtf8("Show differences"), self.__diff))
+if self.vcs.version >= (2, 0):
-self.menuactions.append(self.menu.addAction(
+self.lfActions.append(self.menu.addAction(
-self.trUtf8("Show differences side-by-side"), self.__sbsDiff))
+self.tr("Add as Large File"),
-self.menuactions.append(self.menu.addAction(
+lambda: self.__lfAdd("large")))
-self.trUtf8("Remove from repository"), self.__forget))
+self.lfActions.append(self.menu.addAction(
-self.menuactions.append(self.menu.addAction(
+self.tr("Add as Normal File"),
-self.trUtf8("Revert changes"), self.__revert))
+lambda: self.__lfAdd("normal")))
-self.menuactions.append(self.menu.addAction(
+self.__diffAct = self.menu.addAction(
-self.trUtf8("Restore missing"), self.__restoreMissing))
+self.tr("Show differences"), self.__diff)
+self.menuactions.append(self.__diffAct)
+self.__sbsDiffAct = self.menu.addAction(
+self.tr("Show differences side-by-side"), self.__sbsDiff)
+self.menuactions.append(self.__sbsDiffAct)
+self.__revertAct = self.menu.addAction(
+self.tr("Revert changes"), self.__revert)
+self.menuactions.append(self.__revertAct)
+self.__forgetAct = self.menu.addAction(
+self.tr("Forget missing"), self.__forget)
+self.menuactions.append(self.__forgetAct)
+self.__restoreAct = self.menu.addAction(
+self.tr("Restore missing"), self.__restoreMissing)
+self.menuactions.append(self.__restoreAct)
 self.menu.addSeparator()
 self.menuactions.append(self.menu.addAction(
-self.trUtf8("Adjust column sizes"), self.__resizeColumns))
+self.tr("Adjust column sizes"), self.__resizeColumns))
 for act in self.menuactions:
+act.setEnabled(False)
+for act in self.lfActions:
 act.setEnabled(False)
 self.statusList.setContextMenuPolicy(Qt.CustomContextMenu)
 self.statusList.customContextMenuRequested.connect(
 self.__showContextMenu)
+if not mq and self.vcs.version >= (2, 0):
+self.__lfAddActions = []
+self.__addButtonMenu = QMenu()
+self.__addButtonMenu.addAction(self.tr("Add"), self.__add)
+self.__lfAddActions.append(
+self.__addButtonMenu.addAction(self.tr("Add as Large File"),
+lambda: self.__lfAdd("large")))
+self.__lfAddActions.append(
+self.__addButtonMenu.addAction(self.tr("Add as Normal File"),
+lambda: self.__lfAdd("normal")))
+self.addButton.setMenu(self.__addButtonMenu)
+self.__addButtonMenu.aboutToShow.connect(self.__showAddMenu)
 self.modifiedIndicators = [
-self.trUtf8('added'),
+self.tr('added'),
-self.trUtf8('modified'),
+self.tr('modified'),
-self.trUtf8('removed'),
+self.tr('removed'),
 ]
 self.unversionedIndicators = [
-self.trUtf8('not tracked'),
+self.tr('not tracked'),
 ]
 self.missingIndicators = [
-self.trUtf8('missing')
+self.tr('missing')
 ]
 self.status = {
-'A': self.trUtf8('added'),
+'A': self.tr('added'),
-'C': self.trUtf8('normal'),
+'C': self.tr('normal'),
-'I': self.trUtf8('ignored'),
+'I': self.tr('ignored'),
-'M': self.trUtf8('modified'),
+'M': self.tr('modified'),
-'R': self.trUtf8('removed'),
+'R': self.tr('removed'),
-'?': self.trUtf8('not tracked'),
+'?': self.tr('not tracked'),
-'!': self.trUtf8('missing'),
+'!': self.tr('missing'),
 }
 def __resort(self):
 """
 Private method to resort the tree.
 self.errorGroup.hide()
 self.intercept = False
 self.args = fn
 for act in self.menuactions:
+act.setEnabled(False)
+for act in self.lfActions:
 act.setEnabled(False)
 self.addButton.setEnabled(False)
 self.commitButton.setEnabled(False)
 self.diffButton.setEnabled(False)
 self.statusFilterCombo.clear()
 self.__statusFilters = []
 if self.__mq:
 self.setWindowTitle(
-self.trUtf8("Mercurial Queue Repository Status"))
+self.tr("Mercurial Queue Repository Status"))
 else:
-self.setWindowTitle(self.trUtf8('Mercurial Status'))
+self.setWindowTitle(self.tr('Mercurial Status'))
-args = []
+args = self.vcs.initCommand("status")
-args.append('status')
-self.vcs.addArguments(args, self.vcs.options['global'])
 if self.__mq:
 args.append('--mq')
 if isinstance(fn, list):
 self.dname, fnames = self.vcs.splitPathList(fn)
 else:
 self.dname, fname = self.vcs.splitPath(fn)
 else:
-self.vcs.addArguments(args, self.vcs.options['status'])
 if self.vcs.hasSubrepositories():
 args.append("--subrepos")
 if isinstance(fn, list):
 self.dname, fnames = self.vcs.splitPathList(fn)
 if not procStarted:
 self.inputGroup.setEnabled(False)
 self.inputGroup.hide()
 E5MessageBox.critical(
 self,
-self.trUtf8('Process Generation Error'),
+self.tr('Process Generation Error'),
-self.trUtf8(
+self.tr(
 'The process {0} could not be started. '
 'Ensure, that it is in the search path.'
 ).format('hg'))
 else:
 self.inputGroup.setEnabled(True)
 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
 self.buttonBox.button(QDialogButtonBox.Close).setFocus(
 Qt.OtherFocusReason)
 self.__statusFilters.sort()
-self.__statusFilters.insert(0, "<{0}>".format(self.trUtf8("all")))
+self.__statusFilters.insert(0, "<{0}>".format(self.tr("all")))
 self.statusFilterCombo.addItems(self.__statusFilters)
 for act in self.menuactions:
 act.setEnabled(True)
 """
 if self.process is not None:
 self.process.setReadChannel(QProcess.StandardOutput)
 while self.process.canReadLine():
-line = str(
+line = str(self.process.readLine(), self.vcs.getEncoding(),
-self.process.readLine(),
+'replace')
-Preferences.getSystem("IOEncoding"),
-'replace')
 self.__processOutputLine(line)
 def __processOutputLine(self, line):
 """
 Private method to process the lines of output.
 It reads the error output of the process and inserts it into the
 error pane.
 """
 if self.process is not None:
 s = str(self.process.readAllStandardError(),
-Preferences.getSystem("IOEncoding"),
+self.vcs.getEncoding(), 'replace')
-'replace')
 self.__showError(s)
 def __showError(self, out):
 """
 Private slot to show some error.
 """
 Private slot to react to the selection of a status filter.
 @param txt selected status filter (string)
 """
-if txt == "<{0}>".format(self.trUtf8("all")):
+if txt == "<{0}>".format(self.tr("all")):
 for topIndex in range(self.statusList.topLevelItemCount()):
 topItem = self.statusList.topLevelItem(topIndex)
 topItem.setHidden(False)
 else:
 for topIndex in range(self.statusList.topLevelItemCount()):
 """
 Protected slot to show the context menu of the status list.
 @param coord the position of the mouse pointer (QPoint)
 """
+modified = len(self.__getModifiedItems())
+unversioned = len(self.__getUnversionedItems())
+missing = len(self.__getMissingItems())
+commitable = len(self.__getCommitableItems())
+self.__addAct.setEnabled(unversioned)
+self.__diffAct.setEnabled(modified)
+self.__sbsDiffAct.setEnabled(modified == 1)
+self.__revertAct.setEnabled(modified)
+self.__forgetAct.setEnabled(missing)
+self.__restoreAct.setEnabled(missing)
+self.__commitAct.setEnabled(commitable)
+if self.vcs.isExtensionActive("largefiles"):
+enable = len(self.__getUnversionedItems()) > 0
+else:
+enable = False
+for act in self.lfActions:
+act.setEnabled(enable)
 self.menu.popup(self.mapToGlobal(coord))
+def __showAddMenu(self):
+"""
+Private slot to prepare the Add button menu before it is shown.
+"""
+enable = self.vcs.isExtensionActive("largefiles")
+for act in self.__lfAddActions:
+act.setEnabled(enable)
 def __commit(self):
 """
 Private slot to handle the Commit context menu entry.
 """
 names = [os.path.join(self.dname, itm.text(self.__pathColumn))
 for itm in self.__getCommitableItems()]
 if not names:
 E5MessageBox.information(
 self,
-self.trUtf8("Commit"),
+self.tr("Commit"),
-self.trUtf8("""There are no entries selected to be"""
+self.tr("""There are no entries selected to be"""
 """ committed."""))
 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.tr("Add"),
-self.trUtf8("""There are no unversioned entries"""
+self.tr("""There are no unversioned entries"""
 """ available/selected."""))
 return
 self.vcs.vcsAdd(names)
+self.on_refreshButton_clicked()
+project = e5App().getObject("Project")
+for name in names:
+project.getModel().updateVCSStatus(name)
+self.vcs.checkVCSStatus()
+def __lfAdd(self, mode):
+"""
+Private slot to add a file to the repository.
+@param mode add mode (string one of 'normal' or 'large')
+"""
+names = [os.path.join(self.dname, itm.text(self.__pathColumn))
+for itm in self.__getUnversionedItems()]
+if not names:
+E5MessageBox.information(
+self,
+self.tr("Add"),
+self.tr("""There are no unversioned entries"""
+""" available/selected."""))
+return
+self.vcs.getExtensionObject("largefiles").hgAdd(
+names, mode)
 self.on_refreshButton_clicked()
 project = e5App().getObject("Project")
 for name in names:
 project.getModel().updateVCSStatus(name)
 names = [os.path.join(self.dname, itm.text(self.__pathColumn))
 for itm in self.__getMissingItems()]
 if not names:
 E5MessageBox.information(
 self,
-self.trUtf8("Remove"),
+self.tr("Remove"),
-self.trUtf8("""There are no missing entries"""
+self.tr("""There are no missing entries"""
 """ available/selected."""))
 return
 self.vcs.hgForget(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.tr("Revert"),
-self.trUtf8("""There are no uncommitted changes"""
+self.tr("""There are no uncommitted changes"""
 """ available/selected."""))
 return
 self.vcs.hgRevert(names)
 self.raise_()
 self.activateWindow()
 names = [os.path.join(self.dname, itm.text(self.__pathColumn))
 for itm in self.__getMissingItems()]
 if not names:
 E5MessageBox.information(
 self,
-self.trUtf8("Revert"),
+self.tr("Revert"),
-self.trUtf8("""There are no missing entries"""
+self.tr("""There are no missing entries"""
 """ available/selected."""))
 return
 self.vcs.hgRevert(names)
 self.on_refreshButton_clicked()
 self.vcs.checkVCSStatus()
 names = [os.path.join(self.dname, itm.text(self.__pathColumn))
 for itm in self.__getModifiedItems()]
 if not names:
 E5MessageBox.information(
 self,
-self.trUtf8("Differences"),
+self.tr("Differences"),
-self.trUtf8("""There are no uncommitted changes"""
+self.tr("""There are no uncommitted changes"""
 """ available/selected."""))
 return
 if self.diff is None:
 from .HgDiffDialog import HgDiffDialog
 self.diff = HgDiffDialog(self.vcs)
 names = [os.path.join(self.dname, itm.text(self.__pathColumn))
 for itm in self.__getModifiedItems()]
 if not names:
 E5MessageBox.information(
 self,
-self.trUtf8("Side-by-Side Diff"),
+self.tr("Side-by-Side Diff"),
-self.trUtf8("""There are no uncommitted changes"""
+self.tr("""There are no uncommitted changes"""
 """ available/selected."""))
 return
 elif len(names) > 1:
 E5MessageBox.information(
 self,
-self.trUtf8("Side-by-Side Diff"),
+self.tr("Side-by-Side Diff"),
-self.trUtf8("""Only one file with uncommitted changes"""
+self.tr("""Only one file with uncommitted changes"""
 """ must be selected."""))
 return
 self.vcs.hgSbsDiff(names[0])
 def __getCommitableItems(self):

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py

Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py