From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 8 Nov 2016 15:26:22 +0000 (+0100)
Subject: if building directly in git repo, use file path for remote
X-Git-Tag: 0.8~145^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=28ea33b8d1a0dc14cebb20923353e7c9bd015d30;p=fdroidserver.git

if building directly in git repo, use file path for remote

When a git repo has a .fdroid.yml file in it, and `fdroid build` is run
directly in that git repo, then this uses the file path as the remote for
the git repo in build/appid that is actually built.  That makes it possible
to run builds of commits that are only local, and makes things a whole lot
faster.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 121f6edd..e61d29be 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -502,7 +502,11 @@ def setup_vcs(app):
     # Set up vcs interface and make sure we have the latest code...
     logging.debug("Getting {0} vcs interface for {1}"
                   .format(app.RepoType, app.Repo))
-    vcs = getvcs(app.RepoType, app.Repo, build_dir)
+    if app.RepoType == 'git' and os.path.exists('.fdroid.yml'):
+        remote = os.getcwd()
+    else:
+        remote = app.Repo
+    vcs = getvcs(app.RepoType, remote, build_dir)
 
     return vcs, build_dir