Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>

Repeating "apertis" everywhere is not particularly useful but is
annoying for downstreams which have to either keep the misleading
names or rename everything and deal with the resulting mess when
pulling updates.

This also makes our life less painful since not having a common prefix
makes shell completion much more useful. :)

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

When a merge fails, it's nice to let developers use the same tools as used by
the CI to reproduce and fix the issue.

Unfortunately, `apertis-pkg-merge-updates` cleans up after itself a bit too
much, aborting the merge and thus preventing developer from fixing it.
Stop doing that so that developers can handle the conflicts, GitLab CI will
clean up after itself in any case.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>

 * get_current_branch_name: pass -q --verify and accept return codes 0/1
 * get_git_branch_version, configure_git_user: use sh.git

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>

python sh eats up stdout by default (and returns it). For various
complex commands, where we don't use the stdout in the code it would be
better to have their output on the console for diagnostics if things go
wrong.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Sjoerd Simons authored 5 years ago and Andrej Shadura committed 5 years ago

If a merge fails bail with an error code such that the CI stops.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Sjoerd Simons authored 5 years ago and Andrej Shadura committed 5 years ago

-m for dpkg-mergechangelogs is quite useful when merge pre-release
branches for Debian but it's not when merging upstream into downstream
repositories. Actually it can cause merge failures if it can't work out
the prereleases to merge.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Compare the version of the downstream and upstream branches before
trying to merge, such that a merge can be skipped if upstream is newer.

While there also change the argument names to branch names rather then
suites to make the tool a bit more flexible (in case upstream isn't
debian and downstream isn't apertis.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

When the Apertis version and Debian version don't match then on the
apertis side there should be a changelog entry summarizing the
(remaining) changes to the package.

Pre-add a changelog entry to the merge commit to remind the reviewer
that this should be added.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Don't fail if the .git/info directory already exists but the attributes
haven't been set. Also print the exception if failing to setup
attributes for easier debugging of issues.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>