mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
416 lines
7.6 KiB
Perl
416 lines
7.6 KiB
Perl
#chg-compatible
|
|
|
|
$ configure modern
|
|
|
|
$ showgraph() {
|
|
> hg log -G -T "{desc}: {phase} {bookmarks} {remotenames}" -r "all()"
|
|
> }
|
|
|
|
hg cloud hide uses the smartlog data from the cloud service. We must generate this
|
|
manually.
|
|
$ gensmartlogdata() {
|
|
> echo '{ "smartlog": { "nodes": [' > $TESTTMP/usersmartlogdata
|
|
> hg log -r "sort(0 + draft() + parents(draft()))" \
|
|
> -T '{ifeq(rev,0,"",",")}\{"node": "{node}", "phase": "{phase}", "author": "test", "date": "{rev}", "message": "{desc}", "parents": [{join(parents % "\"{node}\"", ", ")}], "bookmarks": [{join(bookmarks % "\"{bookmark}\"", ", ")}]}\n' \
|
|
> >> $TESTTMP/usersmartlogdata
|
|
> echo "]}}" >> $TESTTMP/usersmartlogdata
|
|
> }
|
|
|
|
$ newserver server
|
|
$ cd $TESTTMP/server
|
|
$ drawdag <<EOS
|
|
> W
|
|
> |
|
|
> X Y
|
|
> |/
|
|
> Z
|
|
> EOS
|
|
$ hg bookmark -r $W master
|
|
$ hg bookmark -r $Y other
|
|
|
|
$ cd $TESTTMP
|
|
$ clone server client1
|
|
$ cd client1
|
|
$ hg update -q 'desc(Y)'
|
|
$ hg pull -B other
|
|
pulling from ssh://user@dummy/server
|
|
no changes found
|
|
$ hg up -qC other
|
|
|
|
$ drawdag <<EOS
|
|
> S
|
|
> |
|
|
> F R
|
|
> | O |
|
|
> C D E | Q
|
|
> \|/ N |
|
|
> B | P
|
|
> | M |
|
|
> A | $Y
|
|
> | $Y
|
|
> $W
|
|
> EOS
|
|
$ hg book -r $D d-bookmark
|
|
$ hg book -r $D d-bookmark2
|
|
$ hg book -r $D d-bookmark3
|
|
$ hg book -r $X x-bookmark
|
|
$ hg book -r $N n-bookmark
|
|
$ hg book -r $N n-bookmark2
|
|
$ hg book -r $O o-bookmark
|
|
$ hg book -r $B b-bookmark
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o S: draft
|
|
│
|
|
│ o F: draft
|
|
│ │
|
|
o │ R: draft
|
|
│ │
|
|
│ │ o O: draft o-bookmark
|
|
│ │ │
|
|
│ o │ E: draft
|
|
│ │ │
|
|
│ │ │ o D: draft d-bookmark d-bookmark2 d-bookmark3
|
|
│ ├───╯
|
|
│ │ │ o C: draft
|
|
│ ├───╯
|
|
o │ │ Q: draft
|
|
│ │ │
|
|
│ │ o N: draft n-bookmark n-bookmark2
|
|
│ │ │
|
|
│ o │ B: draft b-bookmark
|
|
│ │ │
|
|
o │ │ P: draft
|
|
│ │ │
|
|
│ │ o M: draft
|
|
├───╯
|
|
│ o A: draft
|
|
│ │
|
|
│ o W: public remote/master
|
|
│ │
|
|
@ │ Y: public remote/other
|
|
│ │
|
|
│ o X: public x-bookmark
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
Remove by hash with two related commits removes both of them
|
|
$ gensmartlogdata
|
|
$ hg cloud hide $P $R
|
|
removing heads:
|
|
0d5fa5021fb8 S
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
│ o O: draft o-bookmark
|
|
│ │
|
|
o │ E: draft
|
|
│ │
|
|
│ │ o D: draft d-bookmark d-bookmark2 d-bookmark3
|
|
├───╯
|
|
│ │ o C: draft
|
|
├───╯
|
|
│ o N: draft n-bookmark n-bookmark2
|
|
│ │
|
|
o │ B: draft b-bookmark
|
|
│ │
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ X: public x-bookmark
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
Remove by hash removes commit, all descendants and their bookmarks
|
|
$ gensmartlogdata
|
|
$ hg cloud hide $N
|
|
removing heads:
|
|
7f49e3f0c6cd O
|
|
adding heads:
|
|
9c4fc22fed7c M
|
|
removing bookmarks:
|
|
n-bookmark: d3adf05d12fa
|
|
n-bookmark2: d3adf05d12fa
|
|
o-bookmark: 7f49e3f0c6cd
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
│ o D: draft d-bookmark d-bookmark2 d-bookmark3
|
|
├─╯
|
|
│ o C: draft
|
|
├─╯
|
|
o B: draft b-bookmark
|
|
│
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ X: public x-bookmark
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
Remove when other heads keep ancestors alive, removing it just removes the head
|
|
$ gensmartlogdata
|
|
$ hg cloud hide $C
|
|
removing heads:
|
|
f6a18bc998c9 C
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
│ o D: draft d-bookmark d-bookmark2 d-bookmark3
|
|
├─╯
|
|
o B: draft b-bookmark
|
|
│
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ X: public x-bookmark
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
Remove by bookmark leaves commits alone if there are other bookmarks
|
|
$ gensmartlogdata
|
|
$ hg cloud hide -B d-bookmark
|
|
removing bookmarks:
|
|
d-bookmark: fa9d7a2f38d1
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
│ o D: draft d-bookmark2 d-bookmark3
|
|
├─╯
|
|
o B: draft b-bookmark
|
|
│
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ X: public x-bookmark
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
But removing all of the bookmarks pointing to a head removes the head
|
|
$ gensmartlogdata
|
|
$ hg cloud hide -B "re:d-bookmark.*"
|
|
removing heads:
|
|
fa9d7a2f38d1 D
|
|
removing bookmarks:
|
|
d-bookmark2: fa9d7a2f38d1
|
|
d-bookmark3: fa9d7a2f38d1
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft b-bookmark
|
|
│
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ X: public x-bookmark
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
Removing a bookmark in the stack doesn't hide the commit
|
|
$ gensmartlogdata
|
|
$ hg cloud hide -B b-bookmark
|
|
removing bookmarks:
|
|
b-bookmark: 9272e7e427bf
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft
|
|
│
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ X: public x-bookmark
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
Removing a bookmark on a public commit just removes it
|
|
$ gensmartlogdata
|
|
$ hg cloud hide -B x-bookmark
|
|
removing bookmarks:
|
|
x-bookmark: 8a0aebad5927
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft
|
|
│
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
Removing a lone commit just removes that head
|
|
$ gensmartlogdata
|
|
$ hg cloud hide $M
|
|
removing heads:
|
|
9c4fc22fed7c M
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft
|
|
│
|
|
o A: draft
|
|
│
|
|
o W: public remote/master
|
|
│
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
Removing a remote bookmark works
|
|
$ gensmartlogdata
|
|
$ hg cloud hide --remotebookmark remote/other
|
|
removing remote bookmarks:
|
|
remote/other: 1cab361770de
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft
|
|
│
|
|
o A: draft
|
|
│
|
|
o W: public remote/master
|
|
│
|
|
│ @ Y: draft
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
BUG! Commit Y is now draft - it should've been hidden
|
|
|
|
Merge commits can be removed
|
|
$ drawdag <<EOS
|
|
> H H
|
|
> | |
|
|
> | G
|
|
> | |
|
|
> | $A
|
|
> |
|
|
> $F
|
|
> EOS
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o H: draft
|
|
├─╮
|
|
│ o G: draft
|
|
│ │
|
|
o │ F: draft
|
|
│ │
|
|
o │ E: draft
|
|
│ │
|
|
o │ B: draft
|
|
├─╯
|
|
o A: draft
|
|
│
|
|
o W: public remote/master
|
|
│
|
|
│ @ Y: draft
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|
|
|
|
$ gensmartlogdata
|
|
$ hg cloud hide $H
|
|
removing heads:
|
|
28730d10073d H
|
|
adding heads:
|
|
080f94b3ed7f F
|
|
e59c81d53e06 G
|
|
$ hg cloud sync -q
|
|
$ showgraph
|
|
o G: draft
|
|
│
|
|
│ o F: draft
|
|
│ │
|
|
│ o E: draft
|
|
│ │
|
|
│ o B: draft
|
|
├─╯
|
|
o A: draft
|
|
│
|
|
o W: public remote/master
|
|
│
|
|
│ @ Y: draft
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|
|
|