Tue, 25 Mar 2014 19:34:15 +0100
Removed the Mercurial 'Identify changegroup...' action because Mercurial doesn't give useful info.
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py | file | annotate | diff | comparison | revisions | |
Plugins/VcsPlugins/vcsMercurial/hg.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Mar 25 19:29:24 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Mar 25 19:34:15 2014 +0100 @@ -736,21 +736,6 @@ self.hgPreviewBundleAct.triggered.connect(self.__hgPreviewBundle) self.actions.append(self.hgPreviewBundleAct) - self.hgIdentifyBundleAct = E5Action( - self.tr('Identify changegroup'), - self.tr('Identify changegroup...'), - 0, 0, self, 'mercurial_identify_bundle') - self.hgIdentifyBundleAct.setStatusTip(self.tr( - 'Identify a changegroup file containing a collection of changesets' - )) - self.hgIdentifyBundleAct.setWhatsThis(self.tr( - """<b>Identify changegroup</b>""" - """<p>This identifies a changegroup file containing a""" - """ collection of changesets.</p>""" - )) - self.hgIdentifyBundleAct.triggered.connect(self.__hgIdentifyBundle) - self.actions.append(self.hgIdentifyBundleAct) - self.hgUnbundleAct = E5Action( self.tr('Apply changegroups'), self.tr('Apply changegroups...'), @@ -1056,7 +1041,6 @@ bundleMenu = QMenu(self.tr("Changegroup Management"), menu) bundleMenu.setTearOffEnabled(True) bundleMenu.addAction(self.hgBundleAct) - bundleMenu.addAction(self.hgIdentifyBundleAct) bundleMenu.addAction(self.hgPreviewBundleAct) bundleMenu.addAction(self.hgUnbundleAct) self.subMenus.append(bundleMenu) @@ -1392,12 +1376,6 @@ """ self.vcs.hgPreviewBundle(self.project.ppath) - def __hgIdentifyBundle(self): - """ - Private slot used to identify a changegroup file. - """ - self.vcs.hgIdentifyBundle(self.project.ppath) - def __hgUnbundle(self): """ Private slot used to apply changegroup files.
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Mar 25 19:29:24 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Mar 25 19:34:15 2014 +0100 @@ -2553,37 +2553,6 @@ self.log.show() self.log.start(name) - def hgIdentifyBundle(self, name): - """ - Public method used to identify a changegroup file. - - @param name directory name on which to base the changegroup (string) - """ - dname, fname = self.splitPath(name) - - # find the root of the repo - repodir = dname - 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 - - file = E5FileDialog.getOpenFileName( - None, - self.tr("Preview changegroup"), - self.__lastChangeGroupPath or repodir, - self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)")) - if file: - self.__lastChangeGroupPath = os.path.dirname(file) - - args = self.initCommand("identify") - args.append(file) - - dia = HgDialog(self.tr('Identifying changegroup file'), self) - res = dia.startProcess(args, repodir, False) - if res: - dia.exec_() - def hgUnbundle(self, name): """ Public method to apply changegroup files.