~nacc/git-ubuntu:lp1733856-fix-repeated-orphan-tags

Branch merges

Propose for merging

Merged into git-ubuntu:master at revision eacd8959b6fe24d9d7646eba44b549a155156a8b

Server Team CI bot: Approve (continuous-integration) on 2018-03-05

Christian Ehrhardt : Pending requested 2018-03-02

Diff: 67 lines (+28/-2)

2 files modified

gitubuntu/git_repository.py (+3/-0)
gitubuntu/importer.py (+25/-2)

api

Superseded for merging into git-ubuntu:master

Christian Ehrhardt : Approve on 2018-01-10

Server Team CI bot: Approve (continuous-integration) on 2017-12-04

Diff: 67 lines (+28/-2)

2 files modified

gitubuntu/git_repository.py (+3/-0)
gitubuntu/importer.py (+25/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

eacd895... by Nish Aravamudan on 2017-12-04

import: handle orphan tags as changelog parents

It is possible that any given version might be an orphan import (due not
finding any changelog parents). When this happens, we want to ensure
that when importing the same (to-be-orphaned) publication record for a
different series, we simply use the same logic we have now for import
tags. That is, when determining what to do with a given published
version:

1) If there is a corresponding import tag for version
        1a) If the tag's treeish matches, just move the branch
        1b) If the tag's treeish does not match, orphan this publish
2) If there is a corresponding orphan tag for version
        1a) If the tag's treeish matches, just move the branch
        1b) If the tag's treeish does not match, fail (unhandled still)
3) If there is a corresponding upload tag for version
        1a) If the tag's treeish matches, incorporate the rich history
        1b) If the tag's treeish does not match, emit a warning but
                ignore this tag

2) is inserted by these changes.

A similar change should be done in the lookup of the unapplied changelog
parent itself, which previously only searched for import tags, but should
search for import or orphan tags. It is not incorrect to use an orphan
tag as a changelog parent, it just implies there is a break in the
publishing record relative to the changelog.

LP: #1733856

0b45702... by Nish Aravamudan on 2018-03-02

import: fix case of reimport of a not-yet imported repository

In that case lp_git_repo will be None and we should skip the check.

287df3a... by Nish Aravamudan on 2018-03-02

version: bump to 0.7.4

3e9e2d7... by Nish Aravamudan on 2018-03-02

apt_repo: fix mis-use of os.path.join

When os.path.join is given an absolute path as any component,
it resets the computed path to that value. This is obviously
the case in our usage (since we are appending a system path to
the snap's path). Fix this by abstracting out the root path and
appending the same relative path in both cases.

3b21bbe... by Nish Aravamudan on 2018-03-02

Revert "snap: scripts need a custom LD_LIBRARY_PATH"

This reverts commit acdbf24e77bf4af64de82557794cbcfc26b328c0.

This was a regression in snapcraft, as it worked before the recent
updates.

acdbf24... by Nish Aravamudan on 2018-03-02

snap: scripts need a custom LD_LIBRARY_PATH

516b160... by Nish Aravamudan on 2018-03-02

version: bump to 0.7.3

4239044... by Nish Aravamudan on 2018-03-02

apt_repo: fix obvious typo in snap handling

ebc05cd... by Nish Aravamudan on 2018-03-01

version: bump to 0.7.2

b104e4b... by Nish Aravamudan on 2018-03-01

gitignore: add snap-related files

These are not tracked in Git, and they also affect the
versioning now.