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

-:cba0ff902c2b
+:d4b5f3bd4720
 from VCS.VersionControl import VersionControl
 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
 from .HgDialog import HgDialog
-from .HgCommitDialog import HgCommitDialog
-from .HgOptionsDialog import HgOptionsDialog
-from .HgNewProjectOptionsDialog import HgNewProjectOptionsDialog
-from .HgCopyDialog import HgCopyDialog
-from .HgLogDialog import HgLogDialog
-from .HgLogBrowserDialog import HgLogBrowserDialog
-from .HgDiffDialog import HgDiffDialog
-from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
-from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
-from .HgMultiRevisionSelectionDialog import HgMultiRevisionSelectionDialog
-from .HgMergeDialog import HgMergeDialog
-from .HgStatusMonitorThread import HgStatusMonitorThread
-from .HgStatusDialog import HgStatusDialog
-from .HgAnnotateDialog import HgAnnotateDialog
-from .HgTagDialog import HgTagDialog
-from .HgTagBranchListDialog import HgTagBranchListDialog
-from .HgCommandDialog import HgCommandDialog
-from .HgBundleDialog import HgBundleDialog
-from .HgBackoutDialog import HgBackoutDialog
-from .HgServeDialog import HgServeDialog
-from .HgUtilities import getConfigPath
-from .HgClient import HgClient
-from .HgImportDialog import HgImportDialog
-from .HgExportDialog import HgExportDialog
-from .HgPhaseDialog import HgPhaseDialog
-from .HgGraftDialog import HgGraftDialog
-from .HgAddSubrepositoryDialog import HgAddSubrepositoryDialog
-from .HgRemoveSubrepositoriesDialog import HgRemoveSubrepositoriesDialog
-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 .ProjectBrowserHelper import HgProjectBrowserHelper
-from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 import Preferences
 import Utilities
 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.__client = None
 # 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
 self.__extensions = {
 "bookmarks": Bookmarks(self),
 "mq": Queues(self),
 "fetch": Fetch(self),
 "purge": Purge(self),
 msg = message
 if not noDialog and not msg:
 # call CommitDialog and get message from there
 if self.__commitDialog is None:
+from .HgCommitDialog import HgCommitDialog
 self.__commitDialog = HgCommitDialog(self, self.__ui)
 self.__commitDialog.accepted.connect(self.__vcsCommit_Step2)
 self.__commitDialog.show()
 self.__commitDialog.raise_()
 self.__commitDialog.activateWindow()
 if target is None:
 return False
 force = True
 accepted = True
 else:
+from .HgCopyDialog import HgCopyDialog
 dlg = HgCopyDialog(name, None, True, force)
 accepted = dlg.exec_() == QDialog.Accepted
 if accepted:
 target, force = dlg.getData()
 bookmarksList = \
 self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
+from .HgMultiRevisionSelectionDialog import HgMultiRevisionSelectionDialog
 dlg = HgMultiRevisionSelectionDialog(
 self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 bookmarksList,
 emptyRevsOk=True,
 showLimit=True,
 limitDefault=self.getPlugin().getPreferences("LogLimit"))
 if dlg.exec_() == QDialog.Accepted:
 revs, noEntries = dlg.getRevisions()
+from .HgLogDialog import HgLogDialog
 self.log = HgLogDialog(self)
 self.log.show()
 self.log.start(name, noEntries=noEntries, revisions=revs)
 def vcsDiff(self, name):
 return
 else:
 project = e5App().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
+from .HgDiffDialog import HgDiffDialog
 self.diff = HgDiffDialog(self)
 self.diff.show()
 QApplication.processEvents()
 self.diff.start(name)
 Mercurial repository.
 @param name file/directory name(s) to show the status of
 (string or list of strings)
 """
+from .HgStatusDialog import HgStatusDialog
 self.status = HgStatusDialog(self)
 self.status.show()
 self.status.start(name)
 def vcsTag(self, 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
+from .HgTagDialog import HgTagDialog
 dlg = HgTagDialog(self.hgGetTagsList(repodir))
 if dlg.exec_() == QDialog.Accepted:
 tag, tagOp = dlg.getParameters()
 else:
 return
 return False
 project = e5App().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
+from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 dlg = DeleteFilesConfirmationDialog(self.parent(),
 self.trUtf8("Revert changes"),
 self.trUtf8("Do you really want to revert all changes to these files"
 " or directories?"),
 names)
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
 self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
+from .HgMergeDialog import HgMergeDialog
 dlg = HgMergeDialog(force, self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 bookmarksList)
 if dlg.exec_() == QDialog.Accepted:
 rev, force = dlg.getParameters()
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
 self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
+from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 bookmarksList)
 if dlg.exec_() == QDialog.Accepted:
 rev = dlg.getRevision()
 """
 Public method used to execute arbitrary mercurial commands.
 @param name directory name of the working directory (string)
 """
+from .HgCommandDialog import HgCommandDialog
 dlg = HgCommandDialog(self.commandHistory, name)
 if dlg.exec_() == QDialog.Accepted:
 command = dlg.getData()
 commandList = Utilities.parseOptionString(command)
 @param project reference to the project object
 @param archive name of the project in the repository (string)
 @param editable flag indicating that the project name is editable (boolean)
 @param parent parent widget (QWidget)
 """
+from .HgOptionsDialog import HgOptionsDialog
 return HgOptionsDialog(self, project, parent)
 def vcsNewProjectOptionsDialog(self, parent=None):
 """
 Public method to get a dialog to enter repository info for getting a new project.
 @param parent parent widget (QWidget)
 """
+from .HgNewProjectOptionsDialog import HgNewProjectOptionsDialog
 return HgNewProjectOptionsDialog(self, parent)
 def vcsRepositoryInfos(self, ppath):
 """
 Public method to retrieve information about the repository.
 @param name file/directory name to be copied (string)
 @param project reference to the project object
 @return flag indicating successful operation (boolean)
 """
+from .HgCopyDialog import HgCopyDialog
 dlg = HgCopyDialog(name)
 res = False
 if dlg.exec_() == QDialog.Accepted:
 target, force = dlg.getData()
 @param path directory name of the project (string)
 @param tags flag indicating listing of branches or tags
 (False = branches, True = tags)
 """
+from .HgTagBranchListDialog import HgTagBranchListDialog
 self.tagbranchList = HgTagBranchListDialog(self)
 self.tagbranchList.show()
 if tags:
 if not self.showedTags:
 self.showedTags = True
 """
 Public method to show the output of the hg annotate command.
 @param name file name to show the annotations for (string)
 """
+from .HgAnnotateDialog import HgAnnotateDialog
 self.annotate = HgAnnotateDialog(self)
 self.annotate.show()
 self.annotate.start(name)
 def hgExtendedDiff(self, name):
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
 self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
+from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 bookmarksList)
 if dlg.exec_() == QDialog.Accepted:
 revisions = dlg.getRevisions()
+from .HgDiffDialog import HgDiffDialog
 self.diff = HgDiffDialog(self)
 self.diff.show()
 self.diff.start(name, revisions)
 def hgLogBrowser(self, path):
 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)
 """
+from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowser = HgLogBrowserDialog(self)
 self.logBrowser.show()
 self.logBrowser.start(path)
 def hgIncoming(self, name):
 Mercurial repository.
 @param name file/directory name to show the log of (string)
 """
 if self.getPlugin().getPreferences("UseLogBrowser"):
+from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowser = HgLogBrowserDialog(self, mode="incoming")
 self.logBrowser.show()
 self.logBrowser.start(name)
 else:
+from .HgLogDialog import HgLogDialog
 self.log = HgLogDialog(self, mode="incoming")
 self.log.show()
 self.log.start(name)
 def hgOutgoing(self, name):
 Mercurial repository.
 @param name file/directory name to show the log of (string)
 """
 if self.getPlugin().getPreferences("UseLogBrowser"):
+from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowser = HgLogBrowserDialog(self, mode="outgoing")
 self.logBrowser.show()
 self.logBrowser.start(name)
 else:
+from .HgLogDialog import HgLogDialog
 self.log = HgLogDialog(self, mode="outgoing")
 self.log.show()
 self.log.start(name)
 def hgPull(self, name):
 def hgEditUserConfig(self):
 """
 Public method used to edit the user configuration file.
 """
+from .HgUtilities import getConfigPath
 cfgFile = getConfigPath()
 if not os.path.exists(cfgFile):
 try:
 f = open(cfgFile, "w")
 f.close()
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
 self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
+from .HgBundleDialog import HgBundleDialog
 dlg = HgBundleDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 bookmarksList)
 if dlg.exec_() == QDialog.Accepted:
 revs, baseRevs, compression, all = dlg.getParameters()
 self.trUtf8("Preview changegroup"),
 repodir,
 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"))
 if file:
 if self.getPlugin().getPreferences("UseLogBrowser"):
+from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowser = \
 HgLogBrowserDialog(self, mode="incoming", bundle=file)
 self.logBrowser.show()
 self.logBrowser.start(name)
 else:
+from .HgLogDialog import HgLogDialog
 self.log = HgLogDialog(self, mode="incoming", bundle=file)
 self.log.show()
 self.log.start(name)
 def hgIdentifyBundle(self, name):
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
 self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
+from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 bookmarksList,
 showNone=True)
 if dlg.exec_() == QDialog.Accepted:
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
 self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
+from .HgBackoutDialog import HgBackoutDialog
 dlg = HgBackoutDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 bookmarksList)
 if dlg.exec_() == QDialog.Accepted:
 rev, merge, date, user, message = dlg.getParameters()
 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
+from .HgServeDialog import HgServeDialog
 self.serveDlg = HgServeDialog(self, repodir)
 self.serveDlg.show()
 def hgImport(self, 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
+from .HgImportDialog import HgImportDialog
 dlg = HgImportDialog()
 if dlg.exec_() == QDialog.Accepted:
 patchFile, noCommit, message, date, user, stripCount, force = \
 dlg.getParameters()
 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
+from .HgExportDialog import HgExportDialog
 dlg = HgExportDialog()
 if dlg.exec_() == QDialog.Accepted:
 filePattern, revisions, switchParent, allText, noDates, git = \
 dlg.getParameters()
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 if data is None:
+from .HgPhaseDialog import HgPhaseDialog
 dlg = HgPhaseDialog()
 if dlg.exec_() == QDialog.Accepted:
 data = dlg.getData()
 if data:
 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
+from .HgGraftDialog import HgGraftDialog
 res = False
 dlg = HgGraftDialog(self)
 if dlg.exec_() == QDialog.Accepted:
 revs, (userData, currentUser, userName), \
 (dateData, currentDate, dateStr), log, dryrun = dlg.getData()
 def hgAddSubrepository(self):
 """
 Public method to add a sub-repository.
 """
+from .HgAddSubrepositoryDialog import HgAddSubrepositoryDialog
 ppath = self.__projectHelper.getProject().getProjectPath()
 hgsub = self.getHgSubPath()
 dlg = HgAddSubrepositoryDialog(ppath)
 if dlg.exec_() == QDialog.Accepted:
 relPath, subrepoType, subrepoUrl = dlg.getData()
 self.trUtf8("""<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.Accepted:
 subrepositories, removedSubrepos, deleteSubrepos = dlg.getData()
 contents = "\n".join(subrepositories) + "\n"
 try:
 @param project reference to the project object
 @param isTranslationsBrowser flag indicating, the helper is requested for the
 translations browser (this needs some special treatment)
 @return the project browser helper object
 """
+from .ProjectBrowserHelper import HgProjectBrowserHelper
 return HgProjectBrowserHelper(self, browser, project, isTranslationsBrowser)
 def vcsGetProjectHelper(self, project):
 """
 Public method to instantiate a helper object for the project.
 repodir = os.path.dirname(repodir)
 if not repodir or os.path.splitdrive(repodir)[1] == os.sep:
 repodir = ""
 break
 if repodir:
+from .HgClient import HgClient
 client = HgClient(repodir, "utf-8", self)
 ok, err = client.startServer()
 if ok:
 self.__client = client
 else:
 @param project reference to the project object (Project)
 @param interval check interval for the monitor thread in seconds (integer)
 @return reference to the monitor thread (QThread)
 """
+from .HgStatusMonitorThread import HgStatusMonitorThread
 return HgStatusMonitorThread(interval, project, self)

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/hg.py

Plugins/VcsPlugins/vcsMercurial/hg.py