@matheusbsbs / matheus-bagliano / commits / 81a71734bb
Fork 0

Revert "Make it possible to set up libgit directly (instead of from the environment)"

This reverts commit 0270083ded143fd49841e3d3d0cac5eb06081d2a.

Junio C Hamano committed Sep 2, 2006 at 22:58 UTC 81a71734bb73c2def1e86de88fb8de9fb6379cc5
7 files changed +24 -114
cache.h
-3
@@ -117,9 +117,6 @@ extern unsigned int active_nr, active_alloc, active_cache_changed;
117 extern struct cache_tree *active_cache_tree;
118 extern int cache_errno;
119
120 -extern void setup_git(char *new_git_dir, char *new_git_object_dir,
121 - char *new_git_index_file, char *new_git_graft_file);
122 -
120 #define GIT_DIR_ENVIRONMENT "GIT_DIR"
121 #define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
122 #define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
commit.c
+4 -19
@@ -163,14 +163,6 @@ 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 -
166 struct commit_graft *read_graft_line(char *buf, int len)
167 {
168 /* The format is just "Commit Parent1 Parent2 ...\n" */
@@ -223,18 +215,11 @@ int read_graft_file(const char *graft_file)
215 static void prepare_commit_graft(void)
216 {
217 static int commit_graft_prepared;
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);
218 + char *graft_file;
219
220 + if (commit_graft_prepared)
221 + return;
222 + graft_file = get_graft_file();
223 read_graft_file(graft_file);
224 commit_graft_prepared = 1;
225 }
environment.c
+6 -39
@@ -25,61 +25,28 @@ int zlib_compression_level = Z_DEFAULT_COMPRESSION;
25 int pager_in_use;
26 int pager_use_color = 1;
27
28 -static int dyn_git_object_dir, dyn_git_index_file, dyn_git_graft_file;
28 static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
29 *git_graft_file;
31 -
32 -void setup_git(char *new_git_dir, char *new_git_object_dir,
33 - char *new_git_index_file, char *new_git_graft_file)
30 +static void setup_git_env(void)
31 {
35 - git_dir = new_git_dir;
32 + git_dir = getenv(GIT_DIR_ENVIRONMENT);
33 if (!git_dir)
34 git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
38 -
39 - if (dyn_git_object_dir)
40 - free(git_object_dir);
41 - git_object_dir = new_git_object_dir;
35 + git_object_dir = getenv(DB_ENVIRONMENT);
36 if (!git_object_dir) {
37 git_object_dir = xmalloc(strlen(git_dir) + 9);
38 sprintf(git_object_dir, "%s/objects", git_dir);
45 - dyn_git_object_dir = 1;
46 - } else {
47 - dyn_git_object_dir = 0;
39 }
49 -
50 - if (git_refs_dir)
51 - free(git_refs_dir);
40 git_refs_dir = xmalloc(strlen(git_dir) + 6);
41 sprintf(git_refs_dir, "%s/refs", git_dir);
54 -
55 - if (dyn_git_index_file)
56 - free(git_index_file);
57 - git_index_file = new_git_index_file;
42 + git_index_file = getenv(INDEX_ENVIRONMENT);
43 if (!git_index_file) {
44 git_index_file = xmalloc(strlen(git_dir) + 7);
45 sprintf(git_index_file, "%s/index", git_dir);
61 - dyn_git_index_file = 1;
62 - } else {
63 - dyn_git_index_file = 0;
46 }
65 -
66 - if (dyn_git_graft_file)
67 - free(git_graft_file);
68 - git_graft_file = new_git_graft_file;
69 - if (!git_graft_file) {
47 + git_graft_file = getenv(GRAFT_ENVIRONMENT);
48 + if (!git_graft_file)
49 git_graft_file = strdup(git_path("info/grafts"));
71 - dyn_git_graft_file = 1;
72 - } else {
73 - dyn_git_graft_file = 0;
74 - }
75 -}
76 -
77 -static void setup_git_env(void)
78 -{
79 - setup_git(getenv(GIT_DIR_ENVIRONMENT),
80 - getenv(DB_ENVIRONMENT),
81 - getenv(INDEX_ENVIRONMENT),
82 - getenv(GRAFT_ENVIRONMENT));
50 }
51
52 char *get_git_dir(void)
perl/Git.pm
+5 -6
@@ -98,8 +98,6 @@ XSLoader::load('Git', $VERSION);
98
99 }
100
101 -my $instance_id = 0;
102 -
101
102 =head1 CONSTRUCTORS
103
@@ -217,7 +215,7 @@ sub repository {
215 delete $opts{Directory};
216 }
217
220 - $self = { opts => \%opts, id => $instance_id++ };
218 + $self = { opts => \%opts };
219 bless $self, $class;
220 }
221
@@ -835,10 +833,11 @@ sub _call_gate {
833 if (defined $self) {
834 # XXX: We ignore the WorkingCopy! To properly support
835 # 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.
836
841 - xs__call_gate($self->{id}, $self->repo_path());
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 }
842
843 # Having to call throw from the C code is a sure path to insanity.
perl/Git.xs
+1 -15
@@ -52,21 +52,7 @@ BOOT:
52 }
53
54
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 -}
55 +# /* TODO: xs_call_gate(). See Git.pm. */
56
57
58 char *
sha1_file.c
+6 -24
@@ -126,22 +126,16 @@ 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();
129
132 - if (!last_objdir || strcmp(last_objdir, sha1_file_directory)) {
130 + if (!base) {
131 + const char *sha1_file_directory = get_object_directory();
132 int len = strlen(sha1_file_directory);
134 - if (base)
135 - free(base);
133 base = xmalloc(len + 60);
134 memcpy(base, sha1_file_directory, len);
135 memset(base+len, 0, 60);
136 base[len] = '/';
137 base[len+3] = '/';
138 name = base + len + 1;
142 - if (last_objdir)
143 - free((char *) last_objdir);
144 - last_objdir = strdup(sha1_file_directory);
139 }
140 fill_sha1_path(name, sha1);
141 return base;
@@ -151,20 +145,14 @@ char *sha1_pack_name(const unsigned char *sha1)
145 {
146 static const char hex[] = "0123456789abcdef";
147 static char *name, *base, *buf;
154 - static const char *last_objdir;
155 - const char *sha1_file_directory = get_object_directory();
148 int i;
149
158 - if (!last_objdir || strcmp(last_objdir, sha1_file_directory)) {
150 + if (!base) {
151 + const char *sha1_file_directory = get_object_directory();
152 int len = strlen(sha1_file_directory);
160 - if (base)
161 - free(base);
153 base = xmalloc(len + 60);
154 sprintf(base, "%s/pack/pack-1234567890123456789012345678901234567890.pack", sha1_file_directory);
155 name = base + len + 11;
165 - if (last_objdir)
166 - free((char *) last_objdir);
167 - last_objdir = strdup(sha1_file_directory);
156 }
157
158 buf = name;
@@ -182,20 +170,14 @@ char *sha1_pack_index_name(const unsigned char *sha1)
170 {
171 static const char hex[] = "0123456789abcdef";
172 static char *name, *base, *buf;
185 - static const char *last_objdir;
186 - const char *sha1_file_directory = get_object_directory();
173 int i;
174
189 - if (!last_objdir || strcmp(last_objdir, sha1_file_directory)) {
175 + if (!base) {
176 + const char *sha1_file_directory = get_object_directory();
177 int len = strlen(sha1_file_directory);
191 - if (base)
192 - free(base);
178 base = xmalloc(len + 60);
179 sprintf(base, "%s/pack/pack-1234567890123456789012345678901234567890.idx", sha1_file_directory);
180 name = base + len + 11;
196 - if (last_objdir)
197 - free((char *) last_objdir);
198 - last_objdir = strdup(sha1_file_directory);
181 }
182
183 buf = name;
sha1_name.c
+2 -8
@@ -12,21 +12,15 @@ 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();
15
18 - if (!last_objdir || strcmp(last_objdir, objdir)) {
16 + if (!fakeent) {
17 + const char *objdir = get_object_directory();
18 int objdir_len = strlen(objdir);
19 int entlen = objdir_len + 43;
21 - if (fakeent)
22 - free(fakeent);
20 fakeent = xmalloc(sizeof(*fakeent) + entlen);
21 memcpy(fakeent->base, objdir, objdir_len);
22 fakeent->name = fakeent->base + objdir_len + 1;
23 fakeent->name[-1] = '/';
27 - if (last_objdir)
28 - free((char *) last_objdir);
29 - last_objdir = strdup(objdir);
24 }
25 fakeent->next = alt_odb_list;
26