From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Apr 2012 22:49:15 +0000 (-0700)
Subject: Merge branch 'jb/am-include'
X-Git-Tag: v1.7.11-rc0~140
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/334dde8532c68dfcadefbc3a7d96a499c0ec1445?ds=inline;hp=-c

Merge branch 'jb/am-include'

"git am" learned the "--include" option, which is an opposite of existing
the "--exclude" option.

By Johannes Berg
* jb/am-include:
am: support --include option
---

334dde8532c68dfcadefbc3a7d96a499c0ec1445
diff --combined Documentation/git-am.txt
index ee6cca2e13,e4c08e122e..19d57a80f5
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@@ -13,7 -13,7 +13,7 @@@ SYNOPSI
  	 [--3way] [--interactive] [--committer-date-is-author-date]
  	 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
  	 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
- 	 [--exclude=<path>] [--reject] [-q | --quiet]
+ 	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
  	 [--scissors | --no-scissors]
  	 [(<mbox> | <Maildir>)...]
  'git am' (--continue | --skip | --abort)
@@@ -40,9 -40,6 +40,9 @@@ OPTION
  --keep::
  	Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
  
 +--keep-non-patch::
 +	Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
 +
  --keep-cr::
  --no-keep-cr::
  	With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1])
@@@ -92,6 -89,7 +92,7 @@@ default.   You can use `--no-utf8` to o
  -p<n>::
  --directory=<dir>::
  --exclude=<path>::
+ --include=<path>::
  --reject::
  	These flags are passed to the 'git apply' (see linkgit:git-apply[1])
  	program that applies
diff --combined git-am.sh
index 4da0ddafc4,2ecccfd723..928a35f4e0
--- a/git-am.sh
+++ b/git-am.sh
@@@ -15,7 -15,6 +15,7 @@@ q,quiet         be quie
  s,signoff       add a Signed-off-by line to the commit message
  u,utf8          recode into utf8 (default)
  k,keep          pass -k flag to git-mailinfo
 +keep-non-patch  pass -b flag to git-mailinfo
  keep-cr         pass --keep-cr flag to git-mailsplit for mbox format
  no-keep-cr      do not pass --keep-cr flag to git-mailsplit independent of am.keepcr
  c,scissors      strip everything before a scissors line
@@@ -24,6 -23,7 +24,7 @@@ ignore-space-change pass it through git
  ignore-whitespace pass it through git-apply
  directory=      pass it through git-apply
  exclude=        pass it through git-apply
+ include=        pass it through git-apply
  C=              pass it through git-apply
  p=              pass it through git-apply
  patch-format=   format the patch(es) are in
@@@ -39,14 -39,13 +40,14 @@@ rerere-autoupdate update the index wit
  rebasing*       (internal use for git-rebase)"
  
  . git-sh-setup
 +. git-sh-i18n
  prefix=$(git rev-parse --show-prefix)
  set_reflog_action am
  require_work_tree
  cd_to_toplevel
  
  git var GIT_COMMITTER_IDENT >/dev/null ||
 -	die "You need to set your committer info first"
 +	die "$(gettext "You need to set your committer info first")"
  
  if git rev-parse --verify -q HEAD >/dev/null
  then
@@@ -91,8 -90,8 +92,8 @@@ safe_to_abort () 
  	then
  		return 0
  	fi
 -	echo >&2 "You seem to have moved HEAD since the last 'am' failure."
 -	echo >&2 "Not rewinding to ORIG_HEAD"
 +		gettextln "You seem to have moved HEAD since the last 'am' failure.
 +Not rewinding to ORIG_HEAD" >&2
  	return 1
  }
  
@@@ -101,9 -100,9 +102,9 @@@ stop_here_user_resolve () 
  	    printf '%s\n' "$resolvemsg"
  	    stop_here $1
      fi
 -    echo "When you have resolved this problem run \"$cmdline --resolved\"."
 -    echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
 -    echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
 +    eval_gettextln "When you have resolved this problem run \"\$cmdline --resolved\".
 +If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
 +To restore the original branch and stop patching run \"\$cmdline --abort\"."
  
      stop_here $1
  }
@@@ -117,7 -116,7 +118,7 @@@ go_next () 
  
  cannot_fallback () {
  	echo "$1"
 -	echo "Cannot fall back to three-way merge."
 +	gettextln "Cannot fall back to three-way merge."
  	exit 1
  }
  
@@@ -128,24 -127,21 +129,24 @@@ fall_back_3way () 
      mkdir "$dotest/patch-merge-tmp-dir"
  
      # First see if the patch records the index info that we can use.
 -    git apply --build-fake-ancestor "$dotest/patch-merge-tmp-index" \
 -	"$dotest/patch" &&
 +    cmd="git apply $git_apply_opt --build-fake-ancestor" &&
 +    cmd="$cmd "'"$dotest/patch-merge-tmp-index" "$dotest/patch"' &&
 +    eval "$cmd" &&
      GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
      git write-tree >"$dotest/patch-merge-base+" ||
 -    cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."
 +    cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
  
      say Using index info to reconstruct a base tree...
 -    if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
 -	git apply --cached <"$dotest/patch"
 +
 +    cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
 +    cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"'
 +    if eval "$cmd"
      then
  	mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
  	mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
      else
 -        cannot_fallback "Did you hand edit your patch?
 -It does not apply to blobs recorded in its index."
 +	cannot_fallback "$(gettext "Did you hand edit your patch?
 +It does not apply to blobs recorded in its index.")"
      fi
  
      test -f "$dotest/patch-merge-index" &&
@@@ -153,7 -149,7 +154,7 @@@
      orig_tree=$(cat "$dotest/patch-merge-base") &&
      rm -fr "$dotest"/patch-merge-* || exit 1
  
 -    say Falling back to patching base and 3-way merge...
 +    say "$(gettext "Falling back to patching base and 3-way merge...")"
  
      # This is not so wrong.  Depending on which base we picked,
      # orig_tree may be wildly different from ours, but his_tree
@@@ -198,15 -194,10 +199,15 @@@ check_patch_format () 
  		return 0
  	fi
  
 -	# otherwise, check the first few lines of the first patch to try
 -	# to detect its format
 +	# otherwise, check the first few non-blank lines of the first
 +	# patch to try to detect its format
  	{
 -		read l1
 +		# Start from first line containing non-whitespace
 +		l1=
 +		while test -z "$l1"
 +		do
 +			read l1 || break
 +		done
  		read l2
  		read l3
  		case "$l1" in
@@@ -265,7 -256,7 +266,7 @@@ split_patches () 
  	stgit-series)
  		if test $# -ne 1
  		then
 -			clean_abort "Only one StGIT patch series can be applied at once"
 +			clean_abort "$(gettext "Only one StGIT patch series can be applied at once")"
  		fi
  		series_dir=`dirname "$1"`
  		series_file="$1"
@@@ -299,7 -290,7 +300,7 @@@
  			perl -ne 'BEGIN { $subject = 0 }
  				if ($subject > 1) { print ; }
  				elsif (/^\s+$/) { next ; }
 -				elsif (/^Author:/) { print s/Author/From/ ; }
 +				elsif (/^Author:/) { s/Author/From/ ; print ;}
  				elsif (/^(From|Date)/) { print ; }
  				elsif ($subject) {
  					$subject = 2 ;
@@@ -315,46 -306,11 +316,46 @@@
  		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 "$parse_patch" ; then
 -			clean_abort "Patch format $patch_format is not supported."
 +		if test -n "$patch_format"
 +		then
 +			clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
  		else
 -			clean_abort "Patch format detection failed."
 +			clean_abort "$(gettext "Patch format detection failed.")"
  		fi
  		;;
  	esac
@@@ -380,9 -336,7 +381,9 @@@ d
  	-i|--interactive)
  		interactive=t ;;
  	-b|--binary)
 -		: ;;
 +		echo >&2 "The $1 option has been a no-op for long time, and"
 +		echo >&2 "it will be removed. Please do not use it anymore."
 +		;;
  	-3|--3way)
  		threeway=t ;;
  	-s|--signoff)
@@@ -393,8 -347,6 +394,8 @@@
  		utf8= ;;
  	-k|--keep)
  		keep=t ;;
 +	--keep-non-patch)
 +		keep=b ;;
  	-c|--scissors)
  		scissors=t ;;
  	--no-scissors)
@@@ -408,11 -360,11 +409,11 @@@
  	--rebasing)
  		rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
  	-d|--dotest)
 -		die "-d option is no longer supported.  Do not use."
 +		die "$(gettext "-d option is no longer supported.  Do not use.")"
  		;;
  	--resolvemsg)
  		shift; resolvemsg=$1 ;;
- 	--whitespace|--directory|--exclude)
+ 	--whitespace|--directory|--exclude|--include)
  		git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
  	-C|-p)
  		git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
@@@ -471,12 -423,12 +472,12 @@@ the
  		false
  		;;
  	esac ||
 -	die "previous rebase directory $dotest still exists but mbox given."
 +	die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")"
  	resume=yes
  
  	case "$skip,$abort" in
  	t,t)
 -		die "Please make up your mind. --skip or --abort?"
 +		die "$(gettext "Please make up your mind. --skip or --abort?")"
  		;;
  	t,)
  		git rerere clear
@@@ -503,7 -455,7 +504,7 @@@
  else
  	# Make sure we are not given --skip, --resolved, nor --abort
  	test "$skip$resolved$abort" = "" ||
 -		die "Resolve operation not in progress, we are not resuming."
 +		die "$(gettext "Resolve operation not in progress, we are not resuming.")"
  
  	# Start afresh.
  	mkdir -p "$dotest" || exit
@@@ -538,6 -490,7 +539,6 @@@
  	echo "$sign" >"$dotest/sign"
  	echo "$utf8" >"$dotest/utf8"
  	echo "$keep" >"$dotest/keep"
 -	echo "$keepcr" >"$dotest/keepcr"
  	echo "$scissors" >"$dotest/scissors"
  	echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
  	echo "$GIT_QUIET" >"$dotest/quiet"
@@@ -556,8 -509,6 +557,8 @@@
  	fi
  fi
  
 +git update-index -q --refresh
 +
  case "$resolved" in
  '')
  	case "$HAS_HEAD" in
@@@ -569,28 -520,25 +570,28 @@@
  	if test "$files"
  	then
  		test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
 -		die "Dirty index: cannot apply patches (dirty: $files)"
 +		die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")"
  	fi
  esac
  
 +# Now, decide what command line options we will give to the git
 +# commands we invoke, based on the result of parsing command line
 +# options and previous invocation state stored in $dotest/ files.
 +
  if test "$(cat "$dotest/utf8")" = t
  then
  	utf8=-u
  else
  	utf8=-n
  fi
 -if test "$(cat "$dotest/keep")" = t
 -then
 -	keep=-k
 -fi
 -case "$(cat "$dotest/keepcr")" in
 +keep=$(cat "$dotest/keep")
 +case "$keep" in
  t)
 -	keepcr=--keep-cr ;;
 -f)
 -	keepcr=--no-keep-cr ;;
 +	keep=-k ;;
 +b)
 +	keep=-b ;;
 +*)
 +	keep= ;;
  esac
  case "$(cat "$dotest/scissors")" in
  t)
@@@ -661,9 -609,9 +662,9 @@@ d
  			go_next && continue
  
  		test -s "$dotest/patch" || {
 -			echo "Patch is empty.  Was it split wrong?"
 -			echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
 -			echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
 +			eval_gettextln "Patch is empty.  Was it split wrong?
 +If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
 +To restore the original branch and stop patching run \"\$cmdline --abort\"."
  			stop_here $this
  		}
  		rm -f "$dotest/original-commit" "$dotest/author-script"
@@@ -698,7 -646,7 +699,7 @@@
  
  	if test -z "$GIT_AUTHOR_EMAIL"
  	then
 -		echo "Patch does not have a valid e-mail address."
 +		gettextln "Patch does not have a valid e-mail address."
  		stop_here $this
  	fi
  
@@@ -745,18 -693,15 +746,18 @@@
  	if test "$interactive" = t
  	then
  	    test -t 0 ||
 -	    die "cannot be interactive without stdin connected to a terminal."
 +	    die "$(gettext "cannot be interactive without stdin connected to a terminal.")"
  	    action=again
  	    while test "$action" = again
  	    do
 -		echo "Commit Body is:"
 +		gettextln "Commit Body is:"
  		echo "--------------------------"
  		cat "$dotest/final-commit"
  		echo "--------------------------"
 -		printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
 +		# TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 +		# in your translation. The program will only accept English
 +		# input at this point.
 +		gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
  		read reply
  		case "$reply" in
  		[yY]*) action=yes ;;
@@@ -792,7 -737,7 +793,7 @@@
  		stop_here $this
  	fi
  
 -	say "Applying: $FIRSTLINE"
 +	say "$(eval_gettext "Applying: \$FIRSTLINE")"
  
  	case "$resolved" in
  	'')
@@@ -813,16 -758,16 +814,16 @@@
  		# working tree.
  		resolved=
  		git diff-index --quiet --cached HEAD -- && {
 -			echo "No changes - did you forget to use 'git add'?"
 -			echo "If there is nothing left to stage, chances are that something else"
 -			echo "already introduced the same changes; you might want to skip this patch."
 +			gettextln "No changes - did you forget to use 'git add'?
 +If there is nothing left to stage, chances are that something else
 +already introduced the same changes; you might want to skip this patch."
  			stop_here_user_resolve $this
  		}
  		unmerged=$(git ls-files -u)
  		if test -n "$unmerged"
  		then
 -			echo "You still have unmerged paths in your index"
 -			echo "did you forget to use 'git add'?"
 +			gettextln "You still have unmerged paths in your index
 +did you forget to use 'git add'?"
  			stop_here_user_resolve $this
  		fi
  		apply_status=0
@@@ -837,7 -782,7 +838,7 @@@
  		    # Applying the patch to an earlier tree and merging the
  		    # result may have produced the same tree as ours.
  		    git diff-index --quiet --cached HEAD -- && {
 -			say No changes -- Patch already applied.
 +			say "$(gettext "No changes -- Patch already applied.")"
  			go_next
  			continue
  		    }
@@@ -847,7 -792,7 +848,7 @@@
  	fi
  	if test $apply_status != 0
  	then
 -		printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
 +		eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
  		stop_here_user_resolve $this
  	fi
  
@@@ -863,7 -808,7 +864,7 @@@
  			GIT_AUTHOR_DATE=
  		fi
  		parent=$(git rev-parse --verify -q HEAD) ||
 -		say >&2 "applying to an empty history"
 +		say >&2 "$(gettext "applying to an empty history")"
  
  		if test -n "$committer_date_is_author_date"
  		then