Message-ID: <38c03a13520d52e1418666015866a8e72893b41c.camel@cogitri.dev>
Subject: Introducing mkmr
From: Rasmus Thomsen <oss@cogitri.dev>
To: ~alpine/devel@lists.alpinelinux.org
Date: Sun, 22 Mar 2020 19:51:11 +0100
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit

Hello list,

maxice8 (aka. Leo on our Gitlab instance) and I started working on
mkmr, a small python3 tool to create (and manage) merge requests on
gitlab instances (from the CLI). We hope that this tool will cut back
on the overhead Gitlab introduces (e.g. when having to click through
the webUI) and maybe this will even help people migrate from the ML to
Gitlab :)


Setting it up is pretty easy:

0. Create a Gitlab account and fork 
https://gitlab.alpinelinux.org/alpine/aports (or whatever repo you want
to work on). Add a personal access token on 
https://gitlab.alpinelinux.org/profile/personal_access_tokens with the
"api" scope enabled (and copy that token to your clipboard).
1. apk add mkmr
2. Clone your fork. Afterwards add a remote called "upstream", pointing
to the upstream repository (e.g. 
https://gitlab.alpinelinux.org/alpine/aports, whatever you forked from)
(3. in theory this is optional, but you should switch to a different
branch now, since you can't have multiple merge requests open from the
same branch)
4. Make the changes you want to do & commit
5. Run "mkmr". It will ask you to enter a token on the first run (use
the one from 0.) and if you have multiple commits you can select which
commit to use for the title and description. You can set these manually
too, see "man mkmr" for more info. mkmr will ask you to confirm that
the title, description and the included commits are correct and after
you press enter it'll create the MR for you!
6. Run "git push origin" to push your changes. If you want to amend
further changes to the MR simply do "git commit --amend" (if you have
one commit), or use fixup commits and rebase (if you have multiple
commits). Afterwards you can force push. In the future mkmr should do
the initial push for you.

mkmr is in somewhat early stages right now, but it's actively used for
the MRs maxice8 and I create as of now, so we try to test it as much as
we can - but further testing and suggestions would be welcome of
course! See https://github.com/maxice8/mkmr/ for the README with
further information about all of this.

Thanks,

Rasmus "Cogitri" Thomsen