| hg-reviewers |
Almost fixes test-keyword.t on Python 3, but leaves us with some
extremely confusing failures at the end of the test that seem related
to the command server?
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| import email.errors as emailerrors | import email.errors as emailerrors | ||||
| import email.parser as emailparser | import email.parser as emailparser | ||||
| import fnmatch | import fnmatch | ||||
| import socket | import socket | ||||
| import time | import time | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial import ( | from mercurial import ( | ||||
| encoding, | |||||
| error, | error, | ||||
| logcmdutil, | logcmdutil, | ||||
| mail, | mail, | ||||
| patch, | patch, | ||||
| registrar, | registrar, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from mercurial.utils import ( | from mercurial.utils import ( | ||||
| continue | continue | ||||
| if len(subs) == 0: | if len(subs) == 0: | ||||
| self.ui.debug('notify: no subscribers to selected repo ' | self.ui.debug('notify: no subscribers to selected repo ' | ||||
| 'and revset\n') | 'and revset\n') | ||||
| return | return | ||||
| p = emailparser.Parser() | p = emailparser.Parser() | ||||
| try: | try: | ||||
| msg = p.parsestr(data) | msg = p.parsestr(encoding.strfromlocal(data)) | ||||
| except emailerrors.MessageParseError as inst: | except emailerrors.MessageParseError as inst: | ||||
| raise error.Abort(inst) | raise error.Abort(inst) | ||||
| # store sender and subject | # store sender and subject | ||||
| sender, subject = msg['From'], msg['Subject'] | sender = encoding.strtolocal(msg[r'From']) | ||||
| del msg['From'], msg['Subject'] | subject = encoding.strtolocal(msg[r'Subject']) | ||||
| del msg[r'From'], msg[r'Subject'] | |||||
| if not msg.is_multipart(): | if not msg.is_multipart(): | ||||
| # create fresh mime message from scratch | # create fresh mime message from scratch | ||||
| # (multipart templates must take care of this themselves) | # (multipart templates must take care of this themselves) | ||||
| headers = msg.items() | headers = msg.items() | ||||
| payload = msg.get_payload() | payload = msg.get_payload() | ||||
| # for notification prefer readability over data precision | # for notification prefer readability over data precision | ||||
| msg = mail.mimeencode(self.ui, payload, self.charsets, self.test) | msg = mail.mimeencode(self.ui, payload, self.charsets, self.test) | ||||
| # reinstate custom headers | # reinstate custom headers | ||||
| for k, v in headers: | for k, v in headers: | ||||
| msg[k] = v | msg[k] = v | ||||
| msg['Date'] = dateutil.datestr(format="%a, %d %b %Y %H:%M:%S %1%2") | msg[r'Date'] = encoding.strfromlocal( | ||||
| dateutil.datestr(format="%a, %d %b %Y %H:%M:%S %1%2")) | |||||
| # try to make subject line exist and be useful | # try to make subject line exist and be useful | ||||
| if not subject: | if not subject: | ||||
| if count > 1: | if count > 1: | ||||
| subject = _('%s: %d new changesets') % (self.root, count) | subject = _('%s: %d new changesets') % (self.root, count) | ||||
| else: | else: | ||||
| s = ctx.description().lstrip().split('\n', 1)[0].rstrip() | s = ctx.description().lstrip().split('\n', 1)[0].rstrip() | ||||
| subject = '%s: %s' % (self.root, s) | subject = '%s: %s' % (self.root, s) | ||||
| maxsubject = int(self.ui.config('notify', 'maxsubject')) | maxsubject = int(self.ui.config('notify', 'maxsubject')) | ||||
| if maxsubject: | if maxsubject: | ||||
| subject = stringutil.ellipsis(subject, maxsubject) | subject = stringutil.ellipsis(subject, maxsubject) | ||||
| msg['Subject'] = mail.headencode(self.ui, subject, | msg[r'Subject'] = encoding.strfromlocal( | ||||
| self.charsets, self.test) | mail.headencode(self.ui, subject, self.charsets, self.test)) | ||||
| # try to make message have proper sender | # try to make message have proper sender | ||||
| if not sender: | if not sender: | ||||
| sender = self.ui.config('email', 'from') or self.ui.username() | sender = self.ui.config('email', 'from') or self.ui.username() | ||||
| if '@' not in sender or '@localhost' in sender: | if '@' not in sender or '@localhost' in sender: | ||||
| sender = self.fixmail(sender) | sender = self.fixmail(sender) | ||||
| msg['From'] = mail.addressencode(self.ui, sender, | msg[r'From'] = encoding.strfromlocal( | ||||
| self.charsets, self.test) | mail.addressencode(self.ui, sender, self.charsets, self.test)) | ||||
| msg['X-Hg-Notification'] = 'changeset %s' % ctx | msg[r'X-Hg-Notification'] = r'changeset %s' % ctx | ||||
| if not msg['Message-Id']: | if not msg[r'Message-Id']: | ||||
| msg['Message-Id'] = ('<hg.%s.%s.%s@%s>' % | msg[r'Message-Id'] = encoding.strfromlocal( | ||||
| (ctx, int(time.time()), | '<hg.%s.%d.%d@%s>' % (ctx, int(time.time()), | ||||
| hash(self.repo.root), socket.getfqdn())) | hash(self.repo.root), | ||||
| msg['To'] = ', '.join(sorted(subs)) | encoding.strtolocal(socket.getfqdn()))) | ||||
| msg[r'To'] = encoding.strfromlocal(', '.join(sorted(subs))) | |||||
| msgtext = msg.as_string() | msgtext = encoding.strtolocal(msg.as_string()) | ||||
| if self.test: | if self.test: | ||||
| self.ui.write(msgtext) | self.ui.write(msgtext) | ||||
| if not msgtext.endswith('\n'): | if not msgtext.endswith('\n'): | ||||
| self.ui.write('\n') | self.ui.write('\n') | ||||
| else: | else: | ||||
| self.ui.status(_('notify: sending %d subscribers %d changes\n') % | self.ui.status(_('notify: sending %d subscribers %d changes\n') % | ||||
| (len(subs), count)) | (len(subs), count)) | ||||
| mail.sendmail(self.ui, stringutil.email(msg['From']), | mail.sendmail(self.ui, stringutil.email(msg[r'From']), | ||||
| subs, msgtext, mbox=self.mbox) | subs, msgtext, mbox=self.mbox) | ||||
| def diff(self, ctx, ref=None): | def diff(self, ctx, ref=None): | ||||
| maxdiff = int(self.ui.config('notify', 'maxdiff')) | maxdiff = int(self.ui.config('notify', 'maxdiff')) | ||||
| prev = ctx.p1().node() | prev = ctx.p1().node() | ||||
| if ref: | if ref: | ||||
| ref = ref.node() | ref = ref.node() | ||||