Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

git sourcecontrol add SparseCheckout support #258

Open
wants to merge 2 commits into
base: release/CCNet-1.8
Choose a base branch
from
Open

git sourcecontrol add SparseCheckout support #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b13e7e5
git sourcecontrol add SparseCheckout support
Aug 16, 2017
d236de6
Fixed without setting SparseCheckoutPaths error
Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-package.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
cls
Tools\NAnt\NAnt.exe package -buildfile:ccnet.build -D:CCNetLabel=1.5.0.0 -nologo -logfile:nant-build-package.log.txt %*
Tools\NAnt\NAnt.exe package -buildfile:ccnet.build -D:CCNetLabel=1.8.5.0 -nologo -logfile:nant-build-package.log.txt %*
echo %time% %date%
pause
38 changes: 37 additions & 1 deletion project/UnitTests/Core/SourceControl/GitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,28 @@ public void PopulateFromMinimallySpecifiedXml()
Assert.AreEqual(100, git.MaxAmountOfModificationsToFetch, "#C14");
}

[Test]
public void SparseCheckOutSpeclifedXML()
{
const string xml = @"
<git>
<executable>git</executable>
<repository>[email protected]:HRSBU/HRSPD/Radar.Family/Radar2-Mtb.git</repository>
<branch>master</branch>
<workingDirectory>D:\git\working</workingDirectory>
<autoGetSource>true</autoGetSource>
<sparseCheckoutPaths><sparseCheckoutPath>MTB</sparseCheckoutPath></sparseCheckoutPaths>
</git>";

git = (Git)NetReflector.Read(xml);
Assert.AreEqual("git", git.Executable, "#B1");
Assert.AreEqual(@"[email protected]:HRSBU/HRSPD/Radar.Family/Radar2-Mtb.git", git.Repository, "#B2");
Assert.AreEqual("master", git.Branch, "#B3");
Assert.AreEqual(@"D:\git\working", git.WorkingDirectory, "#B4");
Assert.AreEqual(true, git.AutoGetSource, "#B5");
Assert.AreEqual("MTB", git.SparseCheckoutPaths[0], "#B6");
}

[Test]
public void ShouldApplyLabelIfTagOnSuccessTrue()
{
Expand Down Expand Up @@ -265,7 +287,21 @@ public void ShouldLogWholeHistoryIfCommitNotPresentInFromIntegrationResult()

private void ExpectToExecuteWithArgumentsAndReturn(string args, ProcessResult returnValue)
{
mockProcessExecutor.ExpectAndReturn("Execute", returnValue, NewProcessInfo(args, DefaultWorkingDirectory));
var processInfo = NewProcessInfo(args, DefaultWorkingDirectory);
processInfo.StandardInputContent = "";
mockProcessExecutor.ExpectAndReturn("Execute", returnValue, processInfo);
}

private new void ExpectToExecuteArguments(string args)
{
ExpectToExecuteArguments(args, DefaultWorkingDirectory);
}

protected new void ExpectToExecuteArguments(string args, string workingDirectory)
{
ProcessInfo processInfo = NewProcessInfo(args, workingDirectory);
processInfo.StandardInputContent = "";
ExpectToExecute(processInfo);
}

[Test]
Expand Down
95 changes: 91 additions & 4 deletions project/core/sourcecontrol/Git.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Globalization;
using System.Collections.Generic;
using ThoughtWorks.CruiseControl.Remote;
using System;

namespace ThoughtWorks.CruiseControl.Core.Sourcecontrol
{
Expand Down Expand Up @@ -255,6 +256,14 @@ public class Git : ProcessSourceControl
[ReflectorProperty("workingDirectory", Required = false)]
public string WorkingDirectory { get; set; }

/// <summary>
/// use SparseCheckout to checkout path
/// </summary>
/// <version>1.8.5</version>
/// <default>sparse-checkout path</default>
[ReflectorProperty("sparseCheckoutPaths", Required = false)]
public string[] SparseCheckoutPaths { get; set; }

/// <summary>
/// Initializes a new instance of the <see cref="Git" /> class.
/// </summary>
Expand Down Expand Up @@ -331,8 +340,8 @@ public override void GetSource(IIntegrationResult result)
// checkout remote branch
GitCheckoutRemoteBranch(Branch, result);

// update submodules
if (FetchSubmodules)
// update submodules
if (FetchSubmodules)
GitUpdateSubmodules(result);

// clean up the local working copy
Expand Down Expand Up @@ -420,8 +429,28 @@ private RepositoryAction CreateUpateLocalRepository(IIntegrationResult result)
{
Log.Debug(string.Concat("[Git] Working directory '", workingDirectory, "' does not exist."));

// if the working does not exist, call git clone
GitClone(result);
// has SparseCheckout Path
if (SparseCheckoutPaths != null && SparseCheckoutPaths.Length > 0)
{
_fileSystem.CreateDirectory(workingDirectory);

//init git respository
GitInit(result);

//set sparseCheckout enable
GitSetSparseCheckout(Branch, result);

//set git remote url
GitSetRometeUrl(Repository, result);

//create sparse-checkout config
CreateSparseCheckoutConfig(gitRepositoryDirectory, SparseCheckoutPaths, result);
}
else
{
// if the working does not exist, call git clone
GitClone(result);
}

// init submodules
if (FetchSubmodules)
Expand Down Expand Up @@ -483,6 +512,7 @@ private ProcessInfo NewProcessInfo(string args, IIntegrationResult result, Proce
var processInfo = new ProcessInfo(Executable, args, BaseWorkingDirectory(result), priority,
successExitCodes);
//processInfo.StreamEncoding = Encoding.UTF8;
processInfo.StandardInputContent = "";
return processInfo;
}

Expand Down Expand Up @@ -631,6 +661,63 @@ private void GitFetch(IIntegrationResult result)
ProcessExecutor.ProcessOutput -= ProcessExecutor_ProcessOutput;
}

/// <summary>
/// git init
/// </summary>
/// <param name="result"></param>
private void GitInit(IIntegrationResult result)
{
ProcessArgumentBuilder buffer = new ProcessArgumentBuilder();
buffer.AddArgument("init");
Execute(NewProcessInfo(buffer.ToString(), result));
}

/// <summary>
/// Set SparseCheckout
/// </summary>
/// <param name="branchName"></param>
/// <param name="result"></param>
private void GitSetSparseCheckout(string branchName, IIntegrationResult result)
{
ProcessArgumentBuilder buffer = new ProcessArgumentBuilder();
buffer.AddArgument("config");
buffer.AddArgument("core.sparsecheckout");
buffer.AddArgument("true");
Execute(NewProcessInfo(buffer.ToString(), result));
}

/// <summary>
/// Set git Romete Url
/// </summary>
/// <param name="repository"></param>
/// <param name="result"></param>
private void GitSetRometeUrl(string repository, IIntegrationResult result)
{
ProcessArgumentBuilder buffer = new ProcessArgumentBuilder();
buffer.AddArgument("remote");
buffer.AddArgument("add");
buffer.AddArgument("-f");
buffer.AddArgument("origin");
buffer.AddArgument(repository);
Execute(NewProcessInfo(buffer.ToString(), result));
}

/// <summary>
/// Create SparseCheckout config file
/// </summary>
/// <param name="gitRepositoryDirectory"></param>
/// <param name="sparseCheckoutPaths"></param>
/// <param name="result"></param>
private void CreateSparseCheckoutConfig(string gitRepositoryDirectory, string[] sparseCheckoutPaths, IIntegrationResult result)
{
var configDir = string.Concat(gitRepositoryDirectory, @"\info\");
var configFile = string.Concat(configDir, "sparse-checkout");
if (Directory.Exists(configDir))
{
File.WriteAllLines(configFile, sparseCheckoutPaths);
}
}

/// <summary>
/// Checkout a remote branch with the "git checkout -q -f 'origin/branchName'" command.
/// </summary>
Expand Down