This test file test the various templates related to obsmarkers.

Global setup

============

  $ . $TESTDIR/testlib/obsmarker-common.sh

  $ cat >> $HGRCPATH <<EOF

  > [ui]

  > interactive = true

  > [phases]

  > publish=False

  > [experimental]

  > stabilization=all

  > [templates]

  > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"

  > obsfateverb = "{obsfateverb(successors)}"

  > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(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})")}")}"

  > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "

  > [alias]

  > tlog = log -G -T '{node|short}\

  >     {if(predecessors, "\n  Predecessors: {predecessors}")}\

  >     {if(predecessors, "\n  semi-colon: {join(predecessors, "; ")}")}\

  >     {if(predecessors, "\n  json: {predecessors|json}")}\

  >     {if(predecessors, "\n  map: {join(predecessors % "{rev}:{node}", " ")}")}\

  >     {if(successorssets, "\n  Successors: {successorssets}")}\

  >     {if(successorssets, "\n  multi-line: {join(successorssets, "\n  multi-line: ")}")}\

  >     {if(successorssets, "\n  json: {successorssets|json}")}\n'

  > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, "  Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}'

  > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, "  Obsfate: {succsandmarkers|json}\n")}'

  > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % "  Obsfate: {fate}\n"}")}'

  > EOF

Test templates on amended commit

================================

Test setup

----------

  $ hg init $TESTTMP/templates-local-amend

  $ cd $TESTTMP/templates-local-amend

  $ mkcommit ROOT

  $ mkcommit A0

  $ echo 42 >> A0

  $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0"

  $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2

  $ hg log --hidden -G

  @  changeset:   3:d004c8f274b9

  |  tag:         tip

  |  parent:      0:ea207398892e

  |  user:        test

  |  date:        Thu Jan 01 00:00:00 1970 +0000

  |  summary:     A2

  |

  | x  changeset:   2:a468dc9b3633

  |/   parent:      0:ea207398892e

  |    user:        test

  |    date:        Thu Jan 01 00:00:00 1970 +0000

  |    summary:     A1

  |

  | x  changeset:   1:471f378eab4c

  |/   user:        test

  |    date:        Thu Jan 01 00:00:00 1970 +0000

  |    summary:     A0

  |

  o  changeset:   0:ea207398892e

     user:        test

     date:        Thu Jan 01 00:00:00 1970 +0000

     summary:     ROOT

Check templates

---------------

  $ hg up 'desc(A0)' --hidden

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

Predecessors template should show current revision as it is the working copy

  $ hg tlog

  o  d004c8f274b9

  |    Predecessors: 1:471f378eab4c

  |    semi-colon: 1:471f378eab4c

  |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]

  |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874

  | @  471f378eab4c

  |/     Successors: 3:d004c8f274b9

  |      multi-line: 3:d004c8f274b9

  |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]

  o  ea207398892e

  $ hg fatelog

  o  d004c8f274b9

  |

  | @  471f378eab4c

  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);

  o  ea207398892e

  $ hg fatelogkw

  o  d004c8f274b9

  |

  | @  471f378eab4c

  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2

  o  ea207398892e

  $ hg up 'desc(A1)' --hidden

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

Predecessors template should show current revision as it is the working copy

  $ hg tlog

  o  d004c8f274b9

  |    Predecessors: 2:a468dc9b3633

  |    semi-colon: 2:a468dc9b3633

  |    json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]

  |    map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad

  | @  a468dc9b3633

  |/     Successors: 3:d004c8f274b9

  |      multi-line: 3:d004c8f274b9

  |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]

  o  ea207398892e

  $ hg fatelog

  o  d004c8f274b9

  |

  | @  a468dc9b3633

  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);

  o  ea207398892e

Predecessors template should show all the predecessors as we force their display

with --hidden

  $ hg tlog --hidden

  o  d004c8f274b9

  |    Predecessors: 2:a468dc9b3633

  |    semi-colon: 2:a468dc9b3633

  |    json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]

  |    map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad

  | @  a468dc9b3633

  |/     Predecessors: 1:471f378eab4c

  |      semi-colon: 1:471f378eab4c

  |      json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]

  |      map: 1:471f378eab4c5e25f6c77f785b27c936efb22874

  |      Successors: 3:d004c8f274b9

  |      multi-line: 3:d004c8f274b9

  |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]

  | x  471f378eab4c

  |/     Successors: 2:a468dc9b3633

  |      multi-line: 2:a468dc9b3633

  |      json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]

  o  ea207398892e

  $ hg fatelog --hidden

  o  d004c8f274b9

  |

  | @  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);

  o  ea207398892e

Predecessors template shouldn't show anything as all obsolete commit are not

visible.

  $ hg up 'desc(A2)'

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg tlog

  @  d004c8f274b9

  |

  o  ea207398892e

  $ hg tlog --hidden

  @  d004c8f274b9

  |    Predecessors: 2:a468dc9b3633

  |    semi-colon: 2:a468dc9b3633

  |    json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]

  |    map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad

  | x  a468dc9b3633

  |/     Predecessors: 1:471f378eab4c

  |      semi-colon: 1:471f378eab4c

  |      json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]

  |      map: 1:471f378eab4c5e25f6c77f785b27c936efb22874

  |      Successors: 3:d004c8f274b9

  |      multi-line: 3:d004c8f274b9

  |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]

  | x  471f378eab4c

  |/     Successors: 2:a468dc9b3633

  |      multi-line: 2:a468dc9b3633

  |      json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]

  o  ea207398892e

  $ hg fatelog

  @  d004c8f274b9

  |

  o  ea207398892e

  $ hg fatelog --hidden

  @  d004c8f274b9

  |

  | 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);

  o  ea207398892e

  $ hg fatelogjson --hidden

  @  d004c8f274b9

  |

  | x  a468dc9b3633

  |/     Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]

  | x  471f378eab4c

  |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]

  o  ea207398892e

Check other fatelog implementations

-----------------------------------

  $ hg fatelogkw --hidden -q

  @  d004c8f274b9

  |

  | x  a468dc9b3633

  |/     Obsfate: rewritten using amend as 3:d004c8f274b9

  | x  471f378eab4c

  |/     Obsfate: rewritten using amend as 2:a468dc9b3633

  o  ea207398892e

  $ hg fatelogkw --hidden

  @  d004c8f274b9

  |

  | x  a468dc9b3633

  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test2

  | x  471f378eab4c

  |/     Obsfate: rewritten using amend as 2:a468dc9b3633

  o  ea207398892e

  $ hg fatelogkw --hidden -v

  @  d004c8f274b9

  |

  | 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)

  o  ea207398892e

Test templates with splitted commit

===================================

  $ hg init $TESTTMP/templates-local-split

  $ cd $TESTTMP/templates-local-split

  $ mkcommit ROOT

  $ echo 42 >> a

  $ echo 43 >> b

  $ hg commit -A -m "A0"

  adding a

  adding b

  $ hg log --hidden -G

  @  changeset:   1:471597cad322

  |  tag:         tip

  |  user:        test

  |  date:        Thu Jan 01 00:00:00 1970 +0000

  |  summary:     A0

  |

  o  changeset:   0:ea207398892e

     user:        test

     date:        Thu Jan 01 00:00:00 1970 +0000

     summary:     ROOT

# Simulate split

  $ hg up -r "desc(ROOT)"

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

  $ echo 42 >> a

  $ hg commit -A -m "A0"

  adding a

  created new head

  $ echo 43 >> b

  $ hg commit -A -m "A0"

  adding b

  $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`

  obsoleted 1 changesets

  $ hg log --hidden -G

  @  changeset:   3:f257fde29c7a

  |  tag:         tip

  |  user:        test

  |  date:        Thu Jan 01 00:00:00 1970 +0000

  |  summary:     A0

  |

  o  changeset:   2:337fec4d2edc

  |  parent:      0:ea207398892e

  |  user:        test

  |  date:        Thu Jan 01 00:00:00 1970 +0000

  |  summary:     A0

  |

  | x  changeset:   1:471597cad322

  |/   user:        test

  |    date:        Thu Jan 01 00:00:00 1970 +0000

  |    summary:     A0

  |

  o  changeset:   0:ea207398892e

     user:        test

     date:        Thu Jan 01 00:00:00 1970 +0000

     summary:     ROOT

Check templates

---------------

  $ hg up 'obsolete()' --hidden

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

Predecessors template should show current revision as it is the working copy

  $ hg tlog

  o  f257fde29c7a

  |    Predecessors: 1:471597cad322

  |    semi-colon: 1:471597cad322

  |    json: ["471597cad322d1f659bb169751be9133dad92ef3"]

  |    map: 1:471597cad322d1f659bb169751be9133dad92ef3

  o  337fec4d2edc

  |    Predecessors: 1:471597cad322

  |    semi-colon: 1:471597cad322

  |    json: ["471597cad322d1f659bb169751be9133dad92ef3"]

  |    map: 1:471597cad322d1f659bb169751be9133dad92ef3

  | @  471597cad322

  |/     Successors: 2:337fec4d2edc 3:f257fde29c7a

  |      multi-line: 2:337fec4d2edc 3:f257fde29c7a

  |      json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]

  o  ea207398892e

  $ hg fatelog

  o  f257fde29c7a

  |

  o  337fec4d2edc

  |

  | @  471597cad322

  |/     Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);

  o  ea207398892e

  $ hg up f257fde29c7a

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

Predecessors template should not show a predecessor as it's not displayed in

the log

  $ hg tlog

  @  f257fde29c7a

  |

  o  337fec4d2edc

  |

  o  ea207398892e

Predecessors template should show both predecessors as we force their display

with --hidden

  $ hg tlog --hidden

  @  f257fde29c7a

  |    Predecessors: 1:471597cad322

  |    semi-colon: 1:471597cad322

  |    json: ["471597cad322d1f659bb169751be9133dad92ef3"]

  |    map: 1:471597cad322d1f659bb169751be9133dad92ef3

  o  337fec4d2edc

  |    Predecessors: 1:471597cad322

  |    semi-colon: 1:471597cad322

  |    json: ["471597cad322d1f659bb169751be9133dad92ef3"]

  |    map: 1:471597cad322d1f659bb169751be9133dad92ef3

  | x  471597cad322

  |/     Successors: 2:337fec4d2edc 3:f257fde29c7a

  |      multi-line: 2:337fec4d2edc 3:f257fde29c7a

  |      json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]

  o  ea207398892e

  $ hg fatelog --hidden

  @  f257fde29c7a

  |

  o  337fec4d2edc

  |

  | x  471597cad322

  |/     Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);

  o  ea207398892e

  $ hg fatelogjson --hidden

  @  f257fde29c7a

  |

  o  337fec4d2edc

  |

  | x  471597cad322

  |/     Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}]

  o  ea207398892e