From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Sep 2012 18:09:04 +0000 (-0700)
Subject: Merge branch 'nd/am-i18n-fix'
X-Git-Tag: v1.8.0-rc0~96
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e245397434f8d26bf18053823c3fb9d1374679bd?ds=inline;hp=-c

Merge branch 'nd/am-i18n-fix'

"git am" wasn't marked up for i18n properly.

* nd/am-i18n-fix:
am: quote string for translation before passing to eval_gettextln
---

e245397434f8d26bf18053823c3fb9d1374679bd
diff --combined git-am.sh
index bd9620c6c6,c1b7391080..c682d34094
--- 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,7 -23,6 +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
@@@ -92,7 -90,7 +92,7 @@@ safe_to_abort () 
  	then
  		return 0
  	fi
 -		gettextln "You seem to have moved HEAD since the last 'am' failure.
 +	gettextln "You seem to have moved HEAD since the last 'am' failure.
  Not rewinding to ORIG_HEAD" >&2
  	return 1
  }
@@@ -102,9 -100,9 +102,9 @@@ stop_here_user_resolve () 
  	    printf '%s\n' "$resolvemsg"
  	    stop_here $1
      fi
 -    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\"."
 +    eval_gettextln "When you have resolved this problem, run \"\$cmdline --resolved\".
 +If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
 +To restore the original branch and stop patching, run \"\$cmdline --abort\"."
  
      stop_here $1
  }
@@@ -136,15 -134,9 +136,15 @@@ fall_back_3way () 
      git write-tree >"$dotest/patch-merge-base+" ||
      cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
  
 -    say Using index info to reconstruct a base tree...
 +    say "$(gettext "Using index info to reconstruct a base tree...")"
  
      cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
 +
 +    if test -z "$GIT_QUIET"
 +    then
 +	eval "$cmd git diff-index --cached --diff-filter=AM --name-status HEAD"
 +    fi
 +
      cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"'
      if eval "$cmd"
      then
@@@ -176,7 -168,8 +176,7 @@@ It does not apply to blobs recorded in 
      fi
      git-merge-recursive $orig_tree -- HEAD $his_tree || {
  	    git rerere $allow_rerere_autoupdate
 -	    echo Failed to merge in the changes.
 -	    exit 1
 +	    die "$(gettext "Failed to merge in the changes.")"
      }
      unset GITHEAD_$his_tree
  }
@@@ -259,7 -252,7 +259,7 @@@ check_patch_format () 
  split_patches () {
  	case "$patch_format" in
  	mbox)
 -		if test -n "$rebasing" || test t = "$keepcr"
 +		if test t = "$keepcr"
  		then
  		    keep_cr=--keep-cr
  		else
@@@ -386,9 -379,7 +386,9 @@@ d
  	-i|--interactive)
  		interactive=t ;;
  	-b|--binary)
 -		: ;;
 +		gettextln >&2 "The -b/--binary option has been a no-op for long time, and
 +it will be removed. Please do not use it anymore."
 +		;;
  	-3|--3way)
  		threeway=t ;;
  	-s|--signoff)
@@@ -399,8 -390,6 +399,8 @@@
  		utf8= ;;
  	-k|--keep)
  		keep=t ;;
 +	--keep-non-patch)
 +		keep=b ;;
  	-c|--scissors)
  		scissors=t ;;
  	--no-scissors)
@@@ -412,10 -401,13 +412,10 @@@
  	--abort)
  		abort=t ;;
  	--rebasing)
 -		rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
 -	-d|--dotest)
 -		die "$(gettext "-d option is no longer supported.  Do not use.")"
 -		;;
 +		rebasing=t threeway=t ;;
  	--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 ;;
@@@ -576,25 -568,16 +576,25 @@@ case "$resolved" i
  	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
 +keep=$(cat "$dotest/keep")
 +case "$keep" in
 +t)
 +	keep=-k ;;
 +b)
 +	keep=-b ;;
 +*)
 +	keep= ;;
 +esac
  case "$(cat "$dotest/scissors")" in
  t)
  	scissors=--scissors ;;
@@@ -654,34 -637,32 +654,34 @@@ d
  	# by the user, or the user can tell us to do so by --resolved flag.
  	case "$resume" in
  	'')
 -		git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
 -			<"$dotest/$msgnum" >"$dotest/info" ||
 -			stop_here $this
 -
 -		# skip pine's internal folder data
 -		sane_grep '^Author: Mail System Internal Data$' \
 -			<"$dotest"/info >/dev/null &&
 -			go_next && continue
 -
 -		test -s "$dotest/patch" || {
 -			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"
 -		if test -f "$dotest/rebasing" &&
 +		if test -f "$dotest/rebasing"
 +		then
  			commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
  				-e q "$dotest/$msgnum") &&
 -			test "$(git cat-file -t "$commit")" = commit
 -		then
 +			test "$(git cat-file -t "$commit")" = commit ||
 +				stop_here $this
  			git cat-file commit "$commit" |
  			sed -e '1,/^$/d' >"$dotest/msg-clean"
 -			echo "$commit" > "$dotest/original-commit"
 -			get_author_ident_from_commit "$commit" > "$dotest/author-script"
 +			echo "$commit" >"$dotest/original-commit"
 +			get_author_ident_from_commit "$commit" >"$dotest/author-script"
 +			git diff-tree --root --binary "$commit" >"$dotest/patch"
  		else
 +			git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
 +				<"$dotest/$msgnum" >"$dotest/info" ||
 +				stop_here $this
 +
 +			# skip pine's internal folder data
 +			sane_grep '^Author: Mail System Internal Data$' \
 +				<"$dotest"/info >/dev/null &&
 +				go_next && continue
 +
 +			test -s "$dotest/patch" || {
 +				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"
  			{
  				sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
  				echo
@@@ -855,8 -836,8 +855,8 @@@ did you forget to use 'git add'?
  		eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
  		if test "$(git config --bool advice.amworkdir)" != false
  		then
- 			eval_gettextln "The copy of the patch that failed is found in:
-    $dotest/patch"
+ 			eval_gettextln 'The copy of the patch that failed is found in:
+    $dotest/patch'
  		fi
  		stop_here_user_resolve $this
  	fi