Merge in rsync support from upstream.

Signed-off-by: Daniel Silverstone <daniel.silverstone@codethink.co.uk>

8 files changed, 12 insertions, 12 deletions

diff --git a/bin/gitano-auth.in b/bin/gitano-auth.in
index 8a91ae3..3901166 100644
--- a/bin/gitano-auth.in
+++ b/bin/gitano-auth.in
@@ -18,6 +18,7 @@ local sp = require "luxio.subprocess"
 
 -- @@GITANO_BIN_PATH
 -- @@GITANO_SHARE_PATH
+-- @@GITANO_PLUGIN_PATH
 
 local repo_root, username, keytag = ...
 
@@ -104,18 +105,10 @@ if not cmd then
    gitano.log.fatal("Unknown command: " .. parsed_cmdline[1])
 end
 
-if cmd.takes_repo and #parsed_cmdline > 1 then
-   -- Acquire the repository object for the target repo
-   local msg
-   repo, msg = gitano.repository.find(config, parsed_cmdline[2])
-   if not repo then
-      gitano.log.critical("Unable to locate repository.")
-      gitano.log.critical("  * " .. (tostring(msg)))
-      gitano.log.fatal("Cannot continue")
-   end
-   
-   if repo.is_nascent then
-      gitano.log.info("Repository " .. repo.name .. " is nascent")
+if cmd.takes_repo then
+   repo, parsed_cmdline = cmd.detect_repo(config, parsed_cmdline)
+   if not repo and not parsed_cmdline then
+      gitano.log.fatal("Failed to acquire repository object")
    end
 end
 
diff --git a/bin/gitano-command.cgi.in b/bin/gitano-command.cgi.in
index bc280b2..ba16538 100755
--- a/bin/gitano-command.cgi.in
+++ b/bin/gitano-command.cgi.in
@@ -17,6 +17,7 @@ local sio = require "luxio.simple"
 
 -- @@GITANO_BIN_PATH
 -- @@GITANO_SHARE_PATH
+-- @@GITANO_PLUGIN_PATH
 
 local stdout = sio.stdout
 
diff --git a/bin/gitano-post-receive-hook.in b/bin/gitano-post-receive-hook.in
index f495d89..3dccfee 100644
--- a/bin/gitano-post-receive-hook.in
+++ b/bin/gitano-post-receive-hook.in
@@ -18,6 +18,7 @@ local sp = require "luxio.subprocess"
 
 -- @@GITANO_BIN_PATH
 -- @@GITANO_SHARE_PATH
+-- @@GITANO_PLUGIN_PATH
 
 local start_log_level = gitano.log.get_level()
 -- Clamp level at info until we have checked if the caller
diff --git a/bin/gitano-pre-receive-hook.in b/bin/gitano-pre-receive-hook.in
index c25418b..182554b 100644
--- a/bin/gitano-pre-receive-hook.in
+++ b/bin/gitano-pre-receive-hook.in
@@ -18,6 +18,7 @@ local sp = require "luxio.subprocess"
 
 -- @@GITANO_BIN_PATH
 -- @@GITANO_SHARE_PATH
+-- @@GITANO_PLUGIN_PATH
 
 local start_log_level = gitano.log.get_level()
 -- Clamp level at info until we have checked if the caller
diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in
index 61a3246..f31c8f0 100644
--- a/bin/gitano-setup.in
+++ b/bin/gitano-setup.in
@@ -18,6 +18,7 @@ local clod = require "clod"
 
 -- @@GITANO_BIN_PATH
 -- @@GITANO_SHARE_PATH
+-- @@GITANO_PLUGIN_PATH
 
 local possible_answers = {...}
 
diff --git a/bin/gitano-smart-http.cgi.in b/bin/gitano-smart-http.cgi.in
index 8fb0240..017c4e7 100755
--- a/bin/gitano-smart-http.cgi.in
+++ b/bin/gitano-smart-http.cgi.in
@@ -18,6 +18,7 @@ local sio = require "luxio.simple"
 
 -- @@GITANO_BIN_PATH
 -- @@GITANO_SHARE_PATH
+-- @@GITANO_PLUGIN_PATH
 
 local stdout = sio.stdout
 
diff --git a/bin/gitano-update-hook.in b/bin/gitano-update-hook.in
index e338ba2..34acbf9 100644
--- a/bin/gitano-update-hook.in
+++ b/bin/gitano-update-hook.in
@@ -18,6 +18,7 @@ local sp = require "luxio.subprocess"
 
 -- @@GITANO_BIN_PATH
 -- @@GITANO_SHARE_PATH
+-- @@GITANO_PLUGIN_PATH
 
 local refname, oldsha, newsha = ...
 
diff --git a/bin/gitano-update-ssh.in b/bin/gitano-update-ssh.in
index 798296f..136d6df 100644
--- a/bin/gitano-update-ssh.in
+++ b/bin/gitano-update-ssh.in
@@ -18,6 +18,7 @@ local sp = require "luxio.subprocess"
 
 -- @@GITANO_BIN_PATH
 -- @@GITANO_SHARE_PATH
+-- @@GITANO_PLUGIN_PATH
 
 local repo_root = ...