X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=e9a85f76b7e4145263d478e0b11f217f145d5992;hb=5bed21be705bbfc578b623b9543344e4d8efb4a9;hp=5b1feff570453bae1782877b5a6a1f9a12db8100;hpb=d18e956260fd206e3b0c260adeea36e697350a57;p=dgit.git diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 5b1feff5..e9a85f76 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -43,9 +43,10 @@ BEGIN { @ISA = qw(Exporter); @EXPORT = qw(setup_sigwarn forkcheck_setup forkcheck_mainprocess dep14_version_mangle - debiantags debiantag_old debiantag_new + debiantags debiantag_new debiantag_maintview upstreamversion + upstream_commitish_search resolve_upstream_version stripepoch source_file_leafname is_orig_file_of_p_v server_branch server_ref stat_exists link_ltarget rename_link_xf @@ -54,12 +55,14 @@ BEGIN { waitstatusmsg failedcmd_waitstatus failedcmd_report_cmd failedcmd runcmd shell_cmd cmdoutput cmdoutput_errok - git_rev_parse git_cat_file + git_rev_parse changedir_git_toplevel git_cat_file git_get_ref git_get_symref git_for_each_ref git_for_each_tag_referring is_fast_fwd git_check_unmodified git_reflog_action_msg git_update_ref_cmd - make_commit_text + rm_subdir_cached read_tree_subdir + read_tree_debian read_tree_upstream + make_commit hash_commit_text reflog_cache_insert reflog_cache_lookup $package_re $component_re $deliberately_re $distro_re $versiontag_re $series_filename_re @@ -98,7 +101,7 @@ our $distro_re = $component_re; our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+}; our $branchprefix = 'dgit'; our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s; -our $extra_orig_namepart_re = qr{[-0-9a-z]+}; +our $extra_orig_namepart_re = qr{[-0-9a-zA-Z]+}; our $orig_f_comp_re = qr{orig(?:-$extra_orig_namepart_re)?}; our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)'; our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?"; @@ -148,11 +151,11 @@ sub setup_sigwarn () { sub initdebug ($) { ($debugprefix) = @_; - open DEBUG, ">/dev/null" or confess $!; + open DEBUG, ">/dev/null" or confess "$!"; } sub enabledebug () { - open DEBUG, ">&STDERR" or confess $!; + open DEBUG, ">&STDERR" or confess "$!"; DEBUG->autoflush(1); $debuglevel ||= 1; } @@ -181,7 +184,7 @@ sub printdebug { print DEBUG $debugprefix unless $printdebug_noprefix; pop @_ while @_ and !length $_[-1]; return unless @_; - print DEBUG @_ or confess $!; + print DEBUG @_ or confess "$!"; $printdebug_noprefix = $_[-1] !~ m{\n$}; } @@ -214,9 +217,9 @@ sub shellquote { sub printcmd { my $fh = shift @_; my $intro = shift @_; - print $fh $intro," " or confess $!; - print $fh shellquote @_ or confess $!; - print $fh "\n" or confess $!; + print $fh $intro," " or confess "$!"; + print $fh shellquote @_ or confess "$!"; + print $fh "\n" or confess "$!"; } sub debugcmd { @@ -233,11 +236,6 @@ sub dep14_version_mangle ($) { return $v; } -sub debiantag_old ($$) { - my ($v,$distro) = @_; - return "$distro/". dep14_version_mangle $v; -} - sub debiantag_new ($$) { my ($v,$distro) = @_; return "archive/$distro/".dep14_version_mangle $v; @@ -250,7 +248,7 @@ sub debiantag_maintview ($$) { sub debiantags ($$) { my ($version,$distro) = @_; - map { $_->($version, $distro) } (\&debiantag_new, \&debiantag_old); + map { $_->($version, $distro) } (\&debiantag_new, \&debiantag_maintview); } sub stripepoch ($) { @@ -347,7 +345,7 @@ sub waitstatusmsg () { sub failedcmd_report_cmd { my $intro = shift @_; $intro //= __ "failed command"; - { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess $!; }; + { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess "$!"; }; } sub failedcmd_waitstatus { @@ -395,7 +393,7 @@ sub cmdoutput_errok { my $d; $!=0; $?=0; { local $/ = undef; $d =

; } - confess $! if P->error; + confess "$!" if P->error; if (!close P) { printdebug "=>!$?\n"; return undef; } chomp $d; if ($debuglevel > 0) { @@ -500,6 +498,15 @@ sub git_rev_parse ($) { return cmdoutput qw(git rev-parse), "$_[0]~0"; } +sub changedir_git_toplevel () { + my $toplevel = cmdoutput qw(git rev-parse --show-toplevel); + length $toplevel or fail __ < ($type, $data) or ('missing', undef) @@ -519,10 +526,10 @@ sub git_cat_file ($;$) { if (!$gcf_pid) { my @cmd = qw(git cat-file --batch); debugcmd "GCF|", @cmd; - $gcf_pid = open2 $gcf_o, $gcf_i, @cmd or confess $!; + $gcf_pid = open2 $gcf_o, $gcf_i, @cmd or confess "$!"; } printdebug "GCF>| $objname\n"; - print $gcf_i $objname, "\n" or confess $!; + print $gcf_i $objname, "\n" or confess "$!"; my $x = <$gcf_o>; printdebug "GCF<| ", $x; if ($x =~ m/ (missing)$/) { return $chk->($1, undef); } @@ -558,7 +565,7 @@ sub git_for_each_ref ($$;$) { if (defined $gitdir) { @cmd = ('sh','-ec','cd "$1"; shift; exec "$@"','x', $gitdir, @cmd); } - open GFER, "-|", @cmd or confess $!; + open GFER, "-|", @cmd or confess "$!"; debugcmd "|", @cmd; while () { chomp or confess "$_ ?"; @@ -613,6 +620,39 @@ sub git_check_unmodified () { } } +sub upstream_commitish_search ($$) { + my ($upstream_version, $tried) = @_; + # todo: at some point maybe use git-deborig to do this + foreach my $tagpfx ('', 'v', 'upstream/') { + my $tag = $tagpfx.(dep14_version_mangle $upstream_version); + my $new_upstream = git_get_ref "refs/tags/$tag"; + push @$tried, $tag; + return $new_upstream if length $new_upstream; + } +} + +sub resolve_upstream_version ($$) { + my ($new_upstream, $upstream_version) = @_; + + my $used = $new_upstream; + if (!defined $new_upstream) { + my @tried; + $new_upstream = upstream_commitish_search $upstream_version, \@tried; + if (!length $new_upstream) { + fail f_ + "Could not determine appropriate upstream commitish.\n". + " (Tried these tags: %s)\n". + " Check version, and specify upstream commitish explicitly.", + "@tried"; + } + $used = $tried[-1]; + } + $new_upstream = git_rev_parse $new_upstream; + + return ($new_upstream, $used); + # used is a human-readable idea of what we found +} + sub is_fast_fwd ($$) { my ($ancestor,$child) = @_; my @cmd = (qw(git merge-base), $ancestor, $child); @@ -640,6 +680,35 @@ sub git_update_ref_cmd { return qw(git update-ref -m), $msg, @_; } +sub rm_subdir_cached ($) { + my ($subdir) = @_; + runcmd qw(git rm --quiet -rf --cached --ignore-unmatch), $subdir; +} + +sub read_tree_subdir ($$) { + my ($subdir, $new_tree_object) = @_; + rm_subdir_cached $subdir; + runcmd qw(git read-tree), "--prefix=$subdir/", $new_tree_object; +} + +sub read_tree_debian ($) { + my ($treeish) = @_; + read_tree_subdir 'debian', "$treeish:debian"; + rm_subdir_cached 'debian/patches'; +} + +sub read_tree_upstream ($;$$) { + my ($treeish, $keep_patches, $tree_with_debian) = @_; + # if $tree_with_debian is supplied, will use that for debian/ + # otherwise will save and restore it. + my $debian = + $tree_with_debian ? "$tree_with_debian:debian" + : cmdoutput qw(git write-tree --prefix=debian/); + runcmd qw(git read-tree), $treeish; + read_tree_subdir 'debian', $debian; + rm_subdir_cached 'debian/patches' unless $keep_patches; +} + sub changedir ($) { my ($newdir) = @_; printdebug "CD $newdir\n"; @@ -656,7 +725,7 @@ sub git_slurp_config_src ($) { local $/="\0"; my $r = { }; - open GITS, "-|", @cmd or confess $!; + open GITS, "-|", @cmd or confess "$!"; while () { chomp or confess; printdebug "=> ", (messagequote $_), "\n"; @@ -719,7 +788,7 @@ sub parsecontrol { my $fh = new IO::Handle; open $fh, '<', $file or fail f_ "open %s (%s): %s", $file, $desc, $!; my $c = parsecontrolfh($fh,$desc,$allowsigned); - $fh->error and confess $!; + $fh->error and confess "$!"; close $fh; return $c; } @@ -728,7 +797,7 @@ sub parsechangelog { my $c = Dpkg::Control::Hash->new(name => 'parsed changelog'); my $p = new IO::Handle; my @cmd = (qw(dpkg-parsechangelog), @_); - open $p, '-|', @cmd or confess $!; + open $p, '-|', @cmd or confess "$!"; $c->parse($p); $?=0; $!=0; close $p or failedcmd @cmd; return $c; @@ -746,7 +815,7 @@ sub parsechangelog_loop ($$$) { # @$clogcmd is qw(dpkg-parsechangelog ...some...options...) # calls $fn->($thisstanza, $desc); debugcmd "|",@$clogcmd; - open CLOGS, "-|", @$clogcmd or confess $!; + open CLOGS, "-|", @$clogcmd or confess "$!"; for (;;) { my $stanzatext = do { local $/=""; ; }; printdebug "clogp stanza ".Dumper($stanzatext) if $debuglevel>1; @@ -758,21 +827,30 @@ sub parsechangelog_loop ($$$) { $fn->($thisstanza, $desc); } - confess $! if CLOGS->error; + confess "$!" if CLOGS->error; close CLOGS or $?==SIGPIPE or failedcmd @$clogcmd; } -sub make_commit_text ($) { +sub make_commit ($$) { + my ($parents, $message_paras) = @_; + my $tree = cmdoutput qw(git write-tree); + my @cmd = (qw(git commit-tree), $tree); + push @cmd, qw(-p), $_ foreach @$parents; + push @cmd, qw(-m), $_ foreach @$message_paras; + return cmdoutput @cmd; +} + +sub hash_commit_text ($) { my ($text) = @_; my ($out, $in); my @cmd = (qw(git hash-object -w -t commit --stdin)); debugcmd "|",@cmd; print Dumper($text) if $debuglevel > 1; - my $child = open2($out, $in, @cmd) or confess $!; + my $child = open2($out, $in, @cmd) or confess "$!"; my $h; eval { - print $in $text or confess $!; - close $in or confess $!; + print $in $text or confess "$!"; + close $in or confess "$!"; $h = <$out>; $h =~ m/^\w+$/ or confess; $h = $&; @@ -794,7 +872,7 @@ sub reflog_cache_insert ($$$) { my $parent = $ref; $parent =~ s{/[^/]+$}{}; ensuredir "$maindir_gitcommon/logs/$parent"; my $makelogfh = new IO::File "$maindir_gitcommon/logs/$ref", '>>' - or confess $!; + or confess "$!"; my $oldcache = git_get_ref $ref; @@ -803,7 +881,7 @@ sub reflog_cache_insert ($$$) { # git update-ref doesn't always update, in this case. *sigh* my $authline = (ucfirst _us()). ' <'._us().'@example.com> 1000000000 +0000'; - my $dummy = make_commit_text <(no reflog)\n"; finish 0; } @@ -840,7 +918,7 @@ sub reflog_cache_lookup ($$) { close GC; return $1; } - confess $! if GC->error; + confess "$!" if GC->error; failedcmd unless close GC; return undef; } @@ -966,11 +1044,11 @@ sub playtree_setup (;$) { # $maindir_gitdir contains our main working "dgit", HEAD, etc. # $maindir_gitcommon the shared stuff, including .objects rmtree('.git/objects'); - symlink "$maindir_gitcommon/objects",'.git/objects' or confess $!; + symlink "$maindir_gitcommon/objects",'.git/objects' or confess "$!"; ensuredir '.git/info'; - open GA, "> .git/info/attributes" or confess $!; - print GA "* $negate_harmful_gitattrs\n" or confess $!; - close GA or confess $!; + open GA, "> .git/info/attributes" or confess "$!"; + print GA "* $negate_harmful_gitattrs\n" or confess "$!"; + close GA or confess "$!"; } 1;