use Digest::SHA;
use Data::Dumper;
use IPC::Open2;
-use File::Path;
+use File::Path qw(:DEFAULT make_path);
use File::Basename;
use Dpkg::Control::Hash;
use Debian::Dgit::ExitStatus;
server_branch server_ref
stat_exists link_ltarget rename_link_xf
hashfile
- fail failmsg ensuredir must_getcwd executable_on_path
+ fail failmsg ensuredir ensurepath
+ must_getcwd executable_on_path
waitstatusmsg failedcmd_waitstatus
failedcmd_report_cmd failedcmd
runcmd shell_cmd cmdoutput cmdoutput_errok
git_reflog_action_msg git_update_ref_cmd
rm_subdir_cached read_tree_subdir
read_tree_debian read_tree_upstream
- make_commit_text
+ make_commit hash_commit hash_commit_text
reflog_cache_insert reflog_cache_lookup
- $package_re $component_re $deliberately_re
+ $package_re $component_re $suite_re $deliberately_re
$distro_re $versiontag_re $series_filename_re
$orig_f_comp_re $orig_f_sig_re $orig_f_tail_re
$extra_orig_namepart_re
our $package_re = '[0-9a-z][-+.0-9a-z]*';
our $component_re = '[0-9a-zA-Z][-+.0-9a-zA-Z]*';
+our $suite_re = '[-+.0-9a-z]+';
our $deliberately_re = "(?:TEST-)?$package_re";
our $distro_re = $component_re;
our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+};
confess "mkdir $dir: $!";
}
+sub ensurepath ($$) {
+ my ($firsttocreate, $subdir) = @_; # creates necessary bits of $subidr
+ ensuredir $firsttocreate;
+ make_path "$firsttocreate/$subdir";
+}
+
sub must_getcwd () {
my $d = getcwd();
defined $d or fail f_ "getcwd failed: %s\n", $!;
my ($new_upstream, $upstream_version) = @_;
my $used = $new_upstream;
+ my $message = __ 'using specified upstream commitish';
if (!defined $new_upstream) {
my @tried;
$new_upstream = upstream_commitish_search $upstream_version, \@tried;
"@tried";
}
$used = $tried[-1];
+ $message = f_ 'using upstream from git tag %s', $used;
}
$new_upstream = git_rev_parse $new_upstream;
- return ($new_upstream, $used);
+ return ($new_upstream, $used, $message);
# used is a human-readable idea of what we found
}
sub read_tree_subdir ($$) {
my ($subdir, $new_tree_object) = @_;
+ # If $new_tree_object is '', the subtree is deleted.
+ confess unless defined $new_tree_object;
rm_subdir_cached $subdir;
- runcmd qw(git read-tree), "--prefix=$subdir/", $new_tree_object;
+ runcmd qw(git read-tree), "--prefix=$subdir/", $new_tree_object
+ if length $new_tree_object;
}
sub read_tree_debian ($) {
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.
+ # otherwise will save and restore it. If $tree_with_debian
+ # is '' then debian/ is deleted.
my $debian =
- $tree_with_debian ? "$tree_with_debian:debian"
+ defined $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;
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 ($) {
+ my ($file) = @_;
+ return cmdoutput qw(git hash-object -w -t commit), $file;
+}
+
+sub hash_commit_text ($) {
my ($text) = @_;
my ($out, $in);
my @cmd = (qw(git hash-object -w -t commit --stdin));
# When we no longer need to support squeeze, use --create-reflog
# instead of this:
my $parent = $ref; $parent =~ s{/[^/]+$}{};
- ensuredir "$maindir_gitcommon/logs/$parent";
+ ensurepath "$maindir_gitcommon/logs", "$parent";
my $makelogfh = new IO::File "$maindir_gitcommon/logs/$ref", '>>'
or confess "$!";
# 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 <<ENDU.(__ <<END);
+ my $dummy = hash_commit_text <<ENDU.(__ <<END);
tree $tree
parent $value
author $authline