Mercurial > hg
changeset 14871:3a65e3f34b8c
merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 13 Jul 2011 19:24:54 -0500 |
parents | 647071c6dfcf (diff) ad6a58581ecd (current diff) |
children | 15afa4984a94 |
files | |
diffstat | 3 files changed, 54 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/notify.py Wed Jul 13 16:29:28 2011 -0500 +++ b/hgext/notify.py Wed Jul 13 19:24:54 2011 -0500 @@ -167,9 +167,6 @@ return [mail.addressencode(self.ui, s, self.charsets, self.test) for s in sorted(subs)] - def url(self, path=None): - return self.ui.config('web', 'baseurl') + (path or self.root) - def node(self, ctx, **props): '''format one changeset, unless it is a suppressed merge.''' if not self.merge and len(ctx.parents()) > 1:
--- a/tests/run-tests.py Wed Jul 13 16:29:28 2011 -0500 +++ b/tests/run-tests.py Wed Jul 13 19:24:54 2011 -0500 @@ -726,6 +726,7 @@ rename(testpath + ".err", testpath) else: rename(testpath + ".err", testpath + ".out") + result('p', test) return result('f', (test, msg))
--- a/tests/test-notify-changegroup.t Wed Jul 13 16:29:28 2011 -0500 +++ b/tests/test-notify-changegroup.t Wed Jul 13 19:24:54 2011 -0500 @@ -72,4 +72,57 @@ @@ -0,0 +1,2 @@ +a +a + $ hg --cwd a rollback + repository tip rolled back to revision -1 (undo push) + working directory now based on revision -1 +unbundle with unrelated source + + $ hg --cwd b bundle ../test.hg ../a + searching for changes + 2 changesets found + $ hg --cwd a unbundle ../test.hg + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 1 files + (run 'hg update' to get a working copy) + $ hg --cwd a rollback + repository tip rolled back to revision -1 (undo unbundle) + working directory now based on revision -1 + +unbundle with correct source + + $ hg --config notify.sources=unbundle --cwd a unbundle ../test.hg 2>&1 | + > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 1 files + Content-Type: text/plain; charset="us-ascii" + MIME-Version: 1.0 + Content-Transfer-Encoding: 7bit + Date: * (glob) + Subject: * (glob) + From: test + X-Hg-Notification: changeset cb9a9f314b8b + Message-Id: <*> (glob) + To: baz, foo@bar + + changeset cb9a9f314b8b in $TESTTMP/a + details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b + summary: a + + changeset ba677d0156c1 in $TESTTMP/a + details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1 + summary: b + + diffs (6 lines): + + diff -r 000000000000 -r ba677d0156c1 a + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 + +++ b/a Thu Jan 01 00:00:00 1970 +0000 + @@ -0,0 +1,2 @@ + +a + +a + (run 'hg update' to get a working copy)