{"thread":{"id":"24054","subject":"[PATCH v3 0/4] git-gui blame: use textconv","startedAt":"2010-06-09T17:02:05Z","lastAt":"2010-06-16T07:50:56Z","messageCount":9,"participants":["Clément Poulain","Junio C Hamano","Matthieu Moy"],"isPatch":true,"patchVersion":3,"patchTotal":4},"messages":[{"id":"143357","messageId":"1276102929-31712-1-git-send-email-clement.poulain@ensimag.imag.fr","threadId":"24054","inReplyTo":null,"subject":"[PATCH v3 0/4] git-gui blame: use textconv","fromName":"Clément Poulain","fromEmail":"clement.poulain@ensimag.imag.fr","sentAt":"2010-06-09T17:02:05Z","receivedAt":"2010-06-09T17:02:05Z","isPatch":true,"sender":{"key":"clement.poulain@ensimag.imag.fr","avatar":null},"body":"This patch adds support of textconv to git-gui blame.\n\nIt is based on our previous work which adds textconv support to blame:\nhttp://mid.gmane.org/1275921713-3277-1-git-send-email-axel.bonnet@ensimag.imag.fr\nIt also uses a git-gui patch done by Clemens Buchacher which adds textconv\nsupport to git-gui diff: http://mid.gmane.org/20100415193944.GA5848@localhost.\n\ngit-gui blame is based on cat-file to get the content of the file in different\nrevisions, so the patch adds textconv support to cat-file.\nThe first part of this patch adds get_sha1_with_context() in order to know \nthe pathname of the concerned blob, as textconv needs it to work.\n\nThis third version corrects one bug and some compilation warnings\n\nClément Poulain (4):\n  sha1_name: add get_sha1_with_context()\n  textconv: support for cat_file\n  git gui: use textconv filter for diff and blame\n  t/t8007: test textconv support for cat-file\n\n builtin.h                    |    2 +\n builtin/blame.c              |    8 ++--\n builtin/cat-file.c           |   33 ++++++++++++++++++--\n cache.h                      |   11 ++++++\n git-gui/git-gui.sh           |   28 ++++++++++++++++-\n git-gui/lib/blame.tcl        |   21 +++++++++++-\n git-gui/lib/diff.tcl         |    5 ++-\n git-gui/lib/option.tcl       |    1 +\n sha1_name.c                  |   31 +++++++++++++++---\n t/t8007-cat-file-textconv.sh |   70 ++++++++++++++++++++++++++++++++++++++++++\n 10 files changed, 194 insertions(+), 16 deletions(-)\n create mode 100755 t/t8007-cat-file-textconv.sh\n"},{"id":"143360","messageId":"1276102929-31712-2-git-send-email-clement.poulain@ensimag.imag.fr","threadId":"24054","inReplyTo":"1276102929-31712-1-git-send-email-clement.poulain@ensimag.imag.fr","subject":"[PATCH v3 1/4] sha1_name: add get_sha1_with_context()","fromName":"Clément Poulain","fromEmail":"clement.poulain@ensimag.imag.fr","sentAt":"2010-06-09T17:02:06Z","receivedAt":"2010-06-09T17:02:06Z","isPatch":true,"sender":{"key":"clement.poulain@ensimag.imag.fr","avatar":null},"body":"Textconv is defined by the diff driver, which is associated with a pathname,\nnot a blob. This fonction permits to know the context for the sha1 you're\nlooking for, especially his pathname\n\nSigned-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr>\nSigned-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>\nSigned-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>\n---\n cache.h     |   11 +++++++++++\n sha1_name.c |   31 ++++++++++++++++++++++++++-----\n 2 files changed, 37 insertions(+), 5 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex c966023..67030db 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -730,12 +730,23 @@ static inline unsigned int hexval(unsigned char c)\n #define MINIMUM_ABBREV 4\n #define DEFAULT_ABBREV 7\n \n+struct object_context {\n+\tunsigned char tree[20];\n+\tchar path[PATH_MAX];\n+\tunsigned mode;\n+};\n+\n extern int get_sha1(const char *str, unsigned char *sha1);\n extern int get_sha1_with_mode_1(const char *str, unsigned char *sha1, unsigned *mode, int gently, const char *prefix);\n static inline int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode)\n {\n \treturn get_sha1_with_mode_1(str, sha1, mode, 1, NULL);\n }\n+extern int get_sha1_with_context_1(const char *name, unsigned char *sha1, struct object_context *orc, int gently, const char *prefix);\n+static inline int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc)\n+{\n+\treturn get_sha1_with_context_1(str, sha1, orc, 1, NULL);\n+}\n extern int get_sha1_hex(const char *hex, unsigned char *sha1);\n extern char *sha1_to_hex(const unsigned char *sha1);\t/* static buffer result! */\n extern int read_ref(const char *filename, unsigned char *sha1);\ndiff --git a/sha1_name.c b/sha1_name.c\nindex bf92417..7fdb202 100644\n--- a/sha1_name.c\n+++ b/sha1_name.c\n@@ -933,8 +933,8 @@ int interpret_branch_name(const char *name, struct strbuf *buf)\n  */\n int get_sha1(const char *name, unsigned char *sha1)\n {\n-\tunsigned unused;\n-\treturn get_sha1_with_mode(name, sha1, &unused);\n+\tstruct object_context unused;\n+\treturn get_sha1_with_context(name, sha1, &unused);\n }\n \n /* Must be called only when object_name:filename doesn't exist. */\n@@ -1032,11 +1032,23 @@ static void diagnose_invalid_index_path(int stage,\n \n int get_sha1_with_mode_1(const char *name, unsigned char *sha1, unsigned *mode, int gently, const char *prefix)\n {\n+\tstruct object_context oc;\n+\tint ret;\n+\tret = get_sha1_with_context_1(name, sha1, &oc, gently, prefix);\n+\t*mode = oc.mode;\n+\treturn ret;\n+}\n+\n+int get_sha1_with_context_1(const char *name, unsigned char *sha1,\n+\t\t\t    struct object_context *oc,\n+\t\t\t    int gently, const char *prefix)\n+{\n \tint ret, bracket_depth;\n \tint namelen = strlen(name);\n \tconst char *cp;\n \n-\t*mode = S_IFINVALID;\n+\tmemset(oc, 0, sizeof(*oc));\n+\toc->mode = S_IFINVALID;\n \tret = get_sha1_1(name, namelen, sha1);\n \tif (!ret)\n \t\treturn ret;\n@@ -1059,6 +1071,11 @@ int get_sha1_with_mode_1(const char *name, unsigned char *sha1, unsigned *mode,\n \t\t\tcp = name + 3;\n \t\t}\n \t\tnamelen = namelen - (cp - name);\n+\n+\t\tstrncpy(oc->path, cp,\n+\t\t\tsizeof(oc->path));\n+\t\toc->path[sizeof(oc->path)-1] = '\\0';\n+\n \t\tif (!active_cache)\n \t\t\tread_cache();\n \t\tpos = cache_name_pos(cp, namelen);\n@@ -1071,7 +1088,6 @@ int get_sha1_with_mode_1(const char *name, unsigned char *sha1, unsigned *mode,\n \t\t\t\tbreak;\n \t\t\tif (ce_stage(ce) == stage) {\n \t\t\t\thashcpy(sha1, ce->sha1);\n-\t\t\t\t*mode = ce->ce_mode;\n \t\t\t\treturn 0;\n \t\t\t}\n \t\t\tpos++;\n@@ -1098,12 +1114,17 @@ int get_sha1_with_mode_1(const char *name, unsigned char *sha1, unsigned *mode,\n \t\t}\n \t\tif (!get_sha1_1(name, cp-name, tree_sha1)) {\n \t\t\tconst char *filename = cp+1;\n-\t\t\tret = get_tree_entry(tree_sha1, filename, sha1, mode);\n+\t\t\tret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);\n \t\t\tif (!gently) {\n \t\t\t\tdiagnose_invalid_sha1_path(prefix, filename,\n \t\t\t\t\t\t\t   tree_sha1, object_name);\n \t\t\t\tfree(object_name);\n \t\t\t}\n+\t\t\thashcpy(oc->tree, tree_sha1);\n+\t\t\tstrncpy(oc->path, filename,\n+\t\t\t\tsizeof(oc->path));\n+\t\t\toc->path[sizeof(oc->path)-1] = '\\0';\n+\n \t\t\treturn ret;\n \t\t} else {\n \t\t\tif (!gently)\n-- \n1.6.6.7.ga5fe3\n"},{"id":"143361","messageId":"1276102929-31712-3-git-send-email-clement.poulain@ensimag.imag.fr","threadId":"24054","inReplyTo":"1276102929-31712-2-git-send-email-clement.poulain@ensimag.imag.fr","subject":"[PATCH v3 2/4] textconv: support for cat_file","fromName":"Clément Poulain","fromEmail":"clement.poulain@ensimag.imag.fr","sentAt":"2010-06-09T17:02:07Z","receivedAt":"2010-06-09T17:02:07Z","isPatch":true,"sender":{"key":"clement.poulain@ensimag.imag.fr","avatar":null},"body":"Make the textconv_object function public, and add --textconv option to cat-file\nto perform conversion on blob objects. Using --textconv implies that we are\nworking on a blob.\nAs files drivers need to be initialized, a new config is required in addition\nto git_default_config. Therefore git_cat_file_config() is introduced\n\nSigned-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr>\nSigned-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>\nSigned-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>\n---\n builtin.h          |    2 ++\n builtin/blame.c    |    8 ++++----\n builtin/cat-file.c |   33 ++++++++++++++++++++++++++++++---\n 3 files changed, 36 insertions(+), 7 deletions(-)\n\ndiff --git a/builtin.h b/builtin.h\nindex 5c887ef..7902d4d 100644\n--- a/builtin.h\n+++ b/builtin.h\n@@ -36,6 +36,8 @@ void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);\n \n extern int check_pager_config(const char *cmd);\n \n+extern int textconv_object(const char *path, const unsigned char *sha1, char **buf, size_t *buf_size);\n+\n extern int cmd_add(int argc, const char **argv, const char *prefix);\n extern int cmd_annotate(int argc, const char **argv, const char *prefix);\n extern int cmd_apply(int argc, const char **argv, const char *prefix);\ndiff --git a/builtin/blame.c b/builtin/blame.c\nindex 62d040c..d477bbe 100644\n--- a/builtin/blame.c\n+++ b/builtin/blame.c\n@@ -91,10 +91,10 @@ struct origin {\n  * if the textconv driver exists.\n  * Return 1 if the conversion succeeds, 0 otherwise.\n  */\n-static int textconv_object(const char *path,\n-\t\t\t   const unsigned char *sha1,\n-\t\t\t   char **buf,\n-\t\t\t   size_t *buf_size)\n+int textconv_object(const char *path,\n+\t\t    const unsigned char *sha1,\n+\t\t    char **buf,\n+\t\t    size_t *buf_size)\n {\n \tstruct diff_filespec *df;\n \tstruct userdiff_driver *textconv;\ndiff --git a/builtin/cat-file.c b/builtin/cat-file.c\nindex a933eaa..fc7ec61 100644\n--- a/builtin/cat-file.c\n+++ b/builtin/cat-file.c\n@@ -9,6 +9,8 @@\n #include \"tree.h\"\n #include \"builtin.h\"\n #include \"parse-options.h\"\n+#include \"diff.h\"\n+#include \"userdiff.h\"\n \n #define BATCH 1\n #define BATCH_CHECK 2\n@@ -86,8 +88,9 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)\n \tenum object_type type;\n \tvoid *buf;\n \tunsigned long size;\n+\tstruct object_context obj_context;\n \n-\tif (get_sha1(obj_name, sha1))\n+\tif (get_sha1_with_context(obj_name, sha1, &obj_context))\n \t\tdie(\"Not a valid object name %s\", obj_name);\n \n \tbuf = NULL;\n@@ -132,6 +135,17 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)\n \n \t\t/* otherwise just spit out the data */\n \t\tbreak;\n+\n+\tcase 'c':\n+\t\tif (!obj_context.path[0])\n+\t\t\tdie(\"git cat-file --textconv %s: <object> must be <sha1:path>\",\n+\t\t\t    obj_name);\n+\n+\t\tif(!textconv_object(obj_context.path, sha1, (char **) &buf, (size_t *) &size))\n+\t\t\tdie(\"git cat-file --textconv: unable to run textconv on %s\",\n+\t\t\t    obj_name);\n+\t\tbreak;\n+\n \tcase 0:\n \t\tbuf = read_object_with_reference(sha1, exp_type, &size, NULL);\n \t\tbreak;\n@@ -201,11 +215,22 @@ static int batch_objects(int print_contents)\n }\n \n static const char * const cat_file_usage[] = {\n-\t\"git cat-file (-t|-s|-e|-p|<type>) <object>\",\n+\t\"git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>\",\n \t\"git cat-file (--batch|--batch-check) < <list_of_objects>\",\n \tNULL\n };\n \n+static int git_cat_file_config(const char *var, const char *value, void *cb)\n+{\n+\tswitch (userdiff_config(var, value)) {\n+\t\tcase 0: break;\n+\t\tcase -1: return -1;\n+\t\tdefault: return 0;\n+\t}\n+\n+\treturn git_default_config(var, value, cb);\n+}\n+\n int cmd_cat_file(int argc, const char **argv, const char *prefix)\n {\n \tint opt = 0, batch = 0;\n@@ -218,6 +243,8 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)\n \t\tOPT_SET_INT('e', NULL, &opt,\n \t\t\t    \"exit with zero when there's no error\", 'e'),\n \t\tOPT_SET_INT('p', NULL, &opt, \"pretty-print object's content\", 'p'),\n+\t\tOPT_SET_INT(0, \"textconv\", &opt,\n+\t\t\t\t\"for blob objects, run textconv on object's content\", 'c'),\n \t\tOPT_SET_INT(0, \"batch\", &batch,\n \t\t\t    \"show info and content of objects fed from the standard input\",\n \t\t\t    BATCH),\n@@ -227,7 +254,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\tgit_config(git_default_config, NULL);\n+\tgit_config(git_cat_file_config, NULL);\n \n \tif (argc != 3 && argc != 2)\n \t\tusage_with_options(cat_file_usage, options);\n-- \n1.6.6.7.ga5fe3\n"},{"id":"143359","messageId":"1276102929-31712-4-git-send-email-clement.poulain@ensimag.imag.fr","threadId":"24054","inReplyTo":"1276102929-31712-3-git-send-email-clement.poulain@ensimag.imag.fr","subject":"[PATCH v3 3/4] git gui: use textconv filter for diff and blame","fromName":"Clément Poulain","fromEmail":"clement.poulain@ensimag.imag.fr","sentAt":"2010-06-09T17:02:08Z","receivedAt":"2010-06-09T17:02:08Z","isPatch":true,"sender":{"key":"clement.poulain@ensimag.imag.fr","avatar":null},"body":"Create a checkbox \"Use Textconv For Diffs and Blame\" in git-gui options.\nIf checked and if the driver for the concerned file exists, git-gui calls diff\nand blame with --textconv option\n\nSigned-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr>\nSigned-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>\nSigned-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>\n---\n git-gui/git-gui.sh     |   28 +++++++++++++++++++++++++++-\n git-gui/lib/blame.tcl  |   21 +++++++++++++++++++--\n git-gui/lib/diff.tcl   |    5 ++++-\n git-gui/lib/option.tcl |    1 +\n 4 files changed, 51 insertions(+), 4 deletions(-)\n\ndiff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh\nindex 7d54511..59edf39 100755\n--- a/git-gui/git-gui.sh\n+++ b/git-gui/git-gui.sh\n@@ -269,6 +269,17 @@ proc is_config_true {name} {\n \t}\n }\n \n+proc is_config_false {name} {\n+\tglobal repo_config\n+\tif {[catch {set v $repo_config($name)}]} {\n+\t\treturn 0\n+\t} elseif {$v eq {false} || $v eq {0} || $v eq {no}} {\n+\t\treturn 1\n+\t} else {\n+\t\treturn 0\n+\t}\n+}\n+\n proc get_config {name} {\n \tglobal repo_config\n \tif {[catch {set v $repo_config($name)}]} {\n@@ -782,6 +793,7 @@ set default_config(user.email) {}\n \n set default_config(gui.encoding) [encoding system]\n set default_config(gui.matchtrackingbranch) false\n+set default_config(gui.textconv) true\n set default_config(gui.pruneduringfetch) false\n set default_config(gui.trustmtime) false\n set default_config(gui.fastcopyblame) false\n@@ -3405,6 +3417,19 @@ lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]\n $ctxmsm add separator\n create_common_diff_popup $ctxmsm\n \n+proc has_textconv {path} {\n+\tif {[is_config_false gui.textconv]} {\n+\t\treturn 0\n+\t}\n+\tset filter [gitattr $path diff set]\n+\tset textconv [get_config [join [list diff $filter textconv] .]]\n+\tif {$filter ne {set} && $textconv ne {}} {\n+\t\treturn 1\n+\t} else {\n+\t\treturn 0\n+\t}\n+}\n+\n proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {\n \tglobal current_diff_path file_states\n \tset ::cursorX $x\n@@ -3440,7 +3465,8 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {\n \t\t\t|| {__} eq $state\n \t\t\t|| {_O} eq $state\n \t\t\t|| {_T} eq $state\n-\t\t\t|| {T_} eq $state} {\n+\t\t\t|| {T_} eq $state\n+\t\t\t|| [has_textconv $current_diff_path]} {\n \t\t\tset s disabled\n \t\t} else {\n \t\t\tset s normal\ndiff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl\nindex 786b50b..b0f2f23 100644\n--- a/git-gui/lib/blame.tcl\n+++ b/git-gui/lib/blame.tcl\n@@ -449,11 +449,28 @@ method _load {jump} {\n \n \t$status show [mc \"Reading %s...\" \"$commit:[escape_path $path]\"]\n \t$w_path conf -text [escape_path $path]\n+\n+\tset do_textconv 0\n+\tif {![is_config_false gui.textconv]} {\n+\t\tset filter [gitattr $path diff set]\n+\t\tset textconv [get_config [join [list diff $filter textconv] .]]\n+\t\tif {$filter ne {set} && $textconv ne {}} {\n+\t\t\tset do_textconv 1\n+\t\t}\n+\t}\n \tif {$commit eq {}} {\n-\t\tset fd [open $path r]\n+\t\tif {$do_textconv ne 0} {\n+\t\t\tset fd [open \"|$textconv $path\" r]\n+\t\t} else {\n+\t\t\tset fd [open $path r]\n+\t\t}\n \t\tfconfigure $fd -eofchar {}\n \t} else {\n-\t\tset fd [git_read cat-file blob \"$commit:$path\"]\n+\t\tif {$do_textconv ne 0} {\n+\t\t\tset fd [git_read cat-file --textconv \"$commit:$path\"]\n+\t\t} else {\n+\t\t\tset fd [git_read cat-file blob \"$commit:$path\"]\n+\t\t}\n \t}\n \tfconfigure $fd \\\n \t\t-blocking 0 \\\ndiff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl\nindex ec8c11e..c628750 100644\n--- a/git-gui/lib/diff.tcl\n+++ b/git-gui/lib/diff.tcl\n@@ -55,7 +55,7 @@ proc handle_empty_diff {} {\n \n \tset path $current_diff_path\n \tset s $file_states($path)\n-\tif {[lindex $s 0] ne {_M}} return\n+\tif {[lindex $s 0] ne {_M} || [has_textconv $path]} return\n \n \t# Prevent infinite rescan loops\n \tincr diff_empty_count\n@@ -280,6 +280,9 @@ proc start_show_diff {cont_info {add_opts {}}} {\n \t\t\tlappend cmd diff-files\n \t\t}\n \t}\n+\tif {![is_config_false gui.textconv] && [git-version >= 1.6.1]} {\n+\t\tlappend cmd --textconv\n+\t}\n \n \tif {[string match {160000 *} [lindex $s 2]]\n \t || [string match {160000 *} [lindex $s 3]]} {\ndiff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl\nindex d4c5e45..3807c8d 100644\n--- a/git-gui/lib/option.tcl\n+++ b/git-gui/lib/option.tcl\n@@ -148,6 +148,7 @@ proc do_options {} {\n \t\t{b gui.trustmtime  {mc \"Trust File Modification Timestamps\"}}\n \t\t{b gui.pruneduringfetch {mc \"Prune Tracking Branches During Fetch\"}}\n \t\t{b gui.matchtrackingbranch {mc \"Match Tracking Branches\"}}\n+\t\t{b gui.textconv {mc \"Use Textconv For Diffs and Blames\"}}\n \t\t{b gui.fastcopyblame {mc \"Blame Copy Only On Changed Files\"}}\n \t\t{i-20..200 gui.copyblamethreshold {mc \"Minimum Letters To Blame Copy On\"}}\n \t\t{i-0..300 gui.blamehistoryctx {mc \"Blame History Context Radius (days)\"}}\n-- \n1.6.6.7.ga5fe3\n"},{"id":"143358","messageId":"1276102929-31712-5-git-send-email-clement.poulain@ensimag.imag.fr","threadId":"24054","inReplyTo":"1276102929-31712-4-git-send-email-clement.poulain@ensimag.imag.fr","subject":"[PATCH v3 4/4] t/t8007: test textconv support for cat-file","fromName":"Clément Poulain","fromEmail":"clement.poulain@ensimag.imag.fr","sentAt":"2010-06-09T17:02:09Z","receivedAt":"2010-06-09T17:02:09Z","isPatch":true,"sender":{"key":"clement.poulain@ensimag.imag.fr","avatar":null},"body":"Test the correct functionning of textconv with cat-file <sha1:blob>\nand cat-file HEAD^ <file>. Test the case when no driver is specified\n\nSigned-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr>\nSigned-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>\nSigned-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>\n---\n t/t8007-cat-file-textconv.sh |   70 ++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 70 insertions(+), 0 deletions(-)\n create mode 100755 t/t8007-cat-file-textconv.sh\n\ndiff --git a/t/t8007-cat-file-textconv.sh b/t/t8007-cat-file-textconv.sh\nnew file mode 100755\nindex 0000000..38ac05e\n--- /dev/null\n+++ b/t/t8007-cat-file-textconv.sh\n@@ -0,0 +1,70 @@\n+#!/bin/sh\n+\n+test_description='git cat-file textconv support'\n+. ./test-lib.sh\n+\n+cat >helper <<'EOF'\n+#!/bin/sh\n+sed 's/^/converted: /' \"$@\"\n+EOF\n+chmod +x helper\n+\n+test_expect_success 'setup ' '\n+\techo test >one.bin &&\n+\tgit add . &&\n+\tGIT_AUTHOR_NAME=Number1 git commit -a -m First --date=\"2010-01-01 18:00:00\" &&\n+\techo test version 2 >one.bin &&\n+\tGIT_AUTHOR_NAME=Number2 git commit -a -m Second --date=\"2010-01-01 20:00:00\"\n+'\n+\n+cat >expected <<EOF\n+fatal: git cat-file --textconv: unable to run textconv on :one.bin\n+EOF\n+\n+test_expect_success 'no filter specified' '\n+\tgit cat-file --textconv :one.bin 2>result\n+\ttest_cmp expected result\n+'\n+\n+test_expect_success 'setup textconv filters' '\n+\techo \"*.bin diff=test\" >.gitattributes &&\n+\tgit config diff.test.textconv ./helper &&\n+\tgit config diff.test.cachetextconv false\n+'\n+\n+cat >expected <<EOF\n+test version 2\n+EOF\n+\n+test_expect_success 'cat-file without --textconv' '\n+\tgit cat-file blob :one.bin >result &&\n+\ttest_cmp expected result\n+'\n+\n+cat >expected <<EOF\n+test\n+EOF\n+\n+test_expect_success 'cat-file without --textconv on previous commit' '\n+\tgit cat-file -p HEAD^:one.bin >result &&\n+\ttest_cmp expected result\n+'\n+\n+cat >expected <<EOF\n+converted: test version 2\n+EOF\n+\n+test_expect_success 'cat-file --textconv on last commit' '\n+\tgit cat-file --textconv :one.bin >result &&\n+\ttest_cmp expected result\n+'\n+\n+cat >expected <<EOF\n+converted: test\n+EOF\n+\n+test_expect_success 'cat-file --textconv on previous commit' '\n+\tgit cat-file --textconv HEAD^:one.bin >result &&\n+\ttest_cmp expected result\n+'\n+test_done\n-- \n1.6.6.7.ga5fe3\n"},{"id":"143690","messageId":"c80899f148cbfc9446554c6c706fdbfb@ensimag.fr","threadId":"24054","inReplyTo":"1276102929-31712-1-git-send-email-clement.poulain@ensimag.imag.fr","subject":"Re: [PATCH v3 0/4] git-gui blame: use textconv","fromName":"Clément Poulain","fromEmail":"clement.poulain@ensimag.imag.fr","sentAt":"2010-06-14T17:18:36Z","receivedAt":"2010-06-14T17:18:36Z","isPatch":true,"sender":{"key":"clement.poulain@ensimag.imag.fr","avatar":null},"body":"Hi,\n\nI've seen this series is now on pu. I have 2 questions concerning the\nfourth patch (ca23df5e, Clément Poulain, 2010-06-09 19:02:08) tagged with\n[DONTMERGE] and annotated with [jc: shouldn't merge this to 'next' or\nhigher but take it via Shawn].\n\nFirst, is the tag only for this patch, or for the whole series? \nThen, do we have something more to do?\n\nRegards\n"},{"id":"143692","messageId":"7vr5k9a5f5.fsf@alter.siamese.dyndns.org","threadId":"24054","inReplyTo":"c80899f148cbfc9446554c6c706fdbfb@ensimag.fr","subject":"Re: [PATCH v3 0/4] git-gui blame: use textconv","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-06-14T17:29:50Z","receivedAt":"2010-06-14T17:29:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Clément Poulain <clement.poulain@ensimag.imag.fr> writes:\n\n> I've seen this series is now on pu. I have 2 questions concerning the\n> fourth patch (ca23df5e, Clément Poulain, 2010-06-09 19:02:08) tagged with\n> [DONTMERGE] and annotated with [jc: shouldn't merge this to 'next' or\n> higher but take it via Shawn].\n>\n> First, is the tag only for this patch, or for the whole series? \n> Then, do we have something more to do?\n\nThat was primarily a note to myself attached to that one commit.\n\nBecause I pull all the changes to git-gui from Shawn (and gitk from\nPaulus) using subtree merge, I do not want to apply patches that touch\ngit-gui/ (or gitk-git/) part myself.  Sometime later when the earlier\npatches in your series prove to be 'next'-worthy, I'll have to nag Shawn\nto accept it to his tree (we might need to devise a transition strategy so\nthat people who want to use slightly newer git-gui with older git won't\nget hurt).\n\nThanks for asking.\n"},{"id":"143752","messageId":"1276617028-5265-1-git-send-email-clement.poulain@ensimag.imag.fr","threadId":"24054","inReplyTo":"1276102929-31712-1-git-send-email-clement.poulain@ensimag.imag.fr","subject":"[PATCH v3 2/4] textconv: support for cat_file","fromName":"Clément Poulain","fromEmail":"clement.poulain@ensimag.imag.fr","sentAt":"2010-06-15T15:50:28Z","receivedAt":"2010-06-15T15:50:28Z","isPatch":true,"sender":{"key":"clement.poulain@ensimag.imag.fr","avatar":null},"body":"Make the textconv_object function public, and add --textconv option to cat-file\nto perform conversion on blob objects. Using --textconv implies that we are\nworking on a blob.\nAs files drivers need to be initialized, a new config is required in addition\nto git_default_config. Therefore git_cat_file_config() is introduced\n\nSigned-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr>\nSigned-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>\nSigned-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>\n---\n\nThis is a little fix in response of:\nhttp://mid.gmane.org/7vfx0p9wlm.fsf@alter.siamese.dyndns.org\nIt is based on the modifications submitted by Axel.\nIt also corrects the style issue in the switch.\n\n\n builtin.h          |    2 ++\n builtin/blame.c    |    8 ++++----\n builtin/cat-file.c |   36 +++++++++++++++++++++++++++++++++---\n 3 files changed, 39 insertions(+), 7 deletions(-)\n\ndiff --git a/builtin.h b/builtin.h\nindex 5c887ef..5a1dba0 100644\n--- a/builtin.h\n+++ b/builtin.h\n@@ -36,6 +36,8 @@ void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);\n \n extern int check_pager_config(const char *cmd);\n \n+extern int textconv_object(const char *path, const unsigned char *sha1, char **buf, unsigned long *buf_size);\n+\n extern int cmd_add(int argc, const char **argv, const char *prefix);\n extern int cmd_annotate(int argc, const char **argv, const char *prefix);\n extern int cmd_apply(int argc, const char **argv, const char *prefix);\ndiff --git a/builtin/blame.c b/builtin/blame.c\nindex 62d040c..d477bbe 100644\n--- a/builtin/blame.c\n+++ b/builtin/blame.c\n@@ -91,10 +91,10 @@ struct origin {\n  * if the textconv driver exists.\n  * Return 1 if the conversion succeeds, 0 otherwise.\n  */\n-static int textconv_object(const char *path,\n-\t\t\t   const unsigned char *sha1,\n-\t\t\t   char **buf,\n-\t\t\t   unsigned long *buf_size)\n+int textconv_object(const char *path,\n+\t\t    const unsigned char *sha1,\n+\t\t    char **buf,\n+\t\t    unsigned long *buf_size)\n {\n \tstruct diff_filespec *df;\n \tstruct userdiff_driver *textconv;\ndiff --git a/builtin/cat-file.c b/builtin/cat-file.c\nindex a933eaa..f31684d 100644\n--- a/builtin/cat-file.c\n+++ b/builtin/cat-file.c\n@@ -9,6 +9,8 @@\n #include \"tree.h\"\n #include \"builtin.h\"\n #include \"parse-options.h\"\n+#include \"diff.h\"\n+#include \"userdiff.h\"\n \n #define BATCH 1\n #define BATCH_CHECK 2\n@@ -86,8 +88,9 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)\n \tenum object_type type;\n \tvoid *buf;\n \tunsigned long size;\n+\tstruct object_context obj_context;\n \n-\tif (get_sha1(obj_name, sha1))\n+\tif (get_sha1_with_context(obj_name, sha1, &obj_context))\n \t\tdie(\"Not a valid object name %s\", obj_name);\n \n \tbuf = NULL;\n@@ -132,6 +135,17 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)\n \n \t\t/* otherwise just spit out the data */\n \t\tbreak;\n+\n+\tcase 'c':\n+\t\tif (!obj_context.path[0])\n+\t\t\tdie(\"git cat-file --textconv %s: <object> must be <sha1:path>\",\n+\t\t\t    obj_name);\n+\n+\t\tif(!textconv_object(obj_context.path, sha1, (char **) &buf, &size))\n+\t\t\tdie(\"git cat-file --textconv: unable to run textconv on %s\",\n+\t\t\t    obj_name);\n+\t\tbreak;\n+\n \tcase 0:\n \t\tbuf = read_object_with_reference(sha1, exp_type, &size, NULL);\n \t\tbreak;\n@@ -201,11 +215,25 @@ static int batch_objects(int print_contents)\n }\n \n static const char * const cat_file_usage[] = {\n-\t\"git cat-file (-t|-s|-e|-p|<type>) <object>\",\n+\t\"git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>\",\n \t\"git cat-file (--batch|--batch-check) < <list_of_objects>\",\n \tNULL\n };\n \n+static int git_cat_file_config(const char *var, const char *value, void *cb)\n+{\n+\tswitch (userdiff_config(var, value)) {\n+\tcase 0:\n+\t\tbreak;\n+\tcase -1:\n+\t\treturn -1;\n+\tdefault:\n+\t\treturn 0;\n+\t}\n+\n+\treturn git_default_config(var, value, cb);\n+}\n+\n int cmd_cat_file(int argc, const char **argv, const char *prefix)\n {\n \tint opt = 0, batch = 0;\n@@ -218,6 +246,8 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)\n \t\tOPT_SET_INT('e', NULL, &opt,\n \t\t\t    \"exit with zero when there's no error\", 'e'),\n \t\tOPT_SET_INT('p', NULL, &opt, \"pretty-print object's content\", 'p'),\n+\t\tOPT_SET_INT(0, \"textconv\", &opt,\n+\t\t\t\t\"for blob objects, run textconv on object's content\", 'c'),\n \t\tOPT_SET_INT(0, \"batch\", &batch,\n \t\t\t    \"show info and content of objects fed from the standard input\",\n \t\t\t    BATCH),\n@@ -227,7 +257,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\tgit_config(git_default_config, NULL);\n+\tgit_config(git_cat_file_config, NULL);\n \n \tif (argc != 3 && argc != 2)\n \t\tusage_with_options(cat_file_usage, options);\n-- \n1.7.1.258.g8ea745.dirty\n"},{"id":"143816","messageId":"vpq39wnbelb.fsf@bauges.imag.fr","threadId":"24054","inReplyTo":"7vr5k9a5f5.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v3 0/4] git-gui blame: use textconv","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2010-06-16T07:50:56Z","receivedAt":"2010-06-16T07:50:56Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> (we might need to devise a transition strategy so\n> that people who want to use slightly newer git-gui with older git won't\n> get hurt).\n\nI don't think these users would really get hurt: they could still use\ngit gui blame on text files, and they would anyway not have obtained\nanything sensible from \"git gui blame binary-file\". In the very\nunlikely case where a user has a textconv filter activated for a file\nwhich can be viewed as text too, there's a checkbox to disable\ntextconv provided by Clément's patch.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"}]}