[Ccnet-checkins] SF.net SVN: ccnet: [2512] trunk/project/core/sourcecontrol/Perforce

[<mik...@us...>]

Revision: 2512
Author:   mikeroberts
Date:     2006-08-06 16:05:37 -0700 (Sun, 06 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/ccnet/?rev=2512&view=rev

Log Message:
-----------
Adding password support for Perforce plugin

Modified Paths:
--------------
    trunk/project/UnitTests/Core/SourceControl/Perforce/P4Test.cs
    trunk/project/core/sourcecontrol/Perforce/P4.cs
    trunk/project/core/sourcecontrol/Perforce/P4ConfigProcessInfoCreator.cs
Modified: trunk/project/UnitTests/Core/SourceControl/Perforce/P4Test.cs
===================================================================
--- trunk/project/UnitTests/Core/SourceControl/Perforce/P4Test.cs	2006-08-06 08:23:19 UTC (rev 2511)
+++ trunk/project/UnitTests/Core/SourceControl/Perforce/P4Test.cs	2006-08-06 23:05:37 UTC (rev 2512)
@@ -54,6 +54,7 @@
   <view>//depot/myproject/...</view>
   <client>myclient</client>
   <user>me</user>
+  <password>mypassword</password>
   <port>anotherserver:2666</port>
   <workingDirectory>myWorkingDirectory</workingDirectory>
   <p4WebURLFormat>http://perforceWebServer:8080/@md=d&amp;cd=//&amp;c=3IB@/{0}?ac=10</p4WebURLFormat>
@@ -65,6 +66,7 @@
 			Assert.AreEqual("//depot/myproject/...", p4.View);
 			Assert.AreEqual("myclient", p4.Client);
 			Assert.AreEqual("me", p4.User);
+			Assert.AreEqual("mypassword", p4.Password);
 			Assert.AreEqual("anotherserver:2666", p4.Port);
 			Assert.AreEqual("myWorkingDirectory", p4.WorkingDirectory);
 			Assert.AreEqual("http://perforceWebServer:8080/@md=d&cd=//&c=3IB@/{0}?ac=10", p4.P4WebURLFormat);
@@ -99,6 +101,7 @@
 			Assert.AreEqual("//depot/anotherproject/...", p4.View);
 			Assert.AreEqual("", p4.Client);
 			Assert.AreEqual("", p4.User);
+			Assert.AreEqual("", p4.Password);
 			Assert.AreEqual("", p4.Port);
 		}
 
@@ -170,6 +173,7 @@
   <view>//depot/myproject/...</view>
   <client>myclient</client>
   <user>me</user>
+  <password>mypassword</password>
   <port>anotherserver:2666</port>
 </sourceControl>
 ";
@@ -177,7 +181,7 @@
 			DateTime from = new DateTime(2003, 11, 20, 2, 10, 32);
 			DateTime to = new DateTime(2004, 10, 31, 5, 5, 1);
 
-			string expectedArgs = "-s -c myclient -p anotherserver:2666 -u me"
+			string expectedArgs = "-s -c myclient -p anotherserver:2666 -u me -P mypassword"
 				+ " changes -s submitted //depot/myproject/...@2003/11/20:02:10:32,@2004/10/31:05:05:01 ";
 
 			P4 p4 = CreateP4WithNoArgContructor(xml);
@@ -207,12 +211,13 @@
   <view>//depot/myproject/...</view>
   <client>myclient</client>
   <user>me</user>
+  <password>mypassword</password>
   <port>anotherserver:2666</port>
 </sourceControl>
 ";
 			string changes = "3327 3328 332";
 
-			string expectedArgs = "-s -c myclient -p anotherserver:2666 -u me"
+			string expectedArgs = "-s -c myclient -p anotherserver:2666 -u me -P mypassword"
 				+ " describe -s " + changes;
 
 			P4 p4 = CreateP4WithNoArgContructor(xml);

Modified: trunk/project/core/sourcecontrol/Perforce/P4.cs
===================================================================
--- trunk/project/core/sourcecontrol/Perforce/P4.cs	2006-08-06 08:23:19 UTC (rev 2511)
+++ trunk/project/core/sourcecontrol/Perforce/P4.cs	2006-08-06 23:05:37 UTC (rev 2512)
@@ -46,6 +46,9 @@
 		[ReflectorProperty("user", Required=false)]
 		public string User = string.Empty;
 
+		[ReflectorProperty("password", Required=false)]
+		public string Password = string.Empty;
+
 		[ReflectorProperty("port", Required=false)]
 		public string Port = string.Empty;
 

Modified: trunk/project/core/sourcecontrol/Perforce/P4ConfigProcessInfoCreator.cs
===================================================================
--- trunk/project/core/sourcecontrol/Perforce/P4ConfigProcessInfoCreator.cs	2006-08-06 08:23:19 UTC (rev 2511)
+++ trunk/project/core/sourcecontrol/Perforce/P4ConfigProcessInfoCreator.cs	2006-08-06 23:05:37 UTC (rev 2512)
@@ -28,6 +28,10 @@
 			{
 				args.Append("-u " + p4.User + " ");
 			}
+			if (! StringUtil.IsBlank(p4.Password))
+			{
+				args.Append("-P " + p4.Password + " ");
+			}
 			return args.ToString();
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.