Mercurial > hg
view tests/test-ui-verbosity.py.out @ 44396:acbfa31cfaf2
debugmergestate: make templated
Our IntelliJ team wants to be able to read the merge state in order to
help the user resolve merge conflicts. They had so far been reading
file contents from p1() and p2() and their merge base. That is not
ideal for several reasons (merge base is not necessarily the "graft
base", renames are not handled, commands like `hg update -m` is not
handled). It will get especially bad as of my D7827. This patch makes
the output s a templated. I haven't bothered to make it complete
(e.g. merge driver states are not handled), but it's probably good
enough as a start.
I've done a web search for "debugmergestate" and I can't find any
indication that any tools currently rely on its output. If it turns
out that we get bug reports for it once this is released, I won't
object to backing this patch out on the stable branch (and then
perhaps replace it by a separate command, or put it behind a new
flag).
The changes in test-backout.t are interesting, in particular this:
```
- other path: foo (node not stored in v1 format)
+ other path: (node foo)
```
I wonder if that means that we actually read v1 format
incorrectly. That seems to be an old format that was switched away
from in 2014, so it doesn't matter now anyway.
Differential Revision: https://phab.mercurial-scm.org/D8120
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 13 Feb 2020 21:14:20 -0800 |
parents | 807f3f5c60e9 |
children |
line wrap: on
line source
hgrc settings command line options final result quiet verbo debug quiet verbo debug quiet verbo debug 0 False False False False False False -> False False False 1 True False False False False False -> True False False 2 False True False False False False -> False True False 3 True True False False False False -> False False False 4 False False True False False False -> False True True 5 True False True False False False -> False True True 6 False True True False False False -> False True True 7 True True True False False False -> False True True 8 False False False True False False -> True False False 9 True False False True False False -> True False False 10 False True False True False False -> True False False 11 True True False True False False -> True False False 12 False False True True False False -> True False False 13 True False True True False False -> True False False 14 False True True True False False -> True False False 15 True True True True False False -> True False False 16 False False False False True False -> False True False 17 True False False False True False -> False True False 18 False True False False True False -> False True False 19 True True False False True False -> False True False 20 False False True False True False -> False True False 21 True False True False True False -> False True False 22 False True True False True False -> False True False 23 True True True False True False -> False True False 24 False False False True True False -> False False False 25 True False False True True False -> False False False 26 False True False True True False -> False False False 27 True True False True True False -> False False False 28 False False True True True False -> False False False 29 True False True True True False -> False False False 30 False True True True True False -> False False False 31 True True True True True False -> False False False 32 False False False False False True -> False True True 33 True False False False False True -> False True True 34 False True False False False True -> False True True 35 True True False False False True -> False True True 36 False False True False False True -> False True True 37 True False True False False True -> False True True 38 False True True False False True -> False True True 39 True True True False False True -> False True True 40 False False False True False True -> False True True 41 True False False True False True -> False True True 42 False True False True False True -> False True True 43 True True False True False True -> False True True 44 False False True True False True -> False True True 45 True False True True False True -> False True True 46 False True True True False True -> False True True 47 True True True True False True -> False True True 48 False False False False True True -> False True True 49 True False False False True True -> False True True 50 False True False False True True -> False True True 51 True True False False True True -> False True True 52 False False True False True True -> False True True 53 True False True False True True -> False True True 54 False True True False True True -> False True True 55 True True True False True True -> False True True 56 False False False True True True -> False True True 57 True False False True True True -> False True True 58 False True False True True True -> False True True 59 True True False True True True -> False True True 60 False False True True True True -> False True True 61 True False True True True True -> False True True 62 False True True True True True -> False True True 63 True True True True True True -> False True True