[PATCH] patchbomb: respect diff settings
Martin Geisler
mg at daimi.au.dk
Sat Jan 24 11:52:59 CST 2009
# HG changeset patch
# User Martin Geisler <mg at daimi.au.dk>
# Date 1232819566 -3600
# Node ID 0ac41cd08e5d2c2b467f5d166dc8697a5276072f
# Parent 39ae4fb8cf17a0a12ac862d36471afd0fa453d85
patchbomb: respect diff settings
diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py
--- a/hgext/patchbomb.py
+++ b/hgext/patchbomb.py
@@ -63,7 +63,7 @@
import os, errno, socket, tempfile, cStringIO
import email.MIMEMultipart, email.MIMEBase
import email.Utils, email.Encoders, email.Generator
-from mercurial import cmdutil, commands, hg, mail, mdiff, patch, util
+from mercurial import cmdutil, commands, hg, mail, patch, util
from mercurial.i18n import _
from mercurial.node import bin
@@ -225,7 +225,7 @@
for r in cmdutil.revrange(repo, revs):
output = cStringIO.StringIO()
p = patch.export(repo, [r], fp=output,
- opts=mdiff.diffopts(git=opts.get('git')))
+ opts=patch.diffopts(ui, opts))
yield output.getvalue().split('\n')
def getbundle(dest):
More information about the Mercurial-devel
mailing list