mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
235c9a5cd9
Summary:
In getbundle, we compute the set of new draft commit ids. This is used to
include tree and file data in the bundle when draft commits are fully hydrated,
and will also be used to compute the set of mutation information we will
return.
Currently this calculation only computes the non-common draft heads. It
excludes all of the ancestors, which should be included. This is because it
re-uses the prepare_phases code, which doesn't quite do what we want.
Instead, separate out these calculations into two functions:
* `find_new_draft_commits_and_public_roots` finds the draft heads
and their ancestors that are not in the common set, as well as the
public roots the draft commits are based on.
* `find_phase_heads` finds and generates phase head information for
the public heads, draft heads, and the nearest public ancestors of the
draft heads.
Reviewed By: StanislavGlebik
Differential Revision: D20871337
fbshipit-source-id: 2f5804253b8b4f16b649d737f158fce2a5102002
190 lines
4.6 KiB
Perl
190 lines
4.6 KiB
Perl
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License found in the LICENSE file in the root
|
|
# directory of this source tree.
|
|
|
|
$ . "${TEST_FIXTURES}/library.sh"
|
|
|
|
$ function graphlog() {
|
|
> hg log -G -T "{node|short} {phase} '{desc}' {bookmarks} {remotebookmarks}" "$@"
|
|
> }
|
|
|
|
setup configuration
|
|
$ INFINITEPUSH_NAMESPACE_REGEX='^scratch/.+$' setup_common_config
|
|
$ cd $TESTTMP
|
|
|
|
setup common configuration for these tests
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> amend=
|
|
> infinitepush=
|
|
> commitcloud=
|
|
> EOF
|
|
|
|
setup repo
|
|
|
|
$ hginit_treemanifest repo-hg
|
|
$ cd repo-hg
|
|
$ touch base
|
|
$ hg commit -Aqm base
|
|
$ echo 1 > file
|
|
$ hg commit -Aqm public1
|
|
|
|
create master bookmark
|
|
$ hg bookmark master_bookmark -r tip
|
|
|
|
$ cd $TESTTMP
|
|
|
|
setup repo-push and repo-pull
|
|
$ hgclone_treemanifest ssh://user@dummy/repo-hg repo-push --noupdate --config extensions.remotenames=
|
|
$ hgclone_treemanifest ssh://user@dummy/repo-hg repo-pull --noupdate --config extensions.remotenames=
|
|
|
|
blobimport
|
|
|
|
$ blobimport repo-hg/.hg repo
|
|
|
|
start mononoke
|
|
|
|
$ mononoke
|
|
$ wait_for_mononoke
|
|
|
|
push some draft commits
|
|
$ cd repo-push
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> remotenames=
|
|
> [infinitepush]
|
|
> server=False
|
|
> branchpattern=re:scratch/.+
|
|
> EOF
|
|
$ hg up tip
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo 1 > newfile
|
|
$ hg addremove -q
|
|
$ hg commit -m draft1
|
|
$ echo 2 >> newfile
|
|
$ hg commit -m draft2
|
|
$ hgmn push ssh://user@dummy/repo -r . --bundle-store --allow-anon
|
|
pushing to ssh://user@dummy/repo
|
|
searching for changes
|
|
|
|
$ graphlog
|
|
@ fc8f2fba9ac9 draft 'draft2'
|
|
|
|
|
o 48337b947baa draft 'draft1'
|
|
|
|
|
o f2f073d106b0 public 'public1' default/master_bookmark
|
|
|
|
|
o df4f53cec30a public 'base'
|
|
|
|
|
|
pull these draft commits
|
|
$ cd "$TESTTMP/repo-pull"
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> remotenames=
|
|
> [infinitepush]
|
|
> server=False
|
|
> branchpattern=re:scratch/.+
|
|
> EOF
|
|
$ hgmn pull -r fc8f2fba9ac9
|
|
pulling from ssh://user@dummy/repo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 0 changes to 0 files
|
|
|
|
$ graphlog
|
|
o fc8f2fba9ac9 draft 'draft2'
|
|
|
|
|
o 48337b947baa draft 'draft1'
|
|
|
|
|
o f2f073d106b0 public 'public1' default/master_bookmark
|
|
|
|
|
o df4f53cec30a public 'base'
|
|
|
|
|
|
land the first draft commit
|
|
$ cd "$TESTTMP/repo-push"
|
|
$ hgmn push -r 48337b947baa --to master_bookmark
|
|
pushing rev 48337b947baa to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
updating bookmark master_bookmark
|
|
|
|
put a new draft commit on top
|
|
$ echo 3 >> newfile
|
|
$ hg commit -m draft3
|
|
$ hgmn push ssh://user@dummy/repo -r . --bundle-store --allow-anon
|
|
pushing to ssh://user@dummy/repo
|
|
searching for changes
|
|
|
|
add a new public branch
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
$ echo 1 > branchfile
|
|
$ hg commit -Aqm branch1
|
|
$ hgmn push -r . --to branch_bookmark --create
|
|
pushing rev eaf82af99127 to destination ssh://user@dummy/repo bookmark branch_bookmark
|
|
searching for changes
|
|
exporting bookmark branch_bookmark
|
|
|
|
add some draft commits to the branch
|
|
$ echo 2 >> branchfile
|
|
$ hg commit -Aqm branch2
|
|
$ echo 3 >> branchfile
|
|
$ hg commit -Aqm branch3
|
|
$ hgmn push ssh://user@dummy/repo -r . --bundle-store --allow-anon
|
|
pushing to ssh://user@dummy/repo
|
|
searching for changes
|
|
|
|
$ graphlog
|
|
@ 3e86159717e8 draft 'branch3'
|
|
|
|
|
o 0bf099b792a8 draft 'branch2'
|
|
|
|
|
o eaf82af99127 public 'branch1' default/branch_bookmark
|
|
|
|
|
| o 09b17e5ff090 draft 'draft3'
|
|
| |
|
|
| o fc8f2fba9ac9 draft 'draft2'
|
|
| |
|
|
| o 48337b947baa public 'draft1' default/master_bookmark
|
|
| |
|
|
| o f2f073d106b0 public 'public1'
|
|
|/
|
|
o df4f53cec30a public 'base'
|
|
|
|
|
|
pull all of these commits
|
|
$ cd "$TESTTMP/repo-pull"
|
|
$ hgmn pull -r 09b17e5ff090 -r 3e86159717e8
|
|
pulling from ssh://user@dummy/repo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 4 changesets with 0 changes to 0 files
|
|
|
|
the server will have returned phaseheads information that makes 'draft1' and
|
|
'branch1' public, and everything else draft
|
|
$ graphlog
|
|
o 09b17e5ff090 draft 'draft3'
|
|
|
|
|
| o 3e86159717e8 draft 'branch3'
|
|
| |
|
|
| o 0bf099b792a8 draft 'branch2'
|
|
| |
|
|
| o eaf82af99127 public 'branch1' default/branch_bookmark
|
|
| |
|
|
o | fc8f2fba9ac9 draft 'draft2'
|
|
| |
|
|
o | 48337b947baa public 'draft1' default/master_bookmark
|
|
| |
|
|
o | f2f073d106b0 public 'public1'
|
|
|/
|
|
o df4f53cec30a public 'base'
|
|
|
|
|