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

Jacob Keller jacob.e.keller at intel.com
Fri Apr 4 15:06:45 PDT 2014

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

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.

Jacob Keller (7):
  send-mail-on-failure: generalize email address
  aiaiai-project-update: fix srcdir line from location change
  aiaiai-project-update: fix typo of printf in usage statement
  aiaiai-project-update: correct function to upstream change
  aiaiai-email-test-patchset: correct hook calling to actually grab
  aiaiai: extract patches from email prior to using git-am
  git-find-base: rewritten to use newer design

 email/aiaiai-email-test-patchset            |  32 +--
 email/systemd/aiaiai-project-update         |   6 +-
 email/systemd/send-mail-on-failure.sh       |   9 +-
 email/systemd/send-mail-on-failure at .service |   3 +-
 helpers/aiaiai-extract-patches              |  54 +++++
 helpers/aiaiai-sh-functions                 |   2 +-
 helpers/git-find-base                       | 300 ++++++++++++++++++----------
 7 files changed, 276 insertions(+), 130 deletions(-)
 create mode 100755 helpers/aiaiai-extract-patches


More information about the aiaiai mailing list