mercurial-scm/hg: mercurial/cmdutil.py comparison

comparison mercurial/cmdutil.py @ 34683:3d6d4b12128e

tersestatus: make methods part of the dirnode class Differential Revision: https://phab.mercurial-scm.org/D1042

author	Denis Laxalde <denis@laxalde.org>
date	Wed, 11 Oct 2017 21:19:19 +0200
parents	7e3001b74ab3
children	5d98674df18a

comparison

equal deleted inserted replaced

-:7e3001b74ab3
+:3d6d4b12128e
 self._addfileindir(filename, status)
 if status not in self.statuses:
 self.statuses.add(status)
-def _addfilestotersed(path, files, tersedict):
+def _addfilestotersed(self, tersedict):
-""" adds files to the their respective status list in the final tersed list
+"""
+adds files to the their respective status list in the final tersed list
-path is the path of parent directory of the file
-files is a list of tuple where each tuple is (filename, status)
+path is the path of parent directory of the file
-tersedict is a dictonary which contains each status abbreviation as key and
+files is a list of tuple where each tuple is (filename, status)
-list of files and tersed dirs in that status as value
+tersedict is a dictonary which contains each status abbreviation as key and
-"""
+list of files and tersed dirs in that status as value
-for f, st in files:
+"""
-tersedict[st].append(os.path.join(path, f))
+for f, st in self.files:
+tersedict[st].append(os.path.join(self.path, f))
-def _processtersestatus(subdir, tersedict, terseargs):
-"""a recursive function which process status for a certain directory.
+def _processtersestatus(self, tersedict, terseargs):
+"""
-subdir is an oject of dirnode class defined below. each object of dirnode
+a recursive function which process status for a certain directory.
-class has a set of statuses which files in that directory has. This ease our
-check whether we can terse that directory or not.
+self is an oject of dirnode class defined below. each object of dirnode
+class has a set of statuses which files in that directory has. This ease
-tersedict is a dictonary which contains each status abbreviation as key and
+our check whether we can terse that directory or not.
-list of files and tersed dirs in that status as value. In each function call
-we are passing the same dict and adding files and dirs to it.
+tersedict is a dictonary which contains each status abbreviation as key
+and list of files and tersed dirs in that status as value. In each
-terseargs is the string of arguments passed by the user with `--terse` flag.
+function call we are passing the same dict and adding files and dirs
+to it.
-Following are the cases which can happen:
+terseargs is the string of arguments passed by the user with `--terse`
-1) All the files in the directory (including all the files in its
+flag.
-subdirectories) share the same status and the user has asked us to terse
-that status. -> we add the directory name to status list and return
+Following are the cases which can happen:
-2) If '1)' does not happen, we do following:
+1) All the files in the directory (including all the files in its
+subdirectories) share the same status and the user has asked us to terse
-a) Add all the files which are in this directory (only the ones in
+that status. -> we add the directory name to status list and return
-this directory, not the subdirs) to their respective status list
+2) If '1)' does not happen, we do following:
-b) Recurse the function on all the subdirectories of this directory
-"""
+a) Add all the files which are in this directory (only the ones in
+this directory, not the subdirs) to their respective status list
-if len(subdir.statuses) == 1:
-onlyst = subdir.statuses.pop()
+b) Recurse the function on all the subdirectories of this
+directory
-# Making sure we terse only when the status abbreviation is passed as
+"""
-# terse argument
-if onlyst in terseargs:
+if len(self.statuses) == 1:
-tersedict[onlyst].append(subdir.path + pycompat.ossep)
+onlyst = self.statuses.pop()
-return
+# Making sure we terse only when the status abbreviation is
-# add the files to status list
+# passed as terse argument
-_addfilestotersed(subdir.path, subdir.files, tersedict)
+if onlyst in terseargs:
+tersedict[onlyst].append(self.path + pycompat.ossep)
-#recurse on the subdirs
+return
-for dirobj in subdir.subdirs.values():
-_processtersestatus(dirobj, tersedict, terseargs)
+# add the files to status list
+self._addfilestotersed(tersedict)
+#recurse on the subdirs
+for dirobj in self.subdirs.values():
+dirobj._processtersestatus(tersedict, terseargs)
 def tersedir(statuslist, terseargs):
 """
 terses the status if all the files in a directory shares the same status
 for f in getattr(statuslist, attrname):
 rootobj.addfile(f, attrname[0])
 tersedict[attrname[0]] = []
 # we won't be tersing the root dir, so add files in it
-_addfilestotersed(rootobj.path, rootobj.files, tersedict)
+rootobj._addfilestotersed(tersedict)
 # process each sub-directory and build tersedict
 for subdir in rootobj.subdirs.values():
-_processtersestatus(subdir, tersedict, terseargs)
+subdir._processtersestatus(tersedict, terseargs)
 tersedlist = []
 for st in allst:
 tersedict[st].sort()
 tersedlist.append(tersedict[st])

Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 34683:3d6d4b12128e