Logo
HOWTO: Get the Git Conflicts in the Team Explorer of Visual Studio from a package

Author: Carlos J. Quintero (Microsoft MVP) Applies to: Microsoft Visual Studio 2013
Date: April 2015   Microsoft Visual Studio 2015
       
Introduction

The Team Explorer of Visual Studio 2012 and higher is composed of pages (such as Home, My Work, Pending Changes, Work Items, Builds, etc.) and in turn each page is composed of sections. For example, the Git Conflicts page is composed of the Conflicts and Resolved Conflicts sections. While an extension (such as a package) could interact directly as a client with some TFS server or Git Repository, in some cases your extension may be interested in the information of the different pages and sections of the Team Explorer client, for example to provide new pages, new sections inside an existing page, new menu entries in the context menus of the Team Explorer, etc.

More Information

The following package creates a menu command that, when clicked, shows the information about the Git Conflicts page. The required assemblies are the following:

  • Microsoft.TeamFoundation.Controls.dll (in folder C:\Program Files (x86)\Microsoft Visual Studio <version>\Common7\IDE\ReferenceAssemblies\v4.5\)
  • Microsoft.TeamFoundation.Git.Controls.dll (in folder C:\Program Files (x86)\Microsoft Visual Studio <version>\Common7\IDE\ReferenceAssemblies\v4.5\)
Language: C#   Copy Code Copy Code (IE only)
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.ComponentModel.Design;
using Microsoft.VisualStudio.Shell;

namespace Company.VSPackageTeamExplorer
{
   [PackageRegistration(UseManagedResourcesOnly = true)]
   [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
   [ProvideMenuResource("Menus.ctmenu", 1)]
   [Guid(GuidList.guidVSPackageTeamExplorerPkgString)]
   public sealed partial class VSPackageTeamExplorerPackage : Package
   {
      public VSPackageTeamExplorerPackage()
      {
      }

      protected override void Initialize()
      {
         base.Initialize();

         // Add our command handlers for menu (commands must exist in the .vsct file)
         OleMenuCommandService mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
         if (null != mcs)
         {
            // Create the command for the menu item.
            CommandID menuCommandID = new CommandID(GuidList.guidVSPackageTeamExplorerCmdSet, (int)PkgCmdIDList.cmdidTeamExplorerInfo);
            MenuCommand menuItem = new MenuCommand(MenuItemCallback, menuCommandID);
            mcs.AddCommand(menuItem);
         }
      }

      private void MenuItemCallback(object sender, EventArgs e)
      {
         Microsoft.TeamFoundation.Controls.ITeamExplorer teamExplorer;

         teamExplorer = base.GetService(typeof(Microsoft.TeamFoundation.Controls.ITeamExplorer))
            as Microsoft.TeamFoundation.Controls.ITeamExplorer;

         ShowGitConflictsPageInformation(teamExplorer, Microsoft.TeamFoundation.Controls.TeamExplorerPageIds.GitConflicts);
      }

      private void ShowGitConflictsPageInformation(Microsoft.TeamFoundation.Controls.ITeamExplorer teamExplorer, string pageGuid)
      {
         Microsoft.TeamFoundation.Controls.ITeamExplorerPage teamExplorerPage;
         Microsoft.TeamFoundation.Git.Controls.Extensibility.IConflictsExt conflictsExt;

         teamExplorerPage = teamExplorer.NavigateToPage(new Guid(pageGuid), null);

         conflictsExt = teamExplorerPage.GetExtensibilityService(
            typeof(Microsoft.TeamFoundation.Git.Controls.Extensibility.IConflictsExt))
            as Microsoft.TeamFoundation.Git.Controls.Extensibility.IConflictsExt;

         if (conflictsExt != null)
         {
            ShowConflicts("Conflicts", conflictsExt.Conflicts);

            ShowConflicts("SelectedConflicts", conflictsExt.SelectedConflicts);

            ShowResolvedConflicts("ResolvedConflicts", conflictsExt.ResolvedConflicts);

            ShowResolvedConflicts("SelectedResolvedConflicts", conflictsExt.SelectedResolvedConflicts);
         }
      }

      private void ShowConflicts(string description,
         IReadOnlyList<Microsoft.TeamFoundation.Git.Controls.Extensibility.IConflictsConflictItem> conflicts)
      {
         foreach (Microsoft.TeamFoundation.Git.Controls.Extensibility.IConflictsConflictItem conflict in conflicts)
         {
            ShowConflict(description, conflict);
         }
      }

      private void ShowConflict(string description, Microsoft.TeamFoundation.Git.Controls.Extensibility.IConflictsConflictItem conflict)
      {
         System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();

         stringBuilder.AppendLine(description + ":");
         stringBuilder.AppendLine();

         stringBuilder.AppendLine("AncestorSha: " + conflict.AncestorSha);
         stringBuilder.AppendLine("ConflictType: " + conflict.ConflictType);
         stringBuilder.AppendLine("LocalItem: " + conflict.LocalItem);
         stringBuilder.AppendLine("OurSha: " + conflict.OurSha);
         stringBuilder.AppendLine("TheirSha: " + conflict.TheirSha);

         System.Windows.Forms.MessageBox.Show(stringBuilder.ToString());
      }

      private void ShowResolvedConflicts(string description,
         IReadOnlyList<Microsoft.TeamFoundation.Git.Controls.Extensibility.IConflictsResolvedConflictItem> resolvedConflicts)
      {
         foreach (Microsoft.TeamFoundation.Git.Controls.Extensibility.IConflictsResolvedConflictItem resolvedConflict
            in resolvedConflicts)
         {
            ShowResolvedConflict(description, resolvedConflict);
         }
      }

      private void ShowResolvedConflict(string description,
         Microsoft.TeamFoundation.Git.Controls.Extensibility.IConflictsResolvedConflictItem resolvedConflict)
      {
         System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();

         stringBuilder.AppendLine(description + ":");
         stringBuilder.AppendLine();

         stringBuilder.AppendLine("ConflictType: " + resolvedConflict.ConflictType);
         stringBuilder.AppendLine("LocalItem: " + resolvedConflict.LocalItem);

         System.Windows.Forms.MessageBox.Show(stringBuilder.ToString());
      }
   }
}

Related articles



Go to the 'Visual Studio Extensibility (VSX)' web site for more articles like this (Articles section)