예제 #1
0
        void IIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges()
        {
            List <IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
                                                      GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);

            mIncomingChangesViewLogic.ProcessMergesForConflicts(
                MergeContributorType.KeepDestination,
                fileConflicts,
                AfterProcessMerges);
        }
예제 #2
0
        void IIncomingChangesViewMenuOperations.MergeKeepingSourceChanges()
        {
            List <IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
                                                      GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);

            mIncomingChangesViewLogic.ProcessMergesForConflicts(
                MergeContributorType.KeepSource,
                fileConflicts,
                RefreshAsset.UnityAssetDatabase);
        }
예제 #3
0
        void IncomingChangesViewMenu.IMetaMenuOperations.DiffIncomingChanges()
        {
            IncomingChangeInfo incomingChange = IncomingChangesSelection.
                                                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);

            if (incomingChange == null)
            {
                return;
            }

            DiffIncomingChanges(
                mIncomingChangesTreeView.GetMetaChange(incomingChange),
                mWkInfo);
        }
예제 #4
0
        void IIncomingChangesViewMenuOperations.DiffYoursWithIncoming()
        {
            IncomingChangeInfo incomingChange = IncomingChangesSelection.
                                                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);

            if (incomingChange == null)
            {
                return;
            }

            DiffYoursWithIncoming(
                incomingChange,
                mWkInfo);
        }
        void IncomingChangesViewMenu.IMetaMenuOperations.DiffYoursWithIncoming()
        {
            if (LaunchTool.ShowDownloadPlasticExeWindow(true))
            {
                return;
            }

            IncomingChangeInfo incomingChange = IncomingChangesSelection.
                                                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);

            if (incomingChange == null)
            {
                return;
            }

            DiffYoursWithIncoming(
                mIncomingChangesTreeView.GetMetaChange(incomingChange),
                mWkInfo);
        }
예제 #6
0
        void IIncomingChangesViewMenuOperations.MergeContributors()
        {
            if (LaunchTool.ShowDownloadPlasticExeWindow(
                    mWkInfo,
                    true,
                    TrackFeatureUseEvent.Features.InstallPlasticCloudFromMergeSelectedFiles,
                    TrackFeatureUseEvent.Features.InstallPlasticEnterpriseFromMergeSelectedFiles,
                    TrackFeatureUseEvent.Features.CancelPlasticInstallationFromMergeSelectedFiles))
            {
                return;
            }

            List <IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
                                                      GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);

            mIncomingChangesViewLogic.ProcessMergesForConflicts(
                MergeContributorType.MergeContributors,
                fileConflicts,
                AfterProcessMerges);
        }
예제 #7
0
        void IncomingChangesViewMenu.IMetaMenuOperations.DiffYoursWithIncoming()
        {
            if (LaunchTool.ShowDownloadPlasticExeWindow(
                    mWkInfo,
                    true,
                    TrackFeatureUseEvent.Features.InstallPlasticCloudFromDiffYoursWithIncoming,
                    TrackFeatureUseEvent.Features.InstallPlasticEnterpriseFromDiffYoursWithIncoming,
                    TrackFeatureUseEvent.Features.CancelPlasticInstallationFromDiffYoursWithIncoming))
            {
                return;
            }

            IncomingChangeInfo incomingChange = IncomingChangesSelection.
                                                GetSingleSelectedIncomingChange(mIncomingChangesTreeView);

            if (incomingChange == null)
            {
                return;
            }

            DiffYoursWithIncoming(
                mIncomingChangesTreeView.GetMetaChange(incomingChange),
                mWkInfo);
        }
예제 #8
0
 SelectedIncomingChangesGroupInfo IIncomingChangesViewMenuOperations.GetSelectedIncomingChangesGroupInfo()
 {
     return(IncomingChangesSelection.GetSelectedGroupInfo(mIncomingChangesTreeView));
 }