notify.py
475 lines
| 15.4 KiB
| text/x-python
|
PythonLexer
/ hgext / notify.py
Vadim Gelfer
|
r2203 | # notify.py - email notifications for mercurial | ||
# | ||||
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | ||||
# | ||||
Martin Geisler
|
r8225 | # This software may be used and distributed according to the terms of the | ||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
Dirkjan Ochtman
|
r7127 | |||
Patrick Mezard
|
r14940 | '''hooks for sending email push notifications | ||
Dirkjan Ochtman
|
r7127 | |||
David Champion
|
r16950 | This extension implements hooks to send email notifications when | ||
changesets are sent from or received by the local repository. | ||||
Dirkjan Ochtman
|
r7127 | |||
Patrick Mezard
|
r14940 | First, enable the extension as explained in :hg:`help extensions`, and | ||
FUJIWARA Katsunori
|
r16500 | register the hook you want to run. ``incoming`` and ``changegroup`` hooks | ||
David Champion
|
r16950 | are run when changesets are received, while ``outgoing`` hooks are for | ||
changesets sent to another repository:: | ||||
Dirkjan Ochtman
|
r7127 | |||
Martin Geisler
|
r9105 | [hooks] | ||
# one email for each incoming changeset | ||||
incoming.notify = python:hgext.notify.hook | ||||
Patrick Mezard
|
r14940 | # one email for all incoming changesets | ||
Martin Geisler
|
r9105 | changegroup.notify = python:hgext.notify.hook | ||
Patrick Mezard
|
r14940 | |||
# one email for all outgoing changesets | ||||
Ingo Bressler
|
r14617 | outgoing.notify = python:hgext.notify.hook | ||
Dirkjan Ochtman
|
r7127 | |||
David Champion
|
r16950 | This registers the hooks. To enable notification, subscribers must | ||
be assigned to repositories. The ``[usersubs]`` section maps multiple | ||||
repositories to a given recipient. The ``[reposubs]`` section maps | ||||
multiple recipients to a single repository:: | ||||
Martin Geisler
|
r9157 | |||
Martin Geisler
|
r9105 | [usersubs] | ||
Michal Sznajder
|
r17754 | # key is subscriber email, value is a comma-separated list of repo patterns | ||
Martin Geisler
|
r9105 | user@host = pattern | ||
Dirkjan Ochtman
|
r7127 | |||
Martin Geisler
|
r9105 | [reposubs] | ||
Michal Sznajder
|
r17754 | # key is repo pattern, value is a comma-separated list of subscriber emails | ||
Martin Geisler
|
r9105 | pattern = user@host | ||
Dirkjan Ochtman
|
r7127 | |||
Michal Sznajder
|
r17754 | A ``pattern`` is a ``glob`` matching the absolute path to a repository, | ||
optionally combined with a revset expression. A revset expression, if | ||||
present, is separated from the glob by a hash. Example:: | ||||
[reposubs] | ||||
*/widgets#branch(release) = qa-team@example.com | ||||
This sends to ``qa-team@example.com`` whenever a changeset on the ``release`` | ||||
branch triggers a notification in any repository ending in ``widgets``. | ||||
David Champion
|
r16950 | |||
In order to place them under direct user management, ``[usersubs]`` and | ||||
``[reposubs]`` sections may be placed in a separate ``hgrc`` file and | ||||
incorporated by reference:: | ||||
Patrick Mezard
|
r14940 | |||
[notify] | ||||
config = /path/to/subscriptionsfile | ||||
David Champion
|
r16950 | Notifications will not be sent until the ``notify.test`` value is set | ||
to ``False``; see below. | ||||
Patrick Mezard
|
r14940 | |||
Notifications content can be tweaked with the following configuration entries: | ||||
notify.test | ||||
If ``True``, print messages to stdout instead of sending them. Default: True. | ||||
notify.sources | ||||
David Champion
|
r16950 | Space-separated list of change sources. Notifications are activated only | ||
when a changeset's source is in this list. Sources may be: | ||||
:``serve``: changesets received via http or ssh | ||||
:``pull``: changesets received via ``hg pull`` | ||||
:``unbundle``: changesets received via ``hg unbundle`` | ||||
:``push``: changesets sent or received via ``hg push`` | ||||
:``bundle``: changesets sent via ``hg unbundle`` | ||||
Default: serve. | ||||
Patrick Mezard
|
r14940 | |||
notify.strip | ||||
Number of leading slashes to strip from url paths. By default, notifications | ||||
David Champion
|
r16950 | reference repositories with their absolute path. ``notify.strip`` lets you | ||
Patrick Mezard
|
r14940 | turn them into relative paths. For example, ``notify.strip=3`` will change | ||
``/long/path/repository`` into ``repository``. Default: 0. | ||||
notify.domain | ||||
David Champion
|
r16950 | Default email domain for sender or recipients with no explicit domain. | ||
Dirkjan Ochtman
|
r7127 | |||
Patrick Mezard
|
r14940 | notify.style | ||
Style file to use when formatting emails. | ||||
notify.template | ||||
Template to use when formatting emails. | ||||
notify.incoming | ||||
David Champion
|
r16950 | Template to use when run as an incoming hook, overriding ``notify.template``. | ||
Patrick Mezard
|
r14940 | |||
notify.outgoing | ||||
David Champion
|
r16950 | Template to use when run as an outgoing hook, overriding ``notify.template``. | ||
Patrick Mezard
|
r14940 | |||
notify.changegroup | ||||
David Champion
|
r16950 | Template to use when running as a changegroup hook, overriding | ||
Patrick Mezard
|
r14940 | ``notify.template``. | ||
notify.maxdiff | ||||
Maximum number of diff lines to include in notification email. Set to 0 | ||||
David Champion
|
r16950 | to disable the diff, or -1 to include all of it. Default: 300. | ||
Patrick Mezard
|
r14940 | |||
notify.maxsubject | ||||
David Champion
|
r16950 | Maximum number of characters in email's subject line. Default: 67. | ||
Patrick Mezard
|
r14940 | |||
notify.diffstat | ||||
Set to True to include a diffstat before diff content. Default: True. | ||||
notify.merge | ||||
If True, send notifications for merge changesets. Default: True. | ||||
Mads Kiilerich
|
r15561 | notify.mbox | ||
If set, append mails to this mbox file instead of sending. Default: None. | ||||
Nikolaus Schueler
|
r15654 | notify.fromauthor | ||
David Champion
|
r16950 | If set, use the committer of the first changeset in a changegroup for | ||
the "From" field of the notification mail. If not set, take the user | ||||
from the pushing repo. Default: False. | ||||
Nikolaus Schueler
|
r15654 | |||
David Champion
|
r16950 | If set, the following entries will also be used to customize the | ||
notifications: | ||||
Patrick Mezard
|
r14940 | |||
email.from | ||||
David Champion
|
r16950 | Email ``From`` address to use if none can be found in the generated | ||
email content. | ||||
Patrick Mezard
|
r14940 | |||
web.baseurl | ||||
David Champion
|
r16950 | Root repository URL to combine with repository paths when making | ||
Patrick Mezard
|
r14940 | references. See also ``notify.strip``. | ||
Martin Geisler
|
r9068 | ''' | ||
timeless
|
r28416 | from __future__ import absolute_import | ||
Vadim Gelfer
|
r2203 | |||
timeless
|
r28416 | import email | ||
import fnmatch | ||||
import socket | ||||
import time | ||||
Yuya Nishihara
|
r29205 | from mercurial.i18n import _ | ||
timeless
|
r28416 | from mercurial import ( | ||
cmdutil, | ||||
error, | ||||
mail, | ||||
patch, | ||||
Boris Feld
|
r33738 | registrar, | ||
timeless
|
r28416 | util, | ||
) | ||||
Vadim Gelfer
|
r2203 | |||
Augie Fackler
|
r29841 | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||
Augie Fackler
|
r25186 | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | ||
# be specifying the version(s) of Mercurial they are tested with, or | ||||
# leave the attribute unspecified. | ||||
Augie Fackler
|
r29841 | testedwith = 'ships-with-hg-core' | ||
Augie Fackler
|
r16743 | |||
Boris Feld
|
r33738 | configtable = {} | ||
configitem = registrar.configitem(configtable) | ||||
configitem('notify', 'config', | ||||
default=None, | ||||
) | ||||
Boris Feld
|
r33739 | configitem('notify', 'diffstat', | ||
default=True, | ||||
) | ||||
Boris Feld
|
r33740 | configitem('notify', 'domain', | ||
default=None, | ||||
) | ||||
Boris Feld
|
r33741 | configitem('notify', 'fromauthor', | ||
default=None, | ||||
) | ||||
Boris Feld
|
r33742 | configitem('notify', 'maxdiff', | ||
default=300, | ||||
) | ||||
Boris Feld
|
r33743 | configitem('notify', 'maxsubject', | ||
default=67, | ||||
) | ||||
Boris Feld
|
r33744 | configitem('notify', 'mbox', | ||
default=None, | ||||
) | ||||
Boris Feld
|
r33745 | configitem('notify', 'merge', | ||
default=True, | ||||
) | ||||
Boris Feld
|
r33746 | configitem('notify', 'sources', | ||
default='serve', | ||||
) | ||||
Boris Feld
|
r33747 | configitem('notify', 'strip', | ||
default=0, | ||||
) | ||||
Boris Feld
|
r33748 | configitem('notify', 'style', | ||
default=None, | ||||
) | ||||
Boris Feld
|
r33749 | configitem('notify', 'template', | ||
default=None, | ||||
) | ||||
Boris Feld
|
r33750 | configitem('notify', 'test', | ||
default=True, | ||||
) | ||||
Boris Feld
|
r33738 | |||
Vadim Gelfer
|
r2203 | # template for single changeset can include email headers. | ||
single_template = ''' | ||||
Subject: changeset in {webroot}: {desc|firstline|strip} | ||||
From: {author} | ||||
changeset {node|short} in {root} | ||||
details: {baseurl}{webroot}?cmd=changeset;node={node|short} | ||||
description: | ||||
\t{desc|tabindent|strip} | ||||
'''.lstrip() | ||||
# template for multiple changesets should not contain email headers, | ||||
# because only first set of headers will be used and result will look | ||||
# strange. | ||||
multiple_template = ''' | ||||
changeset {node|short} in {root} | ||||
details: {baseurl}{webroot}?cmd=changeset;node={node|short} | ||||
summary: {desc|firstline} | ||||
''' | ||||
deftemplates = { | ||||
'changegroup': multiple_template, | ||||
Thomas Arendsen Hein
|
r4498 | } | ||
Bryan O'Sullivan
|
r2201 | |||
class notifier(object): | ||||
Vadim Gelfer
|
r2203 | '''email notification class.''' | ||
def __init__(self, ui, repo, hooktype): | ||||
Bryan O'Sullivan
|
r2201 | self.ui = ui | ||
Vadim Gelfer
|
r2329 | cfg = self.ui.config('notify', 'config') | ||
if cfg: | ||||
Matt Mackall
|
r8142 | self.ui.readconfig(cfg, sections=['usersubs', 'reposubs']) | ||
Bryan O'Sullivan
|
r2201 | self.repo = repo | ||
Boris Feld
|
r33747 | self.stripcount = int(self.ui.config('notify', 'strip')) | ||
Bryan O'Sullivan
|
r2201 | self.root = self.strip(self.repo.root) | ||
Vadim Gelfer
|
r2203 | self.domain = self.ui.config('notify', 'domain') | ||
Mads Kiilerich
|
r15561 | self.mbox = self.ui.config('notify', 'mbox') | ||
Boris Feld
|
r33750 | self.test = self.ui.configbool('notify', 'test') | ||
Christian Ebert
|
r7116 | self.charsets = mail._charsets(self.ui) | ||
Vadim Gelfer
|
r2203 | self.subs = self.subscribers() | ||
Boris Feld
|
r33745 | self.merge = self.ui.configbool('notify', 'merge') | ||
Vadim Gelfer
|
r2203 | |||
Yuya Nishihara
|
r28951 | mapfile = None | ||
Vadim Gelfer
|
r2203 | template = (self.ui.config('notify', hooktype) or | ||
self.ui.config('notify', 'template')) | ||||
Yuya Nishihara
|
r28951 | if not template: | ||
mapfile = self.ui.config('notify', 'style') | ||||
Vadim Gelfer
|
r2203 | if not mapfile and not template: | ||
template = deftemplates.get(hooktype) or single_template | ||||
Yuya Nishihara
|
r32839 | spec = cmdutil.logtemplatespec(template, mapfile) | ||
self.t = cmdutil.changeset_templater(self.ui, self.repo, spec, | ||||
False, None, False) | ||||
Bryan O'Sullivan
|
r2201 | |||
def strip(self, path): | ||||
Vadim Gelfer
|
r2203 | '''strip leading slashes from local path, turn into web-safe path.''' | ||
Bryan O'Sullivan
|
r2201 | path = util.pconvert(path) | ||
count = self.stripcount | ||||
Vadim Gelfer
|
r2326 | while count > 0: | ||
Bryan O'Sullivan
|
r2201 | c = path.find('/') | ||
if c == -1: | ||||
break | ||||
Matt Mackall
|
r10282 | path = path[c + 1:] | ||
Bryan O'Sullivan
|
r2201 | count -= 1 | ||
return path | ||||
Vadim Gelfer
|
r2203 | def fixmail(self, addr): | ||
'''try to clean up email addresses.''' | ||||
Matt Mackall
|
r5975 | addr = util.email(addr.strip()) | ||
Alexis S. L. Carvalho
|
r4094 | if self.domain: | ||
a = addr.find('@localhost') | ||||
if a != -1: | ||||
addr = addr[:a] | ||||
if '@' not in addr: | ||||
return addr + '@' + self.domain | ||||
Vadim Gelfer
|
r2203 | return addr | ||
Bryan O'Sullivan
|
r2201 | def subscribers(self): | ||
Vadim Gelfer
|
r2203 | '''return list of email addresses of subscribers to this repo.''' | ||
Martin Geisler
|
r8154 | subs = set() | ||
Vadim Gelfer
|
r2203 | for user, pats in self.ui.configitems('usersubs'): | ||
for pat in pats.split(','): | ||||
Michal Sznajder
|
r17754 | if '#' in pat: | ||
pat, revs = pat.split('#', 1) | ||||
else: | ||||
revs = None | ||||
Vadim Gelfer
|
r2203 | if fnmatch.fnmatch(self.repo.root, pat.strip()): | ||
Michal Sznajder
|
r17754 | subs.add((self.fixmail(user), revs)) | ||
Bryan O'Sullivan
|
r2201 | for pat, users in self.ui.configitems('reposubs'): | ||
Michal Sznajder
|
r17754 | if '#' in pat: | ||
pat, revs = pat.split('#', 1) | ||||
else: | ||||
revs = None | ||||
Vadim Gelfer
|
r2203 | if fnmatch.fnmatch(self.repo.root, pat): | ||
for user in users.split(','): | ||||
Michal Sznajder
|
r17754 | subs.add((self.fixmail(user), revs)) | ||
return [(mail.addressencode(self.ui, s, self.charsets, self.test), r) | ||||
for s, r in sorted(subs)] | ||||
Bryan O'Sullivan
|
r2201 | |||
Bryan O'Sullivan
|
r9486 | def node(self, ctx, **props): | ||
David Champion
|
r9516 | '''format one changeset, unless it is a suppressed merge.''' | ||
if not self.merge and len(ctx.parents()) > 1: | ||||
return False | ||||
Dirkjan Ochtman
|
r7726 | self.t.show(ctx, changes=ctx.changeset(), | ||
Vadim Gelfer
|
r2203 | baseurl=self.ui.config('web', 'baseurl'), | ||
Bryan O'Sullivan
|
r9486 | root=self.repo.root, webroot=self.root, **props) | ||
David Champion
|
r9516 | return True | ||
Vadim Gelfer
|
r2203 | |||
Vadim Gelfer
|
r2230 | def skipsource(self, source): | ||
'''true if incoming changes from this source should be skipped.''' | ||||
Boris Feld
|
r33746 | ok_sources = self.ui.config('notify', 'sources').split() | ||
Vadim Gelfer
|
r2230 | return source not in ok_sources | ||
Dirkjan Ochtman
|
r7726 | def send(self, ctx, count, data): | ||
Vadim Gelfer
|
r2203 | '''send message.''' | ||
Michal Sznajder
|
r17754 | # Select subscribers by revset | ||
subs = set() | ||||
for sub, spec in self.subs: | ||||
if spec is None: | ||||
subs.add(sub) | ||||
continue | ||||
revs = self.repo.revs('%r and %d:', spec, ctx.rev()) | ||||
if len(revs): | ||||
subs.add(sub) | ||||
continue | ||||
if len(subs) == 0: | ||||
self.ui.debug('notify: no subscribers to selected repo ' | ||||
'and revset\n') | ||||
return | ||||
Vadim Gelfer
|
r2203 | p = email.Parser.Parser() | ||
Christian Ebert
|
r9313 | try: | ||
msg = p.parsestr(data) | ||||
Gregory Szorc
|
r25660 | except email.Errors.MessageParseError as inst: | ||
Pierre-Yves David
|
r26587 | raise error.Abort(inst) | ||
Vadim Gelfer
|
r2203 | |||
Christian Ebert
|
r7116 | # store sender and subject | ||
sender, subject = msg['From'], msg['Subject'] | ||||
Christian Ebert
|
r7658 | del msg['From'], msg['Subject'] | ||
Christian Ebert
|
r9313 | |||
if not msg.is_multipart(): | ||||
# create fresh mime message from scratch | ||||
# (multipart templates must take care of this themselves) | ||||
headers = msg.items() | ||||
payload = msg.get_payload() | ||||
# for notification prefer readability over data precision | ||||
msg = mail.mimeencode(self.ui, payload, self.charsets, self.test) | ||||
# reinstate custom headers | ||||
for k, v in headers: | ||||
msg[k] = v | ||||
Christian Ebert
|
r7116 | |||
Christian Ebert
|
r7705 | msg['Date'] = util.datestr(format="%a, %d %b %Y %H:%M:%S %1%2") | ||
Vadim Gelfer
|
r2203 | |||
Christian Ebert
|
r7705 | # try to make subject line exist and be useful | ||
if not subject: | ||||
if count > 1: | ||||
subject = _('%s: %d new changesets') % (self.root, count) | ||||
else: | ||||
Dirkjan Ochtman
|
r7726 | s = ctx.description().lstrip().split('\n', 1)[0].rstrip() | ||
Christian Ebert
|
r7705 | subject = '%s: %s' % (self.root, s) | ||
Boris Feld
|
r33743 | maxsubject = int(self.ui.config('notify', 'maxsubject')) | ||
Yuya Nishihara
|
r13202 | if maxsubject: | ||
subject = util.ellipsis(subject, maxsubject) | ||||
Christian Ebert
|
r7705 | msg['Subject'] = mail.headencode(self.ui, subject, | ||
self.charsets, self.test) | ||||
Vadim Gelfer
|
r2203 | |||
Christian Ebert
|
r7705 | # try to make message have proper sender | ||
if not sender: | ||||
sender = self.ui.config('email', 'from') or self.ui.username() | ||||
if '@' not in sender or '@localhost' in sender: | ||||
sender = self.fixmail(sender) | ||||
msg['From'] = mail.addressencode(self.ui, sender, | ||||
self.charsets, self.test) | ||||
Vadim Gelfer
|
r2203 | |||
Dirkjan Ochtman
|
r7726 | msg['X-Hg-Notification'] = 'changeset %s' % ctx | ||
Vadim Gelfer
|
r2203 | if not msg['Message-Id']: | ||
msg['Message-Id'] = ('<hg.%s.%s.%s@%s>' % | ||||
Dirkjan Ochtman
|
r7726 | (ctx, int(time.time()), | ||
Vadim Gelfer
|
r2203 | hash(self.repo.root), socket.getfqdn())) | ||
Michal Sznajder
|
r17754 | msg['To'] = ', '.join(sorted(subs)) | ||
Vadim Gelfer
|
r2203 | |||
Nicolas Dumazet
|
r9136 | msgtext = msg.as_string() | ||
Christian Ebert
|
r7498 | if self.test: | ||
Vadim Gelfer
|
r2203 | self.ui.write(msgtext) | ||
if not msgtext.endswith('\n'): | ||||
self.ui.write('\n') | ||||
Bryan O'Sullivan
|
r2201 | else: | ||
Vadim Gelfer
|
r2329 | self.ui.status(_('notify: sending %d subscribers %d changes\n') % | ||
Michal Sznajder
|
r17754 | (len(subs), count)) | ||
Matt Mackall
|
r5975 | mail.sendmail(self.ui, util.email(msg['From']), | ||
Michal Sznajder
|
r17754 | subs, msgtext, mbox=self.mbox) | ||
Bryan O'Sullivan
|
r2201 | |||
Dirkjan Ochtman
|
r7726 | def diff(self, ctx, ref=None): | ||
Boris Feld
|
r33742 | maxdiff = int(self.ui.config('notify', 'maxdiff')) | ||
Matt Mackall
|
r13878 | prev = ctx.p1().node() | ||
Jordi Gutiérrez Hermoso
|
r24306 | if ref: | ||
ref = ref.node() | ||||
else: | ||||
ref = ctx.node() | ||||
Siddharth Agarwal
|
r23454 | chunks = patch.diff(self.repo, prev, ref, | ||
opts=patch.diffallopts(self.ui)) | ||||
Dirkjan Ochtman
|
r7308 | difflines = ''.join(chunks).splitlines() | ||
divy@chelsio.com
|
r6979 | |||
Boris Feld
|
r33739 | if self.ui.configbool('notify', 'diffstat'): | ||
Matt Doar
|
r3096 | s = patch.diffstat(difflines) | ||
Sean Dague
|
r4077 | # s may be nil, don't include the header if it is | ||
if s: | ||||
FUJIWARA Katsunori
|
r29240 | self.ui.write(_('\ndiffstat:\n\n%s') % s) | ||
Dirkjan Ochtman
|
r7726 | |||
Benoît Allard
|
r6305 | if maxdiff == 0: | ||
return | ||||
Dirkjan Ochtman
|
r7726 | elif maxdiff > 0 and len(difflines) > maxdiff: | ||
msg = _('\ndiffs (truncated from %d to %d lines):\n\n') | ||||
self.ui.write(msg % (len(difflines), maxdiff)) | ||||
Vadim Gelfer
|
r2203 | difflines = difflines[:maxdiff] | ||
elif difflines: | ||||
Matt Mackall
|
r3739 | self.ui.write(_('\ndiffs (%d lines):\n\n') % len(difflines)) | ||
Dirkjan Ochtman
|
r7726 | |||
divy@chelsio.com
|
r6979 | self.ui.write("\n".join(difflines)) | ||
Bryan O'Sullivan
|
r2201 | |||
Vadim Gelfer
|
r2230 | def hook(ui, repo, hooktype, node=None, source=None, **kwargs): | ||
Vadim Gelfer
|
r2203 | '''send email notifications to interested subscribers. | ||
if used as changegroup hook, send one email for all changesets in | ||||
changegroup. else send one email per changeset.''' | ||||
Dirkjan Ochtman
|
r7726 | |||
Vadim Gelfer
|
r2203 | n = notifier(ui, repo, hooktype) | ||
Dirkjan Ochtman
|
r7726 | ctx = repo[node] | ||
Vadim Gelfer
|
r2329 | if not n.subs: | ||
Martin Geisler
|
r9467 | ui.debug('notify: no subscribers to repository %s\n' % n.root) | ||
Vadim Gelfer
|
r2329 | return | ||
if n.skipsource(source): | ||||
Martin Geisler
|
r9467 | ui.debug('notify: changes have source "%s" - skipping\n' % source) | ||
Vadim Gelfer
|
r2230 | return | ||
Dirkjan Ochtman
|
r7726 | |||
Matt Mackall
|
r3739 | ui.pushbuffer() | ||
David Champion
|
r9516 | data = '' | ||
count = 0 | ||||
Nikolaus Schueler
|
r15654 | author = '' | ||
Ingo Bressler
|
r14617 | if hooktype == 'changegroup' or hooktype == 'outgoing': | ||
Dirkjan Ochtman
|
r7726 | start, end = ctx.rev(), len(repo) | ||
Vadim Gelfer
|
r2203 | for rev in xrange(start, end): | ||
David Champion
|
r9516 | if n.node(repo[rev]): | ||
count += 1 | ||||
Nikolaus Schueler
|
r15654 | if not author: | ||
author = repo[rev].user() | ||||
David Champion
|
r9516 | else: | ||
data += ui.popbuffer() | ||||
Brodie Rao
|
r16683 | ui.note(_('notify: suppressing notification for merge %d:%s\n') | ||
% (rev, repo[rev].hex()[:12])) | ||||
David Champion
|
r9516 | ui.pushbuffer() | ||
if count: | ||||
n.diff(ctx, repo['tip']) | ||||
Vadim Gelfer
|
r2203 | else: | ||
David Champion
|
r9516 | if not n.node(ctx): | ||
ui.popbuffer() | ||||
ui.note(_('notify: suppressing notification for merge %d:%s\n') % | ||||
(ctx.rev(), ctx.hex()[:12])) | ||||
return | ||||
count += 1 | ||||
Dirkjan Ochtman
|
r7726 | n.diff(ctx) | ||
Bruce Cran
|
r26503 | if not author: | ||
author = ctx.user() | ||||
Dirkjan Ochtman
|
r7726 | |||
David Champion
|
r9516 | data += ui.popbuffer() | ||
Nikolaus Schueler
|
r15654 | fromauthor = ui.config('notify', 'fromauthor') | ||
if author and fromauthor: | ||||
data = '\n'.join(['From: %s' % author, data]) | ||||
David Champion
|
r9516 | if count: | ||
n.send(ctx, count, data) | ||||