Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 25739:3dabc9b7494a
changeset_printer: use node.wdirrev to calculate meaningful parentrevs
Because we defined the working-directory revision is INT_MAX, it makes sense
that "hg log -r 'wdir()'" displays the "parent:" field. This is the same for
two revisions that are semantically contiguous but the intermediate revisions
are hidden.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 02 Jul 2015 22:03:06 +0900 |
| parents | 68c83b8d407a |
| children | 72d395e399c1 |
comparison
equal
deleted
inserted
replaced
| 25738:04d26a3c96fd | 25739:3dabc9b7494a |
|---|---|
| 1270 parents = ctx.parents() | 1270 parents = ctx.parents() |
| 1271 if len(parents) > 1: | 1271 if len(parents) > 1: |
| 1272 return parents | 1272 return parents |
| 1273 if self.ui.debugflag: | 1273 if self.ui.debugflag: |
| 1274 return [parents[0], self.repo['null']] | 1274 return [parents[0], self.repo['null']] |
| 1275 if parents[0].rev() >= scmutil.intrev(self.repo, ctx.rev()) - 1: | 1275 if parents[0].rev() >= scmutil.intrev(ctx.rev()) - 1: |
| 1276 return [] | 1276 return [] |
| 1277 return parents | 1277 return parents |
| 1278 | 1278 |
| 1279 class jsonchangeset(changeset_printer): | 1279 class jsonchangeset(changeset_printer): |
| 1280 '''format changeset information.''' | 1280 '''format changeset information.''' |