void OnGUI()
{
if (progressMode)
{
GUILayout.Label(progressString);
}
else
{
remoteSelection = EditorGUILayout.Popup(remoteSelection, remotes);
GitSystem.currentRemote = remotes[remoteSelection];
if (GUILayout.Button("Pull", GUILayout.MaxWidth(100)))
{
if (resetHard)
{
GitSystem.RunGitCmd("reset --hard");
}
GitSystem.Pull(remotes[remoteSelection], ProgressReceiver);
progressMode = true;
}
resetHard = GUILayout.Toggle(resetHard, "Hard Reset (Delete all uncomitted files first)");
}
}
static void CleanupIgnored()
{
Debug.Log(GitSystem.RunGitCmd("clean -d -X -f"));
Debug.LogWarning("This feature not yet implemented...");
// UnityGitHelper.UnityCleanupUntracked(GitSystem.GetUntrackedFilesList(false));
}
void OnGUI()
{
isGlobal = GUILayout.Toggle(isGlobal, "Global");
unset = GUILayout.Toggle(unset, "Unset value");
EditorGUILayout.BeginHorizontal();
if (!unset)
{
GUILayout.Label(label + ": ");
configValue = EditorGUILayout.TextField(configValue);
}
else
{
GUILayout.Label("");
}
EditorGUILayout.EndHorizontal();
if (GUILayout.Button("Okay", GUILayout.MaxWidth(100)))
{
string globalString = isGlobal ? "--global " : "";
string unsetString = unset ? "--unset " : "";
GitSystem.RunGitCmd("config " + globalString + unsetString + command + " " + configValue);
Close();
}
}
void OnGUI()
{
if (conflicts.Count > 0)
{
foreach (string key in conflicts.Keys)
{
ConflictData conflict = conflicts[key];
GUILayout.BeginHorizontal();
GUILayout.Label(conflict.fileName);
conflict.useMine = EditorGUILayout.Popup(conflict.useMine ? 0 : 1, resolveUsing) == 0;
if (GUILayout.Button("Diff"))
{
conflict.diffWindow = GitDiffWindow.Init(GitSystem.RunGitCmd("diff --word-diff=porcelain " + conflict.fileName));
}
if (GUILayout.Button("Resolve"))
{
GitSystem.ResolveConflict(conflict.fileName, conflict.useMine);
if (conflict.diffWindow != null)
{
conflict.diffWindow.Close();
}
conflicts.Remove(key);
return;
}
GUILayout.EndHorizontal();
foreach (string code in conflict.locationCodes)
{
// Is it ours?
if (code == "2")
{
// GUILayout.Label(GitSystem.RunGitCmd("diff -" + code + " " + conflict.fileName));
// GUILayout.Label(GitSystem.RunGitCmd("diff --ours " + conflict.fileName));
}
// Is it theirs?
if (code == "3")
{
// GUILayout.Label(GitSystem.RunGitCmd("diff -theirs " + conflict.fileName));
}
}
}
}
else
{
GUILayout.Label("No conflicts found.");
}
}
public static void CleanupUntracked()
{
Debug.Log(GitSystem.RunGitCmd("clean -d -f"));
UnityGitHelper.CleanupUntracked(GitSystem.GetUntrackedFilesList(false));
}
static void GCAuto()
{
Debug.Log(GitSystem.RunGitCmd("gc --auto"));
}
static void GCNormal()
{
Debug.Log(GitSystem.RunGitCmd("gc"));
}
static void ShowGitHelp()
{
GitSystem.RunGitCmd("help git");
}
static void GlobalAutoCRLFOff()
{
GitSystem.RunGitCmd("config --global core.autocrlf false");
ShowCRLF();
}
static void AutoCRLFOff()
{
GitSystem.RunGitCmd("config core.autocrlf false");
ShowCRLF();
}
static void AutoCRLFOn()
{
GitSystem.RunGitCmd("config core.autocrlf true");
ShowCRLF();
}
static void ShowCRLF()
{
Debug.Log("Auto CRLF mode: " + GitSystem.RunGitCmd("config --get core.autocrlf"));
}
static void Auto6700()
{
GitSystem.RunGitCmd("config gc.auto 6700");
Debug.Log("Auto value set to 6700");
}
static void GetPackSize()
{
Debug.Log("Pack size limit: " + GitSystem.RunGitCmd("config pack.packSizeLimit"));
}