Merge pull request git-tfs#253 from kgybels/unshelve

Download correct files for unshelve

Author: spraints

GitTfs.VsCommon/TfsHelper.Common.cs

@@ -223,7 +223,7 @@ public ITfsChangeset GetShelvesetData(IGitTfsRemote remote, string shelvesetOwne
             var wrapperForVersionControlServer =
                 _bridge.Wrap<WrapperForVersionControlServer, VersionControlServer>(VersionControl);
             // TODO - containerify this (no `new`)!
-            var fakeChangeset = new FakeChangeset(shelveset, change, wrapperForVersionControlServer, _bridge);
+            var fakeChangeset = new Unshelveable(shelveset, change, wrapperForVersionControlServer, _bridge);
             var tfsChangeset = new TfsChangeset(remote.Tfs, fakeChangeset, _stdout, null) { Summary = new TfsChangesetInfo { Remote = remote } };
             return tfsChangeset;
         }
@@ -298,21 +298,21 @@ private void WriteShelvesetsToStdoutDetailed(IEnumerable<Shelveset> shelvesets)
 
         #region Fake classes for unshelve
 
-        private class FakeChangeset : IChangeset
+        private class Unshelveable : IChangeset
         {
             private readonly Shelveset _shelveset;
             private readonly PendingSet _pendingSet;
             private readonly IVersionControlServer _versionControlServer;
             private readonly TfsApiBridge _bridge;
             private readonly IChange[] _changes;
 
-            public FakeChangeset(Shelveset shelveset, PendingSet pendingSet, IVersionControlServer versionControlServer, TfsApiBridge bridge)
+            public Unshelveable(Shelveset shelveset, PendingSet pendingSet, IVersionControlServer versionControlServer, TfsApiBridge bridge)
             {
                 _shelveset = shelveset;
                 _versionControlServer = versionControlServer;
                 _bridge = bridge;
                 _pendingSet = pendingSet;
-                _changes = _pendingSet.PendingChanges.Select(x => new FakeChange(x, _bridge, versionControlServer)).Cast<IChange>().ToArray();
+                _changes = _pendingSet.PendingChanges.Select(x => new UnshelveChange(x, _bridge, versionControlServer)).Cast<IChange>().ToArray();
             }
 
             public IChange[] Changes
@@ -344,19 +344,28 @@ public IVersionControlServer VersionControlServer
             {
                 get { return _versionControlServer; }
             }
+
+            public void Get(IWorkspace workspace)
+            {
+                foreach (var change in _changes)
+                {
+                    var item = (UnshelveItem)change.Item;
+                    item.Get(workspace);
+                }
+            }
         }
 
-        private class FakeChange : IChange
+        private class UnshelveChange : IChange
         {
             private readonly PendingChange _pendingChange;
             private readonly TfsApiBridge _bridge;
-            private readonly FakeItem _fakeItem;
+            private readonly UnshelveItem _fakeItem;
 
-            public FakeChange(PendingChange pendingChange, TfsApiBridge bridge, IVersionControlServer versionControlServer)
+            public UnshelveChange(PendingChange pendingChange, TfsApiBridge bridge, IVersionControlServer versionControlServer)
             {
                 _pendingChange = pendingChange;
                 _bridge = bridge;
-                _fakeItem = new FakeItem(_pendingChange, _bridge, versionControlServer);
+                _fakeItem = new UnshelveItem(_pendingChange, _bridge, versionControlServer);
             }
 
             public TfsChangeType ChangeType
@@ -370,14 +379,14 @@ public IItem Item
             }
         }
 
-        private class FakeItem : IItem
+        private class UnshelveItem : IItem
         {
             private readonly PendingChange _pendingChange;
             private readonly TfsApiBridge _bridge;
             private readonly IVersionControlServer _versionControlServer;
             private long _contentLength = -1;
 
-            public FakeItem(PendingChange pendingChange, TfsApiBridge bridge, IVersionControlServer versionControlServer)
+            public UnshelveItem(PendingChange pendingChange, TfsApiBridge bridge, IVersionControlServer versionControlServer)
             {
                 _pendingChange = pendingChange;
                 _bridge = bridge;
@@ -445,6 +454,12 @@ public TemporaryFile DownloadFile()
                 _contentLength = new FileInfo(temp).Length;
                 return temp;
             }
+
+            public void Get(IWorkspace workspace)
+            {
+                _pendingChange.DownloadShelvedFile(workspace.GetLocalItemForServerItem(_pendingChange.ServerItem));
+            }
+
         }
 
         #endregion

GitTfs.VsCommon/Wrappers.cs

@@ -105,6 +105,11 @@ public IVersionControlServer VersionControlServer
         {
             get { return _bridge.Wrap<WrapperForVersionControlServer, VersionControlServer>(_changeset.VersionControlServer); }
         }
+
+        public void Get(IWorkspace workspace)
+        {
+            workspace.GetSpecificVersion(this);
+        }
     }
 
     public class WrapperForChange : WrapperFor<Change>, IChange
@@ -459,10 +464,15 @@ public void GetSpecificVersion(int changeset)
         public void GetSpecificVersion(IChangeset changeset)
         {
             var requests = from change in changeset.Changes
-                           select new GetRequest(new ItemSpec(change.Item.ServerItem, RecursionType.None, change.Item.DeletionId), changeset.ChangesetId == -1 ? change.Item.ChangesetId : changeset.ChangesetId);
+                           select new GetRequest(new ItemSpec(change.Item.ServerItem, RecursionType.None, change.Item.DeletionId), changeset.ChangesetId);
             _workspace.Get(requests.ToArray(), GetOptions.Overwrite);
         }
 
+        public string GetLocalItemForServerItem(string serverItem)
+        {
+            return _workspace.GetLocalItemForServerItem(serverItem);
+        }
+
         public string OwnerName
         {
             get { return _workspace.OwnerName; }

GitTfs.VsFake/TfsHelper.VsFake.cs

@@ -103,6 +103,11 @@ public IVersionControlServer VersionControlServer
             {
                 get { throw new NotImplementedException(); }
             }
+
+            public void Get(IWorkspace workspace)
+            {
+                workspace.GetSpecificVersion(this);
+            }
         }
 
         class Change : IChange, IItem
@@ -265,6 +270,11 @@ public void GetSpecificVersion(int changeset)
                 throw new NotImplementedException();
             }
 
+            public string GetLocalItemForServerItem(string serverItem)
+            {
+                throw new NotImplementedException();
+            }
+
             public string OwnerName
             {
                 get { throw new NotImplementedException(); }

GitTfs/Core/TfsInterop/IChangeset.cs

@@ -10,5 +10,6 @@ public interface IChangeset
         string Comment { get; }
         int ChangesetId { get; }
         IVersionControlServer VersionControlServer { get; }
+        void Get(IWorkspace workspace);
     }
 }

GitTfs/Core/TfsInterop/IWorkspace.cs

@@ -15,6 +15,7 @@ public interface IWorkspace
         void ForceGetFile(string path, int changeset);
         void GetSpecificVersion(int changeset);
         void GetSpecificVersion(IChangeset changeset);
+        string GetLocalItemForServerItem(string serverItem);
         string OwnerName { get; }
     }
 }

GitTfs/Core/TfsWorkspace.cs

@@ -170,7 +170,7 @@ public void Get(int changesetId)
 
         public void Get(IChangeset changeset)
         {
-            _workspace.GetSpecificVersion(changeset);
+            changeset.Get(_workspace);
         }
 
         private IEnumerable<IWorkItemCheckinInfo> GetWorkItemInfos(CheckinOptions options = null)