# HG changeset patch # User Matt Mackall # Date 1305061726 18000 # Node ID 86e70956da4fbd2dbecfac3bb6c0fbb90d52d92a # Parent d68ddccf276b1750b4e0b99f4038bde410b81c55 cmdutil: make_filename -> makefilename diff -r d68ddccf276b -r 86e70956da4f hgext/patchbomb.py --- 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' diff -r d68ddccf276b -r 86e70956da4f mercurial/cmdutil.py --- 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) diff -r d68ddccf276b -r 86e70956da4f mercurial/commands.py --- 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'))