Mercurial > hg-stable
changeset 14290:86e70956da4f
cmdutil: make_filename -> makefilename
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 10 May 2011 16:08:46 -0500 |
| parents | d68ddccf276b |
| children | 1a791993ce59 |
| files | hgext/patchbomb.py mercurial/cmdutil.py mercurial/commands.py |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/patchbomb.py Tue May 10 16:08:46 2011 -0500 +++ b/hgext/patchbomb.py Tue May 10 16:08:46 2011 -0500 @@ -119,10 +119,10 @@ if patchtags: patchname = patchtags[0] elif total > 1: - patchname = cmdutil.make_filename(repo, '%b-%n.patch', + patchname = cmdutil.makefilename(repo, '%b-%n.patch', binnode, seqno=idx, total=total) else: - patchname = cmdutil.make_filename(repo, '%b.patch', binnode) + patchname = cmdutil.makefilename(repo, '%b.patch', binnode) disposition = 'inline' if opts.get('attach'): disposition = 'attachment'
--- a/mercurial/cmdutil.py Tue May 10 16:08:46 2011 -0500 +++ b/mercurial/cmdutil.py Tue May 10 16:08:46 2011 -0500 @@ -189,7 +189,7 @@ return l -def make_filename(repo, pat, node, +def makefilename(repo, pat, node, total=None, seqno=None, revwidth=None, pathname=None): node_expander = { 'H': lambda: hex(node), @@ -246,7 +246,7 @@ return pat if hasattr(pat, 'read') and 'r' in mode: return pat - return open(make_filename(repo, pat, node, total, seqno, revwidth, + return open(makefilename(repo, pat, node, total, seqno, revwidth, pathname), mode)
--- a/mercurial/commands.py Tue May 10 16:08:46 2011 -0500 +++ b/mercurial/commands.py Tue May 10 16:08:46 2011 -0500 @@ -187,7 +187,7 @@ if not ctx: raise util.Abort(_('no working directory: please specify a revision')) node = ctx.node() - dest = cmdutil.make_filename(repo, dest, node) + dest = cmdutil.makefilename(repo, dest, node) if os.path.realpath(dest) == repo.root: raise util.Abort(_('repository root cannot be destination')) @@ -201,7 +201,7 @@ if not prefix: prefix = os.path.basename(repo.root) + '-%h' - prefix = cmdutil.make_filename(repo, prefix, node) + prefix = cmdutil.makefilename(repo, prefix, node) matchfn = cmdutil.match(repo, [], opts) archival.archive(repo, dest, node, kind, not opts.get('no_decode'), matchfn, prefix, subrepos=opts.get('subrepos'))