Mercurial > public > mercurial-scm > hg
comparison hgext/git/gitlog.py @ 44480:f19491aae641
gitlog: fix embarassing bug that prevented log from showing correct parents
We had the correct parents in the database, but the changelog was
always returning p1 for all parents. Oops.
Differential Revision: https://phab.mercurial-scm.org/D8263
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Sat, 07 Mar 2020 17:42:40 -0500 |
| parents | 6d953b3fc2bd |
| children | 8b5f5d8ad783 |
comparison
equal
deleted
inserted
replaced
| 44479:7518ea76eff4 | 44480:f19491aae641 |
|---|---|
| 272 if c.parents: | 272 if c.parents: |
| 273 p1 = self.rev(c.parents[0].id.raw) | 273 p1 = self.rev(c.parents[0].id.raw) |
| 274 if len(c.parents) > 2: | 274 if len(c.parents) > 2: |
| 275 raise error.Abort(b'TODO octopus merge handling') | 275 raise error.Abort(b'TODO octopus merge handling') |
| 276 if len(c.parents) == 2: | 276 if len(c.parents) == 2: |
| 277 p2 = self.rev(c.parents[0].id.raw) | 277 p2 = self.rev(c.parents[1].id.raw) |
| 278 return p1, p2 | 278 return p1, p2 |
| 279 | 279 |
| 280 # Private method is used at least by the tags code. | 280 # Private method is used at least by the tags code. |
| 281 _uncheckedparentrevs = parentrevs | 281 _uncheckedparentrevs = parentrevs |
| 282 | 282 |