Esempio n. 1
0
    void OnGUIInCommits()
    {
        EditorGUILayout.BeginHorizontal();
        EditorGUILayout.LabelField("Commits");

        if (GUILayout.Button("Refresh"))
        {
            UpdateCommitData();
        }

        EditorGUILayout.EndHorizontal();

        using (new EditorGUI.IndentLevelScope())
        {
            ScrollRectCommit = EditorGUILayout.BeginScrollView(ScrollRectCommit, GUI.skin.box, GUILayout.MinHeight(50.0f), GUILayout.MaxHeight(500.0f));

            foreach (var commit in CommitData)
            {
                EditorGUILayout.LabelField(commit.Id, commit.Message);
            }

            EditorGUILayout.EndScrollView();
        }

        EditorGUILayout.BeginHorizontal();
        EditorGUILayout.LabelField("Status");

        if (GUILayout.Button("Refresh"))
        {
            UpdateFileStatus();
        }

        EditorGUILayout.EndHorizontal();

        using (new EditorGUI.IndentLevelScope())
        {
            ScrollRect = EditorGUILayout.BeginScrollView(ScrollRect, GUI.skin.box, GUILayout.MinHeight(50.0f), GUILayout.MaxHeight(500.0f));

            foreach (var item in FileStatusData) // .Where(obj => obj.State != FileStatus.NewInWorkdir))
            {
                EditorGUILayout.LabelField(item.status.ToString(), item.filePath);
            }

            EditorGUILayout.EndScrollView();
        }

        CommitMessage = EditorGUILayout.TextArea(CommitMessage);

        if (GUILayout.Button("Commit"))
        {
            var Sign = LocalCollaborateUserData.GetSignature();
            LocalRepository.Stage("*");
            LocalRepository.Commit(CommitMessage, Sign, Sign);

            CommitMessage = "";
            StatusString  = "Commit Finished!";

            UpdateCommitData();
        }
    }
Esempio n. 2
0
    void Merge()
    {
        var Sign   = LocalCollaborateUserData.GetSignature();
        var Result = LocalRepository.Merge(LocalRepository.Head.TrackedBranch, Sign);

        if (Result.Status == MergeStatus.Conflicts)
        {
            Debug.Log("Conflict!");
        }

        AssetDatabase.Refresh();
        StatusString = "Merge Finished";

        UpdateCommitData();
        UpdateRemoteChangesList();
    }