This is an archive of the discontinued Mercurial Phabricator instance.

Differential D528

record: fix revert -i for lines without newline (issue5651)
ClosedPublic

Authored by quark on Aug 27 2017, 4:43 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG5707bfe04deb: record: fix revert -i for lines without newline (issue5651)
Summary

This is a regression caused by 66117dae87f9. Code prior to 66117dae87f9
seems to miss the "\ No newline at end of file" line.

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.Aug 27 2017, 4:43 PM
yuja accepted this revision.Aug 28 2017, 10:13 AM
yuja added a subscriber: yuja.

Queued for stable, thanks.

This seems correct since scanpatch() explicitly includes the \ No newline line
in hunk.

This revision is now accepted and ready to land.Aug 28 2017, 10:13 AM
Closed by commit rHG5707bfe04deb: record: fix revert -i for lines without newline (issue5651) (authored by quark). · Explain WhyAug 28 2017, 10:17 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (2 lines)
Mtests/test-revert-interactive.t (37 lines)

Diff 1350

mercurial/patch.py

def reversehunk(self): def reversehunk(self):
"""return another recordhunk which is the reverse of the hunk """return another recordhunk which is the reverse of the hunk
If this hunk is diff(A, B), the returned hunk is diff(B, A). To do If this hunk is diff(A, B), the returned hunk is diff(B, A). To do
that, swap fromline/toline and +/- signs while keep other things that, swap fromline/toline and +/- signs while keep other things
unchanged. unchanged.
""" """
m = {'+': '-', '-': '+'} m = {'+': '-', '-': '+', '\\': '\\'}
hunk = ['%s%s' % (m[l[0]], l[1:]) for l in self.hunk] hunk = ['%s%s' % (m[l[0]], l[1:]) for l in self.hunk]
return recordhunk(self.header, self.toline, self.fromline, self.proc, return recordhunk(self.header, self.toline, self.fromline, self.proc,
self.before, hunk, self.after) self.before, hunk, self.after)
def write(self, fp): def write(self, fp):
delta = len(self.before) + len(self.after) delta = len(self.before) + len(self.after)
if self.after and self.after[-1] == '\\ No newline at end of file\n': if self.after and self.after[-1] == '\\ No newline at end of file\n':
delta -= 1 delta -= 1

tests/test-revert-interactive.t

A newfile A newfile
$ hg revert -i <<EOF $ hg revert -i <<EOF
> y > y
> EOF > EOF
forgetting newfile forgetting newfile
forget added file newfile (Yn)? y forget added file newfile (Yn)? y
$ hg status $ hg status
? newfile ? newfile
When a line without EOL is selected during "revert -i" (issue5651)
$ cat <<EOF >> $HGRCPATH
> [experimental]
> %unset revertalternateinteractivemode
> EOF
$ hg init $TESTTMP/revert-i-eol
$ cd $TESTTMP/revert-i-eol
$ echo 0 > a
$ hg ci -qAm 0
$ printf 1 >> a
$ hg ci -qAm 1
$ cat a
0
1 (no-eol)
$ hg revert -ir'.^' <<EOF
> y
> y
> EOF
reverting a
diff --git a/a b/a
1 hunks, 1 lines changed
examine changes to 'a'? [Ynesfdaq?] y
@@ -1,1 +1,2 @@
0
+1
\ No newline at end of file
revert this change to 'a'? [Ynesfdaq?] y
$ cat a
0
$ cd ..