[Cmake-commits] CMake branch, master, updated. 678073bec29201e9edba2b00b6f3c96a528fe610

[cmake-commits at cmake.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  678073bec29201e9edba2b00b6f3c96a528fe610 (commit)
      from  162597e4bff5348e17e1b0f0261310b502ffe7fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=678073bec29201e9edba2b00b6f3c96a528fe610
commit 678073bec29201e9edba2b00b6f3c96a528fe610
Author: Brad King <brad.king at kitware.com>
Date:   Fri May 7 09:17:26 2010 -0400

    CTest: Submit author email in Update.xml
    
    Add the <Email>...</Email> element in Update.xml for each commit
    reported.  This field was defined by Dart but never really used.
    Distributed version control systems use author name and email
    instead of a user id, so now it makes sense to use this field.

diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx
index 55b8d5b..36302df 100644
--- a/Source/CTest/cmCTestBZR.cxx
+++ b/Source/CTest/cmCTestBZR.cxx
@@ -292,7 +292,7 @@ private:
       if(this->EmailRegex.find(this->Rev.Author))
         {
         this->Rev.Author = this->EmailRegex.match(1);
-        //email = email_regex.match(2);
+        this->Rev.EMail = this->EmailRegex.match(2);
         }
       }
     else if(strcmp(name, "timestamp") == 0 && !this->CData.empty())
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 8bac518..156a938 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -347,6 +347,7 @@ private:
       Person author;
       this->ParsePerson(this->Line.c_str()+7, author);
       this->Rev.Author = author.Name;
+      this->Rev.EMail = author.EMail;
 
       // Convert the time to a human-readable format that is also easy
       // to machine-parse: "CCYY-MM-DD hh:mm:ss".
diff --git a/Source/CTest/cmCTestHG.cxx b/Source/CTest/cmCTestHG.cxx
index b263677..86a7617 100644
--- a/Source/CTest/cmCTestHG.cxx
+++ b/Source/CTest/cmCTestHG.cxx
@@ -220,7 +220,7 @@ private:
       }
     else if ( strcmp(name, "email") == 0 && !this->CData.empty())
       {
-      // this->Rev.Email.assign(&this->CData[0], this->CData.size());
+      this->Rev.EMail.assign(&this->CData[0], this->CData.size());
       }
     else if(strcmp(name, "date") == 0 && !this->CData.empty())
       {
diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx
index 35f567a..f9ad79a 100644
--- a/Source/CTest/cmCTestVC.cxx
+++ b/Source/CTest/cmCTestVC.cxx
@@ -227,6 +227,7 @@ void cmCTestVC::WriteXMLEntry(std::ostream& xml,
       << "\t\t\t<FullName>" << cmXMLSafe(full) << "</FullName>\n"
       << "\t\t\t<CheckinDate>" << cmXMLSafe(rev.Date) << "</CheckinDate>\n"
       << "\t\t\t<Author>" << cmXMLSafe(rev.Author) << "</Author>\n"
+      << "\t\t\t<Email>" << cmXMLSafe(rev.EMail) << "</Email>\n"
       << "\t\t\t<Log>" << cmXMLSafe(rev.Log) << "</Log>\n"
       << "\t\t\t<Revision>" << cmXMLSafe(rev.Rev) << "</Revision>\n"
       << "\t\t\t<PriorRevision>" << cmXMLSafe(prior) << "</PriorRevision>\n"
diff --git a/Source/CTest/cmCTestVC.h b/Source/CTest/cmCTestVC.h
index e6ea76d..d36bc8f 100644
--- a/Source/CTest/cmCTestVC.h
+++ b/Source/CTest/cmCTestVC.h
@@ -73,6 +73,7 @@ protected:
     std::string Rev;
     std::string Date;
     std::string Author;
+    std::string EMail;
     std::string Log;
   };
 
diff --git a/Tests/CTestUpdateBZR.cmake.in b/Tests/CTestUpdateBZR.cmake.in
index eebb4f6..7f90b50 100644
--- a/Tests/CTestUpdateBZR.cmake.in
+++ b/Tests/CTestUpdateBZR.cmake.in
@@ -39,6 +39,9 @@ create_content(import)
 run_child(WORKING_DIRECTORY ${TOP}/import
   COMMAND ${BZR} init
   )
+run_child(WORKING_DIRECTORY ${TOP}/import
+  COMMAND ${BZR} whoami --branch "Test Author <testauthor at cmake.org>"
+  )
 
 run_child(WORKING_DIRECTORY ${TOP}/import
   COMMAND ${BZR} add .
@@ -57,6 +60,10 @@ run_child(
   WORKING_DIRECTORY ${TOP}
   COMMAND ${BZR} branch "${REPO}" user-source
   )
+run_child(
+  WORKING_DIRECTORY ${TOP}/user-source
+  COMMAND ${BZR} whoami --branch "Test Author <testauthor at cmake.org>"
+  )
 
 #-----------------------------------------------------------------------------
 # Make changes in the working tree.

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestBZR.cxx   |    2 +-
 Source/CTest/cmCTestGIT.cxx   |    1 +
 Source/CTest/cmCTestHG.cxx    |    2 +-
 Source/CTest/cmCTestVC.cxx    |    1 +
 Source/CTest/cmCTestVC.h      |    1 +
 Tests/CTestUpdateBZR.cmake.in |    7 +++++++
 6 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake