This is an archive of the discontinued Mercurial Phabricator instance.

Differential D376

filemerge: extract `_picklabels` as a helper function
ClosedPublic

Authored by phillco on Aug 14 2017, 2:15 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGaa6c290a77fa: filemerge: extract `_picklabels` as a helper function
Summary

This shortens simplemerge() and is a bit cleaner, IMO.

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

phillco created this revision.Aug 14 2017, 2:15 AM
Closed by commit rHGaa6c290a77fa: filemerge: extract `_picklabels` as a helper function (authored by phillco). · Explain WhyAug 15 2017, 5:32 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Aug 19 2017, 1:00 AM
martinvonz added inline comments.
mercurial/simplemerge.py
411–423
def _picklabels(defaults, overrides):
  if len(overrides) > 3:
        raise error.Abort(_("can only specify three labels."))
  result = defaults[:]
  for i, override in enumerate(overrides):
    result[i] = override
  return result

no?

phillco added inline comments.Aug 19 2017, 1:42 PM
mercurial/simplemerge.py
411–423

I think so, not sure why the original was so weird. I'll replace it.

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (36 lines)

Diff 958

mercurial/simplemerge.py

if util.binary(text): if util.binary(text):
msg = _("%s looks like a binary file.") % path msg = _("%s looks like a binary file.") % path
if not opts.get('quiet'): if not opts.get('quiet'):
ui.warn(_('warning: %s\n') % msg) ui.warn(_('warning: %s\n') % msg)
if not opts.get('text'): if not opts.get('text'):
raise error.Abort(msg) raise error.Abort(msg)
return text return text
def _picklabels(defaults, overrides):
name_a, name_b, name_base = defaults
if len(overrides) > 0:
name_a = overrides[0]
if len(overrides) > 1:
name_b = overrides[1]
if len(overrides) > 2:
name_base = overrides[2]
if len(overrides) > 3:
raise error.Abort(_("can only specify three labels."))
return [name_a, name_b, name_base]
martinvonzUnsubmitted
Not Done
def _picklabels(defaults, overrides):
  if len(overrides) > 3:
        raise error.Abort(_("can only specify three labels."))
  result = defaults[:]
  for i, override in enumerate(overrides):
    result[i] = override
  return result

no?

martinvonz: def _picklabels(defaults, overrides): if len(overrides) > 3: raise error.Abort…
phillcoAuthorUnsubmitted
Not Done

I think so, not sure why the original was so weird. I'll replace it.

phillco: I think so, not sure why the original was so weird. I'll replace it.
def simplemerge(ui, localfile, basefile, otherfile, def simplemerge(ui, localfile, basefile, otherfile,
localctx=None, basectx=None, otherctx=None, repo=None, **opts): localctx=None, basectx=None, otherctx=None, repo=None, **opts):
"""Performs the simplemerge algorithm. """Performs the simplemerge algorithm.
{local|base|other}ctx are optional. If passed, they (local/base/other) will {local|base|other}ctx are optional. If passed, they (local/base/other) will
be read from and the merge result written to (local). You should pass be read from and the merge result written to (local). You should pass
explicit labels in this mode since the default is to use the file paths.""" explicit labels in this mode since the default is to use the file paths."""
def readfile(filename): def readfile(filename):
def write(self, text): def write(self, text):
self.text += text self.text += text
def close(self): def close(self):
self.ctx.write(self.text, self.ctx.flags()) self.ctx.write(self.text, self.ctx.flags())
mode = opts.get('mode','merge') mode = opts.get('mode','merge')
if mode == 'union': name_a, name_b, name_base = None, None, None
name_a = None if mode != 'union':
name_b = None name_a, name_b, name_base = _picklabels([localfile,
name_base = None otherfile, None],
else: opts.get('label', []))
name_a = localfile
name_b = otherfile
name_base = None
labels = opts.get('label', [])
if len(labels) > 0:
name_a = labels[0]
if len(labels) > 1:
name_b = labels[1]
if len(labels) > 2:
name_base = labels[2]
if len(labels) > 3:
raise error.Abort(_("can only specify three labels."))
try: try:
localtext = readctx(localctx) if localctx else readfile(localfile) localtext = readctx(localctx) if localctx else readfile(localfile)
basetext = readctx(basectx) if basectx else readfile(basefile) basetext = readctx(basectx) if basectx else readfile(basefile)
othertext = readctx(otherctx) if otherctx else readfile(otherfile) othertext = readctx(otherctx) if otherctx else readfile(otherfile)
except error.Abort: except error.Abort:
return 1 return 1