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

Revert "Started adding an interactive shelve option, then realized that DialogShelve is internal."

Browse Source 
This reverts commit 7f0549d51d.
This commit is contained in:
Matt Burke
2010-12-01 14:33:50 -05:00
parent 7f0549d51d
commit e0282344df
5 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitTfs.Vs2008/GitTfs.Vs2008.csproj
-3
View File
@@ -49,9 +49,6 @@
<Reference Include="Microsoft.TeamFoundation.VersionControl.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86">
<HintPath>C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\PrivateAssemblies\Microsoft.TeamFoundation.VersionControl.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.TeamFoundation.VersionControl.Controls, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86">
<HintPath>C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\PrivateAssemblies\Microsoft.TeamFoundation.VersionControl.Controls.dll</HintPath>
</Reference>
<Reference Include="Microsoft.TeamFoundation.WorkItemTracking.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86">
<HintPath>C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\PrivateAssemblies\Microsoft.TeamFoundation.WorkItemTracking.Client.dll</HintPath>
</Reference>
GitTfs.VsCommon/TfsHelper.Common.cs
+1 -10
View File
@@ -4,8 +4,7 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.TeamFoundation.Server;
using Microsoft.TeamFoundation.VersionControl.Client;
//using Microsoft.TeamFoundation.VersionControl.Controls;
using Microsoft.TeamFoundation.VersionControl.Client;
using Microsoft.TeamFoundation.WorkItemTracking.Client;
using SEP.Extensions;
using Sep.Git.Tfs.Core;
@@ -128,14 +127,6 @@ namespace Sep.Git.Tfs.VsCommon
workspace.OwnerName));
}
//public bool ShowShelveDialog(IWorkspace workspace, IShelveset shelveset, ref IPendingChange[] pendingChanges, ref TfsShelvingOptions shelvingOptions)
//{
// using(var dialog = new DialogShelve(_bridge.Unwrap(workspace)))
// {
// return false;
// }
//}
public IIdentity GetIdentity(string username)
{
return _bridge.Wrap(GroupSecurityService.ReadIdentity(SearchFactor.AccountName, username, QueryMembership.None));
GitTfs/Commands/CheckinOptions.cs
+2 -9
View File
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel;
using CommandLine.OptParse;
using Sep.Git.Tfs.Util;
@@ -12,7 +11,7 @@ namespace Sep.Git.Tfs.Commands
private List<string> _workItemsToAssociate = new List<string>();
private List<string> _workItemsToResolve = new List<string>();
[OptDef(OptValType.ValueReq)]
[OptDef(OptValType.ValueOpt)]
[ShortOptionName('m')]
[LongOptionName("comment")]
[UseNameAsLongOption(false)]
@@ -35,11 +34,5 @@ namespace Sep.Git.Tfs.Commands
[LongOptionName("resolved-work-item")]
[UseNameAsLongOption(false)]
public List<string> WorkItemsToResolve { get { return _workItemsToResolve; } }
//[OptDef(OptValType.Flag)]
//[LongOptionName("interactive")]
//[UseNameAsLongOption(false)]
//[Description("Show the TF shelve dialog.")]
//public bool Interactive { get; set; }
}
}
GitTfs/Core/TfsInterop/ITfsHelper.cs
-1
View File
@@ -17,6 +17,5 @@ namespace Sep.Git.Tfs.Core.TfsInterop
IChangeset GetChangeset(int changesetId);
bool MatchesUrl(string tfsUrl);
bool HasShelveset(string shelvesetName);
//bool ShowShelveDialog(IWorkspace workspace, IShelveset shelveset, ref IPendingChange[] pendingChanges, ref TfsShelvingOptions shelvingOptions);
}
}
GitTfs/Core/TfsWorkspace.cs
+1 -5
View File
@@ -41,11 +41,7 @@ namespace Sep.Git.Tfs.Core
var shelveset = _tfsHelper.CreateShelveset(_workspace, shelvesetName);
shelveset.Comment = _checkinOptions.CheckinComment;
shelveset.WorkItemInfo = GetWorkItemInfos().ToArray();
var shelvingOptions = _checkinOptions.Force ? TfsShelvingOptions.Replace : TfsShelvingOptions.None;
//if(_checkinOptions.Interactive)
// if(!_tfsHelper.ShowShelveDialog(_workspace, shelveset, ref pendingChanges, ref shelvingOptions))
// return;
_workspace.Shelve(shelveset, pendingChanges, shelvingOptions);
_workspace.Shelve(shelveset, pendingChanges, _checkinOptions.Force ? TfsShelvingOptions.Replace : TfsShelvingOptions.None);
}
}