Mirror_Repos/git-tfs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added "subtree split", which splits and also advances TFS refs as necessary

Browse Source 
Signed-off-by: Gordon Burgett <gordon.burgett@gmail.com>
This commit is contained in:
Gordon Burgett
2013-04-10 12:14:41 -05:00
parent a3733a8c17
commit 664202ef81
1 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitTfs/Commands/Subtree.cs
+39 -7
View File
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
@@ -71,9 +71,11 @@ namespace Sep.Git.Tfs.Commands
case "pull":
return DoPull(args.ElementAtOrDefault(1));
case "split":
return DoSplit();
default:
_stdout.WriteLine("Expected one of [add, pull, merge, split]");
_stdout.WriteLine("Expected one of [add, pull, split]");
return GitTfsExitCodes.InvalidArguments;
break;
}
@@ -173,11 +175,7 @@ namespace Sep.Git.Tfs.Commands
public int DoPull(string remoteId)
{
if (!Directory.Exists(Prefix))
{
_stdout.WriteLine("You must first add the subtree using 'git tfs subtree add -p=<prefix> [tfs-server] [tfs-repository]'");
return GitTfsExitCodes.InvalidArguments;
}
ValidatePrefix();
remoteId = remoteId ?? string.Format(GitTfsConstants.RemoteSubtreeFormat, _globals.RemoteId ?? GitTfsConstants.DefaultRepositoryId, Prefix);
IGitTfsRemote remote = _globals.Repository.ReadTfsRemote(remoteId);
@@ -194,6 +192,40 @@ namespace Sep.Git.Tfs.Commands
return result;
}
public int DoSplit()
{
ValidatePrefix();
var p = Prefix.Replace(" ", "\\ ");
List<string> args = new List<string>() { "subtree", "split", "--prefix=" + p, "-b", p };
command(args);
args = new List<string>() { "checkout", p };
command(args);
//update subtree refs if needed
var owners = _globals.Repository.GetLastParentTfsCommits("HEAD").Where(x => !x.Remote.IsSubtree && x.Remote.TfsRepositoryPath == null).ToList();
foreach (var subtree in _globals.Repository.ReadAllTfsRemotes().Where(x => x.IsSubtree && string.Equals(x.Prefix, Prefix)))
{
var updateTo = owners.FirstOrDefault(x => string.Equals(x.Remote.Id, subtree.OwningRemoteId));
if (updateTo != null && updateTo.ChangesetId > subtree.MaxChangesetId)
{
subtree.UpdateRef(updateTo.GitCommit, updateTo.ChangesetId);
}
}
return GitTfsExitCodes.OK;
}
private void ValidatePrefix()
{
if (!Directory.Exists(Prefix))
{
throw new GitTfsException(string.Format("Directory {0} does not exist", Prefix))
.WithRecommendation("Add the subtree using 'git tfs subtree add -p=<prefix> [tfs-server] [tfs-repository]'");
}
}
private void command(List<string> args)
{
_stdout.WriteLine("git " + string.Join(" ", args));