From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jan 2014 18:45:02 +0000 (-0800)
Subject: Merge branch 'jk/diff-filespec-cleanup'
X-Git-Tag: v1.9-rc1~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e049109ef11be4e164c6f0426fb77c9c7a1ab647?ds=inline;hp=-c

Merge branch 'jk/diff-filespec-cleanup'

* jk/diff-filespec-cleanup:
diff_filespec: use only 2 bits for is_binary flag
diff_filespec: reorder is_binary field
diff_filespec: drop xfrm_flags field
diff_filespec: drop funcname_pattern_ident field
diff_filespec: reorder dirty_submodule macro definitions
---

e049109ef11be4e164c6f0426fb77c9c7a1ab647
diff --combined diff.c
index 6b4cd0eb36,774965307c..8e4a6a9105
--- a/diff.c
+++ b/diff.c
@@@ -30,7 -30,6 +30,7 @@@ static int diff_use_color_default = -1
  static int diff_context_default = 3;
  static const char *diff_word_regex_cfg;
  static const char *external_diff_cmd_cfg;
 +static const char *diff_order_file_cfg;
  int diff_auto_refresh_index = 1;
  static int diff_mnemonic_prefix;
  static int diff_no_prefix;
@@@ -202,8 -201,6 +202,8 @@@ int git_diff_ui_config(const char *var
  		return git_config_string(&external_diff_cmd_cfg, var, value);
  	if (!strcmp(var, "diff.wordregex"))
  		return git_config_string(&diff_word_regex_cfg, var, value);
 +	if (!strcmp(var, "diff.orderfile"))
 +		return git_config_pathname(&diff_order_file_cfg, var, value);
  
  	if (!strcmp(var, "diff.ignoresubmodules"))
  		handle_ignore_submodules_arg(&default_diff_options, value);
@@@ -238,7 -235,7 +238,7 @@@ int git_diff_basic_config(const char *v
  	if (userdiff_config(var, value) < 0)
  		return -1;
  
 -	if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
 +	if (starts_with(var, "diff.color.") || starts_with(var, "color.diff.")) {
  		int slot = parse_diff_color_slot(var, 11);
  		if (slot < 0)
  			return 0;
@@@ -267,7 -264,7 +267,7 @@@
  		return 0;
  	}
  
 -	if (!prefixcmp(var, "submodule."))
 +	if (starts_with(var, "submodule."))
  		return parse_submodule_config_option(var, value);
  
  	return git_default_config(var, value, cb);
@@@ -1218,7 -1215,7 +1218,7 @@@ static void fn_out_consume(void *priv, 
  			diff_words_append(line, len,
  					  &ecbdata->diff_words->plus);
  			return;
 -		} else if (!prefixcmp(line, "\\ ")) {
 +		} else if (starts_with(line, "\\ ")) {
  			/*
  			 * Eat the "no newline at eof" marker as if we
  			 * saw a "+" or "-" line with nothing on it,
@@@ -2390,9 -2387,9 +2390,9 @@@ static void builtin_diff(const char *na
  			xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
  		if (!diffopts)
  			;
 -		else if (!prefixcmp(diffopts, "--unified="))
 +		else if (starts_with(diffopts, "--unified="))
  			xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
 -		else if (!prefixcmp(diffopts, "-u"))
 +		else if (starts_with(diffopts, "-u"))
  			xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
  		if (o->word_diff)
  			init_diff_words_data(&ecbdata, o, one, two);
@@@ -2902,16 -2899,11 +2902,16 @@@ static void run_external_diff(const cha
  			      struct diff_filespec *one,
  			      struct diff_filespec *two,
  			      const char *xfrm_msg,
 -			      int complete_rewrite)
 +			      int complete_rewrite,
 +			      struct diff_options *o)
  {
  	const char *spawn_arg[10];
  	int retval;
  	const char **arg = &spawn_arg[0];
 +	struct diff_queue_struct *q = &diff_queued_diff;
 +	const char *env[3] = { NULL };
 +	char env_counter[50];
 +	char env_total[50];
  
  	if (one && two) {
  		struct diff_tempfile *temp_one, *temp_two;
@@@ -2936,14 -2928,7 +2936,14 @@@
  	}
  	*arg = NULL;
  	fflush(NULL);
 -	retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL);
 +
 +	env[0] = env_counter;
 +	snprintf(env_counter, sizeof(env_counter), "GIT_DIFF_PATH_COUNTER=%d",
 +		 ++o->diff_path_counter);
 +	env[1] = env_total;
 +	snprintf(env_total, sizeof(env_total), "GIT_DIFF_PATH_TOTAL=%d", q->nr);
 +
 +	retval = run_command_v_opt_cd_env(spawn_arg, RUN_USING_SHELL, NULL, env);
  	remove_tempfile();
  	if (retval) {
  		fprintf(stderr, "external diff died, stopping at %s.\n", name);
@@@ -3057,7 -3042,7 +3057,7 @@@ static void run_diff_cmd(const char *pg
  
  	if (pgm) {
  		run_external_diff(pgm, name, other, one, two, xfrm_msg,
 -				  complete_rewrite);
 +				  complete_rewrite, o);
  		return;
  	}
  	if (one && two)
@@@ -3222,8 -3207,6 +3222,8 @@@ void diff_setup(struct diff_options *op
  	options->detect_rename = diff_detect_rename_default;
  	options->xdl_opts |= diff_algorithm;
  
 +	options->orderfile = diff_order_file_cfg;
 +
  	if (diff_no_prefix) {
  		options->a_prefix = options->b_prefix = "";
  	} else if (!diff_mnemonic_prefix) {
@@@ -3334,8 -3317,6 +3334,8 @@@ void diff_setup_done(struct diff_option
  		options->output_format = DIFF_FORMAT_NO_OUTPUT;
  		DIFF_OPT_SET(options, EXIT_WITH_STATUS);
  	}
 +
 +	options->diff_path_counter = 0;
  }
  
  static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
@@@ -3410,10 -3391,10 +3410,10 @@@ int parse_long_opt(const char *opt, con
  	if (arg[0] != '-' || arg[1] != '-')
  		return 0;
  	arg += strlen("--");
 -	if (prefixcmp(arg, opt))
 +	if (!starts_with(arg, opt))
  		return 0;
  	arg += strlen(opt);
 -	if (*arg == '=') { /* sticked form: --option=value */
 +	if (*arg == '=') { /* stuck form: --option=value */
  		*optarg = arg + 1;
  		return 1;
  	}
@@@ -3441,7 -3422,7 +3441,7 @@@ static int stat_opt(struct diff_option
  
  	switch (*arg) {
  	case '-':
 -		if (!prefixcmp(arg, "-width")) {
 +		if (starts_with(arg, "-width")) {
  			arg += strlen("-width");
  			if (*arg == '=')
  				width = strtoul(arg + 1, &end, 10);
@@@ -3451,7 -3432,7 +3451,7 @@@
  				width = strtoul(av[1], &end, 10);
  				argcount = 2;
  			}
 -		} else if (!prefixcmp(arg, "-name-width")) {
 +		} else if (starts_with(arg, "-name-width")) {
  			arg += strlen("-name-width");
  			if (*arg == '=')
  				name_width = strtoul(arg + 1, &end, 10);
@@@ -3461,7 -3442,7 +3461,7 @@@
  				name_width = strtoul(av[1], &end, 10);
  				argcount = 2;
  			}
 -		} else if (!prefixcmp(arg, "-graph-width")) {
 +		} else if (starts_with(arg, "-graph-width")) {
  			arg += strlen("-graph-width");
  			if (*arg == '=')
  				graph_width = strtoul(arg + 1, &end, 10);
@@@ -3471,7 -3452,7 +3471,7 @@@
  				graph_width = strtoul(av[1], &end, 10);
  				argcount = 2;
  			}
 -		} else if (!prefixcmp(arg, "-count")) {
 +		} else if (starts_with(arg, "-count")) {
  			arg += strlen("-count");
  			if (*arg == '=')
  				count = strtoul(arg + 1, &end, 10);
@@@ -3633,15 -3614,15 +3633,15 @@@ int diff_opt_parse(struct diff_options 
  		options->output_format |= DIFF_FORMAT_SHORTSTAT;
  	else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat"))
  		return parse_dirstat_opt(options, "");
 -	else if (!prefixcmp(arg, "-X"))
 +	else if (starts_with(arg, "-X"))
  		return parse_dirstat_opt(options, arg + 2);
 -	else if (!prefixcmp(arg, "--dirstat="))
 +	else if (starts_with(arg, "--dirstat="))
  		return parse_dirstat_opt(options, arg + 10);
  	else if (!strcmp(arg, "--cumulative"))
  		return parse_dirstat_opt(options, "cumulative");
  	else if (!strcmp(arg, "--dirstat-by-file"))
  		return parse_dirstat_opt(options, "files");
 -	else if (!prefixcmp(arg, "--dirstat-by-file=")) {
 +	else if (starts_with(arg, "--dirstat-by-file=")) {
  		parse_dirstat_opt(options, "files");
  		return parse_dirstat_opt(options, arg + 18);
  	}
@@@ -3658,17 -3639,17 +3658,17 @@@
  		options->output_format |= DIFF_FORMAT_NAME_STATUS;
  	else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
  		options->output_format |= DIFF_FORMAT_NO_OUTPUT;
 -	else if (!prefixcmp(arg, "--stat"))
 +	else if (starts_with(arg, "--stat"))
  		/* --stat, --stat-width, --stat-name-width, or --stat-count */
  		return stat_opt(options, av);
  
  	/* renames options */
 -	else if (!prefixcmp(arg, "-B") || !prefixcmp(arg, "--break-rewrites=") ||
 +	else if (starts_with(arg, "-B") || starts_with(arg, "--break-rewrites=") ||
  		 !strcmp(arg, "--break-rewrites")) {
  		if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
  			return error("invalid argument to -B: %s", arg+2);
  	}
 -	else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--find-renames=") ||
 +	else if (starts_with(arg, "-M") || starts_with(arg, "--find-renames=") ||
  		 !strcmp(arg, "--find-renames")) {
  		if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
  			return error("invalid argument to -M: %s", arg+2);
@@@ -3677,7 -3658,7 +3677,7 @@@
  	else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
  		options->irreversible_delete = 1;
  	}
 -	else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--find-copies=") ||
 +	else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") ||
  		 !strcmp(arg, "--find-copies")) {
  		if (options->detect_rename == DIFF_DETECT_COPY)
  			DIFF_OPT_SET(options, FIND_COPIES_HARDER);
@@@ -3693,7 -3674,7 +3693,7 @@@
  		DIFF_OPT_CLR(options, RENAME_EMPTY);
  	else if (!strcmp(arg, "--relative"))
  		DIFF_OPT_SET(options, RELATIVE_NAME);
 -	else if (!prefixcmp(arg, "--relative=")) {
 +	else if (starts_with(arg, "--relative=")) {
  		DIFF_OPT_SET(options, RELATIVE_NAME);
  		options->prefix = arg + 11;
  	}
@@@ -3746,7 -3727,7 +3746,7 @@@
  		DIFF_OPT_CLR(options, FOLLOW_RENAMES);
  	else if (!strcmp(arg, "--color"))
  		options->use_color = 1;
 -	else if (!prefixcmp(arg, "--color=")) {
 +	else if (starts_with(arg, "--color=")) {
  		int value = git_config_colorbool(NULL, arg+8);
  		if (value < 0)
  			return error("option `color' expects \"always\", \"auto\", or \"never\"");
@@@ -3758,7 -3739,7 +3758,7 @@@
  		options->use_color = 1;
  		options->word_diff = DIFF_WORDS_COLOR;
  	}
 -	else if (!prefixcmp(arg, "--color-words=")) {
 +	else if (starts_with(arg, "--color-words=")) {
  		options->use_color = 1;
  		options->word_diff = DIFF_WORDS_COLOR;
  		options->word_regex = arg + 14;
@@@ -3767,7 -3748,7 +3767,7 @@@
  		if (options->word_diff == DIFF_WORDS_NONE)
  			options->word_diff = DIFF_WORDS_PLAIN;
  	}
 -	else if (!prefixcmp(arg, "--word-diff=")) {
 +	else if (starts_with(arg, "--word-diff=")) {
  		const char *type = arg + 12;
  		if (!strcmp(type, "plain"))
  			options->word_diff = DIFF_WORDS_PLAIN;
@@@ -3803,12 -3784,12 +3803,12 @@@
  	else if (!strcmp(arg, "--ignore-submodules")) {
  		DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
  		handle_ignore_submodules_arg(options, "all");
 -	} else if (!prefixcmp(arg, "--ignore-submodules=")) {
 +	} else if (starts_with(arg, "--ignore-submodules=")) {
  		DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
  		handle_ignore_submodules_arg(options, arg + 20);
  	} else if (!strcmp(arg, "--submodule"))
  		DIFF_OPT_SET(options, SUBMODULE_LOG);
 -	else if (!prefixcmp(arg, "--submodule="))
 +	else if (starts_with(arg, "--submodule="))
  		return parse_submodule_opt(options, arg + 12);
  
  	/* misc options */
@@@ -3844,7 -3825,7 +3844,7 @@@
  	}
  	else if (!strcmp(arg, "--abbrev"))
  		options->abbrev = DEFAULT_ABBREV;
 -	else if (!prefixcmp(arg, "--abbrev=")) {
 +	else if (starts_with(arg, "--abbrev=")) {
  		options->abbrev = strtoul(arg + 9, NULL, 10);
  		if (options->abbrev < MINIMUM_ABBREV)
  			options->abbrev = MINIMUM_ABBREV;
@@@ -3926,15 -3907,15 +3926,15 @@@ static int diff_scoreopt_parse(const ch
  	cmd = *opt++;
  	if (cmd == '-') {
  		/* convert the long-form arguments into short-form versions */
 -		if (!prefixcmp(opt, "break-rewrites")) {
 +		if (starts_with(opt, "break-rewrites")) {
  			opt += strlen("break-rewrites");
  			if (*opt == 0 || *opt++ == '=')
  				cmd = 'B';
 -		} else if (!prefixcmp(opt, "find-copies")) {
 +		} else if (starts_with(opt, "find-copies")) {
  			opt += strlen("find-copies");
  			if (*opt == 0 || *opt++ == '=')
  				cmd = 'C';
 -		} else if (!prefixcmp(opt, "find-renames")) {
 +		} else if (starts_with(opt, "find-renames")) {
  			opt += strlen("find-renames");
  			if (*opt == 0 || *opt++ == '=')
  				cmd = 'M';
@@@ -4139,9 -4120,9 +4139,9 @@@ void diff_debug_filespec(struct diff_fi
  		DIFF_FILE_VALID(s) ? "valid" : "invalid",
  		s->mode,
  		s->sha1_valid ? sha1_to_hex(s->sha1) : "");
- 	fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
+ 	fprintf(stderr, "queue[%d] %s size %lu\n",
  		x, one ? one : "",
- 		s->size, s->xfrm_flags);
+ 		s->size);
  }
  
  void diff_debug_filepair(const struct diff_filepair *p, int i)
@@@ -4344,7 -4325,7 +4344,7 @@@ static void patch_id_consume(void *priv
  	int new_len;
  
  	/* Ignore line numbers when computing the SHA1 of the patch */
 -	if (!prefixcmp(line, "@@ -"))
 +	if (starts_with(line, "@@ -"))
  		return;
  
  	new_len = remove_space(line, len);