Michael Stapelberg: mergebot: easily merging contributions
Recently, I was wondering why I was pushing off accepting contributions in Debian for longer than in other projects. It occurred to me that the effort to accept a contribution in Debian is way higher than in other FOSS projects. My remaining FOSS projects are on GitHub, where I can just click the Merge button after deciding a contribution looks good. In Debian, merging is actually a lot of work: I need to clone the repository, configure it, merge the patch, update the changelog, build and upload.
I wondered how close we can bring Debian to a model where accepting a contribution is just a single click as well. In principle, I think it can be done.
To demonstrate the feasibility and collect some feedback, I wrote a program called
mergebot. The first stage is done: mergebot can be used on your local machine as a command-line tool. You provide it with the source package and bug number which contains the patch in question, and it will do the rest:
midna ~ $ mergebot -source_package=wit -bug=#831331 2016/07/17 12:06:06 will work on package "wit", bug "831331" 2016/07/17 12:06:07 Skipping MIME part with invalid Content-Disposition header (mime: no media type) 2016/07/17 12:06:07 gbp clone --pristine-tar git+ssh://git.debian.org/git/collab-maint/wit.git /tmp/mergebot-743062986/repo 2016/07/17 12:06:09 git config push.default matching 2016/07/17 12:06:09 git config --add remote.origin.push +refs/heads/*:refs/heads/* 2016/07/17 12:06:09 git config --add remote.origin.push +refs/tags/*:refs/tags/* 2016/07/17 12:06:09 git config user.email stapelberg AT debian DOT org 2016/07/17 12:06:09 patch -p1 -i ../latest.patch 2016/07/17 12:06:09 git add . 2016/07/17 12:06:09 git commit -a --author Chris Lamb <lamby AT debian DOT org> --message Fix for wit: please make the build reproducible (Closes: #831331) 2016/07/17 12:06:09 gbp dch --release --git-author --commit 2016/07/17 12:06:09 gbp buildpackage --git-tag --git-export-dir=../export --git-builder=sbuild -v -As --dist=unstable 2016/07/17 12:07:16 Merge and build successful! 2016/07/17 12:07:16 Please introspect the resulting Debian package and git repository, then push and upload: 2016/07/17 12:07:16 cd "/tmp/mergebot-743062986" 2016/07/17 12:07:16 (cd repo && git push) 2016/07/17 12:07:16 (cd export && debsign *.changes && dput *.changes) midna ~ $ cd /tmp/mergebot-743062986/repo midna /tmp/mergebot-743062986/repo $ git log HEAD~2.. commit d983d242ee546b2249a866afe664bac002a06859 Author: Michael Stapelberg <stapelberg AT debian DOT org> Date: Sun Jul 17 13:32:41 2016 +0200 Update changelog for 2.31a-3 release commit 5a327f5d66e924afc656ad71d3bfb242a9bd6ddc Author: Chris Lamb <lamby AT debian DOT org> Date: Sun Jul 17 13:32:41 2016 +0200 Fix for wit: please make the build reproducible (Closes: #831331) midna /tmp/mergebot-743062986/repo $ git push Counting objects: 11, done. Delta compression using up to 8 threads. Compressing objects: 100% (11/11), done. Writing objects: 100% (11/11), 1.59 KiB 0 bytes/s, done. Total 11 (delta 6), reused 0 (delta 0) remote: Sending notification emails to: dispatch+wit_vcs@tracker.debian.org remote: Sending notification emails to: dispatch+wit_vcs@tracker.debian.org To git+ssh://git.debian.org/git/collab-maint/wit.git 650ee05..d983d24 master -> master * [new tag] debian/2.31a-3 -> debian/2.31a-3 midna /tmp/mergebot-743062986/repo $ cd ../export midna /tmp/mergebot-743062986/export $ debsign *.changes && dput *.changes [ ] Uploading wit_2.31a-3.dsc Uploading wit_2.31a-3.debian.tar.xz Uploading wit_2.31a-3_amd64.deb Uploading wit_2.31a-3_amd64.changesOf course, this is not quite as convenient as clicking a Merge button yet. I have some ideas on how to make that happen, but I need to know whether people are interested before I spend more time on this. Please see github.com/Debian/mergebot for more details, and please get in touch if you think this is worthwhile or would even like to help. Feedback is accepted in the GitHub issue tracker for mergebot or the project mailing list mergebot-discuss. Thanks!
After a long ~5 years (from 2011) journey with approx I finally wanted
to switch to something new like apt-cacher-ng. And after a bit of
changes I finally managed to get apt-cacher-ng into my work flow.
2. Replace the bash code that produced the left navigation on the
)
3. Thought hard about navigation of the test website, and redesigned (by rearranging) links in the left hand navigation.
After code review, you will see these changes as well! Things to look forward to include:
Around a year ago, I started hacking together a machine readable version
of the OSI approved licenses list, and casually picking parts up until it
was ready to launch. A few weeks ago, we officially announced
the
Like
Warning: This blog post includes instructions for a procedure that
can lead you to lock yourself out of your computer. Even if everything
goes well, you'll be hunted by dragons. Keep backups, have a rescue
system on a USB stick, and wear flameproof clothing. Also, have fun,
and tell your loved ones you love them.
I've recently gotten two
Recently Antirez made a post
After a bit of a debugging session, I ended up looking at some code in a large project
Japanese authors have a tendency to commit suicide, it seems. I have read
Considered as Dazai s master piece, and with Soseki s Kokoro the best selling novels in Japan. The book recounts the life of Oba Yozo, from childhood to the end in a mental hospital. The early years, described in the first chapter ( Memorandum ), are filled with the feeling of differentness, alienation from the rest, and Oba starts his way of living by playing the clown, permanently making jokes. The Second Memorandom spans the time to university, where he drops out, tries to become a painter, indulges in alcohol, smoking and prostitutes, leading to a suicide attempt together with a married woman, but he survived. The first part of the Third Memorandom sees a short recovering due to his relationship with a woman. He stops drinking and works as cartoonist, but in the last part his drinking pal from university times shows up again and they return into an ever increasing vicious drinking. Eventually he is separated from his wife, and confined to a mental hospital.
Very depressing to read, but written in a way that one cannot stop reading. The disturbing thing about this book is that, although the main actor conceives many bad actions, we feel somehow attached to him and feel pity for him. It is somehow a exercise how circumstances and small predispositions can make a huge change in our lives. And it warns us that each one of us can easily come to this brink.
The story recounts the countless turns the life of Nombeko Mayeki, a black girl born in Soweto as latrine cleaner, who manages to save the Swedish king as well as most of the world from an atomic desaster by first getting driven over by a drunkard of South African nuclear bomb engineer, then meeting a clique of three Chinese sisters excelling in faking antiquities, and two Mossad agents. With the (unwilling) help of those agents she escapes to Sweden (including the atomic bomb) where she meets twins of a psychotic father who brought them up as one child so that the spare one can eradicate the Swedish monarchy. After many twists and setbacks, including several meetings with the Chinese premier Hu Jintao, she finally manages to get rid of the atomic bomb, get her undercover twin a real identity, and set up a proper life ah, and not to forget, save the King of Sweden!
A fast paced, surprisingly funny and lovely story about how little things can change our lives completely.
Michael K hlmeier s recently released book Zwei Herren am Strand tells the fictive story of Charlie Chaplin and Winston Churchill meeting and becoming friends, helping each other fighting depression and suicide thoughts. Based on a bunch of (fictive) letters of a (fictive) private secretary of Churchill, as well as (fictive) book on Chaplin, the first person narrator dives into the interesting time of the mid-20ies to about the Second World War.
Chaplin is having a hard time after the divorce from his wife Rita, paired with the difficulties at the production of
A new release 0.4.4 of
Online status
Offline status
Busy DND status
Away status
In a meeting status
Unknow status