~nacc/git-ubuntu:lp1730655-fix-importer-devel-branches

Branch merges

Propose for merging

Merged into git-ubuntu:master at revision b1551b1da50cfc3aa46e935e09abec90dc56a72c

Server Team CI bot: Approve (continuous-integration) on 2017-11-13

Robie Basak: Pending requested 2017-11-07

Diff: 281 lines (+130/-68)

2 files modified

gitubuntu/importer.py (+102/-62)
gitubuntu/source_information.py (+28/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

853cb2e... by Nish Aravamudan on 2017-11-07

importer: rework and move devel pointer moving

After discussion with Robie on IRC, we decided that 0f3c943054ab
("import: drop publishing parent functionality") and 5aa33fa08078 ("Also
reset devel heads") introduced a regression in the semantics of the
devel pointers.

Before those changes, the devel pointers were merged up so as to be
fast-forwarding, as we imported publication entries, if the publication
entry was newer than the current devel pointer. In other words, the
devel pointers were part of the commit graph itself.

After those changes, the devel pointers are more like symbolic
references, describing meta-state about the commit graph, rather than
integral to the graph itself:

A given series devel branch, after a successful import, points to the
latest publication record in a given series.

The ubuntu/devel branch, after a successful import, points to the latest
series devel branch.

Given these 'rules', we can stop updating the devel pointers in the main
import loop and just do so after we are done importing. All series
branch pointers are updated, which is unnecessary but will generally be
a no-op. This allows the method to not be aware of reimporting or not.

LP: #1730655

Fixes: 0f3c943054ab ("import: drop publishing parent functionality")
Fixes: 5aa33fa08078 ("Also reset devel heads")

9507164... by Nish Aravamudan on 2017-11-07

source_information: add API to obtain all series objects/names

f53eda9... by Nish Aravamudan on 2017-11-07

source_information: cleanup formatting per style

02e3e7d... by Nish Aravamudan on 2017-11-07

source_information: fix incorrect API comments

80b7dc4... by Robie Basak on 2017-10-31

Add test_git_repository.py

As a starting point, this adds tests for follow_symlinks_to_blob using
repo_builder.py.

f034bd1... by Robie Basak on 2017-10-31

follow_symlinks_to_blob: fix symlink edge case

Fix the case where changelog is a symlink to another file in the same
directory.

A test for this is in the following commit.

765a34f... by Robie Basak on 2017-10-31

Add repo_builder.py

Represent a git repository as a single Python data structure. This
module is explained in more detail in its docstring.

6e7088f... by Nish Aravamudan on 2017-11-10

build: symlink cache hits into parent directory

The other fetch* operations will result in either the relevant files or
symlinks to them being present in the parent directory. However, the
cache path does not do that, so if a deletes relevant files from .., but
not the cache, the build will succeed, but there will be no orig in the
parent directory. This is not in and of itself necessarily an error, as
the orig tarball is only needed for further use on merges and upstream
updates, but it is counter-intuitive and inconsistent.

LP: #1731513

745ce92... by Nish Aravamudan on 2017-11-10

build: clarify variable name in _symlink_paths_into_parent_dir

It is a new path not an old path.

26bb9d1... by Nish Aravamudan on 2017-11-10

git_repository: drop unused merge_commit_to_devel_head