[PATCH aiaiai 0/7] Further fixups for git-find-base and systemd scripts

Artem Bityutskiy dedekind1 at gmail.com
Mon Apr 7 03:21:04 PDT 2014


On Fri, 2014-04-04 at 15:06 -0700, Jacob Keller wrote:
> Further testing has revealed several issues, as well as some requests for
> change on the mailing list. First, fix systemd script send-mail-on-failure to
> generalize the email address instead of using a hardcoded value. In addition,
> note in the systemd script file that the user should customize their own copy.
> 
> Next, fix up some bugs in aiaiai-project-update, mostly due to location change
> and upstream name change, that was missed because it was in a separate patch.
> 
> Correct an issue with email-test-patchset, which could not correctly handle
> exit codes, since set -e mode makes it very difficult to grab exit code of a
> command, since it would kill the script. Even using if ! command was not able
> to get proper exit code.
> 
> Finally, modify aiaiai to be able to handle patches with both inline *and*
> attachment as a format. Do this by adding a python module capable of extracting
> attachments from email files, and then generating a sequence of patches. It is
> able to locate git-format-patch style attachments (entire patches attached) but
> does not assume that diff hunks alone in a patch are considered a seperate
> patch.
> 
> This allows extracting those patches as seperate bits, which allows us to use
> 3way merge on git am to automatically detect whether the patch was already
> applied, enabling acceptance of these alternative patch format.
> 
> Finally, re-write git-find-base in order to accept more git patch styles.
> (Particularly, have git-find-base ignore duplicate hunks by default, instead of
> accepting them.) Also, build up a "tree" of changes as we encounter them, in
> order to see whether a series of patches is consistent.
> 
> These changes *have* been tested in live environment and so far are stable.

Thanks Jacob. Pushed patches 1-4 and 7, have few suggestions for patches
5 and 6. Thanks!

-- 
Best Regards,
Artem Bityutskiy




More information about the aiaiai mailing list