Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 39710:7375a9ab0149
filectx: fix return of renamed
How is this not blowing up everywhere?
It seems that filelog.renamed has always returned False (incorrectly a
boolean) instead of the assumed None. Tracing through history, you need
to skip over my move of code in 2013 by annotating from 896193a9cab4^
and you can see the original code is from 2007 (180a3eee4b75) and that
ab9fa7a85dd9 broke this by assuming renamed was a bool (instead of
None).
Refactoring memctx code later exposed this bug.
| author | Sean Farley <sean@farley.io> |
|---|---|
| date | Tue, 17 Jul 2018 17:16:22 -0700 |
| parents | fa4d16daf1be |
| children | 6c8ceebce309 |
comparison
equal
deleted
inserted
replaced
| 39709:254361f727bd | 39710:7375a9ab0149 |
|---|---|
| 1050 or both changeset parents contain different file revisions. | 1050 or both changeset parents contain different file revisions. |
| 1051 """ | 1051 """ |
| 1052 | 1052 |
| 1053 renamed = self._filelog.renamed(self._filenode) | 1053 renamed = self._filelog.renamed(self._filenode) |
| 1054 if not renamed: | 1054 if not renamed: |
| 1055 return renamed | 1055 return None |
| 1056 | 1056 |
| 1057 if self.rev() == self.linkrev(): | 1057 if self.rev() == self.linkrev(): |
| 1058 return renamed | 1058 return renamed |
| 1059 | 1059 |
| 1060 name = self.path() | 1060 name = self.path() |