diff --git a/mercurial/obsutil.py b/mercurial/obsutil.py --- a/mercurial/obsutil.py +++ b/mercurial/obsutil.py @@ -788,6 +788,10 @@ def obsfateprinter(successors, markers, """ Build a obsfate string for a single successorset using all obsfate related function defined in obsutil """ + quiet = ui.quiet + verbose = ui.verbose + normal = not verbose and not quiet + line = [] # Verb @@ -805,8 +809,14 @@ def obsfateprinter(successors, markers, # Users users = markersusers(markers) + # Filter out current user in not verbose mode to reduce amount of + # information + if not verbose: + currentuser = ui.username(acceptempty=True) + if len(users) == 1 and currentuser in users: + users = None - if users: + if (verbose or normal) and users: line.append(" by %s" % ", ".join(users)) # Date diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t --- a/tests/test-obsmarker-template.t +++ b/tests/test-obsmarker-template.t @@ -219,9 +219,9 @@ Check other fatelog implementations @ d004c8f274b9 | | x a468dc9b3633 - |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) + |/ Obsfate: rewritten using amend as 3:d004c8f274b9 (at 2001-04-19 04:25 +0000) | x 471f378eab4c - |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten using amend as 2:a468dc9b3633 (at 2009-02-13 23:31 +0000) o ea207398892e $ hg fatelogkw --hidden @@ -230,7 +230,7 @@ Check other fatelog implementations | x a468dc9b3633 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | x 471f378eab4c - |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten using amend as 2:a468dc9b3633 (at 2009-02-13 23:31 +0000) o ea207398892e $ hg fatelogkw --hidden -v @@ -394,7 +394,7 @@ Check other fatelog implementations o 337fec4d2edc | | x 471597cad322 - |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden @@ -403,7 +403,7 @@ Check other fatelog implementations o 337fec4d2edc | | x 471597cad322 - |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden -v @@ -594,18 +594,18 @@ Check other fatelog implementations @ eb5a0daa2192 | | x 0dec01379d3b - | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 3:eb5a0daa2192 (at 1970-01-01 00:00 +0000) | x 471f378eab4c - |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 3:eb5a0daa2192 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden @ eb5a0daa2192 | | x 0dec01379d3b - | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 3:eb5a0daa2192 (at 1970-01-01 00:00 +0000) | x 471f378eab4c - |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 3:eb5a0daa2192 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden -v @@ -824,24 +824,24 @@ Check other fatelog implementations o 019fadeab383 | | x 65b757b745b9 - |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 4:019fadeab383 (at 1970-01-01 00:00 +0000) | @ fdf9bde5129a |/ | x 471f378eab4c - |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) - | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 2:fdf9bde5129a (at 1970-01-01 00:00 +0000) + | Obsfate: rewritten using amend as 3:65b757b745b9 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden o 019fadeab383 | | x 65b757b745b9 - |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 4:019fadeab383 (at 1970-01-01 00:00 +0000) | @ fdf9bde5129a |/ | x 471f378eab4c - |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) - | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 2:fdf9bde5129a (at 1970-01-01 00:00 +0000) + | Obsfate: rewritten using amend as 3:65b757b745b9 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden -v @@ -1095,22 +1095,22 @@ Check other fatelog implementations @ eb5a0daa2192 | | x b7ea6d14e664 - | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 4:eb5a0daa2192 (at 1970-01-01 00:00 +0000) | | x 0dec01379d3b - | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000) + | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 (at 1970-01-01 00:00 +0000) | x 471f378eab4c - |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 4:eb5a0daa2192 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden @ eb5a0daa2192 | | x b7ea6d14e664 - | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 4:eb5a0daa2192 (at 1970-01-01 00:00 +0000) | | x 0dec01379d3b - | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000) + | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 (at 1970-01-01 00:00 +0000) | x 471f378eab4c - |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 4:eb5a0daa2192 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden -v @@ -1282,14 +1282,14 @@ Check other fatelog implementations @ 7a230b46bf61 | | x 471f378eab4c - |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 2:7a230b46bf61 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden @ 7a230b46bf61 | | x 471f378eab4c - |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 2:7a230b46bf61 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden -v @@ -1445,20 +1445,20 @@ Check other fatelog implementations o f897c6137566 | | x 0dec01379d3b - | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) - | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 3:f897c6137566 (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 1:471f378eab4c (at 1970-01-01 00:00 +0000) | x 471f378eab4c - |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 2:0dec01379d3b (at 1970-01-01 00:00 +0000) @ ea207398892e $ hg fatelogkw --hidden o f897c6137566 | | x 0dec01379d3b - | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) - | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 3:f897c6137566 (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 1:471f378eab4c (at 1970-01-01 00:00 +0000) | x 471f378eab4c - |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 2:0dec01379d3b (at 1970-01-01 00:00 +0000) @ ea207398892e $ hg fatelogkw --hidden -v @@ -1832,21 +1832,21 @@ Check other fatelog implementations o | b18bc8331526 |/ | x ba2ed02b0c9a - | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten using rebase as 10:eceed8f98ffc (at 1970-01-01 00:00 +0000) | x 4a004186e638 - |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) - | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 8:b18bc8331526 (at 1970-01-01 00:00 +0000) + | Obsfate: rewritten using amend as 9:0b997eb7ceee (at 1970-01-01 00:00 +0000) o dd800401bd8c | | @ 9bd10a0775e4 - |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a (at 1970-01-01 00:00 +0000) o f897c6137566 | | x 0dec01379d3b - | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) - | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 3:f897c6137566 (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 1:471f378eab4c (at 1970-01-01 00:00 +0000) | x 471f378eab4c - |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 2:0dec01379d3b (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden @@ -1857,21 +1857,21 @@ Check other fatelog implementations o | b18bc8331526 |/ | x ba2ed02b0c9a - | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten using rebase as 10:eceed8f98ffc (at 1970-01-01 00:00 +0000) | x 4a004186e638 - |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) - | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 8:b18bc8331526 (at 1970-01-01 00:00 +0000) + | Obsfate: rewritten using amend as 9:0b997eb7ceee (at 1970-01-01 00:00 +0000) o dd800401bd8c | | @ 9bd10a0775e4 - |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a (at 1970-01-01 00:00 +0000) o f897c6137566 | | x 0dec01379d3b - | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) - | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 3:f897c6137566 (at 1970-01-01 00:00 +0000) + | | Obsfate: rewritten as 1:471f378eab4c (at 1970-01-01 00:00 +0000) | x 471f378eab4c - |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 2:0dec01379d3b (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden -v @@ -1977,22 +1977,22 @@ Check other fatelog implementations $ hg fatelogkw --hidden -q x 65b757b745b9 - | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) + | Obsfate: pruned (at 1970-01-01 00:00 +0000) | x fdf9bde5129a - |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: pruned (at 1970-01-01 00:00 +0000) | @ 471f378eab4c - |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) - | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 2:fdf9bde5129a (at 1970-01-01 00:00 +0000) + | Obsfate: rewritten using amend as 3:65b757b745b9 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden x 65b757b745b9 - | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) + | Obsfate: pruned (at 1970-01-01 00:00 +0000) | x fdf9bde5129a - |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: pruned (at 1970-01-01 00:00 +0000) | @ 471f378eab4c - |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) - | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten using amend as 2:fdf9bde5129a (at 1970-01-01 00:00 +0000) + | Obsfate: rewritten using amend as 3:65b757b745b9 (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden -v @@ -2101,20 +2101,20 @@ Check other fatelog implementations $ hg fatelogkw --hidden -q @ 0d0ef4bdf70e - | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) + | Obsfate: pruned (at 1970-01-01 00:00 +0000) o 617adc3a144c | | x 471597cad322 - |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden @ 0d0ef4bdf70e - | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) + | Obsfate: pruned (at 1970-01-01 00:00 +0000) o 617adc3a144c | | x 471597cad322 - |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e (at 1970-01-01 00:00 +0000) o ea207398892e $ hg fatelogkw --hidden -v diff --git a/tests/test-obsolete-distributed.t b/tests/test-obsolete-distributed.t --- a/tests/test-obsolete-distributed.t +++ b/tests/test-obsolete-distributed.t @@ -51,7 +51,7 @@ Initial setup created new head $ hg debugobsolete `getid 'desc("c_A0")'` `getid 'desc("c_A1")'` obsoleted 1 changesets - $ hg log -G --hidden + $ hg log -G --hidden -v @ 3:e5d7dda7cd28 c_B0 | | o 2:7f6b0a6f5c25 c_A1 @@ -90,7 +90,7 @@ server side: create new revision on the |/ o 0:e82fb8d02bbf ROOT - $ hg log -G --hidden + $ hg log -G --hidden -v @ 4:391a2bf12b1b c_B1 | | x 3:e5d7dda7cd28 c_B0 [rewritten as 4:391a2bf12b1b by server (at 1970-01-01 00:00 +0000)] @@ -117,7 +117,7 @@ client side: create a marker between two | o 0:e82fb8d02bbf ROOT - $ hg log -G --hidden + $ hg log -G --hidden -v @ 3:e5d7dda7cd28 c_B0 | | x 2:7f6b0a6f5c25 c_A1 [rewritten as 3:e5d7dda7cd28 by client (at 1970-01-01 00:00 +0000)] @@ -151,7 +151,7 @@ client side: pull from the server | @ 0:e82fb8d02bbf ROOT - $ hg log -G --hidden + $ hg log -G --hidden -v o 4:391a2bf12b1b c_B1 | | x 3:e5d7dda7cd28 c_B0 [rewritten as 4:391a2bf12b1b by server (at 1970-01-01 00:00 +0000)] @@ -187,7 +187,7 @@ obsolete on the server side but the mark | o 0:e82fb8d02bbf ROOT - $ hg -R ../server/ log -G --hidden + $ hg -R ../server/ log -G --hidden -v @ 4:391a2bf12b1b c_B1 | | x 3:e5d7dda7cd28 c_B0 [rewritten as 4:391a2bf12b1b by server (at 1970-01-01 00:00 +0000)] @@ -288,7 +288,7 @@ Bob pulls from Alice and rewrites them | o 0:e82fb8d02bbf ROOT - $ hg log -G --hidden + $ hg log -G --hidden -v @ 5:956063ac4557 c_B1 | | x 4:5ffb9e311b35 c_B0 [rewritten using amend as 5:956063ac4557 by bob (at 1970-01-01 00:00 +0000)] @@ -335,7 +335,7 @@ Celeste pulls from Bob and rewrites them | o 0:e82fb8d02bbf ROOT - $ hg log -G --hidden + $ hg log -G --hidden -v @ 5:77ae25d99ff0 c_B2 | | x 4:3cf8de21cc22 c_B1 [rewritten using amend as 5:77ae25d99ff0 by celeste (at 1970-01-01 00:00 +0000)] @@ -461,7 +461,7 @@ decision is made in that case, so receiv | @ 0:e82fb8d02bbf ROOT - $ hg log -G --hidden + $ hg log -G --hidden -v x 6:956063ac4557 c_B1 [rewritten using amend, rebase as 4:77ae25d99ff0 by celeste (at 1970-01-01 00:00 +0000)] | x 5:5b5708a437f2 c_A1 [rewritten using amend as 3:9866d64649a5 by celeste (at 1970-01-01 00:00 +0000)] diff --git a/tests/test-obsolete-divergent.t b/tests/test-obsolete-divergent.t --- a/tests/test-obsolete-divergent.t +++ b/tests/test-obsolete-divergent.t @@ -66,7 +66,7 @@ A_1 have two direct and divergent succes | | o 2:82623d38b9ba A_1 |/ - | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba by test (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] |/ @ 0:d20a80d4def3 base @@ -127,11 +127,11 @@ indirect divergence with known changeset $ hg log -G --hidden @ 4:01f36c5a8fda A_3 | - | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] |/ | o 2:82623d38b9ba A_1 |/ - | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba by test (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] |/ o 0:d20a80d4def3 base @@ -185,7 +185,7 @@ indirect divergence with known changeset | | o 2:82623d38b9ba A_1 |/ - | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba by test (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] |/ @ 0:d20a80d4def3 base @@ -259,11 +259,11 @@ divergence that converge again is not di $ hg log -G --hidden @ 4:01f36c5a8fda A_3 | - | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] |/ - | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)] + | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] |/ - | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba by test (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] |/ o 0:d20a80d4def3 base @@ -309,7 +309,7 @@ split is not divergences | | o 2:82623d38b9ba A_1 |/ - | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)] |/ @ 0:d20a80d4def3 base @@ -361,15 +361,15 @@ Even when subsequent rewriting happen $ hg log -G --hidden @ 6:e442cfc57690 A_5 | - | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 by test (at 1970-01-01 00:00 +0000)] + | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 (at 1970-01-01 00:00 +0000)] |/ | o 4:01f36c5a8fda A_3 |/ - | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a by test (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a (at 1970-01-01 00:00 +0000)] |/ - | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)] + | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] |/ - | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)] |/ o 0:d20a80d4def3 base @@ -437,19 +437,19 @@ Check more complex obsolescence graft (w |/ | o 8:7ae126973a96 A_7 |/ - | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] | | - | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a by test (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 by test (at 1970-01-01 00:00 +0000)] + | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 (at 1970-01-01 00:00 +0000)] |/ - | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 by test (at 1970-01-01 00:00 +0000)] + | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 (at 1970-01-01 00:00 +0000)] |/ | o 4:01f36c5a8fda A_3 |/ - | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a by test (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a (at 1970-01-01 00:00 +0000)] |/ - | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)] + | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] |/ - | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)] |/ @ 0:d20a80d4def3 base @@ -535,25 +535,25 @@ fix the divergence $ hg log -G --hidden o 11:a139f71be9da A_A | - | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da by test (at 1970-01-01 00:00 +0000)] + | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da (at 1970-01-01 00:00 +0000)] |/ - | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da by test (at 1970-01-01 00:00 +0000)] + | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da (at 1970-01-01 00:00 +0000)] |/ - | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da by test (at 1970-01-01 00:00 +0000)] + | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da (at 1970-01-01 00:00 +0000)] |/ - | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)] | | - | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a by test (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 by test (at 1970-01-01 00:00 +0000)] + | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 (at 1970-01-01 00:00 +0000)] |/ - | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 by test (at 1970-01-01 00:00 +0000)] + | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 (at 1970-01-01 00:00 +0000)] |/ | o 4:01f36c5a8fda A_3 |/ - | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a by test (at 1970-01-01 00:00 +0000)] + | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a (at 1970-01-01 00:00 +0000)] |/ - | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)] + | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)] |/ - | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da by test (at 1970-01-01 00:00 +0000)] + | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)] |/ @ 0:d20a80d4def3 base diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -159,9 +159,9 @@ check that heads does not report them 5:5601fb93a350 (draft) [tip ] add new_3_c $ hg heads --hidden 5:5601fb93a350 (draft) [tip ] add new_3_c - 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350 by test (between 1970-01-01 00:22 +0000 and 1970-01-01 00:22 +0000)] - 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9 by test (at 1970-01-01 00:22 +0000)] - 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163 by test (at 1970-01-01 00:00 -0002)] + 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350 (between 1970-01-01 00:22 +0000 and 1970-01-01 00:22 +0000)] + 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9 (at 1970-01-01 00:22 +0000)] + 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163 (at 1970-01-01 00:00 -0002)] check that summary does not report them @@ -277,11 +277,11 @@ Basic exclusive testing $ hg log -G --hidden @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | - | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072 by test (at 1970-01-01 00:22 +0000)] + | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072 (at 1970-01-01 00:22 +0000)] |/ - | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350 by test (between 1970-01-01 00:22 +0000 and 1970-01-01 00:22 +0000)] + | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350 (between 1970-01-01 00:22 +0000 and 1970-01-01 00:22 +0000)] |/ - | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9 by test (at 1970-01-01 00:22 +0000)] + | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9 (at 1970-01-01 00:22 +0000)] |/ | o 2:245bde4270cd (public) [ ] add original_c |/ @@ -435,11 +435,11 @@ clone support $ hg -R clone-dest log -G --hidden @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | - | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072 by test (at 1970-01-01 00:22 +0000)] + | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072 (at 1970-01-01 00:22 +0000)] |/ - | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350 by test (between 1970-01-01 00:22 +0000 and 1970-01-01 00:22 +0000)] + | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350 (between 1970-01-01 00:22 +0000 and 1970-01-01 00:22 +0000)] |/ - | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9 by test (at 1970-01-01 00:22 +0000)] + | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9 (at 1970-01-01 00:22 +0000)] |/ | o 2:245bde4270cd (public) [ ] add original_c |/ @@ -520,7 +520,7 @@ detect outgoing obsolete and unstable $ hg debugobsolete | grep `getid original_d` 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} $ hg log -r 'obsolete()' - 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned by test (at 1970-01-01 00:00 +0000)] + 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned (at 1970-01-01 00:00 +0000)] $ hg summary parent: 5:cda648ca50f5 tip (orphan) add original_e @@ -532,7 +532,7 @@ detect outgoing obsolete and unstable $ hg log -G -r '::orphan()' @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | - x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned by test (at 1970-01-01 00:00 +0000)] + x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned (at 1970-01-01 00:00 +0000)] | o 3:6f9641995072 (draft) [ ] add n3w_3_c | @@ -571,7 +571,7 @@ Don't try to push extinct changeset 1:7c3bad9141dc (public) [ ] add b 2:245bde4270cd (public) [ ] add original_c 3:6f9641995072 (draft) [ ] add n3w_3_c - 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned by test (at 1970-01-01 00:00 +0000)] + 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned (at 1970-01-01 00:00 +0000)] 5:cda648ca50f5 (draft orphan) [tip ] add original_e $ hg push ../tmpf -f # -f because be push unstable too pushing to ../tmpf @@ -595,7 +595,7 @@ Do not warn about new head when the new $ hg log -G @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | - x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned by test (at 1970-01-01 00:00 +0000)] + x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned (at 1970-01-01 00:00 +0000)] | o 3:6f9641995072 (draft) [ ] add n3w_3_c | @@ -638,7 +638,7 @@ Reminder of the repo situation | | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test (at 1970-01-01 00:00 +0000)] | | - | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned by test (at 1970-01-01 00:00 +0000)] + | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned (at 1970-01-01 00:00 +0000)] |/ o 3:6f9641995072 (draft) [ ] add n3w_3_c | @@ -928,7 +928,7 @@ Several troubles on the same changeset ( test the "obsolete" templatekw $ hg log -r 'obsolete()' - 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned by test (at 1970-01-01 00:00 +0000)] + 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned (at 1970-01-01 00:00 +0000)] test the "troubles" templatekw @@ -1098,7 +1098,7 @@ Test that a local tag blocks a changeset $ hg log -G @ 2:323a9c3ddd91 (draft) [tip ] A | - | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91 by test (at 1970-01-01 00:00 +0000)] + | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91 (at 1970-01-01 00:00 +0000)] |/ o 0:d20a80d4def3 (draft) [ ] base @@ -1152,7 +1152,7 @@ Test bundle overlay onto hidden revision $ hg log -G --hidden @ 2:b7d587542d40 (draft) [tip ] B+ | - | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40 by test (at 1970-01-01 00:00 +0000)] + | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40 (at 1970-01-01 00:00 +0000)] |/ o 0:4b34ecfb0d56 (draft) [ ] A @@ -1279,7 +1279,7 @@ bookmarks change $ hg commit --amend -m "message" $ hg book bookb -r 13bedc178fce --hidden $ hg log -r 13bedc178fce - 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753 by test (at 1970-01-01 00:00 +0000)] + 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753 (at 1970-01-01 00:00 +0000)] $ hg book -d bookb $ hg log -r 13bedc178fce abort: hidden revision '13bedc178fce'! @@ -1319,7 +1319,7 @@ Test ability to pull changeset with loca $ hg log -G --hidden @ 3:b0551702f918 (draft) [tip ] 2 | - | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918 by test (at 1970-01-01 00:00 +0000)] + | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918 (at 1970-01-01 00:00 +0000)] |/ o 1:e016b03fd86f (draft) [ ] 1 |