This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12441

crecord: avoid duplicating lines when reverting noeol->eol change
ClosedPublic

Authored by spectral on Apr 5 2022, 2:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG079197e94b24: crecord: avoid duplicating lines when reverting noeol->eol change
rHG1faac8c79bee: crecord: avoid duplicating lines when reverting noeol->eol change
rHG327a4022edae: crecord: avoid duplicating lines when reverting noeol->eol change
Summary

When reversing a patch that looks like this while using crecord:

@@ -301,4 +302,4 @@ zza
 zzb
 zzc
 zzd
-zze
\ No newline at end of file
+zze

we would previously reverse the -zze line to be an add, encounter the "no
newline" line and stop inspecting lines. This caused us to duplicate the line,
producing zzezze (still without a newline).

break is the correct action if we know there will be no lines afterwards, as
would be the case in an eol -> noeol transition. It is incorrect if there are
lines afterward, such as if both sides are missing the newline or if only the
lhs is missing the newline.

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.

Revision Contents
Changeset List

Diff 32817

mercurial/crecord.py

""" """
dels = [] dels = []
adds = [] adds = []
noeol = False noeol = False
for line in self.changedlines: for line in self.changedlines:
text = line.linetext text = line.linetext
if line.linetext == diffhelper.MISSING_NEWLINE_MARKER: if line.linetext == diffhelper.MISSING_NEWLINE_MARKER:
noeol = True noeol = True
break continue
if line.applied: if line.applied:
if text.startswith(b'+'): if text.startswith(b'+'):
dels.append(text[1:]) dels.append(text[1:])
elif text.startswith(b'-'): elif text.startswith(b'-'):
adds.append(text[1:]) adds.append(text[1:])
elif text.startswith(b'+'): elif text.startswith(b'+'):
dels.append(text[1:]) dels.append(text[1:])
adds.append(text[1:]) adds.append(text[1:])

tests/test-revert-interactive-curses.t

$ cat <<EOF >testModeCommands $ cat <<EOF >testModeCommands
> c > c
> EOF > EOF
$ do_revert $ do_revert
reverting a reverting a
$ cat a $ cat a
0 (wdir known-bad-output !)
0 (no-eol) 0 (no-eol)