X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=d99e52011a3638ad287a393e950f4b3b47a1f785;hb=5cecc26a9bb8f6478443fad2909ed0a3203a719d;hp=e9a85f76b7e4145263d478e0b11f217f145d5992;hpb=5bed21be705bbfc578b623b9543344e4d8efb4a9;p=dgit.git

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e9a85f76..d99e5201 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -29,7 +29,7 @@ use Config;
 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;
@@ -51,7 +51,8 @@ BEGIN {
 		      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
@@ -62,9 +63,9 @@ BEGIN {
 		      git_reflog_action_msg  git_update_ref_cmd
 		      rm_subdir_cached read_tree_subdir
 		      read_tree_debian read_tree_upstream
-		      make_commit hash_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
@@ -96,6 +97,7 @@ our @EXPORT_OK;
 
 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/]+};
@@ -217,9 +219,7 @@ 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." ".(join '', shellquote @_)."\n" or confess "$!";
 }
 
 sub debugcmd {
@@ -308,6 +308,12 @@ sub ensuredir ($) {
     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", $!;
@@ -635,6 +641,7 @@ sub resolve_upstream_version ($$) {
     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;
@@ -646,10 +653,14 @@ sub resolve_upstream_version ($$) {
 		"@tried";
 	}
 	$used = $tried[-1];
-    }
+	$message = f_ 'using upstream from git tag %s', $used;
+    } elsif ($new_upstream =~ m{^refs/tags/($versiontag_re)$}s) {
+	$message = f_ 'using upstream from git tag %s', $1;
+	$used = $1;
+    }	
     $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
 }
 
@@ -687,8 +698,11 @@ sub rm_subdir_cached ($) {
 
 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 ($) {
@@ -700,9 +714,10 @@ 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;
@@ -840,6 +855,11 @@ sub make_commit ($$) {
     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);
@@ -870,7 +890,7 @@ sub reflog_cache_insert ($$$) {
     # 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 "$!";