tests: add missing no-outer-repo requirements

Outer repos (if any) will now never be touched by the tests. But it is better
to run without any repos around the tmp directory.

tests/test-alias.t

@@ -1,426 +1,428 b''
   $ HGFOO=BAR; export HGFOO
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
   > 
   > [alias]
   > # should clobber ci but not commit (issue2993)
   > ci = version
   > myinit = init
   > optionalrepo = showconfig alias.myinit
   > cleanstatus = status -c
   > unknown = bargle
   > ambiguous = s
   > recursive = recursive
   > nodefinition =
   > no--cwd = status --cwd elsewhere
   > no-R = status -R elsewhere
   > no--repo = status --repo elsewhere
   > no--repository = status --repository elsewhere
   > mylog = log
   > lognull = log -r null
   > shortlog = log --template '{rev} {node|short} | {date|isodate}\n'
   > positional = log --template '{\$2} {\$1} | {date|isodate}\n'
   > dln = lognull --debug
   > nousage = rollback
   > put = export -r 0 -o "\$FOO/%R.diff"
   > blank = !printf '\n'
   > self = !printf '\$0\n'
   > echoall = !printf '\$@\n'
   > echo1 = !printf '\$1\n'
   > echo2 = !printf '\$2\n'
   > echo13 = !printf '\$1 \$3\n'
   > count = !hg log -r "\$@" --template=. | wc -c | sed -e 's/ //g'
   > mcount = !hg log \$@ --template=. | wc -c | sed -e 's/ //g'
   > rt = root
   > tglog = glog --template "{rev}:{node|short}: '{desc}' {branches}\n"
   > idalias = id
   > idaliaslong = id
   > idaliasshell = !echo test
   > parentsshell1 = !echo one
   > parentsshell2 = !echo two
   > escaped1 = !printf 'test\$\$test\n'
   > escaped2 = !sh -c 'echo "HGFOO is \$\$HGFOO"'
   > escaped3 = !sh -c 'echo "\$1 is \$\$\$1"'
   > escaped4 = !printf '\$\$0 \$\$@\n'
   > 
   > [defaults]
   > mylog = -q
   > lognull = -q
   > log = -v
   > EOF
 
 
 basic
 
   $ hg myinit alias
 
 
 unknown
 
   $ hg unknown
   alias 'unknown' resolves to unknown command 'bargle'
   $ hg help unknown
   alias 'unknown' resolves to unknown command 'bargle'
 
 
 ambiguous
 
   $ hg ambiguous
   alias 'ambiguous' resolves to ambiguous command 's'
   $ hg help ambiguous
   alias 'ambiguous' resolves to ambiguous command 's'
 
 
 recursive
 
   $ hg recursive
   alias 'recursive' resolves to unknown command 'recursive'
   $ hg help recursive
   alias 'recursive' resolves to unknown command 'recursive'
 
 
 no definition
 
   $ hg nodef
   no definition for alias 'nodefinition'
   $ hg help nodef
   no definition for alias 'nodefinition'
 
 
 invalid options
 
   $ hg no--cwd
   error in definition for alias 'no--cwd': --cwd may only be given on the command line
   $ hg help no--cwd
   error in definition for alias 'no--cwd': --cwd may only be given on the command line
   $ hg no-R
   error in definition for alias 'no-R': -R may only be given on the command line
   $ hg help no-R
   error in definition for alias 'no-R': -R may only be given on the command line
   $ hg no--repo
   error in definition for alias 'no--repo': --repo may only be given on the command line
   $ hg help no--repo
   error in definition for alias 'no--repo': --repo may only be given on the command line
   $ hg no--repository
   error in definition for alias 'no--repository': --repository may only be given on the command line
   $ hg help no--repository
   error in definition for alias 'no--repository': --repository may only be given on the command line
 
 optional repository
 
+#if no-outer-repo
   $ hg optionalrepo
   init
+#endif
   $ cd alias
   $ cat > .hg/hgrc <<EOF
   > [alias]
   > myinit = init -q
   > EOF
   $ hg optionalrepo
   init -q
 
 no usage
 
   $ hg nousage
   no rollback information available
 
   $ echo foo > foo
   $ hg commit -Amfoo
   adding foo
 
 
 with opts
 
   $ hg cleanst
   C foo
 
 
 with opts and whitespace
 
   $ hg shortlog
   0 e63c23eaa88a | 1970-01-01 00:00 +0000
 
 positional arguments
 
   $ hg positional
   abort: too few arguments for command alias
   [255]
   $ hg positional a
   abort: too few arguments for command alias
   [255]
   $ hg positional 'node|short' rev
   0 e63c23eaa88a | 1970-01-01 00:00 +0000
 
 interaction with defaults
 
   $ hg mylog
   0:e63c23eaa88a
   $ hg lognull
   -1:000000000000
 
 
 properly recursive
 
   $ hg dln
   changeset:   -1:0000000000000000000000000000000000000000
   parent:      -1:0000000000000000000000000000000000000000
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    -1:0000000000000000000000000000000000000000
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   extra:       branch=default
   
 
 
 path expanding
 
   $ FOO=`pwd` hg put
   $ cat 0.diff
   # HG changeset patch
   # User test
   # Date 0 0
   # Node ID e63c23eaa88ae77967edcf4ea194d31167c478b0
   # Parent  0000000000000000000000000000000000000000
   foo
   
   diff -r 000000000000 -r e63c23eaa88a foo
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +foo
 
 
 simple shell aliases
 
   $ hg blank
   
   $ hg blank foo
   
   $ hg self
   self
   $ hg echoall
   
   $ hg echoall foo
   foo
   $ hg echoall 'test $2' foo
   test $2 foo
   $ hg echo1 foo bar baz
   foo
   $ hg echo2 foo bar baz
   bar
   $ hg echo13 foo bar baz test
   foo baz
   $ hg echo2 foo
   
   $ echo bar > bar
   $ hg commit -qA -m bar
   $ hg count .
   1
   $ hg count 'branch(default)'
   2
   $ hg mcount -r '"branch(default)"'
   2
 
   $ hg tglog
   @  1:7e7f92de180e: 'bar'
   |
   o  0:e63c23eaa88a: 'foo'
   
 
 
 shadowing
 
   $ hg i
   hg: command 'i' is ambiguous:
       idalias idaliaslong idaliasshell identify import incoming init
   [255]
   $ hg id
   7e7f92de180e tip
   $ hg ida
   hg: command 'ida' is ambiguous:
       idalias idaliaslong idaliasshell
   [255]
   $ hg idalias
   7e7f92de180e tip
   $ hg idaliasl
   7e7f92de180e tip
   $ hg idaliass
   test
   $ hg parentsshell
   hg: command 'parentsshell' is ambiguous:
       parentsshell1 parentsshell2
   [255]
   $ hg parentsshell1
   one
   $ hg parentsshell2
   two
 
 
 shell aliases with global options
 
   $ hg init sub
   $ cd sub
   $ hg count 'branch(default)'
   0
   $ hg -v count 'branch(default)'
   0
   $ hg -R .. count 'branch(default)'
   0
   $ hg --cwd .. count 'branch(default)'
   2
   $ hg echoall --cwd ..
   
 
 
 repo specific shell aliases
 
   $ cat >> .hg/hgrc <<EOF
   > [alias]
   > subalias = !echo sub
   > EOF
   $ cat >> ../.hg/hgrc <<EOF
   > [alias]
   > mainalias = !echo main
   > EOF
 
 
 shell alias defined in current repo
 
   $ hg subalias
   sub
   $ hg --cwd .. subalias > /dev/null
   hg: unknown command 'subalias'
   [255]
   $ hg -R .. subalias > /dev/null
   hg: unknown command 'subalias'
   [255]
 
 
 shell alias defined in other repo
 
   $ hg mainalias > /dev/null
   hg: unknown command 'mainalias'
   [255]
   $ hg -R .. mainalias
   main
   $ hg --cwd .. mainalias
   main
 
 
 shell aliases with escaped $ chars
 
   $ hg escaped1
   test$test
   $ hg escaped2
   HGFOO is BAR
   $ hg escaped3 HGFOO
   HGFOO is BAR
   $ hg escaped4 test
   $0 $@
 
 
 invalid arguments
 
   $ hg rt foo
   hg rt: invalid arguments
   hg rt
   
   alias for: hg root
   
   use "hg help rt" to show the full help text
   [255]
 
 invalid global arguments for normal commands, aliases, and shell aliases
 
   $ hg --invalid root
   hg: option --invalid not recognized
   Mercurial Distributed SCM
   
   basic commands:
   
    add           add the specified files on the next commit
    annotate      show changeset information by line for each file
    clone         make a copy of an existing repository
    commit        commit the specified files or all outstanding changes
    diff          diff repository (or selected files)
    export        dump the header and diffs for one or more changesets
    forget        forget the specified files on the next commit
    init          create a new repository in the given directory
    log           show revision history of entire repository or files
    merge         merge working directory with another revision
    phase         set or show the current phase name
    pull          pull changes from the specified source
    push          push changes to the specified destination
    remove        remove the specified files on the next commit
    serve         start stand-alone webserver
    status        show changed files in the working directory
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
   use "hg help" for the full list of commands or "hg -v" for details
   [255]
   $ hg --invalid mylog
   hg: option --invalid not recognized
   Mercurial Distributed SCM
   
   basic commands:
   
    add           add the specified files on the next commit
    annotate      show changeset information by line for each file
    clone         make a copy of an existing repository
    commit        commit the specified files or all outstanding changes
    diff          diff repository (or selected files)
    export        dump the header and diffs for one or more changesets
    forget        forget the specified files on the next commit
    init          create a new repository in the given directory
    log           show revision history of entire repository or files
    merge         merge working directory with another revision
    phase         set or show the current phase name
    pull          pull changes from the specified source
    push          push changes to the specified destination
    remove        remove the specified files on the next commit
    serve         start stand-alone webserver
    status        show changed files in the working directory
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
   use "hg help" for the full list of commands or "hg -v" for details
   [255]
   $ hg --invalid blank
   hg: option --invalid not recognized
   Mercurial Distributed SCM
   
   basic commands:
   
    add           add the specified files on the next commit
    annotate      show changeset information by line for each file
    clone         make a copy of an existing repository
    commit        commit the specified files or all outstanding changes
    diff          diff repository (or selected files)
    export        dump the header and diffs for one or more changesets
    forget        forget the specified files on the next commit
    init          create a new repository in the given directory
    log           show revision history of entire repository or files
    merge         merge working directory with another revision
    phase         set or show the current phase name
    pull          pull changes from the specified source
    push          push changes to the specified destination
    remove        remove the specified files on the next commit
    serve         start stand-alone webserver
    status        show changed files in the working directory
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
   use "hg help" for the full list of commands or "hg -v" for details
   [255]
 
 This should show id:
 
   $ hg --config alias.log='id' log
   000000000000 tip
 
 This shouldn't:
 
   $ hg --config alias.log='id' history
 
   $ cd ../..

tests/test-bundle.t

@@ -1,600 +1,603 b''
 Setting up test
 
   $ hg init test
   $ cd test
   $ echo 0 > afile
   $ hg add afile
   $ hg commit -m "0.0"
   $ echo 1 >> afile
   $ hg commit -m "0.1"
   $ echo 2 >> afile
   $ hg commit -m "0.2"
   $ echo 3 >> afile
   $ hg commit -m "0.3"
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 1 >> afile
   $ hg commit -m "1.1"
   created new head
   $ echo 2 >> afile
   $ hg commit -m "1.2"
   $ echo "a line" > fred
   $ echo 3 >> afile
   $ hg add fred
   $ hg commit -m "1.3"
   $ hg mv afile adifferentfile
   $ hg commit -m "1.3m"
   $ hg update -C 3
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg mv afile anotherfile
   $ hg commit -m "0.3m"
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   4 files, 9 changesets, 7 total revisions
   $ cd ..
   $ hg init empty
 
 Bundle and phase
 
   $ hg -R test phase --force --secret 0
   $ hg -R test bundle phase.hg empty
   searching for changes
   no changes found (ignored 9 secret changesets)
   [1]
   $ hg -R test phase --draft -r 'head()'
 
 Bundle --all
 
   $ hg -R test bundle --all all.hg
   9 changesets found
 
 Bundle test to full.hg
 
   $ hg -R test bundle full.hg empty
   searching for changes
   9 changesets found
 
 Unbundle full.hg in test
 
   $ hg -R test unbundle full.hg
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 0 changes to 4 files
   (run 'hg update' to get a working copy)
 
 Verify empty
 
   $ hg -R empty heads
   [1]
   $ hg -R empty verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   0 files, 0 changesets, 0 total revisions
 
 Pull full.hg into test (using --cwd)
 
   $ hg --cwd test pull ../full.hg
   pulling from ../full.hg
   searching for changes
   no changes found
 
 Pull full.hg into empty (using --cwd)
 
   $ hg --cwd empty pull ../full.hg
   pulling from ../full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Rollback empty
 
   $ hg -R empty rollback
   repository tip rolled back to revision -1 (undo pull)
 
 Pull full.hg into empty again (using --cwd)
 
   $ hg --cwd empty pull ../full.hg
   pulling from ../full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Pull full.hg into test (using -R)
 
   $ hg -R test pull full.hg
   pulling from full.hg
   searching for changes
   no changes found
 
 Pull full.hg into empty (using -R)
 
   $ hg -R empty pull full.hg
   pulling from full.hg
   searching for changes
   no changes found
 
 Rollback empty
 
   $ hg -R empty rollback
   repository tip rolled back to revision -1 (undo pull)
 
 Pull full.hg into empty again (using -R)
 
   $ hg -R empty pull full.hg
   pulling from full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Log -R full.hg in fresh empty
 
   $ rm -r empty
   $ hg init empty
   $ cd empty
   $ hg -R bundle://../full.hg log
   changeset:   8:aa35859c02ea
   tag:         tip
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
   changeset:   7:a6a34bfa0076
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   changeset:   6:7373c1169842
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
   changeset:   5:1bb50a9436a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
   changeset:   4:095197eb4973
   parent:      0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
   changeset:   3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3
   
   changeset:   2:e38ba6f5b7e0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.2
   
   changeset:   1:34c2bf6b0626
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.1
   
   changeset:   0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.0
   
 Make sure bundlerepo doesn't leak tempfiles (issue2491)
 
   $ ls .hg
   00changelog.i
   cache
   requires
   store
 
 Pull ../full.hg into empty (with hook)
 
   $ echo "[hooks]" >> .hg/hgrc
   $ echo "changegroup = python \"$TESTDIR\"/printenv.py changegroup" >> .hg/hgrc
 
 doesn't work (yet ?)
 
 hg -R bundle://../full.hg verify
 
   $ hg pull bundle://../full.hg
   pulling from bundle:../full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:../full.hg
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Rollback empty
 
   $ hg rollback
   repository tip rolled back to revision -1 (undo pull)
   $ cd ..
 
 Log -R bundle:empty+full.hg
 
   $ hg -R bundle:empty+full.hg log --template="{rev} "; echo ""
   8 7 6 5 4 3 2 1 0 
 
 Pull full.hg into empty again (using -R; with hook)
 
   $ hg -R empty pull full.hg
   pulling from full.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:empty+full.hg
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Create partial clones
 
   $ rm -r empty
   $ hg init empty
   $ hg clone -r 3 test partial
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone partial partial2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd partial
 
 Log -R full.hg in partial
 
   $ hg -R bundle://../full.hg log
   changeset:   8:aa35859c02ea
   tag:         tip
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
   changeset:   7:a6a34bfa0076
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   changeset:   6:7373c1169842
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
   changeset:   5:1bb50a9436a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
   changeset:   4:095197eb4973
   parent:      0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
   changeset:   3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3
   
   changeset:   2:e38ba6f5b7e0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.2
   
   changeset:   1:34c2bf6b0626
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.1
   
   changeset:   0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.0
   
 
 Incoming full.hg in partial
 
   $ hg incoming bundle://../full.hg
   comparing with bundle:../full.hg
   searching for changes
   changeset:   4:095197eb4973
   parent:      0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
   changeset:   5:1bb50a9436a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
   changeset:   6:7373c1169842
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
   changeset:   7:a6a34bfa0076
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   changeset:   8:aa35859c02ea
   tag:         tip
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
 
 Outgoing -R full.hg vs partial2 in partial
 
   $ hg -R bundle://../full.hg outgoing ../partial2
   comparing with ../partial2
   searching for changes
   changeset:   4:095197eb4973
   parent:      0:f9ee2f85a263
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.1
   
   changeset:   5:1bb50a9436a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.2
   
   changeset:   6:7373c1169842
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3
   
   changeset:   7:a6a34bfa0076
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   changeset:   8:aa35859c02ea
   tag:         tip
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
 
 Outgoing -R does-not-exist.hg vs partial2 in partial
 
   $ hg -R bundle://../does-not-exist.hg outgoing ../partial2
   abort: *../does-not-exist.hg* (glob)
   [255]
   $ cd ..
 
+hide outer repo
+  $ hg init
+
 Direct clone from bundle (all-history)
 
   $ hg clone full.hg full-clone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R full-clone heads
   changeset:   8:aa35859c02ea
   tag:         tip
   parent:      3:eebf5a27f8ca
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     0.3m
   
   changeset:   7:a6a34bfa0076
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1.3m
   
   $ rm -r full-clone
 
 When cloning from a non-copiable repository into '', do not
 recurse infinitely (issue 2528)
 
   $ hg clone full.hg ''
   abort: * (glob)
   [255]
 
 test for http://mercurial.selenic.com/bts/issue216
 
 Unbundle incremental bundles into fresh empty in one go
 
   $ rm -r empty
   $ hg init empty
   $ hg -R test bundle --base null -r 0 ../0.hg
   1 changesets found
   $ hg -R test bundle --base 0    -r 1 ../1.hg
   1 changesets found
   $ hg -R empty unbundle -u ../0.hg ../1.hg
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 test for 540d1059c802
 
 test for 540d1059c802
 
   $ hg init orig
   $ cd orig
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
 
   $ hg clone . ../copy
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tag foo
 
   $ cd ../copy
   $ echo >> foo
   $ hg ci -m 'change foo'
   $ hg bundle ../bundle.hg ../orig
   searching for changes
   1 changesets found
 
   $ cd ../orig
   $ hg incoming ../bundle.hg
   comparing with ../bundle.hg
   searching for changes
   changeset:   2:ed1b79f46b9a
   tag:         tip
   parent:      0:bbd179dfa0a7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo
   
   $ cd ..
 
 test bundle with # in the filename (issue2154):
 
   $ cp bundle.hg 'test#bundle.hg'
   $ cd orig
   $ hg incoming '../test#bundle.hg'
   comparing with ../test
   abort: unknown revision 'bundle.hg'!
   [255]
 
 note that percent encoding is not handled:
 
   $ hg incoming ../test%23bundle.hg
   abort: repository ../test%23bundle.hg not found!
   [255]
   $ cd ..
 
 test for http://mercurial.selenic.com/bts/issue1144
 
 test that verify bundle does not traceback
 
 partial history bundle, fails w/ unkown parent
 
   $ hg -R bundle.hg verify
   abort: 00changelog.i@bbd179dfa0a7: unknown parent!
   [255]
 
 full history bundle, refuses to verify non-local repo
 
   $ hg -R all.hg verify
   abort: cannot verify bundle or remote repos
   [255]
 
 but, regular verify must continue to work
 
   $ hg -R orig verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 2 changesets, 2 total revisions
 
 diff against bundle
 
   $ hg init b
   $ cd b
   $ hg -R ../all.hg diff -r tip
   diff -r aa35859c02ea anotherfile
   --- a/anotherfile	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,4 +0,0 @@
   -0
   -1
   -2
   -3
   $ cd ..
 
 bundle single branch
 
   $ hg init branchy
   $ cd branchy
   $ echo a >a
   $ echo x >x
   $ hg ci -Ama
   adding a
   adding x
   $ echo c >c
   $ echo xx >x
   $ hg ci -Amc
   adding c
   $ echo c1 >c1
   $ hg ci -Amc1
   adding c1
   $ hg up 0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo b >b
   $ hg ci -Amb
   adding b
   created new head
   $ echo b1 >b1
   $ echo xx >x
   $ hg ci -Amb1
   adding b1
   $ hg clone -q -r2 . part
 
 == bundling via incoming
 
   $ hg in -R part --bundle incoming.hg --template "{node}\n" .
   comparing with .
   searching for changes
   1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
   057f4db07f61970e1c11e83be79e9d08adc4dc31
 
 == bundling
 
   $ hg bundle bundle.hg part --debug
   query 1; heads
   searching for changes
   all remote heads known locally
   2 changesets found
   list of changesets:
   1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
   057f4db07f61970e1c11e83be79e9d08adc4dc31
   bundling: 1/2 changesets (50.00%)
   bundling: 2/2 changesets (100.00%)
   bundling: 1/2 manifests (50.00%)
   bundling: 2/2 manifests (100.00%)
   bundling: b 1/3 files (33.33%)
   bundling: b1 2/3 files (66.67%)
   bundling: x 3/3 files (100.00%)
 
 == Test for issue3441
 
   $ hg clone -q -r0 . part2
   $ hg -q -R part2 pull bundle.hg
   $ hg -R part2 verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   4 files, 3 changesets, 5 total revisions
 
   $ cd ..

tests/test-config-case.t

@@ -1,8 +1,11 b''
+hide outer repo
+  $ hg init
+
   $ echo '[Section]' >> $HGRCPATH
   $ echo 'KeY = Case Sensitive' >> $HGRCPATH
   $ echo 'key = lower case' >> $HGRCPATH
 
   $ hg showconfig Section
   Section.KeY=Case Sensitive
   Section.key=lower case
 

tests/test-convert-cvs.t

@@ -1,461 +1,461 b''
 
   $ "$TESTDIR/hghave" cvs || exit 80
   $ cvscall()
   > {
   >     cvs -f "$@"
   > }
   $ hgcat()
   > {
   >     hg --cwd src-hg cat -r tip "$1"
   > }
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert = " >> $HGRCPATH
   $ echo "graphlog = " >> $HGRCPATH
   $ cat > cvshooks.py <<EOF
   > def cvslog(ui,repo,hooktype,log):
   >     print "%s hook: %d entries"%(hooktype,len(log))
   > 
   > def cvschangesets(ui,repo,hooktype,changesets):
   >     print "%s hook: %d changesets"%(hooktype,len(changesets))
   > EOF
   $ hookpath=`pwd`
   $ echo "[hooks]" >> $HGRCPATH
   $ echo "cvslog=python:$hookpath/cvshooks.py:cvslog" >> $HGRCPATH
   $ echo "cvschangesets=python:$hookpath/cvshooks.py:cvschangesets" >> $HGRCPATH
 
 create cvs repository
 
   $ mkdir cvsrepo
   $ cd cvsrepo
   $ CVSROOT=`pwd`
   $ export CVSROOT
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
   $ cvscall -q -d "$CVSROOT" init
 
 create source directory
 
   $ mkdir src-temp
   $ cd src-temp
   $ echo a > a
   $ mkdir b
   $ cd b
   $ echo c > c
   $ cd ..
 
 import source directory
 
   $ cvscall -q import -m import src INITIAL start
   N src/a
   N src/b/c
   
   No conflicts created by this import
   
   $ cd ..
 
 checkout source directory
 
   $ cvscall -q checkout src
   U src/a
   U src/b/c
 
 commit a new revision changing b/c
 
   $ cd src
   $ sleep 1
   $ echo c >> b/c
   $ cvscall -q commit -mci0 . | grep '<--'
   $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
   $ cd ..
 
 convert fresh repo
 
   $ hg convert src src-hg
   initializing destination src-hg repository
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   5 log entries
   cvslog hook: 5 entries
   creating changesets
   3 changeset entries
   cvschangesets hook: 3 changesets
   sorting...
   converting...
   2 Initial revision
   1 import
   0 ci0
   updating tags
   $ hgcat a
   a
   $ hgcat b/c
   c
   c
 
 convert fresh repo with --filemap
 
   $ echo include b/c > filemap
   $ hg convert --filemap filemap src src-filemap
   initializing destination src-filemap repository
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   5 log entries
   cvslog hook: 5 entries
   creating changesets
   3 changeset entries
   cvschangesets hook: 3 changesets
   sorting...
   converting...
   2 Initial revision
   1 import
   filtering out empty revision
   repository tip rolled back to revision 0 (undo commit)
   0 ci0
   updating tags
   $ hgcat b/c
   c
   c
   $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
   2 update tags files: .hgtags
   1 ci0 files: b/c
   0 Initial revision files: b/c
 
 convert full repository (issue1649)
 
   $ cvscall -q -d "$CVSROOT" checkout -d srcfull "." | grep -v CVSROOT
   U srcfull/src/a
   U srcfull/src/b/c
   $ ls srcfull
   CVS
   CVSROOT
   src
   $ hg convert srcfull srcfull-hg \
   >     | grep -v 'log entries' | grep -v 'hook:' \
   >     | grep -v '^[0-3] .*' # filter instable changeset order
   initializing destination srcfull-hg repository
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   creating changesets
   4 changeset entries
   sorting...
   converting...
   updating tags
-  $ hg cat -r tip srcfull-hg/src/a
+  $ hg cat -r tip --cwd srcfull-hg src/a
   a
-  $ hg cat -r tip srcfull-hg/src/b/c
+  $ hg cat -r tip --cwd srcfull-hg src/b/c
   c
   c
 
 commit new file revisions
 
   $ cd src
   $ echo a >> a
   $ echo c >> b/c
   $ cvscall -q commit -mci1 . | grep '<--'
   $TESTTMP/cvsrepo/src/a,v  <--  a
   $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
   $ cd ..
 
 convert again
 
   $ hg convert src src-hg
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   7 log entries
   cvslog hook: 7 entries
   creating changesets
   4 changeset entries
   cvschangesets hook: 4 changesets
   sorting...
   converting...
   0 ci1
   $ hgcat a
   a
   a
   $ hgcat b/c
   c
   c
   c
 
 convert again with --filemap
 
   $ hg convert --filemap filemap src src-filemap
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   7 log entries
   cvslog hook: 7 entries
   creating changesets
   4 changeset entries
   cvschangesets hook: 4 changesets
   sorting...
   converting...
   0 ci1
   $ hgcat b/c
   c
   c
   c
   $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
   3 ci1 files: b/c
   2 update tags files: .hgtags
   1 ci0 files: b/c
   0 Initial revision files: b/c
 
 commit branch
 
   $ cd src
   $ cvs -q update -r1.1 b/c
   U b/c
   $ cvs -q tag -b branch
   T a
   T b/c
   $ cvs -q update -r branch > /dev/null
   $ echo d >> b/c
   $ cvs -q commit -mci2 . | grep '<--'
   $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
   $ cd ..
 
 convert again
 
   $ hg convert src src-hg
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   8 log entries
   cvslog hook: 8 entries
   creating changesets
   5 changeset entries
   cvschangesets hook: 5 changesets
   sorting...
   converting...
   0 ci2
   $ hgcat b/c
   c
   d
 
 convert again with --filemap
 
   $ hg convert --filemap filemap src src-filemap
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   8 log entries
   cvslog hook: 8 entries
   creating changesets
   5 changeset entries
   cvschangesets hook: 5 changesets
   sorting...
   converting...
   0 ci2
   $ hgcat b/c
   c
   d
   $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
   4 ci2 files: b/c
   3 ci1 files: b/c
   2 update tags files: .hgtags
   1 ci0 files: b/c
   0 Initial revision files: b/c
 
 commit a new revision with funny log message
 
   $ cd src
   $ sleep 1
   $ echo e >> a
   $ cvscall -q commit -m'funny
   > ----------------------------
   > log message' . | grep '<--' |\
   >  sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
   checking in src/a,v
 
 commit new file revisions with some fuzz
 
   $ sleep 1
   $ echo f >> a
   $ cvscall -q commit -mfuzzy . | grep '<--'
   $TESTTMP/cvsrepo/src/a,v  <--  a
   $ sleep 4 # the two changes will be split if fuzz < 4
   $ echo g >> b/c
   $ cvscall -q commit -mfuzzy . | grep '<--'
   $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
   $ cd ..
 
 convert again
 
   $ hg convert --config convert.cvsps.fuzz=2 src src-hg
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   11 log entries
   cvslog hook: 11 entries
   creating changesets
   8 changeset entries
   cvschangesets hook: 8 changesets
   sorting...
   converting...
   2 funny
   1 fuzzy
   0 fuzzy
   $ hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'
   o  8 (branch) fuzzy files: b/c
   |
   o  7 (branch) fuzzy files: a
   |
   o  6 (branch) funny
   |  ----------------------------
   |  log message files: a
   o  5 (branch) ci2 files: b/c
   
   o  4 () ci1 files: a b/c
   |
   o  3 () update tags files: .hgtags
   |
   o  2 () ci0 files: b/c
   |
   | o  1 (INITIAL) import files:
   |/
   o  0 () Initial revision files: a b/c
   
 
 testing debugcvsps
 
   $ cd src
   $ hg debugcvsps --fuzz=2
   collecting CVS rlog
   11 log entries
   cvslog hook: 11 entries
   creating changesets
   10 changeset entries
   cvschangesets hook: 10 changesets
   ---------------------
   PatchSet 1 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
   Branchpoints: INITIAL 
   Log:
   Initial revision
   
   Members: 
   	a:INITIAL->1.1 
   
   ---------------------
   PatchSet 2 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
   Branchpoints: INITIAL, branch 
   Log:
   Initial revision
   
   Members: 
   	b/c:INITIAL->1.1 
   
   ---------------------
   PatchSet 3 
   Date: * (glob)
   Author: * (glob)
   Branch: INITIAL
   Tag: start 
   Log:
   import
   
   Members: 
   	a:1.1->1.1.1.1 
   	b/c:1.1->1.1.1.1 
   
   ---------------------
   PatchSet 4 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
   Log:
   ci0
   
   Members: 
   	b/c:1.1->1.2 
   
   ---------------------
   PatchSet 5 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
   Branchpoints: branch 
   Log:
   ci1
   
   Members: 
   	a:1.1->1.2 
   
   ---------------------
   PatchSet 6 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
   Log:
   ci1
   
   Members: 
   	b/c:1.2->1.3 
   
   ---------------------
   PatchSet 7 
   Date: * (glob)
   Author: * (glob)
   Branch: branch
   Tag: (none) 
   Log:
   ci2
   
   Members: 
   	b/c:1.1->1.1.2.1 
   
   ---------------------
   PatchSet 8 
   Date: * (glob)
   Author: * (glob)
   Branch: branch
   Tag: (none) 
   Log:
   funny
   ----------------------------
   log message
   
   Members: 
   	a:1.2->1.2.2.1 
   
   ---------------------
   PatchSet 9 
   Date: * (glob)
   Author: * (glob)
   Branch: branch
   Tag: (none) 
   Log:
   fuzzy
   
   Members: 
   	a:1.2.2.1->1.2.2.2 
   
   ---------------------
   PatchSet 10 
   Date: * (glob)
   Author: * (glob)
   Branch: branch
   Tag: (none) 
   Log:
   fuzzy
   
   Members: 
   	b/c:1.1.2.1->1.1.2.2 
   
 
   $ cd ..

tests/test-convert-darcs.t

@@ -1,106 +1,110 b''
 
   $ "$TESTDIR/hghave" darcs || exit 80
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert=" >> $HGRCPATH
   $ echo 'graphlog =' >> $HGRCPATH
   $ DARCS_EMAIL='[e-mail]'; export DARCS_EMAIL
 
 skip if we can't import elementtree
 
   $ mkdir dummy
   $ mkdir dummy/_darcs
   $ if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then
   >     echo 'skipped: missing feature: elementtree module'
   >     exit 80
   > fi
 
+#if no-outer-repo
+
 try converting darcs1 repository
 
   $ hg clone -q "$TESTDIR/bundles/darcs1.hg" darcs
   $ hg convert -s darcs darcs/darcs1 2>&1 | grep darcs-1.0
   darcs-1.0 repository format is unsupported, please upgrade
 
+#endif
+
 initialize darcs repo
 
   $ mkdir darcs-repo
   $ cd darcs-repo
   $ darcs init
   $ echo a > a
   $ darcs record -a -l -m p0
   Finished recording patch 'p0'
   $ cd ..
 
 branch and update
 
   $ darcs get -q darcs-repo darcs-clone >/dev/null
   $ cd darcs-clone
   $ echo c >> a
   $ echo c > c
   $ darcs record -a -l -m p1.1
   Finished recording patch 'p1.1'
   $ cd ..
 
 update source
 
   $ cd darcs-repo
   $ echo b >> a
   $ echo b > b
   $ darcs record -a -l -m p1.2
   Finished recording patch 'p1.2'
 
   $ darcs pull -q -a --no-set-default ../darcs-clone
   Backing up ./a(*) (glob)
   We have conflicts in the following files:
   ./a
   $ sleep 1
   $ echo e > a
   $ echo f > f
   $ mkdir dir
   $ echo d > dir/d
   $ echo d > dir/d2
   $ darcs record -a -l -m p2
   Finished recording patch 'p2'
 
 test file and directory move
 
   $ darcs mv f ff
 
 Test remove + move
 
   $ darcs remove dir/d2
   $ rm dir/d2
   $ darcs mv dir dir2
   $ darcs record -a -l -m p3
   Finished recording patch 'p3'
 
 The converter does not currently handle patch conflicts very well.
 When they occur, it reverts *all* changes and moves forward,
 letting the conflict resolving patch fix collisions.
 Unfortunately, non-conflicting changes, like the addition of the
 "c" file in p1.1 patch are reverted too.
 Just to say that manifest not listing "c" here is a bug.
 
   $ cd ..
   $ hg convert darcs-repo darcs-repo-hg
   initializing destination darcs-repo-hg repository
   scanning source...
   sorting...
   converting...
   4 p0
   3 p1.2
   2 p1.1
   1 p2
   0 p3
   $ hg log -R darcs-repo-hg -g --template '{rev} "{desc|firstline}" ({author}) files: {files}\n' "$@"
   4 "p3" ([e-mail]) files: dir/d dir/d2 dir2/d f ff
   3 "p2" ([e-mail]) files: a dir/d dir/d2 f
   2 "p1.1" ([e-mail]) files: 
   1 "p1.2" ([e-mail]) files: a b
   0 "p0" ([e-mail]) files: a
 
   $ hg up -q -R darcs-repo-hg
   $ hg -R darcs-repo-hg manifest --debug
   7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a
   1e88685f5ddec574a34c70af492f95b6debc8741 644   b
   37406831adc447ec2385014019599dfec953c806 644   dir2/d
   b783a337463792a5c7d548ad85a7d3253c16ba8c 644   ff

tests/test-hgrc.t

@@ -1,194 +1,203 b''
+hide outer repo
+  $ hg init
+
 Use hgrc within $TESTTMP
 
   $ HGRCPATH=`pwd`/hgrc
   $ export HGRCPATH
 
 Use an alternate var for scribbling on hgrc to keep check-code from
 complaining about the important settings we may be overwriting:
 
   $ HGRC=`pwd`/hgrc
   $ export HGRC
 
 Basic syntax error
 
   $ echo "invalid" > $HGRC
   $ hg version
   hg: parse error at $TESTTMP/hgrc:1: invalid
   [255]
   $ echo "" > $HGRC
 
 Issue1199: Can't use '%' in hgrc (eg url encoded username)
 
   $ hg init "foo%bar"
   $ hg clone "foo%bar" foobar
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd foobar
   $ cat .hg/hgrc
   [paths]
   default = $TESTTMP/foo%bar (glob)
   $ hg paths
   default = $TESTTMP/foo%bar (glob)
   $ hg showconfig
   bundle.mainreporoot=$TESTTMP/foobar (glob)
   paths.default=$TESTTMP/foo%bar (glob)
   $ cd ..
 
 issue1829: wrong indentation
 
   $ echo '[foo]' > $HGRC
   $ echo '  x = y' >> $HGRC
   $ hg version
   hg: parse error at $TESTTMP/hgrc:2:   x = y
   [255]
 
   $ python -c "print '[foo]\nbar = a\n b\n c \n  de\n fg \nbaz = bif cb \n'" \
   > > $HGRC
   $ hg showconfig foo
   foo.bar=a\nb\nc\nde\nfg
   foo.baz=bif cb
 
   $ FAKEPATH=/path/to/nowhere
   $ export FAKEPATH
   $ echo '%include $FAKEPATH/no-such-file' > $HGRC
   $ hg version
   Mercurial Distributed SCM (version *) (glob)
   (see http://mercurial.selenic.com for more information)
   
   Copyright (C) 2005-2012 Matt Mackall and others
   This is free software; see the source for copying conditions. There is NO
   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   $ unset FAKEPATH
 
 make sure global options given on the cmdline take precedence
 
   $ hg showconfig --config ui.verbose=True --quiet
+  bundle.mainreporoot=$TESTTMP
   ui.verbose=False
   ui.debug=False
   ui.quiet=True
 
   $ touch foobar/untracked
   $ cat >> foobar/.hg/hgrc <<EOF
   > [ui]
   > verbose=True
   > EOF
   $ hg -R foobar st -q
 
 username expansion
 
   $ olduser=$HGUSER
   $ unset HGUSER
 
   $ FAKEUSER='John Doe'
   $ export FAKEUSER
   $ echo '[ui]' > $HGRC
   $ echo 'username = $FAKEUSER' >> $HGRC
 
   $ hg init usertest
   $ cd usertest
   $ touch bar
   $ hg commit --addremove --quiet -m "added bar"
   $ hg log --template "{author}\n"
   John Doe
   $ cd ..
 
   $ hg showconfig
+  bundle.mainreporoot=$TESTTMP
   ui.username=$FAKEUSER
 
   $ unset FAKEUSER
   $ HGUSER=$olduser
   $ export HGUSER
 
 showconfig with multiple arguments
 
   $ echo "[alias]" > $HGRC
   $ echo "log = log -g" >> $HGRC
   $ echo "[defaults]" >> $HGRC
   $ echo "identify = -n" >> $HGRC
   $ hg showconfig alias defaults
   alias.log=log -g
   defaults.identify=-n
   $ hg showconfig alias defaults.identify
   abort: only one config item permitted
   [255]
   $ hg showconfig alias.log defaults.identify
   abort: only one config item permitted
   [255]
 
 HGPLAIN
 
-  $ p=`pwd`
   $ echo "[ui]" > $HGRC
   $ echo "debug=true" >> $HGRC
   $ echo "fallbackencoding=ASCII" >> $HGRC
   $ echo "quiet=true" >> $HGRC
   $ echo "slash=true" >> $HGRC
   $ echo "traceback=true" >> $HGRC
   $ echo "verbose=true" >> $HGRC
   $ echo "style=~/.hgstyle" >> $HGRC
   $ echo "logtemplate={node}" >> $HGRC
   $ echo "[defaults]" >> $HGRC
   $ echo "identify=-n" >> $HGRC
   $ echo "[alias]" >> $HGRC
   $ echo "log=log -g" >> $HGRC
 
 customized hgrc
 
   $ hg showconfig
   read config from: $TESTTMP/hgrc
   $TESTTMP/hgrc:13: alias.log=log -g
+  none: bundle.mainreporoot=$TESTTMP
   $TESTTMP/hgrc:11: defaults.identify=-n
   $TESTTMP/hgrc:2: ui.debug=true
   $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
   $TESTTMP/hgrc:4: ui.quiet=true
   $TESTTMP/hgrc:5: ui.slash=true
   $TESTTMP/hgrc:6: ui.traceback=true
   $TESTTMP/hgrc:7: ui.verbose=true
   $TESTTMP/hgrc:8: ui.style=~/.hgstyle
   $TESTTMP/hgrc:9: ui.logtemplate={node}
 
 plain hgrc
 
   $ HGPLAIN=; export HGPLAIN
   $ hg showconfig --config ui.traceback=True --debug
   read config from: $TESTTMP/hgrc
+  none: bundle.mainreporoot=$TESTTMP
   none: ui.traceback=True
   none: ui.verbose=False
   none: ui.debug=True
   none: ui.quiet=False
 
 plain mode with exceptions
 
   $ cat > plain.py <<EOF
   > def uisetup(ui):
   >     ui.write('plain: %r\n' % ui.plain())
   > EOF
   $ echo "[extensions]" >> $HGRC
   $ echo "plain=./plain.py" >> $HGRC
   $ HGPLAINEXCEPT=; export HGPLAINEXCEPT
   $ hg showconfig --config ui.traceback=True --debug
   plain: True
   read config from: $TESTTMP/hgrc
+  none: bundle.mainreporoot=$TESTTMP
   $TESTTMP/hgrc:15: extensions.plain=./plain.py
   none: ui.traceback=True
   none: ui.verbose=False
   none: ui.debug=True
   none: ui.quiet=False
   $ unset HGPLAIN
   $ hg showconfig --config ui.traceback=True --debug
   plain: True
   read config from: $TESTTMP/hgrc
+  none: bundle.mainreporoot=$TESTTMP
   $TESTTMP/hgrc:15: extensions.plain=./plain.py
   none: ui.traceback=True
   none: ui.verbose=False
   none: ui.debug=True
   none: ui.quiet=False
   $ HGPLAINEXCEPT=i18n; export HGPLAINEXCEPT
   $ hg showconfig --config ui.traceback=True --debug
   plain: True
   read config from: $TESTTMP/hgrc
+  none: bundle.mainreporoot=$TESTTMP
   $TESTTMP/hgrc:15: extensions.plain=./plain.py
   none: ui.traceback=True
   none: ui.verbose=False
   none: ui.debug=True
   none: ui.quiet=False

tests/test-hgwebdir.t

@@ -1,1008 +1,1015 b''
   $ "$TESTDIR/hghave" serve || exit 80
 
+hide outer repo and work in dir without '.hg'
+  $ hg init
+  $ mkdir dir
+  $ cd dir
+
 Tests some basic hgwebdir functionality. Tests setting up paths and
 collection, different forms of 404s and the subdirectory support.
 
   $ mkdir webdir
   $ cd webdir
   $ hg init a
   $ echo a > a/a
   $ hg --cwd a ci -Ama -d'1 0'
   adding a
 
 create a mercurial queue repository
 
   $ hg --cwd a qinit --config extensions.hgext.mq= -c
   $ hg init b
   $ echo b > b/b
   $ hg --cwd b ci -Amb -d'2 0'
   adding b
 
 create a nested repository
 
   $ cd b
   $ hg init d
   $ echo d > d/d
   $ hg --cwd d ci -Amd -d'3 0'
   adding d
   $ cd ..
   $ hg init c
   $ echo c > c/c
   $ hg --cwd c ci -Amc -d'3 0'
   adding c
 
 create a subdirectory containing repositories and subrepositories
 
   $ mkdir notrepo
   $ cd notrepo
   $ hg init e
   $ echo e > e/e
   $ hg --cwd e ci -Ame -d'4 0'
   adding e
   $ hg init e/e2
   $ echo e2 > e/e2/e2
   $ hg --cwd e/e2 ci -Ame2 -d '4 0'
   adding e2
   $ hg init f
   $ echo f > f/f
   $ hg --cwd f ci -Amf -d'4 0'
   adding f
   $ hg init f/f2
   $ echo f2 > f/f2/f2
   $ hg --cwd f/f2 ci -Amf2 -d '4 0'
   adding f2
   $ cd ..
 
 create repository without .hg/store
 
   $ hg init nostore
   $ rm -R nostore/.hg/store
   $ root=`pwd`
   $ cd ..
+
+serve
   $ cat > paths.conf <<EOF
   > [paths]
   > a=$root/a
   > b=$root/b
   > EOF
   $ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf paths.conf \
   >     -A access-paths.log -E error-paths-1.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 should give a 404 - file does not exist
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/file/tip/bork?style=raw'
   404 Not Found
   
   
   error: bork@8580ff50825a: not found in manifest
   [1]
 
 should succeed
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw'
   200 Script output follows
   
   
   /a/
   /b/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/file/tip/a?style=raw'
   200 Script output follows
   
   a
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/b/file/tip/b?style=raw'
   200 Script output follows
   
   b
 
 should give a 404 - repo is not published
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/c/file/tip/c?style=raw'
   404 Not Found
   
   
   error: repository c/file/tip/c not found
   [1]
 
 atom-log without basedir
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/atom-log' | grep '<link'
    <link rel="self" href="http://*:$HGPORT/a/atom-log"/> (glob)
    <link rel="alternate" href="http://*:$HGPORT/a/"/> (glob)
     <link href="http://*:$HGPORT/a/rev/8580ff50825a"/> (glob)
 
 rss-log without basedir
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/rss-log' | grep '<guid'
       <guid isPermaLink="true">http://*:$HGPORT/a/rev/8580ff50825a</guid> (glob)
   $ cat > paths.conf <<EOF
   > [paths]
   > t/a/=$root/a
   > b=$root/b
   > coll=$root/*
   > rcoll=$root/**
   > star=*
   > starstar=**
   > astar=webdir/a/*
   > EOF
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
   >     -A access-paths.log -E error-paths-2.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 should succeed, slashy names
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw'
   200 Script output follows
   
   
   /t/a/
   /b/
   /coll/a/
   /coll/a/.hg/patches/
   /coll/b/
   /coll/c/
   /coll/notrepo/e/
   /coll/notrepo/f/
   /rcoll/a/
   /rcoll/a/.hg/patches/
   /rcoll/b/
   /rcoll/b/d/
   /rcoll/c/
   /rcoll/notrepo/e/
   /rcoll/notrepo/e/e2/
   /rcoll/notrepo/f/
   /rcoll/notrepo/f/f2/
   /star/webdir/a/
   /star/webdir/a/.hg/patches/
   /star/webdir/b/
   /star/webdir/c/
   /star/webdir/notrepo/e/
   /star/webdir/notrepo/f/
   /starstar/webdir/a/
   /starstar/webdir/a/.hg/patches/
   /starstar/webdir/b/
   /starstar/webdir/b/d/
   /starstar/webdir/c/
   /starstar/webdir/notrepo/e/
   /starstar/webdir/notrepo/e/e2/
   /starstar/webdir/notrepo/f/
   /starstar/webdir/notrepo/f/f2/
   /astar/
   /astar/.hg/patches/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=paper'
   200 Script output follows
   
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
   <head>
   <link rel="icon" href="/static/hgicon.png" type="image/png" />
   <meta name="robots" content="index, nofollow" />
   <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>Mercurial repositories index</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <a href="http://mercurial.selenic.com/">
   <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
   </div>
   <div class="main">
   <h2>Mercurial Repositories</h2>
   
   <table class="bigtable">
       <tr>
           <th><a href="?sort=name">Name</a></th>
           <th><a href="?sort=description">Description</a></th>
           <th><a href="?sort=contact">Contact</a></th>
           <th><a href="?sort=lastchange">Last modified</a></th>
           <th>&nbsp;</th>
       </tr>
       
   <tr class="parity0">
   <td><a href="/t/a/?style=paper">t/a</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/b/?style=paper">b</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/coll/a/?style=paper">coll/a</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/coll/a/.hg/patches/?style=paper">coll/a/.hg/patches</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/coll/b/?style=paper">coll/b</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/coll/c/?style=paper">coll/c</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/coll/notrepo/e/?style=paper">coll/notrepo/e</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/coll/notrepo/f/?style=paper">coll/notrepo/f</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/rcoll/a/?style=paper">rcoll/a</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/rcoll/a/.hg/patches/?style=paper">rcoll/a/.hg/patches</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/rcoll/b/?style=paper">rcoll/b</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/rcoll/b/d/?style=paper">rcoll/b/d</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/rcoll/c/?style=paper">rcoll/c</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/rcoll/notrepo/e/?style=paper">rcoll/notrepo/e</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/rcoll/notrepo/e/e2/?style=paper">rcoll/notrepo/e/e2</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/rcoll/notrepo/f/?style=paper">rcoll/notrepo/f</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/rcoll/notrepo/f/f2/?style=paper">rcoll/notrepo/f/f2</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/star/webdir/a/?style=paper">star/webdir/a</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/star/webdir/a/.hg/patches/?style=paper">star/webdir/a/.hg/patches</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/star/webdir/b/?style=paper">star/webdir/b</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/star/webdir/c/?style=paper">star/webdir/c</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/star/webdir/notrepo/e/?style=paper">star/webdir/notrepo/e</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/star/webdir/notrepo/f/?style=paper">star/webdir/notrepo/f</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/starstar/webdir/a/?style=paper">starstar/webdir/a</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/starstar/webdir/a/.hg/patches/?style=paper">starstar/webdir/a/.hg/patches</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/starstar/webdir/b/?style=paper">starstar/webdir/b</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/starstar/webdir/b/d/?style=paper">starstar/webdir/b/d</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/starstar/webdir/c/?style=paper">starstar/webdir/c</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/starstar/webdir/notrepo/e/?style=paper">starstar/webdir/notrepo/e</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/starstar/webdir/notrepo/e/e2/?style=paper">starstar/webdir/notrepo/e/e2</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/starstar/webdir/notrepo/f/?style=paper">starstar/webdir/notrepo/f</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/starstar/webdir/notrepo/f/f2/?style=paper">starstar/webdir/notrepo/f/f2</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity0">
   <td><a href="/astar/?style=paper">astar</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   <tr class="parity1">
   <td><a href="/astar/.hg/patches/?style=paper">astar/.hg/patches</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   </table>
   </div>
   </div>
   <script type="text/javascript">process_dates()</script>
   
   
   </body>
   </html>
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t?style=raw'
   200 Script output follows
   
   
   /t/a/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=raw'
   200 Script output follows
   
   
   /t/a/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=paper'
   200 Script output follows
   
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
   <head>
   <link rel="icon" href="/static/hgicon.png" type="image/png" />
   <meta name="robots" content="index, nofollow" />
   <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>Mercurial repositories index</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <a href="http://mercurial.selenic.com/">
   <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
   </div>
   <div class="main">
   <h2>Mercurial Repositories</h2>
   
   <table class="bigtable">
       <tr>
           <th><a href="?sort=name">Name</a></th>
           <th><a href="?sort=description">Description</a></th>
           <th><a href="?sort=contact">Contact</a></th>
           <th><a href="?sort=lastchange">Last modified</a></th>
           <th>&nbsp;</th>
       </tr>
       
   <tr class="parity0">
   <td><a href="/t/a/?style=paper">a</a></td>
   <td>unknown</td>
   <td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td>
   <td class="age">*</td> (glob)
   <td class="indexlinks"></td>
   </tr>
   
   </table>
   </div>
   </div>
   <script type="text/javascript">process_dates()</script>
   
   
   </body>
   </html>
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/a?style=atom'
   200 Script output follows
   
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
    <id>http://*:$HGPORT1/t/a/</id> (glob)
    <link rel="self" href="http://*:$HGPORT1/t/a/atom-log"/> (glob)
    <link rel="alternate" href="http://*:$HGPORT1/t/a/"/> (glob)
    <title>t/a Changelog</title>
    <updated>1970-01-01T00:00:01+00:00</updated>
   
    <entry>
     <title>a</title>
     <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob)
     <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
     </author>
     <updated>1970-01-01T00:00:01+00:00</updated>
     <published>1970-01-01T00:00:01+00:00</published>
     <content type="xhtml">
      <div xmlns="http://www.w3.org/1999/xhtml">
       <pre xml:space="preserve">a</pre>
      </div>
     </content>
    </entry>
   
   </feed>
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/a/?style=atom'
   200 Script output follows
   
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
    <id>http://*:$HGPORT1/t/a/</id> (glob)
    <link rel="self" href="http://*:$HGPORT1/t/a/atom-log"/> (glob)
    <link rel="alternate" href="http://*:$HGPORT1/t/a/"/> (glob)
    <title>t/a Changelog</title>
    <updated>1970-01-01T00:00:01+00:00</updated>
   
    <entry>
     <title>a</title>
     <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob)
     <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
     </author>
     <updated>1970-01-01T00:00:01+00:00</updated>
     <published>1970-01-01T00:00:01+00:00</published>
     <content type="xhtml">
      <div xmlns="http://www.w3.org/1999/xhtml">
       <pre xml:space="preserve">a</pre>
      </div>
     </content>
    </entry>
   
   </feed>
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/a/file/tip/a?style=raw'
   200 Script output follows
   
   a
 
 Test [paths] '*' extension
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/coll/?style=raw'
   200 Script output follows
   
   
   /coll/a/
   /coll/a/.hg/patches/
   /coll/b/
   /coll/c/
   /coll/notrepo/e/
   /coll/notrepo/f/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/coll/a/file/tip/a?style=raw'
   200 Script output follows
   
   a
 
 Test [paths] '**' extension
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/?style=raw'
   200 Script output follows
   
   
   /rcoll/a/
   /rcoll/a/.hg/patches/
   /rcoll/b/
   /rcoll/b/d/
   /rcoll/c/
   /rcoll/notrepo/e/
   /rcoll/notrepo/e/e2/
   /rcoll/notrepo/f/
   /rcoll/notrepo/f/f2/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/b/d/file/tip/d?style=raw'
   200 Script output follows
   
   d
 
 Test collapse = True
 
   $ "$TESTDIR/killdaemons.py"
   $ cat >> paths.conf <<EOF
   > [web]
   > collapse=true
   > EOF
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
   >     -A access-paths.log -E error-paths-3.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/coll/?style=raw'
   200 Script output follows
   
   
   /coll/a/
   /coll/a/.hg/patches/
   /coll/b/
   /coll/c/
   /coll/notrepo/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/coll/a/file/tip/a?style=raw'
   200 Script output follows
   
   a
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/?style=raw'
   200 Script output follows
   
   
   /rcoll/a/
   /rcoll/a/.hg/patches/
   /rcoll/b/
   /rcoll/b/d/
   /rcoll/c/
   /rcoll/notrepo/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/b/d/file/tip/d?style=raw'
   200 Script output follows
   
   d
 
 Test intermediate directories
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/notrepo/?style=raw'
   200 Script output follows
   
   
   /rcoll/notrepo/e/
   /rcoll/notrepo/e/e2/
   /rcoll/notrepo/f/
   /rcoll/notrepo/f/f2/
   
 
 Test repositories inside intermediate directories
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/notrepo/e/file/tip/e?style=raw'
   200 Script output follows
   
   e
 
 Test subrepositories inside intermediate directories
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/notrepo/f/f2/file/tip/f2?style=raw'
   200 Script output follows
   
   f2
 
 Test descend = False
 
   $ "$TESTDIR/killdaemons.py"
   $ cat >> paths.conf <<EOF
   > descend=false
   > EOF
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
   >     -A access-paths.log -E error-paths-4.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/coll/?style=raw'
   200 Script output follows
   
   
   /coll/a/
   /coll/b/
   /coll/c/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/coll/a/file/tip/a?style=raw'
   200 Script output follows
   
   a
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/?style=raw'
   200 Script output follows
   
   
   /rcoll/a/
   /rcoll/b/
   /rcoll/c/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/b/d/file/tip/d?style=raw'
   200 Script output follows
   
   d
 
 Test intermediate directories
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/notrepo/?style=raw'
   200 Script output follows
   
   
   /rcoll/notrepo/e/
   /rcoll/notrepo/f/
   
 
 Test repositories inside intermediate directories
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/notrepo/e/file/tip/e?style=raw'
   200 Script output follows
   
   e
 
 Test subrepositories inside intermediate directories
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/notrepo/f/f2/file/tip/f2?style=raw'
   200 Script output follows
   
   f2
 
 Test [paths] '*' in a repo root
 
   $ hg id http://localhost:$HGPORT1/astar
   8580ff50825a
 
   $ "$TESTDIR/killdaemons.py"
   $ cat > paths.conf <<EOF
   > [paths]
   > t/a = $root/a
   > t/b = $root/b
   > c = $root/c
   > EOF
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
   >     -A access-paths.log -E error-paths-5.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw'
   200 Script output follows
   
   
   /t/a/
   /t/b/
   /c/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=raw'
   200 Script output follows
   
   
   /t/a/
   /t/b/
   
 
 Test collapse = True
 
   $ "$TESTDIR/killdaemons.py"
   $ cat >> paths.conf <<EOF
   > [web]
   > collapse=true
   > EOF
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
   >     -A access-paths.log -E error-paths-6.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw'
   200 Script output follows
   
   
   /t/
   /c/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=raw'
   200 Script output follows
   
   
   /t/a/
   /t/b/
   
 
 test descend = False
 
   $ "$TESTDIR/killdaemons.py"
   $ cat >> paths.conf <<EOF
   > descend=false
   > EOF
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
   >     -A access-paths.log -E error-paths-7.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw'
   200 Script output follows
   
   
   /c/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=raw'
   200 Script output follows
   
   
   /t/a/
   /t/b/
   
   $ "$TESTDIR/killdaemons.py"
   $ cat > paths.conf <<EOF
   > [paths]
   > nostore = $root/nostore
   > inexistent = $root/inexistent
   > EOF
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
   >     -A access-paths.log -E error-paths-8.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 test inexistent and inaccessible repo should be ignored silently
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/'
   200 Script output follows
   
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
   <head>
   <link rel="icon" href="/static/hgicon.png" type="image/png" />
   <meta name="robots" content="index, nofollow" />
   <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>Mercurial repositories index</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <a href="http://mercurial.selenic.com/">
   <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
   </div>
   <div class="main">
   <h2>Mercurial Repositories</h2>
   
   <table class="bigtable">
       <tr>
           <th><a href="?sort=name">Name</a></th>
           <th><a href="?sort=description">Description</a></th>
           <th><a href="?sort=contact">Contact</a></th>
           <th><a href="?sort=lastchange">Last modified</a></th>
           <th>&nbsp;</th>
       </tr>
       
   </table>
   </div>
   </div>
   <script type="text/javascript">process_dates()</script>
   
   
   </body>
   </html>
   
   $ cat > collections.conf <<EOF
   > [collections]
   > $root=$root
   > EOF
   $ hg serve --config web.baseurl=http://hg.example.com:8080/ -p $HGPORT2 -d \
   >     --pid-file=hg.pid --webdir-conf collections.conf \
   >     -A access-collections.log -E error-collections.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 collections: should succeed
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw'
   200 Script output follows
   
   
   /a/
   /a/.hg/patches/
   /b/
   /c/
   /notrepo/e/
   /notrepo/f/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/file/tip/a?style=raw'
   200 Script output follows
   
   a
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/b/file/tip/b?style=raw'
   200 Script output follows
   
   b
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/c/file/tip/c?style=raw'
   200 Script output follows
   
   c
 
 atom-log with basedir /
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/atom-log' | grep '<link'
    <link rel="self" href="http://hg.example.com:8080/a/atom-log"/>
    <link rel="alternate" href="http://hg.example.com:8080/a/"/>
     <link href="http://hg.example.com:8080/a/rev/8580ff50825a"/>
 
 rss-log with basedir /
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/rss-log' | grep '<guid'
       <guid isPermaLink="true">http://hg.example.com:8080/a/rev/8580ff50825a</guid>
   $ "$TESTDIR/killdaemons.py"
   $ hg serve --config web.baseurl=http://hg.example.com:8080/foo/ -p $HGPORT2 -d \
   >     --pid-file=hg.pid --webdir-conf collections.conf \
   >     -A access-collections-2.log -E error-collections-2.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 atom-log with basedir /foo/
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/atom-log' | grep '<link'
    <link rel="self" href="http://hg.example.com:8080/foo/a/atom-log"/>
    <link rel="alternate" href="http://hg.example.com:8080/foo/a/"/>
     <link href="http://hg.example.com:8080/foo/a/rev/8580ff50825a"/>
 
 rss-log with basedir /foo/
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/rss-log' | grep '<guid'
       <guid isPermaLink="true">http://hg.example.com:8080/foo/a/rev/8580ff50825a</guid>
 
 paths errors 1
 
   $ cat error-paths-1.log
 
 paths errors 2
 
   $ cat error-paths-2.log
 
 paths errors 3
 
   $ cat error-paths-3.log
 
 paths errors 4
 
   $ cat error-paths-4.log
 
 paths errors 5
 
   $ cat error-paths-5.log
 
 paths errors 6
 
   $ cat error-paths-6.log
 
 paths errors 7
 
   $ cat error-paths-7.log
 
 paths errors 8
 
   $ cat error-paths-8.log
 
 collections errors
 
   $ cat error-collections.log
 
 collections errors 2
 
   $ cat error-collections-2.log

tests/test-hgwebdirsym.t

@@ -1,76 +1,80 b''
 Tests whether or not hgwebdir properly handles various symlink topologies.
 
   $ "$TESTDIR/hghave" serve symlink || exit 80
+
+hide outer repo
+  $ hg init
+
   $ hg init a
   $ echo a > a/a
   $ hg --cwd a ci -Ama -d'1 0'
   adding a
   $ mkdir webdir
   $ cd webdir
   $ hg init b
   $ echo b > b/b
   $ hg --cwd b ci -Amb -d'2 0'
   adding b
   $ hg init c
   $ echo c > c/c
   $ hg --cwd c ci -Amc -d'3 0'
   adding c
   $ ln -s ../a al
   $ ln -s ../webdir circle
   $ root=`pwd`
   $ cd ..
   $ cat > collections.conf <<EOF
   > [collections]
   > $root=$root
   > EOF
   $ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \
   >     -A access-collections.log -E error-collections.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 should succeed
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw'
   200 Script output follows
   
   
   /al/
   /b/
   /c/
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/al/file/tip/a?style=raw'
   200 Script output follows
   
   a
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/b/file/tip/b?style=raw'
   200 Script output follows
   
   b
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/c/file/tip/c?style=raw'
   200 Script output follows
   
   c
 
 should fail
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/circle/al/file/tip/a?style=raw'
   404 Not Found
   
   
   error: repository circle/al/file/tip/a not found
   [1]
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/circle/b/file/tip/a?style=raw'
   404 Not Found
   
   
   error: repository circle/b/file/tip/a not found
   [1]
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/circle/c/file/tip/a?style=raw'
   404 Not Found
   
   
   error: repository circle/c/file/tip/a not found
   [1]
 
 collections errors
 
   $ cat error-collections.log

tests/test-i18n.t

@@ -1,36 +1,40 b''
 Translations are optional:
 
   $ "$TESTDIR/hghave" gettext || exit 80
 
+#if no-outer-repo
+
 Test that translations are compiled and installed correctly.
 
 Default encoding in tests is "ascii" and the translation is encoded
 using the "replace" error handler:
 
   $ LANGUAGE=pt_BR hg tip
   abortado: n?o foi encontrado um reposit?rio em '$TESTTMP' (.hg n?o encontrado)!
   [255]
 
 Using a more accomodating encoding:
 
   $ HGENCODING=UTF-8 LANGUAGE=pt_BR hg tip
   abortado: n\xc3\xa3o foi encontrado um reposit\xc3\xb3rio em '$TESTTMP' (.hg n\xc3\xa3o encontrado)! (esc)
   [255]
 
 Different encoding:
 
   $ HGENCODING=Latin-1 LANGUAGE=pt_BR hg tip
   abortado: n\xe3o foi encontrado um reposit\xf3rio em '$TESTTMP' (.hg n\xe3o encontrado)! (esc)
   [255]
 
+#endif
+
 Test keyword search in translated help text:
 
   $ HGENCODING=UTF-8 LANGUAGE=de hg help -k blättern
   Topics:
   
    extensions Benutzung erweiterter Funktionen
   
   Erweiterungen:
   
    pager Verwendet einen externen Pager zum Bl\xc3\xa4ttern in der Ausgabe von Befehlen (esc)
 

tests/test-keyword.t

@@ -1,1131 +1,1134 b''
   $ "$TESTDIR/hghave" unix-permissions serve || exit 80
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > keyword =
   > mq =
   > notify =
   > record =
   > transplant =
   > [ui]
   > interactive = true
   > EOF
 
+hide outer repo
+  $ hg init
+
 Run kwdemo before [keyword] files are set up
 as it would succeed without uisetup otherwise
 
   $ hg --quiet kwdemo
   [extensions]
   keyword =
   [keyword]
   demo.txt = 
   [keywordset]
   svn = False
   [keywordmaps]
   Author = {author|user}
   Date = {date|utcdate}
   Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
   Id = {file|basename},v {node|short} {date|utcdate} {author|user}
   RCSFile = {file|basename},v
   RCSfile = {file|basename},v
   Revision = {node|short}
   Source = {root}/{file},v
   $Author: test $
   $Date: ????/??/?? ??:??:?? $ (glob)
   $Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
   $Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
   $RCSFile: demo.txt,v $
   $RCSfile: demo.txt,v $
   $Revision: ???????????? $ (glob)
   $Source: */demo.txt,v $ (glob)
 
   $ hg --quiet kwdemo "Branch = {branches}"
   [extensions]
   keyword =
   [keyword]
   demo.txt = 
   [keywordset]
   svn = False
   [keywordmaps]
   Branch = {branches}
   $Branch: demobranch $
 
   $ cat <<EOF >> $HGRCPATH
   > [keyword]
   > ** =
   > b = ignore
   > i = ignore
   > [hooks]
   > EOF
   $ cp $HGRCPATH $HGRCPATH.nohooks
   > cat <<EOF >> $HGRCPATH
   > commit=
   > commit.test=cp a hooktest
   > EOF
 
   $ hg init Test-bndl
   $ cd Test-bndl
 
 kwshrink should exit silently in empty/invalid repo
 
   $ hg kwshrink
 
 Symlinks cannot be created on Windows.
 A bundle to test this was made with:
  hg init t
  cd t
  echo a > a
  ln -s a sym
  hg add sym
  hg ci -m addsym -u mercurial
  hg bundle --base null ../test-keyword.hg
 
   $ hg pull -u "$TESTDIR"/bundles/test-keyword.hg
   pulling from *test-keyword.hg (glob)
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo 'expand $Id$' > a
   $ echo 'do not process $Id:' >> a
   $ echo 'xxx $' >> a
   $ echo 'ignore $Id$' > b
 
 Output files as they were created
 
   $ cat a b
   expand $Id$
   do not process $Id:
   xxx $
   ignore $Id$
 
 no kwfiles
 
   $ hg kwfiles
 
 untracked candidates
 
   $ hg -v kwfiles --unknown
   k a
 
 Add files and check status
 
   $ hg addremove
   adding a
   adding b
   $ hg status
   A a
   A b
 
 
 Default keyword expansion including commit hook
 Interrupted commit should not change state or run commit hook
 
   $ hg --debug commit
   abort: empty commit message
   [255]
   $ hg status
   A a
   A b
 
 Commit with several checks
 
   $ hg --debug commit -mabsym -u 'User Name <[e-mail]>'
   a
   b
   overwriting a expanding keywords
   running hook commit.test: cp a hooktest
   committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
   $ hg status
   ? hooktest
   $ hg debugrebuildstate
   $ hg --quiet identify
   ef63ca68695b
 
 cat files in working directory with keywords expanded
 
   $ cat a b
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
 
 hg cat files and symlink, no expansion
 
   $ hg cat sym a b && echo
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
   a
 
   $ diff a hooktest
 
   $ cp $HGRCPATH.nohooks $HGRCPATH
   $ rm hooktest
 
 hg status of kw-ignored binary file starting with '\1\n'
 
   >>> open("i", "wb").write("\1\nfoo")
   $ hg -q commit -Am metasep i
   $ hg status
   >>> open("i", "wb").write("\1\nbar")
   $ hg status
   M i
   $ hg -q commit -m "modify metasep" i
   $ hg status --rev 2:3
   M i
   $ touch empty
   $ hg -q commit -A -m "another file"
   $ hg status -A --rev 3:4 i
   C i
 
   $ hg -q strip -n 2
 
 Test hook execution
 
 bundle
 
   $ hg bundle --base null ../kw.hg
   2 changesets found
   $ cd ..
   $ hg init Test
   $ cd Test
 
 Notify on pull to check whether keywords stay as is in email
 ie. if patch.diff wrapper acts as it should
 
   $ cat <<EOF >> $HGRCPATH
   > [hooks]
   > incoming.notify = python:hgext.notify.hook
   > [notify]
   > sources = pull
   > diffstat = False
   > maxsubject = 15
   > [reposubs]
   > * = Test
   > EOF
 
 Pull from bundle and trigger notify
 
   $ hg pull -u ../kw.hg
   pulling from ../kw.hg
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date: * (glob)
   Subject: changeset in...
   From: mercurial
   X-Hg-Notification: changeset a2392c293916
   Message-Id: <hg.a2392c293916*> (glob)
   To: Test
   
   changeset a2392c293916 in $TESTTMP/Test (glob)
   details: $TESTTMP/Test?cmd=changeset;node=a2392c293916
   description:
   	addsym
   
   diffs (6 lines):
   
   diff -r 000000000000 -r a2392c293916 sym
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/sym	Sat Feb 09 20:25:47 2008 +0100
   @@ -0,0 +1,1 @@
   +a
   \ No newline at end of file
   Content-Type: text/plain; charset="us-ascii"
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date:* (glob)
   Subject: changeset in...
   From: User Name <[e-mail]>
   X-Hg-Notification: changeset ef63ca68695b
   Message-Id: <hg.ef63ca68695b*> (glob)
   To: Test
   
   changeset ef63ca68695b in $TESTTMP/Test (glob)
   details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
   description:
   	absym
   
   diffs (12 lines):
   
   diff -r a2392c293916 -r ef63ca68695b a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,3 @@
   +expand $Id$
   +do not process $Id:
   +xxx $
   diff -r a2392c293916 -r ef63ca68695b b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +ignore $Id$
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cp $HGRCPATH.nohooks $HGRCPATH
 
 Touch files and check with status
 
   $ touch a b
   $ hg status
 
 Update and expand
 
   $ rm sym a b
   $ hg update -C
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat a b
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
 
 Check whether expansion is filewise and file mode is preserved
 
   $ echo '$Id$' > c
   $ echo 'tests for different changenodes' >> c
   $ chmod 600 c
   $ ls -l c | cut -b 1-10
   -rw-------
 
 commit file c
 
   $ hg commit -A -mcndiff -d '1 0' -u 'User Name <[e-mail]>'
   adding c
   $ ls -l c | cut -b 1-10
   -rw-------
 
 force expansion
 
   $ hg -v kwexpand
   overwriting a expanding keywords
   overwriting c expanding keywords
 
 compare changenodes in a and c
 
   $ cat a c
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
   tests for different changenodes
 
 record
 
   $ echo '$Id$' > r
   $ hg add r
 
 record chunk
 
   >>> lines = open('a').readlines()
   >>> lines.insert(1, 'foo\n')
   >>> lines.append('bar\n')
   >>> open('a', 'w').writelines(lines)
   $ hg record -d '1 10' -m rectest a<<EOF
   > y
   > y
   > n
   > EOF
   diff --git a/a b/a
   2 hunks, 2 lines changed
   examine changes to 'a'? [Ynesfdaq?] 
   @@ -1,3 +1,4 @@
    expand $Id$
   +foo
    do not process $Id:
    xxx $
   record change 1/2 to 'a'? [Ynesfdaq?] 
   @@ -2,2 +3,3 @@
    do not process $Id:
    xxx $
   +bar
   record change 2/2 to 'a'? [Ynesfdaq?] 
 
   $ hg identify
   d17e03c92c97+ tip
   $ hg status
   M a
   A r
 
 Cat modified file a
 
   $ cat a
   expand $Id: a,v d17e03c92c97 1970/01/01 00:00:01 test $
   foo
   do not process $Id:
   xxx $
   bar
 
 Diff remaining chunk
 
   $ hg diff a
   diff -r d17e03c92c97 a
   --- a/a	Wed Dec 31 23:59:51 1969 -0000
   +++ b/a	* (glob)
   @@ -2,3 +2,4 @@
    foo
    do not process $Id:
    xxx $
   +bar
 
   $ hg rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
 
 Record all chunks in file a
 
   $ echo foo > msg
 
  - do not use "hg record -m" here!
 
   $ hg record -l msg -d '1 11' a<<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/a b/a
   2 hunks, 2 lines changed
   examine changes to 'a'? [Ynesfdaq?] 
   @@ -1,3 +1,4 @@
    expand $Id$
   +foo
    do not process $Id:
    xxx $
   record change 1/2 to 'a'? [Ynesfdaq?] 
   @@ -2,2 +3,3 @@
    do not process $Id:
    xxx $
   +bar
   record change 2/2 to 'a'? [Ynesfdaq?] 
 
 File a should be clean
 
   $ hg status -A a
   C a
 
 rollback and revert expansion
 
   $ cat a
   expand $Id: a,v 59f969a3b52c 1970/01/01 00:00:01 test $
   foo
   do not process $Id:
   xxx $
   bar
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   overwriting a expanding keywords
   $ hg status a
   M a
   $ cat a
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   foo
   do not process $Id:
   xxx $
   bar
   $ echo '$Id$' > y
   $ echo '$Id$' > z
   $ hg add y
   $ hg commit -Am "rollback only" z
   $ cat z
   $Id: z,v 45a5d3adce53 1970/01/01 00:00:00 test $
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   overwriting z shrinking keywords
 
 Only z should be overwritten
 
   $ hg status a y z
   M a
   A y
   A z
   $ cat z
   $Id$
   $ hg forget y z
   $ rm y z
 
 record added file alone
 
   $ hg -v record -l msg -d '1 12' r<<EOF
   > y
   > EOF
   diff --git a/r b/r
   new file mode 100644
   examine changes to 'r'? [Ynesfdaq?] 
   r
   committed changeset 3:899491280810
   overwriting r expanding keywords
  - status call required for dirstate.normallookup() check
   $ hg status r
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   overwriting r shrinking keywords
   $ hg forget r
   $ rm msg r
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 record added keyword ignored file
 
   $ echo '$Id$' > i
   $ hg add i
   $ hg --verbose record -d '1 13' -m recignored<<EOF
   > y
   > EOF
   diff --git a/i b/i
   new file mode 100644
   examine changes to 'i'? [Ynesfdaq?] 
   i
   committed changeset 3:5f40fe93bbdc
   $ cat i
   $Id$
   $ hg -q rollback
   $ hg forget i
   $ rm i
 
 amend
 
   $ echo amend >> a
   $ echo amend >> b
   $ hg -q commit -d '1 14' -m 'prepare amend'
 
   $ hg --debug commit --amend -d '1 15' -m 'amend without changes' | grep keywords
   invalidating branch cache (tip differs)
   overwriting a expanding keywords
   $ hg -q id
   a71343332ea9
   $ head -1 a
   expand $Id: a,v a71343332ea9 1970/01/01 00:00:01 test $
 
   $ hg -q strip -n tip
 
 Test patch queue repo
 
   $ hg init --mq
   $ hg qimport -r tip -n mqtest.diff
   $ hg commit --mq -m mqtest
 
 Keywords should not be expanded in patch
 
   $ cat .hg/patches/mqtest.diff
   # HG changeset patch
   # User User Name <[e-mail]>
   # Date 1 0
   # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
   # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
   cndiff
   
   diff -r ef63ca68695b -r 40a904bbbe4c c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,2 @@
   +$Id$
   +tests for different changenodes
 
   $ hg qpop
   popping mqtest.diff
   patch queue now empty
 
 qgoto, implying qpush, should expand
 
   $ hg qgoto mqtest.diff
   applying mqtest.diff
   now at: mqtest.diff
   $ cat c
   $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
   tests for different changenodes
   $ hg cat c
   $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
   tests for different changenodes
 
 Keywords should not be expanded in filelog
 
   $ hg --config 'extensions.keyword=!' cat c
   $Id$
   tests for different changenodes
 
 qpop and move on
 
   $ hg qpop
   popping mqtest.diff
   patch queue now empty
 
 Copy and show added kwfiles
 
   $ hg cp a c
   $ hg kwfiles
   a
   c
 
 Commit and show expansion in original and copy
 
   $ hg --debug commit -ma2c -d '1 0' -u 'User Name <[e-mail]>'
   c
    c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
   removing unknown node 40a904bbbe4c from 1-phase boundary
   overwriting c expanding keywords
   committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
   $ cat a c
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $
   do not process $Id:
   xxx $
 
 Touch copied c and check its status
 
   $ touch c
   $ hg status
 
 Copy kwfile to keyword ignored file unexpanding keywords
 
   $ hg --verbose copy a i
   copying a to i
   overwriting i shrinking keywords
   $ head -n 1 i
   expand $Id$
   $ hg forget i
   $ rm i
 
 Copy ignored file to ignored file: no overwriting
 
   $ hg --verbose copy b i
   copying b to i
   $ hg forget i
   $ rm i
 
 cp symlink file; hg cp -A symlink file (part1)
 - copied symlink points to kwfile: overwrite
 
   $ cp sym i
   $ ls -l i
   -rw-r--r--* (glob)
   $ head -1 i
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   $ hg copy --after --verbose sym i
   copying sym to i
   overwriting i shrinking keywords
   $ head -1 i
   expand $Id$
   $ hg forget i
   $ rm i
 
 Test different options of hg kwfiles
 
   $ hg kwfiles
   a
   c
   $ hg -v kwfiles --ignore
   I b
   I sym
   $ hg kwfiles --all
   K a
   K c
   I b
   I sym
 
 Diff specific revision
 
   $ hg diff --rev 1
   diff -r ef63ca68695b c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	* (glob)
   @@ -0,0 +1,3 @@
   +expand $Id$
   +do not process $Id:
   +xxx $
 
 Status after rollback:
 
   $ hg rollback
   repository tip rolled back to revision 1 (undo commit)
   working directory now based on revision 1
   $ hg status
   A c
   $ hg update --clean
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 #if symlink
 
 cp symlink file; hg cp -A symlink file (part2)
 - copied symlink points to kw ignored file: do not overwrite
 
   $ cat a > i
   $ ln -s i symignored
   $ hg commit -Am 'fake expansion in ignored and symlink' i symignored
   $ cp symignored x
   $ hg copy --after --verbose symignored x
   copying symignored to x
   $ head -n 1 x
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   $ hg forget x
   $ rm x
 
   $ hg rollback
   repository tip rolled back to revision 1 (undo commit)
   working directory now based on revision 1
   $ hg update --clean
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm i symignored
 
 #endif
 
 Custom keywordmaps as argument to kwdemo
 
   $ hg --quiet kwdemo "Xinfo = {author}: {desc}"
   [extensions]
   keyword =
   [keyword]
   ** = 
   b = ignore
   demo.txt = 
   i = ignore
   [keywordset]
   svn = False
   [keywordmaps]
   Xinfo = {author}: {desc}
   $Xinfo: test: hg keyword configuration and expansion example $
 
 Configure custom keywordmaps
 
   $ cat <<EOF >>$HGRCPATH
   > [keywordmaps]
   > Id = {file} {node|short} {date|rfc822date} {author|user}
   > Xinfo = {author}: {desc}
   > EOF
 
 Cat and hg cat files before custom expansion
 
   $ cat a b
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   do not process $Id:
   xxx $
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $
   do not process $Id:
   xxx $
   ignore $Id$
   a
 
 Write custom keyword and prepare multiline commit message
 
   $ echo '$Xinfo$' >> a
   $ cat <<EOF >> log
   > firstline
   > secondline
   > EOF
 
 Interrupted commit should not change state
 
   $ hg commit
   abort: empty commit message
   [255]
   $ hg status
   M a
   ? c
   ? log
 
 Commit with multiline message and custom expansion
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <[e-mail]>'
   a
   removing unknown node 40a904bbbe4c from 1-phase boundary
   overwriting a expanding keywords
   committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
   $ rm log
 
 Stat, verify and show custom expansion (firstline)
 
   $ hg status
   ? c
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   3 files, 3 changesets, 4 total revisions
   $ cat a b
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   ignore $Id$
   a
 
 annotate
 
   $ hg annotate a
   1: expand $Id$
   1: do not process $Id:
   1: xxx $
   2: $Xinfo$
 
 remove with status checks
 
   $ hg debugrebuildstate
   $ hg remove a
   $ hg --debug commit -m rma
   committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
   $ hg status
   ? c
 
 Rollback, revert, and check expansion
 
   $ hg rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
   $ hg status
   R a
   ? c
   $ hg revert --no-backup --rev tip a
   $ cat a
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
 
 Clone to test global and local configurations
 
   $ cd ..
 
 Expansion in destinaton with global configuration
 
   $ hg --quiet clone Test globalconf
   $ cat globalconf/a
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
 
 No expansion in destination with local configuration in origin only
 
   $ hg --quiet --config 'keyword.**=ignore' clone Test localconf
   $ cat localconf/a
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
 
 Clone to test incoming
 
   $ hg clone -r1 Test Test-a
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd Test-a
   $ cat <<EOF >> .hg/hgrc
   > [paths]
   > default = ../Test
   > EOF
   $ hg incoming
   comparing with $TESTTMP/Test (glob)
   searching for changes
   changeset:   2:bb948857c743
   tag:         tip
   user:        User Name <[e-mail]>
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     firstline
   
 Imported patch should not be rejected
 
   >>> import re
   >>> text = re.sub(r'(Id.*)', r'\1 rejecttest', open('a').read())
   >>> open('a', 'wb').write(text)
   $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <[e-mail]>'
   a
   overwriting a expanding keywords
   committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
   $ hg export -o ../rejecttest.diff tip
   $ cd ../Test
   $ hg import ../rejecttest.diff
   applying ../rejecttest.diff
   $ cat a b
   expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
   do not process $Id: rejecttest
   xxx $
   $Xinfo: User Name <[e-mail]>: rejects? $
   ignore $Id$
 
   $ hg rollback
   repository tip rolled back to revision 2 (undo import)
   working directory now based on revision 2
   $ hg update --clean
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 kwexpand/kwshrink on selected files
 
   $ mkdir x
   $ hg copy a x/a
   $ hg --verbose kwshrink a
   overwriting a shrinking keywords
  - sleep required for dirstate.normal() check
   $ sleep 1
   $ hg status a
   $ hg --verbose kwexpand a
   overwriting a expanding keywords
   $ hg status a
 
 kwexpand x/a should abort
 
   $ hg --verbose kwexpand x/a
   abort: outstanding uncommitted changes
   [255]
   $ cd x
   $ hg --debug commit -m xa -d '3 0' -u 'User Name <[e-mail]>'
   x/a
    x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
   overwriting x/a expanding keywords
   committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
   $ cat a
   expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: xa $
 
 kwshrink a inside directory x
 
   $ hg --verbose kwshrink a
   overwriting x/a shrinking keywords
   $ cat a
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   $ cd ..
 
 kwexpand nonexistent
 
   $ hg kwexpand nonexistent
   nonexistent:* (glob)
 
 
 hg serve
  - expand with hgweb file
  - no expansion with hgweb annotate/changeset/filediff
  - check errors
 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw'
   200 Script output follows
   
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw'
   200 Script output follows
   
   
   user@1: expand $Id$
   user@1: do not process $Id:
   user@1: xxx $
   user@2: $Xinfo$
   
   
   
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw'
   200 Script output follows
   
   
   # HG changeset patch
   # User User Name <[e-mail]>
   # Date 3 0
   # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4
   # Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
   xa
   
   diff -r bb948857c743 -r b4560182a3f9 x/a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
   @@ -0,0 +1,4 @@
   +expand $Id$
   +do not process $Id:
   +xxx $
   +$Xinfo$
   
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw'
   200 Script output follows
   
   
   diff -r ef63ca68695b -r bb948857c743 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:02 1970 +0000
   @@ -1,3 +1,4 @@
    expand $Id$
    do not process $Id:
    xxx $
   +$Xinfo$
   
   
   
   
   $ cat errors.log
 
 Prepare merge and resolve tests
 
   $ echo '$Id$' > m
   $ hg add m
   $ hg commit -m 4kw 
   $ echo foo >> m
   $ hg commit -m 5foo
 
 simplemerge
 
   $ hg update 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo >> m
   $ hg commit -m 6foo
   created new head
   $ hg merge
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m simplemerge
   $ cat m
   $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $
   foo
 
 conflict: keyword should stay outside conflict zone
 
   $ hg update 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo bar >> m
   $ hg commit -m 8bar
   created new head
   $ hg merge
   merging m
   warning: conflicts during merge.
   merging m incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ cat m
   $Id$
   <<<<<<< local
   bar
   =======
   foo
   >>>>>>> other
 
 resolve to local
 
   $ HGMERGE=internal:local hg resolve -a
   $ hg commit -m localresolve
   $ cat m
   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
   bar
 
 Test restricted mode with transplant -b
 
   $ hg update 6
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ mv a a.bak
   $ echo foobranch > a
   $ cat a.bak >> a
   $ rm a.bak
   $ hg commit -m 9foobranch
   $ hg update default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -y transplant -b foo tip
   applying 4aa30d025d50
   4aa30d025d50 transplanted to e00abbf63521
 
 Expansion in changeset but not in file
 
   $ hg tip -p
   changeset:   11:e00abbf63521
   tag:         tip
   parent:      9:800511b3a22d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     9foobranch
   
   diff -r 800511b3a22d -r e00abbf63521 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,3 +1,4 @@
   +foobranch
    expand $Id$
    do not process $Id:
    xxx $
   
   $ head -n 2 a
   foobranch
   expand $Id: a e00abbf63521 Thu, 01 Jan 1970 00:00:00 +0000 test $
 
 Turn off expansion
 
   $ hg -q rollback
   $ hg -q update -C
 
 kwshrink with unknown file u
 
   $ cp a u
   $ hg --verbose kwshrink
   overwriting a shrinking keywords
   overwriting m shrinking keywords
   overwriting x/a shrinking keywords
 
 Keywords shrunk in working directory, but not yet disabled
  - cat shows unexpanded keywords
  - hg cat shows expanded keywords
 
   $ cat a b
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
   do not process $Id:
   xxx $
   $Xinfo: User Name <[e-mail]>: firstline $
   ignore $Id$
   a
 
 Now disable keyword expansion
 
   $ rm "$HGRCPATH"
   $ cat a b
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   ignore $Id$
   $ hg cat sym a b && echo
   expand $Id$
   do not process $Id:
   xxx $
   $Xinfo$
   ignore $Id$
   a
 
   $ cd ..

tests/test-mq-qclone-http.t

@@ -1,150 +1,153 b''
   $ "$TESTDIR/hghave" serve || exit 80
 
+hide outer repo
+  $ hg init
+
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ mkdir webdir
   $ cd webdir
   $ hg init a
   $ hg --cwd a qinit -c
   $ echo a > a/a
   $ hg --cwd a ci -A -m a
   adding a
   $ echo b > a/b
   $ hg --cwd a addremove
   adding b
   $ hg --cwd a qnew -f b.patch
   $ hg --cwd a qcommit -m b.patch
   $ hg --cwd a log --template "{desc}\n"
   [mq]: b.patch
   a
   $ hg --cwd a/.hg/patches log --template "{desc}\n"
   b.patch
   $ root=`pwd`
   $ cd ..
 
 test with recursive collection
 
   $ cat > collections.conf <<EOF
   > [paths]
   > /=$root/**
   > EOF
   $ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \
   >     -A access-paths.log -E error-paths-1.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw'
   200 Script output follows
   
   
   /a/
   /a/.hg/patches/
   
   $ hg qclone http://localhost:$HGPORT/a b
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 3 changes to 3 files
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --cwd b log --template "{desc}\n"
   a
   $ hg --cwd b qpush -a
   applying b.patch
   now at: b.patch
   $ hg --cwd b log --template "{desc}\n"
   imported patch b.patch
   a
 
 test with normal collection
 
   $ cat > collections1.conf <<EOF
   > [paths]
   > /=$root/*
   > EOF
   $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf collections1.conf \
   >     -A access-paths.log -E error-paths-1.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw'
   200 Script output follows
   
   
   /a/
   /a/.hg/patches/
   
   $ hg qclone http://localhost:$HGPORT1/a c
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 3 changes to 3 files
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --cwd c log --template "{desc}\n"
   a
   $ hg --cwd c qpush -a
   applying b.patch
   now at: b.patch
   $ hg --cwd c log --template "{desc}\n"
   imported patch b.patch
   a
 
 test with old-style collection
 
   $ cat > collections2.conf <<EOF
   > [collections]
   > $root=$root
   > EOF
   $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections2.conf \
   >     -A access-paths.log -E error-paths-1.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw'
   200 Script output follows
   
   
   /a/
   /a/.hg/patches/
   
   $ hg qclone http://localhost:$HGPORT2/a d
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 3 changes to 3 files
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --cwd d log --template "{desc}\n"
   a
   $ hg --cwd d qpush -a
   applying b.patch
   now at: b.patch
   $ hg --cwd d log --template "{desc}\n"
   imported patch b.patch
   a
 
 test --mq works and uses correct repository config
 
   $ hg --cwd d outgoing --mq
   comparing with http://localhost:$HGPORT2/a/.hg/patches
   searching for changes
   no changes found
   [1]
   $ hg --cwd d log --mq --template '{rev} {desc|firstline}\n'
   0 b.patch

tests/test-mq.t

@@ -1,1548 +1,1552 b''
   $ checkundo()
   > {
   >     if [ -f .hg/store/undo ]; then
   >     echo ".hg/store/undo still exists after $1"
   >     fi
   > }
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ echo "[mq]" >> $HGRCPATH
   $ echo "plain=true" >> $HGRCPATH
 
 
 help
 
   $ hg help mq
   mq extension - manage a stack of patches
   
   This extension lets you work with a stack of patches in a Mercurial
   repository. It manages two stacks of patches - all known patches, and applied
   patches (subset of known patches).
   
   Known patches are represented as patch files in the .hg/patches directory.
   Applied patches are both patch files and changesets.
   
   Common tasks (use "hg help command" for more details):
   
     create new patch                          qnew
     import existing patch                     qimport
   
     print patch series                        qseries
     print applied patches                     qapplied
   
     add known patch to applied stack          qpush
     remove patch from applied stack           qpop
     refresh contents of top applied patch     qrefresh
   
   By default, mq will automatically use git patches when required to avoid
   losing file mode changes, copy records, binary files or empty files creations
   or deletions. This behaviour can be configured with:
   
     [mq]
     git = auto/keep/yes/no
   
   If set to 'keep', mq will obey the [diff] section configuration while
   preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq
   will override the [diff] section and always generate git or regular patches,
   possibly losing data in the second case.
   
   It may be desirable for mq changesets to be kept in the secret phase (see "hg
   help phases"), which can be enabled with the following setting:
   
     [mq]
     secret = True
   
   You will by default be managing a patch queue named "patches". You can create
   other, independent patch queues with the "hg qqueue" command.
   
   If the working directory contains uncommitted files, qpush, qpop and qgoto
   abort immediately. If -f/--force is used, the changes are discarded. Setting:
   
     [mq]
     keepchanges = True
   
   make them behave as if --keep-changes were passed, and non-conflicting local
   changes will be tolerated and preserved. If incompatible options such as
   -f/--force or --exact are passed, this setting is ignored.
   
   list of commands:
   
    qapplied      print the patches already applied
    qclone        clone main and patch repository at same time
    qdelete       remove patches from queue
    qdiff         diff of the current patch and subsequent modifications
    qfinish       move applied patches into repository history
    qfold         fold the named patches into the current patch
    qgoto         push or pop patches until named patch is at top of stack
    qguard        set or print guards for a patch
    qheader       print the header of the topmost or specified patch
    qimport       import a patch or existing changeset
    qnew          create a new patch
    qnext         print the name of the next pushable patch
    qpop          pop the current patch off the stack
    qprev         print the name of the preceding applied patch
    qpush         push the next patch onto the stack
    qqueue        manage multiple patch queues
    qrefresh      update the current patch
    qrename       rename a patch
    qselect       set or print guarded patches to push
    qseries       print the entire series file
    qtop          print the name of the current patch
    qunapplied    print the patches not yet applied
    strip         strip changesets and all their descendants from the repository
   
   use "hg -v help mq" to show builtin aliases and global options
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg ci -Ama
   adding a
 
   $ hg clone . ../k
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ mkdir b
   $ echo z > b/z
   $ hg ci -Ama
   adding b/z
 
 
 qinit
 
   $ hg qinit
 
   $ cd ..
   $ hg init b
 
 
 -R qinit
 
   $ hg -R b qinit
 
   $ hg init c
 
 
 qinit -c
 
   $ hg --cwd c qinit -c
   $ hg -R c/.hg/patches st
   A .hgignore
   A series
 
 
 qinit; qinit -c
 
   $ hg init d
   $ cd d
   $ hg qinit
   $ hg qinit -c
 
 qinit -c should create both files if they don't exist
 
   $ cat .hg/patches/.hgignore
   ^\.hg
   ^\.mq
   syntax: glob
   status
   guards
   $ cat .hg/patches/series
   $ hg qinit -c
   abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
   [255]
   $ cd ..
 
   $ echo '% qinit; <stuff>; qinit -c'
   % qinit; <stuff>; qinit -c
   $ hg init e
   $ cd e
   $ hg qnew A
   $ checkundo qnew
   $ echo foo > foo
   $ hg phase -r qbase
   0: draft
   $ hg add foo
   $ hg qrefresh
   $ hg phase -r qbase
   0: draft
   $ hg qnew B
   $ echo >> foo
   $ hg qrefresh
   $ echo status >> .hg/patches/.hgignore
   $ echo bleh >> .hg/patches/.hgignore
   $ hg qinit -c
   adding .hg/patches/A (glob)
   adding .hg/patches/B (glob)
   $ hg -R .hg/patches status
   A .hgignore
   A A
   A B
   A series
 
 qinit -c shouldn't touch these files if they already exist
 
   $ cat .hg/patches/.hgignore
   status
   bleh
   $ cat .hg/patches/series
   A
   B
 
 add an untracked file
 
   $ echo >> .hg/patches/flaf
 
 status --mq with color (issue2096)
 
   $ hg status --mq --config extensions.color= --config color.mode=ansi --color=always
   \x1b[0;32;1mA .hgignore\x1b[0m (esc)
   \x1b[0;32;1mA A\x1b[0m (esc)
   \x1b[0;32;1mA B\x1b[0m (esc)
   \x1b[0;32;1mA series\x1b[0m (esc)
   \x1b[0;35;1;4m? flaf\x1b[0m (esc)
 
 try the --mq option on a command provided by an extension
 
   $ hg purge --mq --verbose --config extensions.purge=
   removing file flaf
 
   $ cd ..
 
+#if no-outer-repo
+
 init --mq without repo
 
   $ mkdir f
   $ cd f
   $ hg init --mq
   abort: there is no Mercurial repository here (.hg not found)
   [255]
   $ cd ..
 
+#endif
+
 init --mq with repo path
 
   $ hg init g
   $ hg init --mq g
   $ test -d g/.hg/patches/.hg
 
 init --mq with nonexistent directory
 
   $ hg init --mq nonexistentdir
   abort: repository nonexistentdir not found!
   [255]
 
 
 init --mq with bundle (non "local")
 
   $ hg -R a bundle --all a.bundle >/dev/null
   $ hg init --mq a.bundle
   abort: only a local queue repository may be initialized
   [255]
 
   $ cd a
 
   $ hg qnew -m 'foo bar' test.patch
 
   $ echo '# comment' > .hg/patches/series.tmp
   $ echo >> .hg/patches/series.tmp # empty line
   $ cat .hg/patches/series >> .hg/patches/series.tmp
   $ mv .hg/patches/series.tmp .hg/patches/series
 
 
 qrefresh
 
   $ echo a >> a
   $ hg qrefresh
   $ cat .hg/patches/test.patch
   foo bar
   
   diff -r [a-f0-9]* a (re)
   --- a/a\t(?P<date>.*) (re)
   \+\+\+ b/a\t(?P<date2>.*) (re)
   @@ -1,1 +1,2 @@
    a
   +a
 
 empty qrefresh
 
   $ hg qrefresh -X a
 
 revision:
 
   $ hg diff -r -2 -r -1
 
 patch:
 
   $ cat .hg/patches/test.patch
   foo bar
   
 
 working dir diff:
 
   $ hg diff --nodates -q
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    a
   +a
 
 restore things
 
   $ hg qrefresh
   $ checkundo qrefresh
 
 
 qpop
 
   $ hg qpop
   popping test.patch
   patch queue now empty
   $ checkundo qpop
 
 
 qpush with dump of tag cache
 Dump the tag cache to ensure that it has exactly one head after qpush.
 
   $ rm -f .hg/cache/tags
   $ hg tags > /dev/null
 
 .hg/cache/tags (pre qpush):
 
   $ cat .hg/cache/tags
   1 [\da-f]{40} (re)
   
   $ hg qpush
   applying test.patch
   now at: test.patch
   $ hg phase -r qbase
   2: draft
   $ hg tags > /dev/null
 
 .hg/cache/tags (post qpush):
 
   $ cat .hg/cache/tags
   2 [\da-f]{40} (re)
   
   $ checkundo qpush
   $ cd ..
 
 
 pop/push outside repo
   $ hg -R a qpop
   popping test.patch
   patch queue now empty
   $ hg -R a qpush
   applying test.patch
   now at: test.patch
 
   $ cd a
   $ hg qnew test2.patch
 
 qrefresh in subdir
 
   $ cd b
   $ echo a > a
   $ hg add a
   $ hg qrefresh
 
 pop/push -a in subdir
 
   $ hg qpop -a
   popping test2.patch
   popping test.patch
   patch queue now empty
   $ hg --traceback qpush -a
   applying test.patch
   applying test2.patch
   now at: test2.patch
 
 
 setting columns & formatted tests truncating (issue1912)
 
   $ COLUMNS=4 hg qseries --config ui.formatted=true
   test.patch
   test2.patch
   $ COLUMNS=20 hg qseries --config ui.formatted=true -vs
   0 A test.patch: f...
   1 A test2.patch: 
   $ hg qpop
   popping test2.patch
   now at: test.patch
   $ hg qseries -vs
   0 A test.patch: foo bar
   1 U test2.patch: 
   $ hg sum | grep mq
   mq:     1 applied, 1 unapplied
   $ hg qpush
   applying test2.patch
   now at: test2.patch
   $ hg sum | grep mq
   mq:     2 applied
   $ hg qapplied
   test.patch
   test2.patch
   $ hg qtop
   test2.patch
 
 
 prev
 
   $ hg qapp -1
   test.patch
 
 next
 
   $ hg qunapp -1
   all patches applied
   [1]
 
   $ hg qpop
   popping test2.patch
   now at: test.patch
 
 commit should fail
 
   $ hg commit
   abort: cannot commit over an applied mq patch
   [255]
 
 push should fail if draft
 
   $ hg push ../../k
   pushing to ../../k
   abort: source has mq patches applied
   [255]
 
 
 import should fail
 
   $ hg st .
   $ echo foo >> ../a
   $ hg diff > ../../import.diff
   $ hg revert --no-backup ../a
   $ hg import ../../import.diff
   abort: cannot import over an applied patch
   [255]
   $ hg st
 
 import --no-commit should succeed
 
   $ hg import --no-commit ../../import.diff
   applying ../../import.diff
   $ hg st
   M a
   $ hg revert --no-backup ../a
 
 
 qunapplied
 
   $ hg qunapplied
   test2.patch
 
 
 qpush/qpop with index
 
   $ hg qnew test1b.patch
   $ echo 1b > 1b
   $ hg add 1b
   $ hg qrefresh
   $ hg qpush 2
   applying test2.patch
   now at: test2.patch
   $ hg qpop 0
   popping test2.patch
   popping test1b.patch
   now at: test.patch
   $ hg qpush test.patch+1
   applying test1b.patch
   now at: test1b.patch
   $ hg qpush test.patch+2
   applying test2.patch
   now at: test2.patch
   $ hg qpop test2.patch-1
   popping test2.patch
   now at: test1b.patch
   $ hg qpop test2.patch-2
   popping test1b.patch
   now at: test.patch
   $ hg qpush test1b.patch+1
   applying test1b.patch
   applying test2.patch
   now at: test2.patch
 
 
 qpush --move
 
   $ hg qpop -a
   popping test2.patch
   popping test1b.patch
   popping test.patch
   patch queue now empty
   $ hg qguard test1b.patch -- -negguard
   $ hg qguard test2.patch -- +posguard
   $ hg qpush --move test2.patch # can't move guarded patch
   cannot push 'test2.patch' - guarded by '+posguard'
   [1]
   $ hg qselect posguard
   number of unguarded, unapplied patches has changed from 2 to 3
   $ hg qpush --move test2.patch # move to front
   applying test2.patch
   now at: test2.patch
   $ hg qpush --move test1b.patch # negative guard unselected
   applying test1b.patch
   now at: test1b.patch
   $ hg qpush --move test.patch # noop move
   applying test.patch
   now at: test.patch
   $ hg qseries -v
   0 A test2.patch
   1 A test1b.patch
   2 A test.patch
   $ hg qpop -a
   popping test.patch
   popping test1b.patch
   popping test2.patch
   patch queue now empty
 
 cleaning up
 
   $ hg qselect --none
   guards deactivated
   number of unguarded, unapplied patches has changed from 3 to 2
   $ hg qguard --none test1b.patch
   $ hg qguard --none test2.patch
   $ hg qpush --move test.patch
   applying test.patch
   now at: test.patch
   $ hg qpush --move test1b.patch
   applying test1b.patch
   now at: test1b.patch
   $ hg qpush --move bogus # nonexistent patch
   abort: patch bogus not in series
   [255]
   $ hg qpush --move # no patch
   abort: please specify the patch to move
   [255]
   $ hg qpush --move test.patch # already applied
   abort: cannot push to a previous patch: test.patch
   [255]
   $ sed '2i\
   > # make qtip index different in series and fullseries
   > ' `hg root`/.hg/patches/series > $TESTTMP/sedtmp
   $ cp $TESTTMP/sedtmp `hg root`/.hg/patches/series
   $ cat `hg root`/.hg/patches/series
   # comment
   # make qtip index different in series and fullseries
   
   test.patch
   test1b.patch
   test2.patch
   $ hg qpush --move test2.patch
   applying test2.patch
   now at: test2.patch
 
 
 series after move
 
   $ cat `hg root`/.hg/patches/series
   # comment
   # make qtip index different in series and fullseries
   
   test.patch
   test1b.patch
   test2.patch
 
 
 pop, qapplied, qunapplied
 
   $ hg qseries -v
   0 A test.patch
   1 A test1b.patch
   2 A test2.patch
 
 qapplied -1 test.patch
 
   $ hg qapplied -1 test.patch
   only one patch applied
   [1]
 
 qapplied -1 test1b.patch
 
   $ hg qapplied -1 test1b.patch
   test.patch
 
 qapplied -1 test2.patch
 
   $ hg qapplied -1 test2.patch
   test1b.patch
 
 qapplied -1
 
   $ hg qapplied -1
   test1b.patch
 
 qapplied
 
   $ hg qapplied
   test.patch
   test1b.patch
   test2.patch
 
 qapplied test1b.patch
 
   $ hg qapplied test1b.patch
   test.patch
   test1b.patch
 
 qunapplied -1
 
   $ hg qunapplied -1
   all patches applied
   [1]
 
 qunapplied
 
   $ hg qunapplied
 
 popping
 
   $ hg qpop
   popping test2.patch
   now at: test1b.patch
 
 qunapplied -1
 
   $ hg qunapplied -1
   test2.patch
 
 qunapplied
 
   $ hg qunapplied
   test2.patch
 
 qunapplied test2.patch
 
   $ hg qunapplied test2.patch
 
 qunapplied -1 test2.patch
 
   $ hg qunapplied -1 test2.patch
   all patches applied
   [1]
 
 popping -a
 
   $ hg qpop -a
   popping test1b.patch
   popping test.patch
   patch queue now empty
 
 qapplied
 
   $ hg qapplied
 
 qapplied -1
 
   $ hg qapplied -1
   no patches applied
   [1]
   $ hg qpush
   applying test.patch
   now at: test.patch
 
 
 push should succeed
 
   $ hg qpop -a
   popping test.patch
   patch queue now empty
   $ hg push ../../k
   pushing to ../../k
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 
 we want to start with some patches applied
 
   $ hg qpush -a
   applying test.patch
   applying test1b.patch
   applying test2.patch
   now at: test2.patch
 
 % pops all patches and succeeds
 
   $ hg qpop -a
   popping test2.patch
   popping test1b.patch
   popping test.patch
   patch queue now empty
 
 % does nothing and succeeds
 
   $ hg qpop -a
   no patches applied
 
 % fails - nothing else to pop
 
   $ hg qpop
   no patches applied
   [1]
 
 % pushes a patch and succeeds
 
   $ hg qpush
   applying test.patch
   now at: test.patch
 
 % pops a patch and succeeds
 
   $ hg qpop
   popping test.patch
   patch queue now empty
 
 % pushes up to test1b.patch and succeeds
 
   $ hg qpush test1b.patch
   applying test.patch
   applying test1b.patch
   now at: test1b.patch
 
 % does nothing and succeeds
 
   $ hg qpush test1b.patch
   qpush: test1b.patch is already at the top
 
 % does nothing and succeeds
 
   $ hg qpop test1b.patch
   qpop: test1b.patch is already at the top
 
 % fails - can't push to this patch
 
   $ hg qpush test.patch
   abort: cannot push to a previous patch: test.patch
   [255]
 
 % fails - can't pop to this patch
 
   $ hg qpop test2.patch
   abort: patch test2.patch is not applied
   [255]
 
 % pops up to test.patch and succeeds
 
   $ hg qpop test.patch
   popping test1b.patch
   now at: test.patch
 
 % pushes all patches and succeeds
 
   $ hg qpush -a
   applying test1b.patch
   applying test2.patch
   now at: test2.patch
 
 % does nothing and succeeds
 
   $ hg qpush -a
   all patches are currently applied
 
 % fails - nothing else to push
 
   $ hg qpush
   patch series already fully applied
   [1]
 
 % does nothing and succeeds
 
   $ hg qpush test2.patch
   qpush: test2.patch is already at the top
 
 strip
 
   $ cd ../../b
   $ echo x>x
   $ hg ci -Ama
   adding x
   $ hg strip tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
   $ hg unbundle .hg/strip-backup/*
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
 
 
 strip with local changes, should complain
 
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo y>y
   $ hg add y
   $ hg strip tip
   abort: local changes found
   [255]
 
 --force strip with local changes
 
   $ hg strip -f tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
   $ cd ..
 
 
 cd b; hg qrefresh
 
   $ hg init refresh
   $ cd refresh
   $ echo a > a
   $ hg ci -Ama
   adding a
   $ hg qnew -mfoo foo
   $ echo a >> a
   $ hg qrefresh
   $ mkdir b
   $ cd b
   $ echo f > f
   $ hg add f
   $ hg qrefresh
   $ cat ../.hg/patches/foo
   foo
   
   diff -r cb9a9f314b8b a
   --- a/a\t(?P<date>.*) (re)
   \+\+\+ b/a\t(?P<date>.*) (re)
   @@ -1,1 +1,2 @@
    a
   +a
   diff -r cb9a9f314b8b b/f
   --- /dev/null\t(?P<date>.*) (re)
   \+\+\+ b/b/f\t(?P<date>.*) (re)
   @@ -0,0 +1,1 @@
   +f
 
 hg qrefresh .
 
   $ hg qrefresh .
   $ cat ../.hg/patches/foo
   foo
   
   diff -r cb9a9f314b8b b/f
   --- /dev/null\t(?P<date>.*) (re)
   \+\+\+ b/b/f\t(?P<date>.*) (re)
   @@ -0,0 +1,1 @@
   +f
   $ hg status
   M a
 
 
 qpush failure
 
   $ cd ..
   $ hg qrefresh
   $ hg qnew -mbar bar
   $ echo foo > foo
   $ echo bar > bar
   $ hg add foo bar
   $ hg qrefresh
   $ hg qpop -a
   popping bar
   popping foo
   patch queue now empty
   $ echo bar > foo
   $ hg qpush -a
   applying foo
   applying bar
   file foo already exists
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed, unable to continue (try -v)
   patch failed, rejects left in working dir
   errors during apply, please fix and refresh bar
   [2]
   $ hg st
   ? foo
   ? foo.rej
 
 
 mq tags
 
   $ hg log --template '{rev} {tags}\n' -r qparent:qtip
   0 qparent
   1 foo qbase
   2 bar qtip tip
 
 mq revset
 
   $ hg log -r 'mq()' --template '{rev}\n'
   1
   2
   $ hg help revsets | grep -i mq
       "mq()"
         Changesets managed by MQ.
 
 bad node in status
 
   $ hg qpop
   popping bar
   now at: foo
   $ hg strip -qn tip
   $ hg tip
   changeset:   0:cb9a9f314b8b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ hg branches
   default                        0:cb9a9f314b8b
   $ hg qpop
   no patches applied
   [1]
 
   $ cd ..
 
 
 git patches
 
   $ cat >>$HGRCPATH <<EOF
   > [diff]
   > git = True
   > EOF
   $ hg init git
   $ cd git
   $ hg qinit
 
   $ hg qnew -m'new file' new
   $ echo foo > new
 #if execbit
   $ chmod +x new
 #endif
   $ hg add new
   $ hg qrefresh
 #if execbit
   $ cat .hg/patches/new
   new file
   
   diff --git a/new b/new
   new file mode 100755
   --- /dev/null
   +++ b/new
   @@ -0,0 +1,1 @@
   +foo
 #else
   $ cat .hg/patches/new
   new file
   
   diff --git a/new b/new
   new file mode 100644
   --- /dev/null
   +++ b/new
   @@ -0,0 +1,1 @@
   +foo
 #endif
 
   $ hg qnew -m'copy file' copy
   $ hg cp new copy
   $ hg qrefresh
   $ cat .hg/patches/copy
   copy file
   
   diff --git a/new b/copy
   copy from new
   copy to copy
 
   $ hg qpop
   popping copy
   now at: new
   $ hg qpush
   applying copy
   now at: copy
   $ hg qdiff
   diff --git a/new b/copy
   copy from new
   copy to copy
   $ cat >>$HGRCPATH <<EOF
   > [diff]
   > git = False
   > EOF
   $ hg qdiff --git
   diff --git a/new b/copy
   copy from new
   copy to copy
   $ cd ..
 
 empty lines in status
 
   $ hg init emptystatus
   $ cd emptystatus
   $ hg qinit
   $ printf '\n\n' > .hg/patches/status
   $ hg qser
   $ cd ..
 
 bad line in status (without ":")
 
   $ hg init badstatus
   $ cd badstatus
   $ hg qinit
   $ printf 'babar has no colon in this line\n' > .hg/patches/status
   $ hg qser
   malformated mq status line: ['babar has no colon in this line']
   $ cd ..
 
 
 test file addition in slow path
 
   $ hg init slow
   $ cd slow
   $ hg qinit
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ hg qnew bar
   $ echo bar > bar
   $ hg add bar
   $ hg mv foo baz
   $ hg qrefresh --git
   $ hg up -C 0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo >> foo
   $ hg ci -m 'change foo'
   created new head
   $ hg up -C 1
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,1 @@
   +bar
   diff --git a/foo b/baz
   rename from foo
   rename to baz
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   2 baz (foo)
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,1 @@
   +bar
   diff --git a/foo b/baz
   rename from foo
   rename to baz
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   2 baz (foo)
   $ hg qrefresh
   $ grep 'diff --git' .hg/patches/bar
   diff --git a/bar b/bar
   diff --git a/foo b/baz
 
 
 test file move chains in the slow path
 
   $ hg up -C 1
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo >> foo
   $ hg ci -m 'change foo again'
   $ hg up -C 2
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg mv bar quux
   $ hg mv baz bleh
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/foo b/bleh
   rename from foo
   rename to bleh
   diff --git a/quux b/quux
   new file mode 100644
   --- /dev/null
   +++ b/quux
   @@ -0,0 +1,1 @@
   +bar
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   3 bleh (foo)
   $ hg mv quux fred
   $ hg mv bleh barney
   $ hg qrefresh --git
   $ cat .hg/patches/bar
   diff --git a/foo b/barney
   rename from foo
   rename to barney
   diff --git a/fred b/fred
   new file mode 100644
   --- /dev/null
   +++ b/fred
   @@ -0,0 +1,1 @@
   +bar
   $ hg log -v --template '{rev} {file_copies}\n' -r .
   3 barney (foo)
 
 
 refresh omitting an added file
 
   $ hg qnew baz
   $ echo newfile > newfile
   $ hg add newfile
   $ hg qrefresh
   $ hg st -A newfile
   C newfile
   $ hg qrefresh -X newfile
   $ hg st -A newfile
   A newfile
   $ hg revert newfile
   $ rm newfile
   $ hg qpop
   popping baz
   now at: bar
   $ hg qdel baz
 
 
 create a git patch
 
   $ echo a > alexander
   $ hg add alexander
   $ hg qnew -f --git addalexander
   $ grep diff .hg/patches/addalexander
   diff --git a/alexander b/alexander
 
 
 create a git binary patch
 
   $ cat > writebin.py <<EOF
   > import sys
   > path = sys.argv[1]
   > open(path, 'wb').write('BIN\x00ARY')
   > EOF
   $ python writebin.py bucephalus
 
   $ python "$TESTDIR/md5sum.py" bucephalus
   8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
   $ hg add bucephalus
   $ hg qnew -f --git addbucephalus
   $ grep diff .hg/patches/addbucephalus
   diff --git a/bucephalus b/bucephalus
 
 
 check binary patches can be popped and pushed
 
   $ hg qpop
   popping addbucephalus
   now at: addalexander
   $ test -f bucephalus && echo % bucephalus should not be there
   [1]
   $ hg qpush
   applying addbucephalus
   now at: addbucephalus
   $ test -f bucephalus
   $ python "$TESTDIR/md5sum.py" bucephalus
   8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
 
 
 
 strip again
 
   $ cd ..
   $ hg init strip
   $ cd strip
   $ touch foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ echo >> foo
   $ hg ci -m 'change foo 1'
   $ hg up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 1 >> foo
   $ hg ci -m 'change foo 2'
   created new head
   $ HGMERGE=true hg merge
   merging foo
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m merge
   $ hg log
   changeset:   3:99615015637b
   tag:         tip
   parent:      2:20cbbe65cff7
   parent:      1:d2871fc282d4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge
   
   changeset:   2:20cbbe65cff7
   parent:      0:53245c60e682
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo 2
   
   changeset:   1:d2871fc282d4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo 1
   
   changeset:   0:53245c60e682
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
   $ hg strip 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/strip/.hg/strip-backup/*-backup.hg (glob)
   $ checkundo strip
   $ hg log
   changeset:   1:20cbbe65cff7
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo 2
   
   changeset:   0:53245c60e682
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo
   
   $ cd ..
 
 
 qclone
 
   $ qlog()
   > {
   >     echo 'main repo:'
   >     hg log --template '    rev {rev}: {desc}\n'
   >     echo 'patch repo:'
   >     hg -R .hg/patches log --template '    rev {rev}: {desc}\n'
   > }
   $ hg init qclonesource
   $ cd qclonesource
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ hg qinit
   $ hg qnew patch1
   $ echo bar >> foo
   $ hg qrefresh -m 'change foo'
   $ cd ..
 
 
 repo with unversioned patch dir
 
   $ hg qclone qclonesource failure
   abort: versioned patch repository not found (see init --mq)
   [255]
 
   $ cd qclonesource
   $ hg qinit -c
   adding .hg/patches/patch1 (glob)
   $ hg qci -m checkpoint
   $ qlog
   main repo:
       rev 1: change foo
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
 
 
 repo with patches applied
 
   $ hg qclone qclonesource qclonedest
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd qclonedest
   $ qlog
   main repo:
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
 
 
 repo with patches unapplied
 
   $ cd qclonesource
   $ hg qpop -a
   popping patch1
   patch queue now empty
   $ qlog
   main repo:
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
   $ hg qclone qclonesource qclonedest2
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd qclonedest2
   $ qlog
   main repo:
       rev 0: add foo
   patch repo:
       rev 0: checkpoint
   $ cd ..
 
 
 Issue1033: test applying on an empty file
 
   $ hg init empty
   $ cd empty
   $ touch a
   $ hg ci -Am addempty
   adding a
   $ echo a > a
   $ hg qnew -f -e changea
   $ hg qpop
   popping changea
   patch queue now empty
   $ hg qpush
   applying changea
   now at: changea
   $ cd ..
 
 test qpush with --force, issue1087
 
   $ hg init forcepush
   $ cd forcepush
   $ echo hello > hello.txt
   $ echo bye > bye.txt
   $ hg ci -Ama
   adding bye.txt
   adding hello.txt
   $ hg qnew -d '0 0' empty
   $ hg qpop
   popping empty
   patch queue now empty
   $ echo world >> hello.txt
 
 
 qpush should fail, local changes
 
   $ hg qpush
   abort: local changes found
   [255]
 
 
 apply force, should not discard changes with empty patch
 
   $ hg qpush -f
   applying empty
   patch empty is empty
   now at: empty
   $ hg diff --config diff.nodates=True
   diff -r d58265112590 hello.txt
   --- a/hello.txt
   +++ b/hello.txt
   @@ -1,1 +1,2 @@
    hello
   +world
   $ hg qdiff --config diff.nodates=True
   diff -r 9ecee4f634e3 hello.txt
   --- a/hello.txt
   +++ b/hello.txt
   @@ -1,1 +1,2 @@
    hello
   +world
   $ hg log -l1 -p
   changeset:   1:d58265112590
   tag:         empty
   tag:         qbase
   tag:         qtip
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     imported patch empty
   
   
   $ hg qref -d '0 0'
   $ hg qpop
   popping empty
   patch queue now empty
   $ echo universe >> hello.txt
   $ echo universe >> bye.txt
 
 
 qpush should fail, local changes
 
   $ hg qpush
   abort: local changes found
   [255]
 
 
 apply force, should discard changes in hello, but not bye
 
   $ hg qpush -f --verbose
   applying empty
   saving current version of hello.txt as hello.txt.orig
   patching file hello.txt
   hello.txt
   now at: empty
   $ hg st
   M bye.txt
   ? hello.txt.orig
   $ hg diff --config diff.nodates=True
   diff -r ba252371dbc1 bye.txt
   --- a/bye.txt
   +++ b/bye.txt
   @@ -1,1 +1,2 @@
    bye
   +universe
   $ hg qdiff --config diff.nodates=True
   diff -r 9ecee4f634e3 bye.txt
   --- a/bye.txt
   +++ b/bye.txt
   @@ -1,1 +1,2 @@
    bye
   +universe
   diff -r 9ecee4f634e3 hello.txt
   --- a/hello.txt
   +++ b/hello.txt
   @@ -1,1 +1,3 @@
    hello
   +world
   +universe
 
 
 test popping revisions not in working dir ancestry
 
   $ hg qseries -v
   0 A empty
   $ hg up qparent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg qpop
   popping empty
   patch queue now empty
 
   $ cd ..
   $ hg init deletion-order
   $ cd deletion-order
 
   $ touch a
   $ hg ci -Aqm0
 
   $ hg qnew rename-dir
   $ hg rm a
   $ hg qrefresh
 
   $ mkdir a b
   $ touch a/a b/b
   $ hg add -q a b
   $ hg qrefresh
 
 
 test popping must remove files added in subdirectories first
 
   $ hg qpop
   popping rename-dir
   patch queue now empty
   $ cd ..
 
 
 test case preservation through patch pushing especially on case
 insensitive filesystem
 
   $ hg init casepreserve
   $ cd casepreserve
 
   $ hg qnew add-file1
   $ echo a > TeXtFiLe.TxT
   $ hg add TeXtFiLe.TxT
   $ hg qrefresh
 
   $ hg qnew add-file2
   $ echo b > AnOtHeRFiLe.TxT
   $ hg add AnOtHeRFiLe.TxT
   $ hg qrefresh
 
   $ hg qnew modify-file
   $ echo c >> AnOtHeRFiLe.TxT
   $ hg qrefresh
 
   $ hg qapplied
   add-file1
   add-file2
   modify-file
   $ hg qpop -a
   popping modify-file
   popping add-file2
   popping add-file1
   patch queue now empty
 
 this qpush causes problems below, if case preservation on case
 insensitive filesystem is not enough:
 (1) unexpected "adding ..." messages are shown
 (2) patching fails in modification of (1) files
 
   $ hg qpush -a
   applying add-file1
   applying add-file2
   applying modify-file
   now at: modify-file
 
 Proper phase default with mq:
 
 1. mq.secret=false
 
   $ rm .hg/store/phaseroots
   $ hg phase 'qparent::'
   0: draft
   1: draft
   2: draft
   $ echo '[mq]' >> $HGRCPATH
   $ echo 'secret=true' >> $HGRCPATH
   $ rm -f .hg/store/phaseroots
   $ hg phase 'qparent::'
   0: secret
   1: secret
   2: secret
 
 Test that qfinish change phase when mq.secret=true
 
   $ hg qfinish qbase
   patch add-file1 finalized without changeset message
   $ hg phase 'all()'
   0: draft
   1: secret
   2: secret
 
 Test that qfinish respect phases.new-commit setting
 
   $ echo '[phases]' >> $HGRCPATH
   $ echo 'new-commit=secret' >> $HGRCPATH
   $ hg qfinish qbase
   patch add-file2 finalized without changeset message
   $ hg phase 'all()'
   0: draft
   1: secret
   2: secret
 
 (restore env for next test)
 
   $ sed -e 's/new-commit=secret//' $HGRCPATH > $TESTTMP/sedtmp
   $ cp $TESTTMP/sedtmp $HGRCPATH
   $ hg qimport -r 1 --name  add-file2
 
 Test that qfinish preserve phase when mq.secret=false
 
   $ sed -e 's/secret=true/secret=false/' $HGRCPATH > $TESTTMP/sedtmp
   $ cp $TESTTMP/sedtmp $HGRCPATH
   $ hg qfinish qbase
   patch add-file2 finalized without changeset message
   $ hg phase 'all()'
   0: draft
   1: secret
   2: secret
 
   $ cd ..

tests/test-ssh.t

@@ -1,370 +1,373 b''
 
 
 This test tries to exercise the ssh functionality with a dummy script
 
 creating 'remote' repo
 
   $ hg init remote
   $ cd remote
   $ echo this > foo
   $ echo this > fooO
   $ hg ci -A -m "init" foo fooO
   $ cat <<EOF > .hg/hgrc
   > [server]
   > uncompressed = True
   > 
   > [hooks]
   > changegroup = python "$TESTDIR"/printenv.py changegroup-in-remote 0 ../dummylog
   > EOF
   $ cd ..
 
 repo not found error
 
   $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local
   remote: abort: there is no Mercurial repository here (.hg not found)!
   abort: no suitable response from remote hg!
   [255]
 
 non-existent absolute path
 
   $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local
   remote: abort: there is no Mercurial repository here (.hg not found)!
   abort: no suitable response from remote hg!
   [255]
 
 clone remote via stream
 
   $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream
   streaming all changes
   4 files to transfer, 392 bytes of data
   transferred 392 bytes in * seconds (*/sec) (glob)
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd local-stream
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 1 changesets, 2 total revisions
   $ cd ..
 
 clone remote via pull
 
   $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 verify
 
   $ cd local
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 1 changesets, 2 total revisions
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'changegroup = python "$TESTDIR"/printenv.py changegroup-in-local 0 ../dummylog' >> .hg/hgrc
 
 empty default pull
 
   $ hg paths
   default = ssh://user@dummy/remote
   $ hg pull -e "python \"$TESTDIR/dummyssh\""
   pulling from ssh://user@dummy/remote
   searching for changes
   no changes found
 
 local change
 
   $ echo bleah > foo
   $ hg ci -m "add"
 
 updating rc
 
   $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
   $ echo "[ui]" >> .hg/hgrc
   $ echo "ssh = python \"$TESTDIR/dummyssh\"" >> .hg/hgrc
 
 find outgoing
 
   $ hg out ssh://user@dummy/remote
   comparing with ssh://user@dummy/remote
   searching for changes
   changeset:   1:a28a9d1a809c
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
 
 find incoming on the remote side
 
   $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/local
   comparing with ssh://user@dummy/local
   searching for changes
   changeset:   1:a28a9d1a809c
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
 
 find incoming on the remote side (using absolute path)
 
   $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`"
   comparing with ssh://user@dummy/$TESTTMP/local
   searching for changes
   changeset:   1:a28a9d1a809c
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
 
 push
 
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   $ cd ../remote
 
 check remote tip
 
   $ hg tip
   changeset:   1:a28a9d1a809c
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add
   
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   2 files, 2 changesets, 3 total revisions
   $ hg cat -r tip foo
   bleah
   $ echo z > z
   $ hg ci -A -m z z
   created new head
 
 test pushkeys and bookmarks
 
   $ cd ../local
   $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces
   bookmarks	
   phases	
   namespaces	
   $ hg book foo -r 0
   $ hg out -B
   comparing with ssh://user@dummy/remote
   searching for changed bookmarks
      foo                       1160648e36ce
   $ hg push -B foo
   pushing to ssh://user@dummy/remote
   searching for changes
   no changes found
   exporting bookmark foo
   [1]
   $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks
   foo	1160648e36cec0054048a7edc4110c6f84fde594
   $ hg book -f foo
   $ hg push --traceback
   pushing to ssh://user@dummy/remote
   searching for changes
   no changes found
   updating bookmark foo
   [1]
   $ hg book -d foo
   $ hg in -B
   comparing with ssh://user@dummy/remote
   searching for changed bookmarks
      foo                       a28a9d1a809c
   $ hg book -f -r 0 foo
   $ hg pull -B foo
   pulling from ssh://user@dummy/remote
   no changes found
   updating bookmark foo
   importing bookmark foo
   $ hg book -d foo
   $ hg push -B foo
   pushing to ssh://user@dummy/remote
   searching for changes
   no changes found
   deleting remote bookmark foo
   [1]
 
 a bad, evil hook that prints to stdout
 
   $ cat <<EOF > $TESTTMP/badhook
   > import sys
   > sys.stdout.write("KABOOM\n")
   > EOF
 
   $ echo '[hooks]' >> ../remote/.hg/hgrc
   $ echo "changegroup.stdout = python $TESTTMP/badhook" >> ../remote/.hg/hgrc
   $ echo r > r
   $ hg ci -A -m z r
 
 push should succeed even though it has an unexpected response
 
   $ hg push
   pushing to ssh://user@dummy/remote
   searching for changes
   note: unsynced remote changes!
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
   remote: KABOOM
   $ hg -R ../remote heads
   changeset:   3:1383141674ec
   tag:         tip
   parent:      1:a28a9d1a809c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     z
   
   changeset:   2:6c0482d977a3
   parent:      0:1160648e36ce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     z
   
 
 clone bookmarks
 
   $ hg -R ../remote bookmark test
   $ hg -R ../remote bookmarks
    * test                      2:6c0482d977a3
   $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 5 changes to 4 files (+1 heads)
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R local-bookmarks bookmarks
      test                      2:6c0482d977a3
 
 passwords in ssh urls are not supported
 (we use a glob here because different Python versions give different
 results here)
 
   $ hg push ssh://user:erroneouspwd@dummy/remote
   pushing to ssh://user:*@dummy/remote (glob)
   abort: password in URL not supported!
   [255]
 
   $ cd ..
 
+hide outer repo
+  $ hg init
+
 Test remote paths with spaces (issue2983):
 
   $ hg init --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
   $ hg -R 'a repo' tag tag
   $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
   3fb238f49e8c
 
 Test hg-ssh using a helper script that will restore PYTHONPATH (which might
 have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right
 parameters:
 
   $ cat > ssh.sh << EOF
   > userhost="\$1"
   > SSH_ORIGINAL_COMMAND="\$2"
   > export SSH_ORIGINAL_COMMAND
   > PYTHONPATH="$PYTHONPATH"
   > export PYTHONPATH
   > python "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo"
   > EOF
 
   $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a repo"
   3fb238f49e8c
 
   $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo"
   remote: Illegal repository "$TESTTMP/a'repo" (glob)
   abort: no suitable response from remote hg!
   [255]
 
   $ hg id --ssh "sh ssh.sh" --remotecmd hacking "ssh://user@dummy/a'repo"
   remote: Illegal command "hacking -R 'a'\''repo' serve --stdio"
   abort: no suitable response from remote hg!
   [255]
 
   $ SSH_ORIGINAL_COMMAND="'hg' -R 'a'repo' serve --stdio" python "$TESTDIR/../contrib/hg-ssh"
   Illegal command "'hg' -R 'a'repo' serve --stdio": No closing quotation
   [255]
 
 Test hg-ssh in read-only mode:
 
   $ cat > ssh.sh << EOF
   > userhost="\$1"
   > SSH_ORIGINAL_COMMAND="\$2"
   > export SSH_ORIGINAL_COMMAND
   > PYTHONPATH="$PYTHONPATH"
   > export PYTHONPATH
   > python "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote"
   > EOF
 
   $ hg clone --ssh "sh ssh.sh" "ssh://user@dummy/$TESTTMP/remote" read-only-local
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 4 changesets with 5 changes to 4 files (+1 heads)
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd read-only-local
   $ echo "baz" > bar
   $ hg ci -A -m "unpushable commit" bar
   $ hg push --ssh "sh ../ssh.sh"
   pushing to ssh://user@dummy/*/remote (glob)
   searching for changes
   remote: Permission denied
   remote: abort: prechangegroup.hg-ssh hook failed
   remote: Permission denied
   remote: abort: prepushkey.hg-ssh hook failed
   abort: unexpected response: empty string
   [255]
 
   $ cd ..
 
   $ cat dummylog
   Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
   Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R local serve --stdio
   Got arguments 1:user@dummy 2:hg -R $TESTTMP/local serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   changegroup-in-remote hook: HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
   Got arguments 1:user@dummy 2:hg -R remote serve --stdio
   Got arguments 1:user@dummy 2:hg init 'a repo'
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
   Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio

tests/test-subrepo-relative-path.t

@@ -1,105 +1,108 b''
   $ "$TESTDIR/hghave" serve || exit 80
 
 Preparing the subrepository 'sub'
 
   $ hg init sub
   $ echo sub > sub/sub
   $ hg add -R sub
   adding sub/sub (glob)
   $ 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 (glob)
   adding main/main (glob)
   $ 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
   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
   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"
 
 subrepo paths with ssh urls
 
   $ cp "$TESTDIR/dummyssh" "$BINDIR/ssh"
 
   $ hg clone ssh://user@dummy/cloned sshclone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 3 changes to 3 files
   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
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg -R sshclone push ssh://user@dummy/$TESTTMP/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
   $ rm "$BINDIR/ssh"

tests/test-symlink-os-yes-fs-no.py

@@ -1,42 +1,45 b''
 import os, sys, time
 from mercurial import hg, ui, commands, util
 
 TESTDIR = os.environ["TESTDIR"]
 BUNDLEPATH = os.path.join(TESTDIR, 'bundles', 'test-no-symlinks.hg')
 
 # only makes sense to test on os which supports symlinks
 if not getattr(os, "symlink", False):
     sys.exit(80) # SKIPPED_STATUS defined in run-tests.py
 
+u = ui.ui()
+# hide outer repo
+hg.peer(u, {}, '.', create=True)
+
 # clone with symlink support
-u = ui.ui()
 hg.clone(u, {}, BUNDLEPATH, 'test0')
 
 repo = hg.repository(u, 'test0')
 
 # wait a bit, or the status call wont update the dirstate
 time.sleep(1)
 commands.status(u, repo)
 
 # now disable symlink support -- this is what os.symlink would do on a
 # non-symlink file system
 def symlink_failure(src, dst):
     raise OSError, (1, "Operation not permitted")
 os.symlink = symlink_failure
 
 # dereference links as if a Samba server has exported this to a
 # Windows client
 for f in 'test0/a.lnk', 'test0/d/b.lnk':
     os.unlink(f)
     fp = open(f, 'wb')
     fp.write(util.readfile(f[:-4]))
     fp.close()
 
 # reload repository
 u = ui.ui()
 repo = hg.repository(u, 'test0')
 commands.status(u, repo)
 
 # try cloning a repo which contains symlinks
 u = ui.ui()
 hg.clone(u, {}, BUNDLEPATH, 'test1')