mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
check-code: fix code style with test files
This commit is contained in:
parent
5bc207a895
commit
d20c0f8953
@ -1,6 +1,5 @@
|
||||
$ echo "[extensions]" >> $HGRCPATH
|
||||
$ echo "remotenames=$(echo $(dirname $TESTDIR))/remotenames.py" >> $HGRCPATH
|
||||
|
||||
$ echo "remotenames=`dirname $TESTDIR`/remotenames.py" >> $HGRCPATH
|
||||
$ hg init test
|
||||
$ cd test
|
||||
$ echo foo>foo
|
||||
@ -8,7 +7,6 @@
|
||||
$ echo foo>foo.d/foo
|
||||
$ echo bar>foo.d/bAr.hg.d/BaR
|
||||
$ echo bar>foo.d/baR.d.hg/bAR
|
||||
|
||||
$ hg commit -A -m 1
|
||||
adding foo
|
||||
adding foo.d/bAr.hg.d/BaR
|
||||
@ -19,15 +17,14 @@
|
||||
$ cat hg.pid >> $DAEMON_PIDS
|
||||
|
||||
clone
|
||||
$ hg clone http://localhost:$HGPORT/ copy 2>&1 | \
|
||||
> sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
|
||||
$ hg clone http://localhost:$HGPORT/ copy 2>&1
|
||||
requesting all changes
|
||||
adding changesets
|
||||
adding manifests
|
||||
adding file changes
|
||||
added XXX changesets with XXX changes to XXX files
|
||||
added 1 changesets with 4 changes to 4 files
|
||||
updating to branch default
|
||||
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
|
||||
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
|
||||
$ cd copy
|
||||
|
||||
@ -37,8 +34,8 @@ add a commit to the clone
|
||||
$ hg ci -m 'add alpha'
|
||||
|
||||
verify that the branchheads are stored properly
|
||||
$ hg pull | sed "s/$HGPORT//"
|
||||
pulling from http://localhost:/
|
||||
$ hg pull
|
||||
pulling from http://localhost:$HGPORT/
|
||||
searching for changes
|
||||
no changes found
|
||||
$ hg log --graph
|
||||
|
@ -3,7 +3,7 @@ Set up extension and repos
|
||||
$ echo "[phases]" >> $HGRCPATH
|
||||
$ echo "publish = False" >> $HGRCPATH
|
||||
$ echo "[extensions]" >> $HGRCPATH
|
||||
$ echo "remotenames=$(dirname $TESTDIR)/remotenames.py" >> $HGRCPATH
|
||||
$ echo "remotenames=`dirname $TESTDIR`/remotenames.py" >> $HGRCPATH
|
||||
$ hg init repo1
|
||||
$ hg clone repo1 repo2
|
||||
updating to branch default
|
||||
@ -16,7 +16,7 @@ Test that anonymous heads are disallowed by default
|
||||
$ hg add a
|
||||
$ hg commit -m a
|
||||
$ hg push
|
||||
pushing to $TESTTMP/repo1
|
||||
pushing to $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
abort: push would create new anonymous heads (cb9a9f314b8b)
|
||||
(use --force to override this warning)
|
||||
@ -39,7 +39,7 @@ Test that we can still push a head that advances a remote bookmark
|
||||
$ hg commit -m b
|
||||
$ hg book @
|
||||
$ hg push
|
||||
pushing to $TESTTMP/repo1
|
||||
pushing to $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
adding changesets
|
||||
adding manifests
|
||||
@ -50,7 +50,7 @@ Test that we can still push a head that advances a remote bookmark
|
||||
Test --delete
|
||||
|
||||
$ hg push --delete @
|
||||
pushing to $TESTTMP/repo1
|
||||
pushing to $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
no changes found
|
||||
deleting remote bookmark @
|
||||
@ -60,7 +60,7 @@ Test that we don't get an abort if we're doing a bare push that does nothing
|
||||
|
||||
$ hg bookmark -d @
|
||||
$ hg push
|
||||
pushing to $TESTTMP/repo1
|
||||
pushing to $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
no changes found
|
||||
[1]
|
||||
@ -71,7 +71,7 @@ remote or local repo
|
||||
$ echo c >> a
|
||||
$ hg commit -m c
|
||||
$ hg push -f
|
||||
pushing to $TESTTMP/repo1
|
||||
pushing to $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
adding changesets
|
||||
adding manifests
|
||||
|
@ -3,7 +3,7 @@ Set up extension and repos
|
||||
$ echo "[phases]" >> $HGRCPATH
|
||||
$ echo "publish = False" >> $HGRCPATH
|
||||
$ echo "[extensions]" >> $HGRCPATH
|
||||
$ echo "remotenames=$(dirname $TESTDIR)/remotenames.py" >> $HGRCPATH
|
||||
$ echo "remotenames=`dirname $TESTDIR`/remotenames.py" >> $HGRCPATH
|
||||
$ hg init repo1
|
||||
$ hg clone repo1 repo2
|
||||
updating to branch default
|
||||
@ -16,7 +16,7 @@ Test that anonymous heads are disallowed by default
|
||||
$ hg add a
|
||||
$ hg commit -m a
|
||||
$ hg push
|
||||
pushing to $TESTTMP/repo1
|
||||
pushing to $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
abort: push would create new anonymous heads (cb9a9f314b8b)
|
||||
(use --force to override this warning)
|
||||
@ -27,20 +27,20 @@ Test that config changes what is pushed by default
|
||||
$ echo b > b
|
||||
$ hg add b
|
||||
$ hg commit -m b
|
||||
$ hg up .^
|
||||
$ hg up ".^"
|
||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
$ echo c > c
|
||||
$ hg add c
|
||||
$ hg commit -m c
|
||||
created new head
|
||||
$ hg push -r 'head()'
|
||||
pushing to $TESTTMP/repo1
|
||||
pushing to $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
abort: push would create new anonymous heads (d2ae7f538514, d36c0562f908)
|
||||
(use --force to override this warning)
|
||||
[255]
|
||||
$ hg push
|
||||
pushing to $TESTTMP/repo1
|
||||
pushing to $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
abort: push would create new anonymous heads (d36c0562f908)
|
||||
(use --force to override this warning)
|
||||
@ -52,7 +52,7 @@ Test that config changes what is pushed by default
|
||||
Test that config allows anonymous heads to be pushed
|
||||
|
||||
$ hg push --config remotenames.pushanonheads=True
|
||||
pushing to $TESTTMP/repo1
|
||||
pushing to $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
adding changesets
|
||||
adding manifests
|
||||
@ -72,7 +72,7 @@ Test that --to limits other options
|
||||
|
||||
$ echo b >> a
|
||||
$ hg commit -m b
|
||||
$ hg push --to @ --rev . --rev .^
|
||||
$ hg push --to @ --rev . --rev ".^"
|
||||
abort: --to requires exactly one rev to push
|
||||
(use --rev BOOKMARK or omit --rev for current commit (.))
|
||||
[255]
|
||||
@ -108,13 +108,13 @@ Test that --force is required to move bookmarks to odd locations
|
||||
remote bookmark already points at pushed rev
|
||||
no changes found
|
||||
[1]
|
||||
$ hg push --to @ -r .^
|
||||
$ hg push --to @ -r ".^"
|
||||
pushing rev cb9a9f314b8b to destination $TESTTMP/repo1 bookmark @
|
||||
searching for changes
|
||||
abort: pushed rev is not in the foreground of remote bookmark
|
||||
(use --force flag to complete non-fast-forward update)
|
||||
[255]
|
||||
$ hg up .^
|
||||
$ hg up ".^"
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
$ echo c >> a
|
||||
$ hg commit -m c
|
||||
@ -213,7 +213,7 @@ Clean up repo1
|
||||
Test that rebasing and pushing works as expected
|
||||
|
||||
$ hg pull
|
||||
pulling from $TESTTMP/repo1
|
||||
pulling from $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
adding changesets
|
||||
adding manifests
|
||||
|
@ -1,11 +1,11 @@
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> remotenames=$(echo $(dirname $TESTDIR))/remotenames.py
|
||||
> remotenames=`dirname $TESTDIR`/remotenames.py
|
||||
> [remotenames]
|
||||
> alias.default = True
|
||||
> EOF
|
||||
|
||||
$ FILTERPWD="sed s%$PWD/%%g"
|
||||
$ FILTERPWD="sed s%`pwd`/%%g"
|
||||
|
||||
$ mkcommit () {
|
||||
> echo c$1 > f$1
|
||||
|
@ -1,7 +1,7 @@
|
||||
> echo "[extensions]" >> $HGRCPATH
|
||||
> echo "remotenames=$(echo $(dirname $TESTDIR))/remotenames.py" >> $HGRCPATH
|
||||
> echo "remotenames=`dirname $TESTDIR`/remotenames.py" >> $HGRCPATH
|
||||
|
||||
> FILTERPWD="sed s%$PWD/%%g"
|
||||
> FILTERPWD="sed s%`pwd`/%%g"
|
||||
|
||||
> mkcommit()
|
||||
> {
|
||||
|
@ -1,13 +1,12 @@
|
||||
$ echo "[extensions]" >> $HGRCPATH
|
||||
$ echo "schemes=" >> $HGRCPATH
|
||||
$ echo "remotenames=$(echo $(dirname $TESTDIR))/remotenames.py" >> $HGRCPATH
|
||||
$ echo "remotenames=`dirname $TESTDIR`/remotenames.py" >> $HGRCPATH
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [schemes]
|
||||
> dotdot = ../{1}
|
||||
> EOF
|
||||
|
||||
$ FILTERPWD="sed s%$PWD/%%g"
|
||||
$ FILTERPWD="sed s%`pwd`/%%g"
|
||||
|
||||
$ mkcommit()
|
||||
> {
|
||||
|
@ -1,6 +1,6 @@
|
||||
Set up extension and repos
|
||||
$ echo "[extensions]" >> $HGRCPATH
|
||||
$ echo "remotenames=$(dirname $TESTDIR)/remotenames.py" >> $HGRCPATH
|
||||
$ echo "remotenames=`dirname $TESTDIR`/remotenames.py" >> $HGRCPATH
|
||||
$ hg init repo1
|
||||
$ cd repo1
|
||||
$ echo a > a
|
||||
@ -22,7 +22,7 @@ Test renaming
|
||||
$ echo "[remotenames]" >> $HGRCPATH
|
||||
$ echo "rename.default = remote" >> $HGRCPATH
|
||||
$ hg pull
|
||||
pulling from $TESTTMP/repo1
|
||||
pulling from $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
no changes found
|
||||
$ hg log -l 1 -T '{node|short} {remotenames}\n'
|
||||
@ -67,7 +67,7 @@ Test transition bookmark deletion
|
||||
$ echo "[remotenames]" >> $HGRCPATH
|
||||
$ echo "transitionbookmarks = master, stable, other" >> $HGRCPATH
|
||||
$ hg pull
|
||||
pulling from $TESTTMP/repo1
|
||||
pulling from $TESTTMP/repo1 (glob)
|
||||
searching for changes
|
||||
no changes found
|
||||
$ hg bookmarks
|
||||
@ -82,7 +82,7 @@ Test transition bookmark disallowed
|
||||
$ hg book okay stable
|
||||
abort: bookmark 'stable' not allowed by configuration
|
||||
[255]
|
||||
$ hg book other -r .^
|
||||
$ hg book other -r ".^"
|
||||
abort: bookmark 'other' not allowed by configuration
|
||||
[255]
|
||||
$ hg book foo
|
||||
|
Loading…
Reference in New Issue
Block a user