chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: repos_server_url: Set $access_forpush to 1
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index e4cc92c08fa8db70bda8e8e3dcdf959c39cf6952..cf27bb7c848b5379a03f836721c8ebf83cf4cc63 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-669,7
+669,7
@@
sub git_get_config ($) {
my ($c) = @_;
foreach my $src (@gitcfgsources) {
my $l = $gitcfgs{$src}{$c};
my ($c) = @_;
foreach my $src (@gitcfgsources) {
my $l = $gitcfgs{$src}{$c};
- c
roak "$l $c
" if $l && !ref $l;
+ c
onfess "internal error ($l $c)
" if $l && !ref $l;
printdebug"C $c ".(defined $l ?
join " ", map { messagequote "'$_'" } @$l :
"undef")."\n"
printdebug"C $c ".(defined $l ?
join " ", map { messagequote "'$_'" } @$l :
"undef")."\n"
@@
-1319,6
+1319,8
@@
sub archive_query_aptget {
return [ (getfield $pre_dsc, 'Version'), $uri ];
}
return [ (getfield $pre_dsc, 'Version'), $uri ];
}
+sub file_in_archive_aptget () { return undef; }
+
#---------- `dummyapicat' archive query method ----------
sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
#---------- `dummyapicat' archive query method ----------
sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
@@
-1699,7
+1701,7
@@
sub mktree_in_ud_here () {
runcmd qw(git config gc.auto 0);
rmtree('.git/objects');
symlink '../../../../objects','.git/objects' or die $!;
runcmd qw(git config gc.auto 0);
rmtree('.git/objects');
symlink '../../../../objects','.git/objects' or die $!;
- setup_gitattrs();
+ setup_gitattrs(
1
);
}
sub git_write_tree () {
}
sub git_write_tree () {
@@
-2572,7
+2574,7
@@
sub lrfetchref_used ($) {
}
sub git_lrfetch_sane {
}
sub git_lrfetch_sane {
- my ($supplementary, @specs) = @_;
+ my ($
url, $
supplementary, @specs) = @_;
# Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
# at least as regards @specs. Also leave the results in
# %lrfetchrefs_f, and arrange for lrfetchref_used to be
# Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
# at least as regards @specs. Also leave the results in
# %lrfetchrefs_f, and arrange for lrfetchref_used to be
@@
-2603,8
+2605,6
@@
sub git_lrfetch_sane {
# git fetch to try to generate it. If we don't manage to generate
# the target state, we try again.
# git fetch to try to generate it. If we don't manage to generate
# the target state, we try again.
- my $url = access_giturl();
-
printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
my $specre = join '|', map {
printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
my $specre = join '|', map {
@@
-2744,7
+2744,8
@@
sub git_fetch_us () {
push @specs, $rewritemap;
push @specs, qw(heads/*) if deliberately_not_fast_forward;
push @specs, $rewritemap;
push @specs, qw(heads/*) if deliberately_not_fast_forward;
- git_lrfetch_sane 0, @specs;
+ my $url = access_giturl();
+ git_lrfetch_sane $url, 0, @specs;
my %here;
my @tagpats = debiantags('*',access_nomdistro);
my %here;
my @tagpats = debiantags('*',access_nomdistro);
@@
-2873,13
+2874,13
@@
END
or fail <<END;
.dsc Dgit metadata is in context of distro $dsc_distro
for which we have no configured url;
or fail <<END;
.dsc Dgit metadata is in context of distro $dsc_distro
for which we have no configured url;
-.dsc provi
c
es hinted url with protocol $proto which is unsafe.
+.dsc provi
d
es hinted url with protocol $proto which is unsafe.
(can be overridden by config - consult documentation)
END
$url = $dsc_hint_url;
}
(can be overridden by config - consult documentation)
END
$url = $dsc_hint_url;
}
- git_lrfetch_sane 1, @fetch;
+ git_lrfetch_sane
$url,
1, @fetch;
return $lrf;
};
return $lrf;
};
@@
-3353,7
+3354,7
@@
END
print GAO <<END or die $!;
* dgit-defuse-attrs
[attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
print GAO <<END or die $!;
* dgit-defuse-attrs
[attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
-# ^ see
dgit(7). To undo, leave a definition of [attr]dgit-defuse-attrs
+# ^ see
GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
END
my $gai = open_gitattrs();
if ($gai) {
END
my $gai = open_gitattrs();
if ($gai) {
@@
-3601,6
+3602,7
@@
sub clone ($) {
mkdir $dstdir or fail "create \`$dstdir': $!";
changedir $dstdir;
runcmd @git, qw(init -q);
mkdir $dstdir or fail "create \`$dstdir': $!";
changedir $dstdir;
runcmd @git, qw(init -q);
+ setup_new_tree();
clone_set_head();
my $giturl = access_giturl(1);
if (defined $giturl) {
clone_set_head();
my $giturl = access_giturl(1);
if (defined $giturl) {
@@
-3619,7
+3621,6
@@
sub clone ($) {
$vcsgiturl =~ s/\s+-b\s+\S+//g;
runcmd @git, qw(remote add vcs-git), $vcsgiturl;
}
$vcsgiturl =~ s/\s+-b\s+\S+//g;
runcmd @git, qw(remote add vcs-git), $vcsgiturl;
}
- setup_new_tree();
clone_finish($dstdir);
}
clone_finish($dstdir);
}
@@
-6312,12
+6313,18
@@
sub cmd_archive_api_query {
exec @cmd or fail "exec curl: $!\n";
}
exec @cmd or fail "exec curl: $!\n";
}
+sub repos_server_url () {
+ $package = '_dgit-repos-server';
+ local $access_forpush = 1;
+ local $isuite = 'DGIT-REPOS-SERVER';
+ my $url = access_giturl();
+}
+
sub cmd_clone_dgit_repos_server {
badusage "need destination argument" unless @ARGV==1;
my ($destdir) = @ARGV;
sub cmd_clone_dgit_repos_server {
badusage "need destination argument" unless @ARGV==1;
my ($destdir) = @ARGV;
- $package = '_dgit-repos-server';
- local $access_forpush = 0;
- my @cmd = (@git, qw(clone), access_giturl(), $destdir);
+ my $url = repos_server_url();
+ my @cmd = (@git, qw(clone), $url, $destdir);
debugcmd ">",@cmd;
exec @cmd or fail "exec git clone: $!\n";
}
debugcmd ">",@cmd;
exec @cmd or fail "exec git clone: $!\n";
}
@@
-6325,9
+6332,7
@@
sub cmd_clone_dgit_repos_server {
sub cmd_print_dgit_repos_server_source_url {
badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
if @ARGV;
sub cmd_print_dgit_repos_server_source_url {
badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
if @ARGV;
- $package = '_dgit-repos-server';
- local $access_forpush = 0;
- my $url = access_giturl();
+ my $url = repos_server_url();
print $url, "\n" or die $!;
}
print $url, "\n" or die $!;
}