Merge lp:~twom/launchpad/git-instructions-for-people into lp:launchpad

[Tom Wardill]

Add personal git instructions to Person page

[Colin Watson (cjwatson)]

review: Needs Fixing

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2017-04-18 22:17:00 +0000
+++ lib/canonical/launchpad/icing/style.css	2018-08-29 14:54:36 +0000
@@ -731,6 +731,10 @@
     background-color: #EEEEEE;
 }
 
+p#personal-git-directions pre{
+    max-width: 100%;
+}
+
 /* === Bugs === */
 
 tr.buglink-summary td {

=== modified file 'lib/lp/code/browser/gitlisting.py'
--- lib/lp/code/browser/gitlisting.py	2015-09-21 09:59:13 +0000
+++ lib/lp/code/browser/gitlisting.py	2018-08-29 14:54:36 +0000
@@ -104,6 +104,10 @@
     def repos(self):
         return GitRepositoryBatchNavigator(self, self.repo_collection)
 
+    @property
+    def show_personal_directions(self):
+        return self.user == self.context
+
 
 class TargetGitListingView(BaseGitListingView):
 

=== modified file 'lib/lp/code/browser/tests/test_gitlisting.py'
--- lib/lp/code/browser/tests/test_gitlisting.py	2018-08-23 09:30:24 +0000
+++ lib/lp/code/browser/tests/test_gitlisting.py	2018-08-29 14:54:36 +0000
@@ -348,6 +348,19 @@
         view = create_initialized_view(self.target, '+git')
         self.assertIsNotNone(find_tag_by_id(view(), 'active-review-count'))
 
+    def test_personal_git_instructions_not_present(self):
+        with person_logged_in(self.owner):
+            view = create_initialized_view(
+                self.target, '+git', principal=self.owner)
+            self.assertIsNone(
+                find_tag_by_id(view(), 'personal-git-directions'))
+
+    def test_personal_link(self):
+        with person_logged_in(self.owner):
+            view = create_initialized_view(
+                self.target, '+git', principal=self.owner)
+            self.assertFalse(view.show_personal_directions)
+
 
 class TestPersonProductGitListingView(TestPersonTargetGitListingView,
                                       TestCaseWithFactory):
@@ -487,6 +500,19 @@
         self.context = self.user = self.owner = self.factory.makePerson()
         self.target = self.branch_target = None
 
+    def test_personal_git_instructions_present(self):
+        with person_logged_in(self.owner):
+            view = create_initialized_view(
+                self.owner, '+git', principal=self.owner)
+            self.assertIsNotNone(
+                find_tag_by_id(view(), 'personal-git-directions'))
+
+    def test_personal_link(self):
+        with person_logged_in(self.owner):
+            view = create_initialized_view(
+                self.owner, '+git', principal=self.owner)
+            self.assertTrue(view.show_personal_directions)
+
 
 class TestDistributionGitListingView(TestPlainGitListingView,
                                      TestCaseWithFactory):

=== modified file 'lib/lp/code/templates/gitlisting.pt'
--- lib/lp/code/templates/gitlisting.pt	2018-08-22 14:04:22 +0000
+++ lib/lp/code/templates/gitlisting.pt	2018-08-29 14:54:36 +0000
@@ -55,6 +55,17 @@
     <span class="see-all" tal:condition="view/show_bzr_link">
       <a tal:attributes="href context/fmt:url:code/+branches">View Bazaar branches</a>
     </span>
+
+    <p id="personal-git-directions" tal:condition="view/show_personal_directions">
+      You can create new personal repositories by pushing an existing git repository
+      to Launchpad with the following commands:
+      <br />
+      <pre class="command subordinate">
+git remote add origin git+ssh://<tal:name replace="view/user/name"/>@git.launchpad.net/~<tal:name replace="view/user/name"/>/+git/<em>REPOSITORY_NAME</em>
+git push --set-upstream origin master
+      </pre>
+    </p>
+
     <tal:default-repository
         condition="view/default_git_repository"
         define="repository view/default_git_repository">