mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
fb-hgext: fix copied fb-hgext tests
Summary: This is a big bulk of generally almost-obvious fixes to the moved tests. Mostly these fixes have to do with correct importing of the actual extensions. Depends on D6675329 Test Plan: - ./run-tests.py fails less after this commit - see further commits for more test fixes Reviewers: #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D6675344
This commit is contained in:
parent
e75b9fc1b1
commit
b27a46c987
@ -1,6 +1,6 @@
|
||||
cat >> $HGRCPATH<<EOF
|
||||
[extensions]
|
||||
p4fastimport=$TESTDIR/../hgext3rd/p4fastimport
|
||||
p4fastimport=$TESTDIR/../hgext/p4fastimport
|
||||
EOF
|
||||
|
||||
# create p4 depot
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
$ cat << EOF >> $HGRCPATH
|
||||
> [extensions]
|
||||
> age=$TESTDIR/../hgext3rd/age.py
|
||||
> age=
|
||||
> EOF
|
||||
|
||||
Setup repo
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> backups=$TESTDIR/../hgext3rd/backups.py
|
||||
> backups=
|
||||
> strip=
|
||||
> EOF
|
||||
|
||||
|
@ -4,7 +4,7 @@ Test catnotate
|
||||
$ cd repo1
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> catnotate=$TESTDIR/../hgext3rd/catnotate.py
|
||||
> catnotate=
|
||||
> strip=
|
||||
> EOF
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> checkmessagehook = $TESTDIR/../hgext3rd/checkmessagehook.py
|
||||
> checkmessagehook=
|
||||
> EOF
|
||||
|
||||
Build up a repo
|
||||
|
@ -1,8 +1,8 @@
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> cleanobsstore=$TESTDIR/../hgext3rd/cleanobsstore.py
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> cleanobsstore=
|
||||
> fbamend=
|
||||
> [experimental]
|
||||
> evolution=createmarkers
|
||||
> EOF
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> configwarn=$TESTDIR/../hgext3rd/configwarn.py
|
||||
> configwarn=
|
||||
> [configwarn]
|
||||
> systemconfigs=diff.git, phases.publish
|
||||
> [alias]
|
||||
|
@ -1,8 +1,8 @@
|
||||
$ . "$TESTDIR/copytrace.sh"
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> copytrace=$TESTDIR/../hgext3rd/copytrace.py
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> copytrace=
|
||||
> fbamend=
|
||||
> rebase=
|
||||
> shelve=
|
||||
> [fbamend]
|
||||
|
@ -2,7 +2,7 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> rebase=
|
||||
> copytrace=$TESTDIR/../hgext3rd/copytrace.py
|
||||
> copytrace=
|
||||
> [experimental]
|
||||
> copytrace=off
|
||||
> EOF
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ . "$TESTDIR/copytrace.sh"
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> copytrace=$TESTDIR/../hgext3rd/copytrace.py
|
||||
> copytrace=
|
||||
> rebase=
|
||||
> shelve=
|
||||
> [experimental]
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> drawdag=$RUNTESTDIR/drawdag.py
|
||||
> crdump=$TESTDIR/../hgext3rd/crdump.py
|
||||
> crdump=
|
||||
> EOF
|
||||
|
||||
Create repo
|
||||
@ -143,16 +143,16 @@ Test basic dump of two commits
|
||||
... data = json.loads(f.read())
|
||||
... outdir = data['output_directory']
|
||||
... for commit in data['commits']:
|
||||
... print "#### commit %s" % commit['node']
|
||||
... print open(path.join(outdir, commit['patch_file'])).read()
|
||||
... print("#### commit %s" % commit['node'])
|
||||
... print(open(path.join(outdir, commit['patch_file'])).read())
|
||||
... for binfile in commit['binary_files']:
|
||||
... print "######## file %s" % binfile['file_name']
|
||||
... print("######## file %s" % binfile['file_name'])
|
||||
... if binfile['old_file'] is not None:
|
||||
... print "######## old"
|
||||
... print open(path.join(outdir, binfile['old_file'])).read().encode('hex')
|
||||
... print("######## old")
|
||||
... print(open(path.join(outdir, binfile['old_file'])).read().encode('hex'))
|
||||
... if binfile['new_file'] is not None:
|
||||
... print "######## new"
|
||||
... print open(path.join(outdir, binfile['new_file'])).read().encode('hex')
|
||||
... print("######## new")
|
||||
... print(open(path.join(outdir, binfile['new_file'])).read().encode('hex'))
|
||||
... import shutil
|
||||
... shutil.rmtree(outdir)
|
||||
#### commit 65d913976cc18347138f7b9f5186010d39b39b0f
|
||||
|
@ -1,7 +1,7 @@
|
||||
Set up extension
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> debugcommitmessage = $TESTDIR/../hgext3rd/debugcommitmessage.py
|
||||
> debugcommitmessage=
|
||||
> EOF
|
||||
|
||||
Set up repo
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> dialect = $TESTDIR/../hgext3rd/dialect.py
|
||||
> show = $TESTDIR/../hgext3rd/fbshow.py
|
||||
> dialect=
|
||||
> show=$TESTDIR/../hgext/fbshow.py
|
||||
> EOF
|
||||
|
||||
$ hg help -e show | head -n 1
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> dirsync=$TESTDIR/../hgext3rd/dirsync.py
|
||||
> dirsync=
|
||||
> EOF
|
||||
|
||||
$ hg init repo
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> dirsync=$TESTDIR/../hgext3rd/dirsync.py
|
||||
> dirsync=
|
||||
> EOF
|
||||
|
||||
$ hg init repo
|
||||
|
@ -11,7 +11,7 @@ TEST: incomplete requirements handling (required extension excluded)
|
||||
$ cd a
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> drop = $TESTDIR/../hgext3rd/drop.py
|
||||
> drop=
|
||||
> EOF
|
||||
|
||||
$ hg drop 1
|
||||
@ -23,7 +23,7 @@ SETUP: Properly setup all required extensions
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> rebase=
|
||||
> drop = $TESTDIR/../hgext3rd/drop.py
|
||||
> drop=
|
||||
> [experimental]
|
||||
> evolution=all
|
||||
> EOF
|
||||
@ -50,7 +50,7 @@ RESET and SETUP
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> rebase=
|
||||
> drop = $TESTDIR/../hgext3rd/drop.py
|
||||
> drop=
|
||||
> [experimental]
|
||||
> evolution=all
|
||||
> EOF
|
||||
@ -87,7 +87,7 @@ RESET and SETUP
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> rebase=
|
||||
> drop = $TESTDIR/../hgext3rd/drop.py
|
||||
> drop=
|
||||
> [experimental]
|
||||
> evolution=all
|
||||
> EOF
|
||||
@ -179,7 +179,7 @@ RESET and SETUP
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> rebase=
|
||||
> drop = $TESTDIR/../hgext3rd/drop.py
|
||||
> drop=
|
||||
> [experimental]
|
||||
> evolution=all
|
||||
> EOF
|
||||
|
@ -2,7 +2,7 @@
|
||||
> [ui]
|
||||
> interface=editor
|
||||
> [extensions]
|
||||
> edrecord=$TESTDIR/../hgext3rd/edrecord.py
|
||||
> edrecord=
|
||||
> __EOF__
|
||||
|
||||
$ hg init repo
|
||||
|
@ -8,7 +8,7 @@
|
||||
> EOF
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> errorredirect=$TESTDIR/../hgext3rd/errorredirect.py
|
||||
> errorredirect=
|
||||
> crash=$TESTTMP/crash.py
|
||||
> EOF
|
||||
|
||||
|
@ -3,7 +3,7 @@ Set up repository
|
||||
$ hg init repo
|
||||
$ cd repo
|
||||
$ echo "[extensions]" >> .hg/hgrc
|
||||
$ echo "extorder = $TESTDIR/../hgext3rd/extorder.py" >> .hg/hgrc
|
||||
$ echo "extorder=" >> .hg/hgrc
|
||||
$ echo "rebase =" >> .hg/hgrc
|
||||
$ echo "dummyext1 = $TESTDIR/dummyext1.py" >> .hg/hgrc
|
||||
$ echo "dummyext2 = $TESTDIR/dummyext2.py" >> .hg/hgrc
|
||||
@ -38,4 +38,4 @@ Conflicting deps
|
||||
$ hg id > out.txt 2>&1
|
||||
[1]
|
||||
$ grep MercurialExtOrderException < out.txt
|
||||
hgext_extorder.MercurialExtOrderException: extorder: conflicting extension order
|
||||
hgext.extorder.MercurialExtOrderException: extorder: conflicting extension order
|
||||
|
@ -15,7 +15,7 @@ from mercurial import (
|
||||
)
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.path.insert(0, os.path.join(os.environ["TESTDIR"], "..", "hgext3rd"))
|
||||
sys.path.insert(0, os.path.join(os.environ["TESTDIR"], "..", "hgext"))
|
||||
|
||||
import extutil
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
|
||||
> fastlog=$TESTDIR/../hgext3rd/fastlog.py
|
||||
> tweakdefaults=
|
||||
> fastlog=
|
||||
> [fbconduit]
|
||||
> host=our.intern.facebook.com
|
||||
> protocol=http
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fastpartialmatch=$TESTDIR/../hgext3rd/fastpartialmatch.py
|
||||
> fastpartialmatch=
|
||||
> strip=
|
||||
> EOF
|
||||
|
||||
|
@ -7,10 +7,10 @@
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fastpartialmatch=$TESTDIR/../hgext3rd/fastpartialmatch.py
|
||||
> fastpartialmatch=
|
||||
> strip=
|
||||
> histedit=
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> [experimental]
|
||||
> evolution=createmarkers
|
||||
> [ui]
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fastpartialmatch=$TESTDIR/../hgext3rd/fastpartialmatch.py
|
||||
> fastpartialmatch=
|
||||
> shelve=
|
||||
> [ui]
|
||||
> ssh = python "$TESTDIR/dummyssh"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fastpartialmatch=$TESTDIR/../hgext3rd/fastpartialmatch.py
|
||||
> fastpartialmatch=
|
||||
> strip=
|
||||
> histedit=
|
||||
> [ui]
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> drawdag=$RUNTESTDIR/drawdag.py
|
||||
> fastverify=$TESTDIR/../hgext3rd/fastverify.py
|
||||
> fastverify=
|
||||
> EOF
|
||||
|
||||
Turn manifest verification on and off:
|
||||
|
@ -1,8 +1,8 @@
|
||||
Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
> evolution = createmarkers, allowunstable
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> blackbox=
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> drawdag=$RUNTESTDIR/drawdag.py
|
||||
> [experimental]
|
||||
> evolution = all
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> drawdag=$RUNTESTDIR/drawdag.py
|
||||
> [experimental]
|
||||
> evolution = createmarkers, allowunstable
|
||||
|
@ -14,7 +14,7 @@
|
||||
> unified = 0
|
||||
> [extensions]
|
||||
> rebase=
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> [experimental]
|
||||
> evolution=createmarkers, allowunstable
|
||||
> EOF
|
||||
@ -268,7 +268,7 @@ make the top commit non-empty
|
||||
test histedit compat
|
||||
|
||||
$ echo '[extensions]' >> $HGRCPATH
|
||||
$ echo "fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py" >> $HGRCPATH
|
||||
$ echo "fbhistedit=" >> $HGRCPATH
|
||||
$ echo "histedit=" >> $HGRCPATH
|
||||
|
||||
$ hg export -r .
|
||||
|
@ -1,8 +1,8 @@
|
||||
Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
> evolution = createmarkers
|
||||
|
@ -1,8 +1,8 @@
|
||||
Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> rebase=
|
||||
> [fbamend]
|
||||
> userestack=True
|
||||
|
@ -1,7 +1,7 @@
|
||||
Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
> evolution = createmarkers
|
||||
|
@ -1,8 +1,8 @@
|
||||
Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
> evolution = createmarkers
|
||||
|
@ -1,7 +1,7 @@
|
||||
Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
> evolution = createmarkers, allowunstable
|
||||
|
@ -2,8 +2,8 @@ Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> drawdag=$RUNTESTDIR/drawdag.py
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
> evolution.allowdivergence = True
|
||||
|
@ -1,8 +1,8 @@
|
||||
Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> rebase=
|
||||
> strip=
|
||||
> [experimental]
|
||||
|
@ -1,10 +1,10 @@
|
||||
Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> debuginhibit=$TESTDIR/../hgext3rd/debuginhibit.py
|
||||
> directaccess=$TESTDIR/../hgext3rd/directaccess.py
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> debuginhibit=
|
||||
> directaccess=
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> histedit=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
|
@ -1,11 +1,11 @@
|
||||
Set up test environment.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> rebase=
|
||||
> strip=
|
||||
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
|
||||
> tweakdefaults=
|
||||
> [experimental]
|
||||
> evolution = createmarkers
|
||||
> [fbamend]
|
||||
|
@ -2,7 +2,7 @@ Test functionality is present
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> rebase=
|
||||
> EOF
|
||||
$ mkcommit() {
|
||||
@ -205,7 +205,7 @@ Test that unbookmarked re-amends work well
|
||||
Test interaction with histedit
|
||||
|
||||
$ echo '[extensions]' >> $HGRCPATH
|
||||
$ echo "fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py" >> $HGRCPATH
|
||||
$ echo "fbhistedit=" >> $HGRCPATH
|
||||
$ echo "histedit=" >> $HGRCPATH
|
||||
$ hg up tip
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
@ -307,7 +307,7 @@ Test that the extension disables itself when evolution is enabled
|
||||
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> EOF
|
||||
|
||||
noisy warning during amend
|
||||
@ -474,7 +474,7 @@ Test hg amend works with a logfile
|
||||
Test fbamend with inhibit
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> inhibit=
|
||||
> EOF
|
||||
$ cd ..
|
||||
$ hg init inhibitrepo
|
||||
@ -536,7 +536,7 @@ Prepare a repo for unamend testing
|
||||
$ cd unamendrepo
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> [experimental]
|
||||
> evolution=createmarkers
|
||||
> EOF
|
||||
@ -592,7 +592,7 @@ Make sure that unamend does not work without inhibit
|
||||
Make sure that unamend works as expected with inhibit
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> inhibit=
|
||||
> EOF
|
||||
$ hg unamend
|
||||
|
||||
|
@ -10,7 +10,7 @@ Basic functionality.
|
||||
$ cd basic
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> fbconduit = $TESTDIR/../hgext3rd/fbconduit.py
|
||||
> fbconduit=
|
||||
> [fbconduit]
|
||||
> reponame = basic
|
||||
> host = localhost:$CONDUIT_PORT
|
||||
@ -48,7 +48,7 @@ Test with one backing repos specified.
|
||||
$ hg init single_backingrepo
|
||||
$ cd single_backingrepo
|
||||
$ echo "[extensions]" >> .hg/hgrc
|
||||
$ echo "fbconduit = $TESTDIR/../hgext3rd/fbconduit.py" >> .hg/hgrc
|
||||
$ echo "fbconduit=" >> .hg/hgrc
|
||||
$ echo "[fbconduit]" >> .hg/hgrc
|
||||
$ echo "reponame = single" >> .hg/hgrc
|
||||
$ echo "backingrepos = single_src" >> .hg/hgrc
|
||||
@ -75,7 +75,7 @@ Test with multiple backing repos specified.
|
||||
$ hg init backingrepos
|
||||
$ cd backingrepos
|
||||
$ echo "[extensions]" >> .hg/hgrc
|
||||
$ echo "fbconduit = $TESTDIR/../hgext3rd/fbconduit.py" >> .hg/hgrc
|
||||
$ echo "fbconduit=" >> .hg/hgrc
|
||||
$ echo "[fbconduit]" >> .hg/hgrc
|
||||
$ echo "reponame = multiple" >> .hg/hgrc
|
||||
$ echo "backingrepos = src_a src_b src_c" >> .hg/hgrc
|
||||
@ -136,7 +136,7 @@ Test with a bad server port, where we get connection refused errors.
|
||||
$ hg init errortest
|
||||
$ cd errortest
|
||||
$ echo "[extensions]" >> .hg/hgrc
|
||||
$ echo "fbconduit = $TESTDIR/../hgext3rd/fbconduit.py" >> .hg/hgrc
|
||||
$ echo "fbconduit=" >> .hg/hgrc
|
||||
$ echo "[fbconduit]" >> .hg/hgrc
|
||||
$ echo "reponame = errortest" >> .hg/hgrc
|
||||
$ echo "host = localhost:9" >> .hg/hgrc
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
|
||||
> fbhistedit=
|
||||
> histedit=
|
||||
> rebase=
|
||||
> EOF
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
|
||||
> fbhistedit=
|
||||
> histedit=
|
||||
> rebase=
|
||||
> EOF
|
||||
@ -195,7 +195,6 @@ retry should try to execute the command again and continue if succeeded
|
||||
> exec exit 2
|
||||
> edit 652413bf663e f
|
||||
> EOF
|
||||
[1]
|
||||
|
||||
$ hg histedit --retry
|
||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
@ -346,7 +345,7 @@ Test that we can recover exec with fbamend on
|
||||
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> [experimental]
|
||||
> evolution=createmarkers, allowunstable
|
||||
> EOF
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
|
||||
> fbhistedit=
|
||||
> histedit=
|
||||
> rebase=
|
||||
> [alias]
|
||||
@ -50,7 +50,6 @@ Use histedit to graft an extra commit into current history
|
||||
> graft 581a2eefdc84
|
||||
> pick f9d2e574dc58
|
||||
> EOF
|
||||
[1]
|
||||
|
||||
$ hg tglog
|
||||
@ 7:fc9a25c1b8afb917f8e3dacad873f0d0bea14a96:draft 'c'
|
||||
|
@ -4,7 +4,7 @@ Tests JSON Input support for histedit
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
|
||||
> fbhistedit=
|
||||
> histedit=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
|
||||
> fbhistedit=
|
||||
> histedit=
|
||||
> rebase=
|
||||
> EOF
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
|
||||
> fbhistedit=
|
||||
> histedit=
|
||||
> rebase=
|
||||
> EOF
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
|
||||
> fbhistedit=
|
||||
> histedit=
|
||||
> rebase=
|
||||
> EOF
|
||||
|
@ -8,10 +8,10 @@ Setup
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> histedit=
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=
|
||||
> fbamend=
|
||||
> rebase=
|
||||
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
|
||||
> fbhistedit=
|
||||
> [experimental]
|
||||
> evolution = createmarkers
|
||||
> EOF
|
||||
|
@ -10,7 +10,7 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> noinline=$TESTTMP/noinline.py
|
||||
> fixcorrupt=$TESTDIR/../hgext3rd/fixcorrupt.py
|
||||
> fixcorrupt=
|
||||
> EOF
|
||||
|
||||
$ rebuildrepo() {
|
||||
|
@ -2,9 +2,9 @@ Set up test environment.
|
||||
This test confirms cacheinvalidation in hg fold.
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> undo=$TESTDIR/../hgext3rd/undo.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> undo=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
> evolution = createmarkers, allowunstable
|
||||
|
@ -51,6 +51,6 @@ class BisectTests(unittest.TestCase):
|
||||
self.assertEqual(bisect(0, len(array) - 1, comp, value), result)
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.path.insert(0, os.path.join(os.environ["TESTDIR"], "..", "hgext3rd"))
|
||||
sys.path.insert(0, os.path.join(os.environ["TESTDIR"], "..", "hgext"))
|
||||
from generic_bisect import bisect
|
||||
silenttestrunner.main(__name__)
|
||||
|
@ -1,8 +1,8 @@
|
||||
#testcases onlymapdelta.true onlymapdelta.false
|
||||
|
||||
$ echo "[extensions]" >> $HGRCPATH
|
||||
$ echo "gitlookup = $TESTDIR/../hgext3rd/gitlookup.py" >> $HGRCPATH
|
||||
$ echo "gitrevset = $TESTDIR/../hgext3rd/gitrevset.py" >> $HGRCPATH
|
||||
$ echo "gitlookup=" >> $HGRCPATH
|
||||
$ echo "gitrevset=" >> $HGRCPATH
|
||||
$ echo "strip = " >> $HGRCPATH
|
||||
$ echo "[ui]" >> $HGRCPATH
|
||||
$ echo 'ssh = python "$RUNTESTDIR/dummyssh"' >> $HGRCPATH
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> githelp=$TESTDIR/../hgext3rd/githelp.py
|
||||
> githelp=
|
||||
> EOF
|
||||
|
||||
$ hg init repo
|
||||
@ -277,6 +277,6 @@ githelp for git blame (tweakdefaults disabled)
|
||||
hg annotate -udl
|
||||
|
||||
githelp for git blame (tweakdefaults enabled)
|
||||
$ hg --config extensions.tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py githelp -- git blame
|
||||
$ hg --config extensions.tweakdefaults= githelp -- git blame
|
||||
hg annotate -pudl
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
|
||||
$ echo "[extensions]" >> $HGRCPATH
|
||||
$ echo "grepdiff = $TESTDIR/../hgext3rd/grepdiff.py" >> $HGRCPATH
|
||||
$ echo "grepdiff=" >> $HGRCPATH
|
||||
|
||||
Setup repo
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> grpcheck = $TESTDIR/../hgext3rd/grpcheck.py
|
||||
> grpcheck=
|
||||
> EOF
|
||||
|
||||
$ hg init repo
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> hiddenerror=$TESTDIR/../hgext3rd/hiddenerror.py
|
||||
> hiddenerror=
|
||||
> [experimental]
|
||||
> evolution=all
|
||||
> EOF
|
||||
|
@ -3,7 +3,7 @@
|
||||
> evolution=createmarkers
|
||||
> [extensions]
|
||||
> drawdag=$RUNTESTDIR/drawdag.py
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> inhibit=
|
||||
> EOF
|
||||
|
||||
$ hg init inhibit
|
||||
@ -124,7 +124,7 @@ Test date is set correctly
|
||||
$ hg update -q G
|
||||
$ echo 1 >> G
|
||||
$ hg commit --amend -m G1 --config devel.default-date='123456 0'
|
||||
$ hg unamend --config extensions.fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
$ hg unamend --config extensions.fbamend=
|
||||
$ hg debugobsolete | tail -1
|
||||
b7e6ea8355346dbbedcb23188c3a5de400e780ae cf43ad9da869111bee585c5475aefe61f6f74649 0 (Fri Jan 02 10:17:37 1970 +0000) {'ef1': '9', 'user': 'test'}
|
||||
$ echo 2 >> G
|
||||
@ -136,7 +136,7 @@ Do not use a mocked date
|
||||
> %unset default-date
|
||||
> EOF
|
||||
$ hg commit --amend -m G2
|
||||
$ hg unamend --config extensions.fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
$ hg unamend --config extensions.fbamend=
|
||||
$ hg debugobsolete | tail -1
|
||||
51313a3d2b65bd2cbc4828a7309af84eb5914bdb cf43ad9da869111bee585c5475aefe61f6f74649 0 (*) {'ef1': '9', 'user': 'test'} (glob)
|
||||
$ hg debugobsolete | tail -1 | grep ' 1970 +0000'
|
||||
|
@ -6,7 +6,7 @@ import sys
|
||||
# make it runnable using python directly without run-tests.py
|
||||
sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')]
|
||||
|
||||
from hgext3rd.lfs import pointer
|
||||
from hgext.lfs import pointer
|
||||
|
||||
def tryparse(text):
|
||||
r = {}
|
||||
|
@ -11,7 +11,7 @@ Require lfs-test-server (https://github.com/git-lfs/lfs-test-server)
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> lfs=$TESTDIR/../hgext3rd/lfs
|
||||
> lfs=
|
||||
> [lfs]
|
||||
> url=http://foo:bar@$LFS_HOST/
|
||||
> threshold=1
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> lfs=$TESTDIR/../hgext3rd/lfs/
|
||||
> lfs=
|
||||
> [lfs]
|
||||
> threshold=1000B
|
||||
> EOF
|
||||
@ -416,7 +416,7 @@
|
||||
$ cd repo10
|
||||
$ cat >> .hg/hgrc << EOF
|
||||
> [extensions]
|
||||
> lfs=$TESTDIR/../hgext3rd/lfs/
|
||||
> lfs=
|
||||
> [lfs]
|
||||
> threshold=1
|
||||
> EOF
|
||||
|
@ -4,7 +4,7 @@
|
||||
$ hg init
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> conflictinfo=$TESTDIR/../hgext3rd/conflictinfo.py
|
||||
> conflictinfo=
|
||||
> EOF
|
||||
|
||||
2) Can't run dumpjson outside a conflict
|
||||
@ -104,7 +104,7 @@ Setup
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> rebase=
|
||||
> conflictinfo=$TESTDIR/../hgext3rd/conflictinfo.py
|
||||
> conflictinfo=
|
||||
> EOF
|
||||
|
||||
$ reset() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> mergedriver=$TESTDIR/../hgext3rd/mergedriver.py
|
||||
> mergedriver=
|
||||
> EOF
|
||||
|
||||
basic merge driver: just lists out files and contents, doesn't resolve any files
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> morecolors=$TESTDIR/../hgext3rd/morecolors.py
|
||||
> morecolors=
|
||||
> [ui]
|
||||
> color=always
|
||||
> [color]
|
||||
|
@ -2,11 +2,11 @@
|
||||
> [morestatus]
|
||||
> show=True
|
||||
> [extensions]
|
||||
> morestatus=$TESTDIR/../hgext3rd/morestatus.py
|
||||
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
|
||||
> morestatus=
|
||||
> fbhistedit=
|
||||
> histedit=
|
||||
> rebase=
|
||||
> reset=$TESTDIR/../hgext3rd/reset.py
|
||||
> reset=
|
||||
> EOF
|
||||
$ cat >> $TESTTMP/breakupdate.py << EOF
|
||||
> import sys
|
||||
|
@ -4,7 +4,7 @@ Setup
|
||||
$ export PYTHONPATH
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> myparent=$TESTDIR/../hgext3rd/myparent.py
|
||||
> myparent=
|
||||
> EOF
|
||||
$ hg init repo
|
||||
$ cd repo
|
||||
|
@ -45,7 +45,7 @@ Test ctrl-c
|
||||
[124]
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> nointerrupt = $TESTDIR/../hgext3rd/nointerrupt.py
|
||||
> nointerrupt=
|
||||
> [alias]
|
||||
> slumber = sleep
|
||||
> [nointerrupt]
|
||||
|
@ -4,7 +4,7 @@
|
||||
$ cat <<EOF >> $HGRCPATH
|
||||
> [extensions]
|
||||
> mq =
|
||||
> obsshelve=$TESTDIR/../hgext3rd/obsshelve.py
|
||||
> obsshelve=
|
||||
> [defaults]
|
||||
> diff = --nodates --git
|
||||
> qnew = --date '0 0'
|
||||
@ -1058,7 +1058,7 @@ Wreak havoc on the unshelve process
|
||||
$ rm .hg/unshelverebasestate
|
||||
$ hg unshelve --abort
|
||||
unshelve of 'default' aborted
|
||||
abort: (No such file or directory|The system cannot find the file specified) (re)
|
||||
abort: $ENOENT$
|
||||
[255]
|
||||
Can the user leave the current state?
|
||||
$ hg up -C .
|
||||
@ -1564,7 +1564,7 @@ Unshelving a stripped commit aborts with an explanatory message
|
||||
[255]
|
||||
|
||||
Enabling both shelve and obsshelve should not be allowed
|
||||
$ hg --config extensions.obsshelve=$TESTDIR/../hgext3rd/obsshelve.py --config extensions.shelve= log -r .
|
||||
$ hg --config extensions.obsshelve= --config extensions.shelve= log -r .
|
||||
extension 'shelve' overrides commands: * (glob)
|
||||
abort: shelve must be disabled when obsshelve is enabled
|
||||
[255]
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> ownercheck=$TESTDIR/../hgext3rd/ownercheck.py
|
||||
> ownercheck=
|
||||
> EOF
|
||||
|
||||
ownercheck does not prevent normal hg operations
|
||||
|
@ -11,7 +11,7 @@ except ImportError:
|
||||
import socketserver as SocketServer
|
||||
|
||||
# Make sure we use patchpython.py in this repo, unaffected by PYTHONPATH
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../hgext3rd'))
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../hgext'))
|
||||
import patchpython
|
||||
|
||||
assert patchpython # pass pyflakes "import but unused" check
|
||||
|
@ -4,8 +4,8 @@
|
||||
> [ui]
|
||||
> ssh=python "$TESTDIR/dummyssh"
|
||||
> [extensions]
|
||||
> perftweaks=$TESTDIR/../hgext3rd/perftweaks.py
|
||||
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
|
||||
> perftweaks=
|
||||
> tweakdefaults=
|
||||
> remotenames=
|
||||
> rebase=
|
||||
> EOF
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> drawdag=$RUNTESTDIR/drawdag.py
|
||||
> perftweaks=$TESTDIR/../hgext3rd/perftweaks.py
|
||||
> perftweaks=
|
||||
> EOF
|
||||
|
||||
Test disabling the tag cache
|
||||
@ -191,7 +191,7 @@ We need to disable the SCM_SAMPLING_FILEPATH env var because arcanist may set it
|
||||
> key.sparse_profiles=sparse_profiles
|
||||
> filepath = $LOGDIR/samplingpath.txt
|
||||
> [extensions]
|
||||
> sampling=$TESTDIR/../hgext3rd/sampling.py
|
||||
> sampling=
|
||||
> EOF
|
||||
$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
|
||||
$ export PYTHONPATH
|
||||
@ -202,12 +202,12 @@ We need to disable the SCM_SAMPLING_FILEPATH env var because arcanist may set it
|
||||
... data = f.read()
|
||||
>>> for record in data.strip("\0").split("\0"):
|
||||
... parsedrecord = json.loads(record)
|
||||
... print '{0}: {1}'.format(parsedrecord['category'],
|
||||
... parsedrecord['data']['dirstate_size'])
|
||||
... print('{0}: {1}'.format(parsedrecord['category'],
|
||||
... parsedrecord['data']['dirstate_size']))
|
||||
dirstate_size: 1
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> EOF
|
||||
$ cat >> profile_base << EOF
|
||||
> [include]
|
||||
@ -225,7 +225,7 @@ We need to disable the SCM_SAMPLING_FILEPATH env var because arcanist may set it
|
||||
>>> for record in data.strip("\0").split("\0"):
|
||||
... parsedrecord = json.loads(record)
|
||||
... if parsedrecord['category'] == 'sparse_profiles':
|
||||
... print 'active_profiles:', parsedrecord['data']['active_profiles']
|
||||
... print('active_profiles:', parsedrecord['data']['active_profiles'])
|
||||
active_profiles:
|
||||
active_profiles:
|
||||
active_profiles: profile_base,profile_extended
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> phrevset=$TESTDIR/../hgext3rd/phrevset.py
|
||||
> phrevset=
|
||||
> EOF
|
||||
$ hg init repo
|
||||
$ cd repo
|
||||
|
@ -14,13 +14,13 @@ Test that hg pull creates obsolescence markers for landed diffs
|
||||
> evolution= createmarkers
|
||||
> rebaseskipobsolete=True
|
||||
> [extensions]
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=
|
||||
> fbamend=
|
||||
> strip=
|
||||
> rebase=
|
||||
> remotenames =
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py
|
||||
> pushrebase=
|
||||
> pullcreatemarkers=
|
||||
> [fbamend]
|
||||
> safestrip=false
|
||||
> [remotenames]
|
||||
|
@ -14,13 +14,13 @@ Test that hg pull creates obsolescence markers for landed diffs
|
||||
> evolution= createmarkers
|
||||
> rebaseskipobsolete=True
|
||||
> [extensions]
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=
|
||||
> fbamend=
|
||||
> strip=
|
||||
> rebase=
|
||||
> remotenames =
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py
|
||||
> pushrebase=
|
||||
> pullcreatemarkers=
|
||||
> [remotenames]
|
||||
> allownonfastforward=True
|
||||
> [fbamend]
|
||||
|
@ -17,7 +17,7 @@ Setup pushrebase required repo
|
||||
$ cd server
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> [pushrebase]
|
||||
> blocknonpushrebase = True
|
||||
> EOF
|
||||
@ -54,7 +54,7 @@ Non-pushrebase pushes should be rejected
|
||||
|
||||
Pushrebase pushes should be allowed
|
||||
|
||||
$ hg push --config "extensions.pushrebase=$TESTDIR/../hgext3rd/pushrebase.py" --to master -B master
|
||||
$ hg push --config "extensions.pushrebase=" --to master -B master
|
||||
pushing to $TESTTMP/server (glob)
|
||||
searching for changes
|
||||
pushing 1 changeset:
|
||||
|
@ -16,7 +16,7 @@ Set up server repository
|
||||
$ cd server
|
||||
$ cat >> .hg/hgrc << EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> remotenames = !
|
||||
> [experimental]
|
||||
> bundle2-exp=True
|
||||
@ -42,7 +42,7 @@ Test that pushing to a remotename gets rebased
|
||||
$ cat >> .hg/hgrc << EOF
|
||||
> [extensions]
|
||||
> remotenames =
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> [remotenames]
|
||||
> allownonfastforward=True
|
||||
> [experimental]
|
||||
@ -242,7 +242,7 @@ Test force pushes
|
||||
$ cd forcepushserver
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> remotenames = !
|
||||
> [experimental]
|
||||
> bundle2-exp=True
|
||||
@ -258,7 +258,7 @@ Test force pushes
|
||||
$ cd ../forcepushclient
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> remotenames =
|
||||
> [remotenames]
|
||||
> allownonfastforward=True
|
||||
@ -297,7 +297,7 @@ Test 'hg push' with a tracking bookmark
|
||||
$ cd trackingserver
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> remotenames = !
|
||||
> [experimental]
|
||||
> bundle2-exp=True
|
||||
@ -309,7 +309,7 @@ Test 'hg push' with a tracking bookmark
|
||||
$ cd trackingclient
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> remotenames =
|
||||
> [remotenames]
|
||||
> allownonfastforward=True
|
||||
@ -359,7 +359,7 @@ Test push --to to a repo without pushrebase on (i.e. the default remotenames beh
|
||||
$ cd newclient
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> remotenames =
|
||||
> [experimental]
|
||||
> bundle2-exp=True
|
||||
@ -394,7 +394,7 @@ that requires pushrebase.
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> remotenames =
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> [experimental]
|
||||
> bundle2-exp=True
|
||||
> [pushrebase]
|
||||
|
@ -529,7 +529,7 @@ Test that the prepushrebase hook can run against the bundle repo
|
||||
> [hooks]
|
||||
> prepushrebase = $TESTTMP/prerebase.sh
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> [experimental]
|
||||
> bundle2lazylocking = True
|
||||
> EOF
|
||||
@ -549,7 +549,7 @@ Test that the prepushrebase hook can run against the bundle repo
|
||||
$ cd prepushrebaseclient
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
$ touch b && hg add b && hg commit -qm b
|
||||
$ hg push --to master
|
||||
@ -562,7 +562,7 @@ Test that the prepushrebase hook can run against the bundle repo
|
||||
remote: summary: b
|
||||
remote:
|
||||
remote: Checking if lock exists (it should not):
|
||||
remote: ls: *.hg/store/lock*: No such file or directory (glob)
|
||||
remote: ls: *.hg/store/lock*: $ENOENT$ (glob)
|
||||
remote: prepushrebase hook exited with status * (glob)
|
||||
abort: push failed on remote
|
||||
[255]
|
||||
@ -586,7 +586,7 @@ Test that hooks are fired with the correct variables
|
||||
> prepushrebase = python "$RUNTESTDIR/printenv.py" prepushrebase
|
||||
> prepushkey = python "$RUNTESTDIR/printenv.py" prepushkey
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
$ touch file && hg ci -Aqm initial
|
||||
pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/hookserver HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=commit (glob)
|
||||
@ -604,7 +604,7 @@ Test that hooks are fired with the correct variables
|
||||
$ cd hookclient
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
$ hg update master
|
||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
@ -640,7 +640,7 @@ Test date rewriting
|
||||
$ cd rewritedate
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> [pushrebase]
|
||||
> rewritedates = True
|
||||
> EOF
|
||||
@ -655,7 +655,7 @@ Test date rewriting
|
||||
$ cd rewritedateclient
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
$ hg up 0
|
||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
@ -727,7 +727,7 @@ Test pushrebase on merge commit where master is on the p2 side
|
||||
$ cd p2mergeserver
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
$ echo a >> a && hg commit -Aqm 'add a'
|
||||
$ hg bookmark master
|
||||
@ -737,7 +737,7 @@ Test pushrebase on merge commit where master is on the p2 side
|
||||
$ cd p2mergeclient
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
$ hg up -q null
|
||||
$ echo b >> b && hg commit -Aqm 'add b'
|
||||
@ -783,7 +783,7 @@ Test force pushes
|
||||
$ cd forcepushserver
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
$ echo a > a && hg commit -Aqm a
|
||||
$ cd ..
|
||||
@ -797,7 +797,7 @@ Test force pushes
|
||||
$ cd ../forcepushclient
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
$ hg up 0
|
||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
@ -829,7 +829,7 @@ Make sure that no hg-bundle-* files left
|
||||
(the '|| true' and '*' prefix is because ls has different behavior on linux
|
||||
and osx)
|
||||
$ ls ../server/.hg/hg-bundle-* || true
|
||||
ls: *../server/.hg/hg-bundle-*: No such file or directory (glob)
|
||||
ls: *../server/.hg/hg-bundle-*: $ENOENT$ (glob)
|
||||
|
||||
Server with obsstore disabled can still send obsmarkers useful to client, and
|
||||
phase is updated correctly with the marker information.
|
||||
@ -844,7 +844,7 @@ phase is updated correctly with the marker information.
|
||||
$ cd server1
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
$ echo a > a
|
||||
$ hg commit -m a -A a -q
|
||||
@ -904,7 +904,7 @@ Push a file-copy changeset and the copy source gets modified by others:
|
||||
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
||||
> pushrebase=
|
||||
> EOF
|
||||
|
||||
$ echo 1 > A
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> rage=$TESTDIR/../hgext3rd/rage.py
|
||||
> rage=
|
||||
> EOF
|
||||
|
||||
$ hg init repo
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> remoteid=$TESTDIR/../hgext3rd/remoteid.py
|
||||
> remoteid=
|
||||
> [remotefilelog]
|
||||
> server=True
|
||||
> EOF
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ . $TESTDIR/require-ext.sh remotenames
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> reset=$TESTDIR/../hgext3rd/reset.py
|
||||
> reset=
|
||||
> remotenames=
|
||||
> EOF
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> reset=$TESTDIR/../hgext3rd/reset.py
|
||||
> reset=
|
||||
> EOF
|
||||
|
||||
$ hg init repo
|
||||
@ -153,7 +153,7 @@ Reset + Obsolete tests
|
||||
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> rebase=
|
||||
> [experimental]
|
||||
> evolution=all
|
||||
@ -196,8 +196,8 @@ Reset + Inhibit tests, with inhibit reset revives the same commit
|
||||
|
||||
$ cat >> .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> rebase=
|
||||
> EOF
|
||||
|
||||
|
@ -40,7 +40,7 @@ logged
|
||||
> [sampling]
|
||||
> key.commit=commit_table
|
||||
> [extensions]
|
||||
> sampling=$TESTDIR/../hgext3rd/sampling.py
|
||||
> sampling=
|
||||
> EOF
|
||||
$ LOGDIR=`pwd`/logs
|
||||
$ mkdir $LOGDIR
|
||||
|
@ -1,6 +1,6 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> show=$TESTDIR/../hgext3rd/fbshow.py
|
||||
> show=$TESTDIR/../hgext/fbshow.py
|
||||
> EOF
|
||||
|
||||
We assume that log basically works (it has its own tests). This just covers uses
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> sigtrace=$TESTDIR/../hgext3rd/sigtrace.py
|
||||
> sigtrace=
|
||||
> signal=$TESTTMP/signal.py
|
||||
> [sigtrace]
|
||||
> pathformat=$TESTTMP/dump-%(pid)s-%(time)s.log
|
||||
|
@ -4,7 +4,7 @@ Setup the extension
|
||||
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> simplecache=$TESTDIR/../hgext3rd/simplecache.py
|
||||
> simplecache=
|
||||
> [simplecache]
|
||||
> cachedir=$TESTTMP/hgsimplecache
|
||||
> caches=memcache
|
||||
|
@ -1,8 +1,8 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> smartlog=$TESTDIR/../hgext3rd/smartlog.py
|
||||
> fbamend=
|
||||
> inhibit=
|
||||
> smartlog=
|
||||
> [experimental]
|
||||
> evolution = createmarkers
|
||||
> EOF
|
||||
|
@ -1,11 +1,11 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> fbamend=
|
||||
> histedit=
|
||||
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
|
||||
> inhibit=
|
||||
> rebase=
|
||||
> smartlog=$TESTDIR/../hgext3rd/smartlog.py
|
||||
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
|
||||
> smartlog=
|
||||
> tweakdefaults=
|
||||
> [tweakdefaults]
|
||||
> histeditkeepdate = true
|
||||
> [experimental]
|
||||
|
@ -1,7 +1,7 @@
|
||||
$ . $TESTDIR/require-ext.sh remotenames
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> smartlog=$TESTDIR/../hgext3rd/smartlog.py
|
||||
> smartlog=
|
||||
> remotenames=
|
||||
> EOF
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> rebase=
|
||||
> smartlog=$TESTDIR/../hgext3rd/smartlog.py
|
||||
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
|
||||
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
||||
> smartlog=
|
||||
> tweakdefaults=
|
||||
> fbamend=
|
||||
> [experimental]
|
||||
> evolution=createmarkers
|
||||
> evolution.allowdivergence=on
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> smartlog = $TESTDIR/../hgext3rd/smartlog.py
|
||||
> smartlog=
|
||||
> [experimental]
|
||||
> graphstyle.grandparent=|
|
||||
> graphstyle.missing=|
|
||||
|
@ -4,7 +4,7 @@ test sparse
|
||||
$ cd myrepo
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> purge=
|
||||
> strip=
|
||||
> rebase=
|
||||
|
@ -5,7 +5,7 @@ test sparse
|
||||
> ssh = python "$RUNTESTDIR/dummyssh"
|
||||
> username = nobody <no.reply@fb.com>
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> purge=
|
||||
> strip=
|
||||
> rebase=
|
||||
|
@ -2,7 +2,7 @@
|
||||
$ cd repo
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> EOF
|
||||
$ mkdir show hide
|
||||
$ echo show-modify-1 > show/modify
|
||||
|
@ -4,7 +4,7 @@ test sparse interaction with other extensions
|
||||
$ cd myrepo
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> strip=
|
||||
> [simplecache]
|
||||
> cachedir=$TESTTMP/hgsimplecache
|
||||
@ -12,7 +12,7 @@ test sparse interaction with other extensions
|
||||
|
||||
Test integration with simplecache for profile reads
|
||||
|
||||
$ $PYTHON -c 'import hgext3rd.simplecache' || exit 80
|
||||
$ $PYTHON -c 'import hgext.simplecache' || exit 80
|
||||
$ printf "[include]\nfoo\n" > .hgsparse
|
||||
$ hg add .hgsparse
|
||||
$ hg commit -qm 'Add profile'
|
||||
|
@ -4,7 +4,7 @@ test sparse
|
||||
$ cd myrepo
|
||||
$ cat >> $HGRCPATH <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> purge=
|
||||
> strip=
|
||||
> rebase=
|
||||
|
@ -4,7 +4,7 @@ test merging things outside of the sparse checkout
|
||||
$ cd myrepo
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> EOF
|
||||
|
||||
$ echo foo > foo
|
||||
|
@ -7,7 +7,7 @@ First create a base repository with sparse enabled.
|
||||
$ cd base
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> journal=
|
||||
> EOF
|
||||
|
||||
|
@ -4,7 +4,7 @@ test sparse
|
||||
$ cd myrepo
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> purge=
|
||||
> strip=
|
||||
> rebase=
|
||||
@ -252,7 +252,7 @@ Test file permissions changing across a sparse profile change
|
||||
$ cd sparseperm
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> EOF
|
||||
$ touch a b
|
||||
$ cat > .hgsparse <<EOF
|
||||
@ -278,7 +278,7 @@ Test profile discovery
|
||||
$ cd sparseprofiles
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> EOF
|
||||
$ mkdir -p profiles/foo profiles/bar
|
||||
$ touch profiles/README.txt
|
||||
|
@ -2,7 +2,7 @@
|
||||
$ cd repo
|
||||
$ cat > .hg/hgrc <<EOF
|
||||
> [extensions]
|
||||
> sparse=$TESTDIR/../hgext3rd/fbsparse.py
|
||||
> sparse=$TESTDIR/../hgext/fbsparse.py
|
||||
> dragdag=$RUNTESTDIR/drawdag.py
|
||||
> rebase=
|
||||
> EOF
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user