private static bool IsOpenForEdit(string assetPath, out string message)
{
if (VCCommands.Active && VCSettings.LockAssets)
{
var ap = new ComposedString(assetPath).TrimEnd(VCCAddMetaFiles.meta);
if (!VCUtility.IsMergableAsset(ap) && ap.StartsWith("Assets/"))
{
var status = VCCommands.Instance.GetAssetStatus(ap);
message = AssetStatusUtils.GetStatusText(status);
return(VCUtility.HaveAssetControl(status));
}
}
message = "";
return(true);
}
public static void HandleConflicts()
{
var conflicts = VCCommands.Instance.GetFilteredAssets(s => s.fileStatus == VCFileStatus.Conflicted || s.MetaStatus().fileStatus == VCFileStatus.Conflicted).Select(status => status.assetPath).ToArray();
if (conflicts.Any())
{
foreach (var conflictIt in conflicts)
{
if (ignoredConflicts.Contains(conflictIt))
{
continue;
}
bool mergable = VCUtility.IsMergableAsset(conflictIt);
const string explanation = "\nTheirs :\nUse the file from the server and discard local changes to the file\n\nMine :\nUse my version of the file and discard the changes someone else made on the server";
const string mergeExplanation = "\nMerge External :\nIgnore the conflict in UVC and handle the conflict in an external program";
const string ignoreExplanation = "\nIgnore :\nIgnore the conflict for now although the file will not be readable by Unity";
string message = string.Format("There is a conflict in the file:\n '{0}'\n\nUse 'Theirs' or 'Mine'?\n {1}\n{2}\n", conflictIt.Compose(), explanation, mergable ? mergeExplanation : ignoreExplanation);
int result = EditorUtility.DisplayDialogComplex("Conflict", message, "Theirs", "Mine", mergable ? "Merge External" : "Ignore");
if (result == 0 || result == 1)
{
VCCommands.Instance.Resolve(new[] { conflictIt.Compose() }, result == 0 ? ConflictResolution.Theirs : ConflictResolution.Mine);
}
else
{
ignoredConflicts.Add(conflictIt);
/*if (mergable)
* {
* string mine, theirs, basePath;
* if(VCCommands.Instance.GetConflict(conflictIt.Compose(), out basePath, out mine, out theirs))
* {
* EditorUtility.InvokeDiffTool("Mine : " + mine, mine, "Theirs : " + theirs, theirs, "Base: " + basePath, basePath);
* }
* }*/
}
}
OnNextUpdate.Do(AssetDatabase.Refresh);
}
}