Merge branch 'master' into fixes/1511-Git-UIContext

Author: jcansdale

docs/getting-started/authenticating-to-github.md

@@ -7,12 +7,19 @@ Before you authenticate, you must already have a GitHub or GitHub Enterprise acc
 - For more information on creating a GitHub account, see "[Signing up for a new GitHub account](https://help.github.com/articles/signing-up-for-a-new-github-account/)".
 - For a GitHub Enterprise account, contact your GitHub Enterprise site administrator.
 
-> **Note:** If your organization is on the [Business plan](https://help.github.com/articles/organization-billing-plans) and has not enabled SAML single sign-on or login with username and passowrd, you must create and authorize a personal access token to access protected content. In addition, SAML single sign-on is not available for GitHub enterprise versions less than 2.12.2.
+**Note:** If your organization is on the [Business plan](https://help.github.com/articles/organization-billing-plans) and has not enabled SAML single sign-on or login with username and password, you must create and authorize a personal access token to access protected content. In addition, SAML single sign-on is not available for GitHub enterprise versions less than 2.12.2.
 
-> For more information on authenticating with SAML single sign-on, see "[About authentication with SAML single sign-on](https://help.github.com/articles/about-authentication-with-saml-single-sign-on)."
+### Scopes for personal access tokens
 
-> For more information on creating personal access tokens, see "[Creating a personal access token for the command line](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line). The required scopes for the personal access token are: `user`, `repo`, `gist`, and `write:public_key`. 
+The scopes for the personal access token are: `user`, `repo`, `gist`, and `write:public_key`. 
+- *user* scope: Grants access to the user profile data. We currently use this to display your avatar and check whether your plans lets you publish private repositories.
+- *repo* scope: Grants read/write access to code, commit statuses, invitations, collaborators, adding team memberships, and deployment statuses for public and private repositories and organizations. This is needed for all git network operations (push, pull, fetch), and for getting information about the repository you're currently working on.
+- *gist* scope: Grants write access to gists. We use this in our gist feature, so you can highlight code and create gists directly from Visual Studio
+- *write:public_key* scope: Grants access to creating, listing, and viewing details for public keys. This will allows us to add ssh support to your repositories, if you are unable to go through https (this feature is not available yet, this scope is optional)
 
+For more information on creating personal access tokens, see "[Creating a personal access token for the command line](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line). 
+
+For more information on authenticating with SAML single sign-on, see "[About authentication with SAML single sign-on](https://help.github.com/articles/about-authentication-with-saml-single-sign-on)."
 
 1. In Visual Studio, select **Team Explorer** from the **View** menu.
 ![Team Explorer in the view menu](images/view_team_explorer.png)

src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs

@@ -58,7 +58,7 @@ public PullRequestListViewModelDesigner()
 
         public IReadOnlyList<IRemoteRepositoryModel> Repositories { get; }
         public IRemoteRepositoryModel SelectedRepository { get; set; }
-
+        public IPullRequestModel CheckedOutPullRequest { get; set; }
         public ITrackingCollection<IPullRequestModel> PullRequests { get; set; }
         public IPullRequestModel SelectedPullRequest { get; set; }
 

src/GitHub.App/ViewModels/GitHubPane/PullRequestListViewModel.cs

@@ -41,10 +41,12 @@ public class PullRequestListViewModel : PanePageViewModelBase, IPullRequestListV
         public PullRequestListViewModel(
             IModelServiceFactory modelServiceFactory,
             IPackageSettings settings,
+            IPullRequestSessionManager sessionManager,
             IVisualStudioBrowser visualStudioBrowser)
         {
             Guard.ArgumentNotNull(modelServiceFactory, nameof(modelServiceFactory));
             Guard.ArgumentNotNull(settings, nameof(settings));
+            Guard.ArgumentNotNull(sessionManager, nameof(sessionManager));
             Guard.ArgumentNotNull(visualStudioBrowser, nameof(visualStudioBrowser));
 
             constructing = true;
@@ -100,6 +102,19 @@ public PullRequestListViewModel(
             OpenPullRequestOnGitHub = ReactiveCommand.Create();
             OpenPullRequestOnGitHub.Subscribe(x => DoOpenPullRequestOnGitHub((int)x));
 
+            // Get the current pull request session and the selected repository. When the session's
+            // repository is the same as our selected repository set CheckedOutPullRequest to the
+            // current session's model, so that the checked out PR can be highlighted.
+            Observable.CombineLatest(
+                sessionManager.WhenAnyValue(x => x.CurrentSession),
+                this.WhenAnyValue(x => x.SelectedRepository),
+                (s, r) => new { Session = s, Repository = r })
+                .Subscribe(x =>
+                {
+                    CheckedOutPullRequest = x.Session?.RepositoryOwner == x.Repository?.Owner ?
+                        x.Session?.PullRequest : null;
+                });
+
             constructing = false;
         }
 
@@ -245,6 +260,13 @@ public IPullRequestModel SelectedPullRequest
             set { this.RaiseAndSetIfChanged(ref selectedPullRequest, value); }
         }
 
+        IPullRequestModel checkedOutPullRequest;
+        public IPullRequestModel CheckedOutPullRequest
+        {
+            get { return checkedOutPullRequest; }
+            set { this.RaiseAndSetIfChanged(ref checkedOutPullRequest, value); }
+        }
+
         IReadOnlyList<PullRequestState> states;
         public IReadOnlyList<PullRequestState> States
         {

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestListViewModel.cs

@@ -33,6 +33,7 @@ public interface IPullRequestListViewModel : ISearchablePageViewModel, IOpenInBr
         IRemoteRepositoryModel SelectedRepository { get; set; }
         ITrackingCollection<IPullRequestModel> PullRequests { get; }
         IPullRequestModel SelectedPullRequest { get; }
+        IPullRequestModel CheckedOutPullRequest { get; }
         IReadOnlyList<PullRequestState> States { get; set; }
         PullRequestState SelectedState { get; set; }
         ObservableCollection<IAccount> Authors { get; }

src/GitHub.Exports/Models/UsageModel.cs

@@ -1,8 +1,11 @@
-namespace GitHub.Models
+using System;
+
+namespace GitHub.Models
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes", Justification = "It'll use reflection by default and we're fine with that")]
     public struct UsageModel
     {
+        public Guid Guid { get; set; }
         public bool IsGitHubUser { get; set; }
         public bool IsEnterpriseUser { get; set; }
         public string AppVersion { get; set; }

src/GitHub.Exports/Primitives/UriString.cs

@@ -129,10 +129,12 @@ bool ParseScpSyntax(string scpString)
         public bool IsValidUri => url != null;
 
         /// <summary>
-        /// Attempts a best-effort to convert the remote origin to a GitHub Repository URL.
+        /// Attempts a best-effort to convert the remote origin to a GitHub Repository URL,
+        /// optionally changing the owner.
         /// </summary>
+        /// <param name="owner">The owner to use, if null uses <see cref="Owner"/>.</param>
         /// <returns>A converted uri, or the existing one if we can't convert it (which might be null)</returns>
-        public Uri ToRepositoryUrl()
+        public Uri ToRepositoryUrl(string owner = null)
         {
             // we only want to process urls that represent network resources
             if (!IsScpUri && (!IsValidUri || IsFileUri)) return url;
@@ -141,11 +143,15 @@ public Uri ToRepositoryUrl()
                 ? url.Scheme
                 : Uri.UriSchemeHttps;
 
+            var nameWithOwner = owner != null && Owner != null ?
+                string.Format(CultureInfo.InvariantCulture, "{0}/{1}", owner, RepositoryName) :
+                NameWithOwner;
+
             return new UriBuilder
             {
                 Scheme = scheme,
                 Host = Host,
-                Path = NameWithOwner,
+                Path = nameWithOwner,
                 Port = url?.Port == 80
                     ? -1
                     : (url?.Port ?? -1)

src/GitHub.Exports/Services/IUsageService.cs

@@ -29,6 +29,11 @@ public interface IUsageService
         /// <param name="lastUpdated">The last updated date.</param>
         /// <returns>True if the last updated date is the same month as today; otherwise false.</returns>
         bool IsSameMonth(DateTimeOffset lastUpdated);
+        
+        /// <summary>
+        /// Gets a GUID that anonymously represents the user.
+        /// </summary>
+        Task<Guid> GetUserGuid();
 
         /// <summary>
         /// Starts a timer.

src/GitHub.Exports/Services/IVSUIContextFactory.cs

@@ -20,6 +20,6 @@ public VSUIContextChangedEventArgs(bool activated)
     public interface IVSUIContext
     {
         bool IsActive { get; }
-        event EventHandler<VSUIContextChangedEventArgs> UIContextChanged;
+        void WhenActivated(Action action);
     }
 }

src/GitHub.InlineReviews/ViewModels/InlineCommentThreadViewModel.cs

@@ -54,7 +54,7 @@ public override Uri GetCommentUrl(int id)
             return new Uri(string.Format(
                 CultureInfo.InvariantCulture,
                 "{0}/pull/{1}#discussion_r{2}",
-                Session.LocalRepository.CloneUrl.ToRepositoryUrl(),
+                Session.LocalRepository.CloneUrl.ToRepositoryUrl(Session.RepositoryOwner),
                 Session.PullRequest.Number,
                 id));
         }

src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj

@@ -79,6 +79,10 @@
       <HintPath>..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
       <Private>True</Private>
@@ -87,6 +91,15 @@
       <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
+      <Private>True</Private>
+      <Aliases>global</Aliases>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
       <Private>True</Private>
@@ -95,6 +108,10 @@
       <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">