From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Jun 2019 16:30:55 +0000 (+0100)
Subject: Dgit.pm: Move resolve_upstream_version from git-debrebase
X-Git-Tag: archive/debian/9.0~79
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cd800af2e4ca8fcf72e17555472af9aa37000b3e;hp=359f4592c6035ee027cf283c6af7dcd435038776;p=dgit.git

Dgit.pm: Move resolve_upstream_version from git-debrebase

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 892ebf9b..912a5245 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
@@ -628,6 +629,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);
diff --git a/git-debrebase b/git-debrebase
index eb585e33..39b700a5 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1994,28 +1994,6 @@ sub do_stitch ($;$) {
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
 
-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 cmd_new_upstream () {
     # automatically and unconditionally launders before rebasing
     # if rebase --abort is used, laundering has still been done