tests: accept output changes by 33350debb480

Differential Revision: https://phab.mercurial-scm.org/D10067

tests/test-diff-upgrade.t

@@ -1,290 +1,290 b''
 #require execbit
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > autodiff = $TESTDIR/autodiff.py
   > [diff]
   > nodates = 1
   > EOF
 
   $ hg init repo
   $ cd repo
 
 
 
 make a combination of new, changed and deleted file
 
   $ echo regular > regular
   $ echo rmregular > rmregular
   $ "$PYTHON" -c "open('bintoregular', 'wb').write(b'\0')"
   $ touch rmempty
   $ echo exec > exec
   $ chmod +x exec
   $ echo rmexec > rmexec
   $ chmod +x rmexec
   $ echo setexec > setexec
   $ echo unsetexec > unsetexec
   $ chmod +x unsetexec
   $ echo binary > binary
   $ "$PYTHON" -c "open('rmbinary', 'wb').write(b'\0')"
   $ hg ci -Am addfiles
   adding binary
   adding bintoregular
   adding exec
   adding regular
   adding rmbinary
   adding rmempty
   adding rmexec
   adding rmregular
   adding setexec
   adding unsetexec
   $ echo regular >> regular
   $ echo newregular >> newregular
   $ rm rmempty
   $ touch newempty
   $ rm rmregular
   $ echo exec >> exec
   $ echo newexec > newexec
   $ echo bintoregular > bintoregular
   $ chmod +x newexec
   $ rm rmexec
   $ chmod +x setexec
   $ chmod -x unsetexec
   $ "$PYTHON" -c "open('binary', 'wb').write(b'\0\0')"
   $ "$PYTHON" -c "open('newbinary', 'wb').write(b'\0')"
   $ rm rmbinary
   $ hg addremove -s 0
   adding newbinary
   adding newempty
   adding newexec
   adding newregular
   removing rmbinary
   removing rmempty
   removing rmexec
   removing rmregular
 
 git=no: regular diff for all files
 
   $ hg autodiff --git=no
   diff -r a66d19b9302d binary
   Binary file binary has changed
   diff -r a66d19b9302d bintoregular
   Binary file bintoregular has changed
   diff -r a66d19b9302d exec
   --- a/exec
   +++ b/exec
   @@ -1,1 +1,2 @@
    exec
   +exec
   diff -r a66d19b9302d newbinary
   Binary file newbinary has changed
   diff -r a66d19b9302d newexec
   --- /dev/null
   +++ b/newexec
   @@ -0,0 +1,1 @@
   +newexec
   diff -r a66d19b9302d newregular
   --- /dev/null
   +++ b/newregular
   @@ -0,0 +1,1 @@
   +newregular
   diff -r a66d19b9302d regular
   --- a/regular
   +++ b/regular
   @@ -1,1 +1,2 @@
    regular
   +regular
   diff -r a66d19b9302d rmbinary
   Binary file rmbinary has changed
   diff -r a66d19b9302d rmexec
   --- a/rmexec
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -rmexec
   diff -r a66d19b9302d rmregular
   --- a/rmregular
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -rmregular
 
 git=yes: git diff for single regular file
 
   $ hg autodiff --git=yes regular
   diff --git a/regular b/regular
   --- a/regular
   +++ b/regular
   @@ -1,1 +1,2 @@
    regular
   +regular
 
 git=auto: regular diff for regular files and non-binary removals
 
   $ hg autodiff --git=auto regular newregular rmregular rmexec
   diff -r a66d19b9302d newregular
   --- /dev/null
   +++ b/newregular
   @@ -0,0 +1,1 @@
   +newregular
   diff -r a66d19b9302d regular
   --- a/regular
   +++ b/regular
   @@ -1,1 +1,2 @@
    regular
   +regular
   diff -r a66d19b9302d rmexec
   --- a/rmexec
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -rmexec
   diff -r a66d19b9302d rmregular
   --- a/rmregular
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -rmregular
 
   $ for f in exec newexec setexec unsetexec binary newbinary newempty rmempty rmbinary bintoregular; do
   >     echo
   >     echo '% git=auto: git diff for' $f
   >     hg autodiff --git=auto $f
   > done
   
   % git=auto: git diff for exec
   diff -r a66d19b9302d exec
   --- a/exec
   +++ b/exec
   @@ -1,1 +1,2 @@
    exec
   +exec
   
   % git=auto: git diff for newexec
   diff --git a/newexec b/newexec
   new file mode 100755
   --- /dev/null
   +++ b/newexec
   @@ -0,0 +1,1 @@
   +newexec
   
   % git=auto: git diff for setexec
   diff --git a/setexec b/setexec
   old mode 100644
   new mode 100755
   
   % git=auto: git diff for unsetexec
   diff --git a/unsetexec b/unsetexec
   old mode 100755
   new mode 100644
   
   % git=auto: git diff for binary
   diff --git a/binary b/binary
   index a9128c283485202893f5af379dd9beccb6e79486..09f370e38f498a462e1ca0faa724559b6630c04f
   GIT binary patch
   literal 2
   Jc${Nk0000200961
   
   
   % git=auto: git diff for newbinary
   diff --git a/newbinary b/newbinary
   new file mode 100644
-  index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f76dd238ade08917e6712764a16a22005a50573d
+  index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
   GIT binary patch
   literal 1
   Ic${MZ000310RR91
   
   
   % git=auto: git diff for newempty
   diff --git a/newempty b/newempty
   new file mode 100644
   
   % git=auto: git diff for rmempty
   diff --git a/rmempty b/rmempty
   deleted file mode 100644
   
   % git=auto: git diff for rmbinary
   diff --git a/rmbinary b/rmbinary
   deleted file mode 100644
-  index f76dd238ade08917e6712764a16a22005a50573d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+  index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
   GIT binary patch
   literal 0
   Hc$@<O00001
   
   
   % git=auto: git diff for bintoregular
   diff --git a/bintoregular b/bintoregular
   index f76dd238ade08917e6712764a16a22005a50573d..9c42f2b6427d8bf034b7bc23986152dc01bfd3ab
   GIT binary patch
   literal 13
   Uc$`bh%qz(+N=+}#Ni5<5043uE82|tP
   
 
 
 git=warn: regular diff with data loss warnings
 
   $ hg autodiff --git=warn
   diff -r a66d19b9302d binary
   Binary file binary has changed
   diff -r a66d19b9302d bintoregular
   Binary file bintoregular has changed
   diff -r a66d19b9302d exec
   --- a/exec
   +++ b/exec
   @@ -1,1 +1,2 @@
    exec
   +exec
   diff -r a66d19b9302d newbinary
   Binary file newbinary has changed
   diff -r a66d19b9302d newexec
   --- /dev/null
   +++ b/newexec
   @@ -0,0 +1,1 @@
   +newexec
   diff -r a66d19b9302d newregular
   --- /dev/null
   +++ b/newregular
   @@ -0,0 +1,1 @@
   +newregular
   diff -r a66d19b9302d regular
   --- a/regular
   +++ b/regular
   @@ -1,1 +1,2 @@
    regular
   +regular
   diff -r a66d19b9302d rmbinary
   Binary file rmbinary has changed
   diff -r a66d19b9302d rmexec
   --- a/rmexec
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -rmexec
   diff -r a66d19b9302d rmregular
   --- a/rmregular
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -rmregular
   data lost for: binary
   data lost for: bintoregular
   data lost for: newbinary
   data lost for: newempty
   data lost for: newexec
   data lost for: rmbinary
   data lost for: rmempty
   data lost for: setexec
   data lost for: unsetexec
 
 git=abort: fail on execute bit change
 
   $ hg autodiff --git=abort regular setexec
   abort: losing data for setexec
   [255]
 
 git=abort: succeed on regular file
 
   $ hg autodiff --git=abort regular
   diff -r a66d19b9302d regular
   --- a/regular
   +++ b/regular
   @@ -1,1 +1,2 @@
    regular
   +regular
 
   $ cd ..
 

tests/test-diffstat.t

@@ -1,294 +1,294 b''
   $ hg init repo
   $ cd repo
   $ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
   $ hg add a
   $ cp a b
   $ hg add b
 
 Wide diffstat:
 
   $ hg diff --stat
    a |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    b |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    2 files changed, 426 insertions(+), 0 deletions(-)
 
 diffstat width:
 
   $ COLUMNS=24 hg diff --config ui.interactive=true --stat
    a |  213 ++++++++++++++
    b |  213 ++++++++++++++
    2 files changed, 426 insertions(+), 0 deletions(-)
 
   $ hg ci -m adda
 
   $ cat >> a <<EOF
   > a
   > a
   > a
   > EOF
 
 Narrow diffstat:
 
   $ hg diff --stat
    a |  3 +++
    1 files changed, 3 insertions(+), 0 deletions(-)
 
   $ hg ci -m appenda
 
   >>> open("c", "wb").write(b"\0") and None
   $ touch d
   $ hg add c d
 
 Binary diffstat:
 
   $ hg diff --stat
    c |  Bin 
    1 files changed, 0 insertions(+), 0 deletions(-)
 
 Binary git diffstat:
 
   $ hg diff --stat --git
    c |  Bin 
    d |    0 
    2 files changed, 0 insertions(+), 0 deletions(-)
 
   $ hg ci -m createb
 
   >>> open("file with spaces", "wb").write(b"\0") and None
   $ hg add "file with spaces"
 
 Filename with spaces diffstat:
 
   $ hg diff --stat
    file with spaces |  Bin 
    1 files changed, 0 insertions(+), 0 deletions(-)
 
 Filename with spaces git diffstat:
 
   $ hg diff --stat --git
    file with spaces |  Bin 
    1 files changed, 0 insertions(+), 0 deletions(-)
 
 Filename without "a/" or "b/" (issue5759):
 
   $ hg diff --config 'diff.noprefix=1' -c1 --stat --git
    a |  3 +++
    1 files changed, 3 insertions(+), 0 deletions(-)
   $ hg diff --config 'diff.noprefix=1' -c2 --stat --git
    c |  Bin 
    d |    0 
    2 files changed, 0 insertions(+), 0 deletions(-)
 
   $ hg log --config 'diff.noprefix=1' -r '1:' -p --stat --git
   changeset:   1:3a95b07bb77f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     appenda
   
    a |  3 +++
    1 files changed, 3 insertions(+), 0 deletions(-)
   
   diff --git a a
   --- a
   +++ a
   @@ -211,3 +211,6 @@
    a
    a
    a
   +a
   +a
   +a
   
   changeset:   2:c60a6c753773
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     createb
   
    c |  Bin 
    d |    0 
    2 files changed, 0 insertions(+), 0 deletions(-)
   
   diff --git c c
   new file mode 100644
-  index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f76dd238ade08917e6712764a16a22005a50573d
+  index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
   GIT binary patch
   literal 1
   Ic${MZ000310RR91
   
   diff --git d d
   new file mode 100644
   
 
 diffstat within directories:
 
   $ hg rm -f 'file with spaces'
 
   $ mkdir dir1 dir2
   $ echo new1 > dir1/new
   $ echo new2 > dir2/new
   $ hg add dir1/new dir2/new
   $ hg diff --stat
    dir1/new |  1 +
    dir2/new |  1 +
    2 files changed, 2 insertions(+), 0 deletions(-)
 
   $ hg diff --stat --root dir1
    new |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
 
   $ hg diff --stat --root dir1 dir2
   warning: dir2 not inside relative root dir1
 
   $ hg diff --stat --root dir1 -I dir1/old
 
   $ cd dir1
   $ hg diff --stat .
    dir1/new |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   $ hg diff --stat . --config ui.relative-paths=yes
    new |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   $ hg diff --stat --root .
    new |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
 
   $ hg diff --stat --root . --config ui.relative-paths=yes
    new |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
 --root trumps ui.relative-paths
   $ hg diff --stat --root .. --config ui.relative-paths=yes
    new         |  1 +
    ../dir2/new |  1 +
    2 files changed, 2 insertions(+), 0 deletions(-)
   $ hg diff --stat --root ../dir1 ../dir2
   warning: ../dir2 not inside relative root .
 
   $ hg diff --stat --root . -I old
 
   $ cd ..
 
 Files with lines beginning with '--' or '++' should be properly counted in diffstat
 
   $ hg up -Cr tip
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm dir1/new
   $ rm dir2/new
   $ rm "file with spaces"
   $ cat > file << EOF
   > line 1
   > line 2
   > line 3
   > EOF
   $ hg commit -Am file
   adding file
 
 Lines added starting with '--' should count as additions
   $ cat > file << EOF
   > line 1
   > -- line 2, with dashes
   > line 3
   > EOF
 
   $ hg diff --root .
   diff -r be1569354b24 file
   --- a/file	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file	* (glob)
   @@ -1,3 +1,3 @@
    line 1
   -line 2
   +-- line 2, with dashes
    line 3
 
   $ hg diff --root . --stat
    file |  2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)
 
 Lines changed starting with '--' should count as deletions
   $ hg commit -m filev2
   $ cat > file << EOF
   > line 1
   > -- line 2, with dashes, changed again
   > line 3
   > EOF
 
   $ hg diff --root .
   diff -r 160f7c034df6 file
   --- a/file	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file	* (glob)
   @@ -1,3 +1,3 @@
    line 1
   --- line 2, with dashes
   +-- line 2, with dashes, changed again
    line 3
 
   $ hg diff --root . --stat
    file |  2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)
 
 Lines changed starting with '--' should count as deletions
 and starting with '++' should count as additions
   $ cat > file << EOF
   > line 1
   > ++ line 2, switched dashes to plusses
   > line 3
   > EOF
 
   $ hg diff --root .
   diff -r 160f7c034df6 file
   --- a/file	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file	* (glob)
   @@ -1,3 +1,3 @@
    line 1
   --- line 2, with dashes
   +++ line 2, switched dashes to plusses
    line 3
 
   $ hg diff --root . --stat
    file |  2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)
 
 When a file is renamed, --git shouldn't loss the info about old file
   $ hg init issue6025
   $ cd issue6025
   $ echo > a
   $ hg ci -Am 'add a'
   adding a
   $ hg mv a b
   $ hg diff --git
   diff --git a/a b/b
   rename from a
   rename to b
   $ hg diff --stat
    a |  1 -
    b |  1 +
    2 files changed, 1 insertions(+), 1 deletions(-)
   $ hg diff --stat --git
    a => b |  0 
    1 files changed, 0 insertions(+), 0 deletions(-)
 -- filename may contain whitespaces
   $ echo > c
   $ hg ci -Am 'add c'
   adding c
   $ hg mv c 'new c'
   $ hg diff --git
   diff --git a/c b/new c
   rename from c
   rename to new c
   $ hg diff --stat
    c     |  1 -
    new c |  1 +
    2 files changed, 1 insertions(+), 1 deletions(-)
   $ hg diff --stat --git
    c => new c |  0 
    1 files changed, 0 insertions(+), 0 deletions(-)
 
 Make sure `diff --stat -q --config diff.git-0` shows stat (issue4037)
 
   $ hg status
   A new c
   R c
   $ hg diff --stat -q
    c     |  1 -
    new c |  1 +
    2 files changed, 1 insertions(+), 1 deletions(-)

tests/test-git-export.t

@@ -1,615 +1,615 b''
   $ hg init
   $ echo start > start
   $ hg ci -Amstart
   adding start
 
 New file:
 
   $ mkdir dir1
   $ echo new > dir1/new
   $ hg ci -Amnew
   adding dir1/new
   $ hg diff --git -r 0
   diff --git a/dir1/new b/dir1/new
   new file mode 100644
   --- /dev/null
   +++ b/dir1/new
   @@ -0,0 +1,1 @@
   +new
 
 Copy:
 
   $ mkdir dir2
   $ hg cp dir1/new dir1/copy
   $ echo copy1 >> dir1/copy
   $ hg cp dir1/new dir2/copy
   $ echo copy2 >> dir2/copy
   $ hg ci -mcopy
   $ hg diff --git -r 1:tip
   diff --git a/dir1/new b/dir1/copy
   copy from dir1/new
   copy to dir1/copy
   --- a/dir1/new
   +++ b/dir1/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   diff --git a/dir1/new b/dir2/copy
   copy from dir1/new
   copy to dir2/copy
   --- a/dir1/new
   +++ b/dir2/copy
   @@ -1,1 +1,2 @@
    new
   +copy2
 
 Cross and same-directory copies with a relative root:
 
   $ hg diff --git --root .. -r 1:tip
   abort: .. not under root '$TESTTMP'
   [255]
   $ hg diff --git --root doesnotexist -r 1:tip
   $ hg diff --git --root . -r 1:tip
   diff --git a/dir1/new b/dir1/copy
   copy from dir1/new
   copy to dir1/copy
   --- a/dir1/new
   +++ b/dir1/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   diff --git a/dir1/new b/dir2/copy
   copy from dir1/new
   copy to dir2/copy
   --- a/dir1/new
   +++ b/dir2/copy
   @@ -1,1 +1,2 @@
    new
   +copy2
   $ hg diff --git --root dir1 -r 1:tip
   diff --git a/new b/copy
   copy from new
   copy to copy
   --- a/new
   +++ b/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
 
   $ hg diff --git --root dir2/ -r 1:tip
   diff --git a/copy b/copy
   new file mode 100644
   --- /dev/null
   +++ b/copy
   @@ -0,0 +1,2 @@
   +new
   +copy2
 
   $ hg diff --git --root dir1 -r 1:tip -I '**/copy'
   diff --git a/new b/copy
   copy from new
   copy to copy
   --- a/new
   +++ b/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
 
   $ hg diff --git --root dir1 -r 1:tip dir2
   warning: dir2 not inside relative root dir1
 
   $ hg diff --git --root dir1 -r 1:tip 'dir2/{copy}'
   warning: dir2/{copy} not inside relative root dir1
 
   $ cd dir1
   $ hg diff --git --root .. -r 1:tip
   diff --git a/dir1/new b/dir1/copy
   copy from dir1/new
   copy to dir1/copy
   --- a/dir1/new
   +++ b/dir1/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   diff --git a/dir1/new b/dir2/copy
   copy from dir1/new
   copy to dir2/copy
   --- a/dir1/new
   +++ b/dir2/copy
   @@ -1,1 +1,2 @@
    new
   +copy2
 
   $ hg diff --git --root ../.. -r 1:tip
   abort: ../.. not under root '$TESTTMP'
   [255]
   $ hg diff --git --root ../doesnotexist -r 1:tip
   $ hg diff --git --root .. -r 1:tip
   diff --git a/dir1/new b/dir1/copy
   copy from dir1/new
   copy to dir1/copy
   --- a/dir1/new
   +++ b/dir1/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   diff --git a/dir1/new b/dir2/copy
   copy from dir1/new
   copy to dir2/copy
   --- a/dir1/new
   +++ b/dir2/copy
   @@ -1,1 +1,2 @@
    new
   +copy2
 
   $ hg diff --git --root . -r 1:tip
   diff --git a/new b/copy
   copy from new
   copy to copy
   --- a/new
   +++ b/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   $ hg diff --git --root . -r 1:tip copy
   diff --git a/new b/copy
   copy from new
   copy to copy
   --- a/new
   +++ b/copy
   @@ -1,1 +1,2 @@
    new
   +copy1
   $ hg diff --git --root . -r 1:tip ../dir2
   warning: ../dir2 not inside relative root .
   $ hg diff --git --root . -r 1:tip '../dir2/*'
   warning: ../dir2/* not inside relative root . (glob)
   $ cd ..
 
 Rename:
 
   $ hg mv dir1/copy dir1/rename1
   $ echo rename1 >> dir1/rename1
   $ hg mv dir2/copy dir1/rename2
   $ echo rename2 >> dir1/rename2
   $ hg ci -mrename
   $ hg diff --git -r 2:tip
   diff --git a/dir1/copy b/dir1/rename1
   rename from dir1/copy
   rename to dir1/rename1
   --- a/dir1/copy
   +++ b/dir1/rename1
   @@ -1,2 +1,3 @@
    new
    copy1
   +rename1
   diff --git a/dir2/copy b/dir1/rename2
   rename from dir2/copy
   rename to dir1/rename2
   --- a/dir2/copy
   +++ b/dir1/rename2
   @@ -1,2 +1,3 @@
    new
    copy2
   +rename2
 
 Cross and same-directory renames with a relative root:
 
   $ hg diff --root dir1 --git -r 2:tip
   diff --git a/copy b/rename1
   rename from copy
   rename to rename1
   --- a/copy
   +++ b/rename1
   @@ -1,2 +1,3 @@
    new
    copy1
   +rename1
   diff --git a/rename2 b/rename2
   new file mode 100644
   --- /dev/null
   +++ b/rename2
   @@ -0,0 +1,3 @@
   +new
   +copy2
   +rename2
 
   $ hg diff --root dir2 --git -r 2:tip
   diff --git a/copy b/copy
   deleted file mode 100644
   --- a/copy
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -new
   -copy2
 
   $ hg diff --root dir1 --git -r 2:tip -I '**/copy'
   diff --git a/copy b/copy
   deleted file mode 100644
   --- a/copy
   +++ /dev/null
   @@ -1,2 +0,0 @@
   -new
   -copy1
 
   $ hg diff --root dir1 --git -r 2:tip -I '**/rename*'
   diff --git a/copy b/rename1
   copy from copy
   copy to rename1
   --- a/copy
   +++ b/rename1
   @@ -1,2 +1,3 @@
    new
    copy1
   +rename1
   diff --git a/rename2 b/rename2
   new file mode 100644
   --- /dev/null
   +++ b/rename2
   @@ -0,0 +1,3 @@
   +new
   +copy2
   +rename2
 
 Delete:
 
   $ hg rm dir1/*
   $ hg ci -mdelete
   $ hg diff --git -r 3:tip
   diff --git a/dir1/new b/dir1/new
   deleted file mode 100644
   --- a/dir1/new
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -new
   diff --git a/dir1/rename1 b/dir1/rename1
   deleted file mode 100644
   --- a/dir1/rename1
   +++ /dev/null
   @@ -1,3 +0,0 @@
   -new
   -copy1
   -rename1
   diff --git a/dir1/rename2 b/dir1/rename2
   deleted file mode 100644
   --- a/dir1/rename2
   +++ /dev/null
   @@ -1,3 +0,0 @@
   -new
   -copy2
   -rename2
 
   $ cat > src <<EOF
   > 1
   > 2
   > 3
   > 4
   > 5
   > EOF
   $ hg ci -Amsrc
   adding src
 
 #if execbit
 
 chmod 644:
 
   $ chmod +x src
   $ hg ci -munexec
   $ hg diff --git -r 5:tip
   diff --git a/src b/src
   old mode 100644
   new mode 100755
 
 Rename+mod+chmod:
 
   $ hg mv src dst
   $ chmod -x dst
   $ echo a >> dst
   $ hg ci -mrenamemod
   $ hg diff --git -r 6:tip
   diff --git a/src b/dst
   old mode 100755
   new mode 100644
   rename from src
   rename to dst
   --- a/src
   +++ b/dst
   @@ -3,3 +3,4 @@
    3
    4
    5
   +a
 
 Nonexistent in tip+chmod:
 
   $ hg diff --git -r 5:6
   diff --git a/src b/src
   old mode 100644
   new mode 100755
 
 #else
 
 Dummy changes when no exec bit, mocking the execbit commit structure
 
   $ echo change >> src
   $ hg ci -munexec
   $ hg mv src dst
   $ hg ci -mrenamemod
 
 #endif
 
 Binary diff:
 
   $ cp "$TESTDIR/binfile.bin" .
   $ hg add binfile.bin
   $ hg diff --git > b.diff
   $ cat b.diff
   diff --git a/binfile.bin b/binfile.bin
   new file mode 100644
-  index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9
+  index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9
   GIT binary patch
   literal 593
   zc$@)I0<QguP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
   z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd
   zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M
   z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT
   zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po
   ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<;
   zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V
   z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-
   zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U;
   z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K
   zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=
   fQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf{mKw4
   
 
 Import binary diff:
 
   $ hg revert binfile.bin
   $ rm binfile.bin
   $ hg import -mfoo b.diff
   applying b.diff
   $ cmp binfile.bin "$TESTDIR/binfile.bin"
 
 Rename binary file:
 
   $ hg mv binfile.bin renamed.bin
   $ hg diff --git
   diff --git a/binfile.bin b/renamed.bin
   rename from binfile.bin
   rename to renamed.bin
 
 Diff across many revisions:
 
   $ hg mv dst dst2
   $ hg ci -m 'mv dst dst2'
 
   $ echo >> start
   $ hg ci -m 'change start'
 
   $ hg revert -r -2 start
   $ hg mv dst2 dst3
   $ hg ci -m 'mv dst2 dst3; revert start'
 
   $ hg diff --git -r 9:11
   diff --git a/dst2 b/dst3
   rename from dst2
   rename to dst3
 
 Reversed:
 
   $ hg diff --git -r 11:9
   diff --git a/dst3 b/dst2
   rename from dst3
   rename to dst2
 
 
   $ echo a >> foo
   $ hg add foo
   $ hg ci -m 'add foo'
   $ echo b >> foo
   $ hg ci -m 'change foo'
   $ hg mv foo bar
   $ hg ci -m 'mv foo bar'
   $ echo c >> bar
   $ hg ci -m 'change bar'
 
 File created before r1 and renamed before r2:
 
   $ hg diff --git -r -3:-1
   diff --git a/foo b/bar
   rename from foo
   rename to bar
   --- a/foo
   +++ b/bar
   @@ -1,2 +1,3 @@
    a
    b
   +c
 
 Reversed:
 
   $ hg diff --git -r -1:-3
   diff --git a/bar b/foo
   rename from bar
   rename to foo
   --- a/bar
   +++ b/foo
   @@ -1,3 +1,2 @@
    a
    b
   -c
 
 File created in r1 and renamed before r2:
 
   $ hg diff --git -r -4:-1
   diff --git a/foo b/bar
   rename from foo
   rename to bar
   --- a/foo
   +++ b/bar
   @@ -1,1 +1,3 @@
    a
   +b
   +c
 
 Reversed:
 
   $ hg diff --git -r -1:-4
   diff --git a/bar b/foo
   rename from bar
   rename to foo
   --- a/bar
   +++ b/foo
   @@ -1,3 +1,1 @@
    a
   -b
   -c
 
 File created after r1 and renamed before r2:
 
   $ hg diff --git -r -5:-1
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,3 @@
   +a
   +b
   +c
 
 Reversed:
 
   $ hg diff --git -r -1:-5
   diff --git a/bar b/bar
   deleted file mode 100644
   --- a/bar
   +++ /dev/null
   @@ -1,3 +0,0 @@
   -a
   -b
   -c
 
 
 Comparing with the working dir:
 
   $ echo >> start
   $ hg ci -m 'change start again'
 
   $ echo > created
   $ hg add created
   $ hg ci -m 'add created'
 
   $ hg mv created created2
   $ hg ci -m 'mv created created2'
 
   $ hg mv created2 created3
 
 There's a copy in the working dir:
 
   $ hg diff --git
   diff --git a/created2 b/created3
   rename from created2
   rename to created3
 
 There's another copy between the original rev and the wd:
 
   $ hg diff --git -r -2
   diff --git a/created b/created3
   rename from created
   rename to created3
 
 The source of the copy was created after the original rev:
 
   $ hg diff --git -r -3
   diff --git a/created3 b/created3
   new file mode 100644
   --- /dev/null
   +++ b/created3
   @@ -0,0 +1,1 @@
   +
   $ hg ci -m 'mv created2 created3'
 
 
   $ echo > brand-new
   $ hg add brand-new
   $ hg ci -m 'add brand-new'
   $ hg mv brand-new brand-new2
 
 Created in parent of wd; renamed in the wd:
 
   $ hg diff --git
   diff --git a/brand-new b/brand-new2
   rename from brand-new
   rename to brand-new2
 
 Created between r1 and parent of wd; renamed in the wd:
 
   $ hg diff --git -r -2
   diff --git a/brand-new2 b/brand-new2
   new file mode 100644
   --- /dev/null
   +++ b/brand-new2
   @@ -0,0 +1,1 @@
   +
   $ hg ci -m 'mv brand-new brand-new2'
 
 One file is copied to many destinations and removed:
 
   $ hg cp brand-new2 brand-new3
   $ hg mv brand-new2 brand-new3-2
   $ hg ci -m 'multiple renames/copies'
   $ hg diff --git -r -2 -r -1
   diff --git a/brand-new2 b/brand-new3
   rename from brand-new2
   rename to brand-new3
   diff --git a/brand-new2 b/brand-new3-2
   copy from brand-new2
   copy to brand-new3-2
 
 Reversed:
 
   $ hg diff --git -r -1 -r -2
   diff --git a/brand-new3-2 b/brand-new2
   rename from brand-new3-2
   rename to brand-new2
   diff --git a/brand-new3 b/brand-new3
   deleted file mode 100644
   --- a/brand-new3
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -
 
 There should be a trailing TAB if there are spaces in the file name:
 
   $ echo foo > 'with spaces'
   $ hg add 'with spaces'
   $ hg diff --git
   diff --git a/with spaces b/with spaces
   new file mode 100644
   --- /dev/null
   +++ b/with spaces	
   @@ -0,0 +1,1 @@
   +foo
   $ hg ci -m 'add filename with spaces'
 
 Additions should be properly marked even in the middle of a merge
 
   $ hg up -r -2
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "New File" >> inmerge
   $ hg add inmerge
   $ hg ci -m "file in merge"
   created new head
   $ hg up 23
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg diff -g
   diff --git a/inmerge b/inmerge
   new file mode 100644
   --- /dev/null
   +++ b/inmerge
   @@ -0,0 +1,1 @@
   +New File

tests/test-log-linerange.t

@@ -1,1153 +1,1153 b''
   $ cat >> $HGRCPATH << EOF
   > [diff]
   > git = true
   > EOF
 
   $ hg init
   $ cat > foo << EOF
   > 0
   > 1
   > 2
   > 3
   > 4
   > EOF
   $ hg ci -Am init
   adding foo
   $ cat > foo << EOF
   > 0
   > 0
   > 0
   > 0
   > 1
   > 2
   > 3
   > 4
   > EOF
   $ hg ci -m 'more 0'
   $ sed 's/2/2+/' foo > foo.new
   $ mv foo.new foo
   $ cat > bar << EOF
   > a
   > b
   > c
   > d
   > e
   > EOF
   $ hg add bar
   $ hg ci -Am "2 -> 2+; added bar"
   $ cat >> foo << EOF
   > 5
   > 6
   > 7
   > 8
   > 9
   > 10
   > 11
   > EOF
   $ hg ci -m "to 11"
 
 Add some changes with two diff hunks
 
   $ sed 's/^1$/ 1/' foo > foo.new
   $ mv foo.new foo
   $ sed 's/^11$/11+/' foo > foo.new
   $ mv foo.new foo
   $ hg ci -m '11 -> 11+; leading space before "1"'
 (make sure there are two hunks in "foo")
   $ hg diff -c .
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11
   +11+
   $ sed 's/3/3+/' foo > foo.new
   $ mv foo.new foo
   $ sed 's/^11+$/11-/' foo > foo.new
   $ mv foo.new foo
   $ sed 's/a/a+/' bar > bar.new
   $ mv bar.new bar
   $ hg ci -m 'foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+'
 (make sure there are two hunks in "foo")
   $ hg diff -c . foo
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11+
   +11-
 
   $ hg log -f -L foo,5:7 -p
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
   $ hg log -f --graph -L foo,5:7 -p
   @  changeset:   5:cfdf972b3971
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   |
   |  diff --git a/foo b/foo
   |  --- a/foo
   |  +++ b/foo
   |  @@ -4,7 +4,7 @@
   |   0
   |    1
   |   2+
   |  -3
   |  +3+
   |   4
   |   5
   |   6
   |
   o  changeset:   4:eaec41c1a0c9
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     11 -> 11+; leading space before "1"
   :
   :  diff --git a/foo b/foo
   :  --- a/foo
   :  +++ b/foo
   :  @@ -2,7 +2,7 @@
   :   0
   :   0
   :   0
   :  -1
   :  + 1
   :   2+
   :   3
   :   4
   :
   o  changeset:   2:63a884426fd0
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     2 -> 2+; added bar
   :
   :  diff --git a/foo b/foo
   :  --- a/foo
   :  +++ b/foo
   :  @@ -3,6 +3,6 @@
   :   0
   :   0
   :   1
   :  -2
   :  +2+
   :   3
   :   4
   :
   o  changeset:   0:5ae1f82b9a00
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     init
   
      diff --git a/foo b/foo
      new file mode 100644
      --- /dev/null
      +++ b/foo
      @@ -0,0 +1,5 @@
      +0
      +1
      +2
      +3
      +4
   
 
 With --template.
 
   $ hg log -f -L foo,5:7 -T '{rev}:{node|short} {desc|firstline}\n'
   5:cfdf972b3971 foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   4:eaec41c1a0c9 11 -> 11+; leading space before "1"
   2:63a884426fd0 2 -> 2+; added bar
   0:5ae1f82b9a00 init
   $ hg log -f -L foo,5:7 -T json
   [
    {
     "bookmarks": [],
     "branch": "default",
     "date": [0, 0],
     "desc": "foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+",
     "node": "cfdf972b3971a2a59638bf9583c0debbffee5404",
     "parents": ["eaec41c1a0c9ad0a5e999611d0149d171beffb8c"],
     "phase": "draft",
     "rev": 5,
     "tags": ["tip"],
     "user": "test"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [0, 0],
     "desc": "11 -> 11+; leading space before \"1\"",
     "node": "eaec41c1a0c9ad0a5e999611d0149d171beffb8c",
     "parents": ["730a61fbaecf426c17c2c66bc42d195b5d5b0ba8"],
     "phase": "draft",
     "rev": 4,
     "tags": [],
     "user": "test"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [0, 0],
     "desc": "2 -> 2+; added bar",
     "node": "63a884426fd0b277fcd55895bbb2f230434576eb",
     "parents": ["29a1e7c6b80024f63f310a2d71de979e9d2996d7"],
     "phase": "draft",
     "rev": 2,
     "tags": [],
     "user": "test"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [0, 0],
     "desc": "init",
     "node": "5ae1f82b9a000ff1e0967d0dac1c58b9d796e1b4",
     "parents": ["0000000000000000000000000000000000000000"],
     "phase": "draft",
     "rev": 0,
     "tags": [],
     "user": "test"
    }
   ]
 
 With some white-space diff option, respective revisions are skipped.
 
   $ hg log -f -L foo,5:7 -p --config diff.ignorews=true
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Regular file patterns are not allowed.
 
   $ hg log -f -L foo,5:7 -p bar
   abort: FILE arguments are not compatible with --line-range option
   [10]
 
 Option --rev acts as a restriction.
 
   $ hg log -f -L foo,5:7 -p -r 'desc(2)'
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 With several -L patterns, changes touching any files in their respective line
 range are show.
 
   $ hg log -f -L foo,5:7 -L bar,1:2 -p
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/bar b/bar
   --- a/bar
   +++ b/bar
   @@ -1,4 +1,4 @@
   -a
   +a+
    b
    c
    d
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,5 @@
   +a
   +b
   +c
   +d
   +e
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Multiple -L options with the same file yields changes touching any of
 specified line ranges.
 
   $ hg log -f -L foo,5:7 -L foo,14:15 -p
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11+
   +11-
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11
   +11+
   
   changeset:   3:730a61fbaecf
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     to 11
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -6,3 +6,10 @@
    2+
    3
    4
   +5
   +6
   +7
   +8
   +9
   +10
   +11
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 A file with a comma in its name.
 
   $ cat > ba,z << EOF
   > q
   > w
   > e
   > r
   > t
   > y
   > EOF
   $ hg ci -Am 'querty'
   adding ba,z
   $ cat >> ba,z << EOF
   > u
   > i
   > o
   > p
   > EOF
   $ hg ci -m 'more keys'
   $ cat > ba,z << EOF
   > a
   > z
   > e
   > r
   > t
   > y
   > u
   > i
   > o
   > p
   > EOF
   $ hg ci -m 'azerty'
   $ hg log -f -L ba,z,1:2 -p
   changeset:   8:52373265138b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     azerty
   
   diff --git a/ba,z b/ba,z
   --- a/ba,z
   +++ b/ba,z
   @@ -1,5 +1,5 @@
   -q
   -w
   +a
   +z
    e
    r
    t
   
   changeset:   6:96ba8850f316
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     querty
   
   diff --git a/ba,z b/ba,z
   new file mode 100644
   --- /dev/null
   +++ b/ba,z
   @@ -0,0 +1,6 @@
   +q
   +w
   +e
   +r
   +t
   +y
   
 
 Exact prefix kinds work in -L options.
 
   $ mkdir dir
   $ cd dir
   $ hg log -f -L path:foo,5:7 -p
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Renames are followed.
 
   $ hg mv ../foo baz
   $ sed 's/1/1+/' baz > baz.new
   $ mv baz.new baz
   $ hg ci -m 'foo -> dir/baz; 1-1+'
   $ hg diff -c .
   diff --git a/foo b/dir/baz
   rename from foo
   rename to dir/baz
   --- a/foo
   +++ b/dir/baz
   @@ -2,7 +2,7 @@
    0
    0
    0
   - 1
   + 1+
    2+
    3+
    4
   @@ -11,5 +11,5 @@
    7
    8
    9
   -10
   -11-
   +1+0
   +1+1-
   $ hg log -f -L relpath:baz,5:7 -p
   changeset:   9:6af29c3a778f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo -> dir/baz; 1-1+
   
   diff --git a/foo b/dir/baz
   copy from foo
   copy to dir/baz
   --- a/foo
   +++ b/dir/baz
   @@ -2,7 +2,7 @@
    0
    0
    0
   - 1
   + 1+
    2+
    3+
    4
   
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Uncommitted changes with a rename
 
   $ hg mv baz bazn
   $ hg log -f -L bazn,5:7
   changeset:   9:6af29c3a778f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo -> dir/baz; 1-1+
   
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
 
 Uncommitted changes in requested line range
 
   $ sed 's/2/  /' bazn > bazn.new
   $ mv bazn.new bazn
   $ hg diff
   diff --git a/dir/baz b/dir/bazn
   rename from dir/baz
   rename to dir/bazn
   --- a/dir/baz
   +++ b/dir/bazn
   @@ -3,7 +3,7 @@
    0
    0
     1+
   -2+
   +  +
    3+
    4
    5
   $ hg log -f -L bazn,5:7
   changeset:   9:6af29c3a778f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo -> dir/baz; 1-1+
   
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
 
 Uncommitted changes in line-range + wdir()
 
   $ hg log -r 'wdir()' -f -L bazn,5:7 --limit 2 -p
   changeset:   2147483647:ffffffffffff
   parent:      9:6af29c3a778f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   
   diff --git a/dir/baz b/dir/bazn
   copy from dir/baz
   copy to dir/bazn
   --- a/dir/baz
   +++ b/dir/bazn
   @@ -3,7 +3,7 @@
    0
    0
     1+
   -2+
   +  +
    3+
    4
    5
   
   changeset:   9:6af29c3a778f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo -> dir/baz; 1-1+
   
   diff --git a/foo b/dir/baz
   copy from foo
   copy to dir/baz
   --- a/foo
   +++ b/dir/baz
   @@ -2,7 +2,7 @@
    0
    0
    0
   - 1
   + 1+
    2+
    3+
    4
   
 
   $ hg revert -a -C -q
 
 Copies.
 
   $ hg copy baz bbaz
   $ sed 's/6/6+/' bbaz > bbaz.new
   $ mv bbaz.new bbaz
   $ hg commit -m 'cp baz bbaz; 6-6+'
   $ hg diff -c .
   diff --git a/dir/baz b/dir/bbaz
   copy from dir/baz
   copy to dir/bbaz
   --- a/dir/baz
   +++ b/dir/bbaz
   @@ -7,7 +7,7 @@
    3+
    4
    5
   -6
   +6+
    7
    8
    9
   $ hg log --copies -f -L bbaz,10:11 -p
   changeset:   10:91a3d3b6c546
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     cp baz bbaz; 6-6+
   
   diff --git a/dir/baz b/dir/bbaz
   copy from dir/baz
   copy to dir/bbaz
   --- a/dir/baz
   +++ b/dir/bbaz
   @@ -7,7 +7,7 @@
    3+
    4
    5
   -6
   +6+
    7
    8
    9
   
   changeset:   3:730a61fbaecf
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     to 11
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -6,3 +6,10 @@
    2+
    3
    4
   +5
   +6
   +7
   +8
   +9
   +10
   +11
   
   $ hg log -f -L bbaz,10:11 -p
   changeset:   10:91a3d3b6c546
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     cp baz bbaz; 6-6+
   
   diff --git a/dir/baz b/dir/bbaz
   copy from dir/baz
   copy to dir/bbaz
   --- a/dir/baz
   +++ b/dir/bbaz
   @@ -7,7 +7,7 @@
    3+
    4
    5
   -6
   +6+
    7
    8
    9
   
   changeset:   3:730a61fbaecf
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     to 11
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -6,3 +6,10 @@
    2+
    3
    4
   +5
   +6
   +7
   +8
   +9
   +10
   +11
   
 
 Binary files work but without diff hunks filtering.
 (Checking w/ and w/o diff.git option.)
 
   >>> open('binary', 'wb').write(b'this\nis\na\nbinary\0') and None
   $ hg add binary
   $ hg ci -m 'add a binary file' --quiet
   $ hg log -f -L binary,1:2 -p
   changeset:   11:dc865b608edf
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a binary file
   
   diff --git a/dir/binary b/dir/binary
   new file mode 100644
-  index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c2e1fbed209fe919b3f189a6a31950e9adf61e45
+  index 0000000000000000000000000000000000000000..c2e1fbed209fe919b3f189a6a31950e9adf61e45
   GIT binary patch
   literal 17
   Wc$_QA$SmdpqC~Ew%)G>+N(KNlNClYy
   
   
   $ hg log -f -L binary,1:2 -p --config diff.git=false
   changeset:   11:dc865b608edf
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a binary file
   
   diff -r 91a3d3b6c546 -r dc865b608edf dir/binary
   Binary file dir/binary has changed
   
 
 Option --follow is required.
 
   $ hg log -L foo,5:7
   abort: --line-range requires --follow
   [10]
 
 Non-exact pattern kinds are not allowed.
 
   $ cd ..
   $ hg log -f -L glob:*a*,1:2
   hg: parse error: line range pattern 'glob:*a*' must match exactly one file
   [10]
 
 We get an error for removed files.
 
   $ hg rm dir/baz
   $ hg ci -m 'remove baz' --quiet
   $ hg log -f -L dir/baz,5:7 -p
   abort: cannot follow file not in parent revision: "dir/baz"
   [255]