mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
4791303cd2
Summary: Reviving commits is an essential feature. So move it to core. Most test changes are caused by the auto-date-bump behavior, which is needed to revive commits automatically. Note the existing code is not fully ready for the change. For example, `precursors.get(node)`, `successors.get(node)` do not filter out markers that are suppressed. For example, some code paths treat node as obsoleted if `precursors.get(node)` is non-empty. That's no longer true. markbt's planned visibility change might clean up this area a bit. Regarding on tests, most changes are because of the "auto bump date" feature. The graphlog change in `test-obsmarker-template.t` is because it creates a cycle, which behaves differently in the new code. Half of obsmarker exchange tests break. Given the fact that we do not use and will probably rewrite the exchange algorithm, related tests are deleted, including `test-obsolete-distributed.t`. Reviewed By: DurhamG Differential Revision: D9236661 fbshipit-source-id: 85b983f8bd46dece908c05f56bea2abbc8ffbaf6
331 lines
5.3 KiB
Perl
331 lines
5.3 KiB
Perl
$ cat >> $HGRCPATH<<EOF
|
|
> [extensions]
|
|
> [experimental]
|
|
> evolution=true
|
|
> EOF
|
|
|
|
$ 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 '{rev} {desc} ({tags})'
|
|
o 3 d (d tip)
|
|
|
|
|
| o 2 c (c)
|
|
|/
|
|
o 1 b (b)
|
|
|
|
|
o 0 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'
|
|
> o foo
|
|
> |\
|
|
> +---o bar
|
|
> | | |
|
|
> | o | baz
|
|
> | /
|
|
> +---o d
|
|
> | |
|
|
> +---o c
|
|
> | |
|
|
> o | b
|
|
> |/
|
|
> o a
|
|
> EOS
|
|
|
|
$ hg log -G -T '{desc}'
|
|
o foo
|
|
|\
|
|
| | o d
|
|
| |/
|
|
| | o c
|
|
| |/
|
|
| | o bar
|
|
| |/|
|
|
| o | b
|
|
| |/
|
|
o / baz
|
|
/
|
|
o a
|
|
|
|
$ reinit
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> o foo
|
|
> |\
|
|
> | | o d
|
|
> | |/
|
|
> | | o c
|
|
> | |/
|
|
> | | o bar
|
|
> | |/|
|
|
> | o | b
|
|
> | |/
|
|
> o / baz
|
|
> /
|
|
> o a
|
|
> 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 <<'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: C D B
|
|
[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
|
|
> |
|
|
> I D C F # split: B -> E, F, G
|
|
> \ \| | # replace: C -> D -> H
|
|
> H B E # prune: F, I
|
|
> \|/
|
|
> A
|
|
> EOS
|
|
|
|
$ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}'
|
|
o G 711f53bbef0bebd12eb6f0511d5e2e998b984846
|
|
|
|
|
x F 64a8289d249234b9886244d379f15e6b650b28e3
|
|
|
|
|
o E 7fb047a69f220c21711122dfd94305a9efb60cba
|
|
|
|
|
| x D be0ef73c17ade3fc89dc41701eb9fc3a91b58282
|
|
| |
|
|
| | x C 26805aba1e600a82e93661149f2313866a221a7b
|
|
| |/
|
|
| x B 112478962961147124edd43549aedd1a335e44bf
|
|
|/
|
|
| x I 58e6b987bf7045fcd9c54f496396ca1d1fc81047
|
|
| |
|
|
| o H 575c4b5ec114d64b681d33f8792853568bfb2b2c
|
|
|/
|
|
o A 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
|
|
|
|
$ hg debugobsolete
|
|
112478962961147124edd43549aedd1a335e44bf 7fb047a69f220c21711122dfd94305a9efb60cba 64a8289d249234b9886244d379f15e6b650b28e3 711f53bbef0bebd12eb6f0511d5e2e998b984846 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'split', 'user': 'test'}
|
|
26805aba1e600a82e93661149f2313866a221a7b be0ef73c17ade3fc89dc41701eb9fc3a91b58282 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
|
|
be0ef73c17ade3fc89dc41701eb9fc3a91b58282 575c4b5ec114d64b681d33f8792853568bfb2b2c 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'replace', 'user': 'test'}
|
|
64a8289d249234b9886244d379f15e6b650b28e3 0 {7fb047a69f220c21711122dfd94305a9efb60cba} (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'prune', 'user': 'test'}
|
|
58e6b987bf7045fcd9c54f496396ca1d1fc81047 0 {575c4b5ec114d64b681d33f8792853568bfb2b2c} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'prune', 'user': 'test'}
|
|
|
|
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
|
|
|