# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1171608889 7200
# Node ID fbf0e9acfd83fdbabc0cc657884086025378e3e5
# Parent  669f99f78db0135f70720b22a05f093cb1a66508
notify: don't try to fix addresses if notify.domain is not set

diff -r 669f99f78db0 -r fbf0e9acfd83 hgext/notify.py
--- a/hgext/notify.py	Fri Feb 16 04:54:47 2007 -0200
+++ b/hgext/notify.py	Fri Feb 16 04:54:49 2007 -0200
@@ -137,11 +137,12 @@
         '''try to clean up email addresses.'''
 
         addr = templater.email(addr.strip())
-        a = addr.find('@localhost')
-        if a != -1:
-            addr = addr[:a]
-        if '@' not in addr:
-            return addr + '@' + self.domain
+        if self.domain:
+            a = addr.find('@localhost')
+            if a != -1:
+                addr = addr[:a]
+            if '@' not in addr:
+                return addr + '@' + self.domain
         return addr
 
     def subscribers(self):
diff -r 669f99f78db0 -r fbf0e9acfd83 tests/test-notify
--- a/tests/test-notify	Fri Feb 16 04:54:47 2007 -0200
+++ b/tests/test-notify	Fri Feb 16 04:54:49 2007 -0200
@@ -8,18 +8,14 @@
 incoming.notify = python:hgext.notify.hook
 
 [notify]
-config = $HGTMP/.notify.conf
 sources = pull
-domain = test.com
-strip = 3
-template = Subject: {desc|firstline|strip}\nFrom: {author}\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip}
 diffstat = False
 
-[web]
-baseurl = http://test/
-
 [usersubs]
 foo@bar = *
+
+[reposubs]
+* = baz
 EOF
 
 hg help notify
@@ -35,6 +31,24 @@
 echo % commit
 hg --traceback --cwd a commit -Amb -d '1 0'
 
+echo '% pull (minimal config)'
+hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \
+  -e 's/changeset \([0-9a-f]* \)\?in .*test-notif/changeset \1in test-notif/' \
+  -e 's/^details: .*test-notify/details: test-notify/'
+
+cat <<EOF >> $HGRCPATH
+[notify]
+config = $HGTMP/.notify.conf
+domain = test.com
+strip = 3
+template = Subject: {desc|firstline|strip}\nFrom: {author}\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip}
+
+[web]
+baseurl = http://test/
+EOF
+
 echo % pull
+hg --cwd b rollback
 hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \
   -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/'
+
diff -r 669f99f78db0 -r fbf0e9acfd83 tests/test-notify.out
--- a/tests/test-notify.out	Fri Feb 16 04:54:47 2007 -0200
+++ b/tests/test-notify.out	Fri Feb 16 04:54:49 2007 -0200
@@ -6,7 +6,35 @@
 % clone
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % commit
+% pull (minimal config)
+pulling from ../a
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+Subject: changeset in test-notify/b: b
+From: test
+X-Hg-Notification: changeset 0647d048b600
+Message-Id:
+To: baz, foo@bar
+
+changeset 0647d048b600 in test-notify/b
+details: test-notify/b?cmd=changeset;node=0647d048b600
+description:
+	b
+
+diffs (6 lines):
+
+diff -r cb9a9f314b8b -r 0647d048b600 a
+--- a/a	Thu Jan 01 00:00:00 1970 +0000
++++ b/a	Thu Jan 01 00:00:01 1970 +0000
+@@ -1,1 +1,2 @@ a
+ a
++a
+(run 'hg update' to get a working copy)
 % pull
+rolling back last transaction
 pulling from ../a
 searching for changes
 adding changesets
@@ -17,7 +45,7 @@
 From: test@test.com
 X-Hg-Notification: changeset 0647d048b600
 Message-Id:
-To: foo@bar
+To: baz@test.com, foo@bar
 
 changeset 0647d048b600
 description: