| Lint Skipped |
| Unit Tests Skipped |
I personally don't think this type of patch is needed -- Phabricator makes it very readable anyway (and there is hg diff --ignore-space-change for others). I'm sure some people disagree with me.
In D6952#103223, @martinvonz wrote:I personally don't think this type of patch is needed -- Phabricator makes it very readable anyway (and there is hg diff --ignore-space-change for others). I'm sure some people disagree with me.
I find it useful in my workflow, so I would rather keep it if you don't mind.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (73 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| b6fc9f6cc983 | d815263f91f7 | Pierre-Yves David | Oct 6 2019, 11:36 PM |
| def filesmodified(self): | def filesmodified(self): | ||||
| modified = set(self.files()) | modified = set(self.files()) | ||||
| modified.difference_update(self.filesadded()) | modified.difference_update(self.filesadded()) | ||||
| modified.difference_update(self.filesremoved()) | modified.difference_update(self.filesremoved()) | ||||
| return sorted(modified) | return sorted(modified) | ||||
| def filesadded(self): | def filesadded(self): | ||||
| source = self._repo.ui.config(b'experimental', b'copies.read-from') | |||||
| filesadded = self._changeset.filesadded | filesadded = self._changeset.filesadded | ||||
| if True: | |||||
| source = self._repo.ui.config(b'experimental', b'copies.read-from') | |||||
| if source == b'changeset-only': | if source == b'changeset-only': | ||||
| if filesadded is None: | if filesadded is None: | ||||
| filesadded = [] | filesadded = [] | ||||
| elif source == b'compatibility': | elif source == b'compatibility': | ||||
| if filesadded is None: | if filesadded is None: | ||||
| filesadded = scmutil.computechangesetfilesadded(self) | filesadded = scmutil.computechangesetfilesadded(self) | ||||
| else: | else: | ||||
| filesadded = scmutil.computechangesetfilesadded(self) | filesadded = scmutil.computechangesetfilesadded(self) | ||||
| return filesadded | return filesadded | ||||
| def filesremoved(self): | def filesremoved(self): | ||||
| source = self._repo.ui.config(b'experimental', b'copies.read-from') | |||||
| filesremoved = self._changeset.filesremoved | filesremoved = self._changeset.filesremoved | ||||
| if True: | |||||
| source = self._repo.ui.config(b'experimental', b'copies.read-from') | |||||
| if source == b'changeset-only': | if source == b'changeset-only': | ||||
| if filesremoved is None: | if filesremoved is None: | ||||
| filesremoved = [] | filesremoved = [] | ||||
| elif source == b'compatibility': | elif source == b'compatibility': | ||||
| if filesremoved is None: | if filesremoved is None: | ||||
| filesremoved = scmutil.computechangesetfilesremoved(self) | filesremoved = scmutil.computechangesetfilesremoved(self) | ||||
| else: | else: | ||||
| filesremoved = scmutil.computechangesetfilesremoved(self) | filesremoved = scmutil.computechangesetfilesremoved(self) | ||||
| return filesremoved | return filesremoved | ||||
| @propertycache | @propertycache | ||||
| def _copies(self): | def _copies(self): | ||||
| source = self._repo.ui.config(b'experimental', b'copies.read-from') | |||||
| p1copies = self._changeset.p1copies | p1copies = self._changeset.p1copies | ||||
| p2copies = self._changeset.p2copies | p2copies = self._changeset.p2copies | ||||
| # If config says to get copy metadata only from changeset, then return | if True: | ||||
| # that, defaulting to {} if there was no copy metadata. | source = self._repo.ui.config(b'experimental', b'copies.read-from') | ||||
| # In compatibility mode, we return copy data from the changeset if | # If config says to get copy metadata only from changeset, then | ||||
| # it was recorded there, and otherwise we fall back to getting it from | # return that, defaulting to {} if there was no copy metadata. In | ||||
| # compatibility mode, we return copy data from the changeset if it | |||||
| # was recorded there, and otherwise we fall back to getting it from | |||||
| # the filelogs (below). | # the filelogs (below). | ||||
| if source == b'changeset-only': | if source == b'changeset-only': | ||||
| if p1copies is None: | if p1copies is None: | ||||
| p1copies = {} | p1copies = {} | ||||
| if p2copies is None: | if p2copies is None: | ||||
| p2copies = {} | p2copies = {} | ||||
| elif source == b'compatibility': | elif source == b'compatibility': | ||||
| if p1copies is None: | if p1copies is None: | ||||
| # we are in compatiblity mode and there is not data in the | # we are in compatiblity mode and there is not data in the | ||||
| # changeset), we get the copy metadata from the filelogs. | # changeset), we get the copy metadata from the filelogs. | ||||
| p1copies, p2copies = super(changectx, self)._copies | p1copies, p2copies = super(changectx, self)._copies | ||||
| else: | else: | ||||
| # config said to read only from filelog, we get the copy metadata | # config said to read only from filelog, we get the copy | ||||
| # from the filelogs. | # metadata from the filelogs. | ||||
| p1copies, p2copies = super(changectx, self)._copies | p1copies, p2copies = super(changectx, self)._copies | ||||
| return p1copies, p2copies | return p1copies, p2copies | ||||
| def description(self): | def description(self): | ||||
| return self._changeset.description | return self._changeset.description | ||||
| def branch(self): | def branch(self): | ||||
| return encoding.tolocal(self._changeset.extra.get(b"branch")) | return encoding.tolocal(self._changeset.extra.get(b"branch")) | ||||