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

-:0b936ff1bbb9
+:a2bc06a54d9d
 @param plugin reference to the plugin object
 @param parent parent widget (QWidget)
 @param name name of this object (string)
 """
+from .CloseheadExtension.closehead import Closehead
+from .GpgExtension.gpg import Gpg
+from .HgUtilities import getConfigPath
+from .HisteditExtension.histedit import Histedit
+from .LargefilesExtension.largefiles import Largefiles
+from .PurgeExtension.purge import Purge
+from .QueuesExtension.queues import Queues
+from .RebaseExtension.rebase import Rebase
+from .ShelveExtension.shelve import Shelve
+from .StripExtension.strip import Strip
 VersionControl.__init__(self, parent, name)
 self.defaultOptions = {
 "global": [""],
 "commit": [""],
 "checkout": [""],
 self.__forgotNames = []
 self.__activeExtensions = []
-from .HgUtilities import getConfigPath
 self.__iniWatcher = QFileSystemWatcher(self)
 self.__iniWatcher.fileChanged.connect(self.__iniFileChanged)
 cfgFile = getConfigPath()
 if os.path.exists(cfgFile):
 self.__iniWatcher.addPath(cfgFile)
 self.__repoIniFile = ""
 self.__defaultConfigured = False
 self.__defaultPushConfigured = False
 # instantiate the extensions
-from .CloseheadExtension.closehead import Closehead
-from .GpgExtension.gpg import Gpg
-from .HisteditExtension.histedit import Histedit
-from .LargefilesExtension.largefiles import Largefiles
-from .PurgeExtension.purge import Purge
-from .QueuesExtension.queues import Queues
-from .RebaseExtension.rebase import Rebase
-from .ShelveExtension.shelve import Shelve
-from .StripExtension.strip import Strip
 self.__extensions = {
 "mq": Queues(self),
 "purge": Purge(self),
 "gpg": Gpg(self),
 "rebase": Rebase(self),
 @param noDialog flag indicating quiet operations
 @param closeBranch flag indicating a close branch commit (boolean)
 @param mq flag indicating a queue commit (boolean)
 @param merge flag indicating a merge commit (boolean)
 """
+from .HgCommitDialog import HgCommitDialog
 msg = message
 if mq or merge:
 # ensure dialog is shown for a queue commit
 noDialog = False
 if not noDialog:
 # call CommitDialog and get message from there
 if self.__commitDialog is None:
-from .HgCommitDialog import HgCommitDialog
 self.__commitDialog = HgCommitDialog(self, msg, mq, merge, self.__ui)
 self.__commitDialog.accepted.connect(self.__vcsCommit_Step2)
 self.__commitDialog.show()
 self.__commitDialog.raise_()
 self.__commitDialog.activateWindow()
 @param project reference to the project object
 @param target new name of the file/directory (string)
 @param noDialog flag indicating quiet operations
 @return flag indicating successfull operation (boolean)
 """
+from .HgCopyDialog import HgCopyDialog
 isDir = os.path.isdir(name)
 res = False
 if noDialog:
 if target is None:
 return False
 force = True
 accepted = True
 else:
-from .HgCopyDialog import HgCopyDialog
 dlg = HgCopyDialog(name, None, True)
 accepted = dlg.exec() == QDialog.DialogCode.Accepted
 if accepted:
 target, force = dlg.getData()
 being edited and has unsaved modification, they can be saved or the
 operation may be aborted.
 @param name file/directory name to be diffed (string)
 """
+from .HgDiffDialog import HgDiffDialog
 names = name[:] if isinstance(name, list) else [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 else:
 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)
 self.diff.show()
 self.diff.raise_()
 QApplication.processEvents()
 self.diff.start(name, refreshable=True)
 Mercurial repository.
 @param name file/directory name(s) to show the status of
 (string or list of strings)
 """
+from .HgStatusDialog import HgStatusDialog
 if self.status is None:
-from .HgStatusDialog import HgStatusDialog
 self.status = HgStatusDialog(self)
 self.status.show()
 self.status.raise_()
 self.status.start(name)
 @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
 if self.summary is None:
-from .HgSummaryDialog import HgSummaryDialog
 self.summary = HgSummaryDialog(self)
 self.summary.show()
 self.summary.raise_()
 self.summary.start(mq=mq, largefiles=largefiles)
 @type str
 @return flag indicating, that the update contained an add
 or delete
 @rtype bool
 """
+from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 args = self.initCommand("revert")
 if not self.getPlugin().getPreferences("CreateBackup"):
 args.append("--no-backup")
 args.append("-v")
 if isinstance(name, list):
 names = [name]
 project = ericApp().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
-from eric7.UI.DeleteFilesConfirmationDialog import (
-DeleteFilesConfirmationDialog,
-)
 dlg = DeleteFilesConfirmationDialog(
 self.parent(),
 self.tr("Revert changes"),
 self.tr(
 "Do you really want to revert all changes to these files"
 @param name file/directory name to be merged
 @type str
 @param rev revision to merge with
 @type str
 """
+from .HgMergeDialog import HgMergeDialog
 if not rev:
-from .HgMergeDialog import HgMergeDialog
 dlg = HgMergeDialog(
 self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList(),
 )
 """
 Public method used to merge a URL/revision into the local project.
 @param name file/directory name to be merged (string)
 """
+from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 args = self.initCommand("resolve")
 if self.getPlugin().getPreferences("InternalMerge"):
 args.append("--tool")
 args.append("internal:merge")
 if isinstance(name, list):
 names = [name]
 project = ericApp().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
-from eric7.UI.DeleteFilesConfirmationDialog import (
-DeleteFilesConfirmationDialog,
-)
 dlg = DeleteFilesConfirmationDialog(
 self.parent(),
 self.tr("Re-Merge"),
 self.tr(
 "Do you really want to re-merge these files" " or directories?"
 @param name file name to show the annotations for
 @type str
 @param skiplist name of a skip list file
 @type str
 """
+from .HgAnnotateDialog import HgAnnotateDialog
 if self.annotate is None:
-from .HgAnnotateDialog import HgAnnotateDialog
 self.annotate = HgAnnotateDialog(self)
 self.annotate.show()
 self.annotate.raise_()
 self.annotate.start(name, skiplist=skiplist)
 This method gives the chance to enter the revisions to be compared.
 @param name file/directory name to be diffed (string)
 """
+from .HgDiffDialog import HgDiffDialog
+from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 names = name[:] if isinstance(name, list) else [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = ericApp().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 else:
 project = ericApp().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
-from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(
 self.hgGetTagsList(),
 self.hgGetBranchesList(),
 bookmarksList=self.hgGetBookmarksList(),
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 revisions = dlg.getRevisions()
 if self.diff is None:
-from .HgDiffDialog import HgDiffDialog
 self.diff = HgDiffDialog(self)
 self.diff.show()
 self.diff.raise_()
 self.diff.start(name, revisions)
 @param name file name to be diffed (string)
 @param extended flag indicating the extended variant (boolean)
 @param revisions tuple of two revisions (tuple of strings)
 @exception ValueError raised to indicate an invalid name parameter
 """
+from eric7.UI.CompareDialog import CompareDialog
+from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 if isinstance(name, list):
 raise ValueError("Wrong parameter type")
 if extended:
-from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(
 self.hgGetTagsList(),
 self.hgGetBranchesList(),
 bookmarksList=self.hgGetBookmarksList(),
 )
 ),
 )
 return
 if self.sbsDiff is None:
-from eric7.UI.CompareDialog import CompareDialog
 self.sbsDiff = CompareDialog()
 self.sbsDiff.show()
 self.sbsDiff.raise_()
 self.sbsDiff.compare(output1, output2, name1, name2)
 @param name file/directory name to show the log of (string)
 @param isFile flag indicating log for a file is to be shown
 (boolean)
 """
+from .HgLogBrowserDialog import HgLogBrowserDialog
 if name == self.getClient().getRepository():
 name = None
 if self.logBrowser is None:
-from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowser = HgLogBrowserDialog(self)
 self.logBrowser.show()
 self.logBrowser.raise_()
 self.logBrowser.start(name=name, isFile=isFile)
 def hgIncoming(self):
 """
 Public method used to view the log of incoming changes from the
 Mercurial repository.
 """
+from .HgLogBrowserDialog import HgLogBrowserDialog
 if self.logBrowserIncoming is None:
-from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowserIncoming = HgLogBrowserDialog(self, mode="incoming")
 self.logBrowserIncoming.show()
 self.logBrowserIncoming.raise_()
 self.logBrowserIncoming.start()
 def hgOutgoing(self):
 """
 Public method used to view the log of outgoing changes from the
 Mercurial repository.
 """
+from .HgLogBrowserDialog import HgLogBrowserDialog
 if self.logBrowserOutgoing is None:
-from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowserOutgoing = HgLogBrowserDialog(self, mode="outgoing")
 self.logBrowserOutgoing.show()
 self.logBrowserOutgoing.raise_()
 self.logBrowserOutgoing.start()
 def hgConflicts(self):
 """
 Public method used to show a list of files containing conflicts.
 """
+from .HgConflictsListDialog import HgConflictsListDialog
 if self.conflictsDlg is None:
-from .HgConflictsListDialog import HgConflictsListDialog
 self.conflictsDlg = HgConflictsListDialog(self)
 self.conflictsDlg.show()
 self.conflictsDlg.raise_()
 self.conflictsDlg.start()
 @type bool
 @param largefilesData dictionary with data for the largefiles
 section of the data dialog
 @type dict
 """
+from .HgRepoConfigDataDialog import HgRepoConfigDataDialog
 if repoName is None:
 repoName = self.getClient().getRepository()
 cfgFile = os.path.join(repoName, 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.DialogCode.Accepted:
 createContents = True
 Public method to create a changegroup file.
 @param bundleData dictionary containing the bundle creation information
 @type dict
 """
+from .HgBundleDialog import HgBundleDialog
 if bundleData is None:
-from .HgBundleDialog import HgBundleDialog
 dlg = HgBundleDialog(
 self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList(),
 version=self.version,
 def hgPreviewBundle(self):
 """
 Public method used to view the log of incoming changes from a
 changegroup file.
 """
+from .HgLogBrowserDialog import HgLogBrowserDialog
 file = EricFileDialog.getOpenFileName(
 None,
 self.tr("Preview changegroup"),
 self.__lastChangeGroupPath,
 self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)"),
 )
 if file:
 self.__lastChangeGroupPath = os.path.dirname(file)
 if self.logBrowserIncoming is None:
-from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowserIncoming = HgLogBrowserDialog(self, mode="incoming")
 self.logBrowserIncoming.show()
 self.logBrowserIncoming.raise_()
 self.logBrowserIncoming.start(bundle=file)
 @param subcommand name of the subcommand (one of 'good', 'bad',
 'skip' or 'reset')
 @type str
 @exception ValueError raised to indicate an invalid bisect subcommand
 """
+from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 if subcommand not in ("good", "bad", "skip", "reset"):
 raise ValueError(
 self.tr("Bisect subcommand ({0}) invalid.").format(subcommand)
 )
 rev = ""
 if subcommand in ("good", "bad", "skip"):
-from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(
 self.hgGetTagsList(),
 self.hgGetBranchesList(),
 bookmarksList=self.hgGetBookmarksList(),
 )
 @param data tuple giving phase data (list of revisions, phase, flag
 indicating a forced operation) (list of strings, string, boolean)
 @return flag indicating success (boolean)
 @exception ValueError raised to indicate an invalid phase
 """
+from .HgPhaseDialog import HgPhaseDialog
 if data is None:
-from .HgPhaseDialog import HgPhaseDialog
 dlg = HgPhaseDialog()
 if dlg.exec() == QDialog.DialogCode.Accepted:
 data = dlg.getData()
 if data:
 def hgRemoveSubrepositories(self):
 """
 Public method to remove sub-repositories.
 """
+from .HgRemoveSubrepositoriesDialog import HgRemoveSubrepositoriesDialog
 hgsub = self.getHgSubPath()
 subrepositories = []
 if not os.path.isfile(hgsub):
 EricMessageBox.critical(
 """<p>The sub-repositories file .hgsub could not"""
 """ be read.</p><p>Reason: {0}</p>"""
 ).format(str(err)),
 )
 return
-from .HgRemoveSubrepositoriesDialog import HgRemoveSubrepositoriesDialog
 dlg = HgRemoveSubrepositoriesDialog(subrepositories)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 subrepositories, removedSubrepos, deleteSubrepos = dlg.getData()
 contents = "\n".join(subrepositories) + "\n"
 def hgListBookmarks(self):
 """
 Public method used to list the available bookmarks.
 """
+from .HgBookmarksListDialog import HgBookmarksListDialog
 self.bookmarksList = []
 if self.bookmarksListDlg is None:
-from .HgBookmarksListDialog import HgBookmarksListDialog
 self.bookmarksListDlg = HgBookmarksListDialog(self)
 self.bookmarksListDlg.show()
 self.bookmarksListDlg.raise_()
 self.bookmarksListDlg.start(self.bookmarksList)
 Public method to define a bookmark.
 @param revision revision to set bookmark for (string)
 @param bookmark name of the bookmark (string)
 """
+from .HgBookmarkDialog import HgBookmarkDialog
 if bool(revision) and bool(bookmark):
 ok = True
 else:
-from .HgBookmarkDialog import HgBookmarkDialog
 dlg = HgBookmarkDialog(
 HgBookmarkDialog.DEFINE_MODE,
 self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList(),
 Public method to rename a bookmark.
 @param renameInfo old and new names of the bookmark
 @type tuple of str and str
 """
+from .HgBookmarkRenameDialog import HgBookmarkRenameDialog
 if not renameInfo:
-from .HgBookmarkRenameDialog import HgBookmarkRenameDialog
 dlg = HgBookmarkRenameDialog(self.hgGetBookmarksList())
 if dlg.exec() == QDialog.DialogCode.Accepted:
 renameInfo = dlg.getData()
 if renameInfo:
 Public method to move a bookmark.
 @param revision revision to set bookmark for (string)
 @param bookmark name of the bookmark (string)
 """
+from .HgBookmarkDialog import HgBookmarkDialog
 if bool(revision) and bool(bookmark):
 ok = True
 else:
-from .HgBookmarkDialog import HgBookmarkDialog
 dlg = HgBookmarkDialog(
 HgBookmarkDialog.MOVE_MODE,
 self.hgGetTagsList(),
 self.hgGetBranchesList(),
 self.hgGetBookmarksList(),

Mercurial Repositories > eric / file comparison

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

src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py