| hg-reviewers |
Using generators for feeding chunks into I/O is more flexible than
passing a file object or write function around.
This commit refactors the patch exporting code to emit a series a data
chunks instead of doing push-based I/O. As a side-effect, we could now
obtain the patch representation of a changeset without having to use
a file object. Yay!
Code around the management of the file handles has also been cleaned up
a bit.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (70 lines) |
| # facility to let extensions include additional data in an exported patch | # facility to let extensions include additional data in an exported patch | ||||
| # list of identifiers to be executed in order | # list of identifiers to be executed in order | ||||
| extraexport = [] | extraexport = [] | ||||
| # mapping from identifier to actual export function | # mapping from identifier to actual export function | ||||
| # function as to return a string to be added to the header or None | # function as to return a string to be added to the header or None | ||||
| # it is given two arguments (sequencenumber, changectx) | # it is given two arguments (sequencenumber, changectx) | ||||
| extraexportmap = {} | extraexportmap = {} | ||||
| def _exportsingle(repo, ctx, match, switch_parent, seqno, write, diffopts): | def _exportsingle(repo, ctx, match, switch_parent, seqno, diffopts): | ||||
| node = scmutil.binnode(ctx) | node = scmutil.binnode(ctx) | ||||
| parents = [p.node() for p in ctx.parents() if p] | parents = [p.node() for p in ctx.parents() if p] | ||||
| branch = ctx.branch() | branch = ctx.branch() | ||||
| if switch_parent: | if switch_parent: | ||||
| parents.reverse() | parents.reverse() | ||||
| if parents: | if parents: | ||||
| prev = parents[0] | prev = parents[0] | ||||
| else: | else: | ||||
| prev = nullid | prev = nullid | ||||
| write("# HG changeset patch\n") | yield "# HG changeset patch\n", None | ||||
| write("# User %s\n" % ctx.user()) | yield "# User %s\n" % ctx.user(), None | ||||
| write("# Date %d %d\n" % ctx.date()) | yield "# Date %d %d\n" % ctx.date(), None | ||||
| write("# %s\n" % dateutil.datestr(ctx.date())) | yield "# %s\n" % dateutil.datestr(ctx.date()), None | ||||
| if branch and branch != 'default': | if branch and branch != 'default': | ||||
| write("# Branch %s\n" % branch) | yield "# Branch %s\n" % branch, None | ||||
| write("# Node ID %s\n" % hex(node)) | yield "# Node ID %s\n" % hex(node), None | ||||
| write("# Parent %s\n" % hex(prev)) | yield "# Parent %s\n" % hex(prev), None | ||||
| if len(parents) > 1: | if len(parents) > 1: | ||||
| write("# Parent %s\n" % hex(parents[1])) | yield "# Parent %s\n" % hex(parents[1]), None | ||||
| for headerid in extraexport: | for headerid in extraexport: | ||||
| header = extraexportmap[headerid](seqno, ctx) | header = extraexportmap[headerid](seqno, ctx) | ||||
| if header is not None: | if header is not None: | ||||
| write('# %s\n' % header) | yield '# %s\n' % header, None | ||||
| write(ctx.description().rstrip()) | yield ctx.description().rstrip(), None | ||||
| write("\n\n") | yield "\n\n", None | ||||
| for chunk, label in patch.diffui(repo, prev, node, match, opts=diffopts): | for chunk, label in patch.diffui(repo, prev, node, match, opts=diffopts): | ||||
| write(chunk, label=label) | yield chunk, label | ||||
| def export(repo, revs, fntemplate='hg-%h.patch', fp=None, switch_parent=False, | def export(repo, revs, fntemplate='hg-%h.patch', fp=None, switch_parent=False, | ||||
| opts=None, match=None): | opts=None, match=None): | ||||
| '''export changesets as hg patches | '''export changesets as hg patches | ||||
| Args: | Args: | ||||
| repo: The repository from which we're exporting revisions. | repo: The repository from which we're exporting revisions. | ||||
| revs: A list of revisions to export as revision numbers. | revs: A list of revisions to export as revision numbers. | ||||
| the given template. | the given template. | ||||
| Neither fp nor template specified: All revs written to repo.ui.write() | Neither fp nor template specified: All revs written to repo.ui.write() | ||||
| ''' | ''' | ||||
| total = len(revs) | total = len(revs) | ||||
| revwidth = max(len(str(rev)) for rev in revs) | revwidth = max(len(str(rev)) for rev in revs) | ||||
| filemode = {} | filemode = {} | ||||
| write = None | |||||
| dest = '<unnamed>' | dest = '<unnamed>' | ||||
| if fp: | if fp: | ||||
| allfp = fp | |||||
| dest = getattr(fp, 'name', dest) | dest = getattr(fp, 'name', dest) | ||||
| def write(s, **kw): | supportslabel = False | ||||
| fp.write(s) | |||||
| elif not fntemplate: | elif not fntemplate: | ||||
| write = repo.ui.write | allfp = repo.ui | ||||
| supportslabel = True | |||||
| else: | |||||
| allfp = None | |||||
| supportslabel = False | |||||
| def doexport(ctx, fp, dest): | |||||
| if not dest.startswith('<'): | |||||
| repo.ui.note('%s\n' % dest) | |||||
| for s, label in _exportsingle(repo, ctx, match, switch_parent, seqno, | |||||
| opts): | |||||
| if supportslabel and label: | |||||
| fp.write(s, label=label) | |||||
| else: | |||||
| fp.write(s) | |||||
| for seqno, rev in enumerate(revs, 1): | for seqno, rev in enumerate(revs, 1): | ||||
| ctx = repo[rev] | ctx = repo[rev] | ||||
| fo = None | |||||
| if not fp and fntemplate: | if not allfp: | ||||
| fo = makefileobj(ctx, fntemplate, mode='wb', modemap=filemode, | assert fntemplate | ||||
| total=total, seqno=seqno, revwidth=revwidth) | |||||
| dest = fo.name | with makefileobj(ctx, fntemplate, mode='wb', modemap=filemode, | ||||
| def write(s, **kw): | total=total, seqno=seqno, revwidth=revwidth) as fp: | ||||
| fo.write(s) | doexport(ctx, fp, fp.name) | ||||
| if not dest.startswith('<'): | else: | ||||
| repo.ui.note("%s\n" % dest) | doexport(ctx, allfp, dest) | ||||
| _exportsingle( | |||||
| repo, ctx, match, switch_parent, seqno, write, opts) | |||||
| if fo is not None: | |||||
| fo.close() | |||||
| def showmarker(fm, marker, index=None): | def showmarker(fm, marker, index=None): | ||||
| """utility function to display obsolescence marker in a readable way | """utility function to display obsolescence marker in a readable way | ||||
| To be used by debug function.""" | To be used by debug function.""" | ||||
| if index is not None: | if index is not None: | ||||
| fm.write('index', '%i ', index) | fm.write('index', '%i ', index) | ||||
| fm.write('prednode', '%s ', hex(marker.prednode())) | fm.write('prednode', '%s ', hex(marker.prednode())) | ||||