diff options
| author | Petr Baudis <pasky@suse.cz> | 2006-07-03 22:48:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-09 01:20:01 -0700 |
| commit | 0270083ded143fd49841e3d3d0cac5eb06081d2a (patch) | |
| tree | 960e1b85a2b18225a466bbf4aff040b27c581594 /perl | |
| parent | 998c4daaf4a921fb03d478b50d6e06223326d7ef (diff) | |
| download | git-0270083ded143fd49841e3d3d0cac5eb06081d2a.tar.gz git-0270083ded143fd49841e3d3d0cac5eb06081d2a.tar.xz | |
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>
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/Git.pm | 11 | ||||
| -rw-r--r-- | perl/Git.xs | 16 |
2 files changed, 21 insertions, 6 deletions
diff --git a/perl/Git.pm b/perl/Git.pm index 9ce9fcdd3..9da15e9c8 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -98,6 +98,8 @@ XSLoader::load('Git', $VERSION); } +my $instance_id = 0; + =head1 CONSTRUCTORS @@ -215,7 +217,7 @@ sub repository { delete $opts{Directory}; } - $self = { opts => \%opts }; + $self = { opts => \%opts, id => $instance_id++ }; bless $self, $class; } @@ -833,11 +835,10 @@ sub _call_gate { if (defined $self) { # XXX: We ignore the WorkingCopy! To properly support # that will require heavy changes in libgit. + # For now, when we will need to do it we could temporarily + # chdir() there and then chdir() back after the call is done. - # XXX: And we ignore everything else as well. libgit - # at least needs to be extended to let us specify - # the $GIT_DIR instead of looking it up in environment. - #xs_call_gate($self->{opts}->{Repository}); + xs__call_gate($self->{id}, $self->repo_path()); } # Having to call throw from the C code is a sure path to insanity. diff --git a/perl/Git.xs b/perl/Git.xs index 2bbec4365..6ed26a29b 100644 --- a/perl/Git.xs +++ b/perl/Git.xs @@ -52,7 +52,21 @@ BOOT: } -# /* TODO: xs_call_gate(). See Git.pm. */ +void +xs__call_gate(repoid, git_dir) + long repoid; + char *git_dir; +CODE: +{ + static long last_repoid; + if (repoid != last_repoid) { + setup_git(git_dir, + getenv(DB_ENVIRONMENT), + getenv(INDEX_ENVIRONMENT), + getenv(GRAFT_ENVIRONMENT)); + last_repoid = repoid; + } +} char * |