public void ResolveConflicts(string path, MergeFileFavor favor)
{
if (!initializer.IsValidRepo)
{
return;
}
if (favor == MergeFileFavor.Normal)
{
externalManager.HandleConflict(gitManager.ToProjectPath(path));
}
else if (favor == MergeFileFavor.Ours)
{
var conflict = gitManager.Repository.Index.Conflicts[path];
var ours = conflict.Ours;
if (ours != null)
{
gitManager.Repository.Index.Remove(ours.Path);
gitManager.Repository.CheckoutPaths("ORIG_HEAD", new[] { ours.Path });
}
}
else if (favor == MergeFileFavor.Theirs)
{
var conflict = gitManager.Repository.Index.Conflicts[path];
var theirs = conflict.Theirs;
if (theirs != null)
{
gitManager.Repository.Index.Remove(theirs.Path);
gitManager.Repository.CheckoutPaths("MERGE_HEAD", new[] { theirs.Path });
}
}
//Debug.Log(EditorUtility.InvokeDiffTool(Path.GetFileName(theirs.Path) + " - Theirs", conflictPathTheirs, Path.GetFileName(ours.Path) + " - Ours", conflictPathOurs, "", conflictPathAncestor));
}
internal void Build(IEnumerable <GitStatusEntry> status, IEnumerable <GitStatusSubModuleEntry> subModules)
{
foreach (var entry in status)
{
currentProjectPath = gitManager.ToProjectPath(entry.LocalPath);
currentPathArray = currentProjectPath.Split('\\');
currentStatus = !gitSettings.ShowEmptyFolders && gitManager.IsEmptyFolderMeta(currentProjectPath) ? FileStatus.Ignored : entry.Status;
if (cullNonAssetPaths && !UniGitPathHelper.IsPathInAssetFolder(currentProjectPath) && !UniGitPathHelper.IsPathInPackagesFolder(currentProjectPath))
{
continue;
}
AddRecursive(0, entries);
}
foreach (var module in subModules)
{
currentPathArray = UniGitPathHelper.Combine(paths.RepoProjectRelativePath, module.Path).Split('\\');
currentSubModuleStatus = module.Status;
AddSubModuleRecursive(0, entries);
}
}
internal void Build(IGenericMenu editMenu, GitDiffWindow window)
{
StatusListEntry[] entries = window.GetStatusList().Where(window.IsSelected).ToArray();
FileStatus selectedFlags = entries.Select(e => e.State).CombineFlags();
GUIContent addContent = new GUIContent("Stage", GitGUI.Textures.CollabPush);
if (GitManager.CanStage(selectedFlags))
{
editMenu.AddItem(addContent, false, () => { AddSelectedCallback(window); });
}
else
{
editMenu.AddDisabledItem(addContent);
}
GUIContent removeContent = new GUIContent("Unstage", GitGUI.Textures.CollabPull);
if (GitManager.CanUnstage(selectedFlags))
{
editMenu.AddItem(removeContent, false, () => { RemoveSelectedCallback(window); });
}
else
{
editMenu.AddDisabledItem(removeContent);
}
editMenu.AddSeparator("");
Texture2D diffIcon = GitGUI.Textures.ZoomTool;
if (entries.Length >= 1)
{
string localPath = entries[0].LocalPath;
if (selectedFlags.IsFlagSet(FileStatus.Conflicted))
{
if (conflictsHandler.CanResolveConflictsWithTool(localPath))
{
editMenu.AddItem(new GUIContent("Resolve Conflicts", "Resolve merge conflicts"), false, ResolveConflictsCallback, localPath);
}
else
{
editMenu.AddDisabledItem(new GUIContent("Resolve Conflicts"));
}
editMenu.AddItem(new GUIContent("Resolve (Using Ours)"), false, ResolveConflictsOursCallback, localPath);
editMenu.AddItem(new GUIContent("Resolve (Using Theirs)"), false, ResolveConflictsTheirsCallback, localPath);
}
else if (!selectedFlags.IsFlagSet(FileStatus.Ignored))
{
if (entries[0].MetaChange == (MetaChangeEnum.Object | MetaChangeEnum.Meta))
{
editMenu.AddItem(new GUIContent("Difference/Asset", diffIcon), false, () => { SeeDifferenceObject(entries[0]); });
editMenu.AddItem(new GUIContent("Difference/Meta", diffIcon), false, () => { SeeDifferenceMeta(entries[0]); });
}
else
{
editMenu.AddItem(new GUIContent("Difference", diffIcon), false, () => { SeeDifferenceAuto(entries[0]); });
}
if (entries[0].MetaChange == (MetaChangeEnum.Object | MetaChangeEnum.Meta))
{
editMenu.AddItem(new GUIContent("Difference with previous version/Asset", diffIcon), false, () => { SeeDifferencePrevObject(entries[0]); });
editMenu.AddItem(new GUIContent("Difference with previous version/Meta", diffIcon), false, () => { SeeDifferencePrevMeta(entries[0]); });
}
else
{
editMenu.AddItem(new GUIContent("Difference with previous version", diffIcon), false, () => { SeeDifferencePrevAuto(entries[0]); });
}
}
else
{
editMenu.AddDisabledItem(new GUIContent("Difference", diffIcon));
editMenu.AddDisabledItem(new GUIContent("Difference with previous version", diffIcon));
}
editMenu.AddSeparator("");
}
if (selectedFlags.IsFlagSet(FileStatus.Ignored))
{
editMenu.AddDisabledItem(new GUIContent("Revert", GitGUI.Textures.AnimationWindow));
}
else if (entries.Length >= 1)
{
if (entries[0].MetaChange == (MetaChangeEnum.Object | MetaChangeEnum.Meta))
{
editMenu.AddItem(new GUIContent("Revert/Asset", GitGUI.Textures.AnimationWindow), false, () => RevertSelectedObjects(window));
editMenu.AddItem(new GUIContent("Revert/Meta", GitGUI.Textures.AnimationWindow), false, () => RevertSelectedMeta(window));
}
else
{
editMenu.AddItem(new GUIContent("Revert", GitGUI.Textures.AnimationWindow), false, () => RevertSelectedCallback(window));
}
}
if (entries.Length >= 1)
{
editMenu.AddSeparator("");
if (entries[0].MetaChange == (MetaChangeEnum.Object | MetaChangeEnum.Meta))
{
if (gitManager.CanBlame(entries[0].State))
{
editMenu.AddItem(new GUIContent("Blame/Object", GitGUI.Textures.GameView), false, () => { BlameObject(entries[0]); });
editMenu.AddItem(new GUIContent("Blame/Meta", GitGUI.Textures.GameView), false, () => { BlameMeta(entries[0]); });
}
else
{
editMenu.AddDisabledItem(new GUIContent("Blame", GitGUI.Textures.GameView));
}
}
else if (entries.Length > 0)
{
if (gitManager.CanBlame(entries[0].State))
{
editMenu.AddItem(new GUIContent("Blame", GitGUI.Textures.GameView), false, () => { BlameAuto(entries[0]); });
}
else
{
editMenu.AddDisabledItem(new GUIContent("Blame", GitGUI.Textures.GameView));
}
}
}
editMenu.AddSeparator("");
if (entries.Length >= 1)
{
editMenu.AddItem(new GUIContent("Show In Explorer", GitGUI.Textures.FolderIcon), false, () => { EditorUtility.RevealInFinder(gitManager.ToProjectPath(entries[0].LocalPath)); });
}
editMenu.AddItem(new GUIContent("Open", GitGUI.Textures.OrbitTool), false, () =>
{
AssetDatabase.OpenAsset(entries.Select(e => AssetDatabase.LoadAssetAtPath <Object>(gitManager.ToProjectPath(e.LocalPath))).Where(a => a != null).ToArray());
});
editMenu.AddItem(new GUIContent("Delete", gitOverlay.icons.trashIconSmall.image), false, () =>
{
foreach (var entry in entries)
{
window.DeleteAsset(entry.LocalPath);
}
});
editMenu.AddItem(new GUIContent("Reload", GitGUI.Textures.RotateTool), false, window.ReloadCallback);
}
