This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3553

notify: add option to include function names in the diff output
ClosedPublic

Authored by joerg.sonnenberger on May 12 2018, 5:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd1134ca5b1a3: notify: add option to include function names in the diff output
Summary

This is a localized version of diff.showfunc.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

yuja added a subscriber: yuja.May 16 2018, 8:18 AM

+ notify.show-functions
+ Set to True to get the equivalent of "hg diff --show-functions". Default:
+ False

So is this equivalent to setting the diff option?

[diff]
showfunc = True

I'm not sure if we need notify.show-functions in addition to diff.*
options, but if we do need it, it's probably better to copy the option
name from [diff].

joerg.sonnenberger edited the summary of this revision. (Show Details)May 16 2018, 9:19 AM
joerg.sonnenberger updated this revision to Diff 8715.
yuja added a comment.May 17 2018, 8:12 AM

Queued, thanks.

+ $ hg commit -m changefunction
+ $ hg --cwd ../b --config notify.show-functions=True pull ../a

s/show-functions/showfunc/

Closed by commit rHGd1134ca5b1a3: notify: add option to include function names in the diff output (authored by joerg.sonnenberger). · Explain WhyMay 17 2018, 8:12 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/notify.py (14 lines)
Mtests/test-notify.t (99 lines)

Diff 8726

hgext/notify.py

to include all of it. Default: -1. to include all of it. Default: -1.
notify.maxsubject notify.maxsubject
Maximum number of characters in email's subject line. Default: 67. Maximum number of characters in email's subject line. Default: 67.
notify.diffstat notify.diffstat
Set to True to include a diffstat before diff content. Default: True. Set to True to include a diffstat before diff content. Default: True.
notify.showfunc
If set, override ``diff.showfunc`` for the diff content. Default: None.
notify.merge notify.merge
If True, send notifications for merge changesets. Default: True. If True, send notifications for merge changesets. Default: True.
notify.mbox notify.mbox
If set, append mails to this mbox file instead of sending. Default: None. If set, append mails to this mbox file instead of sending. Default: None.
notify.fromauthor notify.fromauthor
If set, use the committer of the first changeset in a changegroup for If set, use the committer of the first changeset in a changegroup for
default=True, default=True,
) )
configitem('notify', 'outgoing', configitem('notify', 'outgoing',
default=None, default=None,
) )
configitem('notify', 'sources', configitem('notify', 'sources',
default='serve', default='serve',
) )
configitem('notify', 'showfunc',
default=None,
)
configitem('notify', 'strip', configitem('notify', 'strip',
default=0, default=0,
) )
configitem('notify', 'style', configitem('notify', 'style',
default=None, default=None,
) )
configitem('notify', 'template', configitem('notify', 'template',
default=None, default=None,
self.stripcount = int(self.ui.config('notify', 'strip')) self.stripcount = int(self.ui.config('notify', 'strip'))
self.root = self.strip(self.repo.root) self.root = self.strip(self.repo.root)
self.domain = self.ui.config('notify', 'domain') self.domain = self.ui.config('notify', 'domain')
self.mbox = self.ui.config('notify', 'mbox') self.mbox = self.ui.config('notify', 'mbox')
self.test = self.ui.configbool('notify', 'test') self.test = self.ui.configbool('notify', 'test')
self.charsets = mail._charsets(self.ui) self.charsets = mail._charsets(self.ui)
self.subs = self.subscribers() self.subs = self.subscribers()
self.merge = self.ui.configbool('notify', 'merge') self.merge = self.ui.configbool('notify', 'merge')
self.showfunc = self.ui.configbool('notify', 'showfunc')
if self.showfunc is None:
self.showfunc = self.ui.configbool('diff', 'showfunc')
mapfile = None mapfile = None
template = (self.ui.config('notify', hooktype) or template = (self.ui.config('notify', hooktype) or
self.ui.config('notify', 'template')) self.ui.config('notify', 'template'))
if not template: if not template:
mapfile = self.ui.config('notify', 'style') mapfile = self.ui.config('notify', 'style')
if not mapfile and not template: if not mapfile and not template:
template = deftemplates.get(hooktype) or single_template template = deftemplates.get(hooktype) or single_template
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()
else: else:
ref = ctx.node() ref = ctx.node()
chunks = patch.diff(self.repo, prev, ref, diffopts = patch.diffallopts(self.ui)
opts=patch.diffallopts(self.ui)) diffopts.showfunc = self.showfunc
chunks = patch.diff(self.repo, prev, ref, opts=diffopts)
difflines = ''.join(chunks).splitlines() difflines = ''.join(chunks).splitlines()
if self.ui.configbool('notify', 'diffstat'): if self.ui.configbool('notify', 'diffstat'):
maxdiffstat = int(self.ui.config('notify', 'maxdiffstat')) maxdiffstat = int(self.ui.config('notify', 'maxdiffstat'))
s = patch.diffstat(difflines) s = patch.diffstat(difflines)
# s may be nil, don't include the header if it is # s may be nil, don't include the header if it is
if s: if s:
if maxdiffstat >= 0 and s.count("\n") > maxdiffstat + 1: if maxdiffstat >= 0 and s.count("\n") > maxdiffstat + 1:

tests/test-notify.t

to include all of it. Default: -1. to include all of it. Default: -1.
notify.maxsubject notify.maxsubject
Maximum number of characters in email's subject line. Default: 67. Maximum number of characters in email's subject line. Default: 67.
notify.diffstat notify.diffstat
Set to True to include a diffstat before diff content. Default: True. Set to True to include a diffstat before diff content. Default: True.
notify.showfunc
If set, override "diff.showfunc" for the diff content. Default: None.
notify.merge notify.merge
If True, send notifications for merge changesets. Default: True. If True, send notifications for merge changesets. Default: True.
notify.mbox notify.mbox
If set, append mails to this mbox file instead of sending. Default: None. If set, append mails to this mbox file instead of sending. Default: None.
notify.fromauthor notify.fromauthor
If set, use the committer of the first changeset in a changegroup for the If set, use the committer of the first changeset in a changegroup for the
Date: * (glob) Date: * (glob)
Subject: 14721b538ae3: with template Subject: 14721b538ae3: with template
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 14721b538ae3 X-Hg-Notification: changeset 14721b538ae3
Message-Id: <hg.14721b538ae3.*.*@*> (glob) Message-Id: <hg.14721b538ae3.*.*@*> (glob)
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
with template with template
showfunc diff
$ cat <<EOF >> $HGRCPATH
> showfunc = True
> template =
> maxdiff = -1
> EOF
$ cd a
$ cat > f1 << EOF
> int main() {
> int a = 0;
> int b = 1;
> int c = 2;
> int d = 3;
> return a + b + c + d;
> }
> EOF
$ hg commit -Am addfunction
adding f1
$ hg --cwd ../b pull ../a
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets b86bc16ff894
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Date: * (glob)
Subject: addfunction
From: test@test.com
X-Hg-Notification: changeset b86bc16ff894
Message-Id: <hg.b86bc16ff894.*.*@*> (glob)
To: baz@test.com, foo@bar
changeset b86bc16ff894
diffs (11 lines):
diff -r 14721b538ae3 -r b86bc16ff894 f1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/f1 Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,7 @@
+int main() {
+ int a = 0;
+ int b = 1;
+ int c = 2;
+ int d = 3;
+ return a + b + c + d;
+}
(run 'hg update' to get a working copy)
$ cat > f1 << EOF
> int main() {
> int a = 0;
> int b = 1;
> int c = 2;
> int e = 3;
> return a + b + c + e;
> }
> EOF
$ hg commit -m changefunction
$ hg --cwd ../b --config notify.showfunc=True pull ../a
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets e81040e9838c
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Date: * (glob)
Subject: changefunction
From: test@test.com
X-Hg-Notification: changeset e81040e9838c
Message-Id: <hg.e81040e9838c.*.*@*> (glob)
To: baz@test.com, foo@bar
changeset e81040e9838c
diffs (12 lines):
diff -r b86bc16ff894 -r e81040e9838c f1
--- a/f1 Thu Jan 01 00:00:00 1970 +0000
+++ b/f1 Thu Jan 01 00:00:00 1970 +0000
@@ -2,6 +2,6 @@ int main() {
int a = 0;
int b = 1;
int c = 2;
- int d = 3;
- return a + b + c + d;
+ int e = 3;
+ return a + b + c + e;
}
(run 'hg update' to get a working copy)