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

-:734353e7d679
+:e92f0dd51979
 from VCS.VersionControl import VersionControl
 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
 from .HgDialog import HgDialog
-import Preferences
 import Utilities
 class Hg(VersionControl):
 """
 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.
 """
 @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:
 """
 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.tr('Creating Mercurial repository'), self)
 res = dia.startProcess(args)
 if res:
 ignoreName = os.path.join(projectDir, Hg.IgnoreFileName)
 if not os.path.exists(ignoreName):
 status = self.hgCreateIgnoreFile(projectDir)
 if status:
-args = []
+args = self.vcs.initCommand("commit")
-args.append('commit')
 args.append('--addremove')
 args.append('--message')
 args.append(msg)
 dia = HgDialog(
 self.tr('Initial commit to Mercurial repository'),
 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)
 args.append(self.__hgURL(vcsUrl))
 args.append(projectDir)
 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:
 @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:
 args.append("-r")
 args.append(revision)
 @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])
 @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):
 @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'][:]
+# TODO: get rid of this
-force = '--force' in opts
+force = False
-if force:
-opts.remove('--force')
 res = False
 if noDialog:
 if target is None:
 return False
 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)
 if dlg.exec_() == QDialog.Accepted:
 tag, revision, tagOp = dlg.getParameters()
 else:
 return False
-args = []
+args = self.initCommand("tag")
-args.append('tag')
 msgPart = ""
 if tagOp in [HgTagDialog.CreateLocalTag, HgTagDialog.DeleteLocalTag]:
 args.append('--local')
 msgPart = "local "
 else:
 @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)
 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'][:]
+# TODO: get rid of this
-force = '--force' in opts
+force = False
-if force:
-del opts[opts.index('--force')]
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
 self.getExtensionObject("bookmarks")\
 .hgGetBookmarksList(repodir)
 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")
 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)]
 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)
 @param withType flag indicating to get the tag type as well (boolean)
 @return list of tags (list of string) or list of tuples of
 tag name and flag indicating a local tag (list of tuple of string
 and boolean), if withType is True
 """
-args = []
+args = self.initCommand("tags")
-args.append('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:
 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.tr(
 "The hg process did not finish within 30s.")
 else:
 error = self.tr(
 title = self.tr('Apply changegroups')
 else:
 command = "pull"
 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)
 @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')
 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)
 self.tr("Create Branch"),
 self.tr("Enter branch name"),
 sorted(self.hgGetBranchesList(repodir)),
 0, True)
 if ok and name:
-args = []
+args = self.initCommand("branch")
-args.append('branch')
 args.append(name.strip().replace(" ", "_"))
 dia = HgDialog(
 self.tr('Creating branch in the Mercurial repository'),
 self)
 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)
 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("verify")
-args.append('verify')
 dia = HgDialog(
 self.tr('Verifying the integrity of the Mercurial repository'),
 self)
 res = dia.startProcess(args, repodir)
 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.tr('Showing the combined configuration settings'),
 self)
 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.tr('Showing aliases for remote repositories'),
 self)
 res = dia.startProcess(args, repodir, 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
-args = []
+args = self.initCommand("recover")
-args.append('recover')
 dia = HgDialog(
 self.tr('Recovering from interrupted transaction'),
 self)
 res = dia.startProcess(args, repodir, 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
-args = []
+args = self.initCommand("identify")
-args.append('identify')
 dia = HgDialog(self.tr('Identifying project directory'), self)
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
 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)
 self.__lastChangeGroupPath or repodir,
 self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)"))
 if file:
 self.__lastChangeGroupPath = os.path.dirname(file)
-args = []
+args = self.initCommand("identify")
-args.append('identify')
 args.append(file)
 dia = HgDialog(self.tr('Identifying changegroup file'), self)
 res = dia.startProcess(args, repodir, False)
 if res:
 self.__ui,
 self.tr("Apply changegroups"),
 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)
 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(
 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)
 self.__ui,
 self.tr("Backing out changeset"),
 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')
 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:
 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")
 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":
 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:
 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.tr('Copy Changesets (Continue)'), self)
 res = dia.startProcess(args, repodir)
 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")
 def __checkDefaults(self):
 """
 Private method to check, if the default and default-push URLs
 have been configured.
 """
-args = []
+args = self.initCommand("showconfig")
-args.append('showconfig')
 args.append('paths')
 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 = str(
+output = str(process.readAllStandardOutput(),
-process.readAllStandardOutput(),
+self.getEncoding(), 'replace')
-Preferences.getSystem("IOEncoding"), 'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 self.__defaultConfigured = False
 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()
 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():

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/hg.py

Plugins/VcsPlugins/vcsMercurial/hg.py