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

Completed the unshelve spike.

Browse Source
This commit is contained in:
Matt Burke
2010-12-10 10:38:43 -05:00
committed by ivan-danilov
parent ed1c17182c
commit 37fb702606
8 changed files with 197 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitTfs.VsCommon/TfsHelper.Common.cs
+172 -8
View File
@@ -12,6 +12,7 @@ using Sep.Git.Tfs.Commands;
using Sep.Git.Tfs.Core;
using Sep.Git.Tfs.Core.TfsInterop;
using StructureMap;
using ChangeType = Microsoft.TeamFoundation.Server.ChangeType;
namespace Sep.Git.Tfs.VsCommon
{
@@ -183,20 +184,183 @@ namespace Sep.Git.Tfs.VsCommon
public abstract bool CanShowCheckinDialog { get; }
public void Unshelve(Sep.Git.Tfs.Commands.Unshelve unshelve, IList<string> args)
[Obsolete("TODO: un-spike-ify this.")]
public int Unshelve(Sep.Git.Tfs.Commands.Unshelve unshelve, IGitTfsRemote remote, IList<string> args)
{
var ListShelvesets = new Action<Shelveset[]>(shelvesets =>
{
foreach (var shelveset in shelvesets)
{
_stdout.WriteLine(" {0,-20} {1,-20}",
shelveset.OwnerName,
shelveset.Name);
}
});
var shelvesetOwner = unshelve.Owner == "all" ? null : (unshelve.Owner ?? VersionControl.AuthenticatedUser);
if(unshelve.List)
{
var user = unshelve.Owner == "all" ? null : (unshelve.Owner ?? VersionControl.AuthenticatedUser);
var shelvesets = VersionControl.QueryShelvesets(null, user);
foreach(var shelveset in shelvesets)
{
_stdout.WriteLine(" {0,-20} {1,-20}", shelveset.OwnerName, shelveset.Name);
}
var shelvesets = VersionControl.QueryShelvesets(null, shelvesetOwner);
ListShelvesets(shelvesets);
}
else
{
throw new NotImplementedException();
if(args.Count != 2)
{
_stdout.WriteLine("ERROR: Two arguments are required.");
return GitTfsExitCodes.InvalidArguments;
}
var shelvesetName = args[0];
var destinationBranch = args[1];
var shelvesets = VersionControl.QueryShelvesets(shelvesetName, shelvesetOwner);
if(shelvesets.Length != 1)
{
_stdout.WriteLine("ERROR: Unable to find shelveset \"" + shelvesetName + "\" (" + shelvesets.Length + " matches).");
ListShelvesets(shelvesets);
return GitTfsExitCodes.InvalidArguments;
}
var shelveset = shelvesets.First();
var destinationRef = "refs/heads/" + destinationBranch;
if (File.Exists(Path.Combine(remote.Repository.GitDir, destinationRef)))
{
_stdout.WriteLine("ERROR: Destination branch (" + destinationBranch + ") already exists!");
return GitTfsExitCodes.ForceRequired;
}
// Don't need this because we're just adding a branch.
//var worktreeStatus = remote.Repository.Command("ls-files", "--deleted", "--modified", "--others",
// "--exclude-standard");
//if(!string.IsNullOrEmpty(worktreeStatus))
//{
// _stdout.WriteLine("ERROR: You have a dirty working tree:");
// _stdout.Write(worktreeStatus);
// return GitTfsExitCodes.InvalidPrecondition;
//}
var change = VersionControl.QueryShelvedChanges(shelveset).Single();
var gremote = (GitTfsRemote) remote;
//var tfsChangeset = new FakeTfsChangeset(change);
var wrapperForVersionControlServer =
_bridge.Wrap<WrapperForVersionControlServer, VersionControlServer>(VersionControl);
var fakeChangeset = new FakeChangeset(shelveset, change, wrapperForVersionControlServer, _bridge);
var tfsChangeset = new TfsChangeset(remote.Tfs, fakeChangeset)
{Summary = new TfsChangesetInfo {Remote = remote}};
gremote.Apply(tfsChangeset, destinationRef);
_stdout.WriteLine("Created branch " + destinationBranch + " from shelveset \"" + shelvesetName + "\".");
}
return GitTfsExitCodes.OK;
}
class FakeChangeset : IChangeset
{
private readonly Shelveset _shelveset;
private readonly PendingSet _pendingSet;
private readonly IVersionControlServer _versionControlServer;
private readonly TfsApiBridge _bridge;
public FakeChangeset(Shelveset shelveset, PendingSet pendingSet, IVersionControlServer versionControlServer, TfsApiBridge bridge)
{
_shelveset = shelveset;
_versionControlServer = versionControlServer;
_bridge = bridge;
_pendingSet = pendingSet;
}
public IChange[] Changes
{
get { return _pendingSet.PendingChanges.Select(x => new FakeChange(x, _bridge)).Cast<IChange>().ToArray(); }
}
public string Committer
{
get { return _pendingSet.OwnerName; }
}
public DateTime CreationDate
{
get { return _shelveset.CreationDate; }
}
public string Comment
{
get { return _shelveset.Comment; }
}
public int ChangesetId
{
get { return -1; }
}
public IVersionControlServer VersionControlServer
{
get { return _versionControlServer; }
}
}
class FakeChange : IChange
{
private readonly PendingChange _pendingChange;
private readonly TfsApiBridge _bridge;
public FakeChange(PendingChange pendingChange, TfsApiBridge bridge)
{
_pendingChange = pendingChange;
_bridge = bridge;
}
public TfsChangeType ChangeType
{
get { return _bridge.Convert<TfsChangeType>(_pendingChange.ChangeType); }
}
public IItem Item
{
get { return new FakeItem(_pendingChange, _bridge); }
}
}
class FakeItem : IItem
{
private readonly PendingChange _pendingChange;
private readonly TfsApiBridge _bridge;
public FakeItem(PendingChange pendingChange, TfsApiBridge bridge)
{
_pendingChange = pendingChange;
_bridge = bridge;
}
public IVersionControlServer VersionControlServer
{
get { throw new NotImplementedException(); }
}
public int ChangesetId
{
get { throw new NotImplementedException(); }
}
public string ServerItem
{
get { return _pendingChange.ServerItem; }
}
public decimal DeletionId
{
get { return _pendingChange.DeletionId; }
}
public TfsItemType ItemType
{
get { return _bridge.Convert<TfsItemType>(_pendingChange.ItemType); }
}
public int ItemId
{
get { throw new NotImplementedException(); }
}
public void DownloadFile(string file)
{
_pendingChange.DownloadShelvedFile(file);
}
}
GitTfs/Commands/Unshelve.cs
+2 -3
View File
@@ -10,7 +10,7 @@ using StructureMap;
namespace Sep.Git.Tfs.Commands
{
[Pluggable("unshelve")]
[Description("unshelve [options] (-l | shelveset-name [ref-to-shelve]")]
[Description("unshelve [options] (-l | shelveset-name destination-branch)")]
[RequiresValidGitRepository]
public class Unshelve : GitTfsCommand
{
@@ -42,8 +42,7 @@ namespace Sep.Git.Tfs.Commands
{
// TODO -- let the remote be specified on the command line.
var remote = _globals.Repository.ReadAllTfsRemotes().First();
remote.Tfs.Unshelve(this, args);
return GitTfsExitCodes.OK;
return remote.Tfs.Unshelve(this, remote, args);
}
}
}
GitTfs/Core/GitRepository.cs
+1 -1
View File
@@ -28,7 +28,7 @@ namespace Sep.Git.Tfs.Core
_repository = new Repository(new DirectoryInfo(gitDir));
}
private string GitDir { get; set; }
public string GitDir { get; set; }
public string WorkingCopyPath { get; set; }
public string WorkingCopySubdir { get; set; }
GitTfs/Core/GitTfsRemote.cs
+7
View File
@@ -170,6 +170,13 @@ namespace Sep.Git.Tfs.Core
}
}
public void Apply(ITfsChangeset changeset, string destinationRef)
{
var log = Apply(MaxCommitHash, changeset);
var commit = Commit(log);
Repository.CommandNoisy("update-ref", destinationRef, commit);
}
public void QuickFetch()
{
var changeset = Tfs.GetLatestChangeset(this);
GitTfs/Core/IGitHelpers.cs
+12
View File
@@ -5,9 +5,21 @@ namespace Sep.Git.Tfs.Core
{
public interface IGitHelpers
{
/// <summary>
/// Runs the given git command, and returns the contents of its STDOUT.
/// </summary>
string Command(params string[] command);
/// <summary>
/// Runs the given git command, and returns the first line of its STDOUT.
/// </summary>
string CommandOneline(params string[] command);
/// <summary>
/// Runs the given git command, and passes STDOUT through to the current process's STDOUT.
/// </summary>
void CommandNoisy(params string[] command);
/// <summary>
/// Runs the given git command, and redirects STDOUT to the provided action.
/// </summary>
void CommandOutputPipe(Action<TextReader> func, params string[] command);
void CommandInputPipe(Action<TextWriter> action, params string[] command);
void CommandInputOutputPipe(Action<TextWriter, TextReader> interact, params string[] command);
GitTfs/Core/IGitRepository.cs
+1
View File
@@ -6,6 +6,7 @@ namespace Sep.Git.Tfs.Core
{
public interface IGitRepository : IGitHelpers
{
string GitDir { get; set; }
IEnumerable<IGitTfsRemote> ReadAllTfsRemotes();
IGitTfsRemote ReadTfsRemote(string remoteId);
void /*or IGitTfsRemote*/ CreateTfsRemote(string remoteId, string tfsUrl, string tfsRepositoryPath, RemoteOptions remoteOptions);
GitTfs/Core/TfsInterop/ITfsHelper.cs
+1 -1
View File
@@ -22,7 +22,7 @@ namespace Sep.Git.Tfs.Core.TfsInterop
IChangeset GetChangeset(int changesetId);
bool MatchesUrl(string tfsUrl);
bool HasShelveset(string shelvesetName);
void Unshelve(Unshelve unshelve, IList<string> args);
int Unshelve(Unshelve unshelve, IGitTfsRemote remote, IList<string> args);
bool CanShowCheckinDialog { get; }
long ShowCheckinDialog(IWorkspace workspace, IPendingChange[] pendingChanges, IEnumerable<IWorkItemCheckedInfo> checkedInfos, string checkinComment);
void CleanupWorkspaces(string workingDirectory);
GitTfs/GitTfsExitCodes.cs
+1
View File
@@ -8,5 +8,6 @@ namespace Sep.Git.Tfs
public const int Help = 1;
public const int InvalidArguments = 2;
public const int ForceRequired = 3;
public const int InvalidPrecondition = 4;
}
}