Merge branch 'jk/textconv-utf16' into HEAD

* jk/textconv-utf16:
  diff: enable autoencode by default
  diff: add autoencode feature
  diff: add utf-{16,32} binary detection
  diff: convert filespec is_binary flag to enum
  diff: respect diff_options inside get_textconv()
  userdiff: give textconv its own struct
  fill_textconv: always check DIFF_FILE_VALID()

Author: peff

blame.c

@@ -254,8 +254,9 @@ static struct commit *fake_working_tree_commit(struct repository *r,
 
 		switch (st.st_mode & S_IFMT) {
 		case S_IFREG:
-			if (opt->flags.allow_textconv &&
-			    textconv_object(r, read_from, mode, null_oid(the_hash_algo), 0, &buf_ptr, &buf_len))
+			if (textconv_object(r, opt, read_from, mode,
+					    null_oid(the_hash_algo), 0,
+					    &buf_ptr, &buf_len))
 				strbuf_attach(&buf, buf_ptr, buf_len, buf_len + 1);
 			else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
 				die_errno("cannot open or read '%s'", read_from);
@@ -1037,8 +1038,7 @@ static void fill_origin_blob(struct diff_options *opt,
 		unsigned long file_size;
 
 		(*num_read_blob)++;
-		if (opt->flags.allow_textconv &&
-		    textconv_object(opt->repo, o->path, o->mode,
+		if (textconv_object(opt->repo, opt, o->path, o->mode,
 				    &o->blob_oid, 1, &file->ptr, &file_size))
 			;
 		else
@@ -2865,8 +2865,8 @@ void setup_scoreboard(struct blame_scoreboard *sb,
 		if (fill_blob_sha1_and_mode(sb->repo, o))
 			die(_("no such path %s in %s"), sb->path, final_commit_name);
 
-		if (sb->revs->diffopt.flags.allow_textconv &&
-		    textconv_object(sb->repo, sb->path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
+		if (textconv_object(sb->repo, &sb->revs->diffopt,
+				    sb->path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
 				    &sb->final_buf_size))
 			;
 		else

builtin/cat-file.c

@@ -174,8 +174,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
 		break;
 
 	case 'c':
-		if (textconv_object(the_repository, path, obj_context.mode,
-				    &oid, 1, &buf, &size))
+		if (textconv_object(the_repository, NULL, path,
+				    obj_context.mode, &oid, 1, &buf, &size))
 			break;
 		/* else fallthrough */
 
@@ -407,7 +407,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
 					    oid_to_hex(oid), data->rest);
 			} else if (opt->transform_mode == 'c') {
 				enum object_type type;
-				if (!textconv_object(the_repository,
+				if (!textconv_object(the_repository, NULL,
 						     data->rest, 0100644, oid,
 						     1, &contents, &size))
 					contents = odb_read_object(the_repository->objects,

builtin/log.c

@@ -605,7 +605,7 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c
 				 &oidc, &obj_context))
 		die(_("not a valid object name %s"), obj_name);
 	if (!obj_context.path ||
-	    !textconv_object(the_repository, obj_context.path,
+	    !textconv_object(the_repository, NULL, obj_context.path,
 			     obj_context.mode, &oidc, 1, &buf, &size)) {
 		object_context_release(&obj_context);
 		return odb_stream_blob_to_fd(the_repository->objects, 1, oid, NULL, 0);

combine-diff.c

@@ -304,7 +304,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 
 static char *grab_blob(struct repository *r,
 		       const struct object_id *oid, unsigned int mode,
-		       unsigned long *size, struct userdiff_driver *textconv,
+		       unsigned long *size, struct userdiff_textconv *textconv,
 		       const char *path)
 {
 	char *blob;
@@ -420,7 +420,7 @@ static void combine_diff(struct repository *r,
 			 mmfile_t *result_file,
 			 struct sline *sline, unsigned int cnt, int n,
 			 int num_parent, int result_deleted,
-			 struct userdiff_driver *textconv,
+			 struct userdiff_textconv *textconv,
 			 const char *path, long flags)
 {
 	unsigned int p_lno, lno;
@@ -1021,7 +1021,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 	int i, show_hunks;
 	mmfile_t result_file;
 	struct userdiff_driver *userdiff;
-	struct userdiff_driver *textconv = NULL;
+	struct userdiff_textconv *textconv = NULL;
 	int is_binary;
 	const char *line_prefix = diff_line_prefix(opt);