[PATCH 1 of 2] cat: factor out a function that populates the formatter
Matt Harbison
mharbison72 at gmail.com
Wed Jan 17 02:29:26 UTC 2018
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1516150560 18000
# Tue Jan 16 19:56:00 2018 -0500
# Node ID ac8052ec552b36d4bee5bc24bc92fcee36d843cb
# Parent 821d8a5ab4ff890a7732c2e4cdcc7f32191e5942
cat: factor out a function that populates the formatter
This will allow extensions to add data to the templater.
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2962,6 +2962,18 @@
return ret
+def _updatecatformatter(fm, ctx, matcher, path, decode):
+ """Hook for adding data to the formatter used by ``hg cat``.
+
+ Extensions (e.g., lfs) can wrap this to inject keywords/data, but must call
+ this method first."""
+ data = ctx[path].data()
+ if decode:
+ data = ctx.repo().wwritedata(path, data)
+ fm.startitem()
+ fm.write('data', '%s', data)
+ fm.data(abspath=path, path=matcher.rel(path))
+
def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
err = 1
opts = pycompat.byteskwargs(opts)
@@ -2977,12 +2989,7 @@
except OSError:
pass
with formatter.maybereopen(basefm, filename, opts) as fm:
- data = ctx[path].data()
- if opts.get('decode'):
- data = repo.wwritedata(path, data)
- fm.startitem()
- fm.write('data', '%s', data)
- fm.data(abspath=path, path=matcher.rel(path))
+ _updatecatformatter(fm, ctx, matcher, path, opts.get('decode'))
# Automation often uses hg cat on single files, so special case it
# for performance to avoid the cost of parsing the manifest.
More information about the Mercurial-devel
mailing list