mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
d02477d831
Summary: Some scripts are parsing all hg outputs. The remote stderr output could contain random noise that break the scripts. Therefore let's forward remote stderr to local stderr, instead of local stdout. Reviewed By: DurhamG Differential Revision: D8514952 fbshipit-source-id: 2f205fdc948fbeacd20b5af9d6d52eaa8212e90e
142 lines
3.9 KiB
Perl
142 lines
3.9 KiB
Perl
|
|
$ . "$TESTDIR/library.sh"
|
|
|
|
$ cat >> $TESTTMP/helper.sh <<EOF
|
|
> initclients() {
|
|
> for i in {0..9} ; do
|
|
> hg init client\$i
|
|
> cat >> client\$i/.hg/hgrc <<EOF2
|
|
> [paths]
|
|
> default=ssh://user@dummy/master
|
|
> [extensions]
|
|
> fastmanifest=
|
|
> treemanifest=
|
|
> [fastmanifest]
|
|
> usetree=True
|
|
> usecache=False
|
|
> EOF2
|
|
>
|
|
> hg -R client\$i pull -q
|
|
> hg -R client\$i up -q master
|
|
> echo >> client\$i/\$i
|
|
> hg -R client\$i commit -Aqm "add $i"
|
|
> done
|
|
> }
|
|
>
|
|
> pushclients() {
|
|
> for i in {0..9} ; do
|
|
> hg -R client\$i push --to master -B master >/dev/null 2>/dev/null &
|
|
> done
|
|
> wait
|
|
> }
|
|
> EOF
|
|
$ . "$TESTTMP/helper.sh"
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> [experimental]
|
|
> bundle2lazylocking=True
|
|
> [remotefilelog]
|
|
> reponame=master
|
|
> EOF
|
|
|
|
Test that multiple fighting pushes result in the correct flat and tree manifests
|
|
|
|
$ hg init master
|
|
$ cd master
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> treemanifest=
|
|
> [treemanifest]
|
|
> server=True
|
|
> # Sleep gives all the hg serve processes time to load the original repo
|
|
> # state. Otherwise there are race with loading hg server while pushes are
|
|
> # happening.
|
|
> [hooks]
|
|
> prepushrebase.sleep=sleep 1
|
|
> EOF
|
|
$ mkdir subdir/
|
|
$ touch subdir/a && hg ci -Aqm subdir/a
|
|
$ hg book master
|
|
$ hg backfilltree
|
|
$ cd ..
|
|
|
|
$ initclients
|
|
fetching tree '' 0ca5062b87888558ca097bff2f7511160e2e20f6
|
|
2 trees fetched over * (glob)
|
|
$ pushclients
|
|
|
|
$ cd master
|
|
$ hg debugdata .hg/store/00manifesttree.i 10
|
|
0\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
1\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
2\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
3\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
4\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
5\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
6\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
7\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
8\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
9\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
subdir\x008515d4bfda768e04af4c13a69a72e28c7effbea7t (esc)
|
|
$ hg debugdata -m 10
|
|
0\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
1\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
2\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
3\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
4\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
5\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
6\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
7\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
8\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
9\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
|
|
subdir/a\x00b80de5d138758541c5f05265ad144ab9fa86d1db (esc)
|
|
|
|
Test that pushrebase hooks can access the commit data
|
|
$ cat >> $TESTTMP/cathook.sh <<EOF
|
|
> #! /bin/sh
|
|
> echo "\$(hg cat -r \$HG_NODE subdir/a)"
|
|
> exit 1
|
|
> EOF
|
|
$ chmod a+x $TESTTMP/cathook.sh
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [hooks]
|
|
> prepushrebase.cat=$TESTTMP/cathook.sh
|
|
> EOF
|
|
$ cd ..
|
|
|
|
$ hg clone -q ssh://user@dummy/master hook_client
|
|
$ cd hook_client
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> fastmanifest=
|
|
> treemanifest=
|
|
> [fastmanifest]
|
|
> usetree=True
|
|
> usecache=False
|
|
> EOF
|
|
$ hg up -q master
|
|
$ echo baz >> subdir/a
|
|
$ hg commit -Aqm 'hook commit'
|
|
fetching tree * (glob)
|
|
1 trees fetched over * (glob)
|
|
|
|
- Push without sendtrees
|
|
$ hg push --to master -B master
|
|
pushing to ssh://user@dummy/master
|
|
searching for changes
|
|
remote: baz
|
|
remote: prepushrebase.cat hook exited with status 1
|
|
abort: push failed on remote
|
|
[255]
|
|
|
|
- Push with sendtrees
|
|
$ hg push --to master -B master --config treemanifest.sendtrees=True
|
|
pushing to ssh://user@dummy/master
|
|
searching for changes
|
|
remote: baz
|
|
remote: prepushrebase.cat hook exited with status 1
|
|
abort: push failed on remote
|
|
[255]
|