~nacc/git-ubuntu:lp1734137-add-quilt-gbp-API

Branch merges

Propose for merging

Merged into git-ubuntu:master at revision 256caffcacb85d2df2d9ec0ff760d6985e13bd7e

Robie Basak: Approve on 2018-01-30

Server Team CI bot: Approve (continuous-integration) on 2018-01-30

Diff: 205 lines (+74/-24)

3 files modified

gitubuntu/git_repository.py (+19/-13)
gitubuntu/importer.py (+17/-11)
gitubuntu/run.py (+38/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

256caff... by Nish Aravamudan on 2018-01-10

gitubuntu: add API to call quilt and gbp

We want our quilt and gbp invocations to be reproducible when the
importer is run, or they might affect the resulting hashes. So use
application-specific logic via parameters (quilt) or environment (gbp)
to not load any configuration files.

LP: #1734137

38f8ab3... by Robie Basak on 2017-12-08

Add new source_builder module

ff7e516... by Robie Basak on 2018-01-23

Factor out test fixtures

These fixtures are more generally useful, so factor them out to more
cleanly re-use them from other test modules.

c9ce5db... by Robie Basak on 2018-01-23

Remove global _PARENT_OVERRIDES

Make parent_overrides a regular parameter instead of a magic global
variable. This allows for easier testing along the "less initialisation"
theme.

d7be763... by Robie Basak on 2018-01-23

importppa: clean up unused and duplicate imports

7549c50... by Nish Aravamudan on 2018-01-23

Merge remote-tracking branch 'racb/create-dsc-on-first-use'

8b07667... by Robie Basak on 2018-01-19

Clean up catch-all exception

The only thing we want to catch here is the command returning a non-zero
exit status, which is subprocess.CalledProcessError. We shouldn't
swallow any other exceptions.

1d65886... by Robie Basak on 2017-12-22

Create dsc branch on first use

Instead of creating empty commit orphan branches when the importer
starts, create them with a complete commit when first needed.

This changes the algorithm of adding a DSC commit from "add a new commit
assuming a dsc branch exists" to "add a new commit using the dsc branch
if it exists, or start one if it doesn't".

This is less error-prone because it eliminates the state dependency of
the add-new-dsc-commit algorithm. It also makes testing easier, because
there is no need to initialise anything.

Ideally I'd like to see
GitUbuntuRepository.ensure_importer_branches_exist disappear entirely.
For now, the do-not-push and pristine-tar orphan creation initalisation
remains, as this seems to be related to the way gbp works and will be a
separate effort to remove.

LP: #1733895

5bbbbe0... by Robie Basak on 2018-01-23

wrapper: fix module search path

Fix the case when running git-ubuntu from the working tree via a
relative symlink.

1e67e4c... by Nish Aravamudan on 2018-01-22

Merge remote-tracking branch 'racb/drop-unused-parameter'