This is an archive of the discontinued Mercurial Phabricator instance.

Differential D723

templates: introduce a obsfateoperation() function
ClosedPublic

Authored by martinvonz on Sep 15 2017, 2:00 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHG7cdc8c5a481a: templates: introduce a obsfateoperation() function
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Sep 15 2017, 2:00 PM
quark accepted this revision.Sep 15 2017, 6:41 PM
quark added a subscriber: quark.

I think this is a good step forward.

martinvonz updated this revision to Diff 1861.Sep 15 2017, 7:46 PM
lothiraldan added a subscriber: lothiraldan.Sep 18 2017, 9:12 AM
lothiraldan added inline comments.
tests/test-obsmarker-template.t
20

Could you fix https://phab.mercurial-scm.org/D722 so we don't have this renaming here?

martinvonz marked an inline comment as done.Sep 18 2017, 12:00 PM
martinvonz updated this revision to Diff 1866.
martinvonz added inline comments.Sep 18 2017, 12:00 PM
tests/test-obsmarker-template.t
20

Oops, it wasn't supposed to be in D722 at all. Thanks for spotting that.

lothiraldan added a comment.Sep 20 2017, 5:35 AM

I'm +1 with "rewritten using amend as". I find it useful as a complement to the verb.

I'm -0 with "split using amend, rebase as". It find it harder to read and understand even if it brings some value.

quark added a comment.Sep 20 2017, 10:03 AM

+1 for changing the words. I think it should be just "split as ...." or "amend as ...." etc without the word "rewritten". People want the "rewritten" word could customize their own templates.

martinvonz added a comment.Sep 20 2017, 11:31 AM
In D723#12507, @quark wrote:

+1 for changing the words. I think it should be just "split as ...." or "amend as ...." etc without the word "rewritten". People want the "rewritten" word could customize their own templates.

This is just a test case, do we really care that much? (I don't :-))

durin42 accepted this revision.Sep 20 2017, 11:58 AM
This revision is now accepted and ready to land.Sep 20 2017, 11:58 AM
quark added a comment.Sep 20 2017, 12:03 PM
In D723#12511, @martinvonz wrote:

This is just a test case, do we really care that much? (I don't :-))

No. I thought there is a default template. But there isn't.

Closed by commit rHG7cdc8c5a481a: templates: introduce a obsfateoperation() function (authored by martinvonz). · Explain WhySep 20 2017, 12:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1927

mercurial/obsutil.py

def markersusers(markers): def markersusers(markers):
""" Returns a sorted list of markers users without duplicates """ Returns a sorted list of markers users without duplicates
""" """
markersmeta = [dict(m[3]) for m in markers] markersmeta = [dict(m[3]) for m in markers]
users = set(meta.get('user') for meta in markersmeta if meta.get('user')) users = set(meta.get('user') for meta in markersmeta if meta.get('user'))
return sorted(users) return sorted(users)
def markersoperations(markers):
""" Returns a sorted list of markers operations without duplicates
"""
markersmeta = [dict(m[3]) for m in markers]
operations = set(meta.get('operation') for meta in markersmeta
if meta.get('operation'))
return sorted(operations)

mercurial/templater.py

"""Calculate a mod b such that a / b + a mod b == a""" """Calculate a mod b such that a / b + a mod b == a"""
if not len(args) == 2: if not len(args) == 2:
# i18n: "mod" is a keyword # i18n: "mod" is a keyword
raise error.ParseError(_("mod expects two arguments")) raise error.ParseError(_("mod expects two arguments"))
func = lambda a, b: a % b func = lambda a, b: a % b
return runarithmetic(context, mapping, (func, args[0], args[1])) return runarithmetic(context, mapping, (func, args[0], args[1]))
@templatefunc('obsfateoperations(markers)')
def obsfateoperations(context, mapping, args):
"""Compute obsfate related information based on markers (EXPERIMENTAL)"""
if len(args) != 1:
# i18n: "obsfateoperations" is a keyword
raise error.ParseError(_("obsfateoperations expects one arguments"))
markers = evalfuncarg(context, mapping, args[0])
try:
data = obsutil.markersoperations(markers)
return templatekw.hybridlist(data, name='operation')
except (TypeError, KeyError):
# i18n: "obsfateoperations" is a keyword
errmsg = _("obsfateoperations first argument should be an iterable")
raise error.ParseError(errmsg)
@templatefunc('obsfatedate(markers)') @templatefunc('obsfatedate(markers)')
def obsfatedate(context, mapping, args): def obsfatedate(context, mapping, args):
"""Compute obsfate related information based on markers (EXPERIMENTAL)""" """Compute obsfate related information based on markers (EXPERIMENTAL)"""
if len(args) != 1: if len(args) != 1:
# i18n: "obsfatedate" is a keyword # i18n: "obsfatedate" is a keyword
raise error.ParseError(_("obsfatedate expects one arguments")) raise error.ParseError(_("obsfatedate expects one arguments"))
markers = evalfuncarg(context, mapping, args[0]) markers = evalfuncarg(context, mapping, args[0])

tests/test-obsmarker-template.t

This test file test the various templates related to obsmarkers. This test file test the various templates related to obsmarkers.
Global setup Global setup
============ ============
$ . $TESTDIR/testlib/obsmarker-common.sh $ . $TESTDIR/testlib/obsmarker-common.sh
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [ui]
> interactive = true > interactive = true
> [phases] > [phases]
> publish=False > publish=False
> [experimental] > [experimental]
> stabilization=all > stabilization=all
> [templates] > [templates]
> obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
> obsfateverb = "{obsfateverb(successors)}" > obsfateverb = "{obsfateverb(successors)}"
> obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}"
> obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"
> obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}"
> obsfate = "{obsfateverb}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " > obsfate = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
lothiraldanUnsubmitted
Done

Could you fix https://phab.mercurial-scm.org/D722 so we don't have this renaming here?

lothiraldan: Could you fix https://phab.mercurial-scm.org/D722 so we don't have this renaming here?
martinvonzAuthorUnsubmitted
Not Done

Oops, it wasn't supposed to be in D722 at all. Thanks for spotting that.

martinvonz: Oops, it wasn't supposed to be in D722 at all. Thanks for spotting that.
> [alias] > [alias]
> tlog = log -G -T '{node|short}\ > tlog = log -G -T '{node|short}\
> {if(predecessors, "\n Predecessors: {predecessors}")}\ > {if(predecessors, "\n Predecessors: {predecessors}")}\
> {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\
> {if(predecessors, "\n json: {predecessors|json}")}\ > {if(predecessors, "\n json: {predecessors|json}")}\
> {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\ > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\
> {if(successorssets, "\n Successors: {successorssets}")}\ > {if(successorssets, "\n Successors: {successorssets}")}\
> {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\ > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\
| multi-line: 3:d004c8f274b9 | multi-line: 3:d004c8f274b9
| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
o ea207398892e o ea207398892e
$ hg fatelog -q --traceback $ hg fatelog -q --traceback
o d004c8f274b9 o d004c8f274b9
| |
| @ 471f378eab4c | @ 471f378eab4c
|/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
o ea207398892e o ea207398892e
$ hg fatelog $ hg fatelog
o d004c8f274b9 o d004c8f274b9
| |
| @ 471f378eab4c | @ 471f378eab4c
|/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
o ea207398892e o ea207398892e
$ hg fatelog -v $ hg fatelog -v
o d004c8f274b9 o d004c8f274b9
| |
| @ 471f378eab4c | @ 471f378eab4c
|/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
o ea207398892e o ea207398892e
$ hg up 'desc(A1)' --hidden $ hg up 'desc(A1)' --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Predecessors template should show current revision as it is the working copy Predecessors template should show current revision as it is the working copy
$ hg tlog $ hg tlog
o d004c8f274b9 o d004c8f274b9
| Predecessors: 2:a468dc9b3633 | Predecessors: 2:a468dc9b3633
| semi-colon: 2:a468dc9b3633 | semi-colon: 2:a468dc9b3633
| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
| map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
| @ a468dc9b3633 | @ a468dc9b3633
|/ Successors: 3:d004c8f274b9 |/ Successors: 3:d004c8f274b9
| multi-line: 3:d004c8f274b9 | multi-line: 3:d004c8f274b9
| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
o ea207398892e o ea207398892e
$ hg fatelog -v $ hg fatelog -v
o d004c8f274b9 o d004c8f274b9
| |
| @ a468dc9b3633 | @ a468dc9b3633
|/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
o ea207398892e o ea207398892e
Predecessors template should show all the predecessors as we force their display Predecessors template should show all the predecessors as we force their display
with --hidden with --hidden
$ hg tlog --hidden $ hg tlog --hidden
o d004c8f274b9 o d004c8f274b9
| Predecessors: 2:a468dc9b3633 | Predecessors: 2:a468dc9b3633
| semi-colon: 2:a468dc9b3633 | semi-colon: 2:a468dc9b3633
| multi-line: 2:a468dc9b3633 | multi-line: 2:a468dc9b3633
| json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
o ea207398892e o ea207398892e
$ hg fatelog --hidden -q $ hg fatelog --hidden -q
o d004c8f274b9 o d004c8f274b9
| |
| @ a468dc9b3633 | @ a468dc9b3633
|/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
| x 471f378eab4c | x 471f378eab4c
|/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
o ea207398892e o ea207398892e
Predecessors template shouldn't show anything as all obsolete commit are not Predecessors template shouldn't show anything as all obsolete commit are not
visible. visible.
$ hg up 'desc(A2)' $ hg up 'desc(A2)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tlog $ hg tlog
| |
o ea207398892e o ea207398892e
$ hg fatelog -v --hidden $ hg fatelog -v --hidden
@ d004c8f274b9 @ d004c8f274b9
| |
| x a468dc9b3633 | x a468dc9b3633
|/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
| x 471f378eab4c | x 471f378eab4c
|/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
o ea207398892e o ea207398892e
$ hg fatelogjson --hidden $ hg fatelogjson --hidden
@ d004c8f274b9 @ d004c8f274b9
| |
| x a468dc9b3633 | x a468dc9b3633
|/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
| x 471f378eab4c | x 471f378eab4c
o ea207398892e o ea207398892e
$ hg fatelog $ hg fatelog
o 019fadeab383 o 019fadeab383
| |
| o fdf9bde5129a | o fdf9bde5129a
|/ |/
| @ 471f378eab4c | @ 471f378eab4c
|/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
$ hg up 'desc(A1)' $ hg up 'desc(A1)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Predecessors template should not show predecessors as they are not displayed in Predecessors template should not show predecessors as they are not displayed in
the log the log
$ hg tlog $ hg tlog
| json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
o ea207398892e o ea207398892e
$ hg fatelog --hidden $ hg fatelog --hidden
o 019fadeab383 o 019fadeab383
| |
| x 65b757b745b9 | x 65b757b745b9
|/ Obsfate: rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
| @ fdf9bde5129a | @ fdf9bde5129a
|/ |/
| x 471f378eab4c | x 471f378eab4c
|/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
$ hg fatelogjson --hidden $ hg fatelogjson --hidden
o 019fadeab383 o 019fadeab383
| |
| x 65b757b745b9 | x 65b757b745b9
|/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}] |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
o ea207398892e o ea207398892e
$ hg fatelog $ hg fatelog
o eb5a0daa2192 o eb5a0daa2192
| |
| @ 0dec01379d3b | @ 0dec01379d3b
| | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
| x 471f378eab4c | x 471f378eab4c
|/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
$ hg up 'desc(B1)' --hidden $ hg up 'desc(B1)' --hidden
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Predecessors template should both predecessors as they are visible Predecessors template should both predecessors as they are visible
$ hg fatelog --hidden $ hg fatelog --hidden
@ eb5a0daa2192 @ eb5a0daa2192
| |
| x b7ea6d14e664 | x b7ea6d14e664
| | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
| | x 0dec01379d3b | | x 0dec01379d3b
| |/ Obsfate: rewritten as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000); | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000);
| x 471f378eab4c | x 471f378eab4c
|/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
$ hg fatelogjson --hidden $ hg fatelogjson --hidden
@ eb5a0daa2192 @ eb5a0daa2192
| |
| json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
o ea207398892e o ea207398892e
$ hg fatelog $ hg fatelog
o 7a230b46bf61 o 7a230b46bf61
| |
| @ 471f378eab4c | @ 471f378eab4c
|/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
$ hg up 'desc(A2)' $ hg up 'desc(A2)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Predecessors template should show no predecessors as they are non visible Predecessors template should show no predecessors as they are non visible
$ hg tlog $ hg tlog
@ 7a230b46bf61 @ 7a230b46bf61
| json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
o ea207398892e o ea207398892e
$ hg fatelog --hidden $ hg fatelog --hidden
@ 7a230b46bf61 @ 7a230b46bf61
| |
| x 471f378eab4c | x 471f378eab4c
|/ Obsfate: rewritten as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
Test template with obsmarkers cycle Test template with obsmarkers cycle
=================================== ===================================
Test setup Test setup
---------- ----------
$ hg fatelog $ hg fatelog
@ 0b997eb7ceee @ 0b997eb7ceee
| |
| o b18bc8331526 | o b18bc8331526
|/ |/
| o ba2ed02b0c9a | o ba2ed02b0c9a
| | | |
| x 4a004186e638 | x 4a004186e638
|/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
o dd800401bd8c o dd800401bd8c
| |
o f897c6137566 o f897c6137566
| |
o ea207398892e o ea207398892e
$ hg tlog --hidden $ hg tlog --hidden
@ 0b997eb7ceee @ 0b997eb7ceee
$ hg fatelog --hidden $ hg fatelog --hidden
@ 0b997eb7ceee @ 0b997eb7ceee
| |
| o b18bc8331526 | o b18bc8331526
|/ |/
| o ba2ed02b0c9a | o ba2ed02b0c9a
| | | |
| x 4a004186e638 | x 4a004186e638
|/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
o dd800401bd8c o dd800401bd8c
| |
| x 9bd10a0775e4 | x 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 by test (at 1970-01-01 00:00 +0000);
o f897c6137566 o f897c6137566
| |
| x 0dec01379d3b | x 0dec01379d3b
| | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000);
| |
| o 0b997eb7ceee | o 0b997eb7ceee
| | | |
o | b18bc8331526 o | b18bc8331526
|/ |/
o dd800401bd8c o dd800401bd8c
| |
| @ 9bd10a0775e4 | @ 9bd10a0775e4
|/ Obsfate: split as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000);
o f897c6137566 o f897c6137566
| |
o ea207398892e o ea207398892e
Test templates with pruned commits Test templates with pruned commits
================================== ==================================
Test setup Test setup
o ea207398892e o ea207398892e
$ hg fatelog -v --hidden $ hg fatelog -v --hidden
x 65b757b745b9 x 65b757b745b9
| Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
| x fdf9bde5129a | x fdf9bde5129a
|/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
| @ 471f378eab4c | @ 471f378eab4c
|/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000);
o ea207398892e o ea207398892e
Test templates with splitted and pruned commit Test templates with splitted and pruned commit
============================================== ==============================================
$ hg init $TESTTMP/templates-local-split-prune $ hg init $TESTTMP/templates-local-split-prune
$ cd $TESTTMP/templates-local-split-prune $ cd $TESTTMP/templates-local-split-prune