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

-:10516539f238
+:0a02c433f52d
 @param vcsDataDict dictionary of data required for the conversion
 @param project reference to the project object
 """
 success = self.vcsImport(vcsDataDict, project.ppath)[0]
 if not success:
-E5MessageBox.critical(self.__ui,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("Create project repository"),
 self.trUtf8(
 """The project repository could not be created."""))
 else:
 pfn = project.pfile
 ok &= editor.checkDirty()
 if not ok:
 break
 if not ok:
-res = E5MessageBox.yesNo(self.__ui,
+res = E5MessageBox.yesNo(
+self.__ui,
 self.trUtf8("Commit Changes"),
 self.trUtf8(
 """The commit affects files, that have unsaved"""
 """ changes. Shall the commit be continued?"""),
 icon=E5MessageBox.Warning)
 project = e5App().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
 from UI.DeleteFilesConfirmationDialog import \
 DeleteFilesConfirmationDialog
-dlg = DeleteFilesConfirmationDialog(self.parent(),
+dlg = DeleteFilesConfirmationDialog(
+self.parent(),
 self.trUtf8("Revert changes"),
 self.trUtf8(
 "Do you really want to revert all changes to these files"
 " or directories?"),
 names)
 yes = dlg.exec_() == QDialog.Accepted
 else:
-yes = E5MessageBox.yesNo(None,
+yes = E5MessageBox.yesNo(
+None,
 self.trUtf8("Revert changes"),
 self.trUtf8("""Do you really want to revert all changes of"""
 """ the project?"""))
 if yes:
 dia = HgDialog(self.trUtf8('Reverting changes'), self)
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = \
+output = str(
-str(process.readAllStandardOutput(),
+process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 else:
 output, error = self.__client.runcommand(args)
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
+output = str(
+process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
 output, error = self.__client.runcommand(args)
 infoBlock = []
 index += 1
 changeset, tags, author, date, branches, bookmarks = \
 line.split("@@@")
 cdate, ctime = date.split()[:2]
 info = []
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n"""
 """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")\
 .format(index, changeset))
 if tags:
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(tags.split())))
 if bookmarks:
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(bookmarks.split())))
 if branches:
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(branches.split())))
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n"""
 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n"""
 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")\
 .format(author, cdate, ctime))
 infoBlock.append("\n".join(info))
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
+output = str(
+process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 url = output.splitlines()[0].strip()
 else:
 url = ""
-return QApplication.translate('mercurial',
+return QApplication.translate(
+'mercurial',
 """<h3>Repository information</h3>\n"""
 """<p><table>\n"""
 """<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>\n"""
 """<tr></tr>\n"""
 """<tr><td><b>URL</b></td><td>{1}</td></tr>\n"""
 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 False
-dia = HgDialog(self.trUtf8('Copying {0}')
+dia = HgDialog(
-.format(name), self)
+self.trUtf8('Copying {0}').format(name), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.normalExit()
 if res and \
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished:
 if process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
+output = str(
+process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
-error = str(process.readAllStandardError(),
+error = str(
+process.readAllStandardError(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
 error = self.trUtf8(
 "The hg process did not finish within 30s.")
 else:
-error = self.trUtf8('The process {0} could not be started. '
+error = self.trUtf8(
+'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
 else:
 rev1, rev2 = "", ""
 output1, error = self.__hgGetFileForRevision(name, rev=rev1)
 if error:
-E5MessageBox.critical(self.__ui,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("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,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("Mercurial Side-by-Side Difference"),
 error)
 return
 name2 = "{0} (rev. {1})".format(name, rev2)
 else:
 f1 = open(name, "r", encoding="utf-8")
 output2 = f1.read()
 f1.close()
 name2 = name
 except IOError:
-E5MessageBox.critical(self.__ui,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("Mercurial Side-by-Side Difference"),
 self.trUtf8(
 """<p>The file <b>{0}</b> could not be read.</p>""")
 .format(name))
 return
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
+output = str(
+process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 changeset, tags, author, date, branches, parents, bookmarks = \
 line.split("@@@")
 cdate, ctime = date.split()[:2]
 info.append("""<p><table>""")
 if mode == "heads":
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Head #{0}</b></td><td></td></tr>\n"""
 .format(index, changeset)))
 elif mode == "parents":
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n"""
 .format(index, changeset)))
 elif mode == "tip":
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Tip</b></td><td></td></tr>\n"""))
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")\
 .format(changeset))
 if tags:
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(tags.split())))
 if bookmarks:
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(bookmarks.split())))
 if branches:
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(branches.split())))
 if parents:
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(parents.split())))
-info.append(QApplication.translate("mercurial",
+info.append(QApplication.translate(
+"mercurial",
 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n"""
 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n"""
 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n"""
 """</table></p>""")\
 .format(author, cdate, ctime))
 "glob:**.DS_Store",
 ]
 ignoreName = os.path.join(name, Hg.IgnoreFileName)
 if os.path.exists(ignoreName):
-res = E5MessageBox.yesNo(self.__ui,
+res = E5MessageBox.yesNo(
+self.__ui,
 self.trUtf8("Create .hgignore file"),
 self.trUtf8("""<p>The file <b>{0}</b> exists already."""
 """ Overwrite it?</p>""").format(ignoreName),
 icon=E5MessageBox.Warning)
 else:
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fname += ex
 if QFileInfo(fname).exists():
-res = E5MessageBox.yesNo(self.__ui,
+res = E5MessageBox.yesNo(
+self.__ui,
 self.trUtf8("Create changegroup"),
 self.trUtf8("<p>The Mercurial changegroup file <b>{0}</b> "
 "already exists. Overwrite it?</p>")
 .format(fname),
 icon=E5MessageBox.Warning)
 self.__lastChangeGroupPath or repodir,
 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"))
 if files:
 self.__lastChangeGroupPath = os.path.dirname(files[0])
-update = E5MessageBox.yesNo(self.__ui,
+update = E5MessageBox.yesNo(
+self.__ui,
 self.trUtf8("Apply changegroups"),
 self.trUtf8("""Shall the working directory be updated?"""),
 yesDefault=True)
 args = []
 self.hgGetBranchesList(repodir),
 bookmarksList)
 if dlg.exec_() == QDialog.Accepted:
 rev, merge, date, user, message = dlg.getParameters()
 if not rev:
-E5MessageBox.warning(self.__ui,
+E5MessageBox.warning(
+self.__ui,
 self.trUtf8("Backing out changeset"),
 self.trUtf8("""No revision given. Aborting..."""))
 return
 args = []
 try:
 f = open(hgsub, "r")
 contents = f.readlines()
 f.close()
 except IOError as err:
-E5MessageBox.critical(self.__ui,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("Add Sub-repository"),
 self.trUtf8(
 """<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,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("Add Sub-repository"),
 self.trUtf8(
 """<p>The sub-repositories file .hgsub already"""
 """ contains an entry <b>{0}</b>."""
 """ Aborting...</p>""").format(entry))
 try:
 f = open(hgsub, "w")
 f.writelines(contents)
 f.close()
 except IOError as err:
-E5MessageBox.critical(self.__ui,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("Add Sub-repository"),
 self.trUtf8(
 """<p>The sub-repositories file .hgsub could not"""
 """ be written to.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 """
 hgsub = self.getHgSubPath()
 subrepositories = []
 if not os.path.isfile(hgsub):
-E5MessageBox.critical(self.__ui,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("Remove Sub-repositories"),
 self.trUtf8("""<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,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("Remove Sub-repositories"),
 self.trUtf8("""<p>The sub-repositories file .hgsub could not"""
 """ be read.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 return
 try:
 f = open(hgsub, "w")
 f.write(contents)
 f.close()
 except IOError as err:
-E5MessageBox.critical(self.__ui,
+E5MessageBox.critical(
+self.__ui,
 self.trUtf8("Remove Sub-repositories"),
 self.trUtf8(
 """<p>The sub-repositories file .hgsub could not"""
 """ be written to.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 self.__getExtensionsInfo()
 if self.__client:
 ok, err = self.__client.restartServer()
 if not ok:
-E5MessageBox.warning(None,
+E5MessageBox.warning(
+None,
 self.trUtf8("Mercurial Command Server"),
 self.trUtf8(
 """<p>The Mercurial Command Server could not be"""
 """ restarted.</p><p>Reason: {0}</p>""").format(err))
 self.__client = None
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = str(process.readAllStandardOutput(),
+output = str(
+process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
 output, error = self.__client.runcommand(args)
 if output:
 client = HgClient(repodir, "utf-8", self)
 ok, err = client.startServer()
 if ok:
 self.__client = client
 else:
-E5MessageBox.warning(None,
+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))

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/hg.py

Plugins/VcsPlugins/vcsMercurial/hg.py