This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8172

notify: optional mail threading based on obsmarker
ClosedPublic

Authored by joerg.sonnenberger on Feb 26 2020, 4:35 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG947e6df4ff77: notify: optional mail threading based on obsmarker
Summary

When notify.reply is set and a changeset has a predecessor in the
repository, include In-Reply-To pointing to the message-id that would
have been generated for the oldest predecessor. This allows mail
threading like Phabricator for common cases like rebasing changes, but
will be optimal for cases like folding.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit added a subscriber: pulkit.EditedMar 9 2020, 5:13 AM

The code looks good. Since the whole obsmarker thing is experimental, the config option here should be made experimental too.
Also, can you add tests when the config is set and --in-reply-to flag is used; and add info about that behavior in commit message?

durin42 removed a subscriber: durin42.Mar 11 2020, 11:40 AM
joerg.sonnenberger added a comment.Mar 18 2020, 8:12 AM

@pulkit You still wanted to explain what you mean with --in-reply-to interaction here.

pulkit added a comment.Mar 19 2020, 4:02 AM
In D8172#123965, @joerg.sonnenberger wrote:

@pulkit You still wanted to explain what you mean with --in-reply-to interaction here.

Thanks for the reminder. I looked into details and it seems that I misunderstood few things and mixed it with --in-reply-to flag to hg email :/

marmoute added a comment.Mar 19 2020, 5:07 AM

I am planning to have a look at this by the end of the week. SOrry for the delay

marmoute requested changes to this revision.Mar 19 2020, 8:00 PM

The feature looks interresting, but I had a couple of feedback.

hgext/notify.py
136

maybe reply-to-predecessors would be clearer ?

137

The phrasing used in the rest of the doc is If set

139

From waht I understand, this feature will misbehave if notify.messageidseed is not set. I am I right, I believe we should replace "should" by "must" and abort if we detect the new option being used without the other one.

466–470

nits: could be [] instead of list()

472

The "min" does not garantee we are using the root predecessors here. It is just an attemps to get the first that resulted in an email, right? If so, you should document it so that the next soul looking at this code do not get mislead.

You should also document that in case of fold, only one will be replied to.

This revision now requires changes to proceed.Mar 19 2020, 8:00 PM
marmoute accepted this revision.Mar 27 2020, 10:08 AM

Looks good to me, thanks for the update. Sorry for the delay, it totally fell into the cracks.

hgext/notify.py
472

I was thinking of an inline comment in the code. Having this in the doc is actually good idea thanks. Maybe follow up with an inline command too ?

marmoute accepted this revision.Mar 29 2020, 1:33 PM
pulkit accepted this revision.Mar 30 2020, 6:50 AM
This revision is now accepted and ready to land.Mar 30 2020, 6:50 AM

Revision Contents
Changeset List

PathPackages
Mhgext/notify.py (36 lines)
Mtests/test-notify.t (127 lines)

Diff 20843

hgext/notify.py

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
the "From" field of the notification mail. If not set, take the user the "From" field of the notification mail. If not set, take the user
from the pushing repo. Default: False. from the pushing repo. Default: False.
notify.reply-to-predecessor (EXPERIMENTAL)
marmouteUnsubmitted
Not Done

maybe reply-to-predecessors would be clearer ?

marmoute: maybe `reply-to-predecessors` would be clearer ?
If set and the changeset has a predecessor in the repository, try to thread
marmouteUnsubmitted
Not Done

The phrasing used in the rest of the doc is If set

marmoute: The phrasing used in the rest of the doc is `If set`
the notification mail with the predecessor. This adds the "In-Reply-To" header
to the notification mail with a reference to the predecessor with the smallest
marmouteUnsubmitted
Not Done

From waht I understand, this feature will misbehave if notify.messageidseed is not set. I am I right, I believe we should replace "should" by "must" and abort if we detect the new option being used without the other one.

marmoute: From waht I understand, this feature will misbehave if notify.messageidseed is not set. I am I…
revision number. Mail threads can still be torn, especially when changesets
are folded.
This option must be used in combination with ``notify.messageidseed``.
If set, the following entries will also be used to customize the If set, the following entries will also be used to customize the
notifications: notifications:
email.from email.from
Email ``From`` address to use if none can be found in the generated Email ``From`` address to use if none can be found in the generated
email content. email content.
web.baseurl web.baseurl
import time import time
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
encoding, encoding,
error, error,
logcmdutil, logcmdutil,
mail, mail,
obsutil,
patch, patch,
pycompat, pycompat,
registrar, registrar,
util, util,
) )
from mercurial.utils import ( from mercurial.utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
configitem( configitem(
b'notify', b'merge', default=True, b'notify', b'merge', default=True,
) )
configitem( configitem(
b'notify', b'outgoing', default=None, b'notify', b'outgoing', default=None,
) )
configitem( configitem(
b'notify', b'reply-to-predecessor', default=False,
)
configitem(
b'notify', b'sources', default=b'serve', b'notify', b'sources', default=b'serve',
) )
configitem( configitem(
b'notify', b'showfunc', default=None, b'notify', b'showfunc', default=None,
) )
configitem( configitem(
b'notify', b'strip', default=0, b'notify', b'strip', default=0,
) )
self.domain = self.ui.config(b'notify', b'domain') self.domain = self.ui.config(b'notify', b'domain')
self.mbox = self.ui.config(b'notify', b'mbox') self.mbox = self.ui.config(b'notify', b'mbox')
self.test = self.ui.configbool(b'notify', b'test') self.test = self.ui.configbool(b'notify', b'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(b'notify', b'merge') self.merge = self.ui.configbool(b'notify', b'merge')
self.showfunc = self.ui.configbool(b'notify', b'showfunc') self.showfunc = self.ui.configbool(b'notify', b'showfunc')
self.messageidseed = self.ui.config(b'notify', b'messageidseed') self.messageidseed = self.ui.config(b'notify', b'messageidseed')
self.reply = self.ui.configbool(b'notify', b'reply-to-predecessor')
if self.reply and not self.messageidseed:
raise error.Abort(
_(
b'notify.reply-to-predecessor used without '
b'notify.messageidseed'
)
)
if self.showfunc is None: if self.showfunc is None:
self.showfunc = self.ui.configbool(b'diff', b'showfunc') self.showfunc = self.ui.configbool(b'diff', b'showfunc')
mapfile = None mapfile = None
template = self.ui.config(b'notify', hooktype) or self.ui.config( template = self.ui.config(b'notify', hooktype) or self.ui.config(
b'notify', b'template' b'notify', b'template'
) )
if not template: if not template:
sender = self.fixmail(sender) sender = self.fixmail(sender)
msg['From'] = mail.addressencode( msg['From'] = mail.addressencode(
self.ui, sender, self.charsets, self.test self.ui, sender, self.charsets, self.test
) )
msg['X-Hg-Notification'] = 'changeset %s' % ctx msg['X-Hg-Notification'] = 'changeset %s' % ctx
if not msg['Message-Id']: if not msg['Message-Id']:
msg['Message-Id'] = messageid(ctx, self.domain, self.messageidseed) msg['Message-Id'] = messageid(ctx, self.domain, self.messageidseed)
if self.reply:
unfi = self.repo.unfiltered()
has_node = unfi.changelog.index.has_node
predecessors = [
unfi[ctx2]
for ctx2 in obsutil.allpredecessors(unfi.obsstore, [ctx.node()])
if ctx2 != ctx.node() and has_node(ctx2)
]
marmouteUnsubmitted
Not Done

nits: could be [] instead of list()

marmoute: nits: could be `[]` instead of `list()`
if predecessors:
pred = min(predecessors, key=lambda ctx: ctx.rev())
marmouteUnsubmitted
Not Done

The "min" does not garantee we are using the root predecessors here. It is just an attemps to get the first that resulted in an email, right? If so, you should document it so that the next soul looking at this code do not get mislead.

You should also document that in case of fold, only one will be replied to.

marmoute: The "min" does not garantee we are using the root predecessors here. It is just an attemps to…
marmouteUnsubmitted
Not Done

I was thinking of an inline comment in the code. Having this in the doc is actually good idea thanks. Maybe follow up with an inline command too ?

marmoute: I was thinking of an inline comment in the code. Having this in the doc is actually good idea…
msg['In-Reply-To'] = messageid(
pred, self.domain, self.messageidseed
)
msg['To'] = ', '.join(sorted(subs)) msg['To'] = ', '.join(sorted(subs))
msgtext = msg.as_bytes() if pycompat.ispy3 else msg.as_string() msgtext = msg.as_bytes() if pycompat.ispy3 else msg.as_string()
if self.test: if self.test:
self.ui.write(msgtext) self.ui.write(msgtext)
if not msgtext.endswith(b'\n'): if not msgtext.endswith(b'\n'):
self.ui.write(b'\n') self.ui.write(b'\n')
else: else:

tests/test-notify.t

$ cat > $TESTTMP/filter.py <<EOF $ cat > $TESTTMP/filter.py <<EOF
> from __future__ import absolute_import, print_function > from __future__ import absolute_import, print_function
> import re > import re
> import sys > import sys
> print(re.sub("\n[ \t]", " ", sys.stdin.read()), end="") > print(re.sub("\n[ \t]", " ", sys.stdin.read()), end="")
> EOF > EOF
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [experimental]
> evolution = true
>
> [extensions] > [extensions]
> notify= > notify=
> strip=
>
> [phases]
> publish=False
> >
> [hooks] > [hooks]
> incoming.notify = python:hgext.notify.hook > incoming.notify = python:hgext.notify.hook
> >
> [notify] > [notify]
> sources = pull > sources = pull
> diffstat = False > diffstat = False
> reply-to-predecessor = True
> messageidseed = notifyseed
> >
> [usersubs] > [usersubs]
> foo@bar = * > foo@bar = *
> >
> [reposubs] > [reposubs]
> * = baz > * = baz
> EOF > EOF
$ hg help notify $ hg help notify
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
"From" field of the notification mail. If not set, take the user from the "From" field of the notification mail. If not set, take the user from the
pushing repo. Default: False. pushing repo. Default: False.
notify.reply-to-predecessor (EXPERIMENTAL)
If set and the changeset has a predecessor in the repository, try to thread
the notification mail with the predecessor. This adds the "In-Reply-To"
header to the notification mail with a reference to the predecessor with the
smallest revision number. Mail threads can still be torn, especially when
changesets are folded.
This option must be used in combination with "notify.messageidseed".
If set, the following entries will also be used to customize the If set, the following entries will also be used to customize the
notifications: notifications:
email.from email.from
Email "From" address to use if none can be found in the generated email Email "From" address to use if none can be found in the generated email
content. content.
web.baseurl web.baseurl
> "$PYTHON" $TESTDIR/unwrap-message-id.py | \ > "$PYTHON" $TESTDIR/unwrap-message-id.py | \
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 2 changes to 2 files added 1 changesets with 2 changes to 2 files
new changesets 00a13f371396 new changesets 00a13f371396 (1 drafts)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Date: * (glob) Date: * (glob)
Subject: changeset in $TESTTMP/b: b Subject: changeset in $TESTTMP/b: b
From: test@example.com From: test@example.com
X-Hg-Notification: changeset 00a13f371396 X-Hg-Notification: changeset 00a13f371396
Message-Id: <hg.ba3098a36bd4c297288d16788623a841f81f618ea961a0f0fd65de7eb1191b66@example.com> Message-Id: <hg.ba3098a36bd4c297288d16788623a841f81f618ea961a0f0fd65de7eb1191b66@example.com>
> "$PYTHON" $TESTDIR/unwrap-message-id.py | \ > "$PYTHON" $TESTDIR/unwrap-message-id.py | \
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 2 changes to 2 files added 1 changesets with 2 changes to 2 files
new changesets 00a13f371396 new changesets 00a13f371396 (1 drafts)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: b Subject: b
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 00a13f371396 X-Hg-Notification: changeset 00a13f371396
> "$PYTHON" $TESTDIR/unwrap-message-id.py | \ > "$PYTHON" $TESTDIR/unwrap-message-id.py | \
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 2 changes to 2 files added 1 changesets with 2 changes to 2 files
new changesets 00a13f371396 new changesets 00a13f371396 (1 drafts)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: b Subject: b
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 00a13f371396 X-Hg-Notification: changeset 00a13f371396
> "$PYTHON" $TESTDIR/unwrap-message-id.py | \ > "$PYTHON" $TESTDIR/unwrap-message-id.py | \
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 0 changes to 0 files added 2 changesets with 0 changes to 0 files
new changesets 3332653e1f3c:fccf66cd0c35 new changesets 3332653e1f3c:fccf66cd0c35 (2 drafts)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: adda2 Subject: adda2
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 3332653e1f3c X-Hg-Notification: changeset 3332653e1f3c
> "$PYTHON" $TESTDIR/unwrap-message-id.py | \ > "$PYTHON" $TESTDIR/unwrap-message-id.py | \
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 0f25f9c22b4c new changesets 0f25f9c22b4c (1 drafts)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: \xc3\xa0... (esc) (no-py3 !) Subject: \xc3\xa0... (esc) (no-py3 !)
Subject: =?utf-8?b?w6AuLi4=?= (py3 !) Subject: =?utf-8?b?w6AuLi4=?= (py3 !)
From: test@test.com From: test@test.com
$ hg --cwd a commit -A -m "long line" $ hg --cwd a commit -A -m "long line"
$ hg --traceback --cwd b pull ../a $ hg --traceback --cwd b pull ../a
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets a846b5f6ebb7 new changesets a846b5f6ebb7 (1 drafts)
notify: sending 2 subscribers 1 changes notify: sending 2 subscribers 1 changes
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ cat b/mbox | "$PYTHON" $TESTDIR/unwrap-message-id.py | "$PYTHON" $TESTTMP/filter.py $ cat b/mbox | "$PYTHON" $TESTDIR/unwrap-message-id.py | "$PYTHON" $TESTTMP/filter.py
From test@test.com ... ... .. ..:..:.. .... (re) From test@test.com ... ... .. ..:..:.. .... (re)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="*" (glob) Content-Type: text/plain; charset="*" (glob)
Content-Transfer-Encoding: quoted-printable Content-Transfer-Encoding: quoted-printable
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: long line Subject: long line
From: test@test.com From: test@test.com
X-Hg-Notification: changeset a846b5f6ebb7 X-Hg-Notification: changeset a846b5f6ebb7
Message-Id: <hg.a846b5f6ebb7.*.*@*> (glob) Message-Id: <hg.e7dc7658565793ff33c797e72b7d1f3799347b042af3c40df6d17c8d5c3e560a@test.com>
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset a846b5f6ebb7 in b changeset a846b5f6ebb7 in b
description: long line description: long line
diffstat: diffstat:
a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diffs (8 lines): diffs (8 lines):
> */a#branch(test) = will_no_be_send@example.com > */a#branch(test) = will_no_be_send@example.com
> */b#branch(test) = notify@example.com > */b#branch(test) = notify@example.com
> EOF > EOF
$ hg --cwd a branch test $ hg --cwd a branch test
marked working directory as branch test marked working directory as branch test
(branches are permanent and global, did you want a bookmark?) (branches are permanent and global, did you want a bookmark?)
$ echo a >> a/a $ echo a >> a/a
$ hg --cwd a ci -m test -d '1 0' $ hg --cwd a ci -m test -d '1 0'
$ echo a >> a/a
$ hg --cwd a ci -m test -d '1 0'
$ hg --traceback --cwd b pull ../a | \ $ hg --traceback --cwd b pull ../a | \
> "$PYTHON" $TESTDIR/unwrap-message-id.py | \ > "$PYTHON" $TESTDIR/unwrap-message-id.py | \
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 2 changesets with 2 changes to 1 files
new changesets f7e5aaed4080 new changesets f7e5aaed4080:485bf79b9464 (2 drafts)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: test Subject: test
From: test@test.com From: test@test.com
X-Hg-Notification: changeset f7e5aaed4080 X-Hg-Notification: changeset f7e5aaed4080
Message-Id: <hg.f7e5aaed4080.*.*@*> (glob) Message-Id: <hg.12e9ae631e2529e9cfbe7a93be0dd8a401280700640f802a60f20d7be659251d@test.com>
To: baz@test.com, foo@bar, notify@example.com To: baz@test.com, foo@bar, notify@example.com
changeset f7e5aaed4080 in b changeset f7e5aaed4080 in b
description: test description: test
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
X-Test: foo
Date: * (glob)
Subject: test
From: test@test.com
X-Hg-Notification: changeset 485bf79b9464
Message-Id: <hg.15281d60c27d9d5fb70435d33ebc24cb5aa580f2535988dcb9923c26e8bc5c47@test.com>
To: baz@test.com, foo@bar, notify@example.com
changeset 485bf79b9464 in b
description: test
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
revset selection: don't send to address that waits for mails revset selection: don't send to address that waits for mails
from different branch from different branch
$ hg --cwd a update default $ hg --cwd a update default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a >> a/a $ echo a >> a/a
$ hg --cwd a ci -m test -d '1 0' $ hg --cwd a ci -m test -d '1 0'
$ hg --traceback --cwd b pull ../a | \ $ hg --traceback --cwd b pull ../a | \
> "$PYTHON" $TESTDIR/unwrap-message-id.py | \ > "$PYTHON" $TESTDIR/unwrap-message-id.py | \
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads) added 1 changesets with 0 changes to 0 files (+1 heads)
new changesets 645eb6690ecf new changesets 645eb6690ecf (1 drafts)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
X-Test: foo X-Test: foo
Date: * (glob) Date: * (glob)
Subject: test Subject: test
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 645eb6690ecf X-Hg-Notification: changeset 645eb6690ecf
Message-Id: <hg.645eb6690ecf.*.*@*> (glob) Message-Id: <hg.ba26b2c63e7deb44e86c934aeea147edde12a11b6ac94bda103dcab5028dc928@test.com>
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset 645eb6690ecf in b changeset 645eb6690ecf in b
description: test description: test
(run 'hg heads' to see heads) (run 'hg heads' to see heads)
default template: default template:
$ grep -v '^template =' $HGRCPATH > "$HGRCPATH.new" $ grep -v '^template =' $HGRCPATH > "$HGRCPATH.new"
$ mv "$HGRCPATH.new" $HGRCPATH $ mv "$HGRCPATH.new" $HGRCPATH
$ echo a >> a/a $ echo a >> a/a
$ hg --cwd a commit -m 'default template' $ hg --cwd a commit -m 'default template'
$ hg --cwd b pull ../a -q | \ $ hg --cwd b pull ../a -q | \
> "$PYTHON" $TESTDIR/unwrap-message-id.py | \ > "$PYTHON" $TESTDIR/unwrap-message-id.py | \
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Date: * (glob) Date: * (glob)
Subject: changeset in b: default template Subject: changeset in b: default template
From: test@test.com From: test@test.com
X-Hg-Notification: changeset 5cd4346eed47 X-Hg-Notification: changeset 5cd4346eed47
Message-Id: <hg.5cd4346eed47.*.*@*> (glob) Message-Id: <hg.8caa7941b24fc673d10910cb072e2d167362a3c5111cafefa47190d9b831f0a3@test.com>
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset 5cd4346eed47 in $TESTTMP/b changeset 5cd4346eed47 in $TESTTMP/b
details: http://test/b?cmd=changeset;node=5cd4346eed47 details: http://test/b?cmd=changeset;node=5cd4346eed47
description: default template description: default template
with style: with style:
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Date: * (glob) Date: * (glob)
Subject: with style Subject: with style
From: test@test.com From: test@test.com
X-Hg-Notification: changeset ec8d9d852f56 X-Hg-Notification: changeset ec8d9d852f56
Message-Id: <hg.ec8d9d852f56.*.*@*> (glob) Message-Id: <hg.ccd5049818a6a277251189ce1d6d0cca10723d58214199e7178894adb99ed918@test.com>
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset ec8d9d852f56 changeset ec8d9d852f56
with template (overrides style): with template (overrides style):
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> template = Subject: {node|short}: {desc|firstline|strip} > template = Subject: {node|short}: {desc|firstline|strip}
> From: {author} > From: {author}
> {""} > {""}
> {desc} > {desc}
> EOF > EOF
$ echo a >> a/a $ echo a >> a/a
$ hg --cwd a commit -m 'with template' $ hg --cwd a commit -m 'with template'
$ hg --cwd b pull ../a -q | \ $ hg --cwd b pull ../a -q | \
> "$PYTHON" $TESTDIR/unwrap-message-id.py | \ > "$PYTHON" $TESTDIR/unwrap-message-id.py | \
> "$PYTHON" $TESTTMP/filter.py > "$PYTHON" $TESTTMP/filter.py
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
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.7edb9765307a5a24528f3964672e794e2d21f2479e96c099bf52e02abd17b3a2@test.com>
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
with template with template
showfunc diff showfunc diff
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> showfunc = True > showfunc = True
> template = > template =
> maxdiff = -1 > maxdiff = -1
> EOF > EOF
$ cd a $ cd a
$ cat > f1 << EOF $ cat > f1 << EOF
> int main() { > int main() {
> int a = 0; > int a = 0;
> int b = 1; > int b = 1;
> int c = 2; > int c = 2;
> int d = 3; > int d = 3;
> return a + b + c + d; > return a + b + c + d;
> } > }
> EOF > EOF
$ hg commit -Am addfunction $ hg commit -Am addfunction
adding f1 adding f1
$ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee b86bc16ff894f057d023b306936f290954857187
1 new obsolescence markers
$ hg --cwd ../b pull ../a | \ $ hg --cwd ../b pull ../a | \
> "$PYTHON" $TESTDIR/unwrap-message-id.py > "$PYTHON" $TESTDIR/unwrap-message-id.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets b86bc16ff894 1 new obsolescence markers
new changesets b86bc16ff894 (1 drafts)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Date: * (glob) Date: * (glob)
Subject: addfunction Subject: addfunction
From: test@test.com From: test@test.com
X-Hg-Notification: changeset b86bc16ff894 X-Hg-Notification: changeset b86bc16ff894
Message-Id: <hg.b86bc16ff894.*.*@*> (glob) Message-Id: <hg.4c7cacfbbd6ba170656be0c8fc0d7599bd925c0d545b836816be9983e6d08448@test.com>
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset b86bc16ff894 changeset b86bc16ff894
diffs (11 lines): diffs (11 lines):
diff -r 14721b538ae3 -r b86bc16ff894 f1 diff -r 14721b538ae3 -r b86bc16ff894 f1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/f1 Thu Jan 01 00:00:00 1970 +0000 +++ b/f1 Thu Jan 01 00:00:00 1970 +0000
> int a = 0; > int a = 0;
> int b = 1; > int b = 1;
> int c = 2; > int c = 2;
> int e = 3; > int e = 3;
> return a + b + c + e; > return a + b + c + e;
> } > }
> EOF > EOF
$ hg commit -m changefunction $ hg commit -m changefunction
$ hg debugobsolete 485bf79b9464197b2ed2debd0b16252ad64ed458 e81040e9838c704d8bf17658cb11758f24e40b6b
1 new obsolescence markers
obsoleted 1 changesets
$ hg --cwd ../b --config notify.showfunc=True pull ../a | \
> "$PYTHON" $TESTDIR/unwrap-message-id.py
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
obsoleted 1 changesets
new changesets e81040e9838c (1 drafts)
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.99b80bf1c5d0bf8f8a7e60107c1aa1da367a5943b2a70a8b36517d701557edff@test.com>
In-Reply-To: <hg.15281d60c27d9d5fb70435d33ebc24cb5aa580f2535988dcb9923c26e8bc5c47@test.com>
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)
Retry the In-Reply-To, but make sure the oldest known change is older.
This can happen when folding commits that have been rebased by another user.
$ hg --cwd ../b strip tip
saved backup bundle to $TESTTMP/b/.hg/strip-backup/e81040e9838c-10aad4de-backup.hg
$ hg debugobsolete f7e5aaed408029cfe9890318245e87ef44739fdd e81040e9838c704d8bf17658cb11758f24e40b6b
1 new obsolescence markers
obsoleted 1 changesets
$ hg --cwd ../b --config notify.showfunc=True pull ../a | \ $ hg --cwd ../b --config notify.showfunc=True pull ../a | \
> "$PYTHON" $TESTDIR/unwrap-message-id.py > "$PYTHON" $TESTDIR/unwrap-message-id.py
pulling from ../a pulling from ../a
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets e81040e9838c 2 new obsolescence markers
obsoleted 2 changesets
new changesets e81040e9838c (1 drafts)
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Date: * (glob) Date: * (glob)
Subject: changefunction Subject: changefunction
From: test@test.com From: test@test.com
X-Hg-Notification: changeset e81040e9838c X-Hg-Notification: changeset e81040e9838c
Message-Id: <hg.e81040e9838c.*.*@*> (glob) Message-Id: <hg.99b80bf1c5d0bf8f8a7e60107c1aa1da367a5943b2a70a8b36517d701557edff@test.com>
In-Reply-To: <hg.12e9ae631e2529e9cfbe7a93be0dd8a401280700640f802a60f20d7be659251d@test.com>
To: baz@test.com, foo@bar To: baz@test.com, foo@bar
changeset e81040e9838c changeset e81040e9838c
diffs (12 lines): diffs (12 lines):
diff -r b86bc16ff894 -r e81040e9838c f1 diff -r b86bc16ff894 -r e81040e9838c f1
--- a/f1 Thu Jan 01 00:00:00 1970 +0000 --- a/f1 Thu Jan 01 00:00:00 1970 +0000
+++ b/f1 Thu Jan 01 00:00:00 1970 +0000 +++ b/f1 Thu Jan 01 00:00:00 1970 +0000