comparison hgext/patchbomb.py @ 39035:cecb05c371f7

patchbomb: don't unintentionally duplicate headers

This dict-like of headers is only mostly dict-like: if you set a key
that already exists, you it appends another value, rather than
replacing the one that was already present.

This fixes test-patchbomb-bookmark.t on Python 3.

Differential Revision: https://phab.mercurial-scm.org/D4229

39034:751caa6a2936

            m['Reply-To'] = ', '.join(replyto)
        # Fix up all headers to be native strings.
        # TODO(durin42): this should probably be cleaned up above in the future.
        if pycompat.ispy3:
            for hdr, val in list(m.items()):
                if isinstance(hdr, bytes):
                    del m[hdr]
                    hdr = pycompat.strurl(hdr)
                if isinstance(val, bytes):
                    val = pycompat.strurl(val)
                m[hdr] = val
        if opts.get('test'):
            ui.status(_('displaying '), subj, ' ...\n')
            ui.pager('email')
            generator = emailgen.Generator(_bytesgenerator(ui),
                                           mangle_from_=False)

39035:cecb05c371f7

            m['Reply-To'] = ', '.join(replyto)
        # Fix up all headers to be native strings.
        # TODO(durin42): this should probably be cleaned up above in the future.
        if pycompat.ispy3:
            for hdr, val in list(m.items()):
                change = False
                if isinstance(hdr, bytes):
                    del m[hdr]
                    hdr = pycompat.strurl(hdr)
                    change = True
                if isinstance(val, bytes):
                    val = pycompat.strurl(val)
                    if not change:
                        # prevent duplicate headers
                        del m[hdr]
                    change = True
                if change:
                    m[hdr] = val
        if opts.get('test'):
            ui.status(_('displaying '), subj, ' ...\n')
            ui.pager('email')
            generator = emailgen.Generator(_bytesgenerator(ui),
                                           mangle_from_=False)