From: Gordon Hecker <gh@emlix.com>
Date: Thu, 18 Jun 2009 16:22:26 +0000 (+0200)
Subject: move sourceset2ref to generic git code
X-Git-Tag: e2factory-2.3.2rc1~70
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=648a88d0f479c812fcd95429cad19344915d72d0;p=e2factory.git

move sourceset2ref to generic git code

Signed-off-by: Gordon Hecker <gh@emlix.com>
---

diff --git a/generic/scm.git.lua b/generic/scm.git.lua
index b18f001..78d570f 100644
--- a/generic/scm.git.lua
+++ b/generic/scm.git.lua
@@ -373,3 +373,14 @@ function generic_git.git_commit(gitdir, args)
   return e2lib.git("commit", gitdir, args)
 end
 
+function generic_git.sourceset2ref(sourceset, branch, tag)
+	if sourceset == "branch" or
+	   (sourceset == "lazytag" and tag == "^") then
+		return string.format("refs/heads/%s", branch)
+	elseif sourceset == "tag" or
+         (sourceset == "lazytag" and tag ~= "^") then
+		return string.format("refs/tags/%s", tag)
+	end
+	return nil, "invalid sourceset"
+end
+
diff --git a/local/git.lua b/local/git.lua
index b4a915c..a72f253 100644
--- a/local/git.lua
+++ b/local/git.lua
@@ -678,23 +678,6 @@ function git.sourceid(info, sourcename, sourceset)
 	return src.sourceid[sourceset]
 end
 
-local function sourceset2ref(info, sourcename, sourceset)
-	local src = info.sources[sourcename]
-	local rc, e
-	rc, e = git.validate_source(info, sourcename)
-	if not rc then
-		return false, e
-	end
-	if sourceset == "branch" or
-	   (sourceset == "lazytag" and src.tag == "^") then
-		return string.format("refs/heads/%s", src.branch)
-	elseif sourceset == "tag" or
-         (sourceset == "lazytag" and src.tag ~= "^") then
-		return string.format("refs/tags/%s", src.tag)
-	end
-	return nil, "invalid sourceset"
-end
-
 function git.toresult(info, sourcename, sourceset, directory)
 	local rc, re
 	local e = new_error("converting result")
@@ -708,7 +691,7 @@ function git.toresult(info, sourcename, sourceset, directory)
 	local sourcedir = string.format("%s/%s", directory, source)
 	e2lib.mkdir(sourcedir, "-p")
 	local archive = string.format("%s.tar.gz", src.name)
-	local ref = sourceset2ref(info, sourcename, sourceset)
+	local ref = generic_git.sourceset2ref(sourceset, src.branch, src.tag)
 	-- git archive --format=tar <ref> | gzip > <tarball>
 	local cmd = string.format(
 		"cd %s/%s && git archive --format=tar --prefix=\"%s/\" %s | "..