This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3737

crecord: fix line number in hunk header (issue5917)
ClosedPublic

Authored by quark on Jun 14 2018, 5:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG03350f5234a4: crecord: fix line number in hunk header (issue5917)
Summary

@@ -1,1 +-1,0 @@ is not a valid patch hunk header.
Change it to @@ -1,1 +0,0 @@.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Jun 14 2018, 5:37 PM
Closed by commit rHG03350f5234a4: crecord: fix line number in hunk header (issue5917) (authored by quark). · Explain WhyJun 14 2018, 6:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9066

mercurial/crecord.py

# precedes the hunk." # precedes the hunk."
# #
# so, if either of hunks is empty, decrease its line start. --immerrr # so, if either of hunks is empty, decrease its line start. --immerrr
# but only do this if fromline > 0, to avoid having, e.g fromline=-1. # but only do this if fromline > 0, to avoid having, e.g fromline=-1.
fromline, toline = self.fromline, self.toline fromline, toline = self.fromline, self.toline
if fromline != 0: if fromline != 0:
if fromlen == 0: if fromlen == 0:
fromline -= 1 fromline -= 1
if tolen == 0: if tolen == 0 and toline > 0:
toline -= 1 toline -= 1
fromtoline = '@@ -%d,%d +%d,%d @@%s\n' % ( fromtoline = '@@ -%d,%d +%d,%d @@%s\n' % (
fromline, fromlen, toline, tolen, fromline, fromlen, toline, tolen,
self.proc and (' ' + self.proc)) self.proc and (' ' + self.proc))
return fromtoline return fromtoline
def write(self, fp): def write(self, fp):

tests/test-commit-interactive-curses.t

saved backup bundle to $TESTTMP/a/.hg/strip-backup/2b0e9be4d336-3cf0bc8c-amend.hg saved backup bundle to $TESTTMP/a/.hg/strip-backup/2b0e9be4d336-3cf0bc8c-amend.hg
$ hg diff -c . $ hg diff -c .
diff -r a6735021574d -r c1d239d165ae x diff -r a6735021574d -r c1d239d165ae x
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x Thu Jan 01 00:00:00 1970 +0000 +++ b/x Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+hello world +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) 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, 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. exit, toggle the line selected at the end of the edit and commit.
The first line should be recorded if we were put on the second line at the end The first line should be recorded if we were put on the second line at the end
of the edit. of the edit.
$ hg update -C . $ hg update -C .
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "foo" > x $ echo "foo" > x
$ echo "hello world" >> x $ echo "hello world" >> x
$ echo "bar" >> x $ echo "bar" >> x
$ cat <<EOF >testModeCommands $ cat <<EOF >testModeCommands
> f > f
> KEY_DOWN > KEY_DOWN
> KEY_DOWN > KEY_DOWN
> KEY_DOWN > KEY_DOWN
> KEY_DOWN > KEY_DOWN
> e > e
> TOGGLE > TOGGLE
> X > X
> EOF > EOF
$ printf "printf 'editor ran\n'; exit 0" > editor.sh $ 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 editor ran
$ hg cat -r . x $ hg cat -r . x
foo foo
hello world hello world
Testing the review option. The entire final filtered patch should show Testing the review option. The entire final filtered patch should show
up in the editor and be editable. We will unselect the second file and up in the editor and be editable. We will unselect the second file and
the first hunk of the third file. During review, we will decide that the first hunk of the third file. During review, we will decide that