From 06fb75074c0bebccdcf86385b8d248fd127ed66d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 12 Aug 2013 15:33:24 +0100 Subject: start --- NOTES | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 NOTES diff --git a/NOTES b/NOTES new file mode 100644 index 0000000..15ae7da --- /dev/null +++ b/NOTES @@ -0,0 +1,26 @@ +New field in dsc + specifies + url(s) to clone to get history + commit hash corresponding to the thing uploaded + optional commit hash corresponding to pristine tar + +dget or something + fetches dsc + clones repo + repros pristine-tar + +git-buildpackage + adds field for master commit hash + adds field for pristine tar + +dupload (?) + does signature + does push to server(s) + adds tags to changes file to promise has pushed + does actual upload + +where on alioth upstream + +rc bugs for + server(s?) not reachable + mismatch -- cgit v1.2.3 From 0a0c31f84a315c16babc0d61a6a204da00f561a1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 12 Aug 2013 19:30:54 +0100 Subject: wip before new thing --- NOTES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NOTES b/NOTES index 15ae7da..cd8d5eb 100644 --- a/NOTES +++ b/NOTES @@ -3,17 +3,20 @@ New field in dsc url(s) to clone to get history commit hash corresponding to the thing uploaded optional commit hash corresponding to pristine tar + Vcs-git-master: dget or something fetches dsc clones repo repros pristine-tar +what about a git fetch git-buildpackage adds field for master commit hash adds field for pristine tar dupload (?) + checks isn't a force push into archive? does signature does push to server(s) adds tags to changes file to promise has pushed -- cgit v1.2.3 From 57b72bf3294e7d3c8620508a5cd8bfdca04e4f22 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 12 Aug 2013 19:34:05 +0100 Subject: new thing --- NOTES | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/NOTES b/NOTES index cd8d5eb..9254ec6 100644 --- a/NOTES +++ b/NOTES @@ -1,29 +1,33 @@ New field in dsc specifies - url(s) to clone to get history commit hash corresponding to the thing uploaded optional commit hash corresponding to pristine tar Vcs-git-master: -dget or something +dgit clone fetches dsc - clones repo - repros pristine-tar -what about a git fetch + clones repo from alioth + repros commit if nec. (if no hash in current dsc, check that + dsc is after git head and make synthetic commit, otherwise + complain) -git-buildpackage - adds field for master commit hash - adds field for pristine tar +dgit fetch + as above -dupload (?) - checks isn't a force push into archive? - does signature - does push to server(s) - adds tags to changes file to promise has pushed - does actual upload +dgit push + after git-buildpackage --tag (but no sign) + check repo is clean and tag is made + signs tag + debsign + push to alioth (perhaps with merge -s ours) + dput where on alioth upstream rc bugs for server(s?) not reachable mismatch + +?git-buildpackage +? adds field for master commit hash +? adds field for pristine tar -- cgit v1.2.3 From 239e09cb0610be8b4339a1abb742f391006e3ee2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 12:25:14 +0100 Subject: wip --- NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTES b/NOTES index 9254ec6..cd29632 100644 --- a/NOTES +++ b/NOTES @@ -2,7 +2,7 @@ New field in dsc specifies commit hash corresponding to the thing uploaded optional commit hash corresponding to pristine tar - Vcs-git-master: + Vcs-git-master: #commit dgit clone fetches dsc -- cgit v1.2.3 From 1b7deccf26864b71df56b218fd165ca4404397b4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 18:05:20 +0100 Subject: wip --- .gitignore | 1 + NOTES | 4 ++ TODO | 9 +++++ dgit | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 .gitignore create mode 100644 TODO create mode 100755 dgit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/NOTES b/NOTES index cd29632..c13ead7 100644 --- a/NOTES +++ b/NOTES @@ -20,7 +20,11 @@ dgit push signs tag debsign push to alioth (perhaps with merge -s ours) + to "uploading" tag or branch + + uploading/ dput + push to alioth to main tag or branch where on alioth upstream diff --git a/TODO b/TODO new file mode 100644 index 0000000..8c617a2 --- /dev/null +++ b/TODO @@ -0,0 +1,9 @@ +Do not screenscrape p.d.o use rmadison ? + +Make it possible to do dgit clone / fetch anonymously + +Archive agility. Archive needs to specify (a) way to get versions +and paths in archive for dscs (b) unpriv pull location (c) priv +push location + +Support mirrors for source download diff --git a/dgit b/dgit new file mode 100755 index 0000000..7a9c910 --- /dev/null +++ b/dgit @@ -0,0 +1,122 @@ +#!/usr/bin/perl -w +use strict; + +use IO::Handle; +use Data::Dumper; +use LWP::UserAgent; +use Dpkg::Control::Hash; + +open DEBUG, ">&STDERR" or die $!; + +our $pdo = 'http://packages.debian.org/'; +#our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/'; +our $suite = 'sid'; +our $package = 'userv'; + +our $aliothname = 'iwj@git.debian.org'; +our $aliothpath = '/git/dgit-test'; +our $alioth_git = 'git+ssh://$aliothname/$aliothpath'; +our $alioth_sshtestbodge = [$aliothname,$aliothpath]; + +sub mainbranch () { return "$suite"; } +sub uploadingbranch () { return "uploading/$suite"; } + +sub url_get { + if (!$ua) { + $ua = LWP::UserAgent->new; + $ua->env_proxy; + } +print DEBUG "fetching @_...\n"; + my $r = $ua->get(@_) or die $!; + die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success; + return $r->decoded_content(); +} + +sub get_archive_dsc () { + my $pdourl = "$pdo/source/$suite/$package"; + my $pdodata = url_get($pdourl); + # FFS. The Debian archive has no sane way to find what + # version is currently the tip in any branch (aka, what + # is the current version in any suite). + $pdodata =~ m{ + Download\ \Q$package\E .* + \\2\ + }msx + or die "screenscraping of $pdourl failed :-(\n"; + my $dscurl = $1; +print DEBUG Dumper($pdodata, $&, $dscurl); + my $dscdata = url_get($dscurl); + my $dscfh = new IO::File \$dscdata, '<' or die $!; +print DEBUG Dumper($dscdata, $dscfh); + my $dscp = Dpkg::Control::Hash->new(allow_pgp=>1); + $dscp->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n"; + mu $dscf = $dscp->{'fields'}; + die "unsupported format $dscf->{Format}, sorry\n" + unless $dscf->{Format} eq '1.0'; + return $dsc; +} + +sub check_for_git () { + # returns 0 or 1 + open P, "ssh $alioth_sshtestbodge->[0] '". + "set -e; cd /git/dgit-test;". + "if test -d $package.git; then echo 1; else echo 0; fi". + "' |" + or die $!; + $!=0; $?=0; + my $r =

; close P; + die "$r $! $?" unless $r =~ m/^[01]$/; + return !!$r; +} + +sub runcmd { + $!=0; $?=0; + die "$! $?" if system @_; +} + +our ($dsc,$dsc_hash); + +sub combine () { + if (defined $dsc_hash) { + + + open P, "-|", qw(git rev-parse --), $dsc_hash; + +} + +sub clone () { + $dsc = get_archive_dsc(); + $dsc_hash = $dsc->{Vcs-git-master}; + if (defined $dsh_hash) { + $dsc_hash =~ m/\w+/ or die "$dsc_hash $?"; + $dsc_hash = $&; + } + my $dstdir = "$package"; + if (check_for_git()) { + runcmd qw(git clone --origin dgit -b), $suite, '--', + $alioth_git, $dstdir; + chdir "$dstdir" or die "$dstdir $!"; + combine(); + } else { + mkdir $dstdir or die "$dstdir $!"; + chdir "$dstdir" or die "$dstdir $!"; + runcmd qw(git init); + open H, "> .git/refs/HEAD" or die $!; + print H "ref: refs/heads/$suite\n" or die $!; + close H or die $!; + runcmd qw(git remote add dgit), $alioth_git; + runcmd "git config branch.$suite.remote dgit"; + runcmd "git config branch.$suite.merge refs/heads/$suite"; + combine(); + } +} + +sub fetch () { + my ($archive_or_mirror, $suite, $package) = @_; + my $dsc = get_archive_dsc(); + + with_tmpdir($td,{ + + }); + +print Dumper(get_archive_dsc()); -- cgit v1.2.3 From 2b428f38c41e7a5f3aaf867ff069632c9e33a8bd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 18:32:11 +0100 Subject: wip --- dgit | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/dgit b/dgit index 7a9c910..84122dc 100755 --- a/dgit +++ b/dgit @@ -11,7 +11,7 @@ open DEBUG, ">&STDERR" or die $!; our $pdo = 'http://packages.debian.org/'; #our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/'; our $suite = 'sid'; -our $package = 'userv'; +our $package = '2vcard'; our $aliothname = 'iwj@git.debian.org'; our $aliothpath = '/git/dgit-test'; @@ -21,9 +21,11 @@ our $alioth_sshtestbodge = [$aliothname,$aliothpath]; sub mainbranch () { return "$suite"; } sub uploadingbranch () { return "uploading/$suite"; } +our $ua; + sub url_get { if (!$ua) { - $ua = LWP::UserAgent->new; + $ua = LWP::UserAgent->new(); $ua->env_proxy; } print DEBUG "fetching @_...\n"; @@ -50,10 +52,12 @@ print DEBUG Dumper($pdodata, $&, $dscurl); print DEBUG Dumper($dscdata, $dscfh); my $dscp = Dpkg::Control::Hash->new(allow_pgp=>1); $dscp->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n"; - mu $dscf = $dscp->{'fields'}; - die "unsupported format $dscf->{Format}, sorry\n" - unless $dscf->{Format} eq '1.0'; - return $dsc; +# my $dscf = $dscp->{'fields'}; +my $dscf=$dscp; +print DEBUG Dumper($dscp,$dscf); + my $fmt = $dscf->{Format}; + die "unsupported format $fmt, sorry\n" unless $fmt eq '1.0'; + return $dscf; } sub check_for_git () { @@ -76,18 +80,26 @@ sub runcmd { our ($dsc,$dsc_hash); -sub combine () { - if (defined $dsc_hash) { +#sub combine () { +# if (!defined $dsc_hash) { +# runcmd qw(mkdir -p .git/dgit/unpack); +# chdir '.git/dgit/unpack' or die $!; + +# with_tmpdir($td,{ + +# }); - open P, "-|", qw(git rev-parse --), $dsc_hash; +# } + +# open P, "-|", qw(git rev-parse --), $dsc_hash; -} +#} sub clone () { $dsc = get_archive_dsc(); - $dsc_hash = $dsc->{Vcs-git-master}; - if (defined $dsh_hash) { + $dsc_hash = $dsc->{'Vcs-git-master'}; + if (defined $dsc_hash) { $dsc_hash =~ m/\w+/ or die "$dsc_hash $?"; $dsc_hash = $&; } @@ -114,9 +126,6 @@ sub clone () { sub fetch () { my ($archive_or_mirror, $suite, $package) = @_; my $dsc = get_archive_dsc(); +} - with_tmpdir($td,{ - - }); - print Dumper(get_archive_dsc()); -- cgit v1.2.3 From eeb4770ff4b9a82b4cad0388c6ca165044aaa5d8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 19:14:21 +0100 Subject: wip --- dgit | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 7 deletions(-) diff --git a/dgit b/dgit index 84122dc..9411afc 100755 --- a/dgit +++ b/dgit @@ -5,6 +5,8 @@ use IO::Handle; use Data::Dumper; use LWP::UserAgent; use Dpkg::Control::Hash; +use File::Path; +use POSIX; open DEBUG, ">&STDERR" or die $!; @@ -34,6 +36,8 @@ print DEBUG "fetching @_...\n"; return $r->decoded_content(); } +our ($dscdata,$dscurl); + sub get_archive_dsc () { my $pdourl = "$pdo/source/$suite/$package"; my $pdodata = url_get($pdourl); @@ -45,9 +49,9 @@ sub get_archive_dsc () { \\2\ }msx or die "screenscraping of $pdourl failed :-(\n"; - my $dscurl = $1; + $dscurl = $1; print DEBUG Dumper($pdodata, $&, $dscurl); - my $dscdata = url_get($dscurl); + $dscdata = url_get($dscurl); my $dscfh = new IO::File \$dscdata, '<' or die $!; print DEBUG Dumper($dscdata, $dscfh); my $dscp = Dpkg::Control::Hash->new(allow_pgp=>1); @@ -78,11 +82,87 @@ sub runcmd { die "$! $?" if system @_; } -our ($dsc,$dsc_hash); +our ($dsc,$dsc_hash,$lastupl_hash); + +sub generate_commit_from_dsc () { + my $ud = '.git/dgit/unpack'; + remove_tree($ud); + mkpath '.git/dgit'; + mkdir $ud or die $!; + chdir $ud or die $!; + my @files; + foreach (split /\n/, ($dsch->{Checksums-Sha256} || $dsch->{Files})) { + next unless m/\S/; + m/^\w+ \d+ (\S+)$/ or die "$_ ?"; + my $f = $1; + die if $f =~ m#/|^\.|\.dsc$|\.tmp$#; + push @files, $f; + link "../../../$f", $f + or $!==&ENOENT + or die "$f $!"; + } + runcmd qw(dget --), $dscurl; + foreach my $f (grep { m/\.tar\.gz$/ } @files) { + link $f, "../../../$f" + or $!==&EEXIST + or die "$f $!"; + } + my (@dirs) = <*/.>; + die unless @dirs==1; + $dirs[0] =~ m#^([^/]+)/\.$# or die; + my $dir = $1; + chdir $dir or die "$dir $!"; + die if stat '.git'; + die $! unless $!==&ENOENT; + runcmd qw(git init); + remove_tree(.git/objects); + symlink '../../objects','.git/objects' or die $!; + runcmd qw(git add -Af); + my $tree = cmdoutput qw(git write-tree); + chomp $tree or die; + runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp'; + my $clogp = Dpkg::Control::Hash->new(); + $clogp->parse('../changelog.tmp','changelog'); + my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date}; + my $author = $clogp->{Maintainer}; + $author =~ s#,.*##ms; + my $authline = "$author $date"; + $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or die $authline; + open C, ">../commit.tmp" or die $!; + print C "tree $tree\n" or die $!; + print C "parent $lastupl_hash\n" or die $! if defined $lastupl_hash; + print C <{Changes} +# generated by dgit +END + close C or die $!; + my $commithash = runcmd qw(git hash-object -w -t commit ../commit.tmp); + chdir '../../..' or die $!; + remove_tree($ud); + cmdoutput qw(git log -n1), $commithash; + return $commithash; +} + +sub fetch_from_archive () { + my $hash; + if (defined $dsc_hash) { + $hash = $dsc_hash; + } else { + $hash = generate_commit_from_dsc(); + } + cmdoutput qw(git update-ref FETCH_HEAD) $hash; +} #sub combine () { -# if (!defined $dsc_hash) { -# runcmd qw(mkdir -p .git/dgit/unpack); +# if ( + +# runcmd qw(git write-tree + + + runcmd qw(mkdir -p ''); # chdir '.git/dgit/unpack' or die $!; @@ -108,7 +188,7 @@ sub clone () { runcmd qw(git clone --origin dgit -b), $suite, '--', $alioth_git, $dstdir; chdir "$dstdir" or die "$dstdir $!"; - combine(); + update_from_archive(); } else { mkdir $dstdir or die "$dstdir $!"; chdir "$dstdir" or die "$dstdir $!"; @@ -119,7 +199,7 @@ sub clone () { runcmd qw(git remote add dgit), $alioth_git; runcmd "git config branch.$suite.remote dgit"; runcmd "git config branch.$suite.merge refs/heads/$suite"; - combine(); + update_from_archive(); } } -- cgit v1.2.3 From 23a28dbe0471a4e65ad614a063280c2fbb7f2fa8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 20:10:08 +0100 Subject: wip --- NOTES | 2 +- dgit | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 68 insertions(+), 14 deletions(-) diff --git a/NOTES b/NOTES index c13ead7..1e94ba0 100644 --- a/NOTES +++ b/NOTES @@ -22,7 +22,7 @@ dgit push push to alioth (perhaps with merge -s ours) to "uploading" tag or branch - uploading/ + upload/ dput push to alioth to main tag or branch diff --git a/dgit b/dgit index 9411afc..f8bae1d 100755 --- a/dgit +++ b/dgit @@ -20,8 +20,10 @@ our $aliothpath = '/git/dgit-test'; our $alioth_git = 'git+ssh://$aliothname/$aliothpath'; our $alioth_sshtestbodge = [$aliothname,$aliothpath]; +our $remotename = 'dgit'; + sub mainbranch () { return "$suite"; } -sub uploadingbranch () { return "uploading/$suite"; } +sub uploadbranch () { return "upload/$suite"; } our $ua; @@ -122,7 +124,7 @@ sub generate_commit_from_dsc () { chomp $tree or die; runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp'; my $clogp = Dpkg::Control::Hash->new(); - $clogp->parse('../changelog.tmp','changelog'); + $clogp->parse('../changelog.tmp','changelog') or die; my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date}; my $author = $clogp->{Maintainer}; $author =~ s#,.*##ms; @@ -136,24 +138,67 @@ author $authline committer $authline $clogp->{Changes} -# generated by dgit +# imported by dgit from the archive END close C or die $!; + print "synthesised git commit from .dsc $clogp->{Version}\n"; my $commithash = runcmd qw(git hash-object -w -t commit ../commit.tmp); chdir '../../..' or die $!; + cmdoutput qw(git update-ref -m),"dgit synthesise $clogp->{Version}", + 'DGIT_ARCHIVE', $hash; + cmdoutput qw(git log -n2), $commithash; + # ... gives git a chance to complain if our commit is malformed + my $outputhash = $commithash; + if (defined $lastupl_hash) { + chdir $ud or die $!; + runcmd qw(git reset --hard), $lastupl_hash; + runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp'; + my $oldclogp = Dpkg::Control::Hash->new(); + $oldclogp->parse('../changelogold.tmp','previous changelog') or die; + $vcmp = version_compare_string($oldclogp->{Version}, $clogp->{Version}); + if ($vcmp < 0) { + # git upload/ is earlier vsn than archive, use archive + } elsif ($vcmp >= 0) { + print STDERR <{Version} (older) +Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same) +Perhaps the upload is stuck in incoming. Using the version from git. +END + } else { + die "version in archive is same as version in git". + " to-be-uploaded (upload/) branch but archive". + " version hash no commit hash?!\n"; + } + chdir '../../..' or die $!; + } remove_tree($ud); - cmdoutput qw(git log -n1), $commithash; - return $commithash; + return $outputhash; } +my $lastupl_ref = "refs/remotes/$remotename/upload/$suite"; + sub fetch_from_archive () { + # ensures that $lastupl_ref is what is actually in the archive, + # one way or another + $!=0; $lastupl_hash = `git show-ref --heads $lastupl_ref`; + die $! if $!; + die $? unless ($?==0 && chomp $lastupl_hash) + or ($?==128 && !length $lastupl_hash); my $hash; if (defined $dsc_hash) { $hash = $dsc_hash; } else { $hash = generate_commit_from_dsc(); } - cmdoutput qw(git update-ref FETCH_HEAD) $hash; + if ($lastupl_hash) { + my $mb = cmdoutput qw(git merge-base), $dsc_hash, $lastupl_hash; + die "not fast forward on last upload branch!" + " (archive's version left in DGIT_ARCHIVE)" + unless $mb eq $lastupl_hash; + } + if ($lastupl_ref ne $hash) { + cmdoutput qw(git update-ref -m), 'dgit fetch', $lastupl_ref, $hash; + } } #sub combine () { @@ -182,30 +227,39 @@ sub clone () { if (defined $dsc_hash) { $dsc_hash =~ m/\w+/ or die "$dsc_hash $?"; $dsc_hash = $&; + print "last upload to archive specified git hash\n"; + } else { + print "last upload to archive has NO git hash\n"; } my $dstdir = "$package"; if (check_for_git()) { - runcmd qw(git clone --origin dgit -b), $suite, '--', + print "cloning existing git history\n"; + runcmd qw(git clone --origin),$remotename, qw(-b), $suite, '--', $alioth_git, $dstdir; chdir "$dstdir" or die "$dstdir $!"; - update_from_archive(); + record_suite_origin(); + fetch_from_archive(); + runcmd qw(git reset --hard), $lastupl_ref; } else { + die "missing git history even though dsc has hash" if defined $dsc_hash; + print "starting new git history\n"; mkdir $dstdir or die "$dstdir $!"; chdir "$dstdir" or die "$dstdir $!"; runcmd qw(git init); open H, "> .git/refs/HEAD" or die $!; print H "ref: refs/heads/$suite\n" or die $!; close H or die $!; - runcmd qw(git remote add dgit), $alioth_git; - runcmd "git config branch.$suite.remote dgit"; + runcmd qw(git remote add), $remotename, $alioth_git; + record_suite_origin(); + runcmd "git config branch.$suite.remote $remotename"; runcmd "git config branch.$suite.merge refs/heads/$suite"; - update_from_archive(); + my $newhash = generate_commit_from_dsc(); + runcmd "git reset --hard", $newhash; } } sub fetch () { - my ($archive_or_mirror, $suite, $package) = @_; - my $dsc = get_archive_dsc(); + } print Dumper(get_archive_dsc()); -- cgit v1.2.3 From 90d348ace9e603191cfc054fa0c432bfd56ae588 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 20:44:24 +0100 Subject: wip, can clone one thing --- dgit | 108 ++++++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 64 insertions(+), 44 deletions(-) diff --git a/dgit b/dgit index f8bae1d..4d9a71a 100755 --- a/dgit +++ b/dgit @@ -17,9 +17,11 @@ our $package = '2vcard'; our $aliothname = 'iwj@git.debian.org'; our $aliothpath = '/git/dgit-test'; -our $alioth_git = 'git+ssh://$aliothname/$aliothpath'; +our $alioth_git = "git+ssh://$aliothname/$aliothpath"; our $alioth_sshtestbodge = [$aliothname,$aliothpath]; +our (@dget_opts) = qw(-u); + our $remotename = 'dgit'; sub mainbranch () { return "$suite"; } @@ -32,13 +34,19 @@ sub url_get { $ua = LWP::UserAgent->new(); $ua->env_proxy; } -print DEBUG "fetching @_...\n"; + print DEBUG "fetching @_...\n"; my $r = $ua->get(@_) or die $!; die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success; return $r->decoded_content(); } -our ($dscdata,$dscurl); +our ($dscdata,$dscurl,$dsc); + +sub parsecontrol { + my $c = Dpkg::Control::Hash->new(); + $c->load(@_) or return undef; + return $c; +} sub get_archive_dsc () { my $pdourl = "$pdo/source/$suite/$package"; @@ -52,48 +60,59 @@ sub get_archive_dsc () { }msx or die "screenscraping of $pdourl failed :-(\n"; $dscurl = $1; -print DEBUG Dumper($pdodata, $&, $dscurl); +#print DEBUG Dumper($pdodata, $&, $dscurl); $dscdata = url_get($dscurl); my $dscfh = new IO::File \$dscdata, '<' or die $!; -print DEBUG Dumper($dscdata, $dscfh); - my $dscp = Dpkg::Control::Hash->new(allow_pgp=>1); - $dscp->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n"; -# my $dscf = $dscp->{'fields'}; -my $dscf=$dscp; -print DEBUG Dumper($dscp,$dscf); - my $fmt = $dscf->{Format}; +#print DEBUG Dumper($dscdata, $dscfh); + $dsc = Dpkg::Control::Hash->new(allow_pgp=>1); + $dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n"; +#print DEBUG Dumper($dsc); + my $fmt = $dsc->{Format}; die "unsupported format $fmt, sorry\n" unless $fmt eq '1.0'; - return $dscf; } sub check_for_git () { # returns 0 or 1 - open P, "ssh $alioth_sshtestbodge->[0] '". - "set -e; cd /git/dgit-test;". - "if test -d $package.git; then echo 1; else echo 0; fi". - "' |" - or die $!; + my $cmd= + "ssh $alioth_sshtestbodge->[0] '". + " set -e; cd /git/dgit-test;". + " if test -d $package.git; then echo 1; else echo 0; fi". + "'"; + #print DEBUG "$cmd\n"; + open P, "$cmd |" or die $!; $!=0; $?=0; my $r =

; close P; +#print STDERR ">$r<\n"; die "$r $! $?" unless $r =~ m/^[01]$/; - return !!$r; + return $r+0; } sub runcmd { $!=0; $?=0; - die "$! $?" if system @_; + die "@_ $! $?" if system @_; } -our ($dsc,$dsc_hash,$lastupl_hash); +sub cmdoutput { + open P, "-|", @_ or die $!; + my $d; + $!=0; $?=0; + { local $/ = undef; $d =

; } + die if P->error; + close P or die "@_ $? $!"; + chomp $d; + return $d; +} + +our ($dsc_hash,$lastupl_hash); sub generate_commit_from_dsc () { my $ud = '.git/dgit/unpack'; - remove_tree($ud); + rmtree($ud); mkpath '.git/dgit'; mkdir $ud or die $!; chdir $ud or die $!; my @files; - foreach (split /\n/, ($dsch->{Checksums-Sha256} || $dsch->{Files})) { + foreach (split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files})) { next unless m/\S/; m/^\w+ \d+ (\S+)$/ or die "$_ ?"; my $f = $1; @@ -103,7 +122,7 @@ sub generate_commit_from_dsc () { or $!==&ENOENT or die "$f $!"; } - runcmd qw(dget --), $dscurl; + runcmd qw(dget), @dget_opts, qw(--), $dscurl; foreach my $f (grep { m/\.tar\.gz$/ } @files) { link $f, "../../../$f" or $!==&EEXIST @@ -116,15 +135,14 @@ sub generate_commit_from_dsc () { chdir $dir or die "$dir $!"; die if stat '.git'; die $! unless $!==&ENOENT; - runcmd qw(git init); - remove_tree(.git/objects); - symlink '../../objects','.git/objects' or die $!; + runcmd qw(git init -q); + rmtree('.git/objects'); + symlink '../../../../objects','.git/objects' or die $!; runcmd qw(git add -Af); my $tree = cmdoutput qw(git write-tree); - chomp $tree or die; + chomp $tree; $tree =~ m/^\w+$/ or die "$tree ?"; runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp'; - my $clogp = Dpkg::Control::Hash->new(); - $clogp->parse('../changelog.tmp','changelog') or die; + my $clogp = parsecontrol('../changelog.tmp','changelog') or die; my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date}; my $author = $clogp->{Maintainer}; $author =~ s#,.*##ms; @@ -138,24 +156,26 @@ author $authline committer $authline $clogp->{Changes} + # imported by dgit from the archive END close C or die $!; print "synthesised git commit from .dsc $clogp->{Version}\n"; - my $commithash = runcmd qw(git hash-object -w -t commit ../commit.tmp); - chdir '../../..' or die $!; + my $commithash = cmdoutput qw(git hash-object -w -t commit ../commit.tmp); + chdir '../../../..' or die $!; cmdoutput qw(git update-ref -m),"dgit synthesise $clogp->{Version}", - 'DGIT_ARCHIVE', $hash; + 'DGIT_ARCHIVE', $commithash; cmdoutput qw(git log -n2), $commithash; # ... gives git a chance to complain if our commit is malformed my $outputhash = $commithash; if (defined $lastupl_hash) { - chdir $ud or die $!; + chdir "$ud/$dir" or die $!; runcmd qw(git reset --hard), $lastupl_hash; runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp'; my $oldclogp = Dpkg::Control::Hash->new(); $oldclogp->parse('../changelogold.tmp','previous changelog') or die; - $vcmp = version_compare_string($oldclogp->{Version}, $clogp->{Version}); + my $vcmp = + version_compare_string($oldclogp->{Version}, $clogp->{Version}); if ($vcmp < 0) { # git upload/ is earlier vsn than archive, use archive } elsif ($vcmp >= 0) { @@ -169,9 +189,9 @@ END " to-be-uploaded (upload/) branch but archive". " version hash no commit hash?!\n"; } - chdir '../../..' or die $!; + chdir '../../../..' or die $!; } - remove_tree($ud); + rmtree($ud); return $outputhash; } @@ -192,7 +212,7 @@ sub fetch_from_archive () { } if ($lastupl_hash) { my $mb = cmdoutput qw(git merge-base), $dsc_hash, $lastupl_hash; - die "not fast forward on last upload branch!" + die "not fast forward on last upload branch!". " (archive's version left in DGIT_ARCHIVE)" unless $mb eq $lastupl_hash; } @@ -222,7 +242,7 @@ sub fetch_from_archive () { #} sub clone () { - $dsc = get_archive_dsc(); + get_archive_dsc(); $dsc_hash = $dsc->{'Vcs-git-master'}; if (defined $dsc_hash) { $dsc_hash =~ m/\w+/ or die "$dsc_hash $?"; @@ -237,7 +257,6 @@ sub clone () { runcmd qw(git clone --origin),$remotename, qw(-b), $suite, '--', $alioth_git, $dstdir; chdir "$dstdir" or die "$dstdir $!"; - record_suite_origin(); fetch_from_archive(); runcmd qw(git reset --hard), $lastupl_ref; } else { @@ -245,21 +264,22 @@ sub clone () { print "starting new git history\n"; mkdir $dstdir or die "$dstdir $!"; chdir "$dstdir" or die "$dstdir $!"; - runcmd qw(git init); - open H, "> .git/refs/HEAD" or die $!; + runcmd qw(git init -q); + open H, "> .git/HEAD" or die $!; print H "ref: refs/heads/$suite\n" or die $!; close H or die $!; runcmd qw(git remote add), $remotename, $alioth_git; - record_suite_origin(); runcmd "git config branch.$suite.remote $remotename"; runcmd "git config branch.$suite.merge refs/heads/$suite"; my $newhash = generate_commit_from_dsc(); - runcmd "git reset --hard", $newhash; + runcmd qw(git reset --hard), $newhash; } + print "ready for work in $dstdir\n"; } sub fetch () { } -print Dumper(get_archive_dsc()); +#print Dumper(get_archive_dsc()); +clone(); -- cgit v1.2.3 From 9caea34ec7bc7cba966b8a5662e0297a4c2d1736 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 20:49:54 +0100 Subject: improve --- dgit | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/dgit b/dgit index 4d9a71a..4491c96 100755 --- a/dgit +++ b/dgit @@ -13,7 +13,7 @@ open DEBUG, ">&STDERR" or die $!; our $pdo = 'http://packages.debian.org/'; #our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/'; our $suite = 'sid'; -our $package = '2vcard'; +our $package; our $aliothname = 'iwj@git.debian.org'; our $aliothpath = '/git/dgit-test'; @@ -221,26 +221,6 @@ sub fetch_from_archive () { } } -#sub combine () { -# if ( - -# runcmd qw(git write-tree - - - runcmd qw(mkdir -p ''); -# chdir '.git/dgit/unpack' or die $!; - - -# with_tmpdir($td,{ - -# }); - -# } - -# open P, "-|", qw(git rev-parse --), $dsc_hash; - -#} - sub clone () { get_archive_dsc(); $dsc_hash = $dsc->{'Vcs-git-master'}; @@ -280,6 +260,25 @@ sub clone () { sub fetch () { } - -#print Dumper(get_archive_dsc()); -clone(); + +sub cmd_clone { + if (@ARGV==1) { + ($package) = @ARGV; + } elsif (@ARGV==2) { + ($package,$suite) = @ARGV; + } else { + die; + } + clone(); +} + +sub parseopts () { + die if @ARGV && $ARGV[0] =~ m/^\-/; +} + +parseopts(); +die unless @ARGV; +my $cmd = shift @ARGV; +parseopts(); + +{ no strict qw(refs); &{"cmd_$cmd"}(); } -- cgit v1.2.3 From 7969c5b08add442b930ac674ad8dc1607b2063c5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 20:56:16 +0100 Subject: promote cmdoutput nfc --- dgit | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dgit b/dgit index 4491c96..fef71e5 100755 --- a/dgit +++ b/dgit @@ -42,6 +42,22 @@ sub url_get { our ($dscdata,$dscurl,$dsc); +sub runcmd { + $!=0; $?=0; + die "@_ $! $?" if system @_; +} + +sub cmdoutput { + open P, "-|", @_ or die $!; + my $d; + $!=0; $?=0; + { local $/ = undef; $d =

; } + die if P->error; + close P or die "@_ $? $!"; + chomp $d; + return $d; +} + sub parsecontrol { my $c = Dpkg::Control::Hash->new(); $c->load(@_) or return undef; @@ -87,22 +103,6 @@ sub check_for_git () { return $r+0; } -sub runcmd { - $!=0; $?=0; - die "@_ $! $?" if system @_; -} - -sub cmdoutput { - open P, "-|", @_ or die $!; - my $d; - $!=0; $?=0; - { local $/ = undef; $d =

; } - die if P->error; - close P or die "@_ $? $!"; - chomp $d; - return $d; -} - our ($dsc_hash,$lastupl_hash); sub generate_commit_from_dsc () { -- cgit v1.2.3 From 820e6dffcbc02d66950cf62424b263e953b9c714 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 20:58:32 +0100 Subject: rmadison --- TODO | 4 +++- dgit | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/TODO b/TODO index 8c617a2..53298b5 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,6 @@ -Do not screenscrape p.d.o use rmadison ? +Cope with outside-main things (rmadison does not print pool path) + +Cope with non-Debian archives Make it possible to do dgit clone / fetch anonymously diff --git a/dgit b/dgit index fef71e5..7b5803a 100755 --- a/dgit +++ b/dgit @@ -10,8 +10,7 @@ use POSIX; open DEBUG, ">&STDERR" or die $!; -our $pdo = 'http://packages.debian.org/'; -#our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/'; +our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/'; our $suite = 'sid'; our $package; @@ -65,17 +64,18 @@ sub parsecontrol { } sub get_archive_dsc () { - my $pdourl = "$pdo/source/$suite/$package"; - my $pdodata = url_get($pdourl); - # FFS. The Debian archive has no sane way to find what - # version is currently the tip in any branch (aka, what - # is the current version in any suite). - $pdodata =~ m{ - Download\ \Q$package\E .* - \\2\ - }msx - or die "screenscraping of $pdourl failed :-(\n"; - $dscurl = $1; + my $rmad = cmdoutput qw(rmadison -asource),"-s$suite",$package; + $rmad =~ m/^ \s*( [^ \t|]+ )\s* \| + \s*( [^ \t|]+ )\s* \| + \s*( [^ \t|]+ )\s* \| + \s*( [^ \t|]+ )\s* /x or die "$rmad $?"; + $1 eq $package or die "$rmad $package ?"; + my $vsn = $2; + $3 eq $suite or die "$rmad $suite ?"; + $4 eq 'source' or die "$rmad ?"; + # fixme it does not show us the component ? + my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1); + $dscurl = "$mirror/pool/main/$prefix/$package/${package}_$vsn.dsc"; #print DEBUG Dumper($pdodata, $&, $dscurl); $dscdata = url_get($dscurl); my $dscfh = new IO::File \$dscdata, '<' or die $!; -- cgit v1.2.3 From fbbfbb5997b8a31bb7905031201185ef7195a6ad Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 13 Aug 2013 21:13:17 +0100 Subject: TODOs --- TODO | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 53298b5..10127c4 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,5 @@ +Download orig.tar.gz even if archive has hash + Cope with outside-main things (rmadison does not print pool path) Cope with non-Debian archives @@ -8,4 +10,4 @@ Archive agility. Archive needs to specify (a) way to get versions and paths in archive for dscs (b) unpriv pull location (c) priv push location -Support mirrors for source download +Support Format 3.0 (quilt) -- cgit v1.2.3 From 76af1d33368dacf18043ea5040acd550d7818ea2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 14 Aug 2013 19:15:37 +0100 Subject: wip push --- TODO | 2 ++ dgit | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 60 insertions(+), 15 deletions(-) diff --git a/TODO b/TODO index 10127c4..99071f9 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,7 @@ Download orig.tar.gz even if archive has hash +Fix branch names to contain dgit + Cope with outside-main things (rmadison does not print pool path) Cope with non-Debian archives diff --git a/dgit b/dgit index 7b5803a..f879568 100755 --- a/dgit +++ b/dgit @@ -63,6 +63,14 @@ sub parsecontrol { return $c; } +sub parsechangelog { + my $c = Dpkg::Control::Hash->new(); + my $p = new IO::File '-|', qw(dpkg-parsechangelog) or die $!; + $c->parse($p); + $?=0; $!=0; close $p or die "$! $?"; + return $c; +} + sub get_archive_dsc () { my $rmad = cmdoutput qw(rmadison -asource),"-s$suite",$package; $rmad =~ m/^ \s*( [^ \t|]+ )\s* \| @@ -105,11 +113,34 @@ sub check_for_git () { our ($dsc_hash,$lastupl_hash); -sub generate_commit_from_dsc () { - my $ud = '.git/dgit/unpack'; +our $ud = '.git/dgit/unpack'; + +sub prep_ud () { rmtree($ud); mkpath '.git/dgit'; mkdir $ud or die $!; +} + +sub mktree_in_ud_from_only_subdir () { + # changes into the subdir + my (@dirs) = <*/.>; + die unless @dirs==1; + $dirs[0] =~ m#^([^/]+)/\.$# or die; + my $dir = $1; + chdir $dir or die "$dir $!"; + die if stat '.git'; + die $! unless $!==&ENOENT; + runcmd qw(git init -q); + rmtree('.git/objects'); + symlink '../../../../objects','.git/objects' or die $!; + runcmd qw(git add -Af); + my $tree = cmdoutput qw(git write-tree); + chomp $tree; $tree =~ m/^\w+$/ or die "$tree ?"; + return ($tree,$dir); +} + +sub generate_commit_from_dsc () { + prep_ud(); chdir $ud or die $!; my @files; foreach (split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files})) { @@ -128,19 +159,7 @@ sub generate_commit_from_dsc () { or $!==&EEXIST or die "$f $!"; } - my (@dirs) = <*/.>; - die unless @dirs==1; - $dirs[0] =~ m#^([^/]+)/\.$# or die; - my $dir = $1; - chdir $dir or die "$dir $!"; - die if stat '.git'; - die $! unless $!==&ENOENT; - runcmd qw(git init -q); - rmtree('.git/objects'); - symlink '../../../../objects','.git/objects' or die $!; - runcmd qw(git add -Af); - my $tree = cmdoutput qw(git write-tree); - chomp $tree; $tree =~ m/^\w+$/ or die "$tree ?"; + my ($tree,$dir) = mktree_in_ud_from_only_subdir(); runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp'; my $clogp = parsecontrol('../changelog.tmp','changelog') or die; my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date}; @@ -261,6 +280,30 @@ sub fetch () { } +sub push () { + runcmd qw(git diff --quiet HEAD); + my $clogp = parsechangelog(); + $package = $clogp->{Source}; + my $dscfn = "${package}_$clogp->{Version}.dsc"; + stat $dscfn or die "$dscfn $!"; + $dsc = parsecontrol("../$dscfn"); + prep_ud(); + chdir $ud or die $!; + print "checking that $dscfn corresponds to HEAD\n"; + runcmd qw(dpkg-source -x --), "../../../../$dscfn"; + my $tree = mktree_in_ud_from_only_subdir(); + chdir '../../../..' or die $!; + runcmd qw(git diff --exit-code), $tree; + + die < Date: Wed, 14 Aug 2013 19:17:48 +0100 Subject: wip push --- dgit | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dgit b/dgit index f879568..12f7510 100755 --- a/dgit +++ b/dgit @@ -294,6 +294,9 @@ sub push () { my $tree = mktree_in_ud_from_only_subdir(); chdir '../../../..' or die $!; runcmd qw(git diff --exit-code), $tree; + runcmd qw(git fetch), $alioth_git, + map { "$_:refs/remotes/$remotename/$_" } + (mainbranch(), uploadbranch()); die < Date: Wed, 14 Aug 2013 19:19:26 +0100 Subject: break out is_fast_ff --- dgit | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index 12f7510..072f858 100755 --- a/dgit +++ b/dgit @@ -216,6 +216,12 @@ END my $lastupl_ref = "refs/remotes/$remotename/upload/$suite"; +sub is_fast_ff ($$) { + my ($ancestor,$child) = @_; + my $mb = cmdoutput qw(git merge-base), $dsc_hash, $lastupl_hash; + return $mb eq $ancestor; +} + sub fetch_from_archive () { # ensures that $lastupl_ref is what is actually in the archive, # one way or another @@ -230,10 +236,9 @@ sub fetch_from_archive () { $hash = generate_commit_from_dsc(); } if ($lastupl_hash) { - my $mb = cmdoutput qw(git merge-base), $dsc_hash, $lastupl_hash; die "not fast forward on last upload branch!". " (archive's version left in DGIT_ARCHIVE)" - unless $mb eq $lastupl_hash; + unless is_fast_ff($lastupl_hash, $dsc_hash); } if ($lastupl_ref ne $hash) { cmdoutput qw(git update-ref -m), 'dgit fetch', $lastupl_ref, $hash; -- cgit v1.2.3 From 6347d3e236ba3b578c1a6a259f51fc977e71b210 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 14 Aug 2013 19:22:14 +0100 Subject: fix is_fast_fwd (rename and introduce rev parse) --- dgit | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dgit b/dgit index 072f858..55cdc0c 100755 --- a/dgit +++ b/dgit @@ -216,10 +216,14 @@ END my $lastupl_ref = "refs/remotes/$remotename/upload/$suite"; -sub is_fast_ff ($$) { +sub rev_parse ($) { + return cmdoutput qw(git rev-parse --), "$_[0]~0"; +} + +sub is_fast_fwd ($$) { my ($ancestor,$child) = @_; my $mb = cmdoutput qw(git merge-base), $dsc_hash, $lastupl_hash; - return $mb eq $ancestor; + return rev_parse($mb) eq rev_parse($ancestor); } sub fetch_from_archive () { @@ -238,7 +242,7 @@ sub fetch_from_archive () { if ($lastupl_hash) { die "not fast forward on last upload branch!". " (archive's version left in DGIT_ARCHIVE)" - unless is_fast_ff($lastupl_hash, $dsc_hash); + unless is_fast_fwd($lastupl_hash, $dsc_hash); } if ($lastupl_ref ne $hash) { cmdoutput qw(git update-ref -m), 'dgit fetch', $lastupl_ref, $hash; -- cgit v1.2.3 From e047a5c9931a260b730fe3beaae6eacd2c4ccec8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 14 Aug 2013 19:23:20 +0100 Subject: wip push --- dgit | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dgit b/dgit index 55cdc0c..dc2275d 100755 --- a/dgit +++ b/dgit @@ -306,8 +306,11 @@ sub push () { runcmd qw(git fetch), $alioth_git, map { "$_:refs/remotes/$remotename/$_" } (mainbranch(), uploadbranch()); - die < Date: Thu, 15 Aug 2013 11:59:08 +0100 Subject: more TODO --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index 99071f9..8deefee 100644 --- a/TODO +++ b/TODO @@ -13,3 +13,5 @@ and paths in archive for dscs (b) unpriv pull location (c) priv push location Support Format 3.0 (quilt) + +Push access for DMs. -- cgit v1.2.3 From aafc50bea3ab1994044947cbc9dc26e56cd5b978 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 15 Aug 2013 12:54:49 +0100 Subject: make it experimental --- .gitignore | 4 ++++ Makefile | 36 ++++++++++++++++++++++++++++++++++++ debian/changelog | 6 ++++++ debian/compat | 1 + debian/control | 22 ++++++++++++++++++++++ debian/copyright | 17 +++++++++++++++++ debian/rules | 24 ++++++++++++++++++++++++ dgit | 18 ++++++++++++++++++ 8 files changed, 128 insertions(+) create mode 100644 Makefile create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules diff --git a/.gitignore b/.gitignore index b25c15b..1632e2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ *~ +debian/dgit +debian/files +debian/*.substvars +debian/*.log diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ed51774 --- /dev/null +++ b/Makefile @@ -0,0 +1,36 @@ +# dgit +# Integration between git and Debian-style archives +# +# Copyright (C)2013 Ian Jackson +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +INSTALL=install +INSTALL_DIR=$(INSTALL) -d +INSTALL_PROGRAM=$(INSTALL) -m 755 +prefix?=/usr/local + +PROGRAMS=dgit + +all: + +install: installdirs + $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(prefix)/bin + +installdirs: + $(INSTALL_DIR) $(DESTDIR)$(prefix)/bin + +check installcheck: + +clean distclean mostlyclean maintainer-clean: diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..cc596f3 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +dgit (0.1) experimental; urgency=low + + * Initial experimental (partial) version. + + -- Ian Jackson Thu, 15 Aug 2013 12:09:01 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..ebda31c --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: dgit +Section: devel +Priority: optional +Maintainer: Ian Jackson +Standards-Version: 3.9.4.0 +Build-Depends: debhelper (>= 9) + +Package: dgit +Depends: perl, libwww-perl, libdpkg-perl, git-core, devscripts, dpkg-dev, + ${misc:Depends} +Recommends: ssh-client +Architecture: all +Description: git interoperability with the Debian archive + dgit (with the associated infrastructure) makes it possible to + treat the Debian archive as a git repository. + . + dgit push constructs uploads from git commits + . + dgit clone and dgit fetch construct git commits from uploads. + . + WARNING: This program is INCOMPLETE and WRONG and should not yet + be used. It is being uploaded to facilitate development. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..461cbfd --- /dev/null +++ b/debian/copyright @@ -0,0 +1,17 @@ +dgit +Integration between git and Debian-style archives + +Copyright (C)2013 Ian Jackson + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +A copy of the GNU General Public License v3 can be found in +/usr/share/common-licenses/GPL-3. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..e4a2460 --- /dev/null +++ b/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +# dgit +# Integration between git and Debian-style archives +# +# Copyright (C)2013 Ian Jackson +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +export prefix=/usr + +%: + dh $@ diff --git a/dgit b/dgit index dc2275d..a18f45c 100755 --- a/dgit +++ b/dgit @@ -1,4 +1,22 @@ #!/usr/bin/perl -w +# dgit +# Integration between git and Debian-style archives +# +# Copyright (C)2013 Ian Jackson +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + use strict; use IO::Handle; -- cgit v1.2.3