D723: templates: introduce a obsfateoperation() function
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7cdc8c5a481a: templates: introduce a obsfateoperation()
function (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D723?vs=1866=1927
REVISION DETAIL
https://phab.mercurial-scm.org/D723
AFFECTED FILES
mercurial/obsutil.py
mercurial/templater.py
tests/test-obsmarker-template.t
CHANGE DETAILS
diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -14,9 +14,10 @@
> [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})")}")}"
- > obsfate = "{obsfateverb}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
+ > obsfate =
"{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate};
"
> [alias]
> tlog = log -G -T '{node|short}\
> {if(predecessors, "\n Predecessors: {predecessors}")}\
@@ -90,21 +91,21 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg fatelog
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg fatelog -v
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg up 'desc(A1)' --hidden
@@ -127,7 +128,7 @@
o d004c8f274b9
|
| @ a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
o ea207398892e
Predecessors template should show all the predecessors as we force their
display
@@ -156,9 +157,9 @@
o d004c8f274b9
|
| @ a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31
+);
+ |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at
2009-02-13 23:31 +);
o ea207398892e
@@ -201,9 +202,9 @@
@ d004c8f274b9
|
| x a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31
+);
+ |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at
2009-02-13 23:31 +);
o ea207398892e
$ hg fatelogjson --hidden
@@ -653,7 +654,7 @@
| o fdf9bde5129a
|/
| @ 471f378eab4c
- |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00
+); rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +);
+ |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at
1970-01-01 00:00 +); rewritten using amend as 4:019fadeab383 by test (at
1970-01-01 00:00 +);
o ea207398892e
$ hg up 'desc(A1)'
@@ -709,11 +710,11 @@
o 019fadeab383
|
| x 65b757b745b9
- |/ Obsfate: rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00
+);
+ |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at
1970-01-01 00:00 +);
| @ fdf9bde5129a
|/
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00
+); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +);
+ |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at
1970-01-01 00:00 +); rewritten using amend as 3:65b757b745b9 by test (at
D723: templates: introduce a obsfateoperation() function
quark added a comment. In https://phab.mercurial-scm.org/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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D723 To: martinvonz, #hg-reviewers, quark, durin42 Cc: lothiraldan, quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D723: templates: introduce a obsfateoperation() function
martinvonz added a comment. In https://phab.mercurial-scm.org/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 :-)) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D723 To: martinvonz, #hg-reviewers, quark Cc: lothiraldan, quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D723: templates: introduce a obsfateoperation() function
quark added a comment. +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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D723 To: martinvonz, #hg-reviewers, quark Cc: lothiraldan, quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D723: templates: introduce a obsfateoperation() function
lothiraldan added a comment. 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D723 To: martinvonz, #hg-reviewers, quark Cc: lothiraldan, quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D723: templates: introduce a obsfateoperation() function
martinvonz updated this revision to Diff 1866.
martinvonz marked an inline comment as done.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D723?vs=1861=1866
REVISION DETAIL
https://phab.mercurial-scm.org/D723
AFFECTED FILES
mercurial/obsutil.py
mercurial/templater.py
tests/test-obsmarker-template.t
CHANGE DETAILS
diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -14,9 +14,10 @@
> [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})")}")}"
- > obsfate = "{obsfateverb}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
+ > obsfate =
"{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate};
"
> [alias]
> tlog = log -G -T '{node|short}\
> {if(predecessors, "\n Predecessors: {predecessors}")}\
@@ -90,21 +91,21 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg fatelog
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg fatelog -v
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg up 'desc(A1)' --hidden
@@ -127,7 +128,7 @@
o d004c8f274b9
|
| @ a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
o ea207398892e
Predecessors template should show all the predecessors as we force their
display
@@ -156,9 +157,9 @@
o d004c8f274b9
|
| @ a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31
+);
+ |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at
2009-02-13 23:31 +);
o ea207398892e
@@ -201,9 +202,9 @@
@ d004c8f274b9
|
| x a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31
+);
+ |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at
2009-02-13 23:31 +);
o ea207398892e
$ hg fatelogjson --hidden
@@ -653,7 +654,7 @@
| o fdf9bde5129a
|/
| @ 471f378eab4c
- |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00
+); rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +);
+ |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at
1970-01-01 00:00 +); rewritten using amend as 4:019fadeab383 by test (at
1970-01-01 00:00 +);
o ea207398892e
$ hg up 'desc(A1)'
@@ -709,11 +710,11 @@
o 019fadeab383
|
| x 65b757b745b9
- |/ Obsfate: rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00
+);
+ |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at
1970-01-01 00:00 +);
| @ fdf9bde5129a
|/
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00
+); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +);
+ |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at
1970-01-01 00:00 +); rewritten using amend as 3:65b757b745b9 by test (at
1970-01-01 00:00 +);
o ea207398892e
@@ -859,7 +860,7 @@
o eb5a0daa2192
|
| @ 0dec01379d3b
D723: templates: introduce a obsfateoperation() function
martinvonz added inline comments. INLINE COMMENTS > lothiraldan wrote in test-obsmarker-template.t:20 > Could you fix https://phab.mercurial-scm.org/D722 so we don't have this > renaming here? Oops, it wasn't supposed to be in https://phab.mercurial-scm.org/D722 at all. Thanks for spotting that. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D723 To: martinvonz, #hg-reviewers, quark Cc: lothiraldan, quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D723: templates: introduce a obsfateoperation() function
martinvonz updated this revision to Diff 1861.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D723?vs=1858=1861
REVISION DETAIL
https://phab.mercurial-scm.org/D723
AFFECTED FILES
mercurial/obsutil.py
mercurial/templater.py
tests/test-obsmarker-template.t
CHANGE DETAILS
diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -14,9 +14,10 @@
> [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})")}")}"
- > obsfate =
"{obsfateverb}{obsfateoperation}{obsfatesuccessors}{obsfateusers}{obsfatedate};
"
+ > obsfate =
"{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate};
"
> [alias]
> tlog = log -G -T '{node|short}\
> {if(predecessors, "\n Predecessors: {predecessors}")}\
@@ -90,21 +91,21 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg fatelog
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg fatelog -v
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg up 'desc(A1)' --hidden
@@ -127,7 +128,7 @@
o d004c8f274b9
|
| @ a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
o ea207398892e
Predecessors template should show all the predecessors as we force their
display
@@ -156,9 +157,9 @@
o d004c8f274b9
|
| @ a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31
+);
+ |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at
2009-02-13 23:31 +);
o ea207398892e
@@ -201,9 +202,9 @@
@ d004c8f274b9
|
| x a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31
+);
+ |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at
2009-02-13 23:31 +);
o ea207398892e
$ hg fatelogjson --hidden
@@ -653,7 +654,7 @@
| o fdf9bde5129a
|/
| @ 471f378eab4c
- |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00
+); rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +);
+ |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at
1970-01-01 00:00 +); rewritten using amend as 4:019fadeab383 by test (at
1970-01-01 00:00 +);
o ea207398892e
$ hg up 'desc(A1)'
@@ -709,11 +710,11 @@
o 019fadeab383
|
| x 65b757b745b9
- |/ Obsfate: rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00
+);
+ |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at
1970-01-01 00:00 +);
| @ fdf9bde5129a
|/
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00
+); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +);
+ |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at
1970-01-01 00:00 +); rewritten using amend as 3:65b757b745b9 by test (at
1970-01-01 00:00 +);
o ea207398892e
@@ -859,7 +860,7 @@
o eb5a0daa2192
|
| @ 0dec01379d3b
- | |Obsfate:
D723: templates: introduce a obsfateoperation() function
quark accepted this revision. quark added a comment. I think this is a good step forward. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D723 To: martinvonz, #hg-reviewers, quark Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D723: templates: introduce a obsfateoperation() function
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D723
AFFECTED FILES
mercurial/obsutil.py
mercurial/templater.py
tests/test-obsmarker-template.t
CHANGE DETAILS
diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -14,9 +14,10 @@
> [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})")}")}"
- > obsfate =
"{obsfateverb}{obsfateoperation}{obsfatesuccessors}{obsfateusers}{obsfatedate};
"
+ > obsfate =
"{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate};
"
> [alias]
> tlog = log -G -T '{node|short}\
> {if(predecessors, "\n Predecessors: {predecessors}")}\
@@ -90,21 +91,21 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg fatelog
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg fatelog -v
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test1, test2 (between
2001-04-19 04:25 + and 2009-02-13 23:31 +);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2
(between 2001-04-19 04:25 + and 2009-02-13 23:31 +);
o ea207398892e
$ hg up 'desc(A1)' --hidden
@@ -127,7 +128,7 @@
o d004c8f274b9
|
| @ a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
o ea207398892e
Predecessors template should show all the predecessors as we force their
display
@@ -156,9 +157,9 @@
o d004c8f274b9
|
| @ a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31
+);
+ |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at
2009-02-13 23:31 +);
o ea207398892e
@@ -201,9 +202,9 @@
@ d004c8f274b9
|
| x a468dc9b3633
- |/ Obsfate: rewritten as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25
+);
+ |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at
2001-04-19 04:25 +);
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31
+);
+ |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at
2009-02-13 23:31 +);
o ea207398892e
$ hg fatelogjson --hidden
@@ -653,7 +654,7 @@
| o fdf9bde5129a
|/
| @ 471f378eab4c
- |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00
+); rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00 +);
+ |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at
1970-01-01 00:00 +); rewritten using amend as 4:019fadeab383 by test (at
1970-01-01 00:00 +);
o ea207398892e
$ hg up 'desc(A1)'
@@ -709,11 +710,11 @@
o 019fadeab383
|
| x 65b757b745b9
- |/ Obsfate: rewritten as 4:019fadeab383 by test (at 1970-01-01 00:00
+);
+ |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at
1970-01-01 00:00 +);
| @ fdf9bde5129a
|/
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00
+); rewritten as 3:65b757b745b9 by test (at 1970-01-01 00:00 +);
+ |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at
1970-01-01 00:00 +); rewritten using amend as 3:65b757b745b9 by test (at
1970-01-01 00:00 +);
o ea207398892e
@@ -859,7 +860,7 @@
o eb5a0daa2192
|
| @ 0dec01379d3b
- | |Obsfate: rewritten as
