mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 06:47:41 +03:00
9612beb8f6
Summary: Replace the Python drawdag parsing logic with the Rust implementation. This allows drawdag to parse horizontal graphs, and ranges. The `o` special case to support `log -G` output is now gone and related tests are migrated to not use `o`. Differential Revision: D34163476 fbshipit-source-id: c37e336b60aa3fc06f00dfcccd21ecba11e9e074
372 lines
6.4 KiB
Perl
372 lines
6.4 KiB
Perl
#chg-compatible
|
|
|
|
$ configure modern
|
|
|
|
$ reinit () {
|
|
> rm -rf .hg && hg init
|
|
> }
|
|
|
|
$ hg init
|
|
|
|
Test what said in drawdag.py docstring
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> c d
|
|
> |/
|
|
> b
|
|
> |
|
|
> a
|
|
> EOS
|
|
|
|
$ hg log -G -T '{desc} ({bookmarks})'
|
|
o d (d)
|
|
│
|
|
│ o c (c)
|
|
├─╯
|
|
o b (b)
|
|
│
|
|
o a (a)
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> foo bar bar foo
|
|
> | / | |
|
|
> ancestor(c,d) a baz
|
|
> EOS
|
|
|
|
$ hg log -G -T '{desc}'
|
|
o foo
|
|
├─╮
|
|
│ │ o bar
|
|
╭───┤
|
|
│ o │ baz
|
|
│ │
|
|
│ o │ d
|
|
├─╯ │
|
|
│ o │ c
|
|
├─╯ │
|
|
o │ b
|
|
├───╯
|
|
o a
|
|
|
|
$ reinit
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> foo
|
|
> |\
|
|
> | | d
|
|
> | |/
|
|
> | | c
|
|
> | |/
|
|
> | | bar
|
|
> | |/|
|
|
> | b |
|
|
> | |/
|
|
> | a
|
|
> |
|
|
> baz
|
|
> EOS
|
|
|
|
$ hg log -G -T '{desc}'
|
|
o foo
|
|
├─╮
|
|
│ │ o d
|
|
│ ├─╯
|
|
│ │ o c
|
|
│ ├─╯
|
|
│ │ o bar
|
|
│ ╭─┤
|
|
│ o │ b
|
|
│ ├─╯
|
|
o │ baz
|
|
│
|
|
o a
|
|
|
|
$ hg manifest -r a
|
|
a
|
|
$ hg manifest -r b
|
|
a
|
|
b
|
|
$ hg manifest -r bar
|
|
a
|
|
b
|
|
$ hg manifest -r foo
|
|
a
|
|
b
|
|
baz
|
|
|
|
Edges existed in repo are no-ops
|
|
|
|
$ reinit
|
|
$ hg debugdrawdag <<'EOS'
|
|
> B C C
|
|
> | | |
|
|
> A A B
|
|
> EOS
|
|
|
|
$ hg log -G -T '{desc}'
|
|
o C
|
|
├─╮
|
|
│ o B
|
|
├─╯
|
|
o A
|
|
|
|
|
|
$ hg debugdrawdag --traceback <<'EOS'
|
|
> C D C
|
|
> | | |
|
|
> B B A
|
|
> EOS
|
|
|
|
$ hg log -G -T '{desc}'
|
|
o D
|
|
│
|
|
│ o C
|
|
╭─┤
|
|
o │ B
|
|
├─╯
|
|
o A
|
|
|
|
|
|
Node with more than 2 parents are disallowed
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> A
|
|
> /|\
|
|
> D B C
|
|
> EOS
|
|
abort: A: too many parents: B C D
|
|
[255]
|
|
|
|
Cycles are disallowed
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> A
|
|
> |
|
|
> A
|
|
> EOS
|
|
abort: the graph has cycles
|
|
[255]
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> A
|
|
> |
|
|
> B
|
|
> |
|
|
> A
|
|
> EOS
|
|
abort: the graph has cycles
|
|
[255]
|
|
|
|
Create obsmarkers via comments
|
|
|
|
$ reinit
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> G L
|
|
> | |
|
|
> I D C F K # split: B -> E, F, G
|
|
> \ \| | | # replace: C -> D -> H
|
|
> H B E J M # prune: F, I
|
|
> \|/ |/ # fold: J, K, L -> M
|
|
> A A # revive: D, K
|
|
> EOS
|
|
|
|
$ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}'
|
|
o I 58e6b987bf7045fcd9c54f496396ca1d1fc81047
|
|
│
|
|
o H 575c4b5ec114d64b681d33f8792853568bfb2b2c
|
|
│
|
|
│ o G 711f53bbef0bebd12eb6f0511d5e2e998b984846
|
|
│ │
|
|
│ o F 64a8289d249234b9886244d379f15e6b650b28e3
|
|
│ │
|
|
│ o E 7fb047a69f220c21711122dfd94305a9efb60cba
|
|
├─╯
|
|
│ x L 12ac214c2132ccaa5b97fa70b25570496f86853c
|
|
│ │
|
|
│ x K 623037570ba0971f93c31b1b90fa8a1b82307329
|
|
│ │
|
|
│ x J a0a5005cec670cc22e984711855473e8ba07230a
|
|
├─╯
|
|
│ x D be0ef73c17ade3fc89dc41701eb9fc3a91b58282
|
|
│ │
|
|
│ │ x C 26805aba1e600a82e93661149f2313866a221a7b
|
|
│ ├─╯
|
|
│ x B 112478962961147124edd43549aedd1a335e44bf
|
|
├─╯
|
|
│ o M 699bc4b6fa2207ae482508d19836281c02008d1e
|
|
├─╯
|
|
o A 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
|
|
|
|
$ hg debugmutation -r 'all()'
|
|
* 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
|
|
|
|
* 112478962961147124edd43549aedd1a335e44bf
|
|
|
|
* 7fb047a69f220c21711122dfd94305a9efb60cba
|
|
|
|
* be0ef73c17ade3fc89dc41701eb9fc3a91b58282 replace by test at 1970-01-01T00:00:00 from:
|
|
26805aba1e600a82e93661149f2313866a221a7b
|
|
|
|
* 64a8289d249234b9886244d379f15e6b650b28e3
|
|
|
|
* 711f53bbef0bebd12eb6f0511d5e2e998b984846 split by test at 1970-01-01T00:00:00 (split into this and: 7fb047a69f220c21711122dfd94305a9efb60cba, 64a8289d249234b9886244d379f15e6b650b28e3) from:
|
|
112478962961147124edd43549aedd1a335e44bf
|
|
|
|
* 575c4b5ec114d64b681d33f8792853568bfb2b2c replace by test at 1970-01-01T00:00:00 from:
|
|
be0ef73c17ade3fc89dc41701eb9fc3a91b58282 replace by test at 1970-01-01T00:00:00 from:
|
|
26805aba1e600a82e93661149f2313866a221a7b
|
|
|
|
* 699bc4b6fa2207ae482508d19836281c02008d1e fold by test at 1970-01-01T00:00:00 from:
|
|
|- a0a5005cec670cc22e984711855473e8ba07230a
|
|
|- 623037570ba0971f93c31b1b90fa8a1b82307329
|
|
'- 12ac214c2132ccaa5b97fa70b25570496f86853c
|
|
|
|
* 58e6b987bf7045fcd9c54f496396ca1d1fc81047
|
|
|
|
Change file contents via comments
|
|
|
|
$ reinit
|
|
$ hg debugdrawdag <<'EOS'
|
|
> C # A/dir1/a = 1\n2
|
|
> |\ # B/dir2/b = 34
|
|
> A B # C/dir1/c = 5
|
|
> # C/dir2/c = 6
|
|
> # C/A = a
|
|
> # C/B = b
|
|
> EOS
|
|
|
|
$ hg log -G -T '{desc} {files}'
|
|
o C A B dir1/c dir2/c
|
|
├─╮
|
|
│ o B B dir2/b
|
|
│
|
|
o A A dir1/a
|
|
|
|
$ for f in `hg files -r C`; do
|
|
> echo FILE "$f"
|
|
> hg cat -r C "$f"
|
|
> echo
|
|
> done
|
|
FILE A
|
|
a
|
|
FILE B
|
|
b
|
|
FILE dir1/a
|
|
1
|
|
2
|
|
FILE dir1/c
|
|
5
|
|
FILE dir2/b
|
|
34
|
|
FILE dir2/c
|
|
6
|
|
|
|
Special comments: "(removed)", "(copied from X)", "(renamed from X)"
|
|
|
|
$ newrepo
|
|
$ drawdag <<'EOS'
|
|
> C # C/X1 = (removed)
|
|
> | # C/C = (removed)
|
|
> |
|
|
> B # B/B = (removed)
|
|
> | # B/X1 = X\n1\n (renamed from X)
|
|
> | # B/Y1 = Y\n1\n (copied from Y)
|
|
> |
|
|
> | # A/A = (removed)
|
|
> A # A/X = X\n
|
|
> # A/Y = Y\n
|
|
> EOS
|
|
|
|
$ hg log -p -G -r 'all()' --config diff.git=1 -T '{desc}\n'
|
|
o C
|
|
│ diff --git a/X1 b/X1
|
|
│ deleted file mode 100644
|
|
│ --- a/X1
|
|
│ +++ /dev/null
|
|
│ @@ -1,2 +0,0 @@
|
|
│ -X
|
|
│ -1
|
|
│
|
|
o B
|
|
│ diff --git a/X b/X1
|
|
│ rename from X
|
|
│ rename to X1
|
|
│ --- a/X
|
|
│ +++ b/X1
|
|
│ @@ -1,1 +1,2 @@
|
|
│ X
|
|
│ +1
|
|
│ diff --git a/Y b/Y1
|
|
│ copy from Y
|
|
│ copy to Y1
|
|
│ --- a/Y
|
|
│ +++ b/Y1
|
|
│ @@ -1,1 +1,2 @@
|
|
│ Y
|
|
│ +1
|
|
│
|
|
o A
|
|
diff --git a/X b/X
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/X
|
|
@@ -0,0 +1,1 @@
|
|
+X
|
|
diff --git a/Y b/Y
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/Y
|
|
@@ -0,0 +1,1 @@
|
|
+Y
|
|
|
|
Special comments: "X has date 1 0"
|
|
|
|
$ newrepo
|
|
$ drawdag <<'EOS'
|
|
> B # B has date 2 0
|
|
> |
|
|
> A
|
|
> EOS
|
|
$ hg log -r 'all()' -T '{desc} {date}\n'
|
|
A 0.00
|
|
B 2.00
|
|
|
|
--no-bookmarks and --print:
|
|
|
|
$ newrepo
|
|
$ echo 'A' | hg debugdrawdag --no-bookmarks --print
|
|
426bada5c675 A
|
|
$ hg up 'desc(A)' -q
|
|
$ hg debugdrawdag --no-bookmarks --print << 'EOS'
|
|
> B
|
|
> |
|
|
> .
|
|
> EOS
|
|
426bada5c675 .
|
|
112478962961 B
|
|
$ hg bookmarks
|
|
no bookmarks set
|
|
|
|
Horizontal graph with ranges:
|
|
|
|
$ newrepo
|
|
$ hg debugdrawdag << 'EOS'
|
|
> A--S--D..G--Z
|
|
> EOS
|
|
$ hg log -Gr: -T '{desc}'
|
|
o Z
|
|
│
|
|
o G
|
|
│
|
|
o F
|
|
│
|
|
o E
|
|
│
|
|
o D
|
|
│
|
|
o S
|
|
│
|
|
o A
|
|
|