Merge ~ilasc/launchpad:bug-1651826 into launchpad:master

[Ioana Lasc]

LP: #1651826 Mentioned on the Git Import Page that it won't be possible to push to push directly to the imported repository.

[Colin Watson (cjwatson)]

Thanks! And happy first merge proposal day.

While the commit message in this merge proposal has the correct bug number, the git commit message in the branch has an incorrect one. Could you fix that with "git commit --amend" and "git push --force-with-lease", before working on any of the other comments I make here? (We may still need to fix the "Related bugs" part manually.)

review: Needs Fixing

c4b3cce... by Ioana Lasc on 2019-10-09

Mentioned at the top of the New Import Page that it won't be possible to push to push directly to the imported repository.

LP: #1651826

[Colin Watson (cjwatson)]

Looks fairly good now; just a couple more tweaks and we can merge.

Note that you don't need to mention the bug number in every commit; one will do, as long as it's part of the set of unmerged commits introduced by the merge proposal. It's also better for each commit in a series to say what it changed, rather than repeating a commit message that's very similar to the previous ones.

Also, https://git.launchpad.net/~ilasc/launchpad/commit/?id=dec994e93ecac3ac7171ffa86413b70f21c93bc7 is empty and should probably just be rebased out of your history. Let me know if you need help with the details of this.

review: Approve

8ce70f8... by Ioana Lasc on 2019-10-10

Moved new sentence into its own paragraph at the top of the page.

be011c1... by Ioana Lasc on 2019-10-10

Removed spurious trailing space introduced earlier in codeimport.py.

[Ioana Lasc (ilasc)]

This branch is now ready for a new review.

diff --git a/lib/lp/code/stories/codeimport/xx-create-codeimport.txt b/lib/lp/code/stories/codeimport/xx-create-codeimport.txt
index 6825114..c8cb7a1 100644
--- a/lib/lp/code/stories/codeimport/xx-create-codeimport.txt
+++ b/lib/lp/code/stories/codeimport/xx-create-codeimport.txt
@@ -16,6 +16,10 @@ the code home page "Import your project".
     >>> print(browser.title)
     Request a code import...
 
+    >>> browser.contents
+    '...You will not be able to push directly to the 
+    imported\n        branch or repository...'
+
 There is a cancel link on this page near the buttons to take the
 user back to the main code page.
 
diff --git a/lib/lp/code/templates/codeimport-new.pt b/lib/lp/code/templates/codeimport-new.pt
index 0464922..ef544dd 100644
--- a/lib/lp/code/templates/codeimport-new.pt
+++ b/lib/lp/code/templates/codeimport-new.pt
@@ -19,12 +19,14 @@
 <div metal:fill-slot="main">
 
   <div metal:use-macro="context/@@launchpad_form/form">
-    <p metal:fill-slot="extra_info" tal:condition="not:view/errors">
-      For more details on importing source code into Launchpad,
+    <div metal:fill-slot="extra_info" tal:condition="not:view/errors">
+      <p>For more details on importing source code into Launchpad,
       see the help wiki page
       <a href="https://help.launchpad.net/VcsImports">
-          VcsImports</a>.
-    </p>
+          VcsImports</a>.</p>
+      <p>You will not be able to push directly to the imported
+        branch or repository.</p>
+    </div>
 
     <metal:formbody fill-slot="widgets">