Commit 3eadfecd325d355d3f8a9631d9c89b7e8eede98b
2013-06-10T15:24:20
start implementing diff driver registry
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107
diff --git a/src/diff_driver.c b/src/diff_driver.c
index 5438afc..58a9032 100644
--- a/src/diff_driver.c
+++ b/src/diff_driver.c
@@ -16,6 +16,8 @@
#include "map.h"
#include "buf_text.h"
+GIT__USE_STRMAP;
+
typedef enum {
DIFF_DRIVER_AUTO = 0,
DIFF_DRIVER_FALSE = 1,
@@ -33,7 +35,7 @@ enum {
struct git_diff_driver {
git_diff_driver_t type;
git_strarray fn_patterns;
- int binary;
+ int binary; /* 0 => treat as text, 1 => treat as binary, -1 => auto */
};
struct git_diff_driver_registry {
@@ -49,17 +51,45 @@ static git_diff_driver global_drivers[3] = {
git_diff_driver_registry *git_diff_driver_registry_new()
{
- return git__calloc(1, sizeof(git_diff_driver_registry));
+ git_diff_driver_registry *reg =
+ git__calloc(1, sizeof(git_diff_driver_registry));
+ if (!reg)
+ return NULL;
+
+ if (git_pool_init(®->strings, 1, 0) < 0 ||
+ (reg->drivers = git_strmap_alloc()) == NULL)
+ {
+ git_diff_driver_registry_free(reg);
+ return NULL;
+ }
+
+ return reg;
}
void git_diff_driver_registry_free(git_diff_driver_registry *reg)
{
+ if (!reg)
+ return;
+
+ git_strmap_free(reg->drivers);
+ git_pool_clear(®->strings);
git__free(reg);
}
+static int git_diff_driver_load(
+ git_diff_driver **out, git_repository *repo, const char *name)
+{
+ GIT_UNUSED(out);
+ GIT_UNUSED(repo);
+ GIT_UNUSED(name);
+
+ return GIT_ENOTFOUND;
+}
+
int git_diff_driver_lookup(
git_diff_driver **out, git_repository *repo, const char *path)
{
+ int error = 0;
const char *value;
assert(out);
@@ -67,8 +97,8 @@ int git_diff_driver_lookup(
if (!repo || !path || !strlen(path))
goto use_auto;
- if (git_attr_get(&value, repo, 0, path, "diff") < 0)
- return -1;
+ if ((error = git_attr_get(&value, repo, 0, path, "diff")) < 0)
+ return error;
if (GIT_ATTR_FALSE(value)) {
*out = &global_drivers[DIFF_DRIVER_FALSE];
@@ -81,6 +111,12 @@ int git_diff_driver_lookup(
}
/* otherwise look for driver information in config and build driver */
+ if ((error = git_diff_driver_load(out, repo, value)) < 0) {
+ if (error != GIT_ENOTFOUND)
+ return error;
+ else
+ giterr_clear();
+ }
use_auto:
*out = &global_drivers[DIFF_DRIVER_AUTO];
diff --git a/src/repository.c b/src/repository.c
index 4514fee..e445149 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -111,7 +111,9 @@ void git_repository_free(git_repository *repo)
git_cache_free(&repo->objects);
git_submodule_config_free(repo);
+
git_diff_driver_registry_free(repo->diff_drivers);
+ repo->diff_drivers = NULL;
git__free(repo->path_repository);
git__free(repo->workdir);