| durin42 |
| hg-reviewers |
Turn dirnode's methods into generators which can be used to update "tersedict"
in caller. So instead of passing the "tersedict" to be mutated here and there,
it's now clearer where it is updated as it's purely a local variable to
tersedir() function.
While I was here, I renamed _processtersestatus to tersewalk and
_addfilestotersed to iterfilepaths.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (32 lines) |
| self.subdirs[subdir].addfile(filep, status) | self.subdirs[subdir].addfile(filep, status) | ||||
| else: | else: | ||||
| self._addfileindir(filename, status) | self._addfileindir(filename, status) | ||||
| if status not in self.statuses: | if status not in self.statuses: | ||||
| self.statuses.add(status) | self.statuses.add(status) | ||||
| def _addfilestotersed(self, tersedict): | def iterfilepaths(self): | ||||
| """ | """ | ||||
| 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 | path is the path of parent directory of the file | ||||
| files is a list of tuple where each tuple is (filename, status) | files is a list of tuple where each tuple is (filename, status) | ||||
| 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 self.files: | for f, st in self.files: | ||||
| tersedict[st].append(os.path.join(self.path, f)) | yield st, os.path.join(self.path, f) | ||||
| def _processtersestatus(self, tersedict, terseargs): | def tersewalk(self, terseargs): | ||||
| """ | """ | ||||
| a recursive function which process status for a certain directory. | a recursive function which process status for a certain directory. | ||||
| self is an oject of dirnode class defined below. each object of dirnode | 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 | class has a set of statuses which files in that directory has. This ease | ||||
| our check whether we can terse that directory or not. | our check whether we can terse that directory or not. | ||||
| tersedict is a dictonary which contains each status abbreviation as key | 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 | and 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 | function call we are passing the same dict and adding files and dirs | ||||
| to it. | to it. | ||||
| terseargs is the string of arguments passed by the user with `--terse` | terseargs is the string of arguments passed by the user with `--terse` | ||||
| flag. | flag. | ||||
| Following are the cases which can happen: | Following are the cases which can happen: | ||||
| 1) All the files in the directory (including all the files in its | 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 | 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 | that status. -> yield (status, dirpath) | ||||
| 2) If '1)' does not happen, we do following: | 2) If '1)' does not happen, we do following: | ||||
| a) Add all the files which are in this directory (only the ones in | a) Yield (status, filepath) for all the files which are in this | ||||
| this directory, not the subdirs) to their respective status list | directory (only the ones in this directory, not the subdirs) | ||||
| b) Recurse the function on all the subdirectories of this | b) Recurse the function on all the subdirectories of this | ||||
| directory | directory | ||||
| """ | """ | ||||
| if len(self.statuses) == 1: | if len(self.statuses) == 1: | ||||
| onlyst = self.statuses.pop() | onlyst = self.statuses.pop() | ||||
| # Making sure we terse only when the status abbreviation is | # Making sure we terse only when the status abbreviation is | ||||
| # passed as terse argument | # passed as terse argument | ||||
| if onlyst in terseargs: | if onlyst in terseargs: | ||||
| tersedict[onlyst].append(self.path + pycompat.ossep) | yield onlyst, self.path + pycompat.ossep | ||||
| return | return | ||||
| # add the files to status list | # add the files to status list | ||||
| self._addfilestotersed(tersedict) | for st, fpath in self.iterfilepaths(): | ||||
| yield st, fpath | |||||
| #recurse on the subdirs | #recurse on the subdirs | ||||
| for dirobj in self.subdirs.values(): | for dirobj in self.subdirs.values(): | ||||
| dirobj._processtersestatus(tersedict, terseargs) | for st, fpath in dirobj.tersewalk(terseargs): | ||||
| yield st, fpath | |||||
| def tersedir(statuslist, terseargs): | def tersedir(statuslist, terseargs): | ||||
| """ | """ | ||||
| terses the status if all the files in a directory shares the same status | terses the status if all the files in a directory shares the same status | ||||
| statuslist is scmutil.status() object which contains a list of files for | statuslist is scmutil.status() object which contains a list of files for | ||||
| each status. | each status. | ||||
| terseargs is string which is passed by the user as the argument to `--terse` | terseargs is string which is passed by the user as the argument to `--terse` | ||||
| flag. | flag. | ||||
| The function makes a tree of objects of dirnode class, and at each node it | The function makes a tree of objects of dirnode class, and at each node it | ||||
| stores the information required to know whether we can terse a certain | stores the information required to know whether we can terse a certain | ||||
| directory or not. | directory or not. | ||||
| tersedict (defined in the function) is a dictionary which has one word key | tersedict (defined in the function) is a dictionary which has one word key | ||||
| for each status and a list of files and dir in that status as the respective | for each status and a list of files and dir in that status as the respective | ||||
| value. The dictionary is passed to other helper functions which builds it. | value. | ||||
| """ | """ | ||||
| # the order matters here as that is used to produce final list | # the order matters here as that is used to produce final list | ||||
| allst = ('m', 'a', 'r', 'd', 'u', 'i', 'c') | allst = ('m', 'a', 'r', 'd', 'u', 'i', 'c') | ||||
| # checking the argument validity | # checking the argument validity | ||||
| for s in terseargs: | for s in terseargs: | ||||
| if s not in allst: | if s not in allst: | ||||
| raise error.Abort(_("'%s' not recognized") % s) | raise error.Abort(_("'%s' not recognized") % s) | ||||
| # creating a dirnode object for the root of the repo | # creating a dirnode object for the root of the repo | ||||
| rootobj = dirnode('') | rootobj = dirnode('') | ||||
| pstatus = ('modified', 'added', 'deleted', 'clean', 'unknown', | pstatus = ('modified', 'added', 'deleted', 'clean', 'unknown', | ||||
| 'ignored', 'removed') | 'ignored', 'removed') | ||||
| tersedict = {} | tersedict = {} | ||||
| for attrname in pstatus: | for attrname in pstatus: | ||||
| for f in getattr(statuslist, attrname): | for f in getattr(statuslist, attrname): | ||||
| rootobj.addfile(f, attrname[0]) | rootobj.addfile(f, attrname[0]) | ||||
| tersedict[attrname[0]] = [] | tersedict[attrname[0]] = [] | ||||
| # we won't be tersing the root dir, so add files in it | # we won't be tersing the root dir, so add files in it | ||||
| rootobj._addfilestotersed(tersedict) | for st, fpath in rootobj.iterfilepaths(): | ||||
| tersedict[st].append(fpath) | |||||
| # process each sub-directory and build tersedict | # process each sub-directory and build tersedict | ||||
| for subdir in rootobj.subdirs.values(): | for subdir in rootobj.subdirs.values(): | ||||
| subdir._processtersestatus(tersedict, terseargs) | for st, f in subdir.tersewalk(terseargs): | ||||
| tersedict[st].append(f) | |||||
| tersedlist = [] | tersedlist = [] | ||||
| for st in allst: | for st in allst: | ||||
| tersedict[st].sort() | tersedict[st].sort() | ||||
| tersedlist.append(tersedict[st]) | tersedlist.append(tersedict[st]) | ||||
| return tersedlist | return tersedlist | ||||