| hg-reviewers |
This will be used as an abstraction by simplemerge to get the data it used to
read off the filesystem.
| Lint Skipped |
| Unit Tests Skipped |
| while True: | while True: | ||||
| for parent in c.parents()[:cut]: | for parent in c.parents()[:cut]: | ||||
| visit[(parent.linkrev(), parent.filenode())] = parent | visit[(parent.linkrev(), parent.filenode())] = parent | ||||
| if not visit: | if not visit: | ||||
| break | break | ||||
| c = visit.pop(max(visit)) | c = visit.pop(max(visit)) | ||||
| yield c | yield c | ||||
| def decodeddata(self): | |||||
| """Returns `data()` after running repository decoding filters. | |||||
| This is often equivalent to how the data would be expressed on disk. | |||||
| """ | |||||
| return self._repo.wwritedata(self.path(), self.data()) | |||||
| def _annotatepair(parents, childfctx, child, skipchild, diffopts): | def _annotatepair(parents, childfctx, child, skipchild, diffopts): | ||||
| r''' | r''' | ||||
| Given parent and child fctxes and annotate data for parents, for all lines | Given parent and child fctxes and annotate data for parents, for all lines | ||||
| in either parent that match the child, annotate the child with the parent's | in either parent that match the child, annotate the child with the parent's | ||||
| data. | data. | ||||
| Additionally, if `skipchild` is True, replace all other lines with parent | Additionally, if `skipchild` is True, replace all other lines with parent | ||||
| annotate data as well such that child is never blamed for any lines. | annotate data as well such that child is never blamed for any lines. | ||||