Mercurial > hg
view hgext/beautifygraph.py @ 39224:5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
I think this is related to the octopus merge being sloppy, and that's having a
cascading affect on the fixup merge. If this change is made on p1 (specifically
with the 'Added parent file' commit), the failure doesn't occur.
The file modification with the rename doesn't seem to be necessary, but it's
what's happening in a production repo where I first noticed, so I left it. This
is an example of the manifest divergence I'd been seeing, which wasn't fixed by
Yuya's recent changes. This is separate from the changelog divergence I was
also seeing[1]. Probably nobody cares about bzr anymore, but this will also
affect git, since the octopus fixup code is in the hg sink.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-August/120473.html
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 20 Aug 2018 16:19:36 -0400 |
parents | de3a9d7ec1c2 |
children | 5b9f116104f9 |
line wrap: on
line source
# -*- coding: UTF-8 -*- # beautifygraph.py - improve graph output by using Unicode characters # # Copyright 2018 John Stiles <johnstiles@gmail.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. '''beautify log -G output by using Unicode characters (EXPERIMENTAL) A terminal with UTF-8 support and monospace narrow text are required. ''' from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( encoding, extensions, graphmod, pycompat, templatekw, ) # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. testedwith = 'ships-with-hg-core' def prettyedge(before, edge, after): if edge == '~': return '\xE2\x95\xA7' # U+2567 ╧ if edge == 'X': return '\xE2\x95\xB3' # U+2573 ╳ if edge == '/': return '\xE2\x95\xB1' # U+2571 ╱ if edge == '-': return '\xE2\x94\x80' # U+2500 ─ if edge == '|': return '\xE2\x94\x82' # U+2502 │ if edge == ':': return '\xE2\x94\x86' # U+2506 ┆ if edge == '\\': return '\xE2\x95\xB2' # U+2572 ╲ if edge == '+': if before == ' ' and not after == ' ': return '\xE2\x94\x9C' # U+251C ├ if after == ' ' and not before == ' ': return '\xE2\x94\xA4' # U+2524 ┤ return '\xE2\x94\xBC' # U+253C ┼ return edge def convertedges(line): line = ' %s ' % line pretty = [] for idx in pycompat.xrange(len(line) - 2): pretty.append(prettyedge(line[idx:idx + 1], line[idx + 1:idx + 2], line[idx + 2:idx + 3])) return ''.join(pretty) def getprettygraphnode(orig, *args, **kwargs): node = orig(*args, **kwargs) if node == 'o': return '\xE2\x97\x8B' # U+25CB ○ if node == '@': return '\xE2\x97\x8D' # U+25CD ◍ if node == '*': return '\xE2\x88\x97' # U+2217 ∗ if node == 'x': return '\xE2\x97\x8C' # U+25CC ◌ if node == '_': return '\xE2\x95\xA4' # U+2564 ╤ return node def outputprettygraph(orig, ui, graph, *args, **kwargs): (edges, text) = zip(*graph) graph = zip([convertedges(e) for e in edges], text) return orig(ui, graph, *args, **kwargs) def extsetup(ui): if encoding.encoding != 'UTF-8': ui.warn(_('beautifygraph: unsupported encoding, UTF-8 required\n')) return if r'A' in encoding._wide: ui.warn(_('beautifygraph: unsupported terminal settings, ' 'monospace narrow text required\n')) return if ui.plain('graph'): return extensions.wrapfunction(graphmod, 'outputgraph', outputprettygraph) extensions.wrapfunction(templatekw, 'getgraphnode', getprettygraphnode)