Diff for "Code/Git"

Not logged in - Log In / Register

Differences between revisions 8 and 9
Revision 8 as of 2015-04-30 23:46:39
Size: 6431
Editor: cjwatson
Comment: some MP bugs fixed
Revision 9 as of 2015-05-01 12:52:50
Size: 5505
Editor: cjwatson
Comment: live on production!
Deletions are marked like this. Additions are marked like this.
Line 7: Line 7:
Launchpad features experimental support for hosting [[http://git-scm.com/|Git]] repositories. This is distinct from the [[Code/Imports|code import]] facility that Launchpad has included for many years; it will shortly be possible to host Git repositories on Launchpad directly. Launchpad supports hosting [[http://git-scm.com/|Git]] repositories. This is distinct from the [[Code/Imports|code import]] facility that Launchpad has included for many years; it will shortly be possible to host Git repositories on Launchpad directly.
Line 13: Line 13:
As of the end of April 2015, a reasonably complete basic version of Git hosting support is live on our "qastaging" site. This means: As of May 2015, a reasonably complete basic version of Git hosting support is live on Launchpad production. This means that you can:
Line 15: Line 15:
 * all changes made will be reset - this is not yet a persistent hosting service, but is strictly for experimenting and finding bugs in Launchpad
 * the URL format is not guaranteed to be stable
 * everything is on qastaging.launchpad.net and git.qastaging.paddev.net, rather than on the main launchpad.net site
 * the hosting backend is still quite basic and may have scaling problems

Within these constraints, you can:

 * push Git repositories to qastaging over SSH
 * push Git repositories over SSH
Line 24: Line 17:
 * see summary information on repositories and the branches they contain in the Launchpad web UI on qastaging  * see summary information on repositories and the branches they contain in the Launchpad web UI
Line 28: Line 21:

Just don't keep the only copy of your repository on qastaging!
Line 41: Line 32:
Our top priority is to polish things up so that this can land on Launchpad production, and to this end we appreciate your feedback on any bugs you find. Here's a short list of known bugs that you don't need to tell us about: Here's a short list of known bugs that you don't need to tell us about:
Line 51: Line 42:
[url "git+ssh://USER@git.qastaging.paddev.net/"]
        insteadof = lpqas:
[url "git+ssh://USER@git.launchpad.net/"]
        insteadof = lp:
Line 54: Line 45:
This allows you to type `git clone lpqas:REPOSITORY` instead of `git clone git+ssh://git.qastaging.paddev.net/REPOSITORY`.  (Of course, when we add Git support to production we will update this documentation to recommend `lp:` instead.) This allows you to type `git clone lp:REPOSITORY` instead of `git clone git+ssh://git.launchpad.net/REPOSITORY`.
Line 61: Line 52:
$ git clone lpqas:PROJECT $ git clone lp:PROJECT
Line 64: Line 55:
For example, `git clone lpqas:launchpad` fetches Launchpad itself. For example, `git clone lp:launchpad` fetches Launchpad itself.
Line 73: Line 64:
$ git remote add lpqas lpqas:PROJECT $ git remote add lp lp:PROJECT
Line 77: Line 68:
$ git remote add lpqas lpqas:~USER/PROJECT $ git remote add lp lp:~USER/PROJECT
Line 81: Line 72:
$ git push lpqas my-changes $ git push lp my-changes
Line 88: Line 79:
  https://code.qastaging.launchpad.net/~OWNER/PROJECT/+git/REPOSITORY:: This identifies a repository for an upstream project.
  https://code.qastaging.launchpad.net/~OWNER/DISTRIBUTION/+source/SOURCE/+git/REPOSITORY:: This identifies a repository for a source package in a distribution.
  https://code.qastaging.launchpad.net/~OWNER/+git/REPOSITORY:: This identifies a "personal" repository with no particular connection to any project or package.
  https://code.launchpad.net/~OWNER/PROJECT/+git/REPOSITORY:: This identifies a repository for an upstream project.
  https://code.launchpad.net/~OWNER/DISTRIBUTION/+source/SOURCE/+git/REPOSITORY:: This identifies a repository for a source package in a distribution.
  https://code.launchpad.net/~OWNER/+git/REPOSITORY:: This identifies a "personal" repository with no particular connection to any project or package.
Line 94: Line 85:
  https://code.qastaging.launchpad.net/PROJECT:: This is the default repository for an upstream project.
  https://code.qastaging.launchpad.net/DISTRIBUTION/+source/SOURCE:: This is the default repository for a source package in a distribution.
  https://code.launchpad.net/PROJECT:: This is the default repository for an upstream project.
  https://code.launchpad.net/DISTRIBUTION/+source/SOURCE:: This is the default repository for a source package in a distribution.
Line 99: Line 90:
  https://code.qastaging.launchpad.net/~OWNER/PROJECT:: This is an owner's default repository for an upstream project.
  https://code.qastaging.launchpad.net/~OWNER/DISTRIBUTION/+source/SOURCE:: This is an owner's default repository for a source package in a distribution.
  https://code.launchpad.net/~OWNER/PROJECT:: This is an owner's default repository for an upstream project.
  https://code.launchpad.net/~OWNER/DISTRIBUTION/+source/SOURCE:: This is an owner's default repository for a source package in a distribution.

Launchpad Help > Code > Git

Overview

Launchpad supports hosting Git repositories. This is distinct from the code import facility that Launchpad has included for many years; it will shortly be possible to host Git repositories on Launchpad directly.

Git repositories use a somewhat different model from Bazaar branches: operations such as cloning happen at the level of a repository, but it is common for a single repository to contain many branches. This means that the Launchpad interface needs to be laid out somewhat differently to support that.

What's supported?

As of May 2015, a reasonably complete basic version of Git hosting support is live on Launchpad production. This means that you can:

  • push Git repositories over SSH
  • clone repositories over git://, SSH, or HTTPS
  • see summary information on repositories and the branches they contain in the Launchpad web UI
  • follow links from the Launchpad web UI to a full-featured code browser
  • push and clone private repositories, if you have a commercial subscription to Launchpad
  • propose merges from one branch to another, including in a different repository, provided that they are against the same project or package

What will be supported?

Launchpad's Bazaar support has grown many features over the years, and it will take some time to bring our Git support up to full parity with it. Here's an incomplete list of some of the features we expect to add:

  • useful subscriptions (currently only attribute change notifications work, which are not usually very interesting in themselves)
  • RSS feeds
  • mirroring
  • webhooks
  • an integrated code browser

Here's a short list of known bugs that you don't need to tell us about:

  • working with default repositories is harder than it should be (they don't appear on the target's code page, so you have to guess their URL)
  • there is no web listing of repositories available for a given target
  • the interface for registering merge proposals is very rough
  • it is not yet possible to browse private repositories using the cgit interface, as it does not yet have SSO integration

Configuring Git

Git identifies repositories using URLs. Unlike Bazaar, there is no built-in abbreviation for repositories hosted on Launchpad, but it is very easy to add such a thing yourself. Edit ~/.gitconfig and add these lines, where USER is your Launchpad username:

[url "git+ssh://USER@git.launchpad.net/"]
        insteadof = lp:

This allows you to type git clone lp:REPOSITORY instead of git clone git+ssh://git.launchpad.net/REPOSITORY.

The rest of this documentation assumes that you have configured Git this way.

Getting code

You can fetch the default repository for a project like this:

$ git clone lp:PROJECT

For example, git clone lp:launchpad fetches Launchpad itself.

To keep your local clone up to date, run:

$ git pull

Pushing code

You can add a "remote" to your repository like this, if you own the project:

$ git remote add lp lp:PROJECT

Or like this (where USER is your Launchpad username), if you do not own the project:

$ git remote add lp lp:~USER/PROJECT

Now, you can push a branch using a command such as this:

$ git push lp my-changes

Repository URLs

Every Git repository hosted on Launchpad has a full "canonical" URL of one of these forms (these are the versions you'd use in a web browser; you only need to change the scheme and host parts for the command-line Git client):

https://code.launchpad.net/~OWNER/PROJECT/+git/REPOSITORY
This identifies a repository for an upstream project.
https://code.launchpad.net/~OWNER/DISTRIBUTION/+source/SOURCE/+git/REPOSITORY
This identifies a repository for a source package in a distribution.
https://code.launchpad.net/~OWNER/+git/REPOSITORY
This identifies a "personal" repository with no particular connection to any project or package.

These are unique, but can involve quite a lot of typing, and in most cases there's no need for more than one repository per owner and target (project or package). Launchpad therefore has the notion of "default repositories". A repository can be the default for a target, in which case it has one of these forms:

https://code.launchpad.net/PROJECT
This is the default repository for an upstream project.
https://code.launchpad.net/DISTRIBUTION/+source/SOURCE
This is the default repository for a source package in a distribution.

Or a repository can be a person's or a team's default for a target, in which case it has one of these forms:

https://code.launchpad.net/~OWNER/PROJECT
This is an owner's default repository for an upstream project.
https://code.launchpad.net/~OWNER/DISTRIBUTION/+source/SOURCE
This is an owner's default repository for a source package in a distribution.

We expect that projects hosting their code on Launchpad will normally have their primary repository set as the default for the project, and contributors will normally push to branches in owner-default repositories. The extra flexibility with named repositories allows for situations such as separate private repositories containing embargoed security fixes.

Code/Git (last edited 2019-01-10 20:09:47 by cjwatson)