Exemplo n.º 1
0
        void IIncomingChangesViewMenuOperations.MergeContributors()
        {
            if (LaunchTool.ShowDownloadPlasticExeWindow(
                    mWkInfo,
                    false,
                    TrackFeatureUseEvent.Features.InstallPlasticCloudFromMergeSelectedFiles,
                    TrackFeatureUseEvent.Features.InstallPlasticEnterpriseFromMergeSelectedFiles,
                    TrackFeatureUseEvent.Features.CancelPlasticInstallationFromMergeSelectedFiles))
            {
                return;
            }

            List <string> selectedPaths = IncomingChangesSelection.
                                          GetPathsFromSelectedFileConflictsIncludingMeta(
                mIncomingChangesTreeView);

            mMergeViewLogic.ProcessMerges(
                mWorkspaceWindow,
                mSwitcher,
                mGuiMessage,
                selectedPaths,
                MergeContributorType.MergeContributors,
                RefreshAsset.UnityAssetDatabase,
                null);
        }
Exemplo n.º 2
0
        void IncomingChangesViewMenu.IMetaMenuOperations.DiffYoursWithIncoming()
        {
            MergeChangeInfo incomingChange = IncomingChangesSelection.
                                             GetSingleSelectedIncomingChange(mIncomingChangesTreeView);

            if (incomingChange == null)
            {
                return;
            }

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

            if (incomingChange == null)
            {
                return;
            }

            DiffIncomingChanges(
                incomingChange,
                mWkInfo);
        }
Exemplo n.º 4
0
        void IIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges()
        {
            List <string> selectedPaths = IncomingChangesSelection.
                                          GetPathsFromSelectedFileConflictsIncludingMeta(
                mIncomingChangesTreeView);

            mMergeViewLogic.ProcessMerges(
                mWorkspaceWindow,
                mSwitcher,
                mGuiMessage,
                selectedPaths,
                MergeContributorType.KeepDestination,
                RefreshAsset.UnityAssetDatabase);
        }
Exemplo n.º 5
0
        void IIncomingChangesViewMenuOperations.MergeContributors()
        {
            List <string> selectedPaths = IncomingChangesSelection.
                                          GetPathsFromSelectedFileConflictsIncludingMeta(
                mIncomingChangesTreeView);

            mMergeViewLogic.ProcessMerges(
                mPlasticClient,
                mSwitcher,
                mGuiMessage,
                selectedPaths,
                MergeContributorType.MergeContributors,
                RefreshAsset.UnityAssetDatabase);
        }
Exemplo n.º 6
0
 SelectedIncomingChangesGroupInfo IIncomingChangesViewMenuOperations.GetSelectedIncomingChangesGroupInfo()
 {
     return(IncomingChangesSelection.GetSelectedGroupInfo(mIncomingChangesTreeView));
 }