| hg-reviewers |
These read from the dirstate, so they shouldn't be used in other
subclasses.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (96 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| __str__ = encoding.strmethod(__bytes__) | __str__ = encoding.strmethod(__bytes__) | ||||
| def __nonzero__(self): | def __nonzero__(self): | ||||
| return True | return True | ||||
| __bool__ = __nonzero__ | __bool__ = __nonzero__ | ||||
| def _buildflagfunc(self): | |||||
| # Create a fallback function for getting file flags when the | |||||
| # filesystem doesn't support them | |||||
| copiesget = self._repo.dirstate.copies().get | |||||
| parents = self.parents() | |||||
| if len(parents) < 2: | |||||
| # when we have one parent, it's easy: copy from parent | |||||
| man = parents[0].manifest() | |||||
| def func(f): | |||||
| f = copiesget(f, f) | |||||
| return man.flags(f) | |||||
| else: | |||||
| # merges are tricky: we try to reconstruct the unstored | |||||
| # result from the merge (issue1802) | |||||
| p1, p2 = parents | |||||
| pa = p1.ancestor(p2) | |||||
| m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() | |||||
| def func(f): | |||||
| f = copiesget(f, f) # may be wrong for merges with copies | |||||
| fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) | |||||
| if fl1 == fl2: | |||||
| return fl1 | |||||
| if fl1 == fla: | |||||
| return fl2 | |||||
| if fl2 == fla: | |||||
| return fl1 | |||||
| return '' # punt for conflicts | |||||
| return func | |||||
| @propertycache | |||||
| def _flagfunc(self): | |||||
| return self._repo.dirstate.flagfunc(self._buildflagfunc) | |||||
| @propertycache | @propertycache | ||||
| def _status(self): | def _status(self): | ||||
| return self._repo.status() | return self._repo.status() | ||||
| @propertycache | @propertycache | ||||
| def _user(self): | def _user(self): | ||||
| return self._repo.ui.username() | return self._repo.ui.username() | ||||
| return phase | return phase | ||||
| def hidden(self): | def hidden(self): | ||||
| return False | return False | ||||
| def children(self): | def children(self): | ||||
| return [] | return [] | ||||
| def flags(self, path): | |||||
| if r'_manifest' in self.__dict__: | |||||
| try: | |||||
| return self._manifest.flags(path) | |||||
| except KeyError: | |||||
| return '' | |||||
| try: | |||||
| return self._flagfunc(path) | |||||
| except OSError: | |||||
| return '' | |||||
| def ancestor(self, c2): | def ancestor(self, c2): | ||||
| """return the "best" ancestor context of self and c2""" | """return the "best" ancestor context of self and c2""" | ||||
| return self._parents[0].ancestor(c2) # punt on two parents for now | return self._parents[0].ancestor(c2) # punt on two parents for now | ||||
| def walk(self, match): | def walk(self, match): | ||||
| '''Generates matching file names.''' | '''Generates matching file names.''' | ||||
| return sorted(self._repo.dirstate.walk(self._repo.narrowmatch(match), | return sorted(self._repo.dirstate.walk(self._repo.narrowmatch(match), | ||||
| subrepos=sorted(self.substate), | subrepos=sorted(self.substate), | ||||
| unfi = self._repo.unfiltered() | unfi = self._repo.unfiltered() | ||||
| return [changectx(self._repo, unfi.changelog.rev(n), n) for n in p] | return [changectx(self._repo, unfi.changelog.rev(n), n) for n in p] | ||||
| def _fileinfo(self, path): | def _fileinfo(self, path): | ||||
| # populate __dict__['_manifest'] as workingctx has no _manifestdelta | # populate __dict__['_manifest'] as workingctx has no _manifestdelta | ||||
| self._manifest | self._manifest | ||||
| return super(workingctx, self)._fileinfo(path) | return super(workingctx, self)._fileinfo(path) | ||||
| def _buildflagfunc(self): | |||||
| # Create a fallback function for getting file flags when the | |||||
| # filesystem doesn't support them | |||||
| copiesget = self._repo.dirstate.copies().get | |||||
| parents = self.parents() | |||||
| if len(parents) < 2: | |||||
| # when we have one parent, it's easy: copy from parent | |||||
| man = parents[0].manifest() | |||||
| def func(f): | |||||
| f = copiesget(f, f) | |||||
| return man.flags(f) | |||||
| else: | |||||
| # merges are tricky: we try to reconstruct the unstored | |||||
| # result from the merge (issue1802) | |||||
| p1, p2 = parents | |||||
| pa = p1.ancestor(p2) | |||||
| m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() | |||||
| def func(f): | |||||
| f = copiesget(f, f) # may be wrong for merges with copies | |||||
| fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) | |||||
| if fl1 == fl2: | |||||
| return fl1 | |||||
| if fl1 == fla: | |||||
| return fl2 | |||||
| if fl2 == fla: | |||||
| return fl1 | |||||
| return '' # punt for conflicts | |||||
| return func | |||||
| @propertycache | |||||
| def _flagfunc(self): | |||||
| return self._repo.dirstate.flagfunc(self._buildflagfunc) | |||||
| def flags(self, path): | |||||
| if r'_manifest' in self.__dict__: | |||||
| try: | |||||
| return self._manifest.flags(path) | |||||
| except KeyError: | |||||
| return '' | |||||
| try: | |||||
| return self._flagfunc(path) | |||||
| except OSError: | |||||
| return '' | |||||
| def filectx(self, path, filelog=None): | def filectx(self, path, filelog=None): | ||||
| """get a file context from the working directory""" | """get a file context from the working directory""" | ||||
| return workingfilectx(self._repo, path, workingctx=self, | return workingfilectx(self._repo, path, workingctx=self, | ||||
| filelog=filelog) | filelog=filelog) | ||||
| def dirty(self, missing=False, merge=True, branch=True): | def dirty(self, missing=False, merge=True, branch=True): | ||||
| "check whether a working directory is modified" | "check whether a working directory is modified" | ||||
| # check subrepos first | # check subrepos first | ||||