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

-:96232974dcdb
+:645c12de6b0c
 Module implementing the version control systems interface to Mercurial.
 """
 from __future__ import unicode_literals
 try:
-str = unicode    # __IGNORE_WARNING__
+str = unicode
-except (NameError):
+except NameError:
 pass
 import os
 import shutil
 import re
 from PyQt4.QtCore import QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher
-from PyQt4.QtGui import QApplication, QDialog, QInputDialog
+from PyQt4.QtGui import QApplication, QDialog
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
 from QScintilla.MiniEditor import MiniEditor
 from VCS.VersionControl import VersionControl
 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
 from .HgDialog import HgDialog
-import Preferences
 import Utilities
 class Hg(VersionControl):
 """
 Class implementing the version control systems interface to Mercurial.
 @signal committed() emitted after the commit action has completed
 @signal activeExtensionsChanged() emitted when the list of active
 extensions has changed
+@signal iniFileChanged() emitted when a Mercurial/repo configuration file
+has changed
 """
 committed = pyqtSignal()
 activeExtensionsChanged = pyqtSignal()
+iniFileChanged = pyqtSignal()
 IgnoreFileName = ".hgignore"
 def __init__(self, plugin, parent=None, name=None):
 """
 @param parent parent widget (QWidget)
 @param name name of this object (string)
 """
 VersionControl.__init__(self, parent, name)
 self.defaultOptions = {
-'global':   [''],
+'global': [''],
-'commit':   [''],
+'commit': [''],
 'checkout': [''],
-'update':   [''],
+'update': [''],
-'add':      [''],
+'add': [''],
-'remove':   [''],
+'remove': [''],
-'diff':     [''],
+'diff': [''],
-'log':      [''],
+'log': [''],
-'history':  [''],
+'history': [''],
-'status':   [''],
+'status': [''],
-'tag':      [''],
+'tag': [''],
-'export':   ['']
+'export': ['']
 }
 self.__plugin = plugin
 self.__ui = parent
 else:
 self.adminDir = '.hg'
 self.log = None
 self.logBrowser = None
+self.logBrowserIncoming = None
+self.logBrowserOutgoing = None
 self.diff = None
 self.sbsDiff = None
 self.status = None
 self.summary = None
 self.tagbranchList = None
 if os.path.exists(cfgFile):
 self.__iniWatcher.addPath(cfgFile)
 self.__client = None
+self.__repoDir = ""
+self.__repoIniFile = ""
+self.__defaultConfigured = False
+self.__defaultPushConfigured = False
 # instantiate the extensions
 from .BookmarksExtension.bookmarks import Bookmarks
 from .QueuesExtension.queues import Queues
 from .FetchExtension.fetch import Fetch
 from .PurgeExtension.purge import Purge
 from .GpgExtension.gpg import Gpg
 from .TransplantExtension.transplant import Transplant
 from .RebaseExtension.rebase import Rebase
+from .ShelveExtension.shelve import Shelve
+from .LargefilesExtension.largefiles import Largefiles
 self.__extensions = {
 "bookmarks": Bookmarks(self),
 "mq": Queues(self),
 "fetch": Fetch(self),
 "purge": Purge(self),
 "gpg": Gpg(self),
 "transplant": Transplant(self),
 "rebase": Rebase(self),
+"shelve": Shelve(self),
+"largefiles": Largefiles(self)
 }
 def getPlugin(self):
 """
 Public method to get a reference to the plugin object.
 @return reference to the plugin object (VcsMercurialPlugin)
 """
 return self.__plugin
+def getEncoding(self):
+"""
+Public method to get the encoding to be used by Mercurial.
+@return encoding (string)
+"""
+return self.__plugin.getPreferences("Encoding")
 def vcsShutdown(self):
 """
 Public method used to shutdown the Mercurial interface.
 """
 if self.log is not None:
 self.log.close()
 if self.logBrowser is not None:
 self.logBrowser.close()
+if self.logBrowserIncoming is not None:
+self.logBrowserIncoming.close()
+if self.logBrowserOutgoing is not None:
+self.logBrowserOutgoing.close()
 if self.diff is not None:
 self.diff.close()
 if self.sbsDiff is not None:
 self.sbsDiff.close()
 if self.status is not None:
 @return reference to the client (HgClient)
 """
 return self.__client
+def initCommand(self, command):
+"""
+Public method to initialize a command arguments list.
+@param command command name (string)
+@return list of command options (list of string)
+"""
+args = [command]
+self.addArguments(args, self.__plugin.getGlobalOptions())
+return args
 def vcsExists(self):
 """
 Public method used to test for the presence of the hg executable.
 @return flag indicating the existance (boolean) and an error message
 (string)
 """
 self.versionStr = ''
 errMsg = ""
-ioEncoding = Preferences.getSystem("IOEncoding")
+args = self.initCommand("version")
 process = QProcess()
-process.start('hg', ['version'])
+process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = \
+output = str(process.readAllStandardOutput(),
-str(process.readAllStandardOutput(), ioEncoding, 'replace')
+self.getEncoding(), 'replace')
 self.versionStr = output.splitlines()[0].split()[-1][0:-1]
 v = list(re.match(r'.*?(\d+)\.(\d+)\.?(\d+)?(\+[0-9a-f-]+)?',
 self.versionStr).groups())
 for i in range(3):
 try:
 self.version = tuple(v)
 self.__getExtensionsInfo()
 return True, errMsg
 else:
 if finished:
-errMsg = self.trUtf8(
+errMsg = self.tr(
 "The hg process finished with the exit code {0}")\
 .format(process.exitCode())
 else:
-errMsg = self.trUtf8(
+errMsg = self.tr(
 "The hg process did not finish within 30s.")
 else:
-errMsg = self.trUtf8("Could not start the hg executable.")
+errMsg = self.tr("Could not start the hg executable.")
 return False, errMsg
 def vcsInit(self, vcsDir, noDialog=False):
 """
 """
 success = self.vcsImport(vcsDataDict, project.ppath)[0]
 if not success:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Create project repository"),
+self.tr("Create project repository"),
-self.trUtf8(
+self.tr(
 """The project repository could not be created."""))
 else:
 pfn = project.pfile
 if not os.path.isfile(pfn):
 pfn += "z"
 """
 msg = vcsDataDict["message"]
 if not msg:
 msg = '***'
-args = []
+args = self.initCommand("init")
-args.append('init')
 args.append(projectDir)
 # init is not possible with the command server
-dia = HgDialog(self.trUtf8('Creating Mercurial repository'), self)
+dia = HgDialog(self.tr('Creating Mercurial repository'), self)
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 status = dia.normalExit()
 ignoreName = os.path.join(projectDir, Hg.IgnoreFileName)
 if not os.path.exists(ignoreName):
 status = self.hgCreateIgnoreFile(projectDir)
 if status:
-args = []
+args = self.initCommand("commit")
-args.append('commit')
 args.append('--addremove')
 args.append('--message')
 args.append(msg)
 dia = HgDialog(
-self.trUtf8('Initial commit to Mercurial repository'),
+self.tr('Initial commit to Mercurial repository'),
 self)
 res = dia.startProcess(args, projectDir)
 if res:
 dia.exec_()
 status = dia.normalExit()
 if vcsUrl.startswith('/'):
 vcsUrl = 'file://{0}'.format(vcsUrl)
 elif vcsUrl[1] in ['|', ':']:
 vcsUrl = 'file:///{0}'.format(vcsUrl)
-args = []
+args = self.initCommand("clone")
-args.append('clone')
-self.addArguments(args, self.options['global'])
-self.addArguments(args, self.options['checkout'])
 if rev:
 args.append("--rev")
 args.append(rev)
+if vcsDataDict["largefiles"]:
+args.append("--all-largefiles")
 args.append(self.__hgURL(vcsUrl))
 args.append(projectDir)
 if noDialog:
 if self.__client is None:
 else:
 out, err = self.__client.runcommand(args)
 return err == ""
 else:
 dia = HgDialog(
-self.trUtf8('Cloning project from a Mercurial repository'),
+self.tr('Cloning project from a Mercurial repository'),
 self)
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 return dia.normalExit()
 @param projectDir project directory to create (string)
 @return flag indicating an execution without errors (boolean)
 """
 status = self.vcsCheckout(vcsDataDict, projectDir)
 shutil.rmtree(os.path.join(projectDir, self.adminDir), True)
-if os.path.exists(os.path.join(projectDir, '.hgignore')):
+if os.path.exists(os.path.join(projectDir, Hg.IgnoreFileName)):
-os.remove(os.path.join(projectDir, '.hgignore'))
+os.remove(os.path.join(projectDir, Hg.IgnoreFileName))
 return status
 def vcsCommit(self, name, message, noDialog=False, closeBranch=False,
 mq=False):
 """
 if mq:
 # ensure dialog is shown for a queue commit
 noDialog = False
-if not noDialog and not msg:
+if not noDialog:
 # call CommitDialog and get message from there
 if self.__commitDialog is None:
 from .HgCommitDialog import HgCommitDialog
-self.__commitDialog = HgCommitDialog(self, mq, self.__ui)
+self.__commitDialog = HgCommitDialog(self, msg, mq, self.__ui)
 self.__commitDialog.accepted.connect(self.__vcsCommit_Step2)
 self.__commitDialog.show()
 self.__commitDialog.raise_()
 self.__commitDialog.activateWindow()
 break
 if not ok:
 res = E5MessageBox.yesNo(
 self.__ui,
-self.trUtf8("Commit Changes"),
+self.tr("Commit Changes"),
-self.trUtf8(
+self.tr(
 """The commit affects files, that have unsaved"""
 """ changes. Shall the commit be continued?"""),
 icon=E5MessageBox.Warning)
 if not res:
 return
 commitSubrepositories = False
 if not msg and not amend:
 msg = '***'
-args = []
+args = self.initCommand("commit")
-args.append('commit')
-self.addArguments(args, self.options['global'])
-self.addArguments(args, self.options['commit'])
 args.append("-v")
 if mq:
 args.append("--mq")
 else:
 if closeBranch:
 if noDialog:
 self.startSynchronizedProcess(QProcess(), "hg", args, dname)
 else:
 dia = HgDialog(
-self.trUtf8('Committing changes to Mercurial repository'),
+self.tr('Committing changes to Mercurial repository'),
 self)
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 self.committed.emit()
 @param noDialog flag indicating quiet operations (boolean)
 @keyparam revision revision to update to (string)
 @return flag indicating, that the update contained an add
 or delete (boolean)
 """
-args = []
+args = self.initCommand("update")
-args.append('update')
-self.addArguments(args, self.options['global'])
-self.addArguments(args, self.options['update'])
 if "-v" not in args and "--verbose" not in args:
 args.append("-v")
-if revision is not None:
+if revision:
 args.append("-r")
 args.append(revision)
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 self.startSynchronizedProcess(QProcess(), 'hg', args, repodir)
 else:
 out, err = self.__client.runcommand(args)
 res = False
 else:
-dia = HgDialog(self.trUtf8(
+dia = HgDialog(self.tr(
 'Synchronizing with the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 @param name file/directory name to be added (string)
 @param isDir flag indicating name is a directory (boolean)
 @param noDialog flag indicating quiet operations
 """
-args = []
+args = self.initCommand("add")
-args.append('add')
-self.addArguments(args, self.options['global'])
-self.addArguments(args, self.options['add'])
 args.append("-v")
 if isinstance(name, list):
 if isDir:
 dname, fname = os.path.split(name[0])
 self.startSynchronizedProcess(QProcess(), 'hg', args, repodir)
 else:
 out, err = self.__client.runcommand(args)
 else:
 dia = HgDialog(
-self.trUtf8(
+self.tr(
 'Adding files/directories to the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 @param project flag indicating deletion of a project tree (boolean)
 (not needed)
 @param noDialog flag indicating quiet operations
 @return flag indicating successfull operation (boolean)
 """
-args = []
+args = self.initCommand("remove")
-args.append('remove')
-self.addArguments(args, self.options['global'])
-self.addArguments(args, self.options['remove'])
 args.append("-v")
 if noDialog and '--force' not in args:
 args.append('--force')
 if isinstance(name, list):
 else:
 out, err = self.__client.runcommand(args)
 res = err == ""
 else:
 dia = HgDialog(
-self.trUtf8(
+self.tr(
 'Removing files/directories from the Mercurial'
 ' repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
 @param target new name of the file/directory (string)
 @param noDialog flag indicating quiet operations
 @return flag indicating successfull operation (boolean)
 """
 isDir = os.path.isdir(name)
-opts = self.options['global'][:]
-force = '--force' in opts
-if force:
-opts.remove('--force')
 res = False
 if noDialog:
 if target is None:
 return False
 force = True
 accepted = True
 else:
 from .HgCopyDialog import HgCopyDialog
-dlg = HgCopyDialog(name, None, True, force)
+dlg = HgCopyDialog(name, None, True)
 accepted = dlg.exec_() == QDialog.Accepted
 if accepted:
 target, force = dlg.getData()
 if accepted:
-args = []
+args = self.initCommand("rename")
-args.append('rename')
-self.addArguments(args, opts)
 args.append("-v")
 if force:
 args.append('--force')
 args.append(name)
 args.append(target)
 QProcess(), 'hg', args, repodir)
 else:
 out, err = self.__client.runcommand(args)
 res = err == ""
 else:
-dia = HgDialog(self.trUtf8('Renaming {0}').format(name), self)
+dia = HgDialog(self.tr('Renaming {0}').format(name), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.normalExit()
 if res:
 from .HgStatusDialog import HgStatusDialog
 self.status = HgStatusDialog(self)
 self.status.show()
 self.status.start(name)
-def hgSummary(self, mq=False):
+def hgSummary(self, mq=False, largefiles=False):
 """
 Public method used to show some summary information of the
 working directory state.
 @param mq flag indicating to show the queue status as well (boolean)
+@param largefiles flag indicating to show the largefiles status as
+well (boolean)
 """
 from .HgSummaryDialog import HgSummaryDialog
 self.summary = HgSummaryDialog(self)
 self.summary.show()
 self.summary.start(self.__projectHelper.getProject().getProjectPath(),
-mq=mq)
+mq=mq, largefiles=largefiles)
-def vcsTag(self, name):
+def vcsTag(self, name, revision=None, tagName=None):
 """
-Public method used to set the tag in the Mercurial repository.
+Public method used to set/remove a tag in the Mercurial repository.
-@param name file/directory name to be tagged (string)
+@param name file/directory name to determine the repo root from
+(string)
+@param revision revision to set tag for (string)
+@param tagName name of the tag (string)
+@return flag indicating a performed tag action (boolean)
 """
 dname, fname = self.splitPath(name)
 # find the root of the repo
 repodir = dname
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 from .HgTagDialog import HgTagDialog
-dlg = HgTagDialog(self.hgGetTagsList(repodir))
+dlg = HgTagDialog(self.hgGetTagsList(repodir, withType=True),
+revision, tagName)
 if dlg.exec_() == QDialog.Accepted:
-tag, tagOp = dlg.getParameters()
+tag, revision, tagOp = dlg.getParameters()
 else:
-return
+return False
-args = []
+args = self.initCommand("tag")
-args.append('tag')
+msgPart = ""
-if tagOp == HgTagDialog.CreateLocalTag:
+if tagOp in [HgTagDialog.CreateLocalTag, HgTagDialog.DeleteLocalTag]:
 args.append('--local')
-elif tagOp == HgTagDialog.DeleteTag:
+msgPart = "local "
+else:
+msgPart = "global "
+if tagOp in [HgTagDialog.DeleteGlobalTag, HgTagDialog.DeleteLocalTag]:
 args.append('--remove')
+if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]:
+if revision:
+args.append("--rev")
+args.append(revision)
 args.append('--message')
-if tagOp != HgTagDialog.DeleteTag:
+if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]:
 tag = tag.strip().replace(" ", "_")
-args.append("Created tag <{0}>.".format(tag))
+args.append("Created {1}tag <{0}>.".format(tag, msgPart))
 else:
-args.append("Removed tag <{0}>.".format(tag))
+args.append("Removed {1}tag <{0}>.".format(tag, msgPart))
 args.append(tag)
-dia = HgDialog(self.trUtf8('Taging in the Mercurial repository'), self)
+dia = HgDialog(self.tr('Tagging in the Mercurial repository'),
+self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
+return True
 def hgRevert(self, name):
 """
 Public method used to revert changes made to a file/directory.
 @param name file/directory name to be reverted (string)
 @return flag indicating, that the update contained an add
 or delete (boolean)
 """
-args = []
+args = self.initCommand("revert")
-args.append('revert')
-self.addArguments(args, self.options['global'])
 if not self.getPlugin().getPreferences("CreateBackup"):
 args.append("--no-backup")
 args.append("-v")
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 if names[0]:
 from UI.DeleteFilesConfirmationDialog import \
 DeleteFilesConfirmationDialog
 dlg = DeleteFilesConfirmationDialog(
 self.parent(),
-self.trUtf8("Revert changes"),
+self.tr("Revert changes"),
-self.trUtf8(
+self.tr(
 "Do you really want to revert all changes to these files"
 " or directories?"),
 names)
 yes = dlg.exec_() == QDialog.Accepted
 else:
 yes = E5MessageBox.yesNo(
 None,
-self.trUtf8("Revert changes"),
+self.tr("Revert changes"),
-self.trUtf8("""Do you really want to revert all changes of"""
+self.tr("""Do you really want to revert all changes of"""
 """ the project?"""))
 if yes:
-dia = HgDialog(self.trUtf8('Reverting changes'), self)
+dia = HgDialog(self.tr('Reverting changes'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-opts = self.options['global'][:]
-force = '--force' in opts
-if force:
-del opts[opts.index('--force')]
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
 self.getExtensionObject("bookmarks")\
 .hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
 from .HgMergeDialog import HgMergeDialog
-dlg = HgMergeDialog(force, self.hgGetTagsList(repodir),
+dlg = HgMergeDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 bookmarksList)
 if dlg.exec_() == QDialog.Accepted:
 rev, force = dlg.getParameters()
 else:
 return
-args = []
+args = self.initCommand("merge")
-args.append('merge')
-self.addArguments(args, opts)
 if force:
 args.append("--force")
+if self.getPlugin().getPreferences("InternalMerge"):
+args.append("--tool")
+args.append("internal:merge")
 if rev:
 args.append("--rev")
 args.append(rev)
-dia = HgDialog(self.trUtf8('Merging').format(name), self)
+dia = HgDialog(self.tr('Merging').format(name), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 self.checkVCSStatus()
 else:
 bookmarksList = None
 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
-bookmarksList)
+bookmarksList,
+self.tr("Current branch tip"))
 if dlg.exec_() == QDialog.Accepted:
 rev = dlg.getRevision()
 return self.vcsUpdate(name, revision=rev)
 return False
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return 0
-args = []
+args = self.initCommand("status")
-args.append('status')
 args.append('--all')
 args.append('--noninteractive')
 output = ""
 if self.__client is None:
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = \
+output = str(process.readAllStandardOutput(),
-str(process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"),
-'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 for line in output.splitlines():
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return names
-args = []
+args = self.initCommand("status")
-args.append('status')
 args.append('--all')
 args.append('--noninteractive')
 output = ""
 if self.__client is None:
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = str(
+output = str(process.readAllStandardOutput(),
-process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"),
-'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 dirs = [x for x in names.keys() if os.path.isdir(x)]
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-dia = HgDialog(self.trUtf8('Mercurial command'), self)
+dia = HgDialog(self.tr('Mercurial command'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def vcsOptionsDialog(self, project, archive, editable=False, parent=None):
 Public method to retrieve information about the repository.
 @param ppath local path to get the repository infos (string)
 @return string with ready formated info for display (string)
 """
-args = []
+args = self.initCommand("parents")
-args.append('parents')
 args.append('--template')
 args.append('{rev}:{node|short}@@@{tags}@@@{author|xmlescape}@@@'
 '{date|isodate}@@@{branches}@@@{bookmarks}\n')
 output = ""
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = str(
+output = str(process.readAllStandardOutput(),
-process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"), 'replace')
 else:
 output, error = self.__client.runcommand(args)
 infoBlock = []
 if output:
 infoStr = """<tr></tr>{0}""".format("<tr></tr>".join(infoBlock))
 else:
 infoStr = ""
 url = ""
-args = []
+args = self.initCommand("showconfig")
-args.append('showconfig')
 args.append('paths.default')
 output = ""
 if self.__client is None:
 process.setWorkingDirectory(ppath)
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = str(
+output = str(process.readAllStandardOutput(),
-process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"), 'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 url = output.splitlines()[0].strip()
 """<tr></tr>\n"""
 """<tr><td><b>URL</b></td><td>{1}</td></tr>\n"""
 """{2}"""
 """</table></p>\n"""
 ).format(self.versionStr, url, infoStr)
+def vcsSupportCommandOptions(self):
+"""
+Public method to signal the support of user settable command options.
+@return flag indicating the support  of user settable command options
+(boolean)
+"""
+return False
 ###########################################################################
 ## Private Mercurial specific methods are below.
 ###########################################################################
 def __hgURL(self, url):
 dlg = HgCopyDialog(name)
 res = False
 if dlg.exec_() == QDialog.Accepted:
 target, force = dlg.getData()
-args = []
+args = self.initCommand("copy")
-args.append('copy')
-self.addArguments(args, self.options['global'])
 args.append("-v")
 args.append(name)
 args.append(target)
 dname, fname = self.splitPath(name)
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 dia = HgDialog(
-self.trUtf8('Copying {0}').format(name), self)
+self.tr('Copying {0}').format(name), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.normalExit()
 if res and \
 project.copyDirectory(name, target)
 else:
 project.appendFile(target)
 return res
-def hgGetTagsList(self, repodir):
+def hgGetTagsList(self, repodir, withType=False):
 """
 Public method to get the list of tags.
 @param repodir directory name of the repository (string)
-@return list of tags (list of string)
+@param withType flag indicating to get the tag type as well (boolean)
-"""
+@return list of tags (list of string) or list of tuples of
-args = []
+tag name and flag indicating a local tag (list of tuple of string
-args.append('tags')
+and boolean), if withType is True
+"""
+args = self.initCommand("tags")
 args.append('--verbose')
 output = ""
 if self.__client is None:
 process = QProcess()
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = \
+output = str(process.readAllStandardOutput(),
-str(process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"),
-'replace')
 else:
 output, error = self.__client.runcommand(args)
+tagsList = []
 if output:
-self.tagsList = []
 for line in output.splitlines():
 li = line.strip().split()
 if li[-1][0] in "1234567890":
 # last element is a rev:changeset
 del li[-1]
+isLocal = False
 else:
 del li[-2:]
+isLocal = True
 name = " ".join(li)
 if name not in ["tip", "default"]:
-self.tagsList.append(name)
+if withType:
+tagsList.append((name, isLocal))
-return self.tagsList[:]
+else:
+tagsList.append(name)
+if withType:
+return tagsList
+else:
+if tagsList:
+self.tagsList = tagsList
+return self.tagsList[:]
 def hgGetBranchesList(self, repodir):
 """
 Public method to get the list of branches.
 @param repodir directory name of the repository (string)
 @return list of branches (list of string)
 """
-args = []
+args = self.initCommand("branches")
-args.append('branches')
 args.append('--closed')
 output = ""
 if self.__client is None:
 process = QProcess()
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = \
+output = str(process.readAllStandardOutput(),
-str(process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"),
-'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 self.branchesList = []
 @param name file name to get from the repository (string)
 @keyparam rev revision to retrieve (string)
 @return contents of the file (string) and an error message (string)
 """
-args = []
+args = self.initCommand("cat")
-args.append("cat")
 if rev:
 args.append("--rev")
 args.append(rev)
 args.append(name)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished:
 if process.exitCode() == 0:
-output = str(
+output = str(process.readAllStandardOutput(),
-process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"), 'replace')
 else:
-error = str(
+error = str(process.readAllStandardError(),
-process.readAllStandardError(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"), 'replace')
 else:
-error = self.trUtf8(
+error = self.tr(
 "The hg process did not finish within 30s.")
 else:
-error = self.trUtf8(
+error = self.tr(
 'The process {0} could not be started. '
 'Ensure, that it is in the search path.').format('hg')
 else:
 output, error = self.__client.runcommand(args)
-return output, error
+# return file contents with 'universal newlines'
+return output.replace('\r\n', '\n').replace('\r', '\n'), error
 def hgSbsDiff(self, name, extended=False, revisions=None):
 """
 Public method used to view the difference of a file to the Mercurial
 repository side-by-side.
 output1, error = self.__hgGetFileForRevision(name, rev=rev1)
 if error:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Mercurial Side-by-Side Difference"),
+self.tr("Mercurial Side-by-Side Difference"),
 error)
 return
 name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or ".")
 if rev2:
 output2, error = self.__hgGetFileForRevision(name, rev=rev2)
 if error:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Mercurial Side-by-Side Difference"),
+self.tr("Mercurial Side-by-Side Difference"),
 error)
 return
 name2 = "{0} (rev. {1})".format(name, rev2)
 else:
 try:
 f1.close()
 name2 = name
 except IOError:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Mercurial Side-by-Side Difference"),
+self.tr("Mercurial Side-by-Side Difference"),
-self.trUtf8(
+self.tr(
 """<p>The file <b>{0}</b> could not be read.</p>""")
 .format(name))
 return
 if self.sbsDiff is None:
 from UI.CompareDialog import CompareDialog
 self.sbsDiff = CompareDialog()
 self.sbsDiff.show()
 self.sbsDiff.compare(output1, output2, name1, name2)
-def hgLogBrowser(self, path, isFile=False):
+def vcsLogBrowser(self, name, isFile=False):
 """
 Public method used to browse the log of a file/directory from the
 Mercurial repository.
-@param path file/directory name to show the log of (string)
+@param name file/directory name to show the log of (string)
 @keyparam isFile flag indicating log for a file is to be shown
 (boolean)
 """
-from .HgLogBrowserDialog import HgLogBrowserDialog
+if self.logBrowser is None:
-self.logBrowser = HgLogBrowserDialog(self, isFile=isFile)
+from .HgLogBrowserDialog import HgLogBrowserDialog
+self.logBrowser = HgLogBrowserDialog(self)
 self.logBrowser.show()
-self.logBrowser.start(path)
+self.logBrowser.start(name, isFile=isFile)
 def hgIncoming(self, name):
 """
 Public method used to view the log of incoming changes from the
 Mercurial repository.
 @param name file/directory name to show the log of (string)
 """
 if self.getPlugin().getPreferences("UseLogBrowser"):
-from .HgLogBrowserDialog import HgLogBrowserDialog
+if self.logBrowserIncoming is None:
-self.logBrowser = HgLogBrowserDialog(self, mode="incoming")
+from .HgLogBrowserDialog import HgLogBrowserDialog
-self.logBrowser.show()
+self.logBrowserIncoming = HgLogBrowserDialog(
-self.logBrowser.start(name)
+self, mode="incoming")
+self.logBrowserIncoming.show()
+self.logBrowserIncoming.start(name)
 else:
 from .HgLogDialog import HgLogDialog
 self.log = HgLogDialog(self, mode="incoming")
 self.log.show()
 self.log.start(name)
 Mercurial repository.
 @param name file/directory name to show the log of (string)
 """
 if self.getPlugin().getPreferences("UseLogBrowser"):
-from .HgLogBrowserDialog import HgLogBrowserDialog
+if self.logBrowserOutgoing is None:
-self.logBrowser = HgLogBrowserDialog(self, mode="outgoing")
+from .HgLogBrowserDialog import HgLogBrowserDialog
-self.logBrowser.show()
+self.logBrowserOutgoing = HgLogBrowserDialog(
-self.logBrowser.start(name)
+self, mode="outgoing")
+self.logBrowserOutgoing.show()
+self.logBrowserOutgoing.start(name)
 else:
 from .HgLogDialog import HgLogDialog
 self.log = HgLogDialog(self, mode="outgoing")
 self.log.show()
 self.log.start(name)
 """
 if self.getPlugin().getPreferences("PreferUnbundle") and \
 self.bundleFile and \
 os.path.exists(self.bundleFile):
 command = "unbundle"
-title = self.trUtf8('Apply changegroups')
+title = self.tr('Apply changegroups')
 else:
 command = "pull"
-title = self.trUtf8('Pulling from a remote Mercurial repository')
+title = self.tr('Pulling from a remote Mercurial repository')
-args = []
+args = self.initCommand(command)
-args.append(command)
-self.addArguments(args, self.options['global'])
 args.append('-v')
 if self.getPlugin().getPreferences("PullUpdate"):
 args.append('--update')
 if command == "unbundle":
 args.append(self.bundleFile)
 dia = HgDialog(title, self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
-if command == "unbundle":
+if self.bundleFile and \
+os.path.exists(self.bundleFile):
 os.remove(self.bundleFile)
 self.bundleFile = None
 self.checkVCSStatus()
 return res
 @param name directory name of the project to be pushed from (string)
 @keyparam force flag indicating a forced push (boolean)
 @keyparam newBranch flag indicating to push a new branch (boolean)
 """
-args = []
+args = self.initCommand("push")
-args.append('push')
-self.addArguments(args, self.options['global'])
 args.append('-v')
 if force:
 args.append('-f')
 if newBranch:
 args.append('--new-branch')
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 dia = HgDialog(
-self.trUtf8('Pushing to a remote Mercurial repository'), self)
+self.tr('Pushing to a remote Mercurial repository'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 if mode not in ("heads", "parents", "tip"):
 mode = "heads"
 info = []
-args = []
+args = self.initCommand(mode)
-args.append(mode)
 args.append('--template')
 args.append('{rev}:{node|short}@@@{tags}@@@{author|xmlescape}@@@'
 '{date|isodate}@@@{branches}@@@{parents}@@@{bookmarks}\n')
 output = ""
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = str(
+output = str(process.readAllStandardOutput(),
-process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"), 'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 index = 0
 """
 Public method used to resolve conflicts of a file/directory.
 @param name file/directory name to be resolved (string)
 """
-args = []
+args = self.initCommand("resolve")
-args.append('resolve')
-self.addArguments(args, self.options['global'])
 args.append("--mark")
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 self.addArguments(args, name)
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-dia = HgDialog(self.trUtf8('Resolving files/directories'), self)
+dia = HgDialog(self.tr('Resolving files/directories'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 self.checkVCSStatus()
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-name, ok = QInputDialog.getItem(
+from .HgBranchInputDialog import HgBranchInputDialog
-None,
+dlg = HgBranchInputDialog(self.hgGetBranchesList(repodir))
-self.trUtf8("Create Branch"),
+if dlg.exec_() == QDialog.Accepted:
-self.trUtf8("Enter branch name"),
+name, commit = dlg.getData()
-sorted(self.hgGetBranchesList(repodir)),
+name = name.strip().replace(" ", "_")
-0, True)
+args = self.initCommand("branch")
-if ok and name:
+args.append(name)
-args = []
-args.append('branch')
-args.append(name.strip().replace(" ", "_"))
 dia = HgDialog(
-self.trUtf8('Creating branch in the Mercurial repository'),
+self.tr('Creating branch in the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
+if commit:
+self.vcsCommit(
+repodir,
+self.tr("Created new branch <{0}>.").format(
+name))
 def hgShowBranch(self, name):
 """
 Public method used to show the current branch the working directory.
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-args = []
+args = self.initCommand("branch")
-args.append("branch")
+dia = HgDialog(self.tr('Showing current branch'), self)
-dia = HgDialog(self.trUtf8('Showing current branch'), self)
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
 def hgEditUserConfig(self):
 Public method used to edit the user configuration file.
 """
 from .HgUtilities import getConfigPath
 cfgFile = getConfigPath()
 if not os.path.exists(cfgFile):
+# open dialog to enter the initial data
+from .HgUserConfigDataDialog import HgUserConfigDataDialog
+dlg = HgUserConfigDataDialog(version=self.version)
+if dlg.exec_() == QDialog.Accepted:
+firstName, lastName, email, extensions, extensionsData = \
+dlg.getData()
+else:
+firstName, lastName, email, extensions, extensionsData = (
+"Firstname", "Lastname", "email_address", [], {})
 try:
 f = open(cfgFile, "w")
-f.write("[ui]\nusername = Firstname Lastname"
+f.write("[ui]\n")
-" <email_address>\n")
+f.write("username = {0} {1} <{2}>\n".format(
+firstName, lastName, email))
+if extensions:
+f.write("\n[extensions]\n")
+f.write(" =\n".join(extensions))
+f.write(" =\n")     # complete the last line
+if "largefiles" in extensionsData:
+dataDict = extensionsData["largefiles"]
+f.write("\n[largefiles]\n")
+if "minsize" in dataDict:
+f.write("minsize = {0}\n".format(dataDict["minsize"]))
+if "patterns" in dataDict:
+f.write("patterns =\n")
+f.write("  {0}\n".format(
+"\n  ".join(dataDict["patterns"])))
 f.close()
 except (IOError, OSError):
 # ignore these
 pass
 self.userEditor = MiniEditor(cfgFile, "Properties")
 self.userEditor.show()
-def hgEditConfig(self, name):
+def hgEditConfig(self, name, withLargefiles=True, largefilesData=None):
 """
 Public method used to edit the repository configuration file.
 @param name file/directory name (string)
+@param withLargefiles flag indicating to configure the largefiles
+section (boolean)
+@param largefilesData dictionary with data for the largefiles
+section of the data dialog (dict)
 """
 dname, fname = self.splitPath(name)
 # find the root of the repo
 repodir = dname
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 cfgFile = os.path.join(repodir, self.adminDir, "hgrc")
 if not os.path.exists(cfgFile):
+# open dialog to enter the initial data
+withLargefiles = (self.isExtensionActive("largefiles") and
+withLargefiles)
+from .HgRepoConfigDataDialog import HgRepoConfigDataDialog
+dlg = HgRepoConfigDataDialog(withLargefiles=withLargefiles,
+largefilesData=largefilesData)
+if dlg.exec_() == QDialog.Accepted:
+createContents = True
+defaultUrl, defaultPushUrl = dlg.getData()
+if withLargefiles:
+lfMinSize, lfPattern = dlg.getLargefilesData()
+else:
+createContents = False
 try:
 cfg = open(cfgFile, "w")
+if createContents:
+# write the data entered
+cfg.write("[paths]\n")
+if defaultUrl:
+cfg.write("default = {0}\n".format(defaultUrl))
+if defaultPushUrl:
+cfg.write("default-push = {0}\n".format(
+defaultPushUrl))
+if withLargefiles and \
+(lfMinSize, lfPattern) != (None, None):
+cfg.write("\n[largefiles]\n")
+if lfMinSize is not None:
+cfg.write("minsize = {0}\n".format(lfMinSize))
+if lfPattern is not None:
+cfg.write("patterns =\n")
+cfg.write("  {0}\n".format(
+"\n  ".join(lfPattern)))
 cfg.close()
 self.__monitorRepoIniFile(repodir)
+self.__iniFileChanged(cfgFile)
 except IOError:
 pass
 self.repoEditor = MiniEditor(cfgFile, "Properties")
 self.repoEditor.show()
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-args = []
+args = self.initCommand("verify")
-args.append('verify')
 dia = HgDialog(
-self.trUtf8('Verifying the integrity of the Mercurial repository'),
+self.tr('Verifying the integrity of the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-args = []
+args = self.initCommand("showconfig")
-args.append('showconfig')
 args.append("--untrusted")
 dia = HgDialog(
-self.trUtf8('Showing the combined configuration settings'),
+self.tr('Showing the combined configuration settings'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-args = []
+args = self.initCommand("paths")
-args.append('paths')
 dia = HgDialog(
-self.trUtf8('Showing aliases for remote repositories'),
+self.tr('Showing aliases for remote repositories'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-args = []
+args = self.initCommand("recover")
-args.append('recover')
 dia = HgDialog(
-self.trUtf8('Recovering from interrupted transaction'),
+self.tr('Recovering from interrupted transaction'),
 self)
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-args = []
+args = self.initCommand("identify")
-args.append('identify')
+dia = HgDialog(self.tr('Identifying project directory'), self)
-dia = HgDialog(self.trUtf8('Identifying project directory'), self)
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
 def hgCreateIgnoreFile(self, name, autoAdd=False):
 ignoreName = os.path.join(name, Hg.IgnoreFileName)
 if os.path.exists(ignoreName):
 res = E5MessageBox.yesNo(
 self.__ui,
-self.trUtf8("Create .hgignore file"),
+self.tr("Create .hgignore file"),
-self.trUtf8("""<p>The file <b>{0}</b> exists already."""
+self.tr("""<p>The file <b>{0}</b> exists already."""
 """ Overwrite it?</p>""").format(ignoreName),
 icon=E5MessageBox.Warning)
 else:
 res = True
 if res:
 try:
 if dlg.exec_() == QDialog.Accepted:
 revs, baseRevs, compression, all = dlg.getParameters()
 fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 None,
-self.trUtf8("Create changegroup"),
+self.tr("Create changegroup"),
 self.__lastChangeGroupPath or repodir,
-self.trUtf8("Mercurial Changegroup Files (*.hg)"),
+self.tr("Mercurial Changegroup Files (*.hg)"),
 None,
 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
 if not fname:
 return  # user aborted
 if ex:
 fname += ex
 if QFileInfo(fname).exists():
 res = E5MessageBox.yesNo(
 self.__ui,
-self.trUtf8("Create changegroup"),
+self.tr("Create changegroup"),
-self.trUtf8("<p>The Mercurial changegroup file <b>{0}</b> "
+self.tr("<p>The Mercurial changegroup file <b>{0}</b> "
 "already exists. Overwrite it?</p>")
 .format(fname),
 icon=E5MessageBox.Warning)
 if not res:
 return
 fname = Utilities.toNativeSeparators(fname)
 self.__lastChangeGroupPath = os.path.dirname(fname)
-args = []
+args = self.initCommand("bundle")
-args.append('bundle')
 if all:
 args.append("--all")
 for rev in revs:
 args.append("--rev")
 args.append(rev)
 if compression:
 args.append("--type")
 args.append(compression)
 args.append(fname)
-dia = HgDialog(self.trUtf8('Create changegroup'), self)
+dia = HgDialog(self.tr('Create changegroup'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def hgPreviewBundle(self, name):
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 file = E5FileDialog.getOpenFileName(
 None,
-self.trUtf8("Preview changegroup"),
+self.tr("Preview changegroup"),
 self.__lastChangeGroupPath or repodir,
-self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"))
+self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)"))
 if file:
 self.__lastChangeGroupPath = os.path.dirname(file)
 if self.getPlugin().getPreferences("UseLogBrowser"):
-from .HgLogBrowserDialog import HgLogBrowserDialog
+if self.logBrowserIncoming is None:
-self.logBrowser = \
+from .HgLogBrowserDialog import HgLogBrowserDialog
-HgLogBrowserDialog(self, mode="incoming", bundle=file)
+self.logBrowserIncoming = \
-self.logBrowser.show()
+HgLogBrowserDialog(self, mode="incoming")
-self.logBrowser.start(name)
+self.logBrowserIncoming.show()
+self.logBrowserIncoming.start(name, bundle=file)
 else:
 from .HgLogDialog import HgLogDialog
 self.log = HgLogDialog(self, mode="incoming", bundle=file)
 self.log.show()
 self.log.start(name)
-def hgIdentifyBundle(self, name):
-"""
-Public method used to identify a changegroup file.
-@param name directory name on which to base the changegroup (string)
-"""
-dname, fname = self.splitPath(name)
-# find the root of the repo
-repodir = dname
-while not os.path.isdir(os.path.join(repodir, self.adminDir)):
-repodir = os.path.dirname(repodir)
-if os.path.splitdrive(repodir)[1] == os.sep:
-return
-file = E5FileDialog.getOpenFileName(
-None,
-self.trUtf8("Preview changegroup"),
-self.__lastChangeGroupPath or repodir,
-self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"))
-if file:
-self.__lastChangeGroupPath = os.path.dirname(file)
-args = []
-args.append('identify')
-args.append(file)
-dia = HgDialog(self.trUtf8('Identifying changegroup file'), self)
-res = dia.startProcess(args, repodir, False)
-if res:
-dia.exec_()
 def hgUnbundle(self, name):
 """
 Public method to apply changegroup files.
 @param name directory name (string)
 return
 res = False
 files = E5FileDialog.getOpenFileNames(
 None,
-self.trUtf8("Apply changegroups"),
+self.tr("Apply changegroups"),
 self.__lastChangeGroupPath or repodir,
-self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"))
+self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)"))
 if files:
 self.__lastChangeGroupPath = os.path.dirname(files[0])
 update = E5MessageBox.yesNo(
 self.__ui,
-self.trUtf8("Apply changegroups"),
+self.tr("Apply changegroups"),
-self.trUtf8("""Shall the working directory be updated?"""),
+self.tr("""Shall the working directory be updated?"""),
 yesDefault=True)
-args = []
+args = self.initCommand("unbundle")
-args.append('unbundle')
 if update:
 args.append("--update")
 args.append("--verbose")
 args.extend(files)
-dia = HgDialog(self.trUtf8('Apply changegroups'), self)
+dia = HgDialog(self.tr('Apply changegroups'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 'skip' or 'reset')
 @exception ValueError raised to indicate an invalid bisect subcommand
 """
 if subcommand not in ("good", "bad", "skip", "reset"):
 raise ValueError(
-self.trUtf8("Bisect subcommand ({0}) invalid.")
+self.tr("Bisect subcommand ({0}) invalid.")
 .format(subcommand))
 dname, fname = self.splitPath(name)
 # find the root of the repo
 else:
 bookmarksList = None
 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
-bookmarksList,
+bookmarksList)
-showNone=True)
 if dlg.exec_() == QDialog.Accepted:
 rev = dlg.getRevision()
 else:
 return
-args = []
+args = self.initCommand("bisect")
-args.append("bisect")
 args.append("--{0}".format(subcommand))
 if rev:
 args.append(rev)
 dia = HgDialog(
-self.trUtf8('Mercurial Bisect ({0})').format(subcommand), self)
+self.tr('Mercurial Bisect ({0})').format(subcommand), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def hgForget(self, name):
 This will not remove the file from the project directory.
 @param name file/directory name to be removed (string or list of
 strings))
 """
-args = []
+args = self.initCommand("forget")
-args.append('forget')
-self.addArguments(args, self.options['global'])
 args.append('-v')
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 self.addArguments(args, name)
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 dia = HgDialog(
-self.trUtf8('Removing files from the Mercurial repository only'),
+self.tr('Removing files from the Mercurial repository only'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 if isinstance(name, list):
 if dlg.exec_() == QDialog.Accepted:
 rev, merge, date, user, message = dlg.getParameters()
 if not rev:
 E5MessageBox.warning(
 self.__ui,
-self.trUtf8("Backing out changeset"),
+self.tr("Backing out changeset"),
-self.trUtf8("""No revision given. Aborting..."""))
+self.tr("""No revision given. Aborting..."""))
 return
-args = []
+args = self.initCommand("backout")
-args.append('backout')
 args.append('-v')
 if merge:
 args.append('--merge')
 if date:
 args.append('--date')
 args.append(user)
 args.append('--message')
 args.append(message)
 args.append(rev)
-dia = HgDialog(self.trUtf8('Backing out changeset'), self)
+dia = HgDialog(self.tr('Backing out changeset'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def hgRollback(self, name):
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 res = E5MessageBox.yesNo(
 None,
-self.trUtf8("Rollback last transaction"),
+self.tr("Rollback last transaction"),
-self.trUtf8("""Are you sure you want to rollback the last"""
+self.tr("""Are you sure you want to rollback the last"""
 """ transaction?"""),
 icon=E5MessageBox.Warning)
 if res:
-dia = HgDialog(self.trUtf8('Rollback last transaction'), self)
+dia = HgDialog(self.tr('Rollback last transaction'), self)
 res = dia.startProcess(["rollback"], repodir)
 if res:
 dia.exec_()
 def hgServe(self, name):
 dlg = HgImportDialog()
 if dlg.exec_() == QDialog.Accepted:
 patchFile, noCommit, message, date, user, stripCount, force = \
 dlg.getParameters()
-args = []
+args = self.initCommand("import")
-args.append("import")
 args.append("--verbose")
 if noCommit:
 args.append("--no-commit")
 else:
 if message:
 args.append(str(stripCount))
 if force:
 args.append("--force")
 args.append(patchFile)
-dia = HgDialog(self.trUtf8("Import Patch"), self)
+dia = HgDialog(self.tr("Import Patch"), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 dlg = HgExportDialog()
 if dlg.exec_() == QDialog.Accepted:
 filePattern, revisions, switchParent, allText, noDates, git = \
 dlg.getParameters()
-args = []
+args = self.initCommand("export")
-args.append("export")
 args.append("--output")
 args.append(filePattern)
 args.append("--verbose")
 if switchParent:
 args.append("--switch-parent")
 if git:
 args.append("--git")
 for rev in revisions:
 args.append(rev)
-dia = HgDialog(self.trUtf8("Export Patches"), self)
+dia = HgDialog(self.tr("Export Patches"), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def hgPhase(self, name, data=None):
 data = dlg.getData()
 if data:
 revs, phase, force = data
-args = []
+args = self.initCommand("phase")
-args.append("phase")
 if phase == "p":
 args.append("--public")
 elif phase == "d":
 args.append("--draft")
 elif phase == "s":
 if force:
 args.append("--force")
 for rev in revs:
 args.append(rev)
-dia = HgDialog(self.trUtf8("Change Phase"), self)
+dia = HgDialog(self.tr("Change Phase"), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.normalExitWithoutErrors()
 else:
 dlg = HgGraftDialog(self, revs)
 if dlg.exec_() == QDialog.Accepted:
 revs, (userData, currentUser, userName), \
 (dateData, currentDate, dateStr), log, dryrun = dlg.getData()
-args = []
+args = self.initCommand("graft")
-args.append("graft")
 args.append("--verbose")
 if userData:
 if currentUser:
 args.append("--currentuser")
 else:
 args.append("--log")
 if dryrun:
 args.append("--dry-run")
 args.extend(revs)
-dia = HgDialog(self.trUtf8('Copy Changesets'), self)
+dia = HgDialog(self.tr('Copy Changesets'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-args = []
+args = self.initCommand("graft")
-args.append("graft")
 args.append("--continue")
 args.append("--verbose")
-dia = HgDialog(self.trUtf8('Copy Changesets (Continue)'), self)
+dia = HgDialog(self.tr('Copy Changesets (Continue)'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 from .HgArchiveDialog import HgArchiveDialog
 dlg = HgArchiveDialog(self)
 if dlg.exec_() == QDialog.Accepted:
 archive, type_, prefix, subrepos = dlg.getData()
-args = []
+args = self.initCommand("archive")
-args.append("archive")
 if type_:
 args.append("--type")
 args.append(type_)
 if prefix:
 args.append("--prefix")
 args.append(prefix)
 if subrepos:
 args.append("--subrepos")
 args.append(archive)
-dia = HgDialog(self.trUtf8("Create Unversioned Archive"), self)
+dia = HgDialog(self.tr("Create Unversioned Archive"), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 ###########################################################################
 contents = f.readlines()
 f.close()
 except IOError as err:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Add Sub-repository"),
+self.tr("Add Sub-repository"),
-self.trUtf8(
+self.tr(
 """<p>The sub-repositories file .hgsub could not"""
 """ be read.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 return
 if entry in contents:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Add Sub-repository"),
+self.tr("Add Sub-repository"),
-self.trUtf8(
+self.tr(
 """<p>The sub-repositories file .hgsub already"""
 """ contains an entry <b>{0}</b>."""
 """ Aborting...</p>""").format(entry))
 return
 else:
 f.writelines(contents)
 f.close()
 except IOError as err:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Add Sub-repository"),
+self.tr("Add Sub-repository"),
-self.trUtf8(
+self.tr(
 """<p>The sub-repositories file .hgsub could not"""
 """ be written to.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 return
 subrepositories = []
 if not os.path.isfile(hgsub):
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Remove Sub-repositories"),
+self.tr("Remove Sub-repositories"),
-self.trUtf8("""<p>The sub-repositories file .hgsub does not"""
+self.tr("""<p>The sub-repositories file .hgsub does not"""
 """ exist. Aborting...</p>"""))
 return
 try:
 f = open(hgsub, "r")
 subrepositories = [line.strip() for line in f.readlines()]
 f.close()
 except IOError as err:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Remove Sub-repositories"),
+self.tr("Remove Sub-repositories"),
-self.trUtf8("""<p>The sub-repositories file .hgsub could not"""
+self.tr("""<p>The sub-repositories file .hgsub could not"""
 """ be read.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 return
 from .HgRemoveSubrepositoriesDialog import \
 HgRemoveSubrepositoriesDialog
 f.write(contents)
 f.close()
 except IOError as err:
 E5MessageBox.critical(
 self.__ui,
-self.trUtf8("Remove Sub-repositories"),
+self.tr("Remove Sub-repositories"),
-self.trUtf8(
+self.tr(
 """<p>The sub-repositories file .hgsub could not"""
 """ be written to.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 return
 subrepoPath = removedSubrepo.split("=", 1)[0].strip()
 subrepoAbsPath = os.path.join(ppath, subrepoPath)
 shutil.rmtree(subrepoAbsPath, True)
 ###########################################################################
-## Methods to handle extensions are below.
+## Methods to handle configuration dependent stuff are below.
 ###########################################################################
+def __checkDefaults(self):
+"""
+Private method to check, if the default and default-push URLs
+have been configured.
+"""
+args = self.initCommand("showconfig")
+args.append('paths')
+output = ""
+if self.__client is None:
+process = QProcess()
+self.__repoDir and process.setWorkingDirectory(self.__repoDir)
+process.start('hg', args)
+procStarted = process.waitForStarted(5000)
+if procStarted:
+finished = process.waitForFinished(30000)
+if finished and process.exitCode() == 0:
+output = str(process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
+else:
+output, error = self.__client.runcommand(args)
+self.__defaultConfigured = False
+self.__defaultPushConfigured = False
+if output:
+for line in output.splitlines():
+if line.startswith("paths.default=") and \
+not line.strip().endswith("="):
+self.__defaultConfigured = True
+if line.startswith("paths.default-push=") and \
+not line.strip().endswith("="):
+self.__defaultPushConfigured = True
+def canPull(self):
+"""
+Public method to check, if pull is possible.
+@return flag indicating pull capability (boolean)
+"""
+return self.__defaultConfigured
+def canPush(self):
+"""
+Public method to check, if push is possible.
+@return flag indicating push capability (boolean)
+"""
+return self.__defaultPushConfigured or self.__defaultConfigured
 def __iniFileChanged(self, path):
 """
 Private slot to handle a change of the Mercurial configuration file.
 @param path name of the changed file (string)
 """
-self.__getExtensionsInfo()
 if self.__client:
 ok, err = self.__client.restartServer()
 if not ok:
 E5MessageBox.warning(
 None,
-self.trUtf8("Mercurial Command Server"),
+self.tr("Mercurial Command Server"),
-self.trUtf8(
+self.tr(
 """<p>The Mercurial Command Server could not be"""
 """ restarted.</p><p>Reason: {0}</p>""").format(err))
 self.__client = None
+self.__getExtensionsInfo()
+if self.__repoIniFile and path == self.__repoIniFile:
+self.__checkDefaults()
+self.iniFileChanged.emit()
 def __monitorRepoIniFile(self, name):
 """
 Private slot to add a repository configuration file to the list of
 monitored files.
 return
 cfgFile = os.path.join(repodir, self.adminDir, "hgrc")
 if os.path.exists(cfgFile):
 self.__iniWatcher.addPath(cfgFile)
+self.__repoIniFile = cfgFile
+self.__checkDefaults()
+###########################################################################
+## Methods to handle extensions are below.
+###########################################################################
 def __getExtensionsInfo(self):
 """
 Private method to get the active extensions from Mercurial.
 """
 activeExtensions = sorted(self.__activeExtensions)
 self.__activeExtensions = []
-args = []
+args = self.initCommand("showconfig")
-args.append('showconfig')
 args.append('extensions')
 output = ""
 if self.__client is None:
 process = QProcess()
+self.__repoDir and process.setWorkingDirectory(self.__repoDir)
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = str(
+output = str(process.readAllStandardOutput(),
-process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"), 'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 for line in output.splitlines():
 @return flag indicating an active extension (boolean)
 """
 extensionName = extensionName.strip()
 isActive = extensionName in self.__activeExtensions
 if isActive and \
 extensionName == "transplant" and \
 self.version >= (2, 3):
 # transplant extension is deprecated as of Mercurial 2.3.0
+isActive = False
+if isActive and \
+extensionName == "shelve" and \
+self.version < (2, 8):
+# shelve extension was added as of Mercurial 2.8.0
+isActive = False
+if isActive and \
+extensionName == "largefiles" and \
+self.version < (2, 0):
+# largefiles extension was added as of Mercurial 2.0.0
 isActive = False
 return isActive
 def getExtensionObject(self, extensionName):
 Public method to instantiate a helper object for the project.
 @param project reference to the project object
 @return the project helper object
 """
+# find the root of the repo
+repodir = project.getProjectPath()
+while not os.path.isdir(os.path.join(repodir, self.adminDir)):
+repodir = os.path.dirname(repodir)
+if not repodir or os.path.splitdrive(repodir)[1] == os.sep:
+repodir = ""
+break
+if repodir:
+self.__repoDir = repodir
 self.__projectHelper = self.__plugin.getProjectHelper()
 self.__projectHelper.setObjects(self, project)
 self.__monitorRepoIniFile(project.getProjectPath())
-if not Utilities.isMacPlatform() and self.version >= (1, 9):
+if not Utilities.isMacPlatform() and \
-# find the root of the repo
+self.version >= (1, 9) and \
-repodir = project.getProjectPath()
+repodir:
-while not os.path.isdir(os.path.join(repodir, self.adminDir)):
+from .HgClient import HgClient
-repodir = os.path.dirname(repodir)
+client = HgClient(repodir, "utf-8", self)
-if not repodir or os.path.splitdrive(repodir)[1] == os.sep:
+ok, err = client.startServer()
-repodir = ""
+if ok:
-break
+self.__client = client
-if repodir:
+else:
-from .HgClient import HgClient
+E5MessageBox.warning(
-client = HgClient(repodir, "utf-8", self)
+None,
-ok, err = client.startServer()
+self.tr("Mercurial Command Server"),
-if ok:
+self.tr(
-self.__client = client
+"""<p>The Mercurial Command Server could not be"""
-else:
+""" started.</p><p>Reason: {0}</p>""").format(err))
-E5MessageBox.warning(
-None,
-self.trUtf8("Mercurial Command Server"),
-self.trUtf8(
-"""<p>The Mercurial Command Server could not be"""
-""" started.</p><p>Reason: {0}</p>""").format(err))
 return self.__projectHelper
 ###########################################################################
 ##  Status Monitor Thread methods

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/hg.py

Plugins/VcsPlugins/vcsMercurial/hg.py