--- a/tests/test-evolve-obshistory.t Sat Dec 16 23:40:39 2017 +0100
+++ b/tests/test-evolve-obshistory.t Tue Jan 16 04:35:34 2018 +0100
@@ -62,8 +62,9 @@
|
x 471f378eab4c (1) A0
rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/4ae3a4151de9-changeset-description
+ diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,3 @@
-A0
+A1
@@ -78,13 +79,36 @@
+42
+ $ hg obslog --patch --color debug
+ @ [evolve.node|4ae3a4151de9] [evolve.rev|(3)] [evolve.short_description|A1]
+ |
+ x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
+ [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
+ [diff.file_a|--- a/changeset-description]
+ [diff.file_b|+++ b/changeset-description]
+ [diff.hunk|@@ -1,1 +1,3 @@]
+ [diff.deleted|-A0]
+ [diff.inserted|+A1]
+ [diff.inserted|+]
+ [diff.inserted|+Better commit message]
+
+ [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0]
+ [diff.file_a|--- a/A0 Thu Jan 01 00:00:00 1970 +0000]
+ [diff.file_b|+++ b/A0 Thu Jan 01 00:00:00 1970 +0000]
+ [diff.hunk|@@ -1,1 +1,2 @@]
+ A0
+ [diff.inserted|+42]
+
+
$ hg obslog --no-graph --patch 4ae3a4151de9
4ae3a4151de9 (3) A1
471f378eab4c (1) A0
rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
- --- a/471f378eab4c-changeset-description
- +++ b/4ae3a4151de9-changeset-description
+ diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,3 @@
-A0
+A1
@@ -138,8 +162,9 @@
$ hg obslog --hidden --patch 471f378eab4c
x 471f378eab4c (1) A0
rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/4ae3a4151de9-changeset-description
+ diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,3 @@
-A0
+A1
@@ -826,8 +851,9 @@
$ hg obslog --hidden 471f378eab4c --patch
x 471f378eab4c (1) A0
rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/eb5a0daa2192-changeset-description
+ diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+C0
@@ -849,8 +875,9 @@
|
x 471f378eab4c (1) A0
rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/eb5a0daa2192-changeset-description
+ diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+C0
@@ -879,8 +906,9 @@
|
x 471f378eab4c (1) A0
rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/eb5a0daa2192-changeset-description
+ diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+C0
@@ -903,8 +931,9 @@
|
x 471f378eab4c (1) A0
rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/eb5a0daa2192-changeset-description
+ diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+C0
@@ -979,8 +1008,6 @@
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg update 0dec01379d3b
- working directory parent is obsolete! (471f378eab4c)
- (use 'hg evolve' to update to its successor: eb5a0daa2192)
abort: hidden revision '0dec01379d3b'!
(use --hidden to access hidden revisions; successor: eb5a0daa2192)
[255]
@@ -1060,15 +1087,17 @@
$ hg obslog --hidden 471f378eab4c --patch
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/65b757b745b9-changeset-description
+ diff -r 471f378eab4c -r 65b757b745b9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
rewritten(description) as fdf9bde5129a by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/fdf9bde5129a-changeset-description
+ diff -r 471f378eab4c -r fdf9bde5129a changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A1
@@ -1083,15 +1112,17 @@
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/65b757b745b9-changeset-description
+ diff -r 471f378eab4c -r 65b757b745b9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
rewritten(description) as fdf9bde5129a by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/fdf9bde5129a-changeset-description
+ diff -r 471f378eab4c -r fdf9bde5129a changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A1
@@ -1142,15 +1173,17 @@
|
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/65b757b745b9-changeset-description
+ diff -r 471f378eab4c -r 65b757b745b9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
rewritten(description) as fdf9bde5129a by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/fdf9bde5129a-changeset-description
+ diff -r 471f378eab4c -r fdf9bde5129a changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A1
@@ -1165,15 +1198,17 @@
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/65b757b745b9-changeset-description
+ diff -r 471f378eab4c -r 65b757b745b9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
rewritten(description) as fdf9bde5129a by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/fdf9bde5129a-changeset-description
+ diff -r 471f378eab4c -r fdf9bde5129a changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A1
@@ -1186,15 +1221,17 @@
|
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/65b757b745b9-changeset-description
+ diff -r 471f378eab4c -r 65b757b745b9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
rewritten(description) as fdf9bde5129a by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/fdf9bde5129a-changeset-description
+ diff -r 471f378eab4c -r fdf9bde5129a changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A1
@@ -1208,15 +1245,17 @@
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/65b757b745b9-changeset-description
+ diff -r 471f378eab4c -r 65b757b745b9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
rewritten(description) as fdf9bde5129a by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/fdf9bde5129a-changeset-description
+ diff -r 471f378eab4c -r fdf9bde5129a changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A1
@@ -1231,15 +1270,17 @@
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/65b757b745b9-changeset-description
+ diff -r 471f378eab4c -r 65b757b745b9 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A2
rewritten(description) as fdf9bde5129a by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/fdf9bde5129a-changeset-description
+ diff -r 471f378eab4c -r fdf9bde5129a changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A1
@@ -1384,8 +1425,9 @@
|\
x | 471f378eab4c (1) A0
/ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
- | --- a/471f378eab4c-changeset-description
- | +++ b/eb5a0daa2192-changeset-description
+ | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+ | --- a/changeset-description
+ | +++ b/changeset-description
| @@ -1,1 +1,1 @@
| -A0
| +C0
@@ -1403,8 +1445,9 @@
|
x 0dec01379d3b (2) B0
rewritten(description) as b7ea6d14e664 by test (*) (glob)
- --- a/0dec01379d3b-changeset-description
- +++ b/b7ea6d14e664-changeset-description
+ diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-B0
+B1
@@ -1416,8 +1459,9 @@
|\
x | 471f378eab4c (1) A0
/ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
- | --- a/471f378eab4c-changeset-description
- | +++ b/eb5a0daa2192-changeset-description
+ | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+ | --- a/changeset-description
+ | +++ b/changeset-description
| @@ -1,1 +1,1 @@
| -A0
| +C0
@@ -1435,8 +1479,9 @@
|
x 0dec01379d3b (2) B0
rewritten(description) as b7ea6d14e664 by test (*) (glob)
- --- a/0dec01379d3b-changeset-description
- +++ b/b7ea6d14e664-changeset-description
+ diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-B0
+B1
@@ -1531,12 +1576,8 @@
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg update 0dec01379d3b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory parent is obsolete! (0dec01379d3b)
- (use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg update --hidden 'desc(B0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory parent is obsolete! (0dec01379d3b)
- (use 'hg evolve' to update to its successor: eb5a0daa2192)
Test output with pushed and pulled obs markers
==============================================
@@ -1613,8 +1654,9 @@
|
x fdf9bde5129a (2) A1
| rewritten(description) as 7a230b46bf61 by test (*) (glob)
- | --- a/fdf9bde5129a-changeset-description
- | +++ b/7a230b46bf61-changeset-description
+ | diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description
+ | --- a/changeset-description
+ | +++ b/changeset-description
| @@ -1,1 +1,1 @@
| -A1
| +A2
@@ -1622,8 +1664,9 @@
|
x 471f378eab4c (1) A0
rewritten(description) as fdf9bde5129a by test (*) (glob)
- --- a/471f378eab4c-changeset-description
- +++ b/fdf9bde5129a-changeset-description
+ diff -r 471f378eab4c -r fdf9bde5129a changeset-description
+ --- a/changeset-description
+ +++ b/changeset-description
@@ -1,1 +1,1 @@
-A0
+A1