Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Tue Mar 25 19:28:27 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Tue Mar 25 19:34:15 2014 +0100
@@ -730,21 +730,6 @@
         self.hgPreviewBundleAct.triggered[()].connect(self.__hgPreviewBundle)
         self.actions.append(self.hgPreviewBundleAct)
         
-        self.hgIdentifyBundleAct = E5Action(
-            self.trUtf8('Identify changegroup'),
-            self.trUtf8('Identify changegroup...'),
-            0, 0, self, 'mercurial_identify_bundle')
-        self.hgIdentifyBundleAct.setStatusTip(self.trUtf8(
-            'Identify a changegroup file containing a collection of changesets'
-        ))
-        self.hgIdentifyBundleAct.setWhatsThis(self.trUtf8(
-            """<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.trUtf8('Apply changegroups'),
             self.trUtf8('Apply changegroups...'),
@@ -1038,7 +1023,6 @@
         bundleMenu = QMenu(self.trUtf8("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)
@@ -1370,12 +1354,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:28:27 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Tue Mar 25 19:34:15 2014 +0100
@@ -2483,38 +2483,7 @@
                 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.trUtf8("Preview changegroup"),
-            self.__lastChangeGroupPath or repodir,
-            self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"))
-        if file:
-            self.__lastChangeGroupPath = os.path.dirname(file)
-            
-            args = []
-            args.append('identify')
-            args.append(file)
-            
-            dia = HgDialog(self.trUtf8('Identifying changegroup file'), self)
-            res = dia.startProcess(args, repodir, False)
-            if res:
-                dia.exec_()
-    
+
     def hgUnbundle(self, name):
         """
         Public method to apply changegroup files.