Mercurial > hg > mercurial-source
view tests/test-narrow-update.t @ 43094:264a2cbb25d0
graphmod: remove support for graph lines mixing parent/grandparent styles (BC)
Currently, if the configuration for a graph edge draw style has multiple bytes
(at least on python2), it is interpreted as "this is a request to draw the line
partially in the style of the parent, partially in the style of the
grandparent". This precludes the configuration handling unicode characters
(which trigger the `len > 1` check, at least on python2), and I believe was part
of the reason that beautifygraph was written the way it was.
Talking with the person who implemented this, it appears to have been to achieve
feature parity with the rendering of the smartlog extension. I suspect that this
isn't actually used outside of that situation, so I think that we can remove it
without much issue.
This will make it so that multi-character edges are possible, and render any
existing configuration that uses this feature with these multiple characters.
This is *not* going to adjust the width of everything to make it line up
correctly, please see the test that's being modified in this changeset for an
example of how the previous configuration now renders.
Note also that the previous configuration seems to have been broken, or at least
it was behaving in a really non-obvious way - it was avoiding the grandparent
character(s) when it should have been displaying them! This is why so many "!"
characters changed to "3."; I don't know if this was intentional.
Differential Revision: https://phab.mercurial-scm.org/D5112
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Tue, 16 Oct 2018 04:59:36 -0700 |
parents | 351cbda889db |
children |
line wrap: on
line source
$ . "$TESTDIR/narrow-library.sh" create full repo $ hg init master $ cd master $ echo init > init $ hg ci -Aqm 'initial' $ mkdir inside $ echo inside > inside/f1 $ mkdir outside $ echo outside > outside/f1 $ hg ci -Aqm 'add inside and outside' $ echo modified > inside/f1 $ hg ci -qm 'modify inside' $ echo modified > outside/f1 $ hg ci -qm 'modify outside' $ cd .. $ hg clone --narrow ssh://user@dummy/master narrow --include inside requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 2 changes to 1 files new changesets *:* (glob) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd narrow $ hg debugindex -c rev linkrev nodeid p1 p2 0 0 9958b1af2add 000000000000 000000000000 1 1 2db4ce2a3bfe 9958b1af2add 000000000000 2 2 0980ee31a742 2db4ce2a3bfe 000000000000 3 3 4410145019b7 0980ee31a742 000000000000 $ hg update -q 0 Can update to revision with changes inside $ hg update -q 'desc("add inside and outside")' $ hg update -q 'desc("modify inside")' $ find * inside inside/f1 $ cat inside/f1 modified Can update to revision with changes outside $ hg update -q 'desc("modify outside")' $ find * inside inside/f1 $ cat inside/f1 modified Can update with a deleted file inside $ hg rm inside/f1 $ hg update -q 'desc("modify inside")' $ hg update -q 'desc("modify outside")' $ hg update -q 'desc("initial")' $ hg update -q 'desc("modify inside")' Can update with a moved file inside $ hg mv inside/f1 inside/f2 $ hg update -q 'desc("modify outside")' $ hg update -q 'desc("add inside and outside")' $ hg update -q 'desc("modify inside")'