Mercurial > evolve

changeset 5115:f44cc9abf21c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obshistory: add 'folded' to the list of precise verbs It's used for templates and for obslog --filternonlocal, but not for regular obslog.
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 14 Jan 2020 19:42:06 +0700
parents 08112f100d70
children 51b892c54e62
files hgext3rd/evolve/obshistory.py tests/test-evolve-obshistory-amend-then-fold.t tests/test-evolve-obshistory-complex.t tests/test-evolve-obshistory-fold.t tests/test-evolve-templates.t
diffstat 5 files changed, 40 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/obshistory.py	Sat Jan 11 19:53:11 2020 +0700
+++ b/hgext3rd/evolve/obshistory.py	Tue Jan 14 19:42:06 2020 +0700
@@ -785,8 +785,11 @@
     markers collectively have more than one effect in the flags.
     """
     metadata = [dict(marker[3]) for marker in markers]
+
+    if len(metadata) == 1 and metadata[0].get(b'fold-id') is not None:
+        return b'folded'
+
     ef1 = [data.get(b'ef1') for data in metadata]
-
     if all(ef1):
         combined = 0
         for ef in ef1:
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Sat Jan 11 19:53:11 2020 +0700
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Tue Jan 14 19:42:06 2020 +0700
@@ -57,7 +57,7 @@
   | |  parent:      1:471f378eab4c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten using fold as 4:eb5a0daa2192
+  | |  obsolete:    folded using fold as 4:eb5a0daa2192
   | |  summary:     B1
   | |
   | | x  changeset:   2:0dec01379d3b
@@ -69,7 +69,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten using fold as 4:eb5a0daa2192
+  |    obsolete:    folded using fold as 4:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
--- a/tests/test-evolve-obshistory-complex.t	Sat Jan 11 19:53:11 2020 +0700
+++ b/tests/test-evolve-obshistory-complex.t	Tue Jan 14 19:42:06 2020 +0700
@@ -110,25 +110,25 @@
   x | |  changeset:   4:868d2e0eb19c
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    rewritten using fold as 8:d15d0ffc75f6
+  | | |  obsolete:    folded using fold as 8:d15d0ffc75f6
   | | |  summary:     D
   | | |
   x | |  changeset:   3:a8df460dbbfe
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    rewritten using fold as 8:d15d0ffc75f6
+  | |    obsolete:    folded using fold as 8:d15d0ffc75f6
   | |    summary:     C
   | |
   x |  changeset:   2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten using fold as 7:b868bc49b0a4
+  | |  obsolete:    folded using fold as 7:b868bc49b0a4
   | |  summary:     B
   | |
   x |  changeset:   1:2a34000d3544
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten using fold as 7:b868bc49b0a4
+  |    obsolete:    folded using fold as 7:b868bc49b0a4
   |    summary:     A
   |
   o  changeset:   0:ea207398892e
--- a/tests/test-evolve-obshistory-fold.t	Sat Jan 11 19:53:11 2020 +0700
+++ b/tests/test-evolve-obshistory-fold.t	Tue Jan 14 19:42:06 2020 +0700
@@ -50,13 +50,13 @@
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten using fold as 3:eb5a0daa2192
+  | |  obsolete:    folded using fold as 3:eb5a0daa2192
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten using fold as 3:eb5a0daa2192
+  |    obsolete:    folded using fold as 3:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -272,7 +272,7 @@
   o  eb5a0daa2192 (2) C0
   |
   x  471f378eab4c (1) A0
-       rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
@@ -315,7 +315,7 @@
   o  eb5a0daa2192 (2) C0
   |
   x  471f378eab4c (1) A0
-       rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
+       folded(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
          --- a/changeset-description
          +++ b/changeset-description
--- a/tests/test-evolve-templates.t	Sat Jan 11 19:53:11 2020 +0700
+++ b/tests/test-evolve-templates.t	Tue Jan 14 19:42:06 2020 +0700
@@ -452,13 +452,13 @@
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten using fold as 3:eb5a0daa2192
+  | |  obsolete:    folded using fold as 3:eb5a0daa2192
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten using fold as 3:eb5a0daa2192
+  |    obsolete:    folded using fold as 3:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -484,7 +484,7 @@
   | @  471f378eab4c
   |/     Successors: 3:eb5a0daa2192
   |      semi-colon: 3:eb5a0daa2192
-  |      Fate: rewritten using fold as 3:eb5a0daa2192
+  |      Fate: folded using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -492,7 +492,7 @@
   o  eb5a0daa2192
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
+  |/     Obsfate: folded using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -512,12 +512,12 @@
   | @  0dec01379d3b
   | |    Successors: 3:eb5a0daa2192
   | |    semi-colon: 3:eb5a0daa2192
-  | |    Fate: rewritten using fold as 3:eb5a0daa2192
+  | |    Fate: folded using fold as 3:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 3:eb5a0daa2192
   |      semi-colon: 3:eb5a0daa2192
-  |      Fate: rewritten using fold as 3:eb5a0daa2192
+  |      Fate: folded using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -525,10 +525,10 @@
   o  eb5a0daa2192
   |
   | @  0dec01379d3b
-  | |    Obsfate: rewritten using fold as 3:eb5a0daa2192
+  | |    Obsfate: folded using fold as 3:eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
+  |/     Obsfate: folded using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -552,12 +552,12 @@
   | x  0dec01379d3b
   | |    Successors: 3:eb5a0daa2192
   | |    semi-colon: 3:eb5a0daa2192
-  | |    Fate: rewritten using fold as 3:eb5a0daa2192
+  | |    Fate: folded using fold as 3:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 3:eb5a0daa2192
   |      semi-colon: 3:eb5a0daa2192
-  |      Fate: rewritten using fold as 3:eb5a0daa2192
+  |      Fate: folded using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -565,10 +565,10 @@
   @  eb5a0daa2192
   |
   | x  0dec01379d3b
-  | |    Obsfate: rewritten using fold as 3:eb5a0daa2192
+  | |    Obsfate: folded using fold as 3:eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
+  |/     Obsfate: folded using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -785,7 +785,7 @@
   | |  parent:      1:471f378eab4c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten using fold as 4:eb5a0daa2192
+  | |  obsolete:    folded using fold as 4:eb5a0daa2192
   | |  summary:     B1
   | |
   | | x  changeset:   2:0dec01379d3b
@@ -797,7 +797,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten using fold as 4:eb5a0daa2192
+  |    obsolete:    folded using fold as 4:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -821,7 +821,7 @@
   | @  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: rewritten using fold as 4:eb5a0daa2192
+  |      Fate: folded using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -829,7 +829,7 @@
   o  eb5a0daa2192
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
+  |/     Obsfate: folded using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -851,7 +851,7 @@
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: rewritten using fold as 4:eb5a0daa2192
+  |      Fate: folded using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -862,7 +862,7 @@
   | |    Obsfate: rewritten using amend, fold as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
+  |/     Obsfate: folded using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -880,12 +880,12 @@
   | @  b7ea6d14e664
   | |    Successors: 4:eb5a0daa2192
   | |    semi-colon: 4:eb5a0daa2192
-  | |    Fate: rewritten using fold as 4:eb5a0daa2192
+  | |    Fate: folded using fold as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: rewritten using fold as 4:eb5a0daa2192
+  |      Fate: folded using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -893,10 +893,10 @@
   o  eb5a0daa2192
   |
   | @  b7ea6d14e664
-  | |    Obsfate: rewritten using fold as 4:eb5a0daa2192
+  | |    Obsfate: folded using fold as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
+  |/     Obsfate: folded using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -917,7 +917,7 @@
   | |    semi-colon: 2:0dec01379d3b
   | |    Successors: 4:eb5a0daa2192
   | |    semi-colon: 4:eb5a0daa2192
-  | |    Fate: rewritten using fold as 4:eb5a0daa2192
+  | |    Fate: folded using fold as 4:eb5a0daa2192
   | |
   | | x  0dec01379d3b
   | |/     Successors: 3:b7ea6d14e664
@@ -927,7 +927,7 @@
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: rewritten using fold as 4:eb5a0daa2192
+  |      Fate: folded using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -935,13 +935,13 @@
   @  eb5a0daa2192
   |
   | x  b7ea6d14e664
-  | |    Obsfate: rewritten using fold as 4:eb5a0daa2192
+  | |    Obsfate: folded using fold as 4:eb5a0daa2192
   | |
   | | x  0dec01379d3b
   | |/     Obsfate: reworded using amend as 3:b7ea6d14e664
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
+  |/     Obsfate: folded using fold as 4:eb5a0daa2192
   |
   o  ea207398892e