~nacc/git-ubuntu:lp1717965-lint-applied-branches

Branch merges

Propose for merging

Merged into git-ubuntu:master at revision 262a939c67cd2913867966b7f5b368b0a45b5c47

Server Team CI bot: Approve (continuous-integration) on 2017-10-26

Robie Basak: Pending requested 2017-10-11

Diff: 2730 lines (+1245/-463)

23 files modified

doc/README.md (+1/-1)
doc/gitubuntu-completion.sh (+3/-0)
gitubuntu/__main__.py (+1/-1)
gitubuntu/build.py (+278/-192)
gitubuntu/buildsource.py (+25/-20)
gitubuntu/git_repository.py (+546/-41)
gitubuntu/importer.py (+98/-77)
gitubuntu/importppa.py (+8/-0)
gitubuntu/lint.py (+29/-4)
gitubuntu/merge.py (+11/-12)
gitubuntu/remote.py (+128/-31)
gitubuntu/review.py (+4/-0)
gitubuntu/run.py (+31/-14)
gitubuntu/versioning.py (+14/-5)
man/man1/git-ubuntu-build-source.1 (+8/-1)
man/man1/git-ubuntu-build.1 (+8/-1)
man/man1/git-ubuntu-import-ppa.1 (+16/-1)
man/man1/git-ubuntu-import.1 (+16/-1)
man/man1/git-ubuntu.1 (+1/-1)
setup.py (+1/-0)
snap/snapcraft.yaml (+4/-60)
snap/wrappers/git-merge-changelogs (+7/-0)
snap/wrappers/git-reconstruct-changelog (+7/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

262a939... by Nish Aravamudan on 2017-10-04

import: add hidden flag to allow patches-applied failures

It is possible that modern tooling cannot reproduce a historic source
package. This happens, for instance, when patches apply with fuzz and
that was allowed in the past but is no longer allowed. Other cases may
exist. Rather than attempting to resolve all such historical cases with
source patching, add a flag that a developer can use to skip such
failures, when encountered, and continue on. The history of the source
package should be comprehensible, albeit with holes for the failed
patches-applied imports.

3d70115... by Nish Aravamudan on 2017-10-17

remote: add support for adding Debian remote

Parse pkg/ubuntu/devel:debian/control for X-Debian-Vcs-Git and, if
X-Debian-Vcs-Git is not found, Vcs-Git, when the --debian flag is given
to add. This also requires us to make --user a flag option, in order to
properly parse the arguments. One of --debian or --user is required.

LP: #1719707

3c8b93f... by Nish Aravamudan on 2017-10-18

remote: create an add_subparser and nest arguments under that

6db549d... by Nish Aravamudan on 2017-10-18

remote: fix formatting of parse_args to match style

74c136f... by Nish Aravamudan on 2017-10-17

remote: fix docstring

5ec1b12... by Nish Aravamudan on 2017-10-13

remote: fix passing URL

`git remote add <url>` does not mirror `git ubuntu remote add ...`, as
no fetch is performed by default. Additionally, we prefix tags to avoid
collisions between multiple user (and the importer) repositories in the
same local repository. Use our internal APIs to adjust for this.

08c796b... by Nish Aravamudan on 2017-10-25

build: if lxc or gpg are not found, raise an error

3294bc6... by Nish Aravamudan on 2017-10-25

Revert "snap: build gpg from source"

This reverts commit 81d17c0f6adfe830891291c635cdb942f6c8addf.

It is incorrect to snap gpg, as the behavior of gpg2/gpg1 is not
consistent, and it affects the user's home directory. We now call
directly into the host's gpg.

9758d07... by Nish Aravamudan on 2017-10-25

build: use host gpg when calling debsign

LP: #1727545

af7ee97... by Nish Aravamudan on 2017-10-25

versioning.max_version: handle source packages not existing in some series

If a given source package does not exist in a given series, we end up
raising an Exception. Instead, handle it as no Version, and add a test
that _next_sru_version does the right thing (it already does).

LP: #1726722