From b3da9464e1986152c11f520591807285a862dfb9 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Wed, 22 Aug 2012 16:27:40 +0200 Subject: [PATCH] Move git.git_remote_add() to generic_git module Signed-off-by: Tobias Ulmer --- generic/generic_git.lua | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/generic/generic_git.lua b/generic/generic_git.lua index b18f7e6..49e7f6a 100644 --- a/generic/generic_git.lua +++ b/generic/generic_git.lua @@ -245,6 +245,25 @@ function generic_git.git_remote_add1(lurl, rurl, name) return true, nil end +function generic_git.git_remote_add(c, lserver, llocation, name, rserver, rlocation) + e2lib.log(4, string.format("%s, %s, %s, %s, %s, %s", + tostring(c), tostring(lserver), tostring(llocation), + tostring(name), tostring(rserver), tostring(rlocation))) + local rurl, e = cache.remote_url(c, rserver, rlocation) + if not rurl then + e2lib.abort(e) + end + local lurl, e = cache.remote_url(c, lserver, llocation) + if not lurl then + e2lib.abort(e) + end + local rc, e = generic_git.git_remote_add1(lurl, rurl, name) + if not rc then + e2lib.abort(e) + end + return true, nil +end + --- translate a url to a git url -- @param u url table -- @return string: the git url @@ -576,7 +595,7 @@ function generic_git.new_repository(c, lserver, llocation, rserver, rlocation, f if not rc then return false, e:cat("can't initialize local git repository") end - rc = git.git_remote_add(c, lserver, llocation, "origin", + rc = generic_git.git_remote_add(c, lserver, llocation, "origin", rserver, rlocation) if not rc then return false, e:cat("git remote add failed") -- 2.39.5