tests: cleanup of echo statements left over from test conversion

tests/test-convert-filemap.t

@@ -1,375 +1,374 b''
 
   $ HGMERGE=true; export HGMERGE
   $ echo '[extensions]' >> $HGRCPATH
   $ echo 'graphlog =' >> $HGRCPATH
   $ echo 'convert =' >> $HGRCPATH
   $ glog()
   > {
   >     hg glog --template '{rev} "{desc}" files: {files}\n' "$@"
   > }
   $ hg init source
   $ cd source
   $ echo foo > foo
   $ echo baz > baz
   $ mkdir -p dir/subdir
   $ echo dir/file >> dir/file
   $ echo dir/file2 >> dir/file2
   $ echo dir/file3 >> dir/file3 # to be corrupted in rev 0
   $ echo dir/subdir/file3 >> dir/subdir/file3
   $ echo dir/subdir/file4 >> dir/subdir/file4
   $ hg ci -d '0 0' -qAm '0: add foo baz dir/'
   $ echo bar > bar
   $ echo quux > quux
   $ echo dir/file4 >> dir/file4 # to be corrupted in rev 1
   $ hg copy foo copied
   $ hg ci -d '1 0' -qAm '1: add bar quux; copy foo to copied'
   $ echo >> foo
   $ hg ci -d '2 0' -m '2: change foo'
   $ hg up -qC 1
   $ echo >> bar
   $ echo >> quux
   $ hg ci -d '3 0' -m '3: change bar quux'
   created new head
   $ hg up -qC 2
   $ hg merge -qr 3
   $ echo >> bar
   $ echo >> baz
   $ hg ci -d '4 0' -m '4: first merge; change bar baz'
   $ echo >> bar
   $ echo 1 >> baz
   $ echo >> quux
   $ hg ci -d '5 0' -m '5: change bar baz quux'
   $ hg up -qC 4
   $ echo >> foo
   $ echo 2 >> baz
   $ hg ci -d '6 0' -m '6: change foo baz'
   created new head
   $ hg up -qC 5
   $ hg merge -qr 6
   $ echo >> bar
   $ hg ci -d '7 0' -m '7: second merge; change bar'
   $ echo >> foo
   $ hg ci -m '8: change foo'
   $ glog
   @  8 "8: change foo" files: foo
   |
   o    7 "7: second merge; change bar" files: bar baz
   |\
   | o  6 "6: change foo baz" files: baz foo
   | |
   o |  5 "5: change bar baz quux" files: bar baz quux
   |/
   o    4 "4: first merge; change bar baz" files: bar baz
   |\
   | o  3 "3: change bar quux" files: bar quux
   | |
   o |  2 "2: change foo" files: foo
   |/
   o  1 "1: add bar quux; copy foo to copied" files: bar copied dir/file4 quux
   |
   o  0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/file3 dir/subdir/file3 dir/subdir/file4 foo
   
 
 final file versions in this repo:
 
   $ hg manifest --debug
   9463f52fe115e377cf2878d4fc548117211063f2 644   bar
   94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644   baz
   7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644   copied
   3e20847584beff41d7cd16136b7331ab3d754be0 644   dir/file
   75e6d3f8328f5f6ace6bf10b98df793416a09dca 644   dir/file2
   e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c 644   dir/file3
   6edd55f559cdce67132b12ca09e09cee08b60442 644   dir/file4
   5fe139720576e18e34bcc9f79174db8897c8afe9 644   dir/subdir/file3
   57a1c1511590f3de52874adfa04effe8a77d64af 644   dir/subdir/file4
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
   $ hg debugrename copied
   copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
-  $ echo
   
   $ cd ..
   $ splitrepo()
   > {
   >     msg="$1"
   >     files="$2"
   >     opts=$3
   >     echo "% $files: $msg"
   >     prefix=`echo "$files" | sed -e 's/ /-/g'`
   >     fmap="$prefix.fmap"
   >     repo="$prefix.repo"
   >     for i in $files; do
   >         echo "include $i" >> "$fmap"
   >     done
   >     hg -q convert $opts --filemap "$fmap" --datesort source "$repo"
   >     hg up -q -R "$repo"
   >     glog -R "$repo"
   >     hg -R "$repo" manifest --debug
   > }
   $ splitrepo 'skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd' foo
   % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd
   @  3 "8: change foo" files: foo
   |
   o  2 "6: change foo baz" files: foo
   |
   o  1 "2: change foo" files: foo
   |
   o  0 "0: add foo baz dir/" files: foo
   
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   $ splitrepo 'merges are not merges anymore' bar
   % bar: merges are not merges anymore
   @  4 "7: second merge; change bar" files: bar
   |
   o  3 "5: change bar baz quux" files: bar
   |
   o  2 "4: first merge; change bar baz" files: bar
   |
   o  1 "3: change bar quux" files: bar
   |
   o  0 "1: add bar quux; copy foo to copied" files: bar
   
   9463f52fe115e377cf2878d4fc548117211063f2 644   bar
   $ splitrepo '1st merge is not a merge anymore; 2nd still is' baz
   % baz: 1st merge is not a merge anymore; 2nd still is
   @    4 "7: second merge; change bar" files: baz
   |\
   | o  3 "6: change foo baz" files: baz
   | |
   o |  2 "5: change bar baz quux" files: baz
   |/
   o  1 "4: first merge; change bar baz" files: baz
   |
   o  0 "0: add foo baz dir/" files: baz
   
   94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644   baz
   $ splitrepo 'we add additional merges when they are interesting' 'foo quux'
   % foo quux: we add additional merges when they are interesting
   @  8 "8: change foo" files: foo
   |
   o    7 "7: second merge; change bar" files:
   |\
   | o  6 "6: change foo baz" files: foo
   | |
   o |  5 "5: change bar baz quux" files: quux
   |/
   o    4 "4: first merge; change bar baz" files:
   |\
   | o  3 "3: change bar quux" files: quux
   | |
   o |  2 "2: change foo" files: foo
   |/
   o  1 "1: add bar quux; copy foo to copied" files: quux
   |
   o  0 "0: add foo baz dir/" files: foo
   
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
   $ splitrepo 'partial conversion' 'bar quux' '-r 3'
   % bar quux: partial conversion
   @  1 "3: change bar quux" files: bar quux
   |
   o  0 "1: add bar quux; copy foo to copied" files: bar quux
   
   b79105bedc55102f394e90a789c9c380117c1b4a 644   bar
   db0421cc6b685a458c8d86c7d5c004f94429ea23 644   quux
   $ splitrepo 'complete the partial conversion' 'bar quux'
   % bar quux: complete the partial conversion
   @  4 "7: second merge; change bar" files: bar
   |
   o  3 "5: change bar baz quux" files: bar quux
   |
   o  2 "4: first merge; change bar baz" files: bar
   |
   o  1 "3: change bar quux" files: bar quux
   |
   o  0 "1: add bar quux; copy foo to copied" files: bar quux
   
   9463f52fe115e377cf2878d4fc548117211063f2 644   bar
   bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
   $ rm -r foo.repo
   $ splitrepo 'partial conversion' 'foo' '-r 3'
   % foo: partial conversion
   @  0 "0: add foo baz dir/" files: foo
   
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo
   $ splitrepo 'complete the partial conversion' 'foo'
   % foo: complete the partial conversion
   @  3 "8: change foo" files: foo
   |
   o  2 "6: change foo baz" files: foo
   |
   o  1 "2: change foo" files: foo
   |
   o  0 "0: add foo baz dir/" files: foo
   
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   $ splitrepo 'copied file; source not included in new repo' copied
   % copied: copied file; source not included in new repo
   @  0 "1: add bar quux; copy foo to copied" files: copied
   
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   copied
   $ hg --cwd copied.repo debugrename copied
   copied not renamed
   $ splitrepo 'copied file; source included in new repo' 'foo copied'
   % foo copied: copied file; source included in new repo
   @  4 "8: change foo" files: foo
   |
   o  3 "6: change foo baz" files: foo
   |
   o  2 "2: change foo" files: foo
   |
   o  1 "1: add bar quux; copy foo to copied" files: copied
   |
   o  0 "0: add foo baz dir/" files: foo
   
   7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644   copied
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
   $ hg --cwd foo-copied.repo debugrename copied
   copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
   $ cat > renames.fmap <<EOF
   > include dir
   > exclude dir/file2
   > rename dir dir2
   > include foo
   > include copied
   > rename foo foo2
   > rename copied copied2
   > exclude dir/subdir
   > include dir/subdir/file3
   > EOF
   $ rm source/.hg/store/data/dir/file3.i
   $ rm source/.hg/store/data/dir/file4.i
   $ hg -q convert --filemap renames.fmap --datesort source dummydest
   abort: data/dir/file3.i@e96dce0bc6a2: no match found!
   [255]
   $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo
   ignoring: data/dir/file3.i@e96dce0bc6a2: no match found
   ignoring: data/dir/file4.i@6edd55f559cd: no match found
   $ hg up -q -R renames.repo
   $ glog -R renames.repo
   @  4 "8: change foo" files: foo2
   |
   o  3 "6: change foo baz" files: foo2
   |
   o  2 "2: change foo" files: foo2
   |
   o  1 "1: add bar quux; copy foo to copied" files: copied2
   |
   o  0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2
   
   $ hg -R renames.repo manifest --debug
   d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644   copied2
   3e20847584beff41d7cd16136b7331ab3d754be0 644   dir2/file
   5fe139720576e18e34bcc9f79174db8897c8afe9 644   dir2/subdir/file3
   9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo2
   $ hg --cwd renames.repo debugrename copied2
   copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 
 copied:
 
   $ hg --cwd source cat copied
   foo
 
 copied2:
 
   $ hg --cwd renames.repo cat copied2
   foo
 
 filemap errors
 
   $ cat > errors.fmap <<EOF
   > include dir/ # beware that comments changes error line numbers!
   > exclude /dir
   > rename dir//dir /dir//dir/ "out of sync"
   > include
   > EOF
   $ hg -q convert --filemap errors.fmap source errors.repo
   errors.fmap:1: superfluous / in exclude 'dir/'
   errors.fmap:3: superfluous / in include '/dir'
   errors.fmap:3: superfluous / in rename '/dir'
   errors.fmap:3: superfluous / in exclude 'dir//dir'
   errors.fmap:4: unknown directive 'out of sync'
   errors.fmap:5: path to exclude is missing
   abort: errors in filemap
   [255]
 
 test branch closing revision pruning if branch is pruned
 
   $ hg init branchpruning
   $ cd branchpruning
   $ hg branch foo
   marked working directory as branch foo
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ hg ci --close-branch -m closefoo
   $ hg up 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch empty
   marked working directory as branch empty
   $ hg ci -m emptybranch
   $ hg ci --close-branch -m closeempty
   $ hg up 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch default
   marked working directory as branch default
   $ echo b > b
   $ hg ci -Am addb
   adding b
   $ hg ci --close-branch -m closedefault
   $ cat > filemap <<EOF
   > include b
   > EOF
   $ cd ..
   $ hg convert branchpruning branchpruning-hg1
   initializing destination branchpruning-hg1 repository
   scanning source...
   sorting...
   converting...
   5 adda
   4 closefoo
   3 emptybranch
   2 closeempty
   1 addb
   0 closedefault
   $ glog -R branchpruning-hg1
   o  5 "closedefault" files:
   |
   o  4 "addb" files: b
   |
   | o  3 "closeempty" files:
   | |
   | o  2 "emptybranch" files:
   |/
   | o  1 "closefoo" files:
   |/
   o  0 "adda" files: a
   
 
 exercise incremental conversion at the same time
 
   $ hg convert -r0 --filemap branchpruning/filemap branchpruning branchpruning-hg2
   initializing destination branchpruning-hg2 repository
   scanning source...
   sorting...
   converting...
   0 adda
   $ hg convert -r4 --filemap branchpruning/filemap branchpruning branchpruning-hg2
   scanning source...
   sorting...
   converting...
   0 addb
   $ hg convert --filemap branchpruning/filemap branchpruning branchpruning-hg2
   scanning source...
   sorting...
   converting...
   3 closefoo
   2 emptybranch
   1 closeempty
   0 closedefault
   $ glog -R branchpruning-hg2
   o  1 "closedefault" files:
   |
   o  0 "addb" files: b
   

tests/test-convert-git.t

@@ -1,297 +1,293 b''
 
   $ "$TESTDIR/hghave" git || exit 80
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert=" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='[e-mail]'; export GIT_AUTHOR_EMAIL
   $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE
   $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
   $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
   $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
   $ count=10
   $ commit()
   > {
   >     GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
   >     GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
   >     git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
   >     count=`expr $count + 1`
   > }
   $ mkdir git-repo
   $ cd git-repo
   $ git init-db >/dev/null 2>/dev/null
   $ echo a > a
   $ mkdir d
   $ echo b > d/b
   $ git add a d
   $ commit -a -m t1
 
 Remove the directory, then try to replace it with a file
 (issue 754)
 
   $ git rm -f d/b
   rm 'd/b'
   $ commit -m t2
   $ echo d > d
   $ git add d
   $ commit -m t3
   $ echo b >> a
   $ commit -a -m t4.1
   $ git checkout -b other HEAD~ >/dev/null 2>/dev/null
   $ echo c > a
   $ echo a >> a
   $ commit -a -m t4.2
   $ git checkout master >/dev/null 2>/dev/null
   $ git pull --no-commit . other > /dev/null 2>/dev/null
   $ commit -m 'Merge branch other'
   $ cd ..
   $ hg convert --datesort git-repo
   assuming destination git-repo-hg
   initializing destination git-repo-hg repository
   scanning source...
   sorting...
   converting...
   5 t1
   4 t2
   3 t3
   2 t4.1
   1 t4.2
   0 Merge branch other
   updating bookmarks
   $ hg up -q -R git-repo-hg
   $ hg -R git-repo-hg tip -v
   changeset:   5:c78094926be2
   bookmark:    master
   tag:         tip
   parent:      3:f5f5cb45432b
   parent:      4:4e174f80c67c
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:15 2007 +0000
   files:       a
   description:
   Merge branch other
   
   
   $ count=10
   $ mkdir git-repo2
   $ cd git-repo2
   $ git init-db >/dev/null 2>/dev/null
   $ echo foo > foo
   $ git add foo
   $ commit -a -m 'add foo'
   $ echo >> foo
   $ commit -a -m 'change foo'
   $ git checkout -b Bar HEAD~ >/dev/null 2>/dev/null
   $ echo quux >> quux
   $ git add quux
   $ commit -a -m 'add quux'
   $ echo bar > bar
   $ git add bar
   $ commit -a -m 'add bar'
   $ git checkout -b Baz HEAD~ >/dev/null 2>/dev/null
   $ echo baz > baz
   $ git add baz
   $ commit -a -m 'add baz'
   $ git checkout master >/dev/null 2>/dev/null
   $ git pull --no-commit . Bar Baz > /dev/null 2>/dev/null
   $ commit -m 'Octopus merge'
   $ echo bar >> bar
   $ commit -a -m 'change bar'
   $ git checkout -b Foo HEAD~ >/dev/null 2>/dev/null
   $ echo >> foo
   $ commit -a -m 'change foo'
   $ git checkout master >/dev/null 2>/dev/null
   $ git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null
   $ commit -m 'Discard change to foo'
   $ cd ..
   $ glog()
   > {
   >     hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
   > }
   $ splitrepo()
   > {
   >     msg="$1"
   >     files="$2"
   >     opts=$3
   >     echo "% $files: $msg"
   >     prefix=`echo "$files" | sed -e 's/ /-/g'`
   >     fmap="$prefix.fmap"
   >     repo="$prefix.repo"
   >     for i in $files; do
   >         echo "include $i" >> "$fmap"
   >     done
   >     hg -q convert $opts --filemap "$fmap" --datesort git-repo2 "$repo"
   >     hg up -q -R "$repo"
   >     glog -R "$repo"
   >     hg -R "$repo" manifest --debug
   > }
 
 full conversion
 
   $ hg -q convert --datesort git-repo2 fullrepo
   $ hg up -q -R fullrepo
   $ glog -R fullrepo
   @    9 "Discard change to foo" files: foo
   |\
   | o  8 "change foo" files: foo
   | |
   o |  7 "change bar" files: bar
   |/
   o    6 "(octopus merge fixup)" files:
   |\
   | o    5 "Octopus merge" files: baz
   | |\
   o | |  4 "add baz" files: baz
   | | |
   +---o  3 "add bar" files: bar
   | |
   o |  2 "add quux" files: quux
   | |
   | o  1 "change foo" files: foo
   |/
   o  0 "add foo" files: foo
   
   $ hg -R fullrepo manifest --debug
   245a3b8bc653999c2b22cdabd517ccb47aecafdf 644   bar
   354ae8da6e890359ef49ade27b68bbc361f3ca88 644   baz
   9277c9cc8dd4576fc01a17939b4351e5ada93466 644   foo
   88dfeab657e8cf2cef3dec67b914f49791ae76b1 644   quux
   $ splitrepo 'octopus merge' 'foo bar baz'
   % foo bar baz: octopus merge
   @    8 "Discard change to foo" files: foo
   |\
   | o  7 "change foo" files: foo
   | |
   o |  6 "change bar" files: bar
   |/
   o    5 "(octopus merge fixup)" files:
   |\
   | o    4 "Octopus merge" files: baz
   | |\
   o | |  3 "add baz" files: baz
   | | |
   +---o  2 "add bar" files: bar
   | |
   | o  1 "change foo" files: foo
   |/
   o  0 "add foo" files: foo
   
   245a3b8bc653999c2b22cdabd517ccb47aecafdf 644   bar
   354ae8da6e890359ef49ade27b68bbc361f3ca88 644   baz
   9277c9cc8dd4576fc01a17939b4351e5ada93466 644   foo
   $ splitrepo 'only some parents of an octopus merge; "discard" a head' 'foo baz quux'
   % foo baz quux: only some parents of an octopus merge; "discard" a head
   @  6 "Discard change to foo" files: foo
   |
   o  5 "change foo" files: foo
   |
   o    4 "Octopus merge" files:
   |\
   | o  3 "add baz" files: baz
   | |
   | o  2 "add quux" files: quux
   | |
   o |  1 "change foo" files: foo
   |/
   o  0 "add foo" files: foo
   
   354ae8da6e890359ef49ade27b68bbc361f3ca88 644   baz
   9277c9cc8dd4576fc01a17939b4351e5ada93466 644   foo
   88dfeab657e8cf2cef3dec67b914f49791ae76b1 644   quux
-  $ echo
-  
 
 test binary conversion (issue 1359)
 
   $ mkdir git-repo3
   $ cd git-repo3
   $ git init-db >/dev/null 2>/dev/null
   $ python -c 'file("b", "wb").write("".join([chr(i) for i in range(256)])*16)'
   $ git add b
   $ commit -a -m addbinary
   $ cd ..
 
 convert binary file
 
   $ hg convert git-repo3 git-repo3-hg
   initializing destination git-repo3-hg repository
   scanning source...
   sorting...
   converting...
   0 addbinary
   updating bookmarks
   $ cd git-repo3-hg
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ python -c 'print len(file("b", "rb").read())'
   4096
   $ cd ..
-  $ echo
-  
 
 test author vs committer
 
   $ mkdir git-repo4
   $ cd git-repo4
   $ git init-db >/dev/null 2>/dev/null
   $ echo >> foo
   $ git add foo
   $ commit -a -m addfoo
   $ echo >> foo
   $ GIT_AUTHOR_NAME="nottest"
   $ commit -a -m addfoo2
   $ cd ..
 
 convert author committer
 
   $ hg convert git-repo4 git-repo4-hg
   initializing destination git-repo4-hg repository
   scanning source...
   sorting...
   converting...
   1 addfoo
   0 addfoo2
   updating bookmarks
   $ hg -R git-repo4-hg log -v
   changeset:   1:d63e967f93da
   bookmark:    master
   tag:         tip
   user:        nottest <[e-mail]>
   date:        Mon Jan 01 00:00:21 2007 +0000
   files:       foo
   description:
   addfoo2
   
   committer: test <[e-mail]>
   
   
   changeset:   0:0735477b0224
   user:        test <[e-mail]>
   date:        Mon Jan 01 00:00:20 2007 +0000
   files:       foo
   description:
   addfoo
   
   
 
 --sourceorder should fail
 
   $ hg convert --sourcesort git-repo4 git-repo4-sourcesort-hg
   initializing destination git-repo4-sourcesort-hg repository
   abort: --sourcesort is not supported by this data source
   [255]
 
 damage git repository and convert again
 
   $ cat > damage.py <<EOF
   > import os
   > for root, dirs, files in os.walk('git-repo4/.git/objects'):
   >     if files:
   >         path = os.path.join(root, files[0])
   >         os.remove(path)
   >         break
   > EOF
   $ python damage.py
   $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | \
   >     grep 'abort:' | sed 's/abort:.*/abort:/g'
   abort:

tests/test-convert-svn-sink.t

@@ -1,548 +1,549 b''
 
   $ "$TESTDIR/hghave" svn no-outer-repo || exit 80
 
   $ fixpath()
   > {
   >     tr '\\' /
   > }
   $ svnupanddisplay()
   > {
   >     (
   >        cd $1;
   >        svn up;
   >        svn st -v | fixpath | sed 's/  */ /g'
   >        limit=''
   >        if [ $2 -gt 0 ]; then
   >            limit="--limit=$2"
   >        fi
   >        svn log --xml -v $limit \
   >            | fixpath \
   >            | sed 's,<date>.*,<date/>,' \
   >            | grep -v 'kind="'
   >     )
   > }
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert = 
   > graphlog =
   > EOF
 
   $ hg init a
 
 Add
 
   $ echo a > a/a
   $ mkdir -p a/d1/d2
   $ echo b > a/d1/d2/b
   $ ln -s a/missing a/link
   $ hg --cwd a ci -d '0 0' -A -m 'add a file'
   adding a
   adding d1/d2/b
   adding link
 
 Modify
 
   $ "$TESTDIR/svn-safe-append.py" a a/a
   $ hg --cwd a ci -d '1 0' -m 'modify a file'
   $ hg --cwd a tip -q
   1:8231f652da37
 
   $ hg convert -d svn a
   assuming destination a-hg
   initializing svn repository 'a-hg'
   initializing svn working copy 'a-hg-wc'
   scanning source...
   sorting...
   converting...
   1 add a file
   0 modify a file
   $ svnupanddisplay a-hg-wc 2
   At revision 2.
    2 2 test .
    2 2 test a
    2 1 test d1
    2 1 test d1/d2
    2 1 test d1/d2/b
    2 1 test link
   <?xml version="1.0"?>
   <log>
   <logentry
      revision="2">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="M">/a</path>
   </paths>
   <msg>modify a file</msg>
   </logentry>
   <logentry
      revision="1">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="A">/a</path>
   <path
      action="A">/d1</path>
   <path
      action="A">/d1/d2</path>
   <path
      action="A">/d1/d2/b</path>
   <path
      action="A">/link</path>
   </paths>
   <msg>add a file</msg>
   </logentry>
   </log>
   $ ls a a-hg-wc
   a:
   a
   d1
   link
   
   a-hg-wc:
   a
   d1
   link
   $ cmp a/a a-hg-wc/a
 
 Rename
 
   $ hg --cwd a mv a b
   $ hg --cwd a mv link newlink
 
   $ hg --cwd a ci -d '2 0' -m 'rename a file'
   $ hg --cwd a tip -q
   2:a67e26ccec09
 
   $ hg convert -d svn a
   assuming destination a-hg
   initializing svn working copy 'a-hg-wc'
   scanning source...
   sorting...
   converting...
   0 rename a file
   $ svnupanddisplay a-hg-wc 1
   At revision 3.
    3 3 test .
    3 3 test b
    3 1 test d1
    3 1 test d1/d2
    3 1 test d1/d2/b
    3 3 test newlink
   <?xml version="1.0"?>
   <log>
   <logentry
      revision="3">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="D">/a</path>
   <path
      copyfrom-path="/a"
      copyfrom-rev="2"
      action="A">/b</path>
   <path
      copyfrom-path="/link"
      copyfrom-rev="2"
      action="A">/newlink</path>
   <path
      action="D">/link</path>
   </paths>
   <msg>rename a file</msg>
   </logentry>
   </log>
   $ ls a a-hg-wc
   a:
   b
   d1
   newlink
   
   a-hg-wc:
   b
   d1
   newlink
 
 Copy
 
   $ hg --cwd a cp b c
 
   $ hg --cwd a ci -d '3 0' -m 'copy a file'
   $ hg --cwd a tip -q
   3:0cf087b9ab02
 
   $ hg convert -d svn a
   assuming destination a-hg
   initializing svn working copy 'a-hg-wc'
   scanning source...
   sorting...
   converting...
   0 copy a file
   $ svnupanddisplay a-hg-wc 1
   At revision 4.
    4 4 test .
    4 3 test b
    4 4 test c
    4 1 test d1
    4 1 test d1/d2
    4 1 test d1/d2/b
    4 3 test newlink
   <?xml version="1.0"?>
   <log>
   <logentry
      revision="4">
   <author>test</author>
   <date/>
   <paths>
   <path
      copyfrom-path="/b"
      copyfrom-rev="3"
      action="A">/c</path>
   </paths>
   <msg>copy a file</msg>
   </logentry>
   </log>
   $ ls a a-hg-wc
   a:
   b
   c
   d1
   newlink
   
   a-hg-wc:
   b
   c
   d1
   newlink
 
   $ hg --cwd a rm b
-  $ echo % remove
-  % remove
+
+Remove
+
   $ hg --cwd a ci -d '4 0' -m 'remove a file'
   $ hg --cwd a tip -q
   4:07b2e34a5b17
 
   $ hg convert -d svn a
   assuming destination a-hg
   initializing svn working copy 'a-hg-wc'
   scanning source...
   sorting...
   converting...
   0 remove a file
   $ svnupanddisplay a-hg-wc 1
   At revision 5.
    5 5 test .
    5 4 test c
    5 1 test d1
    5 1 test d1/d2
    5 1 test d1/d2/b
    5 3 test newlink
   <?xml version="1.0"?>
   <log>
   <logentry
      revision="5">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="D">/b</path>
   </paths>
   <msg>remove a file</msg>
   </logentry>
   </log>
   $ ls a a-hg-wc
   a:
   c
   d1
   newlink
   
   a-hg-wc:
   c
   d1
   newlink
 
 Exectutable
 
   $ chmod +x a/c
   $ hg --cwd a ci -d '5 0' -m 'make a file executable'
   $ hg --cwd a tip -q
   5:31093672760b
 
   $ hg convert -d svn a
   assuming destination a-hg
   initializing svn working copy 'a-hg-wc'
   scanning source...
   sorting...
   converting...
   0 make a file executable
   $ svnupanddisplay a-hg-wc 1
   At revision 6.
    6 6 test .
    6 6 test c
    6 1 test d1
    6 1 test d1/d2
    6 1 test d1/d2/b
    6 3 test newlink
   <?xml version="1.0"?>
   <log>
   <logentry
      revision="6">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="M">/c</path>
   </paths>
   <msg>make a file executable</msg>
   </logentry>
   </log>
   $ test -x a-hg-wc/c
 
 Executable in new directory
 
   $ rm -rf a a-hg a-hg-wc
   $ hg init a
 
   $ mkdir a/d1
   $ echo a > a/d1/a
   $ chmod +x a/d1/a
   $ hg --cwd a ci -d '0 0' -A -m 'add executable file in new directory'
   adding d1/a
 
   $ hg convert -d svn a
   assuming destination a-hg
   initializing svn repository 'a-hg'
   initializing svn working copy 'a-hg-wc'
   scanning source...
   sorting...
   converting...
   0 add executable file in new directory
   $ svnupanddisplay a-hg-wc 1
   At revision 1.
    1 1 test .
    1 1 test d1
    1 1 test d1/a
   <?xml version="1.0"?>
   <log>
   <logentry
      revision="1">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="A">/d1</path>
   <path
      action="A">/d1/a</path>
   </paths>
   <msg>add executable file in new directory</msg>
   </logentry>
   </log>
   $ test -x a-hg-wc/d1/a
 
 Copy to new directory
 
   $ mkdir a/d2
   $ hg --cwd a cp d1/a d2/a
   $ hg --cwd a ci -d '1 0' -A -m 'copy file to new directory'
 
   $ hg convert -d svn a
   assuming destination a-hg
   initializing svn working copy 'a-hg-wc'
   scanning source...
   sorting...
   converting...
   0 copy file to new directory
   $ svnupanddisplay a-hg-wc 1
   At revision 2.
    2 2 test .
    2 1 test d1
    2 1 test d1/a
    2 2 test d2
    2 2 test d2/a
   <?xml version="1.0"?>
   <log>
   <logentry
      revision="2">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="A">/d2</path>
   <path
      copyfrom-path="/d1/a"
      copyfrom-rev="1"
      action="A">/d2/a</path>
   </paths>
   <msg>copy file to new directory</msg>
   </logentry>
   </log>
 
 Branchy history
 
   $ hg init b
   $ echo base > b/b
   $ hg --cwd b ci -d '0 0' -Ambase
   adding b
 
   $ "$TESTDIR/svn-safe-append.py" left-1 b/b
   $ echo left-1 > b/left-1
   $ hg --cwd b ci -d '1 0' -Amleft-1
   adding left-1
 
   $ "$TESTDIR/svn-safe-append.py" left-2 b/b
   $ echo left-2 > b/left-2
   $ hg --cwd b ci -d '2 0' -Amleft-2
   adding left-2
 
   $ hg --cwd b up 0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ "$TESTDIR/svn-safe-append.py" right-1 b/b
   $ echo right-1 > b/right-1
   $ hg --cwd b ci -d '3 0' -Amright-1
   adding right-1
   created new head
 
   $ "$TESTDIR/svn-safe-append.py" right-2 b/b
   $ echo right-2 > b/right-2
   $ hg --cwd b ci -d '4 0' -Amright-2
   adding right-2
 
   $ hg --cwd b up -C 2
   3 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg --cwd b merge
   merging b
   warning: conflicts during merge.
   merging b failed!
   2 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]
   $ hg --cwd b revert -r 2 b
   $ hg resolve -m b
   $ hg --cwd b ci -d '5 0' -m 'merge'
 
 Expect 4 changes
 
   $ hg convert -d svn b
   assuming destination b-hg
   initializing svn repository 'b-hg'
   initializing svn working copy 'b-hg-wc'
   scanning source...
   sorting...
   converting...
   5 base
   4 left-1
   3 left-2
   2 right-1
   1 right-2
   0 merge
 
   $ svnupanddisplay b-hg-wc 0
   At revision 4.
    4 4 test .
    4 3 test b
    4 2 test left-1
    4 3 test left-2
    4 4 test right-1
    4 4 test right-2
   <?xml version="1.0"?>
   <log>
   <logentry
      revision="4">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="A">/right-1</path>
   <path
      action="A">/right-2</path>
   </paths>
   <msg>merge</msg>
   </logentry>
   <logentry
      revision="3">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="M">/b</path>
   <path
      action="A">/left-2</path>
   </paths>
   <msg>left-2</msg>
   </logentry>
   <logentry
      revision="2">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="M">/b</path>
   <path
      action="A">/left-1</path>
   </paths>
   <msg>left-1</msg>
   </logentry>
   <logentry
      revision="1">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="A">/b</path>
   </paths>
   <msg>base</msg>
   </logentry>
   </log>
 
 Tags are not supported, but must not break conversion
 
   $ rm -rf a a-hg a-hg-wc
   $ hg init a
   $ echo a > a/a
   $ hg --cwd a ci -d '0 0' -A -m 'Add file a'
   adding a
   $ hg --cwd a tag -d '1 0' -m 'Tagged as v1.0' v1.0
 
   $ hg convert -d svn a
   assuming destination a-hg
   initializing svn repository 'a-hg'
   initializing svn working copy 'a-hg-wc'
   scanning source...
   sorting...
   converting...
   1 Add file a
   0 Tagged as v1.0
   writing Subversion tags is not yet implemented
   $ svnupanddisplay a-hg-wc 2
   At revision 2.
    2 2 test .
    2 1 test a
    2 2 test .hgtags
   <?xml version="1.0"?>
   <log>
   <logentry
      revision="2">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="A">/.hgtags</path>
   </paths>
   <msg>Tagged as v1.0</msg>
   </logentry>
   <logentry
      revision="1">
   <author>test</author>
   <date/>
   <paths>
   <path
      action="A">/a</path>
   </paths>
   <msg>Add file a</msg>
   </logentry>
   </log>
   $ rm -rf a a-hg a-hg-wc

tests/test-diff-color.t

@@ -1,127 +1,124 b''
 Setup
 
   $ echo "[color]" >> $HGRCPATH
   $ echo "mode = ansi" >> $HGRCPATH
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "color=" >> $HGRCPATH
   $ hg init repo
   $ cd repo
   $ cat > a <<EOF
   > c
   > c
   > a
   > a
   > b
   > a
   > a
   > c
   > c
   > EOF
   $ hg ci -Am adda
   adding a
   $ cat > a <<EOF
   > c
   > c
   > a
   > a
   > dd
   > a
   > a
   > c
   > c
   > EOF
 
 default context
 
   $ hg diff --nodates --color=always
   \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
   \x1b[0;31;1m--- a/a\x1b[0m (esc)
   \x1b[0;32;1m+++ b/a\x1b[0m (esc)
   \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
    c
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m (esc)
    a
    a
    c
 
 --unified=2
 
   $ hg diff --nodates -U 2  --color=always
   \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
   \x1b[0;31;1m--- a/a\x1b[0m (esc)
   \x1b[0;32;1m+++ b/a\x1b[0m (esc)
   \x1b[0;35m@@ -3,5 +3,5 @@\x1b[0m (esc)
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m (esc)
    a
    a
 
 diffstat
 
   $ hg diff --stat --color=always
    a |  2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc)
    1 files changed, 1 insertions(+), 1 deletions(-)
   $ echo "record=" >> $HGRCPATH
   $ echo "[ui]" >> $HGRCPATH
   $ echo "interactive=true" >> $HGRCPATH
   $ echo "[diff]" >> $HGRCPATH
   $ echo "git=True" >> $HGRCPATH
 
 record
 
   $ chmod 0755 a
   $ hg record --color=always -m moda a <<EOF
   > y
   > y
   > EOF
   \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
   \x1b[0;36;1mold mode 100644\x1b[0m (esc)
   \x1b[0;36;1mnew mode 100755\x1b[0m (esc)
   1 hunks, 1 lines changed
   \x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m  (esc)
   \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
    c
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m (esc)
    a
    a
    c
   \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m  (esc)
-  $ echo
   
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ hg rollback
   repository tip rolled back to revision 0 (undo commit)
   working directory now based on revision 0
 
 qrecord
 
   $ hg qrecord --color=always -m moda patch <<EOF
   > y
   > y
   > EOF
   \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
   \x1b[0;36;1mold mode 100644\x1b[0m (esc)
   \x1b[0;36;1mnew mode 100755\x1b[0m (esc)
   1 hunks, 1 lines changed
   \x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m  (esc)
   \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
    c
    a
    a
   \x1b[0;31m-b\x1b[0m (esc)
   \x1b[0;32m+dd\x1b[0m (esc)
    a
    a
    c
   \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m  (esc)
-  $ echo
-  

tests/test-fetch.t

@@ -1,418 +1,410 b''
 adjust to non-default HGPORT, e.g. with run-tests.py -j
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "fetch=" >> $HGRCPATH
 
 test fetch with default branches only
 
   $ hg init a
   $ echo a > a/a
   $ hg --cwd a commit -d '1 0' -Ama
   adding a
   $ hg clone a b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone a c
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b > a/b
   $ hg --cwd a commit -d '2 0' -Amb
   adding b
   $ hg --cwd a parents -q
   1:97d72e5f12c7
 
 should pull one change
 
   $ hg --cwd b fetch ../a
   pulling from ../a
   searching for 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
   $ hg --cwd b parents -q
   1:97d72e5f12c7
   $ echo c > c/c
   $ hg --cwd c commit -d '3 0' -Amc
   adding c
   $ hg clone c d
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone c e
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 We cannot use the default commit message if fetching from a local
 repo, because the path of the repo will be included in the commit
 message, making every commit appear different.
 should merge c into a
 
   $ hg --cwd c fetch -d '4 0' -m 'automated merge' ../a
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   updating to 2:97d72e5f12c7
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   merging with 1:5e056962225c
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   new changeset 3:cd3a41621cf0 merges remote changes with local
   $ ls c
   a
   b
   c
   $ netstat -tnap 2>/dev/null | grep $HGPORT | grep LISTEN
   [1]
   $ hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid
   $ cat a/hg.pid >> "$DAEMON_PIDS"
 
 fetch over http, no auth
 
   $ hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   updating to 2:97d72e5f12c7
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   merging with 1:5e056962225c
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   new changeset 3:* merges remote changes with local (glob)
   $ hg --cwd d tip --template '{desc}\n'
   Automated merge with http://localhost:$HGPORT/
 
 fetch over http with auth (should be hidden in desc)
 
   $ hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/
   pulling from http://user:***@localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   updating to 2:97d72e5f12c7
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   merging with 1:5e056962225c
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   new changeset 3:* merges remote changes with local (glob)
   $ hg --cwd e tip --template '{desc}\n'
   Automated merge with http://localhost:$HGPORT/
   $ hg clone a f
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone a g
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo f > f/f
   $ hg --cwd f ci -d '6 0' -Amf
   adding f
   $ echo g > g/g
   $ hg --cwd g ci -d '6 0' -Amg
   adding g
   $ hg clone -q f h
   $ hg clone -q g i
 
 should merge f into g
 
   $ hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f
   pulling from ../f
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging with 3:cc6a3744834d
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   new changeset 4:55aa4f32ec59 merges remote changes with local
   $ rm i/g
 
 should abort, because i is modified
 
   $ hg --cwd i fetch ../h
   abort: working directory is missing some files
   [255]
 
 test fetch with named branches
 
   $ hg init nbase
   $ echo base > nbase/a
   $ hg -R nbase ci -d '1 0' -Am base
   adding a
   $ hg -R nbase branch a
   marked working directory as branch a
   $ echo a > nbase/a
   $ hg -R nbase ci -d '2 0' -m a
   $ hg -R nbase up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R nbase branch b
   marked working directory as branch b
   $ echo b > nbase/b
   $ hg -R nbase ci -Ad '3 0' -m b
   adding b
-  $ echo
-  
 
 pull in change on foreign branch
 
   $ hg clone nbase n1
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone nbase n2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R n1 up -C a
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo aa > n1/a
   $ hg -R n1 ci -d '4 0' -m a1
   $ hg -R n2 up -C b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R n2 fetch -d '9 0' -m 'merge' n1
   pulling from n1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 parent should be 2 (no automatic update)
 
   $ hg -R n2 parents --template '{rev}\n'
   2
   $ rm -fr n1 n2
-  $ echo
-  
 
 pull in changes on both foreign and local branches
 
   $ hg clone nbase n1
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone nbase n2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R n1 up -C a
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo aa > n1/a
   $ hg -R n1 ci -d '4 0' -m a1
   $ hg -R n1 up -C b
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo bb > n1/b
   $ hg -R n1 ci -d '5 0' -m b1
   $ hg -R n2 up -C b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R n2 fetch -d '9 0' -m 'merge' n1
   pulling from n1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 parent should be 4 (fast forward)
 
   $ hg -R n2 parents --template '{rev}\n'
   4
   $ rm -fr n1 n2
-  $ echo
-  
 
 pull changes on foreign (2 new heads) and local (1 new head) branches
 with a local change
 
   $ hg clone nbase n1
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone nbase n2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R n1 up -C a
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo a1 > n1/a
   $ hg -R n1 ci -d '4 0' -m a1
   $ hg -R n1 up -C b
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo bb > n1/b
   $ hg -R n1 ci -d '5 0' -m b1
   $ hg -R n1 up -C 1
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo a2 > n1/a
   $ hg -R n1 ci -d '6 0' -m a2
   created new head
   $ hg -R n2 up -C b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo change >> n2/c
   $ hg -R n2 ci -Ad '7 0' -m local
   adding c
   $ hg -R n2 fetch -d '9 0' -m 'merge' n1
   pulling from n1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files (+2 heads)
   updating to 5:708c6cce3d26
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   merging with 3:d83427717b1f
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   new changeset 7:48f1a33f52af merges remote changes with local
 
 parent should be 7 (new merge changeset)
 
   $ hg -R n2 parents --template '{rev}\n'
   7
   $ rm -fr n1 n2
 
 pull in changes on foreign (merge of local branch) and local (2 new
 heads) with a local change
 
   $ hg clone nbase n1
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg clone nbase n2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R n1 up -C a
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R n1 merge b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg -R n1 ci -d '4 0' -m merge
   $ hg -R n1 up -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo c > n1/a
   $ hg -R n1 ci -d '5 0' -m c
   $ hg -R n1 up -C 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo cc > n1/a
   $ hg -R n1 ci -d '6 0' -m cc
   created new head
   $ hg -R n2 up -C b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo change >> n2/b
   $ hg -R n2 ci -Ad '7 0' -m local
   $ hg -R n2 fetch -d '9 0' -m 'merge' n1
   pulling from n1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files (+2 heads)
   not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them)
   [1]
 
 parent should be 3 (fetch did not merge anything)
 
   $ hg -R n2 parents --template '{rev}\n'
   3
   $ rm -fr n1 n2
 
 pull in change on different branch than dirstate
 
   $ hg init n1
   $ echo a > n1/a
   $ hg -R n1 ci -Am initial
   adding a
   $ hg clone n1 n2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b > n1/a
   $ hg -R n1 ci -m next
   $ hg -R n2 branch topic
   marked working directory as branch topic
   $ hg -R n2 fetch -d '0 0' -m merge n1
   abort: working dir not at branch tip (use "hg update" to check out branch tip)
   [255]
 
 parent should be 0 (fetch did not update or merge anything)
 
   $ hg -R n2 parents --template '{rev}\n'
   0
   $ rm -fr n1 n2
 
 test fetch with inactive branches
 
   $ hg init ib1
   $ echo a > ib1/a
   $ hg --cwd ib1 ci -Am base
   adding a
   $ hg --cwd ib1 branch second
   marked working directory as branch second
   $ echo b > ib1/b
   $ hg --cwd ib1 ci -Am onsecond
   adding b
   $ hg --cwd ib1 branch -f default
   marked working directory as branch default
   $ echo c > ib1/c
   $ hg --cwd ib1 ci -Am newdefault
   adding c
   created new head
   $ hg clone ib1 ib2
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 fetch should succeed
 
   $ hg --cwd ib2 fetch ../ib1
   pulling from ../ib1
   searching for changes
   no changes found
   $ rm -fr ib1 ib2
 
 test issue1726
 
   $ hg init i1726r1
   $ echo a > i1726r1/a
   $ hg --cwd i1726r1 ci -Am base
   adding a
   $ hg clone i1726r1 i1726r2
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b > i1726r1/a
   $ hg --cwd i1726r1 ci -m second
   $ echo c > i1726r2/a
   $ hg --cwd i1726r2 ci -m third
   $ HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1
   pulling from ../i1726r1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   updating to 2:7837755a2789
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging with 1:d1f0c6c48ebd
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   new changeset 3:* merges remote changes with local (glob)
   $ hg --cwd i1726r2 heads default --template '{rev}\n'
   3
-  $ echo
-  
 
 test issue2047
 
   $ hg -q init i2047a
   $ cd i2047a
   $ echo a > a
   $ hg -q ci -Am a
   $ hg -q branch stable
   $ echo b > b
   $ hg -q ci -Am b
   $ cd ..
   $ hg -q clone -r 0 i2047a i2047b
   $ cd i2047b
   $ hg fetch ../i2047a
   pulling from ../i2047a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   $ "$TESTDIR/killdaemons.py"

tests/test-highlight.t

@@ -1,609 +1,605 b''
 
   $ "$TESTDIR/hghave" pygments || exit 80
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > highlight =
   > [web]
   > pygments_style = friendly
   > EOF
   $ hg init test
   $ cd test
 
 create random Python file to exercise Pygments
 
   $ cat <<EOF > primes.py
   > #!/usr/bin/env python
   > 
   > """Fun with generators. Corresponding Haskell implementation:
   > 
   > primes = 2 : sieve [3, 5..]
   >     where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]
   > """
   > 
   > from itertools import dropwhile, ifilter, islice, count, chain
   > 
   > def primes():
   >     """Generate all primes."""
   >     def sieve(ns):
   >         p = ns.next()
   >         # It is important to yield *here* in order to stop the
   >         # infinite recursion.
   >         yield p
   >         ns = ifilter(lambda n: n % p != 0, ns)
   >         for n in sieve(ns):
   >             yield n
   > 
   >     odds = ifilter(lambda i: i % 2 == 1, count())
   >     return chain([2], sieve(dropwhile(lambda n: n < 3, odds)))
   > 
   > if __name__ == "__main__":
   >     import sys
   >     try:
   >         n = int(sys.argv[1])
   >     except (ValueError, IndexError):
   >         n = 10
   >     p = primes()
   >     print "The first %d primes: %s" % (n, list(islice(p, n)))
   > EOF
   $ hg ci -Ama
   adding primes.py
 
 hg serve
 
   $ hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 hgweb filerevision, html
 
   $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py') \
   >     | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mf\"/class=\"mi\"/g"
   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>
   
   <link rel="stylesheet" href="/highlightcss" type="text/css" />
   <title>test: 853dcd4de2a6 primes.py</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="http://mercurial.selenic.com/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
   <li><a href="/shortlog/853dcd4de2a6">log</a></li>
   <li><a href="/graph/853dcd4de2a6">graph</a></li>
   <li><a href="/tags">tags</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
   <li><a href="/rev/853dcd4de2a6">changeset</a></li>
   <li><a href="/file/853dcd4de2a6/">browse</a></li>
   </ul>
   <ul>
   <li class="active">file</li>
   <li><a href="/file/tip/primes.py">latest</a></li>
   <li><a href="/diff/853dcd4de2a6/primes.py">diff</a></li>
   <li><a href="/annotate/853dcd4de2a6/primes.py">annotate</a></li>
   <li><a href="/log/853dcd4de2a6/primes.py">file log</a></li>
   <li><a href="/raw-file/853dcd4de2a6/primes.py">raw</a></li>
   </ul>
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   <h2><a href="/">test</a></h2>
   <h3>view primes.py @ 0:853dcd4de2a6</h3>
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" /></p>
   <div id="hint">find changesets by author, revision,
   files, or words in the commit message</div>
   </form>
   
   <div class="description">a</div>
   
   <table id="changesetEntry">
   <tr>
    <th class="author">author</th>
    <td class="author">&#116;&#101;&#115;&#116;</td>
   </tr>
   <tr>
    <th class="date">date</th>
    <td class="date age">Thu Jan 01 00:00:00 1970 +0000</td>
   </tr>
   <tr>
    <th class="author">parents</th>
    <td class="author"></td>
   </tr>
   <tr>
    <th class="author">children</th>
    <td class="author"></td>
   </tr>
   
   </table>
   
   <div class="overflow">
   <div class="sourcefirst"> line source</div>
   
   <div class="parity0 source"><a href="#l1" id="l1">     1</a> <span class="c">#!/usr/bin/env python</span></div>
   <div class="parity1 source"><a href="#l2" id="l2">     2</a> </div>
   <div class="parity0 source"><a href="#l3" id="l3">     3</a> <span class="sd">&quot;&quot;&quot;Fun with generators. Corresponding Haskell implementation:</span></div>
   <div class="parity1 source"><a href="#l4" id="l4">     4</a> </div>
   <div class="parity0 source"><a href="#l5" id="l5">     5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></div>
   <div class="parity1 source"><a href="#l6" id="l6">     6</a> <span class="sd">    where sieve (p:ns) = p : sieve [n | n &lt;- ns, mod n p /= 0]</span></div>
   <div class="parity0 source"><a href="#l7" id="l7">     7</a> <span class="sd">&quot;&quot;&quot;</span></div>
   <div class="parity1 source"><a href="#l8" id="l8">     8</a> </div>
   <div class="parity0 source"><a href="#l9" id="l9">     9</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></div>
   <div class="parity1 source"><a href="#l10" id="l10">    10</a> </div>
   <div class="parity0 source"><a href="#l11" id="l11">    11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></div>
   <div class="parity1 source"><a href="#l12" id="l12">    12</a>     <span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></div>
   <div class="parity0 source"><a href="#l13" id="l13">    13</a>     <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></div>
   <div class="parity1 source"><a href="#l14" id="l14">    14</a>         <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></div>
   <div class="parity0 source"><a href="#l15" id="l15">    15</a>         <span class="c"># It is important to yield *here* in order to stop the</span></div>
   <div class="parity1 source"><a href="#l16" id="l16">    16</a>         <span class="c"># infinite recursion.</span></div>
   <div class="parity0 source"><a href="#l17" id="l17">    17</a>         <span class="kn">yield</span> <span class="n">p</span></div>
   <div class="parity1 source"><a href="#l18" id="l18">    18</a>         <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></div>
   <div class="parity0 source"><a href="#l19" id="l19">    19</a>         <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></div>
   <div class="parity1 source"><a href="#l20" id="l20">    20</a>             <span class="kn">yield</span> <span class="n">n</span></div>
   <div class="parity0 source"><a href="#l21" id="l21">    21</a> </div>
   <div class="parity1 source"><a href="#l22" id="l22">    22</a>     <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mi">2</span> <span class="o">==</span> <span class="mi">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></div>
   <div class="parity0 source"><a href="#l23" id="l23">    23</a>     <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mi">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">&lt;</span> <span class="mi">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></div>
   <div class="parity1 source"><a href="#l24" id="l24">    24</a> </div>
   <div class="parity0 source"><a href="#l25" id="l25">    25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">&quot;__main__&quot;</span><span class="p">:</span></div>
   <div class="parity1 source"><a href="#l26" id="l26">    26</a>     <span class="kn">import</span> <span class="nn">sys</span></div>
   <div class="parity0 source"><a href="#l27" id="l27">    27</a>     <span class="kn">try</span><span class="p">:</span></div>
   <div class="parity1 source"><a href="#l28" id="l28">    28</a>         <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span></div>
   <div class="parity0 source"><a href="#l29" id="l29">    29</a>     <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></div>
   <div class="parity1 source"><a href="#l30" id="l30">    30</a>         <span class="n">n</span> <span class="o">=</span> <span class="mi">10</span></div>
   <div class="parity0 source"><a href="#l31" id="l31">    31</a>     <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></div>
   <div class="parity1 source"><a href="#l32" id="l32">    32</a>     <span class="kn">print</span> <span class="s">&quot;The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></div>
   <div class="sourcelast"></div>
   </div>
   </div>
   </div>
   
   <script type="text/javascript">process_dates()</script>
   
   
   </body>
   </html>
   
 
 hgweb fileannotate, html
 
   $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py') \
   >     | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mi\"/class=\"mf\"/g"
   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>
   
   <link rel="stylesheet" href="/highlightcss" type="text/css" />
   <title>test: primes.py annotate</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="http://mercurial.selenic.com/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
   <li><a href="/shortlog/853dcd4de2a6">log</a></li>
   <li><a href="/graph/853dcd4de2a6">graph</a></li>
   <li><a href="/tags">tags</a></li>
   <li><a href="/bookmarks">bookmarks</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   
   <ul>
   <li><a href="/rev/853dcd4de2a6">changeset</a></li>
   <li><a href="/file/853dcd4de2a6/">browse</a></li>
   </ul>
   <ul>
   <li><a href="/file/853dcd4de2a6/primes.py">file</a></li>
   <li><a href="/file/tip/primes.py">latest</a></li>
   <li><a href="/diff/853dcd4de2a6/primes.py">diff</a></li>
   <li class="active">annotate</li>
   <li><a href="/log/853dcd4de2a6/primes.py">file log</a></li>
   <li><a href="/raw-annotate/853dcd4de2a6/primes.py">raw</a></li>
   </ul>
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   <h2><a href="/">test</a></h2>
   <h3>annotate primes.py @ 0:853dcd4de2a6</h3>
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" /></p>
   <div id="hint">find changesets by author, revision,
   files, or words in the commit message</div>
   </form>
   
   <div class="description">a</div>
   
   <table id="changesetEntry">
   <tr>
    <th class="author">author</th>
    <td class="author">&#116;&#101;&#115;&#116;</td>
   </tr>
   <tr>
    <th class="date">date</th>
    <td class="date age">Thu Jan 01 00:00:00 1970 +0000</td>
   </tr>
   <tr>
    <th class="author">parents</th>
    <td class="author"></td>
   </tr>
   <tr>
    <th class="author">children</th>
    <td class="author"></td>
   </tr>
   
   </table>
   
   <div class="overflow">
   <table class="bigtable">
   <tr>
    <th class="annotate">rev</th>
    <th class="line">&nbsp;&nbsp;line source</th>
   </tr>
   
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#1"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l1" id="l1">     1</a> <span class="c">#!/usr/bin/env python</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#2"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l2" id="l2">     2</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#3"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l3" id="l3">     3</a> <span class="sd">&quot;&quot;&quot;Fun with generators. Corresponding Haskell implementation:</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#4"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l4" id="l4">     4</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#5"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l5" id="l5">     5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#6"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l6" id="l6">     6</a> <span class="sd">    where sieve (p:ns) = p : sieve [n | n &lt;- ns, mod n p /= 0]</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#7"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l7" id="l7">     7</a> <span class="sd">&quot;&quot;&quot;</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#8"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l8" id="l8">     8</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#9"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l9" id="l9">     9</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#10"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l10" id="l10">    10</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#11"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l11" id="l11">    11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#12"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l12" id="l12">    12</a>     <span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#13"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l13" id="l13">    13</a>     <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#14"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l14" id="l14">    14</a>         <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#15"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l15" id="l15">    15</a>         <span class="c"># It is important to yield *here* in order to stop the</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#16"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l16" id="l16">    16</a>         <span class="c"># infinite recursion.</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#17"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l17" id="l17">    17</a>         <span class="kn">yield</span> <span class="n">p</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#18"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l18" id="l18">    18</a>         <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mf">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#19"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l19" id="l19">    19</a>         <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#20"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l20" id="l20">    20</a>             <span class="kn">yield</span> <span class="n">n</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#21"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l21" id="l21">    21</a> </td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#22"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l22" id="l22">    22</a>     <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mf">2</span> <span class="o">==</span> <span class="mf">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#23"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l23" id="l23">    23</a>     <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mf">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">&lt;</span> <span class="mf">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#24"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l24" id="l24">    24</a> </td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#25"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l25" id="l25">    25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">&quot;__main__&quot;</span><span class="p">:</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#26"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l26" id="l26">    26</a>     <span class="kn">import</span> <span class="nn">sys</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#27"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l27" id="l27">    27</a>     <span class="kn">try</span><span class="p">:</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#28"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l28" id="l28">    28</a>         <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#29"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l29" id="l29">    29</a>     <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#30"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l30" id="l30">    30</a>         <span class="n">n</span> <span class="o">=</span> <span class="mf">10</span></td>
   </tr>
   <tr class="parity0">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#31"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l31" id="l31">    31</a>     <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td>
   </tr>
   <tr class="parity1">
   <td class="annotate">
   <a href="/annotate/853dcd4de2a6/primes.py#32"
   title="853dcd4de2a6: a">test@0</a>
   </td>
   <td class="source"><a href="#l32" id="l32">    32</a>     <span class="kn">print</span> <span class="s">&quot;The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></td>
   </tr>
   </table>
   </div>
   </div>
   </div>
   
   <script type="text/javascript">process_dates()</script>
   
   
   </body>
   </html>
   
 
 hgweb fileannotate, raw
 
   $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py?style=raw') \
   >     | sed "s/test@//" > a
   $ echo "200 Script output follows" > b
   $ echo "" >> b
   $ echo "" >> b
   $ hg annotate "primes.py" >> b
   $ echo "" >> b
   $ echo "" >> b
   $ echo "" >> b
   $ echo "" >> b
   $ diff -u b a
-  $ echo
-  
 
 hgweb filerevision, raw
 
   $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py?style=raw') \
   >     > a
   $ echo "200 Script output follows" > b
   $ echo "" >> b
   $ hg cat primes.py >> b
   $ diff -u b a
-  $ echo
-  
 
 hgweb highlightcss friendly
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out
   $ head -n 4 out
   200 Script output follows
   
   /* pygments_style = friendly */
   
   $ rm out
 
 errors encountered
 
   $ cat errors.log
   $ "$TESTDIR/killdaemons.py"
 
 Change the pygments style
 
   $ cat > .hg/hgrc <<EOF
   > [web]
   > pygments_style = fruity
   > EOF
 
 hg serve again
 
   $ hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 hgweb highlightcss fruity
 
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out
   $ head -n 4 out
   200 Script output follows
   
   /* pygments_style = fruity */
   
   $ rm out
 
 errors encountered
 
   $ cat errors.log
   $ cd ..
   $ hg init eucjp
   $ cd eucjp
   $ python -c 'print("\265\376")' >> eucjp.txt  # Japanese kanji "Kyo"
   $ hg ci -Ama
   adding eucjp.txt
   $ hgserveget () {
   >     "$TESTDIR/killdaemons.py"
   >     echo % HGENCODING="$1" hg serve
   >     HGENCODING="$1" hg serve -p $HGPORT -d -n test --pid-file=hg.pid -E errors.log
   >     cat hg.pid >> $DAEMON_PIDS
   > 
   >     echo % hgweb filerevision, html
   >     "$TESTDIR/get-with-headers.py" localhost:$HGPORT "/file/tip/$2" \
   >         | grep '<div class="parity0 source">'
   >     echo % errors encountered
   >     cat errors.log
   > }
   $ hgserveget euc-jp eucjp.txt
   % HGENCODING=euc-jp hg serve
   % hgweb filerevision, html
   <div class="parity0 source"><a href="#l1" id="l1">     1</a> \xb5\xfe</div> (esc)
   % errors encountered
   $ hgserveget utf-8 eucjp.txt
   % HGENCODING=utf-8 hg serve
   % hgweb filerevision, html
   <div class="parity0 source"><a href="#l1" id="l1">     1</a> \xef\xbf\xbd\xef\xbf\xbd</div> (esc)
   % errors encountered
   $ hgserveget us-ascii eucjp.txt
   % HGENCODING=us-ascii hg serve
   % hgweb filerevision, html
   <div class="parity0 source"><a href="#l1" id="l1">     1</a> ??</div>
   % errors encountered

tests/test-mactext.t

@@ -1,40 +1,38 b''
 
   $ cat > unix2mac.py <<EOF
   > import sys
   > 
   > for path in sys.argv[1:]:
   >     data = file(path, 'rb').read()
   >     data = data.replace('\n', '\r')
   >     file(path, 'wb').write(data)
   > EOF
   $ cat > print.py <<EOF
   > import sys
   > print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))
   > EOF
   $ hg init
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
   $ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
   $ cat .hg/hgrc
   [hooks]
   pretxncommit.cr = python:hgext.win32text.forbidcr
   pretxnchangegroup.cr = python:hgext.win32text.forbidcr
-  $ echo
   
   $ echo hello > f
   $ hg add f
   $ hg ci -m 1
-  $ echo
   
   $ python unix2mac.py f
   $ hg ci -m 2
   Attempt to commit or push text file(s) using CR line endings
   in dea860dc51ec: f
   transaction abort!
   rollback completed
   abort: pretxncommit.cr hook failed
   [255]
   $ hg cat f | python print.py
   hello<LF>
   $ cat f | python print.py
   hello<CR>

tests/test-merge-tools.t

@@ -1,778 +1,720 b''
 test merge-tools configuration - mostly exercising filemerge.py
 
   $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
   $ hg init
 
 revision 0
 
   $ echo "revision 0" > f
   $ echo "space" >> f
   $ hg commit -Am "revision 0"
   adding f
 
 revision 1
 
   $ echo "revision 1" > f
   $ echo "space" >> f
   $ hg commit -Am "revision 1"
   $ hg update 0 > /dev/null
 
 revision 2
 
   $ echo "revision 2" > f
   $ echo "space" >> f
   $ hg commit -Am "revision 2"
   created new head
   $ hg update 0 > /dev/null
 
 revision 3 - simple to merge
 
   $ echo "revision 3" >> f
   $ hg commit -Am "revision 3"
   created new head
   $ echo "[merge-tools]" > .hg/hgrc
-  $ echo
   
   $ beforemerge() {
   >   cat .hg/hgrc
   >   echo "# hg update -C 1"
   >   hg update -C 1 > /dev/null
   > }
   $ aftermerge() {
   >   echo "# cat f"
   >   cat f
   >   echo "# hg stat"
   >   hg stat
   >   rm -f f.orig
-  >   echo
   > }
   $ domerge() {
   >   beforemerge
   >   echo "# hg merge $*"
   >   hg merge $*
   >   aftermerge
   > }
-  $ echo
-  
 
 Tool selection
 
-  $ echo
-  
-
 default is internal merge:
 
   $ beforemerge
   [merge-tools]
   # hg update -C 1
 
 hg merge -r 2
 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
 running from a devel copy, not a temp installation
 
   $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
   merging f
   warning: conflicts during merge.
   merging f failed!
   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]
   $ aftermerge
   # cat f
   <<<<<<< local
   revision 1
   =======
   revision 2
   >>>>>>> other
   space
   # hg stat
   M f
   ? f.orig
   
-
 simplest hgrc using false for merge:
 
   $ echo "false.whatever=" >> .hg/hgrc
   $ domerge -r 2
   [merge-tools]
   false.whatever=
   # hg update -C 1
   # hg merge -r 2
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-
 true with higher .priority gets precedence:
 
   $ echo "true.priority=1" >> .hg/hgrc
   $ domerge -r 2
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   # hg merge -r 2
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   # cat f
   revision 1
   space
   # hg stat
   M f
   
-
 unless lowered on command line:
 
   $ domerge -r 2 --config merge-tools.true.priority=-7
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   # hg merge -r 2 --config merge-tools.true.priority=-7
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-
 or false set higher on command line:
 
   $ domerge -r 2 --config merge-tools.false.priority=117
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   # hg merge -r 2 --config merge-tools.false.priority=117
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-
 or true.executable not found in PATH:
 
   $ domerge -r 2 --config merge-tools.true.executable=nonexistingmergetool
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   # hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-
 or true.executable with bogus path:
 
   $ domerge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool
   [merge-tools]
   false.whatever=
   true.priority=1
   # hg update -C 1
   # hg merge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-
 but true.executable set to cat found in PATH works:
 
   $ echo "true.executable=cat" >> .hg/hgrc
   $ domerge -r 2
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2
   merging f
   revision 1
   space
   revision 0
   space
   revision 2
   space
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   # cat f
   revision 1
   space
   # hg stat
   M f
   
-
 and true.executable set to cat with path works:
 
   $ domerge -r 2 --config merge-tools.true.executable=cat
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config merge-tools.true.executable=cat
   merging f
   revision 1
   space
   revision 0
   space
   revision 2
   space
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   # cat f
   revision 1
   space
   # hg stat
   M f
   
-  $ echo
-  
-
 Tool selection and merge-patterns
 
-  $ echo
-  
-
 merge-patterns specifies new tool false:
 
   $ domerge -r 2 --config merge-patterns.f=false
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config merge-patterns.f=false
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-
 merge-patterns specifies executable not found in PATH and gets warning:
 
   $ domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
   couldn't find merge tool true specified for f
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-
 merge-patterns specifies executable with bogus path and gets warning:
 
   $ domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool
   couldn't find merge tool true specified for f
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-  $ echo
-  
-
 ui.merge overrules priority
 
-  $ echo
-  
-
 ui.merge specifies false:
 
   $ domerge -r 2 --config ui.merge=false
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config ui.merge=false
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-
 ui.merge specifies internal:fail:
 
   $ domerge -r 2 --config ui.merge=internal:fail
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config ui.merge=internal:fail
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   
-
 ui.merge specifies internal:local:
 
   $ domerge -r 2 --config ui.merge=internal:local
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config ui.merge=internal:local
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   # cat f
   revision 1
   space
   # hg stat
   M f
   
-
 ui.merge specifies internal:other:
 
   $ domerge -r 2 --config ui.merge=internal:other
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config ui.merge=internal:other
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   # cat f
   revision 2
   space
   # hg stat
   M f
   
-
 ui.merge specifies internal:prompt:
 
   $ domerge -r 2 --config ui.merge=internal:prompt
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config ui.merge=internal:prompt
    no tool found to merge f
   keep (l)ocal or take (o)ther? l
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   # cat f
   revision 1
   space
   # hg stat
   M f
   
-
 ui.merge specifies internal:dump:
 
   $ domerge -r 2 --config ui.merge=internal:dump
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config ui.merge=internal:dump
   merging f
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.base
   ? f.local
   ? f.orig
   ? f.other
   
-
 f.base:
 
   $ cat f.base
   revision 0
   space
 
 f.local:
 
   $ cat f.local
   revision 1
   space
 
 f.other:
 
   $ cat f.other
   revision 2
   space
   $ rm f.base f.local f.other
-  $ echo
-  
 
 ui.merge specifies internal:other but is overruled by pattern for false:
 
   $ domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
-  $ echo
-  
-
 Premerge
 
-  $ echo
-  
-
 ui.merge specifies internal:other but is overruled by --tool=false
 
   $ domerge -r 2 --config ui.merge=internal:other --tool=false
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --config ui.merge=internal:other --tool=false
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
 HGMERGE specifies internal:other but is overruled by --tool=false
 
   $ HGMERGE=internal:other ; export HGMERGE
   $ domerge -r 2 --tool=false
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 2 --tool=false
   merging f
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
   
   $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests
 
 Default is silent simplemerge:
 
   $ domerge -r 3
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 3
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   # cat f
   revision 1
   space
   revision 3
   # hg stat
   M f
   
-
 .premerge=True is same:
 
   $ domerge -r 3 --config merge-tools.true.premerge=True
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 3 --config merge-tools.true.premerge=True
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   # cat f
   revision 1
   space
   revision 3
   # hg stat
   M f
   
-
 .premerge=False executes merge-tool:
 
   $ domerge -r 3 --config merge-tools.true.premerge=False
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -r 3 --config merge-tools.true.premerge=False
   merging f
   revision 1
   space
   revision 0
   space
   revision 0
   space
   revision 3
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   # cat f
   revision 1
   space
   # hg stat
   M f
   
-  $ echo
-  
-
 Tool execution
 
-  $ echo
+set tools.args explicit to include $base $local $other $output:
   
-  $ echo '# set tools.args explicit to include $base $local $other $output:' # default '$local $base $other'
-  # set tools.args explicit to include $base $local $other $output:
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \
   >   | sed 's,==> .* <==,==> ... <==,g'
   merging f
   ==> ... <==
   revision 0
   space
   
   ==> ... <==
   revision 1
   space
   
   ==> ... <==
   revision 2
   space
   
   ==> ... <==
   revision 1
   space
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   revision 1
   space
   # hg stat
   M f
   
-  $ echo '# Merge with "echo mergeresult > $local":'
-  # Merge with "echo mergeresult > $local":
+Merge with "echo mergeresult > $local":
+
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local'
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   mergeresult
   # hg stat
   M f
   
-  $ echo '# - and $local is the file f:'
-  # - and $local is the file f:
+- and $local is the file f:
+
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f'
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   mergeresult
   # hg stat
   M f
   
-  $ echo '# Merge with "echo mergeresult > $output" - the variable is a bit magic:'
-  # Merge with "echo mergeresult > $output" - the variable is a bit magic:
+Merge with "echo mergeresult > $output" - the variable is a bit magic:
+
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output'
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
   # cat f
   mergeresult
   # hg stat
   M f
   
-
 Merge using tool with a path that must be quoted:
 
   $ beforemerge
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   $ cat <<EOF > 'my merge tool'
   > #!/bin/sh
   > cat "\$1" "\$2" "\$3" > "\$4"
   > EOF
   $ chmod +x 'my merge tool'
   $ hg merge -r 2 --config merge-tools.true.executable='./my merge tool' --config merge-tools.true.args='$base $local $other $output'
   merging f
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ rm -f 'my merge tool'
   $ aftermerge
   # cat f
   revision 0
   space
   revision 1
   space
   revision 2
   space
   # hg stat
   M f
   
-  $ echo
-  
-
 Merge post-processing
 
-  $ echo
-  
-
 cat is a bad merge-tool and doesn't change:
 
   $ domerge -y -r 2 --config merge-tools.true.checkchanged=1
   [merge-tools]
   false.whatever=
   true.priority=1
   true.executable=cat
   # hg update -C 1
   # hg merge -y -r 2 --config merge-tools.true.checkchanged=1
   merging f
   revision 1
   space
   revision 0
   space
   revision 2
   space
    output file f appears unchanged
   was merge successful (yn)? n
   merging f failed!
   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
   # cat f
   revision 1
   space
   # hg stat
   M f
   ? f.orig
-  

tests/test-merge1.t

@@ -1,172 +1,171 b''
   $ cat <<EOF > merge
   > import sys, os
   > 
   > try:
   >     import msvcrt
   >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
   >     msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
   > except ImportError:
   >     pass
   > 
   > print "merging for", os.path.basename(sys.argv[1])
   > EOF
   $ HGMERGE="python ../merge"; export HGMERGE
 
   $ hg init t
   $ cd t
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
   $ hg commit -m "commit #2"
   created new head
   $ echo This is file b1 > b
 no merges expected
   $ hg merge -P 1
   changeset:   1:b8bb4a988f25
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit #1
   
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
   diff -r 49035e18a8e6 b
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +This is file b1
   $ hg status
   M b
   $ cd ..; rm -r t
 
   $ hg init t
   $ cd t
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
   $ hg commit -m "commit #2"
   created new head
   $ echo This is file b2 > b
 merge should fail
   $ hg merge 1
   abort: untracked file in working directory differs from file in requested revision: 'b'
   [255]
 merge of b expected
   $ hg merge -f 1
   merging b
   merging for b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
   diff -r 49035e18a8e6 b
   --- /dev/null
   +++ b/b
   @@ -0,0 +1,1 @@
   +This is file b2
   $ hg status
   M b
   $ cd ..; rm -r t
 
   $ hg init t
   $ cd t
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
   $ echo This is file b22 > b
   $ hg commit -m "commit #2"
   $ hg update 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
   $ hg commit -m "commit #3"
   created new head
 
 Contents of b should be "this is file b1"
   $ cat b
   This is file b1
 
   $ echo This is file b22 > b
 merge fails
   $ hg merge 2
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
   [255]
-  $ echo %% merge expected!
-  %% merge expected!
+merge expected!
   $ hg merge -f 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
   diff -r 85de557015a8 b
   --- a/b
   +++ b/b
   @@ -1,1 +1,1 @@
   -This is file b1
   +This is file b22
   $ hg status
   M b
   $ cd ..; rm -r t
 
   $ hg init t
   $ cd t
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
   $ echo This is file b1 > b
   $ hg add b
   $ hg commit -m "commit #1"
   $ echo This is file b22 > b
   $ hg commit -m "commit #2"
   $ hg update 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo This is file c1 > c
   $ hg add c
   $ hg commit -m "commit #3"
   created new head
   $ echo This is file b33 > b
 merge of b should fail
   $ hg merge 2
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
   [255]
 merge of b expected
   $ hg merge -f 2
   merging b
   merging for b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff --nodates
   diff -r 85de557015a8 b
   --- a/b
   +++ b/b
   @@ -1,1 +1,1 @@
   -This is file b1
   +This is file b33
   $ hg status
   M b
 
 Test for issue2364
 
   $ hg up -qC .
   $ hg rm b
   $ hg ci -md
   $ hg revert -r -2 b
   $ hg up -q -- -2

tests/test-mq-qimport-fail-cleanup.t

@@ -1,40 +1,34 b''
 Failed qimport of patches from files should cleanup by recording successfully
 imported patches in series file.
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ hg init repo
   $ cd repo
   $ echo a > a
   $ hg ci -Am'add a'
   adding a
   $ cat >b.patch<<EOF
   > diff --git a/a b/a
   > --- a/a
   > +++ b/a
   > @@ -1,1 +1,2 @@
   >  a
   > +b
   > EOF
-  $ echo
-  
 
 empty series
 
   $ hg qseries
-  $ echo
-  
 
 qimport valid patch followed by invalid patch
 
   $ hg qimport b.patch fakepatch
   adding b.patch to series file
   abort: unable to read file fakepatch
   [255]
-  $ echo
-  
 
 valid patches before fail added to series
 
   $ hg qseries
   b.patch

tests/test-tags.t

@@ -1,382 +1,380 b''
 Helper functions:
 
   $ cacheexists() {
   >   [ -f .hg/cache/tags ] && echo "tag cache exists" || echo "no tag cache"
   > }
 
   $ dumptags() {
   >     rev=$1
   >     echo "rev $rev: .hgtags:"
   >     hg cat -r$rev .hgtags
   > }
 
 # XXX need to test that the tag cache works when we strip an old head
 # and add a new one rooted off non-tip: i.e. node and rev of tip are the
 # same, but stuff has changed behind tip.
 
 Setup:
 
   $ hg init t
   $ cd t
   $ cacheexists
   no tag cache
   $ hg id
   000000000000 tip
   $ cacheexists
   no tag cache
   $ echo a > a
   $ hg add a
   $ hg commit -m "test"
   $ hg co
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg identify
   acb14030fe0a tip
   $ cacheexists
   tag cache exists
 
 Try corrupting the cache
 
   $ printf 'a b' > .hg/cache/tags
   $ hg identify
   .hg/cache/tags is corrupt, rebuilding it
   acb14030fe0a tip
   $ cacheexists
   tag cache exists
   $ hg identify
   acb14030fe0a tip
 
 Create local tag with long name:
 
   $ T=`hg identify --debug --id`
   $ hg tag -l "This is a local tag with a really long name!"
   $ hg tags
   tip                                0:acb14030fe0a
   This is a local tag with a really long name!     0:acb14030fe0a
   $ rm .hg/localtags
 
 Create a tag behind hg's back:
 
   $ echo "$T first" > .hgtags
   $ cat .hgtags
   acb14030fe0a21b60322c440ad2d20cf7685a376 first
   $ hg add .hgtags
   $ hg commit -m "add tags"
   $ hg tags
   tip                                1:b9154636be93
   first                              0:acb14030fe0a
   $ hg identify
   b9154636be93 tip
 
 Repeat with cold tag cache:
 
   $ rm -f .hg/cache/tags
   $ hg identify
   b9154636be93 tip
 
 And again, but now unable to write tag cache:
 
   $ rm -f .hg/cache/tags
   $ chmod 555 .hg
   $ hg identify
   b9154636be93 tip
   $ chmod 755 .hg
 
 Create a branch:
 
   $ echo bb > a
   $ hg status
   M a
   $ hg identify
   b9154636be93+ tip
   $ hg co first
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg id
   acb14030fe0a+ first
   $ hg -v id
   acb14030fe0a+ first
   $ hg status
   M a
   $ echo 1 > b
   $ hg add b
   $ hg commit -m "branch"
   created new head
   $ hg id
   c8edf04160c7 tip
 
 Merge the two heads:
 
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg id
   c8edf04160c7+b9154636be93+ tip
   $ hg status
   M .hgtags
   $ hg commit -m "merge"
 
 Create a fake head, make sure tag not visible afterwards:
 
   $ cp .hgtags tags
   $ hg tag last
   $ hg rm .hgtags
   $ hg commit -m "remove"
 
   $ mv tags .hgtags
   $ hg add .hgtags
   $ hg commit -m "readd"
   $ 
   $ hg tags
   tip                                6:35ff301afafe
   first                              0:acb14030fe0a
 
 Add invalid tags:
 
   $ echo "spam" >> .hgtags
   $ echo >> .hgtags
   $ echo "foo bar" >> .hgtags
   $ echo "a5a5 invalid" >> .hg/localtags
-  $ echo "committing .hgtags:"
-  committing .hgtags:
   $ cat .hgtags 
   acb14030fe0a21b60322c440ad2d20cf7685a376 first
   spam
   
   foo bar
   $ hg commit -m "tags"
 
 Report tag parse error on other head:
 
   $ hg up 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'x y' >> .hgtags
   $ hg commit -m "head"
   created new head
 
   $ hg tags
   .hgtags@75d9f02dfe28, line 2: cannot parse entry
   .hgtags@75d9f02dfe28, line 4: node 'foo' is not well formed
   .hgtags@c4be69a18c11, line 2: node 'x' is not well formed
   tip                                8:c4be69a18c11
   first                              0:acb14030fe0a
   $ hg tip
   changeset:   8:c4be69a18c11
   tag:         tip
   parent:      3:ac5e980c4dc0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     head
   
 
 Test tag precedence rules:
 
   $ cd ..
   $ hg init t2
   $ cd t2
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'      # rev 0
   $ hg tag bar              # rev 1
   $ echo >> foo
   $ hg ci -m 'change foo 1' # rev 2
   $ hg up -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tag -r 1 -f bar      # rev 3
   $ hg up -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo >> foo
   $ hg ci -m 'change foo 2' # rev 4
   created new head
   $ hg tags
   tip                                4:0c192d7d5e6b
   bar                                1:78391a272241
 
 Repeat in case of cache effects:
 
   $ hg tags
   tip                                4:0c192d7d5e6b
   bar                                1:78391a272241
 
 Detailed dump of tag info:
 
   $ hg heads -q             # expect 4, 3, 2
   4:0c192d7d5e6b
   3:6fa450212aeb
   2:7a94127795a3
   $ dumptags 2
   rev 2: .hgtags:
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   $ dumptags 3
   rev 3: .hgtags:
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   78391a272241d70354aa14c874552cad6b51bb42 bar
   $ dumptags 4
   rev 4: .hgtags:
   bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
 
 Dump cache:
 
   $ cat .hg/cache/tags
   4 0c192d7d5e6b78a714de54a2e9627952a877e25a 0c04f2a8af31de17fab7422878ee5a2dadbc943d
   3 6fa450212aeb2a21ed616a54aea39a4a27894cd7 7d3b718c964ef37b89e550ebdafd5789e76ce1b0
   2 7a94127795a33c10a370c93f731fd9fea0b79af6 0c04f2a8af31de17fab7422878ee5a2dadbc943d
   
   78391a272241d70354aa14c874552cad6b51bb42 bar
 
 Test tag removal:
 
   $ hg tag --remove bar     # rev 5
   $ hg tip -vp
   changeset:   5:5f6e8655b1c7
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       .hgtags
   description:
   Removed tag bar
   
   
   diff -r 0c192d7d5e6b -r 5f6e8655b1c7 .hgtags
   --- a/.hgtags	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,3 @@
    bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
   +78391a272241d70354aa14c874552cad6b51bb42 bar
   +0000000000000000000000000000000000000000 bar
   
   $ hg tags
   tip                                5:5f6e8655b1c7
   $ hg tags                 # again, try to expose cache bugs
   tip                                5:5f6e8655b1c7
 
 Remove nonexistent tag:
 
   $ hg tag --remove foobar
   abort: tag 'foobar' does not exist
   [255]
   $ hg tip
   changeset:   5:5f6e8655b1c7
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Removed tag bar
   
 
 Undo a tag with rollback:
 
   $ hg rollback             # destroy rev 5 (restore bar)
   repository tip rolled back to revision 4 (undo commit)
   working directory now based on revision 4
   $ hg tags
   tip                                4:0c192d7d5e6b
   bar                                1:78391a272241
   $ hg tags
   tip                                4:0c192d7d5e6b
   bar                                1:78391a272241
 
 Test tag rank:
 
   $ cd ..
   $ hg init t3
   $ cd t3
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m 'add foo'       # rev 0
   $ hg tag -f bar            # rev 1 bar -> 0
   $ hg tag -f bar            # rev 2 bar -> 1
   $ hg tag -fr 0 bar         # rev 3 bar -> 0
   $ hg tag -fr 1 bar         # rev 4 bar -> 1
   $ hg tag -fr 0 bar         # rev 5 bar -> 0
   $ hg tags
   tip                                5:85f05169d91d
   bar                                0:bbd179dfa0a7
   $ hg co 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo barbar > foo
   $ hg ci -m 'change foo'    # rev 6
   created new head
   $ hg tags
   tip                                6:735c3ca72986
   bar                                0:bbd179dfa0a7
 
 Don't allow moving tag without -f:
 
   $ hg tag -r 3 bar
   abort: tag 'bar' already exists (use -f to force)
   [255]
   $ hg tags
   tip                                6:735c3ca72986
   bar                                0:bbd179dfa0a7
 
 Strip 1: expose an old head:
 
   $ hg --config extensions.mq= strip 5
   saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
   $ hg tags                  # partly stale cache
   tip                                5:735c3ca72986
   bar                                1:78391a272241
   $ hg tags                  # up-to-date cache
   tip                                5:735c3ca72986
   bar                                1:78391a272241
 
 Strip 2: destroy whole branch, no old head exposed
 
   $ hg --config extensions.mq= strip 4
   saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
   $ hg tags                  # partly stale
   tip                                4:735c3ca72986
   bar                                0:bbd179dfa0a7
   $ rm -f .hg/cache/tags
   $ hg tags                  # cold cache
   tip                                4:735c3ca72986
   bar                                0:bbd179dfa0a7
 
 Test tag rank with 3 heads:
 
   $ cd ..
   $ hg init t4
   $ cd t4
   $ echo foo > foo
   $ hg add
   adding foo
   $ hg ci -m 'add foo'                 # rev 0
   $ hg tag bar                         # rev 1 bar -> 0
   $ hg tag -f bar                      # rev 2 bar -> 1
   $ hg up -qC 0
   $ hg tag -fr 2 bar                   # rev 3 bar -> 2
   $ hg tags
   tip                                3:197c21bbbf2c
   bar                                2:6fa450212aeb
   $ hg up -qC 0
   $ hg tag -m 'retag rev 0' -fr 0 bar  # rev 4 bar -> 0, but bar stays at 2
 
 Bar should still point to rev 2:
 
   $ hg tags
   tip                                4:3b4b14ed0202
   bar                                2:6fa450212aeb
 
 Test that removing global/local tags does not get confused when trying
 to remove a tag of type X which actually only exists as a type Y:
 
   $ cd ..
   $ hg init t5
   $ cd t5
   $ echo foo > foo
   $ hg add
   adding foo
   $ hg ci -m 'add foo'                 # rev 0
 
   $ hg tag -r 0 -l localtag
   $ hg tag --remove localtag
   abort: tag 'localtag' is not a global tag
   [255]
   $ 
   $ hg tag -r 0 globaltag
   $ hg tag --remove -l globaltag
   abort: tag 'globaltag' is not a local tag
   [255]
   $ hg tags -v
   tip                                1:a0b6fe111088
   localtag                           0:bbd179dfa0a7 local
   globaltag                          0:bbd179dfa0a7

tests/test-win32text.t

@@ -1,446 +1,424 b''
 
   $ hg init t
   $ cd t
   $ cat > unix2dos.py <<EOF
   > import sys
   > 
   > for path in sys.argv[1:]:
   >     data = file(path, 'rb').read()
   >     data = data.replace('\n', '\r\n')
   >     file(path, 'wb').write(data)
   > EOF
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
   $ echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
   $ cat .hg/hgrc
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
-  $ echo
   
   $ echo hello > f
   $ hg add f
 
 commit should succeed
 
   $ hg ci -m 1
-  $ echo
   
   $ hg clone . ../zoz
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cp .hg/hgrc ../zoz/.hg
   $ python unix2dos.py f
 
 commit should fail
 
   $ hg ci -m 2.1
   Attempt to commit or push text file(s) using CRLF line endings
   in f583ea08d42a: f
   transaction abort!
   rollback completed
   abort: pretxncommit.crlf hook failed
   [255]
-  $ echo
   
   $ mv .hg/hgrc .hg/hgrc.bak
 
 commits should succeed
 
   $ hg ci -m 2
   $ hg cp f g
   $ hg ci -m 2.2
-  $ echo
-  
 
 push should fail
 
   $ hg push ../zoz
   pushing to ../zoz
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   Attempt to commit or push text file(s) using CRLF line endings
   in bc2d09796734: g
   in b1aa5cde7ff4: f
   
   To prevent this mistake in your local repository,
   add to Mercurial.ini or .hg/hgrc:
   
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   
   and also consider adding:
   
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   [decode]
   ** = cleverdecode:
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [255]
-  $ echo
   
   $ mv .hg/hgrc.bak .hg/hgrc
   $ echo hello > f
   $ hg rm g
 
 commit should succeed
 
   $ hg ci -m 2.3
-  $ echo
-  
 
 push should succeed
 
   $ hg push ../zoz
   pushing to ../zoz
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files
-  $ echo
-  
 
 and now for something completely different
 
   $ mkdir d
   $ echo hello > d/f2
   $ python unix2dos.py d/f2
   $ hg add d/f2
   $ hg ci -m 3
   Attempt to commit or push text file(s) using CRLF line endings
   in 053ba1a3035a: d/f2
   transaction abort!
   rollback completed
   abort: pretxncommit.crlf hook failed
   [255]
   $ hg revert -a
   forgetting d/f2
   $ rm d/f2
-  $ echo
   
   $ hg rem f
   $ hg ci -m 4
-  $ echo
   
   $ python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")'
   $ hg add bin
   $ hg ci -m 5
   $ hg log -v
   changeset:   5:f0b1c8d75fce
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
-  $ echo
-  
   $ hg clone . dupe
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ echo
   
   $ for x in a b c d; do echo content > dupe/$x; done
   $ hg -R dupe add
   adding dupe/a
   adding dupe/b
   adding dupe/c
   adding dupe/d
   $ python unix2dos.py dupe/b dupe/c dupe/d
   $ hg -R dupe ci -m a dupe/a
   $ hg -R dupe ci -m b/c dupe/[bc]
   $ hg -R dupe ci -m d dupe/d
   $ hg -R dupe log -v
   changeset:   8:67ac5962ab43
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       d
   description:
   d
   
   
   changeset:   7:68c127d1834e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       b c
   description:
   b/c
   
   
   changeset:   6:adbf8bf7f31d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   a
   
   
   changeset:   5:f0b1c8d75fce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
-  $ echo
-  
   $ hg pull dupe
   pulling from dupe
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 4 changes to 4 files
   Attempt to commit or push text file(s) using CRLF line endings
   in 67ac5962ab43: d
   in 68c127d1834e: b
   in 68c127d1834e: c
   
   To prevent this mistake in your local repository,
   add to Mercurial.ini or .hg/hgrc:
   
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   
   and also consider adding:
   
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   [decode]
   ** = cleverdecode:
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [255]
-  $ echo
   
   $ hg log -v
   changeset:   5:f0b1c8d75fce
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
-  $ echo
-  
   $ rm .hg/hgrc
   $ (echo some; echo text) > f3
   $ python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")'
   $ hg add f3 f4.bat
   $ hg ci -m 6
   $ cat bin
   hello\x00\r (esc)
   $ cat f3
   some
   text
   $ cat f4.bat
   rem empty\r (esc)
-  $ echo
   
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'win32text = ' >> .hg/hgrc
   $ echo '[decode]' >> .hg/hgrc
   $ echo '** = cleverdecode:' >> .hg/hgrc
   $ echo '[encode]' >> .hg/hgrc
   $ echo '** = cleverencode:' >> .hg/hgrc
   $ cat .hg/hgrc
   [extensions]
   win32text = 
   [decode]
   ** = cleverdecode:
   [encode]
   ** = cleverencode:
 
 Trigger deprecation warning:
 
   $ hg id -t
   win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
   tip
 
 Disable warning:
 
   $ echo '[win32text]' >> .hg/hgrc
   $ echo 'warn = no' >> .hg/hgrc
   $ hg id -t
   tip
 
   $ rm f3 f4.bat bin
   $ hg co -C
   WARNING: f4.bat already has CRLF line endings
   and does not need EOL conversion by the win32text plugin.
   Before your next commit, please reconsider your encode/decode settings in 
   Mercurial.ini or $TESTTMP/t/.hg/hgrc.
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat bin
   hello\x00\r (esc)
   $ cat f3
   some\r (esc)
   text\r (esc)
   $ cat f4.bat
   rem empty\r (esc)
-  $ echo
   
   $ python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")'
   $ hg add f5.sh
   $ hg ci -m 7
   $ cat f5.sh
   # empty\r (esc)
   $ hg cat f5.sh
   # empty
   $ echo '% just linefeed' > linefeed
   $ hg ci -qAm 8 linefeed
   $ cat linefeed
   % just linefeed
   $ hg cat linefeed
   % just linefeed
   $ hg st -q
   $ hg revert -a linefeed
   no changes needed to linefeed
   $ cat linefeed
   % just linefeed
   $ hg st -q
   $ echo modified >> linefeed
   $ hg st -q
   M linefeed
   $ hg revert -a
   reverting linefeed
   $ hg st -q
   $ cat linefeed
   % just linefeed\r (esc)