mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 06:47:41 +03:00
d24a5c5035
Summary: This is part of removing filepeer. I also enabled treemanifest and modernclient (i.e. lazy changelog) on a few tests. Reviewed By: quark-zju Differential Revision: D31580599 fbshipit-source-id: ca3da5fe2a9e9903092e30b4eb033df7e98bd2f6
203 lines
3.5 KiB
Perl
203 lines
3.5 KiB
Perl
#chg-compatible
|
|
'narrow-heads' requires remotenames and visibility
|
|
|
|
$ configure dummyssh modernclient
|
|
$ enable remotenames amend
|
|
$ setconfig experimental.narrow-heads=true visibility.enabled=true mutation.record=true mutation.enabled=true mutation.date="0 0" experimental.evolution= remotenames.rename.default=remote
|
|
$ setconfig 'infinitepush.branchpattern=re:(^hack/.*)'
|
|
$ shorttraceback
|
|
|
|
Prepare the server repo
|
|
|
|
$ newclientrepo server
|
|
$ drawdag << 'EOS'
|
|
> B
|
|
> |
|
|
> A
|
|
> EOS
|
|
|
|
$ hg push -q -r $B --to fake_master --create
|
|
$ hg push -q -r $A --to stable --create
|
|
|
|
Prepare the client repo
|
|
|
|
$ newclientrepo client test:server_server fake_master stable
|
|
|
|
Verify the commits
|
|
|
|
$ hg bookmarks --list-subscriptions
|
|
remote/fake_master 112478962961
|
|
remote/stable 426bada5c675
|
|
|
|
Revsets after the initial clone
|
|
|
|
$ hg log -Gr 'all()' -T '{desc} {remotenames} {phase}'
|
|
@ B remote/fake_master public
|
|
│
|
|
o A remote/stable public
|
|
|
|
$ hg log -Gr 'head()' -T '{desc} {remotenames}'
|
|
@ B remote/fake_master
|
|
│
|
|
~
|
|
|
|
Make some client-side commits based on A
|
|
|
|
$ drawdag << 'EOS'
|
|
> D
|
|
> |
|
|
> C
|
|
> |
|
|
> A
|
|
> EOS
|
|
$ hg up -r $D -q
|
|
$ hg up -r $C -q
|
|
$ hg metaedit -m C2
|
|
|
|
Revsets after the local edits
|
|
|
|
head() should include one 'D' commit, and one 'B'
|
|
|
|
$ hg log -Gr 'head()' -T '{desc}'
|
|
o D
|
|
│
|
|
~
|
|
|
|
o B
|
|
│
|
|
~
|
|
|
|
all() should not show C
|
|
Commits under ::fake_master should be public
|
|
|
|
$ hg log -Gr 'all()' -T '{desc} {phase} {remotebookmarks}'
|
|
o D draft
|
|
│
|
|
@ C2 draft
|
|
│
|
|
│ o B public remote/fake_master
|
|
├─╯
|
|
o A public remote/stable
|
|
|
|
draft() should not show C
|
|
|
|
$ hg log -Gr 'draft()' -T '{desc}'
|
|
o D
|
|
│
|
|
@ C2
|
|
│
|
|
~
|
|
not public() should not show C
|
|
|
|
$ hg log -Gr 'not public()' -T '{desc}'
|
|
o D
|
|
│
|
|
@ C2
|
|
│
|
|
~
|
|
A:: should not show C
|
|
|
|
$ hg log -Gr "$A::" -T '{desc}'
|
|
o D
|
|
│
|
|
@ C2
|
|
│
|
|
│ o B
|
|
├─╯
|
|
o A
|
|
|
|
children(A) should not show C
|
|
|
|
$ hg log -Gr "children($A)" -T '{desc}'
|
|
@ C2
|
|
│
|
|
~
|
|
|
|
o B
|
|
│
|
|
~
|
|
|
|
predecessors(C2) should include C
|
|
|
|
$ hg log -Gr "predecessors(desc('C2'))" -T '{desc}'
|
|
@ C2
|
|
│
|
|
~
|
|
|
|
x C
|
|
│
|
|
~
|
|
|
|
Using commit hash to access C should be allowed
|
|
|
|
$ hg log -r $C -T '{desc}'
|
|
C (no-eol)
|
|
|
|
Phases
|
|
|
|
$ hg phase --public $D
|
|
(phases are now managed by remotenames and heads; manully editing phases is a no-op)
|
|
$ hg phase $D
|
|
e7b3f00ed42ef8977173765eccff8a861809549b: secret
|
|
|
|
$ hg phase --force --draft $A
|
|
(phases are now managed by remotenames and heads; manully editing phases is a no-op)
|
|
$ hg phase $A
|
|
426bada5c67598ca65036d57d9e4b64b0c1ce7a0: public
|
|
|
|
Rebase
|
|
|
|
$ newclientrepo repo2
|
|
$ enable rebase amend
|
|
$ drawdag << 'EOS'
|
|
> B C
|
|
> |/
|
|
> | D
|
|
> |/
|
|
> A
|
|
> EOS
|
|
$ hg debugremotebookmark fake_master $B
|
|
$ hg hide $D -q
|
|
$ hg rebase -s $D -d $B
|
|
"source" revision set is invisible - nothing to rebase
|
|
(hint: use 'hg unhide' to make commits visible first)
|
|
|
|
Visible heads got out of sync with "." or bookmarks
|
|
|
|
$ newclientrepo repo3
|
|
$ drawdag << 'EOS'
|
|
> M B
|
|
> |/
|
|
> | C
|
|
> |/
|
|
> | D
|
|
> |/
|
|
> A
|
|
> EOS
|
|
$ hg debugremotebookmark fake_master $M
|
|
$ hg hide -q $B+$C+$D
|
|
$ hg up -q $C
|
|
$ hg bookmark -r $D book-D
|
|
|
|
(Both C and D should show up since they are working parents and bookmarked)
|
|
$ hg log -Gr 'all()' -T '{desc} {phase}'
|
|
o M public
|
|
│
|
|
│ o D draft
|
|
├─╯
|
|
│ @ C draft
|
|
├─╯
|
|
o A public
|
|
|
|
(Both C and D should show up here, too)
|
|
$ hg log -Gr 'draft()' -T '{desc} {phase}'
|
|
o D draft
|
|
│
|
|
~
|
|
|
|
@ C draft
|
|
│
|
|
~
|
|
|
|
|