comparison contrib/patchbomb @ 876:14cfaaec2e8e

Get patchbomb script to not use MIME attachments.

Adding patches as attachments makes it difficult or impossible for some
mail clients to quote them effectively.

875:d3f836bf6cc1

        try: os.unlink(name)
        except: pass

def patchbomb(ui, repo, *revs, **opts):
    def prompt(prompt, default = None, rest = ': ', empty_ok = False):
        try:
            if default: prompt += ' [%s]' % default
            prompt += rest
            r = raw_input(prompt)
            if not r and not empty_ok: raise EOFError
            return r
        except EOFError:
            if default is None: raise
            return default

    def confirm(s):
        if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'):
            raise ValueError

                ui.write(summary, '\n')
                ui.write(s, '\n')
            confirm('Does the diffstat above look okay')
        return s

    def make_patch(patch, idx, total):
        desc = []
        node = None
        for line in patch:
            if line.startswith('#'):
                if line.startswith('# Node ID'): node = line.split()[-1]
                continue
            if line.startswith('diff -r'): break
            desc.append(line)
        if not node: raise ValueError
        msg = MIMEMultipart()
        msg['X-Mercurial-Node'] = node
        subj = '[PATCH %d of %d] %s' % (idx, total, desc[0].strip())
        if subj.endswith('.'): subj = subj[:-1]
        msg['Subject'] = subj
        body = '\n'.join(desc[1:]).strip() + '\n'
        summary = subj
        if body != '\n':
            msg.attach(MIMEText(body))
            summary += '\n\n' + body
        else:
            summary += '\n'
        d = cdiffstat(summary, patch)
        if d: msg.attach(MIMEText(d))
        p = MIMEText('\n'.join(patch), 'x-patch')
        p['Content-Disposition'] = commands.make_filename(repo, None,
                                                          'inline; filename=%b-%n.patch',
                                                          seqno = idx)
        msg.attach(p)
        return msg

    start_time = int(time.time())

    def make_msgid(id):
        return '<%s.%s@%s>' % (id[:20], start_time, socket.getfqdn())

    patches = []

    class exportee:
        def __init__(self, container):
            self.lines = []
            self.container = container

        def write(self, data):
            self.lines.append(data)

        def close(self):

    ui.write('This patch series consists of %d patches.\n\n' % len(patches))

    for p, i in zip(patches, range(len(patches))):
        jumbo.extend(p)
        msgs.append(make_patch(p, i + 1, len(patches)))

    ui.write('\nWrite the introductory message for the patch series.\n\n')

    sender = opts['sender'] or prompt('From', ui.username())

    d = cdiffstat('Final summary:\n', jumbo)
    if d: msg.attach(MIMEText(d))

    msgs.insert(0, msg)

    s = smtplib.SMTP()
    s.connect(host = ui.config('smtp', 'host', 'mail'),
              port = int(ui.config('smtp', 'port', 25)))

    refs = []
    parent = None
    tz = time.strftime('%z')
    for m in msgs:
        try:
            m['Message-Id'] = make_msgid(m['X-Mercurial-Node'])
        except TypeError:
            m['Message-Id'] = make_msgid('patchbomb')
        if parent:
            m['In-Reply-To'] = parent
        parent = m['Message-Id']
        if len(refs) > 1:
            m['References'] = ' '.join(refs[:-1])
        refs.append(parent)
        m['Date'] = time.strftime('%a, %m %b %Y %T ', time.localtime(start_time)) + tz
        start_time += 1
        m['From'] = sender
        m['To'] = ', '.join(to)
        if cc: m['Cc'] = ', '.join(cc)

            fp.write(m.as_string(0))
            fp.write('\n')
            fp.close()
        else:
            s.sendmail(sender, to + cc, m.as_string(0))
    s.close()

if __name__ == '__main__':
    optspec = [('c', 'cc', [], 'email addresses of copy recipients'),
               ('n', 'test', None, 'print messages that would be sent'),
               ('s', 'sender', '', 'email address of sender'),

876:14cfaaec2e8e

        try: os.unlink(name)
        except: pass

def patchbomb(ui, repo, *revs, **opts):
    def prompt(prompt, default = None, rest = ': ', empty_ok = False):
        if default: prompt += ' [%s]' % default
        prompt += rest
        while True:
            r = raw_input(prompt)
            if r: return r
            if default is not None: return default
            if empty_ok: return r
            print >> sys.stderr, 'Please enter a valid value.'

    def confirm(s):
        if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'):
            raise ValueError

                ui.write(summary, '\n')
                ui.write(s, '\n')
            confirm('Does the diffstat above look okay')
        return s

    def makepatch(patch, idx, total):
        desc = []
        node = None
        for line in patch:
            if line.startswith('#'):
                if line.startswith('# Node ID'): node = line.split()[-1]
                continue
            if line.startswith('diff -r'): break
            desc.append(line)
        if not node: raise ValueError
        body = ('\n'.join(desc[1:]).strip() or
                'Patch subject is complete summary.')
        body += '\n\n\n' + cdiffstat('\n'.join(desc), patch) + '\n\n'
        body += '\n'.join(patch)
        msg = MIMEText(body)
        subj = '[PATCH %d of %d] %s' % (idx, total, desc[0].strip())
        if subj.endswith('.'): subj = subj[:-1]
        msg['Subject'] = subj
        msg['X-Mercurial-Node'] = node
        return msg

    start_time = int(time.time())

    def genmsgid(id):
        return '<%s.%s@%s>' % (id[:20], start_time, socket.getfqdn())

    patches = []

    class exportee:
        def __init__(self, container):
            self.lines = []
            self.container = container
            self.name = 'email'

        def write(self, data):
            self.lines.append(data)

        def close(self):

    ui.write('This patch series consists of %d patches.\n\n' % len(patches))

    for p, i in zip(patches, range(len(patches))):
        jumbo.extend(p)
        msgs.append(makepatch(p, i + 1, len(patches)))

    ui.write('\nWrite the introductory message for the patch series.\n\n')

    sender = opts['sender'] or prompt('From', ui.username())

    d = cdiffstat('Final summary:\n', jumbo)
    if d: msg.attach(MIMEText(d))

    msgs.insert(0, msg)

    if not opts['test']:
        s = smtplib.SMTP()
        s.connect(host = ui.config('smtp', 'host', 'mail'),
                  port = int(ui.config('smtp', 'port', 25)))

    parent = None
    tz = time.strftime('%z')
    for m in msgs:
        try:
            m['Message-Id'] = genmsgid(m['X-Mercurial-Node'])
        except TypeError:
            m['Message-Id'] = genmsgid('patchbomb')
        if parent:
            m['In-Reply-To'] = parent
        else:
            parent = m['Message-Id']
        m['Date'] = time.strftime('%a, %m %b %Y %T ', time.localtime(start_time)) + tz
        start_time += 1
        m['From'] = sender
        m['To'] = ', '.join(to)
        if cc: m['Cc'] = ', '.join(cc)

            fp.write(m.as_string(0))
            fp.write('\n')
            fp.close()
        else:
            s.sendmail(sender, to + cc, m.as_string(0))
    if not opts['test']:
        s.close()

if __name__ == '__main__':
    optspec = [('c', 'cc', [], 'email addresses of copy recipients'),
               ('n', 'test', None, 'print messages that would be sent'),
               ('s', 'sender', '', 'email address of sender'),