From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Mar 2010 23:32:34 +0000 (-0800)
Subject: Merge branch 'sh/am-keep-cr'
X-Git-Tag: v1.7.1-rc0~73
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c505a850157961d2db4512d029753946d0591649?hp=-c

Merge branch 'sh/am-keep-cr'

* sh/am-keep-cr:
git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
git-am: Add am.keepcr and --no-keep-cr to override it
git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
documentation: 'git-mailsplit --keep-cr' is not hidden anymore
---

c505a850157961d2db4512d029753946d0591649
diff --combined Documentation/config.txt
index 7103172ed3,dcbbdad661..87a3512073
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -555,6 -555,13 +555,13 @@@ it will be treated as a shell command
  executed from the top-level directory of a repository, which may
  not necessarily be the current directory.
  
+ am.keepcr::
+ 	If true, git-am will call git-mailsplit for patches in mbox format
+ 	with parameter '--keep-cr'. In this case git-mailsplit will
+ 	not remove `\r` from lines ending with `\r\n`. Can be overrriden
+ 	by giving '--no-keep-cr' from the command line.
+ 	See linkgit:git-am[1], linkgit:git-mailsplit[1].
+ 
  apply.ignorewhitespace::
  	When set to 'change', tells 'git apply' to ignore changes in
  	whitespace, in the same way as the '--ignore-space-change'
@@@ -685,7 -692,9 +692,7 @@@ color.grep:
  
  color.grep.match::
  	Use customized color for matches.  The value of this variable
 -	may be specified as in color.branch.<slot>.  It is passed using
 -	the environment variables 'GREP_COLOR' and 'GREP_COLORS' when
 -	calling an external 'grep'.
 +	may be specified as in color.branch.<slot>.
  
  color.interactive::
  	When set to `always`, always use colors for interactive prompts
diff --combined Documentation/git-am.txt
index 23864df8da,70bc698a35..9e62f8778f
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@@ -9,7 -9,7 +9,7 @@@ git-am - Apply a series of patches fro
  SYNOPSIS
  --------
  [verse]
- 'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
+ 'git am' [--signoff] [--keep] [--keep-cr | --no-keep-cr] [--utf8 | --no-utf8]
  	 [--3way] [--interactive] [--committer-date-is-author-date]
  	 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
  	 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
@@@ -39,12 -39,19 +39,19 @@@ OPTION
  --keep::
  	Pass `-k` 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])
+ 	with the same option, to prevent it from stripping CR at the end of
+ 	lines. `am.keepcr` configuration variable can be used to specify the
+ 	default behaviour.  `--no-keep-cr` is useful to override `am.keepcr`.
+ 
  -c::
  --scissors::
  	Remove everything in body before a scissors line (see
  	linkgit:git-mailinfo[1]).
  
 ----no-scissors::
 +--no-scissors::
  	Ignore scissors lines (see linkgit:git-mailinfo[1]).
  
  -q::
diff --combined builtin/mailsplit.c
index 207e358ed1,0000000000..cdfc1b7042
mode 100644,000000..100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@@ -1,309 -1,0 +1,309 @@@
 +/*
 + * Totally braindamaged mbox splitter program.
 + *
 + * It just splits a mbox into a list of files: "0001" "0002" ..
 + * so you can process them further from there.
 + */
 +#include "cache.h"
 +#include "builtin.h"
 +#include "string-list.h"
 +#include "strbuf.h"
 +
 +static const char git_mailsplit_usage[] =
- "git mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";
++"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [<mbox>|<Maildir>...]";
 +
 +static int is_from_line(const char *line, int len)
 +{
 +	const char *colon;
 +
 +	if (len < 20 || memcmp("From ", line, 5))
 +		return 0;
 +
 +	colon = line + len - 2;
 +	line += 5;
 +	for (;;) {
 +		if (colon < line)
 +			return 0;
 +		if (*--colon == ':')
 +			break;
 +	}
 +
 +	if (!isdigit(colon[-4]) ||
 +	    !isdigit(colon[-2]) ||
 +	    !isdigit(colon[-1]) ||
 +	    !isdigit(colon[ 1]) ||
 +	    !isdigit(colon[ 2]))
 +		return 0;
 +
 +	/* year */
 +	if (strtol(colon+3, NULL, 10) <= 90)
 +		return 0;
 +
 +	/* Ok, close enough */
 +	return 1;
 +}
 +
 +static struct strbuf buf = STRBUF_INIT;
 +static int keep_cr;
 +
 +/* Called with the first line (potentially partial)
 + * already in buf[] -- normally that should begin with
 + * the Unix "From " line.  Write it into the specified
 + * file.
 + */
 +static int split_one(FILE *mbox, const char *name, int allow_bare)
 +{
 +	FILE *output = NULL;
 +	int fd;
 +	int status = 0;
 +	int is_bare = !is_from_line(buf.buf, buf.len);
 +
 +	if (is_bare && !allow_bare)
 +		goto corrupt;
 +
 +	fd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0666);
 +	if (fd < 0)
 +		die_errno("cannot open output file '%s'", name);
 +	output = xfdopen(fd, "w");
 +
 +	/* Copy it out, while searching for a line that begins with
 +	 * "From " and having something that looks like a date format.
 +	 */
 +	for (;;) {
 +		if (!keep_cr && buf.len > 1 && buf.buf[buf.len-1] == '\n' &&
 +			buf.buf[buf.len-2] == '\r') {
 +			strbuf_setlen(&buf, buf.len-2);
 +			strbuf_addch(&buf, '\n');
 +		}
 +
 +		if (fwrite(buf.buf, 1, buf.len, output) != buf.len)
 +			die_errno("cannot write output");
 +
 +		if (strbuf_getwholeline(&buf, mbox, '\n')) {
 +			if (feof(mbox)) {
 +				status = 1;
 +				break;
 +			}
 +			die_errno("cannot read mbox");
 +		}
 +		if (!is_bare && is_from_line(buf.buf, buf.len))
 +			break; /* done with one message */
 +	}
 +	fclose(output);
 +	return status;
 +
 + corrupt:
 +	if (output)
 +		fclose(output);
 +	unlink(name);
 +	fprintf(stderr, "corrupt mailbox\n");
 +	exit(1);
 +}
 +
 +static int populate_maildir_list(struct string_list *list, const char *path)
 +{
 +	DIR *dir;
 +	struct dirent *dent;
 +	char name[PATH_MAX];
 +	char *subs[] = { "cur", "new", NULL };
 +	char **sub;
 +
 +	for (sub = subs; *sub; ++sub) {
 +		snprintf(name, sizeof(name), "%s/%s", path, *sub);
 +		if ((dir = opendir(name)) == NULL) {
 +			if (errno == ENOENT)
 +				continue;
 +			error("cannot opendir %s (%s)", name, strerror(errno));
 +			return -1;
 +		}
 +
 +		while ((dent = readdir(dir)) != NULL) {
 +			if (dent->d_name[0] == '.')
 +				continue;
 +			snprintf(name, sizeof(name), "%s/%s", *sub, dent->d_name);
 +			string_list_insert(name, list);
 +		}
 +
 +		closedir(dir);
 +	}
 +
 +	return 0;
 +}
 +
 +static int split_maildir(const char *maildir, const char *dir,
 +	int nr_prec, int skip)
 +{
 +	char file[PATH_MAX];
 +	char name[PATH_MAX];
 +	int ret = -1;
 +	int i;
 +	struct string_list list = {NULL, 0, 0, 1};
 +
 +	if (populate_maildir_list(&list, maildir) < 0)
 +		goto out;
 +
 +	for (i = 0; i < list.nr; i++) {
 +		FILE *f;
 +		snprintf(file, sizeof(file), "%s/%s", maildir, list.items[i].string);
 +		f = fopen(file, "r");
 +		if (!f) {
 +			error("cannot open mail %s (%s)", file, strerror(errno));
 +			goto out;
 +		}
 +
 +		if (strbuf_getwholeline(&buf, f, '\n')) {
 +			error("cannot read mail %s (%s)", file, strerror(errno));
 +			goto out;
 +		}
 +
 +		sprintf(name, "%s/%0*d", dir, nr_prec, ++skip);
 +		split_one(f, name, 1);
 +
 +		fclose(f);
 +	}
 +
 +	ret = skip;
 +out:
 +	string_list_clear(&list, 1);
 +	return ret;
 +}
 +
 +static int split_mbox(const char *file, const char *dir, int allow_bare,
 +		      int nr_prec, int skip)
 +{
 +	char name[PATH_MAX];
 +	int ret = -1;
 +	int peek;
 +
 +	FILE *f = !strcmp(file, "-") ? stdin : fopen(file, "r");
 +	int file_done = 0;
 +
 +	if (!f) {
 +		error("cannot open mbox %s", file);
 +		goto out;
 +	}
 +
 +	do {
 +		peek = fgetc(f);
 +	} while (isspace(peek));
 +	ungetc(peek, f);
 +
 +	if (strbuf_getwholeline(&buf, f, '\n')) {
 +		/* empty stdin is OK */
 +		if (f != stdin) {
 +			error("cannot read mbox %s", file);
 +			goto out;
 +		}
 +		file_done = 1;
 +	}
 +
 +	while (!file_done) {
 +		sprintf(name, "%s/%0*d", dir, nr_prec, ++skip);
 +		file_done = split_one(f, name, allow_bare);
 +	}
 +
 +	if (f != stdin)
 +		fclose(f);
 +
 +	ret = skip;
 +out:
 +	return ret;
 +}
 +
 +int cmd_mailsplit(int argc, const char **argv, const char *prefix)
 +{
 +	int nr = 0, nr_prec = 4, num = 0;
 +	int allow_bare = 0;
 +	const char *dir = NULL;
 +	const char **argp;
 +	static const char *stdin_only[] = { "-", NULL };
 +
 +	for (argp = argv+1; *argp; argp++) {
 +		const char *arg = *argp;
 +
 +		if (arg[0] != '-')
 +			break;
 +		/* do flags here */
 +		if ( arg[1] == 'd' ) {
 +			nr_prec = strtol(arg+2, NULL, 10);
 +			if (nr_prec < 3 || 10 <= nr_prec)
 +				usage(git_mailsplit_usage);
 +			continue;
 +		} else if ( arg[1] == 'f' ) {
 +			nr = strtol(arg+2, NULL, 10);
 +		} else if ( arg[1] == 'h' ) {
 +			usage(git_mailsplit_usage);
 +		} else if ( arg[1] == 'b' && !arg[2] ) {
 +			allow_bare = 1;
 +		} else if (!strcmp(arg, "--keep-cr")) {
 +			keep_cr = 1;
 +		} else if ( arg[1] == 'o' && arg[2] ) {
 +			dir = arg+2;
 +		} else if ( arg[1] == '-' && !arg[2] ) {
 +			argp++;	/* -- marks end of options */
 +			break;
 +		} else {
 +			die("unknown option: %s", arg);
 +		}
 +	}
 +
 +	if ( !dir ) {
 +		/* Backwards compatibility: if no -o specified, accept
 +		   <mbox> <dir> or just <dir> */
 +		switch (argc - (argp-argv)) {
 +		case 1:
 +			dir = argp[0];
 +			argp = stdin_only;
 +			break;
 +		case 2:
 +			stdin_only[0] = argp[0];
 +			dir = argp[1];
 +			argp = stdin_only;
 +			break;
 +		default:
 +			usage(git_mailsplit_usage);
 +		}
 +	} else {
 +		/* New usage: if no more argument, parse stdin */
 +		if ( !*argp )
 +			argp = stdin_only;
 +	}
 +
 +	while (*argp) {
 +		const char *arg = *argp++;
 +		struct stat argstat;
 +		int ret = 0;
 +
 +		if (arg[0] == '-' && arg[1] == 0) {
 +			ret = split_mbox(arg, dir, allow_bare, nr_prec, nr);
 +			if (ret < 0) {
 +				error("cannot split patches from stdin");
 +				return 1;
 +			}
 +			num += (ret - nr);
 +			nr = ret;
 +			continue;
 +		}
 +
 +		if (stat(arg, &argstat) == -1) {
 +			error("cannot stat %s (%s)", arg, strerror(errno));
 +			return 1;
 +		}
 +
 +		if (S_ISDIR(argstat.st_mode))
 +			ret = split_maildir(arg, dir, nr_prec, nr);
 +		else
 +			ret = split_mbox(arg, dir, allow_bare, nr_prec, nr);
 +
 +		if (ret < 0) {
 +			error("cannot split patches from %s", arg);
 +			return 1;
 +		}
 +		num += (ret - nr);
 +		nr = ret;
 +	}
 +
 +	printf("%d\n", num);
 +
 +	return 0;
 +}
diff --combined git-am.sh
index 9df951a597,a2004506c5..50a292a7da
--- a/git-am.sh
+++ b/git-am.sh
@@@ -15,6 -15,8 +15,8 @@@ 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-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
  whitespace=     pass it through git-apply
  ignore-space-change pass it through git-apply
@@@ -217,12 -219,12 +219,12 @@@ check_patch_format () 
  split_patches () {
  	case "$patch_format" in
  	mbox)
- 		case "$rebasing" in
- 		'')
- 			keep_cr= ;;
- 		?*)
- 			keep_cr=--keep-cr ;;
- 		esac
+ 		if test -n "$rebasing" || test t = "$keepcr"
+ 		then
+ 		    keep_cr=--keep-cr
+ 		else
+ 		    keep_cr=
+ 		fi
  		git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" ||
  		clean_abort
  		;;
@@@ -291,13 -293,18 +293,18 @@@
  
  prec=4
  dotest="$GIT_DIR/rebase-apply"
- sign= utf8=t keep= skip= interactive= resolved= rebasing= abort=
+ sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
  resolvemsg= resume= scissors= no_inbody_headers=
  git_apply_opt=
  committer_date_is_author_date=
  ignore_date=
  allow_rerere_autoupdate=
  
+ if test "$(git config --bool --get am.keepcr)" = true
+ then
+     keepcr=t
+ fi
+ 
  while test $# != 0
  do
  	case "$1" in
@@@ -348,6 -355,10 +355,10 @@@
  		allow_rerere_autoupdate="$1" ;;
  	-q|--quiet)
  		GIT_QUIET=t ;;
+ 	--keep-cr)
+ 		keepcr=t ;;
+ 	--no-keep-cr)
+ 		keepcr=f ;;
  	--)
  		shift; break ;;
  	*)
@@@ -453,6 -464,7 +464,7 @@@ els
  	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"
@@@ -496,6 -508,12 +508,12 @@@ if test "$(cat "$dotest/keep")" = 
  then
  	keep=-k
  fi
+ case "$(cat "$dotest/keepcr")" in
+ t)
+ 	keepcr=--keep-cr ;;
+ f)
+ 	keepcr=--no-keep-cr ;;
+ esac
  case "$(cat "$dotest/scissors")" in
  t)
  	scissors=--scissors ;;
@@@ -663,7 -681,10 +681,7 @@@ d
  		[eE]*) git_editor "$dotest/final-commit"
  		       action=again ;;
  		[vV]*) action=again
 -		       : ${GIT_PAGER=$(git var GIT_PAGER)}
 -		       : ${LESS=-FRSX}
 -		       export LESS
 -		       $GIT_PAGER "$dotest/patch" ;;
 +		       git_pager "$dotest/patch" ;;
  		*)     action=again ;;
  		esac
  	    done