mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
7d8bebd9c1
# skip-blame because this was mechanically rewritten the following script. I
ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t
ones appear to be, and they run without addition failures on both Windows and
Linux.
import argparse
import os
import re
ap = argparse.ArgumentParser()
ap.add_argument('path', nargs='+')
opts = ap.parse_args()
globre = re.compile(r'^(.*) \(glob\)(.*)$')
for p in opts.path:
tmp = p + '.tmp'
with open(p, 'rb') as src, open(tmp, 'wb') as dst:
for line in src:
m = globre.match(line)
if not m or '$LOCALIP' in line or '*' in line:
dst.write(line)
continue
if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'):
dst.write(line)
continue
dst.write(m.group(1) + m.group(2) + '\n')
os.unlink(p)
os.rename(tmp, p)
110 lines
3.0 KiB
Perl
110 lines
3.0 KiB
Perl
#require killdaemons
|
|
|
|
Preparing the subrepository 'sub'
|
|
|
|
$ hg init sub
|
|
$ echo sub > sub/sub
|
|
$ hg add -R sub
|
|
adding sub/sub
|
|
$ hg commit -R sub -m "sub import"
|
|
|
|
Preparing the 'main' repo which depends on the subrepo 'sub'
|
|
|
|
$ hg init main
|
|
$ echo main > main/main
|
|
$ echo "sub = ../sub" > main/.hgsub
|
|
$ hg clone sub main/sub
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg add -R main
|
|
adding main/.hgsub
|
|
adding main/main
|
|
$ hg commit -R main -m "main import"
|
|
|
|
Cleaning both repositories, just as a clone -U
|
|
|
|
$ hg up -C -R sub null
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg up -C -R main null
|
|
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
|
$ rm -rf main/sub
|
|
|
|
hide outer repo
|
|
$ hg init
|
|
|
|
Serving them both using hgweb
|
|
|
|
$ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf
|
|
$ hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \
|
|
> -A /dev/null -E /dev/null --pid-file hg.pid -d
|
|
$ cat hg.pid >> $DAEMON_PIDS
|
|
|
|
Clone main from hgweb
|
|
|
|
$ hg clone "http://localhost:$HGPORT/main" cloned
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 3 changes to 3 files
|
|
new changesets fdfeeb3e979e
|
|
updating to branch default
|
|
cloning subrepo sub from http://localhost:$HGPORT/sub
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets 863c1745b441
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Checking cloned repo ids
|
|
|
|
$ hg id -R cloned
|
|
fdfeeb3e979e tip
|
|
$ hg id -R cloned/sub
|
|
863c1745b441 tip
|
|
|
|
subrepo debug for 'main' clone
|
|
|
|
$ hg debugsub -R cloned
|
|
path sub
|
|
source ../sub
|
|
revision 863c1745b441bd97a8c4a096e87793073f4fb215
|
|
|
|
$ killdaemons.py
|
|
|
|
subrepo paths with ssh urls
|
|
|
|
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned sshclone
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 3 changes to 3 files
|
|
new changesets fdfeeb3e979e
|
|
updating to branch default
|
|
cloning subrepo sub from ssh://user@dummy/sub
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets 863c1745b441
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg -R sshclone push -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned
|
|
pushing to ssh://user@dummy/$TESTTMP/cloned
|
|
pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub
|
|
searching for changes
|
|
no changes found
|
|
searching for changes
|
|
no changes found
|
|
[1]
|
|
|
|
$ cat dummylog
|
|
Got arguments 1:user@dummy 2:hg -R cloned serve --stdio
|
|
Got arguments 1:user@dummy 2:hg -R sub serve --stdio
|
|
Got arguments 1:user@dummy 2:hg -R $TESTTMP/cloned serve --stdio
|
|
Got arguments 1:user@dummy 2:hg -R $TESTTMP/sub serve --stdio
|