Make it possible to set up libgit directly (instead of from the environment)
This introduces a setup_git() function which is essentialy a (public) backend for setup_git_env() which lets anyone specify custom sources for the various paths instead of environment variables. Since the repositories may get switched on the fly, this also updates code that caches paths to invalidate them properly; I hope neither of those is a sweet spot. It is used by Git.xs' xs__call_gate() to set up per-repository data for libgit's consumption. No code actually takes advantage of it yet but get_object() will in the next patches. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis committed
Jul 3, 2006 at 22:48 UTC
0270083ded143fd49841e3d3d0cac5eb06081d2a
7 files changed
+114
-24
cache.h
+3
@@ -116,6 +116,9 @@ extern struct cache_entry **active_cache;
116
extern unsigned int active_nr, active_alloc, active_cache_changed;
117
extern struct cache_tree *active_cache_tree;
118
119
+extern void setup_git(char *new_git_dir, char *new_git_object_dir,
120
+ char *new_git_index_file, char *new_git_graft_file);
121
+
122
#define GIT_DIR_ENVIRONMENT "GIT_DIR"
123
#define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
124
#define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
commit.c
+19
-4
@@ -163,6 +163,14 @@ int register_commit_graft(struct commit_graft *graft, int ignore_dups)
163
return 0;
164
}
165
166
+void free_commit_grafts(void)
167
+{
168
+ int pos = commit_graft_nr;
169
+ while (pos >= 0)
170
+ free(commit_graft[pos--]);
171
+ commit_graft_nr = 0;
172
+}
173
+
174
struct commit_graft *read_graft_line(char *buf, int len)
175
{
176
/* The format is just "Commit Parent1 Parent2 ...\n" */
@@ -215,11 +223,18 @@ int read_graft_file(const char *graft_file)
223
static void prepare_commit_graft(void)
224
{
225
static int commit_graft_prepared;
218
- char *graft_file;
226
+ static char *last_graft_file;
227
+ char *graft_file = get_graft_file();
228
+
229
+ if (last_graft_file) {
230
+ if (!strcmp(graft_file, last_graft_file))
231
+ return;
232
+ free_commit_grafts();
233
+ }
234
+ if (last_graft_file)
235
+ free(last_graft_file);
236
+ last_graft_file = strdup(graft_file);
237
220
- if (commit_graft_prepared)
221
- return;
222
- graft_file = get_graft_file();
238
read_graft_file(graft_file);
239
commit_graft_prepared = 1;
240
}
environment.c
+39
-6
@@ -21,28 +21,61 @@ char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
21
int shared_repository = PERM_UMASK;
22
const char *apply_default_whitespace = NULL;
23
24
+static int dyn_git_object_dir, dyn_git_index_file, dyn_git_graft_file;
25
static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
26
*git_graft_file;
26
-static void setup_git_env(void)
27
+
28
+void setup_git(char *new_git_dir, char *new_git_object_dir,
29
+ char *new_git_index_file, char *new_git_graft_file)
30
{
28
- git_dir = getenv(GIT_DIR_ENVIRONMENT);
31
+ git_dir = new_git_dir;
32
if (!git_dir)
33
git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
31
- git_object_dir = getenv(DB_ENVIRONMENT);
34
+
35
+ if (dyn_git_object_dir)
36
+ free(git_object_dir);
37
+ git_object_dir = new_git_object_dir;
38
if (!git_object_dir) {
39
git_object_dir = xmalloc(strlen(git_dir) + 9);
40
sprintf(git_object_dir, "%s/objects", git_dir);
41
+ dyn_git_object_dir = 1;
42
+ } else {
43
+ dyn_git_object_dir = 0;
44
}
45
+
46
+ if (git_refs_dir)
47
+ free(git_refs_dir);
48
git_refs_dir = xmalloc(strlen(git_dir) + 6);
49
sprintf(git_refs_dir, "%s/refs", git_dir);
38
- git_index_file = getenv(INDEX_ENVIRONMENT);
50
+
51
+ if (dyn_git_index_file)
52
+ free(git_index_file);
53
+ git_index_file = new_git_index_file;
54
if (!git_index_file) {
55
git_index_file = xmalloc(strlen(git_dir) + 7);
56
sprintf(git_index_file, "%s/index", git_dir);
57
+ dyn_git_index_file = 1;
58
+ } else {
59
+ dyn_git_index_file = 0;
60
}
43
- git_graft_file = getenv(GRAFT_ENVIRONMENT);
44
- if (!git_graft_file)
61
+
62
+ if (dyn_git_graft_file)
63
+ free(git_graft_file);
64
+ git_graft_file = new_git_graft_file;
65
+ if (!git_graft_file) {
66
git_graft_file = strdup(git_path("info/grafts"));
67
+ dyn_git_graft_file = 1;
68
+ } else {
69
+ dyn_git_graft_file = 0;
70
+ }
71
+}
72
+
73
+static void setup_git_env(void)
74
+{
75
+ setup_git(getenv(GIT_DIR_ENVIRONMENT),
76
+ getenv(DB_ENVIRONMENT),
77
+ getenv(INDEX_ENVIRONMENT),
78
+ getenv(GRAFT_ENVIRONMENT));
79
}
80
81
char *get_git_dir(void)
perl/Git.pm
+6
-5
@@ -98,6 +98,8 @@ XSLoader::load('Git', $VERSION);
98
99
}
100
101
+my $instance_id = 0;
102
+
103
104
=head1 CONSTRUCTORS
105
@@ -215,7 +217,7 @@ sub repository {
217
delete $opts{Directory};
218
}
219
218
- $self = { opts => \%opts };
220
+ $self = { opts => \%opts, id => $instance_id++ };
221
bless $self, $class;
222
}
223
@@ -833,11 +835,10 @@ sub _call_gate {
835
if (defined $self) {
836
# XXX: We ignore the WorkingCopy! To properly support
837
# that will require heavy changes in libgit.
838
+ # For now, when we will need to do it we could temporarily
839
+ # chdir() there and then chdir() back after the call is done.
840
837
- # XXX: And we ignore everything else as well. libgit
838
- # at least needs to be extended to let us specify
839
- # the $GIT_DIR instead of looking it up in environment.
840
- #xs_call_gate($self->{opts}->{Repository});
841
+ xs__call_gate($self->{id}, $self->repo_path());
842
}
843
844
# Having to call throw from the C code is a sure path to insanity.
perl/Git.xs
+15
-1
@@ -52,7 +52,21 @@ BOOT:
52
}
53
54
55
-# /* TODO: xs_call_gate(). See Git.pm. */
55
+void
56
+xs__call_gate(repoid, git_dir)
57
+ long repoid;
58
+ char *git_dir;
59
+CODE:
60
+{
61
+ static long last_repoid;
62
+ if (repoid != last_repoid) {
63
+ setup_git(git_dir,
64
+ getenv(DB_ENVIRONMENT),
65
+ getenv(INDEX_ENVIRONMENT),
66
+ getenv(GRAFT_ENVIRONMENT));
67
+ last_repoid = repoid;
68
+ }
69
+}
70
71
72
char *
sha1_file.c
+24
-6
@@ -126,16 +126,22 @@ static void fill_sha1_path(char *pathbuf, const unsigned char *sha1)
126
char *sha1_file_name(const unsigned char *sha1)
127
{
128
static char *name, *base;
129
+ static const char *last_objdir;
130
+ const char *sha1_file_directory = get_object_directory();
131
130
- if (!base) {
131
- const char *sha1_file_directory = get_object_directory();
132
+ if (!last_objdir || strcmp(last_objdir, sha1_file_directory)) {
133
int len = strlen(sha1_file_directory);
134
+ if (base)
135
+ free(base);
136
base = xmalloc(len + 60);
137
memcpy(base, sha1_file_directory, len);
138
memset(base+len, 0, 60);
139
base[len] = '/';
140
base[len+3] = '/';
141
name = base + len + 1;
142
+ if (last_objdir)
143
+ free((char *) last_objdir);
144
+ last_objdir = strdup(sha1_file_directory);
145
}
146
fill_sha1_path(name, sha1);
147
return base;
@@ -145,14 +151,20 @@ char *sha1_pack_name(const unsigned char *sha1)
151
{
152
static const char hex[] = "0123456789abcdef";
153
static char *name, *base, *buf;
154
+ static const char *last_objdir;
155
+ const char *sha1_file_directory = get_object_directory();
156
int i;
157
150
- if (!base) {
151
- const char *sha1_file_directory = get_object_directory();
158
+ if (!last_objdir || strcmp(last_objdir, sha1_file_directory)) {
159
int len = strlen(sha1_file_directory);
160
+ if (base)
161
+ free(base);
162
base = xmalloc(len + 60);
163
sprintf(base, "%s/pack/pack-1234567890123456789012345678901234567890.pack", sha1_file_directory);
164
name = base + len + 11;
165
+ if (last_objdir)
166
+ free((char *) last_objdir);
167
+ last_objdir = strdup(sha1_file_directory);
168
}
169
170
buf = name;
@@ -170,14 +182,20 @@ char *sha1_pack_index_name(const unsigned char *sha1)
182
{
183
static const char hex[] = "0123456789abcdef";
184
static char *name, *base, *buf;
185
+ static const char *last_objdir;
186
+ const char *sha1_file_directory = get_object_directory();
187
int i;
188
175
- if (!base) {
176
- const char *sha1_file_directory = get_object_directory();
189
+ if (!last_objdir || strcmp(last_objdir, sha1_file_directory)) {
190
int len = strlen(sha1_file_directory);
191
+ if (base)
192
+ free(base);
193
base = xmalloc(len + 60);
194
sprintf(base, "%s/pack/pack-1234567890123456789012345678901234567890.idx", sha1_file_directory);
195
name = base + len + 11;
196
+ if (last_objdir)
197
+ free((char *) last_objdir);
198
+ last_objdir = strdup(sha1_file_directory);
199
}
200
201
buf = name;
sha1_name.c
+8
-2
@@ -12,15 +12,21 @@ static int find_short_object_filename(int len, const char *name, unsigned char *
12
char hex[40];
13
int found = 0;
14
static struct alternate_object_database *fakeent;
15
+ static const char *last_objdir;
16
+ const char *objdir = get_object_directory();
17
16
- if (!fakeent) {
17
- const char *objdir = get_object_directory();
18
+ if (!last_objdir || strcmp(last_objdir, objdir)) {
19
int objdir_len = strlen(objdir);
20
int entlen = objdir_len + 43;
21
+ if (fakeent)
22
+ free(fakeent);
23
fakeent = xmalloc(sizeof(*fakeent) + entlen);
24
memcpy(fakeent->base, objdir, objdir_len);
25
fakeent->name = fakeent->base + objdir_len + 1;
26
fakeent->name[-1] = '/';
27
+ if (last_objdir)
28
+ free((char *) last_objdir);
29
+ last_objdir = strdup(objdir);
30
}
31
fakeent->next = alt_odb_list;
32