This instance will be upgraded to Heptapod 0.31.0rc on 2022-05-19 at 11:00 UTC+2 (a few minutes of down time)

Commit f44cc9ab authored by Anton Shestakov's avatar Anton Shestakov
Browse files

obshistory: add 'folded' to the list of precise verbs

It's used for templates and for obslog --filternonlocal, but not for regular
obslog.
parent 08112f100d70
Pipeline #2732 passed with stage
in 3 minutes and 25 seconds
......@@ -785,4 +785,8 @@
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]
......@@ -788,5 +792,4 @@
ef1 = [data.get(b'ef1') for data in metadata]
if all(ef1):
combined = 0
for ef in ef1:
......
......@@ -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
......
......@@ -110,9 +110,9 @@
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
......@@ -114,11 +114,11 @@
| | | 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
......@@ -120,11 +120,11 @@
| | 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
......@@ -126,9 +126,9 @@
| | 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
......
......@@ -50,9 +50,9 @@
| 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
......@@ -54,9 +54,9 @@
| | 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
......
......@@ -452,9 +452,9 @@
| 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
......@@ -456,9 +456,9 @@
| | 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,8 +512,8 @@
| @ 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
......@@ -516,8 +516,8 @@
| |
| 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,6 +525,6 @@
o eb5a0daa2192
|
| @ 0dec01379d3b
| | Obsfate: rewritten using fold as 3:eb5a0daa2192
| | Obsfate: folded using fold as 3:eb5a0daa2192
| |
| x 471f378eab4c
......@@ -529,6 +529,6 @@
| |
| x 471f378eab4c
|/ Obsfate: rewritten using fold as 3:eb5a0daa2192
|/ Obsfate: folded using fold as 3:eb5a0daa2192
|
o ea207398892e
......@@ -552,8 +552,8 @@
| 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
......@@ -556,8 +556,8 @@
| |
| 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,6 +565,6 @@
@ eb5a0daa2192
|
| x 0dec01379d3b
| | Obsfate: rewritten using fold as 3:eb5a0daa2192
| | Obsfate: folded using fold as 3:eb5a0daa2192
| |
| x 471f378eab4c
......@@ -569,6 +569,6 @@
| |
| 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,8 +880,8 @@
| @ 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
......@@ -884,8 +884,8 @@
| |
| 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,6 +893,6 @@
o eb5a0daa2192
|
| @ b7ea6d14e664
| | Obsfate: rewritten using fold as 4:eb5a0daa2192
| | Obsfate: folded using fold as 4:eb5a0daa2192
| |
| x 471f378eab4c
......@@ -897,6 +897,6 @@
| |
| 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,9 +935,9 @@
@ 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
......@@ -939,9 +939,9 @@
| |
| | 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment