Mercurial > hg
view tests/test-glog-topological.t @ 45761:341e014fe0fb stable
repoview: only pin obsolete wdir parents while there are unresolved conflicts
I noticed after doing an update from an obsolete revision with a dirty wdir that
the obsolete commit stayed visible for no obvious reason. It was decided in
85b03b1e4715 not to clear mergestate once all of the conflicts were resolved, in
order to allow re-resolving. Since the point of pinning the obsolete parents
was to allow resolving in the first place (aaeccdb6e654), it makes sense to also
gate it on whether or not there are any remaining files to resolve. This might
result in pinning again if files are marked unresolved again, but that seems
reasonable, given that it still solves the original issue.
Note that this isn't purely cosmetic- pushing with a pinned obsolete revision is
likely to cause complaints about pushing multiple heads or other unexpected
errors. So the faster it comes out of that state, the better.
Differential Revision: https://phab.mercurial-scm.org/D9248
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 23 Oct 2020 22:20:08 -0400 |
parents | 604c086ddde6 |
children | ed84a4d48910 |
line wrap: on
line source
This test file aims at test topological iteration and the various configuration it can has. $ cat >> $HGRCPATH << EOF > [ui] > logtemplate={rev}\n > EOF On this simple example, all topological branch are displayed in turn until we can finally display 0. this implies skipping from 8 to 3 and coming back to 7 later. $ hg init test01 $ cd test01 $ hg unbundle $TESTDIR/bundles/remote.hg adding changesets adding manifests adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg log -G o 8 | | o 7 | | | o 6 | | | o 5 | | | o 4 | | o | 3 | | o | 2 | | o | 1 |/ o 0 (display all nodes) $ hg log -G -r 'sort(all(), topo)' o 8 | o 3 | o 2 | o 1 | | o 7 | | | o 6 | | | o 5 | | | o 4 |/ o 0 (display nodes filtered by log options) $ hg log -G -r 'sort(all(), topo)' -k '.3' o 8 | o 3 | ~ o 7 | o 6 | ~ (revset skipping nodes) $ hg log -G --rev 'sort(not (2+6), topo)' o 8 | o 3 : o 1 | | o 7 | : | o 5 | | | o 4 |/ o 0 (begin) from the other branch $ hg log -G -r 'sort(all(), topo, topo.firstbranch=5)' o 7 | o 6 | o 5 | o 4 | | o 8 | | | o 3 | | | o 2 | | | o 1 |/ o 0 Topological sort can be turned on via config $ cat >> $HGRCPATH << EOF > [experimental] > log.topo=true > EOF $ hg log -G o 8 | o 3 | o 2 | o 1 | | o 7 | | | o 6 | | | o 5 | | | o 4 |/ o 0 Does not affect non-graph log $ hg log -T '{rev}\n' 8 7 6 5 4 3 2 1 0