mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
e0bdff5188
Summary: Refactor control of movement of scratch bookmarks to a new `bookmark_movement` crate that will contain all bookmark movement controls. Reviewed By: krallin Differential Revision: D22844830 fbshipit-source-id: 56d25ad45a9328eaa079c13466b4b802f033d1dd
126 lines
3.4 KiB
Perl
126 lines
3.4 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"
|
|
|
|
setup configuration
|
|
$ INFINITEPUSH_ALLOW_WRITES=true setup_common_config
|
|
$ cat > $TESTTMP/mononoke_tunables.json <<EOF
|
|
> {
|
|
> "killswitches": {
|
|
> "mutation_advertise_for_infinitepush": true,
|
|
> "mutation_accept_for_infinitepush": true,
|
|
> "mutation_generate_for_draft": true
|
|
> }
|
|
> }
|
|
> EOF
|
|
$ 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 a && hg addremove && hg ci -q -ma
|
|
adding a
|
|
$ hg log -T '{short(node)}\n'
|
|
3903775176ed
|
|
|
|
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
|
|
$ hgclone_treemanifest ssh://user@dummy/repo-hg repo-pull --noupdate
|
|
|
|
blobimport
|
|
|
|
$ blobimport repo-hg/.hg repo
|
|
|
|
start mononoke
|
|
|
|
$ mononoke
|
|
$ wait_for_mononoke
|
|
|
|
|
|
Do infinitepush (aka commit cloud) push
|
|
$ cd repo-push
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> remotenames=
|
|
> [infinitepush]
|
|
> server=False
|
|
> branchpattern=re:scratch/.+
|
|
> EOF
|
|
$ hg up tip
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo new > newfile
|
|
$ hg addremove -q
|
|
$ hg ci -m new
|
|
$ hgmn push ssh://user@dummy/repo -r . --to "scratch/123" --create
|
|
pushing to ssh://user@dummy/repo
|
|
searching for changes
|
|
remote: Command failed
|
|
remote: Error:
|
|
remote: While doing an infinitepush
|
|
remote:
|
|
remote: Root cause:
|
|
remote: Invalid scratch bookmark: scratch/123 (scratch bookmarks are not enabled for this repo)
|
|
remote:
|
|
remote: Caused by:
|
|
remote: Failed to create scratch bookmark
|
|
remote: Caused by:
|
|
remote: Invalid scratch bookmark: scratch/123 (scratch bookmarks are not enabled for this repo)
|
|
remote:
|
|
remote: Debug context:
|
|
remote: Error {
|
|
remote: context: "While doing an infinitepush",
|
|
remote: source: Error {
|
|
remote: context: "Failed to create scratch bookmark",
|
|
remote: source: ScratchBookmarksDisabled {
|
|
remote: bookmark: BookmarkName {
|
|
remote: bookmark: "scratch/123",
|
|
remote: },
|
|
remote: },
|
|
remote: },
|
|
remote: }
|
|
abort: stream ended unexpectedly (got 0 bytes, expected 4)
|
|
[255]
|
|
|
|
$ tglogp
|
|
@ 1: 47da8b81097c draft 'new'
|
|
|
|
|
o 0: 3903775176ed draft 'a' master_bookmark
|
|
|
|
Bookmark push should have been ignored
|
|
$ sqlite3 "$TESTTMP/monsql/sqlite_dbs" 'SELECT name, hg_kind, HEX(changeset_id) FROM bookmarks;'
|
|
master_bookmark|pull_default|E10EC6CD13B1CBCFE2384F64BD37FC71B4BF9CFE21487D2EAF5064C1B3C0B793
|
|
Commit should have been accepted
|
|
$ cd ../repo-pull
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> remotenames=
|
|
> [infinitepush]
|
|
> server=False
|
|
> branchpattern=re:scratch/.+
|
|
> EOF
|
|
$ hgmn pull -r 47da8b81097c5534f3eb7947a8764dd323cffe3d
|
|
pulling from ssh://user@dummy/repo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files
|