Merge pull request git-tfs#727 from pmiossec/unshelve_on_current_commit

[WIP]Trying to apply shelveset on current commit when parent changeset is not...

Author: spraints

GitTfs/Commands/Unshelve.cs

@@ -50,7 +50,7 @@ public int Run(string shelvesetName, string destinationBranch)
                 TfsBranch = _globals.RemoteId;
 
             var remote = _globals.Repository.ReadTfsRemote(TfsBranch);
-            remote.Unshelve(Owner, shelvesetName, destinationBranch, BuildErrorHandler());
+            remote.Unshelve(Owner, shelvesetName, destinationBranch, BuildErrorHandler(), Force);
             _stdout.WriteLine("Created branch " + destinationBranch + " from shelveset \"" + shelvesetName + "\".");
             return GitTfsExitCodes.OK;
         }

GitTfs/Core/DerivedGitTfsRemote.cs

@@ -225,7 +225,7 @@ public void QuickFetch(int changesetId)
             throw DerivedRemoteException;
         }
 
-        public void Unshelve(string a, string b, string c, Action<Exception> h)
+        public void Unshelve(string a, string b, string c, Action<Exception> h, bool force)
         {
             throw DerivedRemoteException;
         }

GitTfs/Core/GitTfsRemote.cs

@@ -736,7 +736,7 @@ private string BuildCommitMessage(string tfsCheckinComment, long changesetId)
             return builder.ToString();
         }
 
-        public void Unshelve(string shelvesetOwner, string shelvesetName, string destinationBranch, Action<Exception> ignorableErrorHandler)
+        public void Unshelve(string shelvesetOwner, string shelvesetName, string destinationBranch, Action<Exception> ignorableErrorHandler, bool force)
         {
             var destinationRef = GitRepository.ShortToLocalName(destinationBranch);
             if(Repository.HasRef(destinationRef))
@@ -746,11 +746,22 @@ public void Unshelve(string shelvesetOwner, string shelvesetName, string destina
 
             var parentId = shelvesetChangeset.BaseChangesetId;
             var ch = GetTfsChangesetById(parentId);
+            string rootCommit;
             if (ch == null)
-                throw new GitTfsException("ERROR: Parent changeset C" + parentId  + " not found."
-                                         +" Try fetching the latest changes from TFS");
+            {
+                if (!force)
+                    throw new GitTfsException("ERROR: Parent changeset C" + parentId + " not found."
+                                              + " Try fetching the latest changes from TFS");
+                stdout.WriteLine("warning: Parent changeset C" + parentId + " not found."
+                                 + " Trying to apply the shelveset on the current commit...");
+                rootCommit = Repository.GetCurrentCommit();
+            }
+            else
+            {
+                rootCommit = ch.GitCommit;
+            }
 
-            var log = Apply(ch.GitCommit, shelvesetChangeset, ignorableErrorHandler);
+            var log = Apply(rootCommit, shelvesetChangeset, ignorableErrorHandler);
             var commit = Commit(log);
             Repository.UpdateRef(destinationRef, commit, "Shelveset " + shelvesetName + " from " + shelvesetOwner);
         }

GitTfs/Core/IGitTfsRemote.cs

@@ -50,7 +50,7 @@ public interface IGitTfsRemote
         IFetchResult FetchWithMerge(long mergeChangesetId, bool stopOnFailMergeCommit = false, params string[] parentCommitsHashes);
         void QuickFetch();
         void QuickFetch(int changesetId);
-        void Unshelve(string shelvesetOwner, string shelvesetName, string destinationBranch, Action<Exception> ignorableErrorHandler);
+        void Unshelve(string shelvesetOwner, string shelvesetName, string destinationBranch, Action<Exception> ignorableErrorHandler, bool force);
         void Shelve(string shelvesetName, string treeish, TfsChangesetInfo parentChangeset, bool evaluateCheckinPolicies);
         bool HasShelveset(string shelvesetName);
         long CheckinTool(string head, TfsChangesetInfo parentChangeset);