Mercurial > evolve
changeset 4918:f16274729530
obslog: don't overwrite {rev} keyword from changeset context
Now that we have the whole changeset in the formatter context, there's
no need to explicitly add {rev}.
We should also deprecate the {shortdescription} keyword since it's no
longer needed, but I don't know how to do that.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 04 Nov 2019 14:58:58 -0800 |
| parents | d1d8e97d32af |
| children | a7c01a2a3974 |
| files | hgext3rd/evolve/obshistory.py tests/test-evolve-cycles.t tests/test-evolve-obshistory-amend-then-fold.t tests/test-evolve-obshistory-amend.t tests/test-evolve-obshistory-content-divergent.t tests/test-evolve-obshistory-fold.t tests/test-evolve-obshistory-lots-of-splits.t tests/test-evolve-obshistory-phase-divergent.t tests/test-evolve-obshistory-prune.t tests/test-evolve-obshistory-split.t |
| diffstat | 10 files changed, 1 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/obshistory.py Mon Nov 04 14:31:08 2019 -0800 +++ b/hgext3rd/evolve/obshistory.py Mon Nov 04 14:58:58 2019 -0800 @@ -483,8 +483,7 @@ label=b"evolve.node") fm.plain(b' ') - fm.write(b'rev', b'(%d)', ctx.rev(), - label=b"evolve.rev") + fm.plain(b'(%d)' % ctx.rev(), label=b"evolve.rev") fm.plain(b' ') fm.write(b'shortdescription', b'%s', shortdescription,
--- a/tests/test-evolve-cycles.t Mon Nov 04 14:31:08 2019 -0800 +++ b/tests/test-evolve-cycles.t Mon Nov 04 14:58:58 2019 -0800 @@ -314,7 +314,6 @@ } ], "node": "868d2e0eb19c", - "rev": 4, "shortdescription": "D" }, { @@ -338,7 +337,6 @@ } ], "node": "d9f908fde1a1", - "rev": 6, "shortdescription": "F" }, { @@ -362,7 +360,6 @@ } ], "node": "0da815c333f6", - "rev": 5, "shortdescription": "E" }, { @@ -387,7 +384,6 @@ } ], "node": "a8df460dbbfe", - "rev": 3, "shortdescription": "C" }, { @@ -411,7 +407,6 @@ } ], "node": "c473644ee0e9", - "rev": 2, "shortdescription": "B" }, { @@ -435,7 +430,6 @@ } ], "node": "2a34000d3544", - "rev": 1, "shortdescription": "A" } ]
--- a/tests/test-evolve-obshistory-amend-then-fold.t Mon Nov 04 14:31:08 2019 -0800 +++ b/tests/test-evolve-obshistory-amend-then-fold.t Mon Nov 04 14:58:58 2019 -0800 @@ -153,7 +153,6 @@ { "markers": [], "node": "eb5a0daa2192", - "rev": 4, "shortdescription": "C0" }, { @@ -177,7 +176,6 @@ } ], "node": "b7ea6d14e664", - "rev": 3, "shortdescription": "B1" }, { @@ -199,7 +197,6 @@ } ], "node": "0dec01379d3b", - "rev": 2, "shortdescription": "B0" }, { @@ -222,7 +219,6 @@ } ], "node": "471f378eab4c", - "rev": 1, "shortdescription": "A0" } ]
--- a/tests/test-evolve-obshistory-amend.t Mon Nov 04 14:31:08 2019 -0800 +++ b/tests/test-evolve-obshistory-amend.t Mon Nov 04 14:58:58 2019 -0800 @@ -128,7 +128,6 @@ { "markers": [], "node": "4ae3a4151de9", - "rev": 2, "shortdescription": "A1" }, { @@ -151,7 +150,6 @@ } ], "node": "471f378eab4c", - "rev": 1, "shortdescription": "A0" } ] @@ -197,7 +195,6 @@ } ], "node": "471f378eab4c", - "rev": 1, "shortdescription": "A0" } ]
--- a/tests/test-evolve-obshistory-content-divergent.t Mon Nov 04 14:31:08 2019 -0800 +++ b/tests/test-evolve-obshistory-content-divergent.t Mon Nov 04 14:58:58 2019 -0800 @@ -156,7 +156,6 @@ } ], "node": "471f378eab4c", - "rev": 1, "shortdescription": "A0" } ] @@ -285,7 +284,6 @@ { "markers": [], "node": "65b757b745b9", - "rev": 3, "shortdescription": "A2" }, { @@ -322,13 +320,11 @@ } ], "node": "471f378eab4c", - "rev": 1, "shortdescription": "A0" }, { "markers": [], "node": "fdf9bde5129a", - "rev": 2, "shortdescription": "A1" } ]
--- a/tests/test-evolve-obshistory-fold.t Mon Nov 04 14:31:08 2019 -0800 +++ b/tests/test-evolve-obshistory-fold.t Mon Nov 04 14:58:58 2019 -0800 @@ -173,7 +173,6 @@ { "markers": [], "node": "eb5a0daa2192", - "rev": 3, "shortdescription": "C0" }, { @@ -196,7 +195,6 @@ } ], "node": "471f378eab4c", - "rev": 1, "shortdescription": "A0" }, { @@ -220,7 +218,6 @@ } ], "node": "0dec01379d3b", - "rev": 2, "shortdescription": "B0" } ]
--- a/tests/test-evolve-obshistory-lots-of-splits.t Mon Nov 04 14:31:08 2019 -0800 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Mon Nov 04 14:58:58 2019 -0800 @@ -217,7 +217,6 @@ } ], "node": "de7290d8b885", - "rev": 1, "shortdescription": "A0" } ] @@ -233,7 +232,6 @@ { "markers": [], "node": "c7f044602e9b", - "rev": 5, "shortdescription": "A0" }, { @@ -259,7 +257,6 @@ } ], "node": "de7290d8b885", - "rev": 1, "shortdescription": "A0" } ]
--- a/tests/test-evolve-obshistory-phase-divergent.t Mon Nov 04 14:31:08 2019 -0800 +++ b/tests/test-evolve-obshistory-phase-divergent.t Mon Nov 04 14:58:58 2019 -0800 @@ -114,7 +114,6 @@ } ], "node": "471f378eab4c", - "rev": 1, "shortdescription": "A0" } ] @@ -197,7 +196,6 @@ { "markers": [], "node": "fdf9bde5129a", - "rev": 2, "shortdescription": "A1" }, { @@ -219,7 +217,6 @@ } ], "node": "471f378eab4c", - "rev": 1, "shortdescription": "A0" } ]
--- a/tests/test-evolve-obshistory-prune.t Mon Nov 04 14:31:08 2019 -0800 +++ b/tests/test-evolve-obshistory-prune.t Mon Nov 04 14:58:58 2019 -0800 @@ -83,7 +83,6 @@ } ], "node": "0dec01379d3b", - "rev": 2, "shortdescription": "B0" } ] @@ -95,7 +94,6 @@ { "markers": [], "node": "471f378eab4c", - "rev": 1, "shortdescription": "A0" } ]