3:58 a.m.
Hi all,
We needed our gitano users to have access to the git-archive command so added
it to the available commands. It might be usefull for someone else, any
comments or feedback would be appreciated.
Gavin Lee (1):
Added git-upload-archive to available commands
lib/gitano/command.lua | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
--
1.7.9.5
3:58 a.m.
New subject: [PATCH 1/1] Added git-upload-archive to available commands
---
lib/gitano/command.lua | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/lib/gitano/command.lua b/lib/gitano/command.lua
index 468b34b..4e82012 100644
--- a/lib/gitano/command.lua
+++ b/lib/gitano/command.lua
@@ -75,6 +75,41 @@ local function get_cmd(cmdname)
}
end
+-- Adding archive command here
+
+local function builtin_upload_archive_validate(config, repo, cmdline)
+ -- git-upload-archive repo
+ if #cmdline > 2 then
+ return false
+ end
+ cmdline[2] = repo:fs_path()
+ return true
+end
+
+local function builtin_upload_archive_prep(config, repo, cmdline, context)
+ if repo.is_nascent then
+ return "deny", "Repository " .. repo.name .. " does not
exist"
+ end
+ -- git-upload-archive is always a simple write operation
+ context.operation = "read"
+ return repo:run_lace(context)
+end
+
+local function builtin_upload_archive_run(config, repo, cmdline, env)
+ local cmdcopy = {env=env}
+ for i = 1, #cmdline do cmdcopy[i] = cmdline[i] end
+ local proc = sp.spawn(cmdcopy)
+ return proc:wait()
+end
+
+assert(register_cmd("git-upload-archive", nil, nil,
+ builtin_upload_archive_validate,
+ builtin_upload_archive_prep,
+ builtin_upload_archive_run,
+ true, true))
+
+-- End of archive command
+
local builtin_help_short = "Ask for help"
local builtin_help_helptext = [[
usage: help [admin|command]
--
1.7.9.5
5:04 a.m.
On Mon, Jun 30, 2014 at 08:58:34 +0100, Gavin Lee wrote:
We needed our gitano users to have access to the git-archive command
so added
it to the available commands. It might be usefull for someone else, any
comments or feedback would be appreciated.
Thanks for this Gavin.
I am looking to migrate most commands out of the core into plugins so that
people can add/remove them from Gitano installations at will.
If you're not able to rework your patch as a plugin (See the rsync plugin for
an example) then I will do that when I have time.
I agree that access to git archive is well worthwhile.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
1:14 p.m.
New subject: [PATCH 0/4] Add git-upload-archive plugin
Repo: git://git.gitano.org.uk/personal/richardmaw/gitano.git
Ref: refs/heads/git-upload-archive-plugin
Sha1: 243654496f8e5ec9ef7940696c4155624339a23a
This is Gavin Lee's patch imported into git, rebased with some tests added.
I ran into issues testing it, since it turns out my filesystem won't return the
d_type when iterating dentries, so there's also a commit that modifies the
check for whether a plugin is valid to load.
Gavin Lee (1):
git-archive command as plugin
Richard Maw (3):
plugins: Don't check for the file type
tests: add gitarchive subcommand to GTT and yarn implementation
yarns: Add test for git-upload-archive command
Makefile | 11 +++++-----
lib/gitano/plugins.lua | 2 +-
plugins/archive-plugin.lua | 33 +++++++++++++++++++++++++++++
testing/02-commands-git-upload-archive.yarn | 12 +++++++++++
testing/gitano-test-tool.in | 7 ++++++
testing/library.yarn | 4 ++++
6 files changed, 63 insertions(+), 6 deletions(-)
create mode 100644 plugins/archive-plugin.lua
create mode 100644 testing/02-commands-git-upload-archive.yarn
--
1.9.1
1:14 p.m.
New subject: [PATCH 1/4] git-archive command as plugin
From: Gavin Lee <gavlee888(a)live.ie>
---
plugins/archive-plugin.lua | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 plugins/archive-plugin.lua
diff --git a/plugins/archive-plugin.lua b/plugins/archive-plugin.lua
new file mode 100644
index 0000000..e117201
--- /dev/null
+++ b/plugins/archive-plugin.lua
@@ -0,0 +1,33 @@
+local gitano = require "gitano"
+local sp = require "luxio.subprocess"
+
+local function builtin_upload_archive_validate(config, repo, cmdline)
+ -- git-upload-archive repo
+ if #cmdline > 2 then
+ return false
+ end
+ cmdline[2] = repo:fs_path()
+ return true
+end
+
+local function builtin_upload_archive_prep(config, repo, cmdline, context)
+ if repo.is_nascent then
+ return "deny", "Repository " .. repo.name .. " does not
exist"
+ end
+ -- git-upload-archive is always a simple write operation
+ context.operation = "read"
+ return repo:run_lace(context)
+end
+
+local function builtin_upload_archive_run(config, repo, cmdline, env)
+ local cmdcopy = {env=env}
+ for i = 1, #cmdline do cmdcopy[i] = cmdline[i] end
+ local proc = sp.spawn(cmdcopy)
+ return proc:wait()
+end
+
+assert(gitano.command.register("git-upload-archive", nil, nil,
+ builtin_upload_archive_validate,
+ builtin_upload_archive_prep,
+ builtin_upload_archive_run,
+ true, true))
--
1.9.1
1:14 p.m.
New subject: [PATCH 2/4] plugins: Don't check for the file type
dirp:iterate()'s fileinfo may not have d_type initialised,
do the check could fail even if it was a valid plugin file.
I think the filename check is sufficient.
---
lib/gitano/plugins.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/gitano/plugins.lua b/lib/gitano/plugins.lua
index bdc6d1e..ffa8af0 100644
--- a/lib/gitano/plugins.lua
+++ b/lib/gitano/plugins.lua
@@ -24,7 +24,7 @@ local function find_plugins(path)
else
for filename, fileinfo in dirp:iterate() do
local plugin_name = filename:match(plugin_name_pattern)
- if plugin_name and fileinfo.d_type == luxio.DT_REG then
+ if plugin_name then
if not ret[plugin_name] then
ret[plugin_name] = entry
ret[#ret + 1] = plugin_name
--
1.9.1
1:14 p.m.
New subject: [PATCH 3/4] tests: add gitarchive subcommand to GTT and yarn implementation
---
testing/gitano-test-tool.in | 7 +++++++
testing/library.yarn | 4 ++++
2 files changed, 11 insertions(+)
diff --git a/testing/gitano-test-tool.in b/testing/gitano-test-tool.in
index 822460d..3fc6599 100644
--- a/testing/gitano-test-tool.in
+++ b/testing/gitano-test-tool.in
@@ -163,6 +163,13 @@ function cmd_cloneexists(user, localname)
}
end
+function cmd_gitarchive(user, key, repo, ref)
+ local exturl = generate_exturl(user, key, repo)
+ run_program {
+ "git", "archive", "--remote", exturl, ref,
+ }
+end
+
function cmd_pubkeyfilename(user, key)
print(ssh_key_file(user, key) .. ".pub")
end
diff --git a/testing/library.yarn b/testing/library.yarn
index 89e8da1..997db7e 100644
--- a/testing/library.yarn
+++ b/testing/library.yarn
@@ -64,6 +64,10 @@ Clone manipulation
cd "$($GTT clonelocation $MATCH_1 "$MATCH_2")"
if test -r "$MATCH_3"; then false; else true; fi
+ IMPLEMENTS WHEN ([a-z][a-z0-9]*) ([a-z][a-z0-9]*) uses git archive to extract the tree
of ([a-z][a-z0-9-]*) ([a-z][a-z0-9]*) to ([a-z][a-z0-9]*)
+ mkdir -p "$DATADIR/$MATCH_5"
+ $GTT gitarchive $MATCH_1 $MATCH_2 $MATCH_3 $MATCH_4 | tar -C
"$DATADIR/$MATCH_5" -x
+
Admin repo manipulation
-----------------------
--
1.9.1
1:14 p.m.
New subject: [PATCH 4/4] yarns: Add test for git-upload-archive command
This is used by git-archive to get the server to generate a tarball.
---
Makefile | 11 ++++++-----
testing/02-commands-git-upload-archive.yarn | 12 ++++++++++++
2 files changed, 18 insertions(+), 5 deletions(-)
create mode 100644 testing/02-commands-git-upload-archive.yarn
diff --git a/Makefile b/Makefile
index 9651c0e..1a60887 100644
--- a/Makefile
+++ b/Makefile
@@ -32,11 +32,12 @@ TEST_BIN_NAMES := gitano-test-tool
TESTS := 01-basics 02-commands-as 02-commands-config 02-commands-copy \
02-commands-count-objects 02-commands-create 02-commands-destroy \
- 02-commands-fsck 02-commands-gc 02-commands-graveyard \
- 02-commands-group 02-commands-help 02-commands-ls 02-commands-readme \
- 02-commands-rename 02-commands-set-description 02-commands-set-head \
- 02-commands-set-owner 02-commands-sshkey 02-commands-user \
- 02-commands-whoami
+ 02-commands-fsck 02-commands-gc 02-commands-git-upload-archive \
+ 02-commands-graveyard 02-commands-group 02-commands-help \
+ 02-commands-ls 02-commands-readme 02-commands-rename \
+ 02-commands-set-description 02-commands-set-head 02-commands-set-owner \
+ 02-commands-sshkey 02-commands-user 02-commands-whoami
+
MODS := gitano \
diff --git a/testing/02-commands-git-upload-archive.yarn
b/testing/02-commands-git-upload-archive.yarn
new file mode 100644
index 0000000..a16a0ca
--- /dev/null
+++ b/testing/02-commands-git-upload-archive.yarn
@@ -0,0 +1,12 @@
+<!-- -*- markdown -*- -->
+git archive \-\-remote support with git-upload-archive
+======================================================
+
+An appropriately configured git server
+can also serve the contents of a git repository directly through git-archive,
+which is useful for providing snapshots.
+
+ SCENARIO Performing git-archive operations
+ GIVEN a standard instance
+ WHEN testinstance adminkey uses git archive to extract the tree of gitano-admin HEAD
to test
+ THEN test/site.conf contains site_name "Gitano Test Instance"
--
1.9.1
2:04 p.m.
New subject: [PATCH 0/4] Add git-upload-archive plugin
On Wed, Oct 28, 2015 at 17:14:10 +0000, Richard Maw wrote:
This is Gavin Lee's patch imported into git, rebased with some
tests added.
I ended up using git am, but I have now merged your patch and work and it
seems to be all good. I had to tweak the Makefile hunk in the last patch
but that's more due to my awful makefile than anything else.
Thanks,
Daniel.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
2776
days inactive
3263
days old
8 comments
3 participants
participants (3)
-
Daniel Silverstone -
Gavin Lee -
Richard Maw