Mercurial > hg > gitweb
changeset 3254:168485fa44ba
merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 04 Oct 2006 22:07:03 +0200 |
parents | 1e2941fda520 (diff) 7a0d70b69d74 (current diff) |
children | 03acd01520ac |
files | |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/patchbomb.py Wed Oct 04 14:09:26 2006 -0500 +++ b/hgext/patchbomb.py Wed Oct 04 22:07:03 2006 +0200 @@ -65,7 +65,7 @@ from mercurial.demandload import * demandload(globals(), '''email.MIMEMultipart email.MIMEText email.Utils - mercurial:commands,hg,mail,ui,patch + mercurial:cmdutil,commands,hg,mail,ui,patch os errno popen2 socket sys tempfile time''') from mercurial.i18n import gettext as _ from mercurial.node import * @@ -146,10 +146,10 @@ if patchname: patchname = patchname[0] elif total > 1: - patchname = commands.make_filename(repo, '%b-%n.patch', + patchname = cmdutil.make_filename(repo, '%b-%n.patch', binnode, idx, total) else: - patchname = commands.make_filename(repo, '%b.patch', binnode) + patchname = cmdutil.make_filename(repo, '%b.patch', binnode) p['Content-Disposition'] = 'inline; filename=' + patchname msg.attach(p) else: