Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Tue Jan 12 17:19:02 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Tue Jan 12 20:03:30 2021 +0100
@@ -327,13 +327,6 @@
                 self.dname, fname = self.vcs.splitPath(fn)
                 args.append(fn)
         
-        # find the root of the repo
-        repodir = self.dname
-        while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)):
-            repodir = os.path.dirname(repodir)
-            if os.path.splitdrive(repodir)[1] == os.sep:
-                return
-        
         self.refreshButton.setEnabled(False)
         
         out, err = self.__hgClient.runcommand(args)
@@ -448,7 +441,7 @@
         """
         Private slot to prepare the actions button menu before it is shown.
         """
-        if self.vcs.canCommitMerge(self.dname):
+        if self.vcs.canCommitMerge():
             self.__commitMergeAct.setEnabled(True)
             self.__abortMergeAct.setEnabled(True)
 
@@ -776,7 +769,7 @@
         """
         Private slot used to abort an uncommitted merge.
         """
-        self.vcs.hgAbortMerge(self.dname)
+        self.vcs.hgAbortMerge()
         self.__committed()
 
     ###########################################################################