This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10079

patch: fix a formatting issue
ClosedPublic

Authored by khanchi97 on Feb 26 2021, 6:06 AM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa9887f9e87aa: patch: fix a formatting issue

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

khanchi97 created this revision.Feb 26 2021, 6:06 AM
SimonSapin accepted this revision.Feb 26 2021, 6:12 AM
SimonSapin added a subscriber: SimonSapin.

Looks good. This matches what CI is complaining about for the stable branch:

https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170521

pulkit accepted this revision.Mar 2 2021, 8:03 AM
This revision is now accepted and ready to land.Mar 2 2021, 8:03 AM
khanchi97 added a commit: rHGa9887f9e87aa: patch: fix a formatting issue.Mar 2 2021, 8:11 AM
Closed by commit rHGa9887f9e87aa: patch: fix a formatting issue (authored by khanchi97). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (4 lines)

Diff 26019

mercurial/patch.py

ctx1, fctx1, path1, flag1, content1, date1 = data1 ctx1, fctx1, path1, flag1, content1, date1 = data1
ctx2, fctx2, path2, flag2, content2, date2 = data2 ctx2, fctx2, path2, flag2, content2, date2 = data2
index1 = _gitindex(content1) if path1 in ctx1 else nullhex index1 = _gitindex(content1) if path1 in ctx1 else nullhex
index2 = _gitindex(content2) if path2 in ctx2 else nullhex index2 = _gitindex(content2) if path2 in ctx2 else nullhex
if binary and opts.git and not opts.nobinary: if binary and opts.git and not opts.nobinary:
text = mdiff.b85diff(content1, content2) text = mdiff.b85diff(content1, content2)
if text: if text:
header.append( header.append(b'index %s..%s' % (index1, index2))
b'index %s..%s' % (index1, index2)
)
hunks = ((None, [text]),) hunks = ((None, [text]),)
else: else:
if opts.git and opts.index > 0: if opts.git and opts.index > 0:
flag = flag1 flag = flag1
if flag is None: if flag is None:
flag = flag2 flag = flag2
header.append( header.append(
b'index %s..%s %s' b'index %s..%s %s'