tests/test-notify-changegroup.t
changeset 15654 2a7fa7c641d8
parent 15447 9910f60a37ee
child 15766 8e1854807dc2
equal deleted inserted replaced
15653:93c77d5b9752 15654:2a7fa7c641d8
   122   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   122   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   123   @@ -0,0 +1,2 @@
   123   @@ -0,0 +1,2 @@
   124   +a
   124   +a
   125   +a
   125   +a
   126   (run 'hg update' to get a working copy)
   126   (run 'hg update' to get a working copy)
       
   127 
       
   128 Check that using the first committer as the author of a changeset works:
       
   129 Check that the config option works.
       
   130 Check that the first committer is indeed used for "From:".
       
   131 Check that the merge user is NOT used for "From:"
       
   132 
       
   133 Create new file
       
   134 
       
   135   $ echo a > b/b
       
   136   $ echo b >> b/b
       
   137   $ echo c >> b/b
       
   138   $ hg --traceback --cwd b commit -Amnewfile -u committer_1
       
   139   adding b
       
   140 
       
   141 commit as one user
       
   142 
       
   143   $ echo x > b/b
       
   144   $ echo b >> b/b
       
   145   $ echo c >> b/b
       
   146   $ hg --traceback --cwd b commit -Amx -u committer_2
       
   147 
       
   148 commit as other user, change file so we can do an (automatic) merge
       
   149 
       
   150   $ hg --cwd b up 2
       
   151   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   152   $ echo a > b/b
       
   153   $ echo b >> b/b
       
   154   $ echo y >> b/b
       
   155   $ hg --traceback --cwd b commit -Amy -u committer_3
       
   156   created new head
       
   157 
       
   158 merge as a different user
       
   159 
       
   160   $ hg --cwd b merge --config notify.fromauthor=True
       
   161   merging b
       
   162   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
       
   163   (branch merge, don't forget to commit)
       
   164 
       
   165   $ hg --traceback --cwd b commit -Am "merged"
       
   166 
       
   167 push
       
   168 
       
   169   $ hg --traceback --cwd b --config notify.fromauthor=True push ../a 2>&1 |
       
   170   >     python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
       
   171   pushing to ../a
       
   172   searching for changes
       
   173   adding changesets
       
   174   adding manifests
       
   175   adding file changes
       
   176   added 4 changesets with 4 changes to 1 files
       
   177   Content-Type: text/plain; charset="us-ascii"
       
   178   MIME-Version: 1.0
       
   179   Content-Transfer-Encoding: 7bit
       
   180   Date: * (glob)
       
   181   Subject: * (glob)
       
   182   From: committer_1
       
   183   X-Hg-Notification: changeset 84e487dddc58
       
   184   Message-Id: <*> (glob)
       
   185   To: baz, foo@bar
       
   186   
       
   187   changeset 84e487dddc58 in $TESTTMP/a
       
   188   details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
       
   189   summary: newfile
       
   190   
       
   191   changeset b29c7a2b6b0c in $TESTTMP/a
       
   192   details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
       
   193   summary: x
       
   194   
       
   195   changeset 0957c7d64886 in $TESTTMP/a
       
   196   details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
       
   197   summary: y
       
   198   
       
   199   changeset 485b4e6b0249 in $TESTTMP/a
       
   200   details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249
       
   201   summary: merged
       
   202   
       
   203   diffs (7 lines):
       
   204   
       
   205   diff -r ba677d0156c1 -r 485b4e6b0249 b
       
   206   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
       
   207   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
       
   208   @@ -0,0 +1,3 @@
       
   209   +x
       
   210   +b
       
   211   +y
       
   212   $ hg --cwd a rollback
       
   213   repository tip rolled back to revision 1 (undo push)
       
   214