Mercurial > hg
view tests/test-rebase-brute-force.t @ 42072:fc0095256513
chistedit: properly show verbose diffs
I'm not sure if that ever worked and it's an internal API breakage,
but `"verbose": True` is not correctly parsed, as most of these
options are parsed by diffopts, whereas verbose is a global option.
Setting the UI to verbose instead does work and does show a verbose
patch, with full commit message.
It also shows all files, which unfortunately are a bit hard to read on
a single line in the default verbose template. Thus, we also change
the default template to use the status template, which shows one file
per line as well as its modification state.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Thu, 04 Apr 2019 10:41:55 -0400 |
parents | 7f183c643eb6 |
children |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > drawdag=$TESTDIR/drawdag.py > bruterebase=$TESTDIR/bruterebase.py > [experimental] > evolution.createmarkers=True > evolution.allowunstable=True > EOF $ init() { > N=`expr ${N:-0} + 1` > cd $TESTTMP && hg init repo$N && cd repo$N > hg debugdrawdag > } Source looks like "N" $ init <<'EOS' > C D > |\| > A B Z > EOS $ hg debugbruterebase 'all()-Z' Z A: A':Z B: B':Z AB: A':Z B':Z C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents AC: A':Z C':A'B BC: B':Z C':B'A ABC: A':Z B':Z C':A'B' D: D':Z AD: A':Z D':Z BD: B':Z D':B' ABD: A':Z B':Z D':B' CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents ACD: A':Z C':A'B D':Z BCD: B':Z C':B'A D':B' ABCD: A':Z B':Z C':A'B' D':B' Moving backwards $ init <<'EOS' > C > |\ > A B > | > Z > EOS $ hg debugbruterebase 'all()-Z' Z B: B':Z A: BA: B':Z C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents BC: B':Z C':B'A AC: BAC: B':Z C':B'A