# HG changeset patch # User Augie Fackler # Date 1419286373 18000 # Node ID c7a9cd793e37beb959889dd8040c4cf8ab357c7d # Parent b9fd69a36e0ce493f8412c9e84cf4776ef137bdd patchpipe: handle base64-encoded message bodies It looks like the new version of mailman on selenic now base64s message bodies, so detect that and unpack the base64'd body. diff --git a/unixSoft/bin/patchpipe b/unixSoft/bin/patchpipe --- a/unixSoft/bin/patchpipe +++ b/unixSoft/bin/patchpipe @@ -1,4 +1,5 @@ #!/usr/bin/env python +import base64 import os import subprocess import sys @@ -6,6 +7,8 @@ import tempfile _PATCHHDR = '# HG changeset patch' +_BASE64_MAGIC = 'Content-Transfer-Encoding: base64' + def main(argv): tf = tempfile.NamedTemporaryFile(suffix='.diff') @@ -13,6 +16,9 @@ def main(argv): if _PATCHHDR in d: junk, d = d.split(_PATCHHDR, 1) d = _PATCHHDR + d + elif _BASE64_MAGIC in d: + junk, d = d.split('\n\n', 1) + d = d.decode('base64') tf.write(d) tf.flush() subprocess.check_call([os.environ['EDITOR'], tf.name],