##// END OF EJS Templates
hooklib: force an exception wrapped by errors.Abort to bytestr...
Matt Harbison -
r50760:5392bf25 default
parent child Browse files
Show More
@@ -32,7 +32,10 b' from mercurial import ('
32 pycompat,
32 pycompat,
33 registrar,
33 registrar,
34 )
34 )
35 from mercurial.utils import dateutil
35 from mercurial.utils import (
36 dateutil,
37 stringutil,
38 )
36 from .. import notify
39 from .. import notify
37
40
38 configtable = {}
41 configtable = {}
@@ -98,7 +101,7 b' def _report_commit(ui, repo, ctx):'
98 try:
101 try:
99 msg = mail.parsebytes(data)
102 msg = mail.parsebytes(data)
100 except emailerrors.MessageParseError as inst:
103 except emailerrors.MessageParseError as inst:
101 raise error.Abort(inst)
104 raise error.Abort(stringutil.forcebytestr(inst))
102
105
103 msg['In-reply-to'] = notify.messageid(ctx, domain, messageidseed)
106 msg['In-reply-to'] = notify.messageid(ctx, domain, messageidseed)
104 msg['Message-Id'] = notify.messageid(
107 msg['Message-Id'] = notify.messageid(
@@ -31,7 +31,10 b' from mercurial import ('
31 pycompat,
31 pycompat,
32 registrar,
32 registrar,
33 )
33 )
34 from mercurial.utils import dateutil
34 from mercurial.utils import (
35 dateutil,
36 stringutil,
37 )
35 from .. import notify
38 from .. import notify
36
39
37 configtable = {}
40 configtable = {}
@@ -97,7 +100,7 b' def _report_commit(ui, repo, ctx):'
97 try:
100 try:
98 msg = mail.parsebytes(data)
101 msg = mail.parsebytes(data)
99 except emailerrors.MessageParseError as inst:
102 except emailerrors.MessageParseError as inst:
100 raise error.Abort(inst)
103 raise error.Abort(stringutil.forcebytestr(inst))
101
104
102 msg['In-reply-to'] = notify.messageid(ctx, domain, messageidseed)
105 msg['In-reply-to'] = notify.messageid(ctx, domain, messageidseed)
103 msg['Message-Id'] = notify.messageid(
106 msg['Message-Id'] = notify.messageid(
General Comments 0
You need to be logged in to leave comments. Login now