py3: suppress the output from .write() calls in the remaining tests

tests/test-casefolding.t

@@ -1,257 +1,257 b''
 #require icasefs
 
   $ hg debugfs | grep 'case-sensitive:'
   case-sensitive: no
 
 test file addition with bad case
 
   $ hg init repo1
   $ cd repo1
   $ echo a > a
   $ hg add A
   $ hg st
   A a
   $ hg ci -m adda
   $ hg manifest
   a
   $ cd ..
 
 test case collision on rename (issue750)
 
   $ hg init repo2
   $ cd repo2
   $ echo a > a
   $ hg --debug ci -Am adda
   adding a
   committing files:
   a
   committing manifest
   committing changelog
   updating the branch cache
   committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9
 
 Case-changing renames should work:
 
   $ hg mv a A
   $ hg mv A a
   $ hg st
 
 addremove after case-changing rename has no effect (issue4590)
 
   $ hg mv a A
   $ hg addremove
   recording removal of a as rename to A (100% similar)
   $ hg revert --all
   forgetting A
   undeleting a
 
 test changing case of path components
 
   $ mkdir D
   $ echo b > D/b
   $ hg ci -Am addb D/b
   $ hg mv D/b d/b
   D/b: not overwriting - file already committed
   ('hg rename --force' to replace the file by recording a rename)
   [1]
   $ hg mv D/b d/c
   $ hg st
   A D/c
   R D/b
   $ mv D temp
   $ mv temp d
   $ hg st
   A D/c
   R D/b
   $ hg revert -aq
   $ rm d/c
   $ echo c > D/c
   $ hg add D/c
   $ hg st
   A D/c
   $ hg ci -m addc D/c
   $ hg mv d/b d/e
   $ hg st
   A D/e
   R D/b
   $ hg revert -aq
   $ rm d/e
   $ hg mv d/b D/B
   $ hg st
   A D/B
   R D/b
   $ cd ..
 
 test case collision between revisions (issue912)
 
   $ hg init repo3
   $ cd repo3
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ hg rm a
   $ hg ci -Am removea
   $ echo A > A
 
 on linux hfs keeps the old case stored, force it
 
   $ mv a aa
   $ mv aa A
   $ hg ci -Am addA
   adding A
 
 used to fail under case insensitive fs
 
   $ hg up -C 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg up -C
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 no clobbering of untracked files with wrong casing
 
   $ hg up -r null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo gold > a
   $ hg up
   A: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
   [255]
   $ cat a
   gold
   $ rm a
 
 test that normal file in different case on target context is not
 unlinked by largefiles extension.
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > largefiles=
   > EOF
   $ hg update -q -C 1
   $ hg status -A
   $ echo 'A as largefiles' > A
   $ hg add --large A
   $ hg commit -m '#3'
   created new head
   $ hg manifest -r 3
   .hglf/A
   $ hg manifest -r 0
   a
   $ hg update -q -C 0
   $ hg status -A
   C a
   $ hg update -q -C 3
   $ hg update -q 0
 
   $ hg up -C -r 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg mv A a
   $ hg diff -g > rename.diff
   $ hg ci -m 'A -> a'
   $ hg up -q '.^'
   $ hg import rename.diff -m "import rename A -> a"
   applying rename.diff
   $ hg st
   ? rename.diff
   $ hg files
   a
   $ find * | sort
   a
   rename.diff
 
   $ rm rename.diff
 
   $ cd ..
 
 issue 3342: file in nested directory causes unexpected abort
 
   $ hg init issue3342
   $ cd issue3342
 
   $ mkdir -p a/B/c/D
   $ echo e > a/B/c/D/e
   $ hg add a/B/c/D/e
   $ hg ci -m 'add e'
 
 issue 4481: revert across case only renames
   $ hg mv a/B/c/D/e a/B/c/d/E
   $ hg ci -m "uppercase E"
   $ echo 'foo' > a/B/c/D/E
   $ hg ci -m 'e content change'
   $ hg revert --all -r 0
   removing a/B/c/D/E
   adding a/B/c/D/e
   $ find * | sort
   a
   a/B
   a/B/c
   a/B/c/D
   a/B/c/D/e
   a/B/c/D/e.orig
 
   $ cd ..
 
 issue 3340: mq does not handle case changes correctly
 
 in addition to reported case, 'hg qrefresh' is also tested against
 case changes.
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ hg init issue3340
   $ cd issue3340
 
   $ echo a > mIxEdCaSe
   $ hg add mIxEdCaSe
   $ hg commit -m '#0'
   $ hg rename mIxEdCaSe tmp
   $ hg rename tmp MiXeDcAsE
   $ hg status -A
   A MiXeDcAsE
     mIxEdCaSe
   R mIxEdCaSe
   $ hg qnew changecase
   $ hg status -A
   C MiXeDcAsE
 
   $ hg qpop -a
   popping changecase
   patch queue now empty
   $ hg qnew refresh-casechange
   $ hg status -A
   C mIxEdCaSe
   $ hg rename mIxEdCaSe tmp
   $ hg rename tmp MiXeDcAsE
   $ hg status -A
   A MiXeDcAsE
     mIxEdCaSe
   R mIxEdCaSe
   $ hg qrefresh
   $ hg status -A
   C MiXeDcAsE
 
   $ hg qpop -a
   popping refresh-casechange
   patch queue now empty
   $ hg qnew refresh-pattern
   $ hg status
   $ echo A > A
   $ hg add
   adding A
   $ hg qrefresh a # issue 3271, qrefresh with file handled case wrong
   $ hg status # empty status means the qrefresh worked
 
 #if osx
 
 We assume anyone running the tests on a case-insensitive volume on OS
 X will be using HFS+. If that's not true, this test will fail.
 
   $ rm A
-  >>> open(u'a\u200c'.encode('utf-8'), 'w').write('unicode is fun')
+  >>> open(u'a\u200c'.encode('utf-8'), 'w').write('unicode is fun') and None
   $ hg status
   M A
 
 #endif
 
   $ cd ..

tests/test-hgweb-json.t

@@ -1,2219 +1,2219 b''
 #require serve
 
   $ request() {
   >   get-with-headers.py --json localhost:$HGPORT "$1"
   > }
 
   $ hg init test
   $ cd test
   $ mkdir da
   $ echo foo > da/foo
   $ echo foo > foo
   $ hg -q ci -A -m initial
   $ echo bar > foo
   $ hg ci -m 'modify foo'
   $ echo bar > da/foo
   $ hg ci -m 'modify da/foo'
   $ hg bookmark bookmark1
   $ hg up default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (leaving bookmark bookmark1)
   $ hg mv foo foo-new
   $ hg commit -m 'move foo'
   $ hg tag -m 'create tag' tag1
   $ hg phase --public -r .
   $ echo baz > da/foo
   $ hg commit -m 'another commit to da/foo'
   $ hg tag -m 'create tag2' tag2
   $ hg bookmark bookmark2
   $ hg -q up -r 0
   $ hg -q branch test-branch
   $ echo branch > foo
   $ hg commit -m 'create test branch'
   $ echo branch_commit_2 > foo
   $ hg commit -m 'another commit in test-branch'
   $ hg -q up default
   $ hg merge --tool :local test-branch
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m 'merge test-branch into default'
 
   $ hg log -G
   @    changeset:   9:cc725e08502a
   |\   tag:         tip
   | |  parent:      6:ceed296fe500
   | |  parent:      8:ed66c30e87eb
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     merge test-branch into default
   | |
   | o  changeset:   8:ed66c30e87eb
   | |  branch:      test-branch
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     another commit in test-branch
   | |
   | o  changeset:   7:6ab967a8ab34
   | |  branch:      test-branch
   | |  parent:      0:06e557f3edf6
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     create test branch
   | |
   o |  changeset:   6:ceed296fe500
   | |  bookmark:    bookmark2
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     create tag2
   | |
   o |  changeset:   5:f2890a05fea4
   | |  tag:         tag2
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     another commit to da/foo
   | |
   o |  changeset:   4:93a8ce14f891
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     create tag
   | |
   o |  changeset:   3:78896eb0e102
   | |  tag:         tag1
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     move foo
   | |
   o |  changeset:   2:8d7c456572ac
   | |  bookmark:    bookmark1
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     modify da/foo
   | |
   o |  changeset:   1:f8bbb9024b10
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     modify foo
   |
   o  changeset:   0:06e557f3edf6
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     initial
   
 
   $ echo '[web]' >> .hg/hgrc
   $ echo 'allow-archive = bz2' >> .hg/hgrc
   $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E error.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 (Try to keep these in roughly the order they are defined in webcommands.py)
 
 (log is handled by filelog/ and changelog/ - ignore it)
 
 (rawfile/ doesn't use templating - nothing to test)
 
 file/{revision}/{path} shows file revision
 
   $ request json-file/78896eb0e102/foo-new
   200 Script output follows
   
   {
     "bookmarks": [],
     "branch": "default",
     "date": [
       0.0,
       0
     ],
     "desc": "move foo",
     "lines": [
       {
         "line": "bar\n"
       }
     ],
     "node": "78896eb0e102174ce9278438a95e12543e4367a7",
     "parents": [
       "f8bbb9024b10f93cdbb8d940337398291d40dea8"
     ],
     "path": "foo-new",
     "phase": "public",
     "tags": [
       "tag1"
     ],
     "user": "test"
   }
 
 file/{revision} shows root directory info
 
   $ request json-file/cc725e08502a
   200 Script output follows
   
   {
     "abspath": "/",
     "bookmarks": [],
     "directories": [
       {
         "abspath": "/da",
         "basename": "da",
         "emptydirs": ""
       }
     ],
     "files": [
       {
         "abspath": ".hgtags",
         "basename": ".hgtags",
         "date": [
           0.0,
           0
         ],
         "flags": "",
         "size": 92
       },
       {
         "abspath": "foo-new",
         "basename": "foo-new",
         "date": [
           0.0,
           0
         ],
         "flags": "",
         "size": 4
       }
     ],
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
     "tags": [
       "tip"
     ]
   }
 
 changelog/ shows information about several changesets
 
   $ request json-changelog
   200 Script output follows
   
   {
     "changeset_count": 10,
     "changesets": [
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "merge test-branch into default",
         "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
         "parents": [
           "ceed296fe500c3fac9541e31dad860cb49c89e45",
           "ed66c30e87eb65337c05a4229efaa5f1d5285a90"
         ],
         "phase": "draft",
         "tags": [
           "tip"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "desc": "another commit in test-branch",
         "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
         "parents": [
           "6ab967a8ab3489227a83f80e920faa039a71819f"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "desc": "create test branch",
         "node": "6ab967a8ab3489227a83f80e920faa039a71819f",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark2"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag2",
         "node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
         "parents": [
           "f2890a05fea49bfaf9fb27ed5490894eba32da78"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "another commit to da/foo",
         "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
         "parents": [
           "93a8ce14f89156426b7fa981af8042da53f03aa0"
         ],
         "phase": "draft",
         "tags": [
           "tag2"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag",
         "node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
         "parents": [
           "78896eb0e102174ce9278438a95e12543e4367a7"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "move foo",
         "node": "78896eb0e102174ce9278438a95e12543e4367a7",
         "parents": [
           "8d7c456572acf3557e8ed8a07286b10c408bcec5"
         ],
         "phase": "public",
         "tags": [
           "tag1"
         ],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark1"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify da/foo",
         "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
         "parents": [
           "f8bbb9024b10f93cdbb8d940337398291d40dea8"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify foo",
         "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "initial",
         "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
         "parents": [],
         "phase": "public",
         "tags": [],
         "user": "test"
       }
     ],
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7"
   }
 
 changelog/{revision} shows information starting at a specific changeset
 
   $ request json-changelog/f8bbb9024b10
   200 Script output follows
   
   {
     "changeset_count": 10,
     "changesets": [
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify foo",
         "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "initial",
         "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
         "parents": [],
         "phase": "public",
         "tags": [],
         "user": "test"
       }
     ],
     "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8"
   }
 
 shortlog/ shows information about a set of changesets
 
   $ request json-shortlog
   200 Script output follows
   
   {
     "changeset_count": 10,
     "changesets": [
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "merge test-branch into default",
         "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
         "parents": [
           "ceed296fe500c3fac9541e31dad860cb49c89e45",
           "ed66c30e87eb65337c05a4229efaa5f1d5285a90"
         ],
         "phase": "draft",
         "tags": [
           "tip"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "desc": "another commit in test-branch",
         "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
         "parents": [
           "6ab967a8ab3489227a83f80e920faa039a71819f"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "desc": "create test branch",
         "node": "6ab967a8ab3489227a83f80e920faa039a71819f",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark2"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag2",
         "node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
         "parents": [
           "f2890a05fea49bfaf9fb27ed5490894eba32da78"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "another commit to da/foo",
         "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
         "parents": [
           "93a8ce14f89156426b7fa981af8042da53f03aa0"
         ],
         "phase": "draft",
         "tags": [
           "tag2"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag",
         "node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
         "parents": [
           "78896eb0e102174ce9278438a95e12543e4367a7"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "move foo",
         "node": "78896eb0e102174ce9278438a95e12543e4367a7",
         "parents": [
           "8d7c456572acf3557e8ed8a07286b10c408bcec5"
         ],
         "phase": "public",
         "tags": [
           "tag1"
         ],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark1"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify da/foo",
         "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
         "parents": [
           "f8bbb9024b10f93cdbb8d940337398291d40dea8"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify foo",
         "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "initial",
         "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
         "parents": [],
         "phase": "public",
         "tags": [],
         "user": "test"
       }
     ],
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7"
   }
 
 shortlog is displayed by default (issue5978)
 
   $ request '?style=json'
   200 Script output follows
   
   {
     "changeset_count": 10,
     "changesets": [
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "merge test-branch into default",
         "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
         "parents": [
           "ceed296fe500c3fac9541e31dad860cb49c89e45",
           "ed66c30e87eb65337c05a4229efaa5f1d5285a90"
         ],
         "phase": "draft",
         "tags": [
           "tip"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "desc": "another commit in test-branch",
         "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
         "parents": [
           "6ab967a8ab3489227a83f80e920faa039a71819f"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "desc": "create test branch",
         "node": "6ab967a8ab3489227a83f80e920faa039a71819f",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark2"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag2",
         "node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
         "parents": [
           "f2890a05fea49bfaf9fb27ed5490894eba32da78"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "another commit to da/foo",
         "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
         "parents": [
           "93a8ce14f89156426b7fa981af8042da53f03aa0"
         ],
         "phase": "draft",
         "tags": [
           "tag2"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag",
         "node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
         "parents": [
           "78896eb0e102174ce9278438a95e12543e4367a7"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "move foo",
         "node": "78896eb0e102174ce9278438a95e12543e4367a7",
         "parents": [
           "8d7c456572acf3557e8ed8a07286b10c408bcec5"
         ],
         "phase": "public",
         "tags": [
           "tag1"
         ],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark1"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify da/foo",
         "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
         "parents": [
           "f8bbb9024b10f93cdbb8d940337398291d40dea8"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify foo",
         "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "initial",
         "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
         "parents": [],
         "phase": "public",
         "tags": [],
         "user": "test"
       }
     ],
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7"
   }
 
 changeset/ renders the tip changeset
 
   $ request json-rev
   200 Script output follows
   
   {
     "bookmarks": [],
     "branch": "default",
     "date": [
       0.0,
       0
     ],
     "desc": "merge test-branch into default",
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
     "parents": [
       "ceed296fe500c3fac9541e31dad860cb49c89e45",
       "ed66c30e87eb65337c05a4229efaa5f1d5285a90"
     ],
     "phase": "draft",
     "tags": [
       "tip"
     ],
     "user": "test"
   }
 
 changeset/{revision} shows tags
 
   $ request json-rev/78896eb0e102
   200 Script output follows
   
   {
     "bookmarks": [],
     "branch": "default",
     "date": [
       0.0,
       0
     ],
     "desc": "move foo",
     "node": "78896eb0e102174ce9278438a95e12543e4367a7",
     "parents": [
       "8d7c456572acf3557e8ed8a07286b10c408bcec5"
     ],
     "phase": "public",
     "tags": [
       "tag1"
     ],
     "user": "test"
   }
 
 changeset/{revision} shows bookmarks
 
   $ request json-rev/8d7c456572ac
   200 Script output follows
   
   {
     "bookmarks": [
       "bookmark1"
     ],
     "branch": "default",
     "date": [
       0.0,
       0
     ],
     "desc": "modify da/foo",
     "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
     "parents": [
       "f8bbb9024b10f93cdbb8d940337398291d40dea8"
     ],
     "phase": "public",
     "tags": [],
     "user": "test"
   }
 
 changeset/{revision} shows branches
 
   $ request json-rev/6ab967a8ab34
   200 Script output follows
   
   {
     "bookmarks": [],
     "branch": "test-branch",
     "date": [
       0.0,
       0
     ],
     "desc": "create test branch",
     "node": "6ab967a8ab3489227a83f80e920faa039a71819f",
     "parents": [
       "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
     ],
     "phase": "draft",
     "tags": [],
     "user": "test"
   }
 
 manifest/{revision}/{path} shows info about a directory at a revision
 
   $ request json-manifest/06e557f3edf6/
   200 Script output follows
   
   {
     "abspath": "/",
     "bookmarks": [],
     "directories": [
       {
         "abspath": "/da",
         "basename": "da",
         "emptydirs": ""
       }
     ],
     "files": [
       {
         "abspath": "foo",
         "basename": "foo",
         "date": [
           0.0,
           0
         ],
         "flags": "",
         "size": 4
       }
     ],
     "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
     "tags": []
   }
 
 tags/ shows tags info
 
   $ request json-tags
   200 Script output follows
   
   {
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
     "tags": [
       {
         "date": [
           0.0,
           0
         ],
         "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
         "tag": "tag2"
       },
       {
         "date": [
           0.0,
           0
         ],
         "node": "78896eb0e102174ce9278438a95e12543e4367a7",
         "tag": "tag1"
       }
     ]
   }
 
 bookmarks/ shows bookmarks info
 
   $ request json-bookmarks
   200 Script output follows
   
   {
     "bookmarks": [
       {
         "bookmark": "bookmark2",
         "date": [
           0.0,
           0
         ],
         "node": "ceed296fe500c3fac9541e31dad860cb49c89e45"
       },
       {
         "bookmark": "bookmark1",
         "date": [
           0.0,
           0
         ],
         "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5"
       }
     ],
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7"
   }
 
 branches/ shows branches info
 
   $ request json-branches
   200 Script output follows
   
   {
     "branches": [
       {
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
         "status": "open"
       },
       {
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
         "status": "inactive"
       }
     ]
   }
 
 summary/ shows a summary of repository state
 
   $ request json-summary
   200 Script output follows
   
   {
     "archives": [
       {
         "extension": ".tar.bz2",
         "node": "tip",
         "type": "bz2",
         "url": "http://*:$HGPORT/archive/tip.tar.bz2" (glob)
       }
     ],
     "bookmarks": [
       {
         "bookmark": "bookmark2",
         "date": [
           0.0,
           0
         ],
         "node": "ceed296fe500c3fac9541e31dad860cb49c89e45"
       },
       {
         "bookmark": "bookmark1",
         "date": [
           0.0,
           0
         ],
         "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5"
       }
     ],
     "branches": [
       {
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
         "status": "open"
       },
       {
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
         "status": "inactive"
       }
     ],
     "labels": [],
     "lastchange": [
       0.0,
       0
     ],
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
     "shortlog": [
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "merge test-branch into default",
         "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
         "parents": [
           "ceed296fe500c3fac9541e31dad860cb49c89e45",
           "ed66c30e87eb65337c05a4229efaa5f1d5285a90"
         ],
         "phase": "draft",
         "tags": [
           "tip"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "desc": "another commit in test-branch",
         "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
         "parents": [
           "6ab967a8ab3489227a83f80e920faa039a71819f"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "desc": "create test branch",
         "node": "6ab967a8ab3489227a83f80e920faa039a71819f",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark2"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag2",
         "node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
         "parents": [
           "f2890a05fea49bfaf9fb27ed5490894eba32da78"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "another commit to da/foo",
         "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
         "parents": [
           "93a8ce14f89156426b7fa981af8042da53f03aa0"
         ],
         "phase": "draft",
         "tags": [
           "tag2"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag",
         "node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
         "parents": [
           "78896eb0e102174ce9278438a95e12543e4367a7"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "move foo",
         "node": "78896eb0e102174ce9278438a95e12543e4367a7",
         "parents": [
           "8d7c456572acf3557e8ed8a07286b10c408bcec5"
         ],
         "phase": "public",
         "tags": [
           "tag1"
         ],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark1"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify da/foo",
         "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
         "parents": [
           "f8bbb9024b10f93cdbb8d940337398291d40dea8"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify foo",
         "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "initial",
         "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
         "parents": [],
         "phase": "public",
         "tags": [],
         "user": "test"
       }
     ],
     "tags": [
       {
         "date": [
           0.0,
           0
         ],
         "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
         "tag": "tag2"
       },
       {
         "date": [
           0.0,
           0
         ],
         "node": "78896eb0e102174ce9278438a95e12543e4367a7",
         "tag": "tag1"
       }
     ]
   }
 
   $ request json-changelog?rev=create
   200 Script output follows
   
   {
     "entries": [
       {
         "bookmarks": [],
         "branch": "test-branch",
         "date": [
           0.0,
           0
         ],
         "desc": "create test branch",
         "node": "6ab967a8ab3489227a83f80e920faa039a71819f",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark2"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag2",
         "node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
         "parents": [
           "f2890a05fea49bfaf9fb27ed5490894eba32da78"
         ],
         "phase": "draft",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "create tag",
         "node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
         "parents": [
           "78896eb0e102174ce9278438a95e12543e4367a7"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       }
     ],
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
     "query": "create"
   }
 
 filediff/{revision}/{path} shows changes to a file in a revision
 
   $ request json-diff/f8bbb9024b10/foo
   200 Script output follows
   
   {
     "author": "test",
     "children": [],
     "date": [
       0.0,
       0
     ],
     "desc": "modify foo",
     "diff": [
       {
         "blockno": 1,
         "lines": [
           {
             "l": "--- a/foo\tThu Jan 01 00:00:00 1970 +0000\n",
             "n": 1,
             "t": "-"
           },
           {
             "l": "+++ b/foo\tThu Jan 01 00:00:00 1970 +0000\n",
             "n": 2,
             "t": "+"
           },
           {
             "l": "@@ -1,1 +1,1 @@\n",
             "n": 3,
             "t": "@"
           },
           {
             "l": "-foo\n",
             "n": 4,
             "t": "-"
           },
           {
             "l": "+bar\n",
             "n": 5,
             "t": "+"
           }
         ]
       }
     ],
     "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
     "parents": [
       "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
     ],
     "path": "foo"
   }
 
 comparison/{revision}/{path} shows information about before and after for a file
 
   $ request json-comparison/f8bbb9024b10/foo
   200 Script output follows
   
   {
     "author": "test",
     "children": [],
     "comparison": [
       {
         "lines": [
           {
             "ll": "foo",
             "ln": 1,
             "rl": "bar",
             "rn": 1,
             "t": "replace"
           }
         ]
       }
     ],
     "date": [
       0.0,
       0
     ],
     "desc": "modify foo",
     "leftnode": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
     "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
     "parents": [
       "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
     ],
     "path": "foo",
     "rightnode": "f8bbb9024b10f93cdbb8d940337398291d40dea8"
   }
 
 annotate/{revision}/{path} shows annotations for each line
 
   $ request json-annotate/f8bbb9024b10/foo
   200 Script output follows
   
   {
     "abspath": "foo",
     "annotate": [
       {
         "abspath": "foo",
         "author": "test",
         "desc": "modify foo",
         "line": "bar\n",
         "lineno": 1,
         "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
         "revdate": [
           0.0,
           0
         ],
         "targetline": 1
       }
     ],
     "author": "test",
     "children": [],
     "date": [
       0.0,
       0
     ],
     "desc": "modify foo",
     "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
     "parents": [
       "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
     ],
     "permissions": ""
   }
 
 filelog/{revision}/{path} shows history of a single file
 
   $ request json-filelog/f8bbb9024b10/foo
   200 Script output follows
   
   {
     "entries": [
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify foo",
         "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "initial",
         "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
         "parents": [],
         "phase": "public",
         "tags": [],
         "user": "test"
       }
     ]
   }
 
   $ request json-filelog/cc725e08502a/da/foo
   200 Script output follows
   
   {
     "entries": [
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "another commit to da/foo",
         "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
         "parents": [
           "8d7c456572acf3557e8ed8a07286b10c408bcec5"
         ],
         "phase": "draft",
         "tags": [
           "tag2"
         ],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark1"
         ],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "modify da/foo",
         "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "public",
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "date": [
           0.0,
           0
         ],
         "desc": "initial",
         "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
         "parents": [],
         "phase": "public",
         "tags": [],
         "user": "test"
       }
     ]
   }
 
 (archive/ doesn't use templating, so ignore it)
 
 (static/ doesn't use templating, so ignore it)
 
 graph/ shows information that can be used to render a graph of the DAG
 
   $ request json-graph
   200 Script output follows
   
   {
     "changeset_count": 10,
     "changesets": [
       {
         "bookmarks": [],
         "branch": "default",
         "col": 0,
         "color": 1,
         "date": [
           0.0,
           0
         ],
         "desc": "merge test-branch into default",
         "edges": [
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 0,
             "width": -1
           },
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 1,
             "width": -1
           }
         ],
         "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7",
         "parents": [
           "ceed296fe500c3fac9541e31dad860cb49c89e45",
           "ed66c30e87eb65337c05a4229efaa5f1d5285a90"
         ],
         "phase": "draft",
         "row": 0,
         "tags": [
           "tip"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "col": 1,
         "color": 2,
         "date": [
           0.0,
           0
         ],
         "desc": "another commit in test-branch",
         "edges": [
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 0,
             "width": -1
           },
           {
             "bcolor": "",
             "col": 1,
             "color": 2,
             "nextcol": 1,
             "width": -1
           }
         ],
         "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90",
         "parents": [
           "6ab967a8ab3489227a83f80e920faa039a71819f"
         ],
         "phase": "draft",
         "row": 1,
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "test-branch",
         "col": 1,
         "color": 2,
         "date": [
           0.0,
           0
         ],
         "desc": "create test branch",
         "edges": [
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 0,
             "width": -1
           },
           {
             "bcolor": "",
             "col": 1,
             "color": 2,
             "nextcol": 1,
             "width": -1
           }
         ],
         "node": "6ab967a8ab3489227a83f80e920faa039a71819f",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "draft",
         "row": 2,
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark2"
         ],
         "branch": "default",
         "col": 0,
         "color": 1,
         "date": [
           0.0,
           0
         ],
         "desc": "create tag2",
         "edges": [
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 0,
             "width": -1
           },
           {
             "bcolor": "",
             "col": 1,
             "color": 2,
             "nextcol": 1,
             "width": -1
           }
         ],
         "node": "ceed296fe500c3fac9541e31dad860cb49c89e45",
         "parents": [
           "f2890a05fea49bfaf9fb27ed5490894eba32da78"
         ],
         "phase": "draft",
         "row": 3,
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "col": 0,
         "color": 1,
         "date": [
           0.0,
           0
         ],
         "desc": "another commit to da/foo",
         "edges": [
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 0,
             "width": -1
           },
           {
             "bcolor": "",
             "col": 1,
             "color": 2,
             "nextcol": 1,
             "width": -1
           }
         ],
         "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78",
         "parents": [
           "93a8ce14f89156426b7fa981af8042da53f03aa0"
         ],
         "phase": "draft",
         "row": 4,
         "tags": [
           "tag2"
         ],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "col": 0,
         "color": 1,
         "date": [
           0.0,
           0
         ],
         "desc": "create tag",
         "edges": [
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 0,
             "width": -1
           },
           {
             "bcolor": "",
             "col": 1,
             "color": 2,
             "nextcol": 1,
             "width": -1
           }
         ],
         "node": "93a8ce14f89156426b7fa981af8042da53f03aa0",
         "parents": [
           "78896eb0e102174ce9278438a95e12543e4367a7"
         ],
         "phase": "public",
         "row": 5,
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "col": 0,
         "color": 1,
         "date": [
           0.0,
           0
         ],
         "desc": "move foo",
         "edges": [
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 0,
             "width": -1
           },
           {
             "bcolor": "",
             "col": 1,
             "color": 2,
             "nextcol": 1,
             "width": -1
           }
         ],
         "node": "78896eb0e102174ce9278438a95e12543e4367a7",
         "parents": [
           "8d7c456572acf3557e8ed8a07286b10c408bcec5"
         ],
         "phase": "public",
         "row": 6,
         "tags": [
           "tag1"
         ],
         "user": "test"
       },
       {
         "bookmarks": [
           "bookmark1"
         ],
         "branch": "default",
         "col": 0,
         "color": 1,
         "date": [
           0.0,
           0
         ],
         "desc": "modify da/foo",
         "edges": [
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 0,
             "width": -1
           },
           {
             "bcolor": "",
             "col": 1,
             "color": 2,
             "nextcol": 1,
             "width": -1
           }
         ],
         "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5",
         "parents": [
           "f8bbb9024b10f93cdbb8d940337398291d40dea8"
         ],
         "phase": "public",
         "row": 7,
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "col": 0,
         "color": 1,
         "date": [
           0.0,
           0
         ],
         "desc": "modify foo",
         "edges": [
           {
             "bcolor": "",
             "col": 0,
             "color": 1,
             "nextcol": 0,
             "width": -1
           },
           {
             "bcolor": "",
             "col": 1,
             "color": 2,
             "nextcol": 0,
             "width": -1
           }
         ],
         "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
         "parents": [
           "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
         ],
         "phase": "public",
         "row": 8,
         "tags": [],
         "user": "test"
       },
       {
         "bookmarks": [],
         "branch": "default",
         "col": 0,
         "color": 2,
         "date": [
           0.0,
           0
         ],
         "desc": "initial",
         "edges": [],
         "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
         "parents": [],
         "phase": "public",
         "row": 9,
         "tags": [],
         "user": "test"
       }
     ],
     "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7"
   }
 
 help/ shows help topics
 
   $ request json-help
   200 Script output follows
   
   {
     "earlycommands": [
       {
         "summary": "add the specified files on the next commit",
         "topic": "add"
       },
       {
         "summary": "show changeset information by line for each file",
         "topic": "annotate"
       },
       {
         "summary": "make a copy of an existing repository",
         "topic": "clone"
       },
       {
         "summary": "commit the specified files or all outstanding changes",
         "topic": "commit"
       },
       {
         "summary": "diff repository (or selected files)",
         "topic": "diff"
       },
       {
         "summary": "dump the header and diffs for one or more changesets",
         "topic": "export"
       },
       {
         "summary": "forget the specified files on the next commit",
         "topic": "forget"
       },
       {
         "summary": "create a new repository in the given directory",
         "topic": "init"
       },
       {
         "summary": "show revision history of entire repository or files",
         "topic": "log"
       },
       {
         "summary": "merge another revision into working directory",
         "topic": "merge"
       },
       {
         "summary": "pull changes from the specified source",
         "topic": "pull"
       },
       {
         "summary": "push changes to the specified destination",
         "topic": "push"
       },
       {
         "summary": "remove the specified files on the next commit",
         "topic": "remove"
       },
       {
         "summary": "start stand-alone webserver",
         "topic": "serve"
       },
       {
         "summary": "show changed files in the working directory",
         "topic": "status"
       },
       {
         "summary": "summarize working directory state",
         "topic": "summary"
       },
       {
         "summary": "update working directory (or switch revisions)",
         "topic": "update"
       }
     ],
     "othercommands": [
       {
         "summary": "add all new files, delete all missing files",
         "topic": "addremove"
       },
       {
         "summary": "create an unversioned archive of a repository revision",
         "topic": "archive"
       },
       {
         "summary": "reverse effect of earlier changeset",
         "topic": "backout"
       },
       {
         "summary": "subdivision search of changesets",
         "topic": "bisect"
       },
       {
         "summary": "create a new bookmark or list existing bookmarks",
         "topic": "bookmarks"
       },
       {
         "summary": "set or show the current branch name",
         "topic": "branch"
       },
       {
         "summary": "list repository named branches",
         "topic": "branches"
       },
       {
         "summary": "create a bundle file",
         "topic": "bundle"
       },
       {
         "summary": "output the current or given revision of files",
         "topic": "cat"
       },
       {
         "summary": "show combined config settings from all hgrc files",
         "topic": "config"
       },
       {
         "summary": "mark files as copied for the next commit",
         "topic": "copy"
       },
       {
         "summary": "list tracked files",
         "topic": "files"
       },
       {
         "summary": "copy changes from other branches onto the current branch",
         "topic": "graft"
       },
       {
         "summary": "search revision history for a pattern in specified files",
         "topic": "grep"
       },
       {
         "summary": "show branch heads",
         "topic": "heads"
       },
       {
         "summary": "show help for a given topic or a help overview",
         "topic": "help"
       },
       {
         "summary": "identify the working directory or specified revision",
         "topic": "identify"
       },
       {
         "summary": "import an ordered set of patches",
         "topic": "import"
       },
       {
         "summary": "show new changesets found in source",
         "topic": "incoming"
       },
       {
         "summary": "output the current or given revision of the project manifest",
         "topic": "manifest"
       },
       {
         "summary": "show changesets not found in the destination",
         "topic": "outgoing"
       },
       {
         "summary": "show aliases for remote repositories",
         "topic": "paths"
       },
       {
         "summary": "set or show the current phase name",
         "topic": "phase"
       },
       {
         "summary": "roll back an interrupted transaction",
         "topic": "recover"
       },
       {
         "summary": "rename files; equivalent of copy + remove",
         "topic": "rename"
       },
       {
         "summary": "redo merges or set/view the merge status of files",
         "topic": "resolve"
       },
       {
         "summary": "restore files to their checkout state",
         "topic": "revert"
       },
       {
         "summary": "print the root (top) of the current working directory",
         "topic": "root"
       },
       {
         "summary": "add one or more tags for the current or given revision",
         "topic": "tag"
       },
       {
         "summary": "list repository tags",
         "topic": "tags"
       },
       {
         "summary": "apply one or more bundle files",
         "topic": "unbundle"
       },
       {
         "summary": "verify the integrity of the repository",
         "topic": "verify"
       },
       {
         "summary": "output version and copyright information",
         "topic": "version"
       }
     ],
     "topics": [
       {
         "summary": "Bundle File Formats",
         "topic": "bundlespec"
       },
       {
         "summary": "Colorizing Outputs",
         "topic": "color"
       },
       {
         "summary": "Configuration Files",
         "topic": "config"
       },
       {
         "summary": "Date Formats",
         "topic": "dates"
       },
       {
         "summary": "Deprecated Features",
         "topic": "deprecated"
       },
       {
         "summary": "Diff Formats",
         "topic": "diffs"
       },
       {
         "summary": "Environment Variables",
         "topic": "environment"
       },
       {
         "summary": "Using Additional Features",
         "topic": "extensions"
       },
       {
         "summary": "Specifying File Sets",
         "topic": "filesets"
       },
       {
         "summary": "Command-line flags",
         "topic": "flags"
       },
       {
         "summary": "Glossary",
         "topic": "glossary"
       },
       {
         "summary": "Syntax for Mercurial Ignore Files",
         "topic": "hgignore"
       },
       {
         "summary": "Configuring hgweb",
         "topic": "hgweb"
       },
       {
         "summary": "Technical implementation topics",
         "topic": "internals"
       },
       {
         "summary": "Merge Tools",
         "topic": "merge-tools"
       },
       {
         "summary": "Pager Support",
         "topic": "pager"
       },
       {
         "summary": "File Name Patterns",
         "topic": "patterns"
       },
       {
         "summary": "Working with Phases",
         "topic": "phases"
       },
       {
         "summary": "Specifying Revisions",
         "topic": "revisions"
       },
       {
         "summary": "Using Mercurial from scripts and automation",
         "topic": "scripting"
       },
       {
         "summary": "Subrepositories",
         "topic": "subrepos"
       },
       {
         "summary": "Template Usage",
         "topic": "templating"
       },
       {
         "summary": "URL Paths",
         "topic": "urls"
       }
     ]
   }
 
 help/{topic} shows an individual help topic
 
   $ request json-help/phases
   200 Script output follows
   
   {
     "rawdoc": "Working with Phases\n*", (glob)
     "topic": "phases"
   }
 
 Error page shouldn't crash
 
   $ request json-changeset/deadbeef
   404 Not Found
   
   {
     "error": "unknown revision 'deadbeef'"
   }
   [1]
 
 Commit message with Japanese Kanji 'Noh', which ends with '\x5c'
 
   $ echo foo >> da/foo
   $ HGENCODING=cp932 hg ci -m `"$PYTHON" -c 'print("\x94\x5c")'`
 
 Commit message with null character
 
   $ echo foo >> da/foo
-  >>> open('msg', 'wb').write('commit with null character: \0\n')
+  >>> open('msg', 'wb').write('commit with null character: \0\n') and None
   $ hg ci -l msg
   $ rm msg
 
 Stop and restart with HGENCODING=cp932
 
   $ killdaemons.py
   $ HGENCODING=cp932 hg serve -p $HGPORT -d --pid-file=hg.pid \
   > -A access.log -E error.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 Test json escape of multibyte characters
 
   $ request json-filelog/tip/da/foo?revcount=2 | grep '"desc":'
         "desc": "commit with null character: \u0000",
         "desc": "\u80fd",

tests/test-keyword.t

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

tests/test-revlog.t

@@ -1,52 +1,52 b''
   $ hg init empty-repo
   $ cd empty-repo
 
 Flags on revlog version 0 are rejected
 
   >>> with open('.hg/store/00changelog.i', 'wb') as fh:
   ...     fh.write(b'\x00\x01\x00\x00') and None
 
   $ hg log
   abort: unknown flags (0x01) in version 0 revlog 00changelog.i!
   [255]
 
 Unknown flags on revlog version 1 are rejected
 
   >>> with open('.hg/store/00changelog.i', 'wb') as fh:
   ...     fh.write(b'\x00\x04\x00\x01') and None
 
   $ hg log
   abort: unknown flags (0x04) in version 1 revlog 00changelog.i!
   [255]
 
 Unknown version is rejected
 
   >>> with open('.hg/store/00changelog.i', 'wb') as fh:
   ...     fh.write(b'\x00\x00\x00\x02') and None
 
   $ hg log
   abort: unknown version (2) in revlog 00changelog.i!
   [255]
 
   $ cd ..
 
 Test for CVE-2016-3630
 
   $ hg init
 
   >>> open("a.i", "wb").write(
   ... b"""eJxjYGZgZIAAYQYGxhgom+k/FMx8YKx9ZUaKSOyqo4cnuKb8mbqHV5cBCVTMWb1Cwqkhe4Gsg9AD
   ... Joa3dYtcYYYBAQ8Qr4OqZAYRICPTSr5WKd/42rV36d+8/VmrNpv7NP1jQAXrQE4BqQUARngwVA=="""
-  ... .decode("base64").decode("zlib"))
+  ... .decode("base64").decode("zlib")) and None
 
   $ hg debugrevlogindex a.i
      rev linkrev nodeid       p1           p2
        0       2 99e0332bd498 000000000000 000000000000
        1       3 6674f57a23d8 99e0332bd498 000000000000
 
   >>> from mercurial import revlog, vfs
   >>> tvfs = vfs.vfs(b'.')
   >>> tvfs.options = {b'revlogv1': True}
   >>> rl = revlog.revlog(tvfs, b'a.i')
   >>> rl.revision(1)
   mpatchError('patch cannot be decoded',)