<p4> source control block modifications (Feature #239)

Author: RubenWillems

project/UnitTests/Core/SourceControl/Perforce/P4Test.cs

@@ -429,38 +429,38 @@ public void DontLabelSourceControlIfApplyLabelNotSetEvenIfInvalidLabel()
 			VerifyAll();
 		}
 
-		[Test]
-		public void GetSourceIfGetSourceTrue()
-		{
-			P4 p4 = CreateP4();
-			p4.View = "//depot/myproject/...";
-			p4.AutoGetSource = true;
+        [Test]
+        public void GetSourceIfGetSourceTrue()
+        {
+            P4 p4 = CreateP4();
+            p4.View = "//depot/myproject/...";
+            p4.AutoGetSource = true;
 
             DateTime modificationsToDate = new DateTime(2002, 10, 31, 5, 5, 0);
-			ProcessInfo processInfo = new ProcessInfo("getSource");
-            processInfoCreatorMock.ExpectAndReturn("CreateProcessInfo", processInfo, p4, "sync @2002/10/31:05:05:00");
-			mockProcessExecutor.ExpectAndReturn("Execute", new ProcessResult("", "", 0, false), processInfo);
+            ProcessInfo processInfo = new ProcessInfo("getSource");
+            processInfoCreatorMock.ExpectAndReturn("CreateProcessInfo", processInfo, p4, "sync //depot/myproject/...@2002/10/31:05:05:00");
+            mockProcessExecutor.ExpectAndReturn("Execute", new ProcessResult("", "", 0, false), processInfo);
             p4.GetSource(IntegrationResultMother.CreateSuccessful(modificationsToDate));
 
-			VerifyAll();
-		}
+            VerifyAll();
+        }
 
-		[Test]
-		public void GetForceSourceIfGetSourceTrue()
-		{
-			P4 p4 = CreateP4();
-			p4.View = "//depot/myproject/...";
-			p4.AutoGetSource = true;
-			p4.ForceSync = true;
+        [Test]
+        public void GetForceSourceIfGetSourceTrue()
+        {
+            P4 p4 = CreateP4();
+            p4.View = "//depot/myproject/...";
+            p4.AutoGetSource = true;
+            p4.ForceSync = true;
 
             DateTime modificationsToDate = new DateTime(2002, 10, 31, 5, 5, 0);
-			ProcessInfo processInfo = new ProcessInfo("getSource");
-            processInfoCreatorMock.ExpectAndReturn("CreateProcessInfo", processInfo, p4, "sync -f @2002/10/31:05:05:00");
-			mockProcessExecutor.ExpectAndReturn("Execute", new ProcessResult("", "", 0, false), processInfo);
+            ProcessInfo processInfo = new ProcessInfo("getSource");
+            processInfoCreatorMock.ExpectAndReturn("CreateProcessInfo", processInfo, p4, "sync -f //depot/myproject/...@2002/10/31:05:05:00");
+            mockProcessExecutor.ExpectAndReturn("Execute", new ProcessResult("", "", 0, false), processInfo);
             p4.GetSource(IntegrationResultMother.CreateSuccessful(modificationsToDate));
 
-			VerifyAll();
-		}
+            VerifyAll();
+        }
 
 		[Test]
 		public void DontGetSourceIfGetSourceFalse()

project/core/sourcecontrol/Perforce/P4.cs

@@ -172,6 +172,30 @@ private void InitialiseDefaults()
         [ReflectorProperty("port", Required = false)]
         public string Port { get; set; }
 
+        /// <summary>
+        /// The perforce character set to use.
+        /// </summary>
+        /// <version>1.8</version>
+        /// <default>Performance environment setting</default>
+        [ReflectorProperty("charset", Required = false)]
+        public string CharSet { get; set; }
+
+        /// <summary>
+        /// The perforce command character set to use.
+        /// </summary>
+        /// <version>1.8</version>
+        /// <default>Performance environment setting</default>
+        [ReflectorProperty("commandcharset", Required = false)]
+        public string CommandCharSet { get; set; }
+
+        /// <summary>
+        /// Encoding Code page to use for communicating with perforce
+        /// </summary>
+        /// <version>1.8</version>
+        /// <default>CurrentEmpty String, will default to an encoding for the operating system's current ANSI code page.</default>
+        [ReflectorProperty("codepage", Required = false)]
+        public int CodePage { get; set; }
+
         /// <summary>
         /// The working directory to use.
         /// </summary>
@@ -509,15 +533,18 @@ public override void GetSource(IIntegrationResult result)
 
         private string CreateSyncCommandLine(DateTime modificationsToDate)
 		{
-			string commandline = "sync";
-			if (ForceSync)
-			{
-				commandline += " -f";
-			}
+            StringBuilder commandline = new StringBuilder("sync");
+            if (ForceSync)
+            {
+                commandline.Append(" -f");
+            }
 
-            commandline += " @" + FormatDate(modificationsToDate);
+            foreach (string viewline in View.Split(','))
+            {
+                commandline.Append(' ').Append(viewline).Append('@').Append(FormatDate(modificationsToDate));
+            }
 
-			return commandline;
+			return commandline.ToString();
 		}
 
         /// <summary>
@@ -595,4 +622,4 @@ private void FillIssueUrl(Modification[] modifications)
             }
         }
 	}
-}
+}