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

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 892ebf9b..e9a85f76 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -45,7 +45,8 @@ BEGIN {
 		      dep14_version_mangle
                       debiantags debiantag_new
 		      debiantag_maintview
-		      upstreamversion upstream_commitish_search
+		      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
@@ -59,7 +60,9 @@ BEGIN {
                       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
@@ -628,6 +631,28 @@ sub upstream_commitish_search ($$) {
     }
 }
 
+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);
@@ -655,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";
@@ -777,7 +831,16 @@ sub parsechangelog_loop ($$$) {
     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));
@@ -818,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 <<ENDU.(__ <<END);
+	my $dummy = hash_commit_text <<ENDU.(__ <<END);
 tree $tree
 parent $value
 author $authline