Move the gc and count-objects commands to a separate repocommand module so that we can group fsck in with them neatly. This new module is for commands which operate neatly on a repository with little to no extra dependencies. --- Makefile | 3 +- lib/gitano/command.lua | 54 ++-------------------------------- lib/gitano/repocommand.lua | 70 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 53 deletions(-) create mode 100644 lib/gitano/repocommand.lua diff --git a/Makefile b/Makefile index 5e0249c..0bb007c 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,8 @@ MODS := gitano \ gitano.util \ gitano.actions gitano.config gitano.lace gitano.log \ gitano.markdown gitano.repository gitano.supple \ - gitano.command gitano.admincommand gitano.usercommand + gitano.command gitano.admincommand gitano.usercommand \ + gitano.repocommand SKEL_FILES := gitano-admin/rules/selfchecks.lace \ gitano-admin/rules/aschecks.lace \ diff --git a/lib/gitano/command.lua b/lib/gitano/command.lua index da20dea..c8f537a 100644 --- a/lib/gitano/command.lua +++ b/lib/gitano/command.lua @@ -937,63 +937,13 @@ assert(register_cmd("ls", builtin_ls_short, builtin_ls_helptext, builtin_ls_validate, builtin_ls_prep, builtin_ls_run, false, false)) -local builtin_gc_short = "Invoke git gc on your repository" -local builtin_gc_helptext = [[ -usage: gc repo [options] - -Invoke, git gc, passing the given options, on the given repository. -You must have basic write access to the repository in order to invoke a gc. -]] - -local function builtin_gc_prep(config, repo, cmdline, context) - context.operation = "write" - return repo:run_lace(context) -end - -local builtin_count_objects_short = "Count objects in your projects" -local builtin_count_objects_helptext = [[ -usage: count-objects repo [options] - -Counts objects in your repository. - -You must have read access to the repository in order -to run count-objects. -]] - -local function builtin_count_objects_prep(config, repo, cmdline, context) - context.operation = "read" - return repo:run_lace(context) -end - -local function builtin_simple_validate(config, repo, cmdline) - if not repo or repo.is_nascent then - log.error("Unable to proceed, repository does not exist") - return false - end - return true -end - -local function builtin_simple_run(config, repo, cmdline, env) - local cmdcopy = {env=util.deep_copy(env), "git", cmdline[1]} - cmdcopy.env.GIT_DIR=repo:fs_path() - for i = 3, #cmdline do cmdcopy[#cmdcopy+1] = cmdline[i] end - local proc = sp.spawn(cmdcopy) - return proc:wait() -end - -assert(register_cmd("gc", builtin_gc_short, builtin_gc_helptext, - builtin_simple_validate, builtin_gc_prep, - builtin_simple_run, true, false)) - -assert(register_cmd("count-objects", builtin_count_objects_short, - builtin_count_objects_helptext, builtin_simple_validate, - builtin_count_objects_prep, builtin_simple_run, - true, false)) local usercmds = require 'gitano.usercommand' usercmds.register(register_cmd) local admincmds = require 'gitano.admincommand' admincmds.register(register_cmd) +local repocmds = require 'gitano.repocommand' +repocmds.register(register_cmd) return { register = register_cmd, diff --git a/lib/gitano/repocommand.lua b/lib/gitano/repocommand.lua new file mode 100644 index 0000000..6cdcf0a --- /dev/null +++ b/lib/gitano/repocommand.lua @@ -0,0 +1,70 @@ +-- gitano.repocommand +-- +-- Gitano repository related commands such as gc, count-objects and fsck +-- +-- Copyright 2012 Daniel Silverstone <dsilvers(a)digital-scurf.org&gt; + +local log = require 'gitano.log' +local util = require 'gitano.util' +local repository = require 'gitano.repository' + +local sp = require "luxio.subprocess" + +local builtin_gc_short = "Invoke git gc on your repository" +local builtin_gc_helptext = [[ +usage: gc repo [options] + +Invoke, git gc, passing the given options, on the given repository. +You must have basic write access to the repository in order to invoke a gc. +]] + +local function builtin_gc_prep(config, repo, cmdline, context) + context.operation = "write" + return repo:run_lace(context) +end + +local builtin_count_objects_short = "Count objects in your projects" +local builtin_count_objects_helptext = [[ +usage: count-objects repo [options] + +Counts objects in your repository. + +You must have read access to the repository in order +to run count-objects. +]] + +local function builtin_count_objects_prep(config, repo, cmdline, context) + context.operation = "read" + return repo:run_lace(context) +end + +local function builtin_simple_validate(config, repo, cmdline) + if not repo or repo.is_nascent then + log.error("Unable to proceed, repository does not exist") + return false + end + return true +end + +local function builtin_simple_run(config, repo, cmdline, env) + local cmdcopy = {env=util.deep_copy(env), "git", cmdline[1]} + cmdcopy.env.GIT_DIR=repo:fs_path() + for i = 3, #cmdline do cmdcopy[#cmdcopy+1] = cmdline[i] end + local proc = sp.spawn(cmdcopy) + return proc:wait() +end + +local function register_repocommand(register_cmd) + assert(register_cmd("gc", builtin_gc_short, builtin_gc_helptext, + builtin_simple_validate, builtin_gc_prep, + builtin_simple_run, true, false)) + + assert(register_cmd("count-objects", builtin_count_objects_short, + builtin_count_objects_helptext, builtin_simple_validate, + builtin_count_objects_prep, builtin_simple_run, + true, false)) +end + +return { + register = register_repocommand +} -- 1.7.10.4

Given we now use repository tokens in multiple places, this ensures that the tokens can be customised with notes. This might be to ensure that a delete user token doesn't match a rename user token for example. --- lib/gitano/repository.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitano/repository.lua b/lib/gitano/repository.lua index f512092..39ed21b 100644 --- a/lib/gitano/repository.lua +++ b/lib/gitano/repository.lua @@ -443,7 +443,7 @@ function repo_method:set_head(newhead) return true end -function repo_method:generate_confirmation() +function repo_method:generate_confirmation(notes) -- Generate a confirmation token. -- To do this, we read *ALL* refs in the repository and their -- sha1 sums. We then hash all that to generate a token @@ -454,7 +454,7 @@ function repo_method:generate_confirmation() refnames[#refnames+1] = ref end table.sort(refnames) - local str = "" + local str = notes or "" log.debug("Calculating confirmation token for", self.name) for i = 1, #refnames do local ref, sha = refnames[i], refs[refnames[i]] -- 1.7.10.4

Prior to this patch, if you did 'user delete' on a user in a group then the group membership change was not committed. --- lib/gitano/admincommand.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/gitano/admincommand.lua b/lib/gitano/admincommand.lua index 0b7075a..e8c63ad 100644 --- a/lib/gitano/admincommand.lua +++ b/lib/gitano/admincommand.lua @@ -249,6 +249,7 @@ local function builtin_user_run(conf, _, cmdline, env) if gtab.members[username] then table.remove(gtab.members, gtab.members[username]) gtab.members[username] = nil + gtab.changed_tables() log.state("Removed", username, "from membership of", g) end end -- 1.7.10.4

Before this patch, if you used 'group del' to remove a group which was a subgroup member of another group, the resulting config would not parse. This fixes that. --- lib/gitano/admincommand.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/gitano/admincommand.lua b/lib/gitano/admincommand.lua index a89d4e9..0f2e4ee 100644 --- a/lib/gitano/admincommand.lua +++ b/lib/gitano/admincommand.lua @@ -476,6 +476,14 @@ local function builtin_group_run(conf, _, cmdline, env) elseif cmdline[4] ~= token then log.fatal("Token does not match. Has someone else done administrative actions?") else + for gg, gtab in pairs(conf.groups) do + if gtab.subgroups[g] then + table.remove(gtab.subgroups, gtab.subgroups[g]) + gtab.subgroups[g] = nil + gtab.changed_tables() + log.state("Removed:", g, "from subgroup membership of", gg) + end + end conf.groups[g] = nil reason = "Delete group " .. g end -- 1.7.10.4

This updates the defines in the skeleton gitano-admin ruleset to include the user rename and group rename commands. --- skel/gitano-admin/rules/defines.lace | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/skel/gitano-admin/rules/defines.lace b/skel/gitano-admin/rules/defines.lace index 0d7882a..20a2f7c 100644 --- a/skel/gitano-admin/rules/defines.lace +++ b/skel/gitano-admin/rules/defines.lace @@ -19,19 +19,21 @@ define op_userdel operation userdel define op_userlist operation userlist define op_useremail operation useremail define op_username operation username -define op_user anyof op_userlist op_useradd op_userdel op_useremail op_username +define op_userrename operation userrename +define op_user anyof op_userlist op_useradd op_userdel op_useremail op_username op_userrename ## Groups define op_grouplist operation grouplist define op_groupshow operation groupshow define op_groupadd operation groupadd define op_groupdel operation groupdel +define op_grouprename operation grouprename define op_groupadduser operation groupadduser define op_groupdeluser operation groupdeluser define op_groupaddgroup operation groupaddgroup define op_groupdelgroup operation groupdelgroup define op_groupdescription operation groupdescription -define op_group anyof op_grouplist op_groupshow op_groupadd op_groupdel op_groupadduser op_groupdeluser op_groupaddgroup op_groupdelgroup op_groupdescription +define op_group anyof op_grouplist op_groupshow op_groupadd op_groupdel op_groupadduser op_groupdeluser op_groupaddgroup op_groupdelgroup op_groupdescription op_grouprename ## Graveyard define op_graveyardlist operation graveyardlist -- 1.7.10.4

Add to the readme command the ability to alter the README of a repository. --- lib/gitano/command.lua | 55 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/lib/gitano/command.lua b/lib/gitano/command.lua index c3fd108..80fa554 100644 --- a/lib/gitano/command.lua +++ b/lib/gitano/command.lua @@ -9,6 +9,7 @@ local util = require 'gitano.util' local repository = require 'gitano.repository' local sp = require "luxio.subprocess" +local sio = require "luxio.simple" local cmds = {} @@ -600,16 +601,22 @@ assert(register_cmd("config", builtin_config_short, builtin_config_validate, builtin_config_prep, builtin_config_run, true, false)) -local builtin_readme_short = "View readme for a repository (if present)" +local builtin_readme_short = "Access readme for a repository" local builtin_readme_helptext = [[ -usage: readme <reponame> +usage: readme <reponame> [set|show] -Shows you the readme for the given repository. You must have read -access to the repository in order to see it. +If you do not provide a sub-command, the readme command defaults to +showing you the readme for the given repository. To view the +readme you must have read access to the repository. + +If you provide the subcommand 'set' then the readme command reads +from the input stream and updates the readme in the repository. +You must have the right to alter the project readme in order to do +this. ]] local function builtin_readme_validate(config, repo, cmdline) - if #cmdline ~= 2 then + if #cmdline < 2 then log.error("Expected repository not provided") return false end @@ -617,25 +624,45 @@ local function builtin_readme_validate(config, repo, cmdline) log.error("Repository does not exist") return false end + if #cmdline > 3 then + log.error("usage: readme <reponame> [set|show]") + return false + end + if #cmdline == 2 then + cmdline[3] = "show" + end + if cmdline[3] ~= "set" and cmdline[3] ~= "show" then + log.error("usage: readme <reponame> [set|show]") + return false + end return true end local function builtin_readme_prep(config, repo, cmdline, context) - context.operation = "read" + if cmdline[3] == "show" then + context.operation = "read" + else + context.operation = "setreadme" + end return repo:run_lace(context) end local function builtin_readme_run(config, repo, cmdline, env) - local t = repo.readme_mdwn - if t then - if not t:match("\n$") then - t = t .. "\n" - end - for l in t:gmatch("([^\n]*)\n") do - log.state(l) + if cmdline[3] == "show" then + local t = repo.readme_mdwn + if t then + if not t:match("\n$") then + t = t .. "\n" + end + for l in t:gmatch("([^\n]*)\n") do + log.state(l) + end + else + log.state("# No README.mdwn found") end else - log.state("# No README.mdwn found") + local readme = sio.stdin:read("*a") + repo:set_readme(readme) end return "exit", 0 end -- 1.7.10.4