Merge pull request #502 from github/fixes/501-push-new-branch-on-pr-creation

PR Creation: Push local branches and handle forks properly

Author: shana

src/GitHub.App/Api/ApiClient.cs

@@ -259,5 +259,10 @@ public IObservable<Branch> GetBranches(string owner, string repo)
         {
             return gitHubClient.Repository.GetAllBranches(owner, repo);
         }
+
+        public IObservable<Repository> GetRepository(string owner, string repo)
+        {
+            return gitHubClient.Repository.Get(owner, repo);
+        }
     }
 }

src/GitHub.App/Controllers/UIController.cs

@@ -339,7 +339,8 @@ void ConfigureUIHandlingStates()
                 .OnEntry(tr => RunView(UIViewType.PRCreation, CalculateDirection(tr)))
                 .PermitDynamic(Trigger.Next, () => Go(Trigger.Next))
                 .PermitDynamic(Trigger.Cancel, () => Go(Trigger.Cancel))
-                .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish));
+                .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish))
+                .OnExit(() => DisposeView(activeFlow, UIViewType.PRCreation));
 
             uiStateMachine.Configure(UIViewType.Login)
                 .OnEntry(tr => RunView(UIViewType.Login, CalculateDirection(tr)))

src/GitHub.App/GitHub.App.csproj

@@ -127,7 +127,6 @@
     <Compile Include="Factories\UIFactory.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Infrastructure\LoggingConfiguration.cs" />
-    <Compile Include="Models\BranchModel.cs" />
     <Compile Include="Models\PullRequestModel.cs" />
     <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>

src/GitHub.App/Models/Account.cs

@@ -3,7 +3,9 @@
 using System.Globalization;
 using System.Reactive.Linq;
 using System.Windows.Media.Imaging;
+using GitHub.Primitives;
 using NullGuard;
+using Octokit;
 using ReactiveUI;
 
 namespace GitHub.Models
@@ -33,6 +35,19 @@ public Account(
                 .Subscribe(x => avatar = x);
         }
 
+        public Account(Octokit.Account account)
+        {
+            Login = account.Login;
+            IsUser = (account as User) != null;
+            Uri htmlUrl;
+            IsEnterprise = Uri.TryCreate(account.HtmlUrl, UriKind.Absolute, out htmlUrl)
+                && !HostAddress.IsGitHubDotComUri(htmlUrl);
+            PrivateReposInPlan = account.Plan != null ? account.Plan.PrivateRepos : 0;
+            OwnedPrivateRepos = account.OwnedPrivateRepos;
+            IsOnFreePlan = PrivateReposInPlan == 0;
+            HasMaximumPrivateRepositories = OwnedPrivateRepos >= PrivateReposInPlan;
+        }
+
         public bool IsOnFreePlan { get; private set; }
 
         public bool HasMaximumPrivateRepositories { get; private set; }

src/GitHub.App/Models/BranchModel.cs

@@ -12,10 +12,28 @@ public RepositoryModel(long id, string name, UriString cloneUrl, bool isPrivate,
             : base(name, cloneUrl)
         {
             Id = id;
-            Owner = ownerAccount;
+            OwnerAccount = ownerAccount;
+            IsFork = isFork;
             SetIcon(isPrivate, isFork);
+            // this is an assumption, we'd have to load the repo information from octokit to know for sure
+            // probably not worth it for this ctor
+            DefaultBranch = new BranchModel("master", this);
         }
 
+        public RepositoryModel(Octokit.Repository repository)
+            : base(repository.Name, repository.CloneUrl)
+        {
+            Id = repository.Id;
+            IsFork = repository.Fork;
+            SetIcon(repository.Private, IsFork);
+            OwnerAccount = new Account(repository.Owner);
+            DefaultBranch = new BranchModel(repository.DefaultBranch, this);
+            Parent = repository.Parent != null ? new RepositoryModel(repository.Parent) : null;
+            if (Parent != null)
+                Parent.DefaultBranch.DisplayName = Parent.DefaultBranch.Id;
+        }
+
+#region Equality Things
         public void CopyFrom(IRepositoryModel other)
         {
             if (!Equals(other))
@@ -33,17 +51,17 @@ public override bool Equals([AllowNull]object obj)
             if (ReferenceEquals(this, obj))
                 return true;
             var other = obj as RepositoryModel;
-            return other != null && Id == other.Id;
+            return Equals(other);
         }
 
-        bool IEquatable<IRepositoryModel>.Equals([AllowNull]IRepositoryModel other)
+        public bool Equals([AllowNull]IRepositoryModel other)
         {
             if (ReferenceEquals(this, other))
                 return true;
             return other != null && Id == other.Id;
         }
 
-        bool IEquatable<RepositoryModel>.Equals([AllowNull]RepositoryModel other)
+        public bool Equals([AllowNull]RepositoryModel other)
         {
             if (ReferenceEquals(this, other))
                 return true;
@@ -83,11 +101,15 @@ public int CompareTo([AllowNull]RepositoryModel other)
         {
             return !(lhs == rhs);
         }
+#endregion
 
-        public IAccount Owner { get; }
+        public IAccount OwnerAccount { get; }
         public long Id { get; }
         public DateTimeOffset CreatedAt { get; set; }
         public DateTimeOffset UpdatedAt { get; set; }
+        public bool IsFork { get; }
+        [AllowNull] public IRepositoryModel Parent { [return: AllowNull] get; }
+        public IBranch DefaultBranch { get; }
 
         internal string DebuggerDisplay
         {

src/GitHub.App/Models/RepositoryModel.cs

@@ -171,6 +171,9 @@
   <data name="PasswordValidatorEmpty" xml:space="preserve">
     <value>Please enter your password</value>
   </data>
+  <data name="PRCreatedUpstream" xml:space="preserve">
+    <value>The Pull Request has been created at [{0}]({1}).</value>
+  </data>
   <data name="PublishTitle" xml:space="preserve">
     <value>Publish repository</value>
   </data>

src/GitHub.App/Resources.Designer.cs

@@ -14,13 +14,13 @@ public PullRequestCreationViewModelDesigner()
         {
             Branches = new List<IBranch>
             {
-                new BranchModel { Name = "master" },
-                new BranchModel { Name = "don/stub-ui" },
-                new BranchModel { Name = "feature/pr/views" },
-                new BranchModel { Name = "release-1.0.17.0" }
+                new BranchModel("master", new SimpleRepositoryModel("http://github.com/user/repo")),
+                new BranchModel("don/stub-ui", new SimpleRepositoryModel("http://github.com/user/repo")),
+                new BranchModel("feature/pr/views", new SimpleRepositoryModel("http://github.com/user/repo")),
+                new BranchModel("release-1.0.17.0", new SimpleRepositoryModel("http://github.com/user/repo")),
             }.AsReadOnly();
 
-            TargetBranch = new BranchModel { Name = "master" };
+            TargetBranch = new BranchModel("master", new SimpleRepositoryModel("http://github.com/user/repo"));
             SourceBranch = Branches[2];
 
             SelectedAssignee = "Haacked (Phil Haack)";

src/GitHub.App/Resources.resx

@@ -496,6 +496,7 @@ public bool OpenRepository()
 
     public class InfoPanelDesigner
     {
-        public string Message => "This is an informational message for the info panel to test things in design mode.";
+        public string Message => "This is an informational message for the [info panel](link) to test things in design mode.";
+        public MessageType MessageType => MessageType.Information;
     }
 }