Mercurial > hg-stable
changeset 37875:03350f5234a4 stable
crecord: fix line number in hunk header (issue5917)
`@@ -1,1 +-1,0 @@` is not a valid patch hunk header.
Change it to `@@ -1,1 +0,0 @@`.
Differential Revision: https://phab.mercurial-scm.org/D3737
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Thu, 14 Jun 2018 14:04:26 -0700 |
| parents | 6caca2a7d37f |
| children | 2baf79933b45 |
| files | mercurial/crecord.py tests/test-commit-interactive-curses.t |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/crecord.py Wed Jun 13 10:41:20 2018 -0400 +++ b/mercurial/crecord.py Thu Jun 14 14:04:26 2018 -0700 @@ -398,7 +398,7 @@ if fromline != 0: if fromlen == 0: fromline -= 1 - if tolen == 0: + if tolen == 0 and toline > 0: toline -= 1 fromtoline = '@@ -%d,%d +%d,%d @@%s\n' % (
--- a/tests/test-commit-interactive-curses.t Wed Jun 13 10:41:20 2018 -0400 +++ b/tests/test-commit-interactive-curses.t Thu Jun 14 14:04:26 2018 -0700 @@ -214,6 +214,14 @@ @@ -0,0 +1,1 @@ +hello world +Make file empty + $ echo -n > x + $ cat <<EOF >testModeCommands + > X + > EOF + $ hg ci -i -m emptify -d "0 0" + $ hg update -C '.^' -q + Editing a hunk puts you back on that hunk when done editing (issue5041) To do that, we change two lines in a file, pretend to edit the second line, exit, toggle the line selected at the end of the edit and commit. @@ -236,7 +244,7 @@ > X > EOF $ printf "printf 'editor ran\n'; exit 0" > editor.sh - $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -m "edit hunk" -d "0 0" + $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -m "edit hunk" -d "0 0" -q editor ran $ hg cat -r . x foo