mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
7d7d96bd74
Consider this test:
$ hg glog --template '{rev}:{node|short} "{desc}"\n'
@ 2:20c4f79fd7ac "3"
|
| o 1:38f24201dcab "2"
|/
o 0:2a18120dc1c9 "1"
Because each line beginning with "|" can be compiled as a regular
expression (equivalent to ".*|"), they will match any output.
Similarly:
$ echo foo
The blank output line can be compiled as a regular expression and will
also match any output.
With this patch, none of the above output lines will be matched as
regular expressions. A line must end in " (re)" in order to be matched
as one.
Lines are still matched literally first, so the following will pass:
$ echo 'foo (re)'
foo (re)
70 lines
1.8 KiB
Perl
70 lines
1.8 KiB
Perl
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"
|
|
committing subrepository sub
|
|
|
|
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
|
|
|
|
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
|
|
updating to branch default
|
|
pulling subrepo sub from http://localhost:[0-9]+/sub (re)
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
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
|
|
|
|
$ "$TESTDIR/killdaemons.py"
|