Mercurial > evolve
changeset 2832:07b9fcf8b6d3
output: update obsfate / obslog output order
Always display successors after the verb. So instead of "rewritten by boris as
X", display "rewritten as X by boris".
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Wed, 09 Aug 2017 16:01:20 +0200 |
| parents | eda8eb561134 |
| children | 08a64770ed24 |
| files | hgext3rd/evolve/obshistory.py hgext3rd/evolve/templatekw.py tests/test-evolve-cycles.t tests/test-evolve-effectflags.t tests/test-evolve-obshistory-complex.t tests/test-evolve-obshistory.t tests/test-evolve-templates.t tests/test-evolve.t tests/test-obsolete.t |
| diffstat | 9 files changed, 129 insertions(+), 129 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/obshistory.py Wed Aug 09 13:21:44 2017 +0200 +++ b/hgext3rd/evolve/obshistory.py Wed Aug 09 16:01:20 2017 +0200 @@ -460,6 +460,14 @@ fmteffect = fm.formatlist(effect, 'debugobshistory.effect', sep=', ') fm.write('debugobshistory.effect', '(%s)', fmteffect) + if len(succnodes) > 0: + fm.plain(' as ') + + shortsnodes = (nodemod.short(succnode) for succnode in sorted(succnodes)) + nodes = fm.formatlist(shortsnodes, 'debugobshistory.succnodes', sep=', ') + fm.write('debugobshistory.succnodes', '%s', nodes, + label="evolve.node") + fm.plain(' by ') fm.write('debugobshistory.marker_user', '%s', metadata['user'], @@ -469,14 +477,6 @@ fm.write('debugobshistory.marker_date', '(%s)', fm.formatdate(date), label="evolve.date") - if len(succnodes) > 0: - fm.plain(' as ') - - shortsnodes = (nodemod.short(succnode) for succnode in sorted(succnodes)) - nodes = fm.formatlist(shortsnodes, 'debugobshistory.succnodes', sep=', ') - fm.write('debugobshistory.succnodes', '%s', nodes, - label="evolve.node") - # Patch display if opts.get('patch'): _patchavailable = patchavailable(node, repo, marker)
--- a/hgext3rd/evolve/templatekw.py Wed Aug 09 13:21:44 2017 +0200 +++ b/hgext3rd/evolve/templatekw.py Wed Aug 09 16:01:20 2017 +0200 @@ -138,8 +138,8 @@ # Assemble them return { 'obsfate_quiet': verbtempl + succtempl, - 'obsfate': verbtempl + optionalusertempl + succtempl, - 'obsfate_verbose': verbtempl + usertempl + succtempl + datetempl, + 'obsfate': verbtempl + succtempl + optionalusertempl, + 'obsfate_verbose': verbtempl + succtempl + usertempl + datetempl, } def obsfatedata(repo, ctx):
--- a/tests/test-evolve-cycles.t Wed Aug 09 13:21:44 2017 +0200 +++ b/tests/test-evolve-cycles.t Wed Aug 09 16:01:20 2017 +0200 @@ -89,48 +89,48 @@ $ hg obslog "desc(A)" --hidden @ 2a34000d3544 (1) A - | rewritten(description, parent, content) by test (*) as c473644ee0e9 (glob) + | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob) | x a8df460dbbfe (3) C - | rewritten(description, parent, content) by test (*) as 2a34000d3544 (glob) + | rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob) | x c473644ee0e9 (2) B - | rewritten(description, parent, content) by test (*) as a8df460dbbfe (glob) + | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob) | $ hg obslog "desc(B)" --hidden @ 2a34000d3544 (1) A - | rewritten(description, parent, content) by test (*) as c473644ee0e9 (glob) + | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob) | x a8df460dbbfe (3) C - | rewritten(description, parent, content) by test (*) as 2a34000d3544 (glob) + | rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob) | x c473644ee0e9 (2) B - | rewritten(description, parent, content) by test (*) as a8df460dbbfe (glob) + | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob) | $ hg obslog "desc(C)" --hidden @ 2a34000d3544 (1) A - | rewritten(description, parent, content) by test (*) as c473644ee0e9 (glob) + | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob) | x a8df460dbbfe (3) C - | rewritten(description, parent, content) by test (*) as 2a34000d3544 (glob) + | rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob) | x c473644ee0e9 (2) B - | rewritten(description, parent, content) by test (*) as a8df460dbbfe (glob) + | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob) | Check that all option don't crash on a cycle either $ hg obslog "desc(C)" --hidden --all @ 2a34000d3544 (1) A - | rewritten(description, parent, content) by test (*) as c473644ee0e9 (glob) + | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob) | x a8df460dbbfe (3) C - | rewritten(description, parent, content) by test (*) as 2a34000d3544 (glob) + | rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob) | x c473644ee0e9 (2) B - | rewritten(description, parent, content) by test (*) as a8df460dbbfe (glob) + | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob) | Test with multiple cyles @@ -252,42 +252,42 @@ $ hg obslog "desc(D)" --hidden x 0da815c333f6 (5) E - | rewritten(description, parent, content) by test (*) as d9f908fde1a1 (glob) + | rewritten(description, parent, content) as d9f908fde1a1 by test (*) (glob) | @ 868d2e0eb19c (4) D - |\ rewritten(description, parent, content) by test (*) as 0da815c333f6 (glob) + |\ rewritten(description, parent, content) as 0da815c333f6 by test (*) (glob) | | | x d9f908fde1a1 (6) F - | | rewritten(description, parent, content) by test (*) as 868d2e0eb19c (glob) + | | rewritten(description, parent, content) as 868d2e0eb19c by test (*) (glob) | | +---x 2a34000d3544 (1) A - | | rewritten(description, parent, content) by test (*) as c473644ee0e9 (glob) + | | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob) | | x | a8df460dbbfe (3) C - | | rewritten(description, parent, content) by test (*) as 2a34000d3544, 868d2e0eb19c (glob) + | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (*) (glob) | | x | c473644ee0e9 (2) B - | | rewritten(description, parent, content) by test (*) as a8df460dbbfe (glob) + | | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob) | | Check that all option don't crash either on a cycle $ hg obslog --all --hidden "desc(F)" x 0da815c333f6 (5) E - | rewritten(description, parent, content) by test (*) as d9f908fde1a1 (glob) + | rewritten(description, parent, content) as d9f908fde1a1 by test (*) (glob) | @ 868d2e0eb19c (4) D - |\ rewritten(description, parent, content) by test (*) as 0da815c333f6 (glob) + |\ rewritten(description, parent, content) as 0da815c333f6 by test (*) (glob) | | | x d9f908fde1a1 (6) F - | | rewritten(description, parent, content) by test (*) as 868d2e0eb19c (glob) + | | rewritten(description, parent, content) as 868d2e0eb19c by test (*) (glob) | | +---x 2a34000d3544 (1) A - | | rewritten(description, parent, content) by test (*) as c473644ee0e9 (glob) + | | rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob) | | x | a8df460dbbfe (3) C - | | rewritten(description, parent, content) by test (*) as 2a34000d3544, 868d2e0eb19c (glob) + | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (*) (glob) | | x | c473644ee0e9 (2) B - | | rewritten(description, parent, content) by test (*) as a8df460dbbfe (glob) + | | rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob) | | Check the json output is valid in this case
--- a/tests/test-evolve-effectflags.t Wed Aug 09 13:21:44 2017 +0200 +++ b/tests/test-evolve-effectflags.t Wed Aug 09 16:01:20 2017 +0200 @@ -34,7 +34,7 @@ @ fdf9bde5129a (2) A1 | x 471f378eab4c (1) A0 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) amend touching the user only @@ -51,7 +51,7 @@ @ 5485c92d3433 (4) B0 | x ef4a313b1e0a (3) B0 - rewritten(user) by test (*) as 5485c92d3433 (glob) + rewritten(user) as 5485c92d3433 by test (*) (glob) amend touching the date only @@ -68,7 +68,7 @@ @ 4dd84345082e (6) B1 | x 2ef0680ff450 (5) B1 - rewritten(date) by test (*) as 4dd84345082e (glob) + rewritten(date) as 4dd84345082e by test (*) (glob) amend touching the branch only @@ -89,7 +89,7 @@ @ 14a01456e057 (9) B2 | x bd3db8264cee (7) B2 - rewritten(branch) by test (*) as 14a01456e057 (glob) + rewritten(branch) as 14a01456e057 by test (*) (glob) $ hg up default @@ -111,7 +111,7 @@ @ da86aa2f19a3 (12) D0 | x c85eff83a034 (11) D0 - rewritten(parent) by test (*) as da86aa2f19a3 (glob) + rewritten(parent) as da86aa2f19a3 by test (*) (glob) amend touching the diff @@ -130,7 +130,7 @@ @ 75781fdbdbf5 (15) E0 | x ebfe0333e0d9 (13) E0 - rewritten(content) by test (*) as 75781fdbdbf5 (glob) + rewritten(content) as 75781fdbdbf5 by test (*) (glob) amend with multiple effect (desc and meta) @@ -150,7 +150,7 @@ @ a94e0fd5f1c8 (18) F1 | x fad47e5bd78e (16) F0 - rewritten(description, user, date, branch) by test (*) as a94e0fd5f1c8 (glob) + rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob) rebase not touching the diff ---------------------------- @@ -197,7 +197,7 @@ o e509e2eb3df5 (22) H1 | x b57fed8d8322 (20) H1 - rewritten(parent) by test (*) as e509e2eb3df5 (glob) + rewritten(parent) as e509e2eb3df5 by test (*) (glob) amend closing the branch should be detected as meta change ---------------------------------------------------------- @@ -214,5 +214,5 @@ @ 12c6238b5e37 (26) I0 | x 2f599e54c1c6 (24) I0 - rewritten(meta) by test (*) as 12c6238b5e37 (glob) + rewritten(meta) as 12c6238b5e37 by test (*) (glob)
--- a/tests/test-evolve-obshistory-complex.t Wed Aug 09 13:21:44 2017 +0200 +++ b/tests/test-evolve-obshistory-complex.t Wed Aug 09 16:01:20 2017 +0200 @@ -374,25 +374,25 @@ o 7b3290f6e0a0 (12) fold1 |\ x | d15d0ffc75f6 (8) fold1 - |\ \ rewritten(parent, content) by test (*) as 7b3290f6e0a0, d0f33db50670 (glob) + |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob) | | | | | x e036916b63ea (11) fold0 - | | | rewritten(description, parent, content) by test (*) as 7b3290f6e0a0 (glob) + | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob) | | | x | | 868d2e0eb19c (4) D - / / rewritten(description, parent, content) by test (*) as d15d0ffc75f6 (glob) + / / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob) | | x | a8df460dbbfe (3) C - / rewritten(description, content) by test (*) as d15d0ffc75f6 (glob) + / rewritten(description, content) as d15d0ffc75f6 by test (*) (glob) | x b868bc49b0a4 (7) fold0 - |\ rewritten(parent, content) by test (*) as 19e14c8397fc, e036916b63ea (glob) + |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob) | | x | 2a34000d3544 (1) A - / rewritten(description, content) by test (*) as b868bc49b0a4 (glob) + / rewritten(description, content) as b868bc49b0a4 by test (*) (glob) | x c473644ee0e9 (2) B - rewritten(description, parent, content) by test (*) as b868bc49b0a4 (glob) + rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob) While with all option, we should see 15 changesets @@ -406,35 +406,35 @@ | | | | o ec31316faa9d (14) fold2 | | | |/| | | | x | 100cc25b765f (9) fold2 - | | | |\ \ rewritten(parent, content) by test (*) as d4a000f63ee9, ec31316faa9d (glob) + | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (*) (glob) | | | | | | | +-------x d0f33db50670 (13) fold1 - | | | | | rewritten(description, parent, content) by test (*) as ec31316faa9d (glob) + | | | | | rewritten(description, parent, content) as ec31316faa9d by test (*) (glob) | | | | | +---x | | e036916b63ea (11) fold0 - | | / / rewritten(description, parent, content) by test (*) as 7b3290f6e0a0 (glob) + | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob) | | | | | | x | 0da815c333f6 (5) E - | | / rewritten(description, content) by test (*) as 100cc25b765f (glob) + | | / rewritten(description, content) as 100cc25b765f by test (*) (glob) | | | x | | b868bc49b0a4 (7) fold0 - |\ \ \ rewritten(parent, content) by test (*) as 19e14c8397fc, e036916b63ea (glob) + |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob) | | | | | | x | d15d0ffc75f6 (8) fold1 - | | |\ \ rewritten(parent, content) by test (*) as 7b3290f6e0a0, d0f33db50670 (glob) + | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (*) (glob) | | | | | | | | | x d9f908fde1a1 (6) F - | | | | rewritten(description, parent, content) by test (*) as 100cc25b765f (glob) + | | | | rewritten(description, parent, content) as 100cc25b765f by test (*) (glob) | | | | x | | | 2a34000d3544 (1) A - / / / rewritten(description, content) by test (*) as b868bc49b0a4 (glob) + / / / rewritten(description, content) as b868bc49b0a4 by test (*) (glob) | | | | x | 868d2e0eb19c (4) D - | / rewritten(description, parent, content) by test (*) as d15d0ffc75f6 (glob) + | / rewritten(description, parent, content) as d15d0ffc75f6 by test (*) (glob) | | | x a8df460dbbfe (3) C - | rewritten(description, content) by test (*) as d15d0ffc75f6 (glob) + | rewritten(description, content) as d15d0ffc75f6 by test (*) (glob) | x c473644ee0e9 (2) B - rewritten(description, parent, content) by test (*) as b868bc49b0a4 (glob) + rewritten(description, parent, content) as b868bc49b0a4 by test (*) (glob)
--- a/tests/test-evolve-obshistory.t Wed Aug 09 13:21:44 2017 +0200 +++ b/tests/test-evolve-obshistory.t Wed Aug 09 16:01:20 2017 +0200 @@ -61,7 +61,7 @@ @ 4ae3a4151de9 (3) A1 | x 471f378eab4c (1) A0 - rewritten(description, content) by test (Thu Jan 01 00:00:00 1970 +0000) as 4ae3a4151de9 + rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/4ae3a4151de9-changeset-description @@ -1,1 +1,3 @@ @@ -111,7 +111,7 @@ ] $ hg obslog --hidden --patch 471f378eab4c x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as 4ae3a4151de9 (glob) + rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/4ae3a4151de9-changeset-description @@ -1,1 +1,3 @@ @@ -353,7 +353,7 @@ Check that debugobshistory on splitted commit show both targets $ hg obslog 471597cad322 --hidden --patch x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (2)) $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool @@ -388,7 +388,7 @@ o 337fec4d2edc (2) A0 | x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (2)) With the all option, it should show the three changesets @@ -398,7 +398,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (2)) Check that debugobshistory on the second successor after split show @@ -407,7 +407,7 @@ @ f257fde29c7a (3) A0 | x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (2)) With the all option, it should show the three changesets @@ -417,7 +417,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (2)) Obslog with all option all should also works on the splitted commit @@ -427,7 +427,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (2)) Check that debugobshistory on both successors after split show @@ -438,7 +438,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (2)) $ hg update 471597cad322 @@ -606,7 +606,7 @@ $ hg obslog de7290d8b885 --hidden --patch x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (4)) $ hg obslog de7290d8b885 --hidden --all --patch @@ -619,7 +619,7 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (4)) $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool @@ -654,7 +654,7 @@ @ c7f044602e9b (5) A0 | x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (4)) $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool @@ -702,7 +702,7 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (4)) $ hg obslog 5 --all --patch @@ -715,7 +715,7 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) (No patch available yet, too many successors (4)) $ hg update de7290d8b885 @@ -790,7 +790,7 @@ the revision with the target $ hg obslog --hidden 471f378eab4c --patch x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, content) as eb5a0daa2192 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/eb5a0daa2192-changeset-description @@ -1,1 +1,1 @@ @@ -809,11 +809,11 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, content) as eb5a0daa2192 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/eb5a0daa2192-changeset-description @@ -1,1 +1,1 @@ @@ -831,7 +831,7 @@ the revision with the target $ hg obslog --hidden 0dec01379d3b --patch x 0dec01379d3b (2) B0 - rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) (No patch available yet, changesets rebased) Check that with all option, all changesets are shown @@ -839,11 +839,11 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, content) as eb5a0daa2192 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/eb5a0daa2192-changeset-description @@ -1,1 +1,1 @@ @@ -863,11 +863,11 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 471f378eab4c (1) A0 - rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + rewritten(description, content) as eb5a0daa2192 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/eb5a0daa2192-changeset-description @@ -1,1 +1,1 @@ @@ -1024,14 +1024,14 @@ Check that debugobshistory on the divergent revision show both destinations $ hg obslog --hidden 471f378eab4c --patch x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1047,14 +1047,14 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1106,14 +1106,14 @@ o fdf9bde5129a (2) A1 | x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1129,14 +1129,14 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1150,14 +1150,14 @@ @ 65b757b745b9 (3) A2 | x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1172,14 +1172,14 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1195,14 +1195,14 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) by test (*) as 65b757b745b9 (glob) + rewritten(description) as 65b757b745b9 by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/65b757b745b9-changeset-description @@ -1,1 +1,1 @@ -A0 +A2 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1348,7 +1348,7 @@ @ eb5a0daa2192 (4) C0 |\ x | 471f378eab4c (1) A0 - / rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | --- a/471f378eab4c-changeset-description | +++ b/eb5a0daa2192-changeset-description | @@ -1,1 +1,1 @@ @@ -1363,11 +1363,11 @@ | | x b7ea6d14e664 (3) B1 - | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 0dec01379d3b (2) B0 - rewritten(description) by test (*) as b7ea6d14e664 (glob) + rewritten(description) as b7ea6d14e664 by test (*) (glob) --- a/0dec01379d3b-changeset-description +++ b/b7ea6d14e664-changeset-description @@ -1,1 +1,1 @@ @@ -1380,7 +1380,7 @@ @ eb5a0daa2192 (4) C0 |\ x | 471f378eab4c (1) A0 - / rewritten(description, content) by test (*) as eb5a0daa2192 (glob) + / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | --- a/471f378eab4c-changeset-description | +++ b/eb5a0daa2192-changeset-description | @@ -1,1 +1,1 @@ @@ -1395,11 +1395,11 @@ | | x b7ea6d14e664 (3) B1 - | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) + | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | (No patch available yet, changesets rebased) | x 0dec01379d3b (2) B0 - rewritten(description) by test (*) as b7ea6d14e664 (glob) + rewritten(description) as b7ea6d14e664 by test (*) (glob) --- a/0dec01379d3b-changeset-description +++ b/b7ea6d14e664-changeset-description @@ -1,1 +1,1 @@ @@ -1577,7 +1577,7 @@ @ 7a230b46bf61 (3) A2 | x fdf9bde5129a (2) A1 - | rewritten(description) by test (*) as 7a230b46bf61 (glob) + | rewritten(description) as 7a230b46bf61 by test (*) (glob) | --- a/fdf9bde5129a-changeset-description | +++ b/7a230b46bf61-changeset-description | @@ -1,1 +1,1 @@ @@ -1586,7 +1586,7 @@ | | x 471f378eab4c (1) A0 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) --- a/471f378eab4c-changeset-description +++ b/fdf9bde5129a-changeset-description @@ -1,1 +1,1 @@ @@ -1613,21 +1613,21 @@ o 7a230b46bf61 (2) A2 | x fdf9bde5129a - | rewritten(description) by test (*) as 7a230b46bf61 (glob) + | rewritten(description) as 7a230b46bf61 by test (*) (glob) | (No patch available yet, context is not local) | @ 471f378eab4c (1) A0 - rewritten(description) by test (*) as fdf9bde5129a (glob) + rewritten(description) as fdf9bde5129a by test (*) (glob) (No patch available yet, succ is unknown locally) $ hg obslog 7a230b46bf61 --color=debug --patch o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] | x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] - | [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|7a230b46bf61] (glob) + | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob) | (No patch available yet, context is not local) | @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] - [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob) + [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob) (No patch available yet, succ is unknown locally)
--- a/tests/test-evolve-templates.t Wed Aug 09 13:21:44 2017 +0200 +++ b/tests/test-evolve-templates.t Wed Aug 09 16:01:20 2017 +0200 @@ -79,10 +79,10 @@ o d004c8f274b9 (4) A2 | x a468dc9b3633 (3) A1 - | rewritten(description) by test2 (Thu Apr 19 04:25:21 2001 +0000) as d004c8f274b9 + | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000) | @ 471f378eab4c (1) A0 - rewritten(description, content) by test1 (Fri Feb 13 23:31:30 2009 +0000) as a468dc9b3633 + rewritten(description, content) as a468dc9b3633 by test1 (Fri Feb 13 23:31:30 2009 +0000) $ hg tlog o d004c8f274b9 @@ -91,7 +91,7 @@ | @ 471f378eab4c |/ Successors: [d004c8f274b9] | semi-colon: [d004c8f274b9] - | Fate: rewritten by test1, test2 as d004c8f274b9 + | Fate: rewritten as d004c8f274b9 by test1, test2 | o ea207398892e @@ -108,7 +108,7 @@ o d004c8f274b9 | | @ 471f378eab4c - |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 + |/ Obsfate: rewritten as d004c8f274b9 by test1, test2 | o ea207398892e @@ -116,7 +116,7 @@ o d004c8f274b9 | | @ 471f378eab4c - |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten as d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) | o ea207398892e @@ -152,7 +152,7 @@ | @ a468dc9b3633 |/ Successors: [d004c8f274b9] | semi-colon: [d004c8f274b9] - | Fate: rewritten by test2 as d004c8f274b9 + | Fate: rewritten as d004c8f274b9 by test2 | o ea207398892e @@ -167,7 +167,7 @@ | semi-colon: 471f378eab4c | Successors: [d004c8f274b9] | semi-colon: [d004c8f274b9] - | Fate: rewritten by test2 as d004c8f274b9 + | Fate: rewritten as d004c8f274b9 by test2 | | x f137d23bb3e1 | | Fate: pruned by test1 @@ -175,7 +175,7 @@ | x 471f378eab4c |/ Successors: [a468dc9b3633] | semi-colon: [a468dc9b3633] - | Fate: rewritten by test1 as a468dc9b3633 + | Fate: rewritten as a468dc9b3633 by test1 | o ea207398892e @@ -183,7 +183,7 @@ o d004c8f274b9 | | @ a468dc9b3633 - |/ Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000) + |/ Obsfate: rewritten as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | o ea207398892e @@ -203,7 +203,7 @@ | semi-colon: 471f378eab4c | Successors: [d004c8f274b9] | semi-colon: [d004c8f274b9] - | Fate: rewritten by test2 as d004c8f274b9 + | Fate: rewritten as d004c8f274b9 by test2 | | x f137d23bb3e1 | | Fate: pruned by test1 @@ -211,7 +211,7 @@ | x 471f378eab4c |/ Successors: [a468dc9b3633] | semi-colon: [a468dc9b3633] - | Fate: rewritten by test1 as a468dc9b3633 + | Fate: rewritten as a468dc9b3633 by test1 | o ea207398892e @@ -225,13 +225,13 @@ @ d004c8f274b9 | | x a468dc9b3633 - |/ Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000) + |/ Obsfate: rewritten as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | | x f137d23bb3e1 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000) | | | x 471f378eab4c - |/ Obsfate: rewritten by test1 as a468dc9b3633 (at 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten as a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000) | o ea207398892e @@ -1074,7 +1074,7 @@ o 7a230b46bf61 | | @ 471f378eab4c - |/ Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) | o ea207398892e @@ -1105,7 +1105,7 @@ @ 7a230b46bf61 | | x 471f378eab4c - |/ Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000) + |/ Obsfate: rewritten as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) | o ea207398892e
--- a/tests/test-evolve.t Wed Aug 09 13:21:44 2017 +0200 +++ b/tests/test-evolve.t Wed Aug 09 16:01:20 2017 +0200 @@ -770,12 +770,12 @@ @ d26d339c513f (12) add 4 |\ x | af636757ce3b (11) add 3 - |\ \ rewritten(description, user, parent, content) by test (*) as d26d339c513f (glob) + |\ \ rewritten(description, user, parent, content) as d26d339c513f by test (*) (glob) | | | | \ \ | |\ \ | | | x ce341209337f (4) add 4 - | | | rewritten(description, user, content) by test (*) as d26d339c513f (glob) + | | | rewritten(description, user, content) as d26d339c513f by test (*) (glob) | | | Test obsstore stat
--- a/tests/test-obsolete.t Wed Aug 09 13:21:44 2017 +0200 +++ b/tests/test-obsolete.t Wed Aug 09 16:01:20 2017 +0200 @@ -707,11 +707,11 @@ [2] $ hg olog @ 0d3f46688ccc (3) add obsol_c - | rewritten(parent) by test (*) as 2033b4e49474 (glob) - | rewritten by test (*) as 725c380fe99b (glob) + | rewritten(parent) as 2033b4e49474 by test (*) (glob) + | rewritten as 725c380fe99b by test (*) (glob) | x 4538525df7e2 (2) add c - rewritten by test (*) as 0d3f46688ccc (glob) + rewritten as 0d3f46688ccc by test (*) (glob) Check import reports new unstable changeset: