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

Added two checkin options: ignore-missing-files and add-missing-files. This allows the user to repair lost files that were lost at some point in the synchronization history.

Browse Source
This commit is contained in:
Søren Holstebroe
2015-03-17 09:48:21 +01:00
committed by Søren Holstebroe
parent 8c74d86dc3
commit 30bad767d4
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitTfs/Commands/CheckinOptions.cs
+6
View File
@@ -36,6 +36,10 @@ namespace Sep.Git.Tfs.Commands
{ "no-gate", "Disables gated checkin.",
v => { OverrideGatedCheckIn = true; } },
{ "author=", "TFS User ID to check in on behalf of", var => AuthorTfsUserId = var },
{ "ignore-missing-files", "When applying an edit operation, ignores items that were expected to already be in TFS but were not found. Missing files indicates bad synchronization at some point. Use this option with care.",
v => IgnoreMissingItems = v != null },
{ "add-missing-files", "When applying an edit operation, add items that were expected to already be in TFS but were not found. Missing files indicates bad synchronization at some point. Use this option with care. This option is ignored if ignore-missing-files option is used.",
v => AddMissingItems = v != null },
};
}
}
@@ -57,6 +61,8 @@ namespace Sep.Git.Tfs.Commands
public string AuthorTfsUserId { get; set; }
public Regex WorkItemAssociateRegex { get; set; }
public bool IgnoreMissingItems { get; set; }
public bool AddMissingItems { get; set; }
}
}
GitTfs/Core/TfsWorkspace.cs
+21 -5
View File
@@ -143,11 +143,27 @@ namespace Sep.Git.Tfs.Core
public void Edit(string path)
{
path = GetLocalPath(path);
_stdout.WriteLine(" edit " + path);
GetFromTfs(path);
var edited = _workspace.PendEdit(path);
if (edited != 1) throw new Exception("One item should have been edited, but actually edited " + edited + " items.");
var localPath = GetLocalPath(path);
_stdout.WriteLine(" edit " + localPath);
GetFromTfs(localPath);
var edited = _workspace.PendEdit(localPath);
if (edited != 1)
{
if (_checkinOptions.IgnoreMissingItems)
{
_stdout.WriteLine("Warning: One item should have been edited, but actually edited " + edited + ". Ignoring item.");
}
else
if (edited == 0 && _checkinOptions.AddMissingItems)
{
_stdout.WriteLine("Warning: One item should have been edited, but was not found. Adding the file instead.");
Add(path);
}
else
{
throw new Exception("One item should have been edited, but actually edited " + edited + " items.");
}
}
}
public void Delete(string path)