Commit 1d4710d0 authored by martin@catalyst.net.nz's avatar martin@catalyst.net.nz Committed by Junio C Hamano

[PATCH] archimport - use GIT_DIR instead of hardcoded ".git"

Use GIT_DIR from the environment instead of a hardcoded '.git' string.
Signed-off-by: 's avatarMartin Langhoff <martin@catalyst.net.nz>
Signed-off-by: 's avatarJunio C Hamano <junkio@cox.net>
parent 241b5967
......@@ -24,7 +24,6 @@ =head1 TODO
- create tag objects instead of ref tags
- audit shell-escaping of filenames
- better handling of temp directories
- use GIT_DIR instead of hardcoded ".git"
- hide our private tags somewhere smarter
- find a way to make "cat *patches | patch" safe even when patchfiles are missing newlines
......@@ -52,6 +51,9 @@ =head1 Devel tricks
$SIG{'PIPE'}="IGNORE";
$ENV{'TZ'}="UTC";
my $git_dir = $ENV{"GIT_DIR"} || ".git";
$ENV{"GIT_DIR"} = $git_dir;
our($opt_h,$opt_v, $opt_T,
$opt_C,$opt_t);
......@@ -179,7 +181,7 @@ END
## and put an initial import
## or a full tag
my $import = 0;
unless (-d '.git') { # initial import
unless (-d $git_dir) { # initial import
if ($psets[0]{type} eq 'i' || $psets[0]{type} eq 't') {
print "Starting import from $psets[0]{id}\n";
`git-init-db`;
......@@ -190,11 +192,11 @@ END
}
} else { # progressing an import
# load the rptags
opendir(DIR, ".git/archimport/tags")
opendir(DIR, "$git_dir/archimport/tags")
|| die "can't opendir: $!";
while (my $file = readdir(DIR)) {
# skip non-interesting-files
next unless -f ".git/archimport/tags/$file";
next unless -f "$git_dir/archimport/tags/$file";
next if $file =~ m/--base-0$/; # don't care for base-0
my $sha = ptag($file);
chomp $sha;
......@@ -238,7 +240,7 @@ END
}
unless ($import) { # skip for import
if ( -e ".git/refs/heads/$ps->{branch}") {
if ( -e "$git_dir/refs/heads/$ps->{branch}") {
# we know about this branch
`git checkout $ps->{branch}`;
} else {
......@@ -291,7 +293,7 @@ END
# imports don't give us good info
# on added files. Shame on them
if ($ps->{type} eq 'i' || $ps->{type} eq 't') {
`find . -type f -print0 | grep -zv '^./.git' | xargs -0 -l100 git-update-index --add`;
`find . -type f -print0 | grep -zv '^./$git_dir' | xargs -0 -l100 git-update-index --add`;
`git-ls-files --deleted -z | xargs --no-run-if-empty -0 -l100 git-update-index --remove`;
}
......@@ -355,8 +357,8 @@ END
# Who's your daddy?
#
my @par;
if ( -e ".git/refs/heads/$ps->{branch}") {
if (open HEAD, "<.git/refs/heads/$ps->{branch}") {
if ( -e "$git_dir/refs/heads/$ps->{branch}") {
if (open HEAD, "<$git_dir/refs/heads/$ps->{branch}") {
my $p = <HEAD>;
close HEAD;
chomp $p;
......@@ -403,11 +405,11 @@ END
#
# Update the branch
#
open HEAD, ">.git/refs/heads/$ps->{branch}";
open HEAD, ">$git_dir/refs/heads/$ps->{branch}";
print HEAD $commitid;
close HEAD;
unlink ('.git/HEAD');
symlink("refs/heads/$ps->{branch}",".git/HEAD");
unlink ("$git_dir/HEAD");
symlink("refs/heads/$ps->{branch}","$git_dir/HEAD");
# tag accordingly
ptag($ps->{id}, $commitid); # private tag
......@@ -436,7 +438,7 @@ sub apply_import {
`tla get -s --no-pristine -A $ps->{repo} $ps->{id} $tmp/import`;
die "Cannot get import: $!" if $?;
`rsync -v --archive --delete --exclude '.git' --exclude '.arch-ids' --exclude '{arch}' $tmp/import/* ./`;
`rsync -v --archive --delete --exclude '$git_dir' --exclude '.arch-ids' --exclude '{arch}' $tmp/import/* ./`;
die "Cannot rsync import:$!" if $?;
`rm -fr $tmp/import`;
......@@ -482,7 +484,7 @@ sub apply_cset {
}
# bring in new files
`rsync --archive --exclude '.git' --exclude '.arch-ids' --exclude '{arch}' $tmp/changeset/new-files-archive/* ./`;
`rsync --archive --exclude '$git_dir' --exclude '.arch-ids' --exclude '{arch}' $tmp/changeset/new-files-archive/* ./`;
# deleted files are hinted from the commitlog processing
......@@ -577,7 +579,7 @@ sub tag {
$tag = shell_quote($tag);
if ($commit) {
open(C,">.git/refs/tags/$tag")
open(C,">$git_dir/refs/tags/$tag")
or die "Cannot create tag $tag: $!\n";
print C "$commit\n"
or die "Cannot write tag $tag: $!\n";
......@@ -585,7 +587,7 @@ sub tag {
or die "Cannot write tag $tag: $!\n";
print " * Created tag ' $tag' on '$commit'\n" if $opt_v;
} else { # read
open(C,"<.git/refs/tags/$tag")
open(C,"<$git_dir/refs/tags/$tag")
or die "Cannot read tag $tag: $!\n";
$commit = <C>;
chomp $commit;
......@@ -603,12 +605,12 @@ sub ptag {
$tag =~ s|/|--|g;
$tag = shell_quote($tag);
unless (-d '.git/archimport/tags') {
mkpath('.git/archimport/tags');
unless (-d "$git_dir/archimport/tags") {
mkpath("$git_dir/archimport/tags");
}
if ($commit) { # write
open(C,">.git/archimport/tags/$tag")
open(C,">$git_dir/archimport/tags/$tag")
or die "Cannot create tag $tag: $!\n";
print C "$commit\n"
or die "Cannot write tag $tag: $!\n";
......@@ -618,10 +620,10 @@ sub ptag {
unless $tag =~ m/--base-0$/;
} else { # read
# if the tag isn't there, return 0
unless ( -s ".git/archimport/tags/$tag") {
unless ( -s "$git_dir/archimport/tags/$tag") {
return 0;
}
open(C,"<.git/archimport/tags/$tag")
open(C,"<$git_dir/archimport/tags/$tag")
or die "Cannot read tag $tag: $!\n";
$commit = <C>;
chomp $commit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment