##// END OF EJS Templates
rebase: change and standarize template for rebase's one-line summary...
rebase: change and standarize template for rebase's one-line summary This removes the default template in rebase and switches to a centrally defined template. I've simplified it a bit to avoid the conditional parenthesis. I've also added labels so the different parts can be easily colored. The template is somewhat similar to what we've used internally at Google for a few years. I'm happy to change the template if others have opinions. Should we reuse the `color.log.` names as I have? Differential Revision: https://phab.mercurial-scm.org/D9252

File last commit:

r46356:f90a5c21 default
r46356:f90a5c21 default
Show More
test-rebase-legacy.t
93 lines | 1.9 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-legacy.t
Taapas Agrawal
continue: added support for rebase...
r42832 #testcases continuecommand continueflag
Jun Wu
rebase: change internal format to support destination map...
r34006 Test rebase --continue with rebasestate written by legacy client
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
> drawdag=$TESTDIR/drawdag.py
> EOF
Taapas Agrawal
continue: added support for rebase...
r42832 #if continueflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> continue = rebase --continue
> EOF
#endif
Jun Wu
rebase: change internal format to support destination map...
r34006 $ hg init
$ hg debugdrawdag <<'EOF'
> D H
> | |
> C G
> | |
> B F
> | |
> Z A E
> \|/
> R
> EOF
Martin von Zweigbergk
tests: avoid "magic" nodeids in test-rebase-legacy.t...
r45670 $ for r in A B C D E F G H R Z
> do
> eval node_$r=$(hg log -r $r -T '{node}')
> done
Jun Wu
rebase: change internal format to support destination map...
r34006
rebasestate generated by a legacy client running "hg rebase -r B+D+E+G+H -d Z"
$ touch .hg/last-message.txt
$ cat > .hg/rebasestate <<EOF
> 0000000000000000000000000000000000000000
Martin von Zweigbergk
tests: avoid "magic" nodeids in test-rebase-legacy.t...
r45670 > $node_Z
Jun Wu
rebase: change internal format to support destination map...
r34006 > 0000000000000000000000000000000000000000
> 0
> 0
> 0
>
Martin von Zweigbergk
tests: avoid "magic" nodeids in test-rebase-legacy.t...
r45670 > $node_A:-2
> $node_E:0000000000000000000000000000000000000000
> $node_B:0000000000000000000000000000000000000000
> $node_F:-3
> $node_C:-3
> $node_G:0000000000000000000000000000000000000000
> $node_D:0000000000000000000000000000000000000000
> $node_H:0000000000000000000000000000000000000000
Jun Wu
rebase: change internal format to support destination map...
r34006 > EOF
Taapas Agrawal
continue: added support for rebase...
r42832 #if continuecommand
$ hg continue --dry-run
rebase in progress, will be resumed
#endif
$ hg continue
Martin von Zweigbergk
rebase: change and standarize template for rebase's one-line summary...
r46356 rebasing 4:c1e6b162678d B "B"
rebasing 8:6f7a236de685 D "D"
rebasing 2:de008c61a447 E "E"
rebasing 7:d2fa1c02b240 G "G"
rebasing 9:6582e6951a9c H tip "H"
Jun Wu
rebase: change internal format to support destination map...
r34006 warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg
Jun Wu
rebase: change internal format to support destination map...
r34006
$ hg log -G -T '{rev}:{node|short} {desc}\n'
o 11:721b8da0a708 H
|
o 10:9d65695ec3c2 G
|
o 9:21c8397a5d68 E
|
| o 8:fc52970345e8 D
| |
| o 7:eac96551b107 B
|/
| o 6:bd5548558fcf C
| |
| | o 5:aeba276fcb7d F
| | |
| o | 4:c1e6b162678d B
| | |
o | | 3:f424eb6a8c01 Z
| | |
+---o 2:de008c61a447 E
| |
| o 1:21a6c4502885 A
|/
o 0:b41ce7760717 R