This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5743

patch: handle 0 context lines (diff.unified=0) when parsing patches
ClosedPublic

Authored by spectral on Jan 29 2019, 9:31 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd1d3094b54f9: patch: handle 0 context lines (diff.unified=0) when parsing patches
Summary

Previously, if there were no context lines, we would just keep updating the
ranges and the hunk, but not actually storing the hunk (just overwriting it each
time). Thus a diff like this:

$ hg diff --config diff.unified=0
diff --git a/bar b/bar
--- a/bar
+++ b/bar
@@ -1,0 +2,1 @@ 1
+change1
@@ -3,0 +5,1 @@ 3
+change2

would come out of the parser like this (change1 is lost):

bar:
@@ -3,0 +5,1 @@ 3
+change2

This had some really weird side effects for things like commit --interactive,
split, etc.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (3 lines)
Mtests/test-commit-interactive.t (35 lines)
Mtests/test-split.t (46 lines)

Diff 14078

mercurial/patch.py

self.proc = '' self.proc = ''
self.header = None self.header = None
self.context = [] self.context = []
self.before = [] self.before = []
self.hunk = [] self.hunk = []
self.headers = [] self.headers = []
def addrange(self, limits): def addrange(self, limits):
self.addcontext([])
fromstart, fromend, tostart, toend, proc = limits fromstart, fromend, tostart, toend, proc = limits
self.fromline = int(fromstart) self.fromline = int(fromstart)
self.toline = int(tostart) self.toline = int(tostart)
self.proc = proc self.proc = proc
def addcontext(self, context): def addcontext(self, context):
if self.hunk: if self.hunk:
h = recordhunk(self.header, self.fromline, self.toline, h = recordhunk(self.header, self.fromline, self.toline,
self.proc, self.before, self.hunk, context, maxcontext) self.proc, self.before, self.hunk, context, maxcontext)
self.header.hunks.append(h) self.header.hunks.append(h)
self.fromline += len(self.before) + h.removed self.fromline += len(self.before) + h.removed
self.toline += len(self.before) + h.added self.toline += len(self.before) + h.added
self.before = [] self.before = []
self.hunk = [] self.hunk = []
self.context = context self.context = context
def addhunk(self, hunk): def addhunk(self, hunk):
if self.context: if self.context:
self.before = self.context self.before = self.context
self.context = [] self.context = []
if self.hunk:
self.addcontext([])
self.hunk = hunk self.hunk = hunk
def newfile(self, hdr): def newfile(self, hdr):
self.addcontext([]) self.addcontext([])
h = header(hdr) h = header(hdr)
self.headers.append(h) self.headers.append(h)
self.header = h self.header = h

tests/test-commit-interactive.t

> [extensions] > [extensions]
> fakepatchtime = ! > fakepatchtime = !
> EOF > EOF
$ hg debugstate | grep ' subdir/f1$' $ hg debugstate | grep ' subdir/f1$'
n 0 -1 unset subdir/f1 n 0 -1 unset subdir/f1
$ hg status -A subdir/f1 $ hg status -A subdir/f1
M subdir/f1 M subdir/f1
Test diff.unified=0
$ hg init $TESTTMP/b
$ cd $TESTTMP/b
$ cat > foo <<EOF
> 1
> 2
> 3
> 4
> 5
> EOF
$ hg ci -qAm initial
$ cat > foo <<EOF
> 1
> change1
> 2
> 3
> change2
> 4
> 5
> EOF
$ printf 'y\ny\ny\n' | hg ci -im initial --config diff.unified=0
diff --git a/foo b/foo
2 hunks, 2 lines changed
examine changes to 'foo'? [Ynesfdaq?] y
@@ -1,0 +2,1 @@ 1
+change1
record change 1/2 to 'foo'? [Ynesfdaq?] y
@@ -3,0 +5,1 @@ 3
+change2
record change 2/2 to 'foo'? [Ynesfdaq?] y

tests/test-split.t

Split a head Split a head
$ hg bookmark r3 $ hg bookmark r3
$ hg split 'all()' $ hg split 'all()'
abort: cannot split multiple revisions abort: cannot split multiple revisions
[255] [255]
This function splits a bit strangely primarily to avoid changing the behavior of
the test after a bug was fixed with how split/commit --interactive handled
`diff.unified=0`: when there were no context lines, it kept only the last diff
hunk. When running split, this meant that runsplit was always recording three commits,
one for each diff hunk, in reverse order (the base commit was the last diff hunk
in the file).
$ runsplit() { $ runsplit() {
> cat > $TESTTMP/messages <<EOF > cat > $TESTTMP/messages <<EOF
> split 1 > split 1
> -- > --
> split 2 > split 2
> -- > --
> split 3 > split 3
> EOF > EOF
> cat <<EOF | hg split "$@" > cat <<EOF | hg split "$@"
> y > y
> n
> n
> y > y
> y > y
> n
> y > y
> y > y
> y > y
> EOF > EOF
> } > }
$ HGEDITOR=false runsplit $ HGEDITOR=false runsplit
diff --git a/a b/a diff --git a/a b/a
1 hunks, 1 lines changed 3 hunks, 3 lines changed
examine changes to 'a'? [Ynesfdaq?] y examine changes to 'a'? [Ynesfdaq?] y
@@ -1,1 +1,1 @@
-1
+11
record change 1/3 to 'a'? [Ynesfdaq?] n
@@ -3,1 +3,1 @@ 2
-3
+33
record change 2/3 to 'a'? [Ynesfdaq?] n
@@ -5,1 +5,1 @@ 4 @@ -5,1 +5,1 @@ 4
-5 -5
+55 +55
record this change to 'a'? [Ynesfdaq?] y record change 3/3 to 'a'? [Ynesfdaq?] y
transaction abort! transaction abort!
rollback completed rollback completed
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [255]
$ hg status $ hg status
$ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py" $ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py"
$ runsplit $ runsplit
diff --git a/a b/a diff --git a/a b/a
1 hunks, 1 lines changed 3 hunks, 3 lines changed
examine changes to 'a'? [Ynesfdaq?] y examine changes to 'a'? [Ynesfdaq?] y
@@ -1,1 +1,1 @@
-1
+11
record change 1/3 to 'a'? [Ynesfdaq?] n
@@ -3,1 +3,1 @@ 2
-3
+33
record change 2/3 to 'a'? [Ynesfdaq?] n
@@ -5,1 +5,1 @@ 4 @@ -5,1 +5,1 @@ 4
-5 -5
+55 +55
record this change to 'a'? [Ynesfdaq?] y record change 3/3 to 'a'? [Ynesfdaq?] y
EDITOR: HG: Splitting 1df0d5c5a3ab. Write commit message for the first split changeset. EDITOR: HG: Splitting 1df0d5c5a3ab. Write commit message for the first split changeset.
EDITOR: a2 EDITOR: a2
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit. EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: -- EDITOR: HG: --
EDITOR: HG: user: test EDITOR: HG: user: test
EDITOR: HG: branch 'default' EDITOR: HG: branch 'default'
EDITOR: HG: changed a EDITOR: HG: changed a
created new head created new head
diff --git a/a b/a diff --git a/a b/a
1 hunks, 1 lines changed 2 hunks, 2 lines changed
examine changes to 'a'? [Ynesfdaq?] y examine changes to 'a'? [Ynesfdaq?] y
@@ -1,1 +1,1 @@
-1
+11
record change 1/2 to 'a'? [Ynesfdaq?] n
@@ -3,1 +3,1 @@ 2 @@ -3,1 +3,1 @@ 2
-3 -3
+33 +33
record this change to 'a'? [Ynesfdaq?] y record change 2/2 to 'a'? [Ynesfdaq?] y
EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into: EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
EDITOR: HG: - e704349bd21b: split 1 EDITOR: HG: - e704349bd21b: split 1
EDITOR: HG: Write commit message for the next split changeset. EDITOR: HG: Write commit message for the next split changeset.
EDITOR: a2 EDITOR: a2
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.