Esempio n. 1
0
        void IIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges()
        {
            List <IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
                                                      GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);

            mIncomingChangesViewLogic.ProcessMergesForConflicts(
                MergeContributorType.KeepDestination,
                fileConflicts,
                Refresh.UnityAssetDatabase);
        }
Esempio n. 2
0
        void IncomingChangesViewMenu.IMetaMenuOperations.DiffYoursWithIncoming()
        {
            IncomingChangeInfo incomingChange = IncomingChangesSelection.
                                                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);

            if (incomingChange == null)
            {
                return;
            }

            DiffYoursWithIncoming(
                mIncomingChangesTreeView.GetMetaChange(incomingChange),
                mWkInfo);
        }
Esempio n. 3
0
        void IIncomingChangesViewMenuOperations.DiffIncomingChanges()
        {
            IncomingChangeInfo incomingChange = IncomingChangesSelection.
                                                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);

            if (incomingChange == null)
            {
                return;
            }

            DiffIncomingChanges(
                incomingChange,
                mWkInfo);
        }
Esempio n. 4
0
 SelectedIncomingChangesGroupInfo IIncomingChangesViewMenuOperations.GetSelectedIncomingChangesGroupInfo()
 {
     return(IncomingChangesSelection.GetSelectedGroupInfo(mIncomingChangesTreeView));
 }