mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
ba00990cdc
Summary: Created this diff by running: ``` find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#update --clean#goto --clean#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#update --clean#goto --clean#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#update --continue#goto --continue#g' find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#update --continue#goto --continue#g' find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#prog@ update#prog@ goto#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's# hg update # hg goto #g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#hg update -C#hg goto -C#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's# hg update$# hg goto#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's# update HASH# goto HASH#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#hg update 1#hg goto 1#g' find eden/scm/tests -name \*.t | xargs sed -i -e "s#'hg update'#'hg goto'#g" find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#:prog:`update`#:prog:`goto`#g' find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#:prog:`update .::`#:prog:`goto .::`#g' sed -i -e 's#commit or update#commit or goto#' eden/integration/hg/update_test.py arc f ``` Though then I had to manually update `eden/integration/hg/update_test.py` to use `assertRegex()` instead of `assertEqual()`, but as noted, that is a temporary issue due to how we run that test for EdenFS for Windows internally. Fixes https://github.com/facebook/sapling/issues/149 Fixes https://github.com/facebook/sapling/issues/293 Reviewed By: zzl0, yancouto Differential Revision: D41859668 fbshipit-source-id: 3bdf4e342fc1a751335960a3216651a5ce35225f
426 lines
8.8 KiB
Perl
426 lines
8.8 KiB
Perl
#chg-compatible
|
|
#debugruntest-compatible
|
|
$ setconfig format.use-segmented-changelog=true
|
|
$ setconfig experimental.allowfilepeer=True
|
|
|
|
$ 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 goto -q 'desc(Y)'
|
|
$ hg pull -B other
|
|
pulling from ssh://user@dummy/server
|
|
$ 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
|
|
│ │
|
|
@ │ Y: public remote/other
|
|
│ │
|
|
│ o W: public remote/master
|
|
│ │
|
|
│ 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
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ 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
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
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
|
|
removing bookmarks:
|
|
n-bookmark: d3adf05d12fa
|
|
n-bookmark2: d3adf05d12fa
|
|
o-bookmark: 7f49e3f0c6cd
|
|
adding heads:
|
|
9c4fc22fed7c M
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ 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
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
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
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ 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
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
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
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ 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
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
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
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft b-bookmark
|
|
│
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
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
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft
|
|
│
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
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
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft
|
|
│
|
|
│ o M: draft
|
|
│ │
|
|
o │ A: draft
|
|
│ │
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|
|
Removing a lone commit just removes that head
|
|
$ gensmartlogdata
|
|
$ hg cloud hide $M
|
|
removing heads:
|
|
9c4fc22fed7c M
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft
|
|
│
|
|
o A: draft
|
|
│
|
|
│ @ Y: public remote/other
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|
|
Removing a remote bookmark works
|
|
$ gensmartlogdata
|
|
$ hg cloud hide --remotebookmark remote/other
|
|
removing remote bookmarks:
|
|
remote/other: 1cab361770de
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ showgraph
|
|
o F: draft
|
|
│
|
|
o E: draft
|
|
│
|
|
o B: draft
|
|
│
|
|
o A: draft
|
|
│
|
|
│ @ Y: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|
|
BUG! Commit Y is now draft - it should've been hidden. (Actually it will disappear if we update to another commit)
|
|
|
|
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
|
|
│
|
|
│ @ Y: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|
|
$ gensmartlogdata
|
|
$ hg cloud hide $H
|
|
removing heads:
|
|
28730d10073d H
|
|
adding heads:
|
|
080f94b3ed7f F
|
|
e59c81d53e06 G
|
|
commitcloud: synchronizing 'server' with 'user/test/default'
|
|
commitcloud: commits synchronized
|
|
finished in * (glob)
|
|
$ showgraph
|
|
o G: draft
|
|
│
|
|
│ o F: draft
|
|
│ │
|
|
│ o E: draft
|
|
│ │
|
|
│ o B: draft
|
|
├─╯
|
|
o A: draft
|
|
│
|
|
│ @ Y: draft
|
|
│ │
|
|
o │ W: public remote/master
|
|
│ │
|
|
o │ X: public
|
|
├─╯
|
|
o Z: public
|
|
|