Mercurial > evolve
comparison hgext3rd/topic/stack.py @ 2918:0437158e0ed6
stack: display both parent with displaying merge
This will help understanding merge in the stack. More test involving merge are
adding in the next changeset.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 07 Sep 2017 19:43:07 +0200 |
| parents | 17749d9d3968 |
| children | 5b514ab2ab4e |
comparison
equal
deleted
inserted
replaced
| 2917:044686b25cf7 | 2918:0437158e0ed6 |
|---|---|
| 168 continue | 168 continue |
| 169 entries.append((idx, False, ctx)) | 169 entries.append((idx, False, ctx)) |
| 170 prev = ctx.rev() | 170 prev = ctx.rev() |
| 171 continue | 171 continue |
| 172 p1 = ctx.p1() | 172 p1 = ctx.p1() |
| 173 p2 = ctx.p2() | |
| 173 if p1.obsolete(): | 174 if p1.obsolete(): |
| 174 p1 = repo[_singlesuccessor(repo, p1)] | 175 p1 = repo[_singlesuccessor(repo, p1)] |
| 175 if p1.rev() != prev and p1.node() != node.nullid: | 176 if p2.node() != node.nullid: |
| 177 entries.append((idxmap.get(p1.rev()), False, p1)) | |
| 178 entries.append((idxmap.get(p2.rev()), False, p2)) | |
| 179 elif p1.rev() != prev and p1.node() != node.nullid: | |
| 176 entries.append((idxmap.get(p1.rev()), False, p1)) | 180 entries.append((idxmap.get(p1.rev()), False, p1)) |
| 177 entries.append((idx, True, ctx)) | 181 entries.append((idx, True, ctx)) |
| 178 idxmap[ctx.rev()] = idx | 182 idxmap[ctx.rev()] = idx |
| 179 prev = r | 183 prev = r |
| 180 | 184 |