This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1332

cmdutil: create dirs for templated cat file output
ClosedPublic

Authored by ryanmce on Nov 7 2017, 4:49 PM.

Details

Reviewers
mbthomas
yuja
Group Reviewers
hg-reviewers
Commits
rHG407ec7f3ff02: cmdutil: create dirs for templated cat file output
Summary

Previously, the caller was responsible for creating the directory structure of
files written out using a path template. This is onerous, especially if the
exact filenames are not known upfront, but are being accessed via a matcher.

This patch changes things so that hg will attempt to create the appropriate
directories before writing the output file.

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

ryanmce created this revision.Nov 7 2017, 4:49 PM
mbthomas accepted this revision.Nov 8 2017, 3:32 PM
yuja accepted this revision.Nov 9 2017, 8:33 AM
This revision is now accepted and ready to land.Nov 9 2017, 8:33 AM
Closed by commit rHG407ec7f3ff02: cmdutil: create dirs for templated cat file output (authored by ryanmce). · Explain WhyNov 9 2017, 9:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (5 lines)
Mtests/test-cat.t (5 lines)

Diff 3373

mercurial/cmdutil.py

def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts): def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
err = 1 err = 1
def write(path): def write(path):
filename = None filename = None
if fntemplate: if fntemplate:
filename = makefilename(repo, fntemplate, ctx.node(), filename = makefilename(repo, fntemplate, ctx.node(),
pathname=os.path.join(prefix, path)) pathname=os.path.join(prefix, path))
# attempt to create the directory if it does not already exist
try:
os.makedirs(os.path.dirname(filename))
except OSError:
pass
with formatter.maybereopen(basefm, filename, opts) as fm: with formatter.maybereopen(basefm, filename, opts) as fm:
data = ctx[path].data() data = ctx[path].data()
if opts.get('decode'): if opts.get('decode'):
data = repo.wwritedata(path, data) data = repo.wwritedata(path, data)
fm.startitem() fm.startitem()
fm.write('data', '%s', data) fm.write('data', '%s', data)
fm.data(abspath=path, path=matcher.rel(path)) fm.data(abspath=path, path=matcher.rel(path))

tests/test-cat.t

PATTERN -> t4 PATTERN -> t4
Test behavior of output when directory structure does not already exist Test behavior of output when directory structure does not already exist
$ mkdir foo $ mkdir foo
$ echo a > foo/a $ echo a > foo/a
$ hg add foo/a $ hg add foo/a
$ hg commit -qm "add foo/a" $ hg commit -qm "add foo/a"
$ mkdir output
$ hg cat --output "output/%p" foo/a $ hg cat --output "output/%p" foo/a
abort: No such file or directory: output/foo/a $ cat output/foo/a
[255] a