~paelzer/git-ubuntu:fix-usd-importer-typo

Last commit made on 2016-10-07
Get this branch:
git clone -b fix-usd-importer-typo https://git.launchpad.net/~paelzer/git-ubuntu
Only Christian Ehrhardt  can upload to this branch. If you are Christian Ehrhardt  please log in for upload directions.

Branch merges

Branch information

Name:
fix-usd-importer-typo
Repository:
lp:~paelzer/git-ubuntu

Recent commits

9b50294... by Christian Ehrhardt 

change apt-get to apt

Modernize the README.md

Signed-off-by: Christian Ehrhardt <email address hidden>

698b0ce... by Christian Ehrhardt 

fix dependency install in README.md

Just a little copy and paste error with update and install in one line.

Signed-off-by: Christian Ehrhardt <email address hidden>

6fdc600... by Scott Moser

usd-clone: add usd-clone simple wrapper for cloning

This just adds a wrapper that knows urls to keep typing down.
It tries to find the launchpad user, and prompts if it can't find one.
If provided with a user name via prompt, it will offer to store
that username in git config by configuring an 'lp:' remote.

It clones from the importer location, and sets up the following remotes:
  importer git://git.launchpad.net/~usd-import-team/ubuntu/+source/<pkg>
  lpusd git://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/<pkg>
  <user> git+ssh://<user@>git.launchpad.net/~<user>/ubuntu/+source/<pkg>

Where '<user>' is launchpad user.

It then sets a local branch 'master' to track importer/ubuntu/devel,
and checks that branch out.

MR: #307839

3a72b3d... by Nish Aravamudan

usd-import: also push tags

585bf4a... by Nish Aravamudan

usd-import: leverage pkg_resources to find override files

Use pkg_resources (a new dependency) to get the absolute path to the
override files that are now part of the proper usd package resource.

Signed-off-by: Nishanth Aravamudan <email address hidden>

530fbd7... by Nish Aravamudan

usd-import: reorganize into a python package

There were a few bugs in the override logic, because of the time of
interpretation of a string like './usd-import' -- '.' is changed by
the chdirs in the script itself.

After discussions with Barry Warsaw on IRC (#ubuntu-devel), reorganize
the importer into a proper package (usd) and place the relevant override
files and patches in that package. This will allow us to use
pkg_resources to get the absolute path to the resource.

Signed-off-by: Nishanth Aravamudan <email address hidden>

66dada8... by Nish Aravamudan

usd-import: cleanup subprocess.run usage

Don't pass stdout if it's not needed, so we don't block on writing to
stdout.

Don't save return value if it's not used.

Also remove one stray input= assignment from the development code for
the patch support.

Signed-off-by: Nishanth Aravamudan <email address hidden>

07325b4... by Nish Aravamudan

usd-import: use safer branch name extraction

Add an assert as well. Also fix a bug with a prior commit that dropped
the trailing '/'.

Signed-off-by: Nishanth Aravamudan <email address hidden>
Fixes: 1adb8a9f ('usd-import: use a variable to store the remote name')

8ba1116... by Scott Moser

README.md: fix git clone info and add new package depends.

71837fd... by Nish Aravamudan

usd-import: sort head names in output

When we detect existing branches, provide the output in a consistent
manner, sorting by the heads' names.

Signed-off-by: Nishanth Aravamudan <email address hidden>