Exemplo n.º 1
0
 void OpenChangesetView(MergeSelection what)
 {
     try
     {
         if (!what.SourceBranch.IsSubBranch && !Repository.Instance.TfsBridgeProvider.CompleteBranchList.Any(branch => branch.Equals(what.SourceBranch)))
         {
             var mbvm = new MessageBoxViewModel("Active team project", "The branch you selected belongs to a team project which is currently not active.\nPlease switch to that project in the team explorer pane and try again", MessageBoxViewModel.MessageBoxButtons.OK);
             Repository.Instance.ViewManager.ShowModal(mbvm);
             return;
         }
         var settings = Repository.Instance.ProfileProvider.GetDefaultProfile();
         settings.CSSourceBranch = what.SourceBranch.Name;
         settings.CSTargetBranch = what.TargetBranch.Name;
         settings.DateFromFilter = null;
         settings.DateToFilter   = null;
         settings.CSQueryName    = null;
         settings.ChangesetExcludeCommentFilter = null;
         settings.ChangesetIncludeCommentFilter = null;
         ShowChangesetView();
     }
     catch (Exception ex)
     {
         SimpleLogger.Log(ex);
         throw;
     }
 }
Exemplo n.º 2
0
 void MergeToTarget(MergeSelection what)
 {
     try
     {
         IEnumerable <ITfsChangeset> changesets = null;
         if (Repository.Instance.BackgroundTaskManager.RunWithCancelDialog(
                 (trackProgress) =>
         {
             trackProgress.TrackProgress.ProgressInfo = "Loading merge candidates from tfs ...";
             changesets = Repository.Instance.TfsBridgeProvider.GetMergeCandidatesForBranchToBranch(what.SourceBranch, what.TargetBranch, what.SourceFilter);
         }))
         {
             PrepareMergeViewModel vm = new PrepareMergeViewModel(_tfsItemCache, changesets);
             vm.MergeSource = what.SourceBranch;
             vm.MergeTarget = what.TargetBranch;
             vm.PathFilter  = what.SourceFilter;
             if (Repository.Instance.Settings.FetchSettings <bool>(Constants.Settings.PerformNonModalMergeKey))
             {
                 vMergePackage.OpenMergeView(vm);
             }
             else
             {
                 Repository.Instance.ViewManager.ShowModal(vm, "Modal");
             }
         }
     }
     catch (Exception ex)
     {
         SimpleLogger.Log(ex);
         throw;
     }
 }