mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
7e9b8dd9e9
Summary: For Lua hooks, we needed to know whether to run the hook per file, or per changeset. Rust hooks know this implicitly, as they're built-in to the server. Stop having the tests set an unnecessary config Reviewed By: krallin Differential Revision: D22282799 fbshipit-source-id: c9f6f6325823d06d03341f04ecf7152999fcdbe7
167 lines
4.5 KiB
Raku
167 lines
4.5 KiB
Raku
# 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.
|
|
|
|
This is the test to cover tricky case in the discovery logic.
|
|
Previously Mononoke's known() wireproto method returned `true` for both public and
|
|
draft commits. The problem was in that it affects pushrebase. If Mononoke
|
|
returns true for a draft commit and client runs `hg push -r HASH --to BOOK`,
|
|
then hg client logic may decide to just move a bookmark instead of running the
|
|
actual pushrebase.
|
|
|
|
$ . "${TEST_FIXTURES}/library.sh"
|
|
|
|
setup configuration
|
|
$ INFINITEPUSH_ALLOW_WRITES=true setup_common_config
|
|
$ cd "$TESTTMP/mononoke-config"
|
|
|
|
$ cat >> repos/repo/server.toml <<CONFIG
|
|
> [[bookmarks]]
|
|
> name="master_bookmark"
|
|
> CONFIG
|
|
|
|
$ register_hook always_fail_changeset <(
|
|
> echo 'bypass_pushvar="BYPASS_REVIEW=true"'
|
|
> )
|
|
|
|
|
|
setup common configuration
|
|
$ cd $TESTTMP
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [ui]
|
|
> ssh="$DUMMYSSH"
|
|
> [extensions]
|
|
> amend=
|
|
> infinitepush=
|
|
> commitcloud=
|
|
> EOF
|
|
|
|
setup repo
|
|
$ hg init repo-hg
|
|
$ cd repo-hg
|
|
$ setup_hg_server
|
|
$ drawdag <<EOF
|
|
> C
|
|
> |
|
|
> B
|
|
> |
|
|
> A
|
|
> EOF
|
|
|
|
create master bookmark
|
|
|
|
$ hg bookmark master_bookmark -r tip
|
|
|
|
blobimport them into Mononoke storage and start Mononoke
|
|
$ cd ..
|
|
$ blobimport repo-hg/.hg repo
|
|
|
|
start mononoke
|
|
$ mononoke
|
|
$ wait_for_mononoke
|
|
|
|
Clone the repo
|
|
$ hgclone_treemanifest ssh://user@dummy/repo-hg repo2 --noupdate --config extensions.remotenames= -q
|
|
$ hgclone_treemanifest ssh://user@dummy/repo-hg repo3 --noupdate --config extensions.remotenames= -q
|
|
$ cd repo2
|
|
$ setup_hg_client
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase =
|
|
> remotenames =
|
|
> EOF
|
|
$ hg up -q 0
|
|
$ echo 1 > 1 && hg addremove -q
|
|
$ hg ci -m 'to push'
|
|
|
|
Unsuccessful push creates a draft commit on the server
|
|
$ hgmn push -r . --to master_bookmark
|
|
pushing rev 812eca0823f9 to destination ssh://user@dummy/repo bookmark master_bookmark
|
|
searching for changes
|
|
remote: Command failed
|
|
remote: Error:
|
|
remote: hooks failed:
|
|
remote: always_fail_changeset for 812eca0823f97743f8d85cdef5cf338b54cebb01: This hook always fails
|
|
remote:
|
|
remote: Root cause:
|
|
remote: hooks failed:
|
|
remote: always_fail_changeset for 812eca0823f97743f8d85cdef5cf338b54cebb01: This hook always fails
|
|
remote:
|
|
remote: Debug context:
|
|
remote: "hooks failed:\nalways_fail_changeset for 812eca0823f97743f8d85cdef5cf338b54cebb01: This hook always fails"
|
|
abort: stream ended unexpectedly (got 0 bytes, expected 4)
|
|
[255]
|
|
|
|
In order to hit an edge case the master on the server needs to point to another commit.
|
|
Let's make a push
|
|
$ cd ../repo3
|
|
$ setup_hg_client
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> pushrebase =
|
|
> remotenames =
|
|
> [remotenames]
|
|
> EOF
|
|
$ hg up -q 0
|
|
$ echo 2 > 2 && hg addremove -q
|
|
$ hg ci -m 'to push2'
|
|
$ hgmn push -r . --to master_bookmark --pushvar BYPASS_REVIEW=true -q
|
|
|
|
Now let's push the same commit again but with a bypass. It should pushrebase,
|
|
not move a bookmark
|
|
$ cd ../repo2
|
|
$ hgmn push -r . --to master_bookmark --pushvar BYPASS_REVIEW=true -q
|
|
$ hgmn up -q master_bookmark
|
|
$ log
|
|
@ to push [public;rev=5;a6205c464622] default/master_bookmark
|
|
|
|
|
o to push2 [public;rev=4;854b7c3bdd1f]
|
|
|
|
|
| o to push [draft;rev=3;812eca0823f9]
|
|
| |
|
|
o | C [public;rev=2;26805aba1e60]
|
|
| |
|
|
o | B [public;rev=1;112478962961]
|
|
|/
|
|
o A [public;rev=0;426bada5c675]
|
|
$
|
|
|
|
The same procedure, but with commit cloud commit
|
|
$ hg up -q 0
|
|
$ echo commitcloud > commitcloud && hg addremove -q
|
|
$ hg ci -m commitcloud
|
|
$ hgmn cloud backup -q
|
|
|
|
Move master again
|
|
$ cd ../repo3
|
|
$ hg up -q 0
|
|
$ echo 3 > 3 && hg addremove -q
|
|
$ hg ci -m 'to push3'
|
|
$ hgmn push -r . --to master_bookmark --pushvar BYPASS_REVIEW=true -q
|
|
|
|
Now let's push commit cloud commit. Again, it should do pushrebase
|
|
$ cd ../repo2
|
|
$ hgmn push -r . --to master_bookmark --pushvar BYPASS_REVIEW=true -q
|
|
$ hgmn up -q master_bookmark
|
|
$ log
|
|
@ commitcloud [public;rev=8;3308f3bd8048] default/master_bookmark
|
|
|
|
|
o to push3 [public;rev=7;c3f020572849]
|
|
|
|
|
| o commitcloud [draft;rev=6;17f29bea0858]
|
|
| |
|
|
o | to push [public;rev=5;a6205c464622]
|
|
| |
|
|
o | to push2 [public;rev=4;854b7c3bdd1f]
|
|
| |
|
|
| | o to push [draft;rev=3;812eca0823f9]
|
|
| |/
|
|
o | C [public;rev=2;26805aba1e60]
|
|
| |
|
|
o | B [public;rev=1;112478962961]
|
|
|/
|
|
o A [public;rev=0;426bada5c675]
|
|
$
|