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

-:8a7677a63c8d
+:68ec9c3d4de5
 from PyQt6.QtCore import (
 pyqtSignal, QFileInfo, QFileSystemWatcher, QCoreApplication
 )
 from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog
-from E5Gui.E5Application import e5App
+from E5Gui.EricApplication import ericApp
-from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui import EricMessageBox, EricFileDialog
 from QScintilla.MiniEditor import MiniEditor
 from VCS.VersionControl import VersionControl
 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
 @param addAll flag indicating to add all files to the repository
 @type bool
 """
 success = self.vcsImport(vcsDataDict, project.ppath, addAll=addAll)[0]
 if not success:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Create project repository"),
 self.tr(
 """The project repository could not be created."""))
 else:
 nameList = [name]
 ok = True
 for nam in nameList:
 # check for commit of the project
 if os.path.isdir(nam):
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 if nam == project.getProjectPath():
 ok &= (
 project.checkAllScriptsDirty(
 reportSyntaxErrors=True) and
 project.checkDirty()
 )
 continue
 elif os.path.isfile(nam):
 editor = (
-e5App().getObject("ViewManager").getOpenEditor(nam)
+ericApp().getObject("ViewManager").getOpenEditor(nam)
 )
 if editor:
 ok &= editor.checkDirty()
 if not ok:
 break
 if not ok:
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 self.__ui,
 self.tr("Commit Changes"),
 self.tr(
 """The commit affects files, that have unsaved"""
 """ changes. Shall the commit be continued?"""),
-icon=E5MessageBox.Warning)
+icon=EricMessageBox.Warning)
 if not res:
 return
 if self.__commitDialog is not None:
 (msg, amend, commitSubrepositories, author,
 res = dia.startProcess(args)
 if res:
 dia.exec()
 self.committed.emit()
 if self.__forgotNames:
-model = e5App().getObject("Project").getModel()
+model = ericApp().getObject("Project").getModel()
 for name in self.__forgotNames:
 model.updateVCSStatus(name)
 self.__forgotNames = []
 self.checkVCSStatus()
 @param name file/directory name to be diffed (string)
 """
 names = name[:] if isinstance(name, list) else [name]
 for nam in names:
 if os.path.isfile(nam):
-editor = e5App().getObject("ViewManager").getOpenEditor(nam)
+editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 return
 else:
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
 if self.diff is None:
 from .HgDiffDialog import HgDiffDialog
 self.diff = HgDiffDialog(self)
 names = name[:]
 else:
 args.append(name)
 names = [name]
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
 from UI.DeleteFilesConfirmationDialog import (
 DeleteFilesConfirmationDialog
 )
 "Do you really want to revert all changes to these files"
 " or directories?"),
 names)
 yes = dlg.exec() == QDialog.DialogCode.Accepted
 else:
-yes = E5MessageBox.yesNo(
+yes = EricMessageBox.yesNo(
 None,
 self.tr("Revert changes"),
 self.tr("""Do you really want to revert all changes of"""
 """ the project?"""))
 if yes:
 names = name[:]
 else:
 args.append(name)
 names = [name]
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
 from UI.DeleteFilesConfirmationDialog import (
 DeleteFilesConfirmationDialog
 )
 "Do you really want to re-merge these files"
 " or directories?"),
 names)
 yes = dlg.exec() == QDialog.DialogCode.Accepted
 else:
-yes = E5MessageBox.yesNo(
+yes = EricMessageBox.yesNo(
 None,
 self.tr("Re-Merge"),
 self.tr("""Do you really want to re-merge the project?"""))
 if yes:
 dia = HgDialog(self.tr('Re-Merging').format(name), self)
 @param name file/directory name to be diffed (string)
 """
 names = name[:] if isinstance(name, list) else [name]
 for nam in names:
 if os.path.isfile(nam):
-editor = e5App().getObject("ViewManager").getOpenEditor(nam)
+editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 return
 else:
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(),
 else:
 rev1, rev2 = "", ""
 output1, error = self.__hgGetFileForRevision(name, rev=rev1)
 if error:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 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(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Mercurial Side-by-Side Difference"),
 error)
 return
 name2 = "{0} (rev. {1})".format(name, rev2)
 try:
 with open(name, "r", encoding="utf-8") as f1:
 output2 = f1.read()
 name2 = "{0} (Work)".format(name)
 except OSError:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Mercurial Side-by-Side Difference"),
 self.tr(
 """<p>The file <b>{0}</b> could not be read.</p>""")
 .format(name))
 "glob:**.DS_Store",
 ]
 ignoreName = os.path.join(name, Hg.IgnoreFileName)
 res = (
-E5MessageBox.yesNo(
+EricMessageBox.yesNo(
 self.__ui,
 self.tr("Create .hgignore file"),
 self.tr("""<p>The file <b>{0}</b> exists already."""
 """ Overwrite it?</p>""").format(ignoreName),
-icon=E5MessageBox.Warning)
+icon=EricMessageBox.Warning)
 if os.path.exists(ignoreName) else
 True
 )
 if res:
 try:
 except OSError:
 status = False
 if status and autoAdd:
 self.vcsAdd(ignoreName, noDialog=True)
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 project.appendFile(ignoreName)
 return status
 def hgBundle(self, bundleData=None):
 else:
 baseRevs = []
 compression = ""
 bundleAll = bundleData["all"]
-fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
 None,
 self.tr("Create changegroup"),
 self.__lastChangeGroupPath,
 self.tr("Mercurial Changegroup Files (*.hg)"),
 None,
-E5FileDialog.DontConfirmOverwrite)
+EricFileDialog.DontConfirmOverwrite)
 if not fname:
 return  # user aborted
 ext = QFileInfo(fname).suffix()
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fname += ex
 if QFileInfo(fname).exists():
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 self.__ui,
 self.tr("Create changegroup"),
 self.tr("<p>The Mercurial changegroup file <b>{0}</b> "
 "already exists. Overwrite it?</p>")
 .format(fname),
-icon=E5MessageBox.Warning)
+icon=EricMessageBox.Warning)
 if not res:
 return
 fname = Utilities.toNativeSeparators(fname)
 self.__lastChangeGroupPath = os.path.dirname(fname)
 def hgPreviewBundle(self):
 """
 Public method used to view the log of incoming changes from a
 changegroup file.
 """
-file = E5FileDialog.getOpenFileName(
+file = EricFileDialog.getOpenFileName(
 None,
 self.tr("Preview changegroup"),
 self.__lastChangeGroupPath,
 self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)"))
 if file:
 or delete
 @rtype bool
 """
 res = False
 if not files:
-files = E5FileDialog.getOpenFileNames(
+files = EricFileDialog.getOpenFileNames(
 None,
 self.tr("Apply changegroups"),
 self.__lastChangeGroupPath,
 self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)"))
 if files:
 self.__lastChangeGroupPath = os.path.dirname(files[0])
-update = E5MessageBox.yesNo(
+update = EricMessageBox.yesNo(
 self.__ui,
 self.tr("Apply changegroups"),
 self.tr("""Shall the working directory be updated?"""),
 yesDefault=True)
 self.hgGetBranchesList(),
 self.hgGetBookmarksList())
 if dlg.exec() == QDialog.DialogCode.Accepted:
 rev, merge, date, user, message = dlg.getParameters()
 if not rev:
-E5MessageBox.warning(
+EricMessageBox.warning(
 self.__ui,
 self.tr("Backing out changeset"),
 self.tr("""No revision given. Aborting..."""))
 return
 def hgRollback(self):
 """
 Public method used to rollback the last transaction.
 """
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 None,
 self.tr("Rollback last transaction"),
 self.tr("""Are you sure you want to rollback the last"""
 """ transaction?"""),
-icon=E5MessageBox.Warning)
+icon=EricMessageBox.Warning)
 if res:
 dia = HgDialog(self.tr('Rollback last transaction'), self)
 res = dia.startProcess(["rollback"])
 if res:
 dia.exec()
 """
 Public method to delete all backup bundles in the backup area.
 """
 backupdir = os.path.join(self.getClient().getRepository(),
 self.adminDir, "strip-backup")
-yes = E5MessageBox.yesNo(
+yes = EricMessageBox.yesNo(
 self.__ui,
 self.tr("Delete All Backups"),
 self.tr("""<p>Do you really want to delete all backup bundles"""
 """ stored the backup area <b>{0}</b>?</p>""").format(
 backupdir))
 needsAdd = False
 try:
 with open(hgsub, "r") as f:
 contents = f.readlines()
 except OSError as err:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Add Sub-repository"),
 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(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Add Sub-repository"),
 self.tr(
 """<p>The sub-repositories file .hgsub already"""
 """ contains an entry <b>{0}</b>."""
 contents.append(entry)
 try:
 with open(hgsub, "w") as f:
 f.writelines(contents)
 except OSError as err:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Add Sub-repository"),
 self.tr(
 """<p>The sub-repositories file .hgsub could not"""
 """ be written to.</p><p>Reason: {0}</p>""")
 """
 hgsub = self.getHgSubPath()
 subrepositories = []
 if not os.path.isfile(hgsub):
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Remove Sub-repositories"),
 self.tr("""<p>The sub-repositories file .hgsub does not"""
 """ exist. Aborting...</p>"""))
 return
 try:
 with open(hgsub, "r") as f:
 subrepositories = [line.strip() for line in f.readlines()]
 except OSError as err:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Remove Sub-repositories"),
 self.tr("""<p>The sub-repositories file .hgsub could not"""
 """ be read.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 contents = "\n".join(subrepositories) + "\n"
 try:
 with open(hgsub, "w") as f:
 f.write(contents)
 except OSError as err:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Remove Sub-repositories"),
 self.tr(
 """<p>The sub-repositories file .hgsub could not"""
 """ be written to.</p><p>Reason: {0}</p>""")
 @param path name of the changed file (string)
 """
 if self.__client:
 ok, err = self.__client.restartServer()
 if not ok:
-E5MessageBox.warning(
+EricMessageBox.warning(
 None,
 self.tr("Mercurial Command Server"),
 self.tr(
 """<p>The Mercurial Command Server could not be"""
 """ restarted.</p><p>Reason: {0}</p>""").format(err))
 self.stopClient()
 self.__client = HgClient(repodir, "utf-8", self)
 ok, err = self.__client.startServer()
 if not ok:
-E5MessageBox.warning(
+EricMessageBox.warning(
 None,
 self.tr("Mercurial Command Server"),
 self.tr(
 """<p>The Mercurial Command Server could not be"""
 """ started.</p><p>Reason: {0}</p>""").format(err))

Mercurial Repositories > eric / file comparison

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

eric7/Plugins/VcsPlugins/vcsMercurial/hg.py