~nacc/git-ubuntu:refactor-import-pristine-tarv2

Branch merges

Propose for merging

Merged into git-ubuntu:master at revision 29e03d74bfa4a708c9e0cf4a57683ea7d08dca3b

Robie Basak: Approve on 2017-08-29

Server Team CI bot: Needs Fixing (continuous-integration) on 2017-08-25

Diff: 343 lines (+204/-62)

2 files modified

gitubuntu/git_repository.py (+149/-0)
gitubuntu/importer.py (+55/-62)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

29e03d7... by Nish Aravamudan on 2017-07-19

git ubuntu import: update pristine-tar imports to use common code

1) Modify orig_imported() to take a set of paths to tarballs and a
distribution name. It will see if the given tarballs have been imported
identically to the current repository for the given distribution.

2) Use the gitubuntu/dsc.py accessors for the orig tarball and component
tarballs.

b253c20... by Nish Aravamudan on 2017-07-19

gitubuntu/git_repository: abstract pristine-tar manipulation

We expose three new APIs:

1) pristine_tar_branches - a context manager that manipulates the
per-distro pristine-tar branches

2) pristine_tar_list - returns a list of imported tarballs for a given
distro

3) pristine_tar_extract - obtains the pristine-tar tarball corresponding
to a given srcpkg and version (the srcpkg is necessary as it is in the
tarball name) in a distro

b96d39f... by Nish Aravamudan on 2017-08-23

build: add derive_orig_search_list

This will take our args namespace and convert into an appropriate list
of OrigSearchEntrys for use by fetch_orig.

333d56e... by Nish Aravamudan on 2017-08-23

build: add core fetch_orig algorithm

Effectively, given a list of OrigSearchEntrys, iterate them, trying each
in order. If the build must succeed with one of them, fail out when it
doesn't. Convert 'changelog' source entries to the appropriate value
('debian' or 'ubuntu') based upon the actual changelog file.

642f64a... by Nish Aravamudan on 2017-08-23

build: reformat logging

ee468a0... by Nish Aravamudan on 2017-08-23

build: add fetch_orig_from_launchpad

This is effectively a reimplementation of what was the base algorithm
before in build.py, but in a testable function.

cdf386e... by Nish Aravamudan on 2017-08-24

build: add _populate_cache

98b918d... by Nish Aravamudan on 2017-08-25

build, buildsource: drop un-reused member variable CACHE_DIR

Fix some strings and formatting at the same time.

6392f59... by Nish Aravamudan on 2017-08-23

build: add fetch_orig_from_cache

This also adds APIs for symlinking in the parent directory (for when a
tarball is found in the cache, and we want to link to it).

Note, this also corrects how the cache is populated, by using the source
parameter to be part of the path so that debian and ubuntu caches are
different.

2c735b4... by Nish Aravamudan on 2017-08-23

build: add fetch_orig_from_parent_dir

This will simply try to use tarballs from the parent directory, if they
match a simple regex. In future commits, this behavior will be extended
to leverage pristine-tar for verification.