Merge lp:~davidc3/developer-ubuntu-com/no-git-protocol into lp:developer-ubuntu-com

[David Callé]

Switch to github https instead of git protocol
+ misc wording and checks

[Daniel Holbach (dholbach)]

Inline comments.

[lp:~davidc3/developer-ubuntu-com/no-git-protocol]

164. By David Callé on 2015-11-02

Less wording changes, better branch name parsing

[Daniel Holbach (dholbach)]

Great, thanks

review: Approve

[Daniel Holbach (dholbach)]

Great, thanks

review: Approve

=== modified file 'developer_portal/management/commands/import-external-docs-branches.py'
--- developer_portal/management/commands/import-external-docs-branches.py	2015-10-30 10:34:06 +0000
+++ developer_portal/management/commands/import-external-docs-branches.py	2015-11-02 16:48:17 +0000
@@ -229,7 +229,7 @@
             "<code>%s</code> Snappy branch.</p>"
             "<p><ul class=\"list-ubuntu\">%s</ul></p>\n"
             "<p>Auto-imported from <a "
-            "href=\"https://code.launchpad.net/snappy\">%s</a>.</p>\n"
+            "href=\"https://github.com/ubuntu-core/snappy\">%s</a>.</p>\n"
             "</div></div>") % (self.release_alias, list_pages,
                                self.external_branch.lp_origin)
         self.db_actions.add_page(
@@ -309,7 +309,8 @@
             if os.path.exists(checkout_location):
                 shutil.rmtree(checkout_location)
             break
-        if branch.lp_origin.startswith('lp:snappy'):
+        if branch.lp_origin.startswith('lp:snappy') or \
+           'snappy' in branch.lp_origin.split(':')[1].split('.git')[0].split('/'):
             local_branch = SnappyLocalBranch(checkout_location, branch,
                                              db_actions)
         else:
@@ -332,7 +333,8 @@
             return subprocess.call([
                 'bzr', 'checkout', '--lightweight', self.branch_origin,
                 self.checkout_location])
-        if self.branch_origin.startswith('git://') and \
+        if self.branch_origin.startswith('https://github.com') and \
+           self.branch_origin.endswith('.git') and \
            os.path.exists('/usr/bin/git'):
             return subprocess.call([
                 'git', 'clone', '-q', self.branch_origin,

=== modified file 'developer_portal/models.py'
--- developer_portal/models.py	2015-10-30 08:50:29 +0000
+++ developer_portal/models.py	2015-11-02 16:48:17 +0000
@@ -27,7 +27,7 @@
     lp_origin = models.CharField(
         max_length=200,
         help_text=_('External branch location, ie: lp:snappy/15.04 or '
-                    'git://github.com/ubuntu-core/snappy'))
+                    'https://github.com/ubuntu-core/snappy.git'))
     docs_namespace = models.CharField(
         max_length=120,
         help_text=_('Path alias we want to use for the docs, '