[PATCH 11 of 11] obsfate: add obsfate to default mapfile

Pulkit Goyal 7895pulkit at gmail.com
Mon Oct 9 17:43:03 EDT 2017


On Tue, Oct 10, 2017 at 12:10 AM, Boris Feld <boris.feld at octobus.net> wrote:
> # HG changeset patch
> # User Boris Feld <boris.feld at octobus.net>
> # Date 1507305216 -7200
> #      Fri Oct 06 17:53:36 2017 +0200
> # Node ID ab0796c0fbce5d8314511bf08ea5b6b4cf0b9dfc
> # Parent  1943f74e8e4cb6bd1d44910898fffcaec7a56ca1
> # EXP-Topic obsfatekeyword
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r ab0796c0fbce
> obsfate: add obsfate to default mapfile

[snip]

> +# Obsfate templates
> +lobsfate = '{if(obsfate, "{label('log.obsfate', '{obsfate % "obsfate:     {fate}\n"}')}")}'
> diff -r 1943f74e8e4c -r ab0796c0fbce tests/test-obsmarker-template.t
> --- a/tests/test-obsmarker-template.t   Thu Oct 05 15:25:18 2017 +0200
> +++ b/tests/test-obsmarker-template.t   Fri Oct 06 17:53:36 2017 +0200
> @@ -117,7 +117,27 @@
>    | @  changeset:   1:471f378eab4c
>    |/   user:        test
>    |    date:        Thu Jan 01 00:00:00 1970 +0000
> -  |    obsfate:     rewritten using amend as 3:d004c8f274b9 by test2
> +  |    obsfate:     rewritten using amend as 3:d004c8f274b9 by test, test2
^ this one

> +  |    summary:     A0
> +  |
> +  o  changeset:   0:ea207398892e
> +     user:        test
> +     date:        Thu Jan 01 00:00:00 1970 +0000
> +     summary:     ROOT
> +
> +
> +  $ hg log -G -T "default"
> +  o  changeset:   3:d004c8f274b9
> +  |  tag:         tip
> +  |  parent:      0:ea207398892e
> +  |  user:        test
> +  |  date:        Thu Jan 01 00:00:00 1970 +0000
> +  |  summary:     A2
> +  |
> +  | @  changeset:   1:471f378eab4c
> +  |/   user:        test
> +  |    date:        Thu Jan 01 00:00:00 1970 +0000
> +  |    obsfate:     rewritten using amend as 3:d004c8f274b9 by test, test2
^ this one

>    |    summary:     A0
>    |
>    o  changeset:   0:ea207398892e
> @@ -264,6 +284,71 @@
>    |/     Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
>    o  ea207398892e

I am bit confused by two of the outputs above. They say `rewritten
using amend as XXXX by test, test2`. Does that mean test did some
amend, then test2 did some amend and the resulting changeset is XXXX.
This more or sounds like they performed the amend together and the
resulting changeset is XXXX.
If this has been discussed earlier, feel free to ignore me as I missed
couple of obsfate series earlier I guess.


More information about the Mercurial-devel mailing list