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

-:1e391f977124
+:54b73174ab61
 def vcsRegisteredState(self, name):
 """
 Public method used to get the registered state of a file in the vcs.
-@param name filename to check (string)
+@param name file or directory name to check
+@type str
 @return a combination of canBeCommited and canBeAdded
+@rtype int
 """
 if name.endswith(os.sep):
 name = name[:-1]
 name = os.path.normcase(name)
-dname, fname = self.splitPath(name)
+if (
-if fname == '.' and os.path.isdir(os.path.join(dname, self.adminDir)):
+os.path.isdir(name) and
+os.path.isdir(os.path.join(name, self.adminDir))
+):
 return self.canBeCommitted
 if name in self.statusCache:
 return self.statusCache[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 0
 args = self.initCommand("status")
 args.append('--all')
 args.append('--noninteractive')
 output, error = self.__client.runcommand(args)
 if output:
+repodir = self.getClient().getRepository()
 for line in output.splitlines():
 if len(line) > 2 and line[0] in "MARC!?I" and line[1] == " ":
 flag, path = line.split(" ", 1)
-absname = os.path.join(repodir, os.path.normcase(path))
+absname = Utilities.normcasepath(
-if flag not in "?I":
+os.path.join(repodir, path))
-if fname == '.':
+if flag not in "?I" and absname == name:
-if absname.startswith(dname + os.path.sep):
+return self.canBeCommitted
-return self.canBeCommitted
-if absname == dname:
-return self.canBeCommitted
-else:
-if absname == name:
-return self.canBeCommitted
 return self.canBeAdded
 def vcsAllRegisteredStates(self, names, dname, shortcut=True):
 """
 if name in names:
 found = True
 names[name] = self.statusCache[name]
 if not found:
-# 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 names
 args = self.initCommand("status")
 args.append('--all')
 args.append('--noninteractive')
 output, error = self.__client.runcommand(args)
 if output:
+repoPath = self.getClient().getRepository()
 dirs = [x for x in names.keys() if os.path.isdir(x)]
 for line in output.splitlines():
 if line and line[0] in "MARC!?I":
 flag, path = line.split(" ", 1)
-name = os.path.normcase(os.path.join(repodir, path))
+name = os.path.normcase(os.path.join(repoPath, path))
 dirName = os.path.dirname(name)
 if name.startswith(dname):
 if flag not in "?I":
 if name in names:
 names[name] = self.canBeCommitted
 @param name file/directory name to show the log of (string)
 @param isFile flag indicating log for a file is to be shown
 (boolean)
 """
-if name == self.__repoDir:
+if name == self.getClient().getRepository():
 name = None
 if self.logBrowser is None:
 from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowser = HgLogBrowserDialog(self)
 @param largefilesData dictionary with data for the largefiles
 section of the data dialog
 @type dict
 """
 if repoName is None:
-repoName = self.__repoDir
+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
 dia = HgDialog(self.tr('Rollback last transaction'), self)
 res = dia.startProcess(["rollback"])
 if res:
 dia.exec()
-def hgServe(self, name):
+def hgServe(self, repoPath):
 """
 Public method used to serve the project.
-@param name directory name (string)
+@param repoPath directory containing the repository
-"""
+@type str
-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
 from .HgServeDialog import HgServeDialog
-self.serveDlg = HgServeDialog(self, repodir)
+self.serveDlg = HgServeDialog(self, repoPath)
 self.serveDlg.show()
 def hgImport(self):
 """
 Public method to import a patch file.
 def hgDeleteBackups(self):
 """
 Public method to delete all backup bundles in the backup area.
 """
-backupdir = os.path.join(self.__repodir, self.adminDir, "strip-backup")
+backupdir = os.path.join(self.getClient().getRepository(),
+self.adminDir, "strip-backup")
 yes = E5MessageBox.yesNo(
 self.__ui,
 self.tr("Delete All Backups"),
 self.tr("""<p>Do you really want to delete all backup bundles"""
 """ stored the backup area <b>{0}</b>?</p>""").format(
 if self.__repoIniFile and path == self.__repoIniFile:
 self.__checkDefaults()
 self.iniFileChanged.emit()
-def __monitorRepoIniFile(self, name):
+def __monitorRepoIniFile(self, repodir):
 """
 Private slot to add a repository configuration file to the list of
 monitored files.
-@param name directory name pointing into the repository (string)
+@param repodir directory name of the repository
-"""
+@type str
-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 not repodir or os.path.splitdrive(repodir)[1] == os.sep:
-return
 cfgFile = os.path.join(repodir, self.adminDir, "hgrc")
 if os.path.exists(cfgFile):
 self.__iniWatcher.addPath(cfgFile)
 self.__repoIniFile = cfgFile
 self.__checkDefaults()

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsMercurial/hg.py