internal void Add(GitStatusEntry entry, IComparer <StatusListEntry> sorter)
{
StatusListEntry statusEntry;
if (UniGitPathHelper.IsMetaPath(entry.LocalPath))
{
string mainAssetPath = GitManager.AssetPathFromMeta(entry.LocalPath);
if (!gitSettings.ShowEmptyFolders && gitManager.IsEmptyFolder(mainAssetPath))
{
return;
}
int index = entries.FindIndex(e => e.LocalPath == mainAssetPath);
if (index >= 0)
{
StatusListEntry ent = entries[index];
ent.MetaChange |= MetaChangeEnum.Meta;
ent.State |= entry.Status;
entries[index] = ent;
return;
}
statusEntry = new StatusListEntry(mainAssetPath, entry.Status, MetaChangeEnum.Meta, CalculateFlags(entry));
}
else
{
int index = entries.FindIndex(e => e.LocalPath == entry.LocalPath);
if (index >= 0)
{
StatusListEntry ent = entries[index];
ent.State |= entry.Status;
entries[index] = ent;
return;
}
statusEntry = new StatusListEntry(entry.LocalPath, entry.Status, MetaChangeEnum.Object, CalculateFlags(entry));
}
if (sorter != null)
{
AddSorted(statusEntry, sorter);
}
else
{
entries.Add(statusEntry);
}
}
public void RemoveRange(string[] paths)
{
foreach (var path in paths)
{
if (UniGitPathHelper.IsMetaPath(path))
{
var assetPath = GitManager.AssetPathFromMeta(path);
for (int i = entries.Count - 1; i >= 0; i--)
{
var entry = entries[i];
if (entry.LocalPath == assetPath)
{
if (entry.MetaChange.HasFlag(MetaChangeEnum.Object))
{
entry.MetaChange = entry.MetaChange.ClearFlags(MetaChangeEnum.Meta);
entries[i] = entry;
}
else
{
entries.RemoveAt(i);
}
}
}
}
else
{
for (int i = entries.Count - 1; i >= 0; i--)
{
var entry = entries[i];
if (entry.LocalPath == path)
{
if (entry.MetaChange.HasFlag(MetaChangeEnum.Meta))
{
entry.MetaChange = entry.MetaChange.ClearFlags(MetaChangeEnum.Object);
entries[i] = entry;
}
else
{
entries.RemoveAt(i);
}
}
}
}
}
}
public IEnumerator MissingFolderForDriftingMetaCreated()
{
injectionHelper.GetInstance <GitSettingsJson>().CreateFoldersForDriftingMeta = true;
string metaFileName = "Test Folder.meta";
string metaFilePath = Path.Combine(gitManager.GetCurrentRepoPath(), metaFileName);
File.WriteAllText(metaFilePath, "Test Meta");
Assert.IsTrue(File.Exists(metaFilePath));
gitManager.AutoStage(metaFileName);
yield return(null);
GitStatusEntry metaStatusEntry;
Assert.IsTrue(data.RepositoryStatus.Get(metaFileName, out metaStatusEntry));
Assert.AreEqual(FileStatus.NewInIndex, metaStatusEntry.Status);
var addedMetaCommit = gitManager.Repository.Commit("Drifting Meta Commit", signature, signature);
yield return(null);
File.Delete(metaFilePath);
gitManager.AutoStage(metaFileName);
yield return(null);
Assert.IsTrue(data.RepositoryStatus.Get(metaFileName, out metaStatusEntry));
Assert.AreEqual(FileStatus.DeletedFromIndex, metaStatusEntry.Status);
Assert.IsFalse(File.Exists(metaFilePath));
gitManager.Repository.Commit("Removed meta", signature, signature);
GitCommands.Checkout(gitManager.Repository, addedMetaCommit, new CheckoutOptions()
{
CheckoutNotifyFlags = CheckoutNotifyFlags.Updated,
OnCheckoutNotify = gitManager.CheckoutNotifyHandler
});
Assert.IsTrue(File.Exists(metaFilePath));
Assert.IsTrue(Directory.Exists(GitManager.AssetPathFromMeta(metaFilePath)));
}
internal void DoFileDiff(Rect rect, StatusListEntry info, bool enabled, bool selected, GitDiffWindow window)
{
RectOffset elementPadding = GetElementStyle().padding;
float iconSize = GetElementStyle().fixedHeight - elementPadding.vertical;
float toggleSize = styles.toggle.fixedHeight;
Event current = Event.current;
string projectPath = gitManager.ToProjectPath(info.LocalPath);
string fileName = info.Name;
GitGUI.StartEnable(enabled);
Rect stageToggleRect = new Rect(rect.x + rect.width - toggleSize * 2, rect.y + (rect.height - toggleSize) * 0.5f, toggleSize, toggleSize);
bool canUnstage = GitManager.CanUnstage(info.State);
bool canStage = GitManager.CanStage(info.State);
float maxPathSize = rect.width - stageToggleRect.width - toggleSize - 21;
if (current.type == EventType.Repaint)
{
(selected ? styles.diffElementSelected : GetElementStyle()).Draw(rect, false, false, false, false);
}
if (canStage && canUnstage)
{
maxPathSize -= stageToggleRect.width - 4;
Rect stageWarnningRect = new Rect(stageToggleRect.x - stageToggleRect.width - 4, stageToggleRect.y, stageToggleRect.width, stageToggleRect.height);
EditorGUIUtility.AddCursorRect(stageWarnningRect, MouseCursor.Link);
if (GUI.Button(stageWarnningRect, GitGUI.IconContent("console.warnicon", "", "Unstaged changed pending. Stage to update index."), GUIStyle.none))
{
string[] localPaths = gitManager.GetPathWithMeta(info.LocalPath).ToArray();
if (gitManager.Threading.IsFlagSet(GitSettingsJson.ThreadingType.Stage))
{
gitManager.AsyncStage(localPaths).onComplete += (o) => { window.Repaint(); };
}
else
{
GitCommands.Stage(gitManager.Repository, localPaths);
gitManager.MarkDirtyAuto(localPaths);
}
window.Repaint();
}
}
if (current.type == EventType.Repaint)
{
Object asset = null;
if (UniGitPathHelper.IsPathInAssetFolder(projectPath))
{
asset = AssetDatabase.LoadAssetAtPath(UniGitPathHelper.IsMetaPath(projectPath) ? GitManager.AssetPathFromMeta(projectPath) : projectPath, typeof(Object));
}
string extension = Path.GetExtension(projectPath);
GUIContent tmpContent = GUIContent.none;
if (string.IsNullOrEmpty(extension))
{
tmpContent = GitGUI.GetTempContent(styles.folderIcon, "Folder");
}
if (tmpContent.image == null)
{
if (asset != null)
{
tmpContent = GitGUI.GetTempContent(string.Empty, AssetDatabase.GetCachedIcon(projectPath), asset.GetType().Name);
}
else
{
tmpContent = GitGUI.GetTempContent(styles.defaultAssetIcon, "Unknown Type");
}
}
float x = rect.x + elementPadding.left;
GUI.Box(new Rect(x, rect.y + elementPadding.top, iconSize, iconSize), tmpContent, styles.assetIcon);
x += iconSize + 8;
styles.diffElementName.Draw(new Rect(x, rect.y + elementPadding.top + 2, rect.width - elementPadding.right - iconSize - rect.height, EditorGUIUtility.singleLineHeight), GitGUI.GetTempContent(fileName), false, selected, selected, false);
x = rect.x + elementPadding.left + iconSize + 8;
foreach (var diffTypeIcon in gitOverlay.GetDiffTypeIcons(info.State, false))
{
GUI.Box(new Rect(x, rect.y + elementPadding.top + EditorGUIUtility.singleLineHeight + 4, 21, 21), diffTypeIcon, GUIStyle.none);
x += 25;
}
if (info.MetaChange == (MetaChangeEnum.Object | MetaChangeEnum.Meta))
{
GUI.Box(new Rect(x, rect.y + elementPadding.top + EditorGUIUtility.singleLineHeight + 4, 21, 21), GitGUI.GetTempContent(gitOverlay.icons.objectIconSmall.image, "main asset file changed"), GUIStyle.none);
x += 25;
}
if (info.MetaChange.IsFlagSet(MetaChangeEnum.Meta))
{
GUI.Box(new Rect(x, rect.y + elementPadding.top + EditorGUIUtility.singleLineHeight + 4, 21, 21), GitGUI.GetTempContent(gitOverlay.icons.metaIconSmall.image, ".meta file changed"), GUIStyle.none);
x += 25;
}
if (info.Flags.IsFlagSet(StatusEntryFlags.IsLfs))
{
GUI.Box(new Rect(x, rect.y + elementPadding.top + EditorGUIUtility.singleLineHeight + 4, 21, 21), GitGUI.GetTempContent(gitOverlay.icons.lfsObjectIconSmall.image, "Lfs Object"), GUIStyle.none);
x += 25;
}
if (info.Flags.IsFlagSet(StatusEntryFlags.IsSubModule))
{
GUI.Box(new Rect(x, rect.y + elementPadding.top + EditorGUIUtility.singleLineHeight + 4, 21, 21), GitGUI.GetTempContent(gitOverlay.icons.submoduleTagIconSmall.image, "Sub Module"), GUIStyle.none);
x += 25;
}
Vector2 pathSize = styles.diffElementPath.CalcSize(GitGUI.GetTempContent(projectPath));
pathSize.x = Mathf.Min(pathSize.x, maxPathSize - x);
Rect pathRect = new Rect(x, rect.y + elementPadding.top + EditorGUIUtility.singleLineHeight, pathSize.x, EditorGUIUtility.singleLineHeight * 2);
styles.diffElementPath.Draw(pathRect, GitGUI.GetTempContent(projectPath), false, selected, selected, false);
x += pathRect.width + 4;
if (!enabled)
{
GUI.Box(new Rect(x, rect.y + elementPadding.top + EditorGUIUtility.singleLineHeight + 4, 21, 21), GitGUI.GetTempSpinAnimatedTexture(), GUIStyle.none);
//spinning animation needs constant repaint
if (gitSettings.AnimationType.HasFlag(GitSettingsJson.AnimationTypeEnum.Loading))
{
window.Repaint();
}
}
}
if (canUnstage || canStage)
{
EditorGUI.BeginChangeCheck();
EditorGUIUtility.AddCursorRect(stageToggleRect, MouseCursor.Link);
EditorGUI.Toggle(stageToggleRect, canUnstage, styles.toggle);
if (EditorGUI.EndChangeCheck())
{
bool updateFlag = false;
if (GitManager.CanStage(info.State))
{
string[] paths = gitManager.GetPathWithMeta(info.LocalPath).ToArray();
if (gitManager.Threading.IsFlagSet(GitSettingsJson.ThreadingType.Stage))
{
gitManager.AsyncStage(paths).onComplete += (o) => { window.Repaint(); };
}
else
{
GitCommands.Stage(gitManager.Repository, paths);
gitManager.MarkDirtyAuto(paths);
}
updateFlag = true;
}
else if (GitManager.CanUnstage(info.State))
{
string[] paths = gitManager.GetPathWithMeta(info.LocalPath).ToArray();
if (gitManager.Threading.IsFlagSet(GitSettingsJson.ThreadingType.Unstage))
{
gitManager.AsyncUnstage(paths).onComplete += (o) => { window.Repaint(); };
}
else
{
GitCommands.Unstage(gitManager.Repository, paths);
gitManager.MarkDirtyAuto(paths);
}
updateFlag = true;
}
if (updateFlag)
{
window.Repaint();
current.Use();
}
}
}
GitGUI.EndEnable();
}