summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:17 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:17 -0700
commit79814585b78329b5009b7684290bc0c8872220db (patch)
treec4ef8ae29075d2e76ec1461ab6c4eae637445af4 /git-am.sh
parent9eb765d5f400aa922a46f1727259ce114b78561c (diff)
parent0cfd112032017ab68ed576f6bb5258452084ebf1 (diff)
downloadgit-79814585b78329b5009b7684290bc0c8872220db.tar.gz
Merge branch 'gb/am-hg-patch'
* gb/am-hg-patch: am: preliminary support for hg patches
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh34
1 files changed, 34 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index 016b5056eb..9042432e23 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=$(( $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