Mercurial > evolve
changeset 3055:774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
"yet" was a bit confusing as it let me think that patch is currently not
available but can be available sometimes later. This is true for cases when it
says "context not local" but we have more messages like "no successors", "too
many successors", "changesets rebased" where we can't have a patch.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 09 Oct 2017 19:39:13 +0530 |
| parents | bc890c6c9b2f |
| children | cb8ae3cb0bbc |
| files | hgext3rd/evolve/obshistory.py tests/test-evolve-obshistory.t |
| diffstat | 2 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/obshistory.py Mon Oct 09 19:35:32 2017 +0530 +++ b/hgext3rd/evolve/obshistory.py Mon Oct 09 19:39:13 2017 +0530 @@ -498,7 +498,7 @@ fm.plain("\n") fm.plain(contentpatch) else: - patch = " (No patch available yet, %s)" % _patchavailable[1] + patch = " (No patch available, %s)" % _patchavailable[1] fm.plain("\n") # TODO: should be in json too fm.plain(patch)
--- a/tests/test-evolve-obshistory.t Mon Oct 09 19:35:32 2017 +0530 +++ b/tests/test-evolve-obshistory.t Mon Oct 09 19:39:13 2017 +0530 @@ -239,7 +239,7 @@ $ hg obslog 'desc(B0)' --hidden --patch x 0dec01379d3b (2) B0 pruned by test (*) (glob) - (No patch available yet, no successors) + (No patch available, no successors) $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool [ @@ -374,7 +374,7 @@ $ hg obslog 471597cad322 --hidden --patch x 471597cad322 (1) A0 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (2)) + (No patch available, too many successors (2)) $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool [ @@ -409,7 +409,7 @@ | x 471597cad322 (1) A0 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (2)) + (No patch available, too many successors (2)) With the all option, it should show the three changesets $ hg obslog --all 337fec4d2edc --patch @@ -419,7 +419,7 @@ |/ x 471597cad322 (1) A0 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (2)) + (No patch available, too many successors (2)) Check that debugobshistory on the second successor after split show the revision plus the splitted one @@ -428,7 +428,7 @@ | x 471597cad322 (1) A0 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (2)) + (No patch available, too many successors (2)) With the all option, it should show the three changesets $ hg obslog f257fde29c7a --all --patch @@ -438,7 +438,7 @@ |/ x 471597cad322 (1) A0 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (2)) + (No patch available, too many successors (2)) Obslog with all option all should also works on the splitted commit $ hg obslog -a 471597cad322 --hidden --patch @@ -448,7 +448,7 @@ |/ x 471597cad322 (1) A0 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (2)) + (No patch available, too many successors (2)) Check that debugobshistory on both successors after split show a coherent graph @@ -459,7 +459,7 @@ |/ x 471597cad322 (1) A0 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (2)) + (No patch available, too many successors (2)) $ hg update 471597cad322 abort: hidden revision '471597cad322'! @@ -627,7 +627,7 @@ $ hg obslog de7290d8b885 --hidden --patch x de7290d8b885 (1) A0 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (4)) + (No patch available, too many successors (4)) $ hg obslog de7290d8b885 --hidden --all --patch o 1ae8bc733a14 (4) A0 @@ -640,7 +640,7 @@ |/ x de7290d8b885 (1) A0 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (4)) + (No patch available, too many successors (4)) $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool [ @@ -675,7 +675,7 @@ | x de7290d8b885 (1) A0 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (4)) + (No patch available, too many successors (4)) $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool [ @@ -723,7 +723,7 @@ |/ x de7290d8b885 (1) A0 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (4)) + (No patch available, too many successors (4)) $ hg obslog 5 --all --patch o 1ae8bc733a14 (4) A0 @@ -736,7 +736,7 @@ |/ x de7290d8b885 (1) A0 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) - (No patch available yet, too many successors (4)) + (No patch available, too many successors (4)) $ hg update de7290d8b885 abort: hidden revision 'de7290d8b885'! @@ -830,7 +830,7 @@ |\ x | 0dec01379d3b (2) B0 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) - | (No patch available yet, changesets rebased) + | (No patch available, changesets rebased) | x 471f378eab4c (1) A0 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) @@ -852,7 +852,7 @@ $ hg obslog --hidden 0dec01379d3b --patch x 0dec01379d3b (2) B0 rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) - (No patch available yet, changesets rebased) + (No patch available, changesets rebased) Check that with all option, all changesets are shown $ hg obslog --hidden --all 0dec01379d3b --patch @@ -860,7 +860,7 @@ |\ x | 0dec01379d3b (2) B0 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) - | (No patch available yet, changesets rebased) + | (No patch available, changesets rebased) | x 471f378eab4c (1) A0 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) @@ -884,7 +884,7 @@ |\ x | 0dec01379d3b (2) B0 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) - | (No patch available yet, changesets rebased) + | (No patch available, changesets rebased) | x 471f378eab4c (1) A0 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) @@ -1384,7 +1384,7 @@ | x b7ea6d14e664 (3) B1 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) - | (No patch available yet, changesets rebased) + | (No patch available, changesets rebased) | x 0dec01379d3b (2) B0 rewritten(description) as b7ea6d14e664 by test (*) (glob) @@ -1416,7 +1416,7 @@ | x b7ea6d14e664 (3) B1 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) - | (No patch available yet, changesets rebased) + | (No patch available, changesets rebased) | x 0dec01379d3b (2) B0 rewritten(description) as b7ea6d14e664 by test (*) (glob) @@ -1634,20 +1634,20 @@ | x fdf9bde5129a | rewritten(description) as 7a230b46bf61 by test (*) (glob) - | (No patch available yet, context is not local) + | (No patch available, context is not local) | @ 471f378eab4c (1) A0 rewritten(description) as fdf9bde5129a by test (*) (glob) - (No patch available yet, successor is unknown locally) + (No patch available, successor 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) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob) - | (No patch available yet, context is not local) + | (No patch available, context is not local) | @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob) - (No patch available yet, successor is unknown locally) + (No patch available, successor is unknown locally)