[PATCH 1/2] am: preliminary support for hg patches
From: Giuseppe Bilotta <hidden>
Date: 2016-06-15 22:51:56
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Giuseppe Bilotta <redacted> --- git-am.sh | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 4fff195..729ee51 100755
--- a/git-am.sh
+++ b/git-am.sh@@ -311,6 +311,40 @@ split_patches () this= msgnum= ;; + hg) + this=0 + for hg in "$@" + do + this=`expr "$this" + 1` + msgnum=`printf "%0${prec}d" $this` + # hg stores changeset metadata in #-commented lines preceding + # the commit message and diff(s). The only metadata we care about + # are the User and Date (Node ID and Parent are hashes which are + # only relevant to the hg repository and thus not useful to us) + # Since we cannot guarantee that the commit message is in git-friendly + # format, we put no Subject: line and just consume all of the message + # as the body + perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 } + if ($subject) { print ; } + elsif (/^\# User /) { s/\# User/From:/ ; print ; } + elsif (/^\# Date /) { + my ($hashsign, $str, $time, $tz) = split ; + $tz = sprintf "%+05d", (0-$tz)/36; + print "Date: " . + strftime("%a, %d %b %Y %H:%M:%S ", + localtime($time)) + . "$tz\n"; + } elsif (/^\# /) { next ; } + else { + print "\n", $_ ; + $subject = 1; + } + ' < "$hg" > "$dotest/$msgnum" || clean_abort + done + echo "$this" > "$dotest/last" + this= + msgnum= + ;; *) if test -n "$patch_format" ; then clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
--
1.7.7.rc0.331.g25483.dirty