chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs changes
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index c353b8e2fd774db2bdcf1046b3afd6ac1b4e5af6..78b05f9edcd3a7bd2d2e13f91aca7a3a2dd72ce8 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-32,6
+32,8
@@
our $package;
our $sign = 1;
our $dryrun = 0;
our $changesfile;
our $sign = 1;
our $dryrun = 0;
our $changesfile;
+our $new_package = 0;
+our $existing_package = 'dpkg';
our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
@@
-207,7
+209,7
@@
sub parsechangelog {
return $c;
}
return $c;
}
-our
$
rmad;
+our
%
rmad;
sub archive_query () {
my $query = access_cfg('archive-query');
sub archive_query () {
my $query = access_cfg('archive-query');
@@
-216,10
+218,15
@@
sub archive_query () {
my $proto = $1;
my $url = $'; #';
die unless $proto eq 'madison';
my $proto = $1;
my $url = $'; #';
die unless $proto eq 'madison';
- $rmad ||= cmdoutput qw(rmadison -asource),"-s$suite","-u$url",$package;
+ $rmad{$package} ||= cmdoutput
+ qw(rmadison -asource),"-s$suite","-u$url",$package;
+ my $rmad = $rmad{$package};
+ if (!length $rmad) {
+ return ();
+ }
$rmad =~ m{^ \s*( [^ \t|]+ )\s* \|
\s*( [^ \t|]+ )\s* \|
$rmad =~ m{^ \s*( [^ \t|]+ )\s* \|
\s*( [^ \t|]+ )\s* \|
- \s*( [^ \t|/]+ )(?:/([^ \t|/]+)) \s* \|
+ \s*( [^ \t|/]+ )(?:/([^ \t|/]+))
?
\s* \|
\s*( [^ \t|]+ )\s* }x or die "$rmad $?";
$1 eq $package or die "$rmad $package ?";
my $vsn = $2;
\s*( [^ \t|]+ )\s* }x or die "$rmad $?";
$1 eq $package or die "$rmad $package ?";
my $vsn = $2;
@@
-241,12
+248,12
@@
sub archive_query () {
}
sub canonicalise_suite () {
}
sub canonicalise_suite () {
- archive_query();
+ archive_query()
or die
;
}
sub get_archive_dsc () {
my ($vsn,$subpath) = archive_query();
}
sub get_archive_dsc () {
my ($vsn,$subpath) = archive_query();
- # fixme madison does not show us the component
+ if (!defined $vsn) { $dsc=undef; return undef; }
$dscurl = access_cfg('mirror').$subpath;
$dscdata = url_get($dscurl);
my $dscfh = new IO::File \$dscdata, '<' or die $!;
$dscurl = access_cfg('mirror').$subpath;
$dscdata = url_get($dscurl);
my $dscfh = new IO::File \$dscdata, '<' or die $!;
@@
-424,7
+431,7
@@
sub rev_parse ($) {
sub is_fast_fwd ($$) {
my ($ancestor,$child) = @_;
sub is_fast_fwd ($$) {
my ($ancestor,$child) = @_;
- my $mb = cmdoutput @git, qw(merge-base), $
dsc_hash, $upload_hash
;
+ my $mb = cmdoutput @git, qw(merge-base), $
ancestor, $child
;
return rev_parse($mb) eq rev_parse($ancestor);
}
return rev_parse($mb) eq rev_parse($ancestor);
}
@@
-436,7
+443,7
@@
sub git_fetch_us () {
sub fetch_from_archive () {
# ensures that lrref() is what is actually in the archive,
# one way or another
sub fetch_from_archive () {
# ensures that lrref() is what is actually in the archive,
# one way or another
- get_archive_dsc();
+ get_archive_dsc()
or return 0
;
$dsc_hash = $dsc->{$ourdscfield};
if (defined $dsc_hash) {
$dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
$dsc_hash = $dsc->{$ourdscfield};
if (defined $dsc_hash) {
$dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
@@
-477,6
+484,7
@@
sub fetch_from_archive () {
dryrun_report @upd_cmd;
}
}
dryrun_report @upd_cmd;
}
}
+ return 1;
}
sub clone ($) {
}
sub clone ($) {
@@
-497,7
+505,7
@@
sub clone ($) {
} else {
print "starting new git history\n";
}
} else {
print "starting new git history\n";
}
- fetch_from_archive();
+ fetch_from_archive()
or die
;
runcmd @git, qw(reset --hard), lrref();
print "ready for work in $dstdir\n";
}
runcmd @git, qw(reset --hard), lrref();
print "ready for work in $dstdir\n";
}
@@
-506,7
+514,7
@@
sub fetch () {
if (check_for_git()) {
git_fetch_us();
}
if (check_for_git()) {
git_fetch_us();
}
- fetch_from_archive();
+ fetch_from_archive()
or die
;
}
sub pull () {
}
sub pull () {
@@
-571,6
+579,7
@@
sub dopush () {
}
sub cmd_clone {
}
sub cmd_clone {
+ parseopts();
my $dstdir;
die if defined $package;
if (@ARGV==1) {
my $dstdir;
die if defined $package;
if (@ARGV==1) {
@@
-620,38
+629,50
@@
sub fetchpullargs () {
}
sub cmd_fetch {
}
sub cmd_fetch {
+ parseopts();
fetchpullargs();
fetch();
}
sub cmd_pull {
fetchpullargs();
fetch();
}
sub cmd_pull {
+ parseopts();
fetchpullargs();
pull();
}
sub cmd_push {
fetchpullargs();
pull();
}
sub cmd_push {
+ parseopts();
die if defined $package;
my $clogp = parsechangelog();
$package = $clogp->{Source};
if (@ARGV==0) {
$suite = $clogp->{Distribution};
die if defined $package;
my $clogp = parsechangelog();
$package = $clogp->{Source};
if (@ARGV==0) {
$suite = $clogp->{Distribution};
- canonicalise_suite();
+ if ($new_package) {
+ local ($package) = $existing_package; # this is a hack
+ canonicalise_suite();
+ }
} else {
die;
}
} else {
die;
}
+ if (fetch_from_archive()) {
+ is_fast_fwd(lrref(), 'HEAD') or die;
+ } else {
+ die unless $new_package;
+ }
dopush();
}
sub cmd_build {
dopush();
}
sub cmd_build {
+ # we pass further options and args to git-buildpackage
die if defined $package;
my $clogp = parsechangelog();
$suite = $clogp->{Distribution};
$package = $clogp->{Source};
die if defined $package;
my $clogp = parsechangelog();
$suite = $clogp->{Distribution};
$package = $clogp->{Source};
- canonicalise_suite();
runcmd_ordryrun
qw(git-buildpackage -us -uc --git-no-sign-tags),
runcmd_ordryrun
qw(git-buildpackage -us -uc --git-no-sign-tags),
- "--git-debian-branch=".lbranch(),
- @ARGV;
+ '--git-builder=dpkg-buildpackage -i\.git/ -I.git',
+ "--git-debian-branch=".lbranch(),
+ @ARGV;
}
sub parseopts () {
}
sub parseopts () {
@@
-665,10
+686,14
@@
sub parseopts () {
$dryrun=1;
} elsif (m/^--no-sign$/) {
$sign=0;
$dryrun=1;
} elsif (m/^--no-sign$/) {
$sign=0;
+ } elsif (m/^--new$/) {
+ $new_package=1;
} elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1})) {
$om->[0] = $2;
} elsif (m/^--(\w+):(.*)/s && ($om = $opts_opt_map{$1})) {
push @$om, $2;
} elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1})) {
$om->[0] = $2;
} elsif (m/^--(\w+):(.*)/s && ($om = $opts_opt_map{$1})) {
push @$om, $2;
+ } elsif (m/^--existing-package=(.*)/s) {
+ $existing_package = $1;
} else {
die "$_ ?";
}
} else {
die "$_ ?";
}
@@
-679,6
+704,8
@@
sub parseopts () {
} elsif (s/^-D/-/) {
open DEBUG, ">&STDERR" or die $!;
$debug++;
} elsif (s/^-D/-/) {
open DEBUG, ">&STDERR" or die $!;
$debug++;
+ } elsif (s/^-N/-/) {
+ $new_package=1;
} elsif (s/^-c(.*=.*)//s) {
push @git, '-c', $1;
} elsif (s/^-C(.*)//s) {
} elsif (s/^-c(.*=.*)//s) {
push @git, '-c', $1;
} elsif (s/^-C(.*)//s) {
@@
-696,6
+723,5
@@
sub parseopts () {
parseopts();
die unless @ARGV;
my $cmd = shift @ARGV;
parseopts();
die unless @ARGV;
my $cmd = shift @ARGV;
-parseopts();
{ no strict qw(refs); &{"cmd_$cmd"}(); }
{ no strict qw(refs); &{"cmd_$cmd"}(); }