This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12011

filemerge: remove unnecessary check for empty string
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1a84758b4fca: filemerge: remove unnecessary check for empty string
Summary

Looking at the statement just before, the string is clearly never
empty (or otherwise falsy).

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

martinvonz created this revision.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 4:34 AM
This revision is now accepted and ready to land.Jan 24 2022, 4:34 AM
martinvonz added a commit: rHG1a84758b4fca: filemerge: remove unnecessary check for empty string.Jan 24 2022, 12:29 PM
Closed by commit rHG1a84758b4fca: filemerge: remove unnecessary check for empty string (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (4 lines)

Diff 31824

mercurial/filemerge.py

if ctx.node() is None: if ctx.node() is None:
ctx = ctx.p1() ctx = ctx.p1()
props = {b'ctx': ctx} props = {b'ctx': ctx}
templateresult = template.renderdefault(props) templateresult = template.renderdefault(props)
label = (b'%s:' % label).ljust(pad + 1) label = (b'%s:' % label).ljust(pad + 1)
mark = b'%s %s' % (label, templateresult) mark = b'%s %s' % (label, templateresult)
if mark:
mark = mark.splitlines()[0] # split for safety mark = mark.splitlines()[0] # split for safety
# 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
return stringutil.ellipsis(mark, 80 - 8) return stringutil.ellipsis(mark, 80 - 8)
_defaultconflictlabels = [b'local', b'other'] _defaultconflictlabels = [b'local', b'other']