6:25 p.m.
Repo: git://gitano.org.uk/personal/richardmaw/gitano.git
Branch: add-copy-command-rebase
Commit: 0f682e35f071f18ede96dedb4cc6a2a2d4b5d480
Richard Maw (5):
Fix typo in error message in command.lua
Add utility functions for copying types of files
Add a copy method to repository object.
Create a copy command and register it
Merge cp_r and cp_lr into copy_dir
lib/gitano/command.lua | 4 +-
lib/gitano/copycommand.lua | 88 +++++++++++++++++++++++++++++++++++++++++++
lib/gitano/repository.lua | 57 ++++++++++++++++++++++++++++
lib/gitano/util.lua | 89 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 237 insertions(+), 1 deletion(-)
create mode 100644 lib/gitano/copycommand.lua
--
1.7.9.5
6:25 p.m.
New subject: [PATCH 1/5] Fix typo in error message in command.lua
---
lib/gitano/command.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/gitano/command.lua b/lib/gitano/command.lua
index da20dea..f8b25a8 100644
--- a/lib/gitano/command.lua
+++ b/lib/gitano/command.lua
@@ -740,7 +740,7 @@ local function builtin_rename_prep(config, repo, cmdline, context)
local ctx, action, reason
-- Check 0, is the current repo nascent
if repo.is_nascent then
- return "deny", "Cannot rename a repository which does not
exit"
+ return "deny", "Cannot rename a repository which does not
exist"
end
-- Check 1, read current repo
ctx = util.deep_copy(context)
--
1.7.9.5
6:25 p.m.
New subject: [PATCH 2/5] Add utility functions for copying types of files
There's far too much redundancy in the directory copy methods,
and it could be made more atomic, but it works.
---
lib/gitano/util.lua | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 121 insertions(+)
diff --git a/lib/gitano/util.lua b/lib/gitano/util.lua
index c8834d3..8586590 100644
--- a/lib/gitano/util.lua
+++ b/lib/gitano/util.lua
@@ -182,6 +182,123 @@ local function rm_rf(path)
return (ret == 0), luxio.strerror(err)
end
+local function copy_file(from, to)
+ local fromfile, emsg = sio.open(from, "r")
+ if not fromfile then
+ return false, emsg
+ end
+ local tofile, emsg = sio.open(to, "wce")
+ if not tofile then
+ return false, emsg
+ end
+ local write_count
+ repeat
+ local bytes, emsg
+ bytes, ems = fromfile:read(4096)
+ if not bytes then
+ fromfile:close()
+ tofile:close()
+ return false, emsg
+ end
+ write_count, emsg = tofile:write(bytes)
+ if not write_count then
+ fromfile:close()
+ tofile:close()
+ return false, emsg
+ end
+ until write_count == 0
+ return true
+end
+
+local function copy_symlink(from, to)
+ local link_target, ret, err
+ ret, link_target = luxio.readlink(from)
+ if ret == -1 then
+ return false, luxio.strerror(link_target)
+ end
+ ret, err = luxio.symlink(link_target, to)
+ if ret ~= 0 then
+ return false, luxio.strerror(err)
+ end
+ return true
+end
+
+local function cp_lr(from, to)
+ local ret, err, dirp
+ ret, err = mkdir_p(to)
+ if not ret then
+ return ret, err
+ end
+ dirp, err, ret = sio.opendir(from)
+ if not dirp then
+ return ret, err
+ end
+ for filename, fileinfo in dirp:iterate() do
+ if filename == "." or filename == ".." then
+ -- skip
+ elseif fileinfo.d_type == luxio.DT_REG then
+ ret, err = luxio.link(from .. '/' .. filename,
+ to .. '/' .. filename)
+ if ret ~= 0 then
+ return false, luxio.strerror(err)
+ end
+ elseif fileinfo.d_type == luxio.DT_LNK then
+ ret, err = copy_symlink(from .. '/' .. filename,
+ to .. '/' .. filename)
+ if not ret then
+ return false, err
+ end
+ elseif fileinfo.d_type == luxio.DT_DIR then
+ ret, err = cp_lr(from .. '/' .. filename,
+ to .. '/' .. filename)
+ if not ret then
+ return ret, err
+ end
+ else
+ return false, ("Unsupported file type %d"):format(fileinfo.d_type)
+ end
+ end
+ return true
+end
+
+local function cp_r(from, to)
+ local ret, err, dirp
+ ret, err = mkdir_p(to)
+ if not ret then
+ return ret, err
+ end
+ dirp, err, ret = sio.opendir(from)
+ if not dirp then
+ return ret, err
+ end
+ for filename, fileinfo in dirp:iterate() do
+ if filename == "." or filename == ".." then
+ -- skip
+ elseif fileinfo.d_type == luxio.DT_REG then
+ ret, err = copy_file(from .. '/' .. filename,
+ to .. '/' .. filename)
+ if not ret then
+ return false, err
+ end
+ elseif fileinfo.d_type == luxio.DT_LNK then
+ ret, err = copy_symlink(from .. '/' .. filename,
+ to .. '/' .. filename)
+ if not ret then
+ return false, err
+ end
+ elseif fileinfo.d_type == luxio.DT_DIR then
+ ret, err = cp_r(from .. '/' .. filename,
+ to .. '/' .. filename)
+ if not ret then
+ return ret, err
+ end
+ else
+ return false, ("Unsupported file type %d"):format(fileinfo.d_type)
+ end
+ end
+ return true
+end
+
local function html_escape(s)
return (s:gsub("&", "&"):
gsub("<", "<"):
@@ -324,8 +441,12 @@ return {
dirname = dirname,
basename = basename,
+ copy_symlink = copy_symlink,
+ copy_file = copy_file,
mkdir_p = mkdir_p,
rm_rf = rm_rf,
+ cp_lr = cp_lr,
+ cp_r = cp_r,
html_escape = html_escape,
--
1.7.9.5
10:58 p.m.
New subject: [PATCH 2/5] Add utility functions for copying types of files
On Sun, May 12, 2013 at 05:25:44PM +0100, Richard Maw wrote:
diff --git a/lib/gitano/util.lua b/lib/gitano/util.lua
+local function copy_file(from, to)
+ bytes, ems = fromfile:read(4096)
Any reason you picked 4kB ? I'd personally go for something way larger than
that. Perhaps a megabyte, perhaps ten megabytes. RAM is not really an issue
these days, and fewer calls will help significantly.
+local function copy_symlink(from, to)
+ local link_target, ret, err
+ ret, link_target = luxio.readlink(from)
+ if ret == -1 then
+ return false, luxio.strerror(link_target)
+ end
+ ret, err = luxio.symlink(link_target, to)
+ if ret ~= 0 then
+ return false, luxio.strerror(err)
+ end
+ return true
+end
Should we be performing any kind of target adjustment based on base dirs? I'm
not certain that git even has symlinks inside its GIT_DIR stuff because they're
not Windows compatible (it used to, but symbolic refs became files because
Windows couldn't cope well enough with the symlinks).
+local function cp_lr(from, to)
+ ret, err = luxio.link(from .. '/' .. filename,
+ to .. '/' .. filename)
At some point, it'd be nice to have a join function to go with the split
function (path_components) but for now this is okay.
+local function cp_r(from, to)
Overall these two functions are a lot similar, could you factor them out,
perhaps make the factored function higher order (takes either luxio.link or
copy_file as one of its arguments) and then cp_lr and cp_r would just be
tailcalls through.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
10:07 p.m.
New subject: [PATCH 2/5] Add utility functions for copying types of files
On Mon, May 13, 2013 at 09:58:38PM +0100, Daniel Silverstone wrote:
Any reason you picked 4kB ? I'd personally go for something way
larger than
that. Perhaps a megabyte, perhaps ten megabytes. RAM is not really an issue
these days, and fewer calls will help significantly.
I can't remember, I probably just picked it up from somewhere else.
Should we be performing any kind of target adjustment based on base
dirs?
I hadn't thought of that. Given I want this to be a generic library function
for copying any form of directory, I think we should.
I'm also happy to move it to Luxio, if Rob will take patch emails.
I'm not certain that git even has symlinks inside its GIT_DIR
stuff because
they're not Windows compatible (it used to, but symbolic refs became files
because Windows couldn't cope well enough with the symlinks).
I was not aware of that. That's a little sad given NTFS at least claims to have
symlinks now.
> +local function cp_lr(from, to)
> + ret, err = luxio.link(from .. '/' .. filename,
> + to .. '/' .. filename)
At some point, it'd be nice to have a join function to go with the split
function (path_components) but for now this is okay.
Good point, I'll take a look at adding one next time I have a hack, though
I'd expect this functionality would be more usefully added to a lower-level
library.
6:25 p.m.
New subject: [PATCH 3/5] Add a copy method to repository object.
This also has a lot of common code to util.cp*
---
lib/gitano/repository.lua | 56 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/lib/gitano/repository.lua b/lib/gitano/repository.lua
index f512092..877e43c 100644
--- a/lib/gitano/repository.lua
+++ b/lib/gitano/repository.lua
@@ -507,6 +507,62 @@ function repo_method:rename_to(somename)
return true
end
+function repo_method:copy_to(somename)
+ -- Same cleanup as in find...
+ if somename:match(".%.git$") then
+ somename = somename:match("^(.+)%.git$")
+ end
+ -- Remove any '.'
+ somename = somename:gsub("%.", "")
+ -- Remove any leading or trailing /
+ somename = somename:match("^/*(.-)/*$")
+
+ local newpath = self.fs_path({name=somename,config=self.config})
+
+ if not util.mkdir_p(util.dirname(newpath)) then
+ return false, "Cannot prepare path leading to repository."
+ end
+
+ -- TODO: make this atomic
+ local from = self:fs_path()
+ local dirp, err = sio.opendir(from)
+ if not dirp then
+ return false, err
+ end
+ for filename, fileinfo in dirp:iterate() do
+ if filename == "." or filename == ".." then
+ -- skip
+ elseif filename == "objects" then
+ local ok, err = util.cp_lr(from .. '/objects',
+ newpath .. '/objects')
+ if not ok then
+ return ok, err
+ end
+ elseif fileinfo.d_type == luxio.DT_REG then
+ local ok, err = util.copy_file(from .. '/' .. filename,
+ newpath .. '/' .. filename)
+ if not ok then
+ return ok, err
+ end
+ elseif fileinfo.d_type == luxio.DT_LNK then
+ local ok, err = util.copy_symlink(from .. '/' .. filename,
+ newpath .. '/' .. filename)
+ if not ok then
+ return false, err
+ end
+ elseif fileinfo.d_type == luxio.DT_DIR then
+ local ok, err = util.cp_r(from .. '/' .. filename,
+ newpath .. '/' .. filename)
+ if not ok then
+ return false, err
+ end
+ else
+ return false, ("Unsupported file type %d"):format(fileinfo.d_type)
+ end
+ end
+ return true
+end
+
function repo_method:update_modified_date(shas)
-- Update the info/web/last-modified
local dirpath = self:fs_path() .. "/info/web"
--
1.7.9.5
10:58 p.m.
New subject: [PATCH 3/5] Add a copy method to repository object.
On Sun, May 12, 2013 at 05:25:45PM +0100, Richard Maw wrote:
+function repo_method:copy_to(somename)
+ -- Same cleanup as in find...
+ if somename:match(".%.git$") then
+ somename = somename:match("^(.+)%.git$")
+ end
+ -- Remove any '.'
+ somename = somename:gsub("%.", "")
+ -- Remove any leading or trailing /
+ somename = somename:match("^/*(.-)/*$")
+
+ local newpath = self.fs_path({name=somename,config=self.config})
Rather than doing this, take a nascent repo as your argument (verify it's
nascent) and then as that for its repo path. That way, if we change the repo
name sanitisation rules, there's only one place to change it.
+ -- TODO: make this atomic
Indeed, I'd imagine the process as: Create target:fs_path() ..
".in_progress"
Then once its copied, rename it into place. Any errors, and you can rm_rf that
partial tree and report the error.
+ local from = self:fs_path()
+ local dirp, err = sio.opendir(from)
+ if not dirp then
+ return false, err
+ end
+ for filename, fileinfo in dirp:iterate() do
[snip loop body]
+ end
If you did the higher-order thing in util, then this loop body could easily use
such a beast.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
10:15 p.m.
New subject: [PATCH 3/5] Add a copy method to repository object.
On Mon, May 13, 2013 at 09:58:45PM +0100, Daniel Silverstone wrote:
On Sun, May 12, 2013 at 05:25:45PM +0100, Richard Maw wrote:
> +function repo_method:copy_to(somename)
> + -- Same cleanup as in find...
> + if somename:match(".%.git$") then
> + somename = somename:match("^(.+)%.git$")
> + end
> + -- Remove any '.'
> + somename = somename:gsub("%.", "")
> + -- Remove any leading or trailing /
> + somename = somename:match("^/*(.-)/*$")
> +
> + local newpath = self.fs_path({name=somename,config=self.config})
Rather than doing this, take a nascent repo as your argument (verify it's
nascent) and then as that for its repo path. That way, if we change the repo
name sanitisation rules, there's only one place to change it.
Good point. I guess at this point I was still at the copy-paste part of
learning how it works.
> + -- TODO: make this atomic
Indeed, I'd imagine the process as: Create target:fs_path() ..
".in_progress"
Then once its copied, rename it into place. Any errors, and you can rm_rf that
partial tree and report the error.
I could also use the presence of the ".in_progress" to prevent a copy while
the current one is being processed.
> + local from = self:fs_path()
> + local dirp, err = sio.opendir(from)
> + if not dirp then
> + return false, err
> + end
> + for filename, fileinfo in dirp:iterate() do
[snip loop body]
> + end
If you did the higher-order thing in util, then this loop body could easily use
such a beast.
Ack. I'll probably want to add a filter function parameter as well, so I can
treat the objects subdirectory specially. I'll make a note to take a look at
some other language's directory iteration APIs.
6:25 p.m.
New subject: [PATCH 4/5] Create a copy command and register it
---
lib/gitano/command.lua | 2 +
lib/gitano/copycommand.lua | 88 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 90 insertions(+)
create mode 100644 lib/gitano/copycommand.lua
diff --git a/lib/gitano/command.lua b/lib/gitano/command.lua
index f8b25a8..34e3053 100644
--- a/lib/gitano/command.lua
+++ b/lib/gitano/command.lua
@@ -994,6 +994,8 @@ local usercmds = require 'gitano.usercommand'
usercmds.register(register_cmd)
local admincmds = require 'gitano.admincommand'
admincmds.register(register_cmd)
+local copycmds = require 'gitano.copycommand'
+copycmds.register(register_cmd)
return {
register = register_cmd,
diff --git a/lib/gitano/copycommand.lua b/lib/gitano/copycommand.lua
new file mode 100644
index 0000000..f9c31e6
--- /dev/null
+++ b/lib/gitano/copycommand.lua
@@ -0,0 +1,88 @@
+-- gitano.copycommand
+--
+-- Gitano repository copy commands
+--
+-- Copyright 2013 Richard Maw <richard.maw(a)gmail.com>
+
+local repository = require "gitano.repository"
+local log = require "gitano.log"
+local util = require "gitano.util"
+
+local builtin_copy_short = "Copy a repository to a new path"
+
+local builtin_copy_helptext = [[
+usage: copy <oldrepo> <newrepo>
+
+Copy a git repository locally. This is quicker than fetching the
+old repository, creating the new one, then pushing to the new one.
+]]
+
+local function builtin_copy_validate(config, srcrepo, cmdline)
+ if #cmdline ~= 3 then
+ log.error("usage: copy <oldrepo> <newrepo>")
+ return false
+ end
+ local tgtrepo, msg = repository.find(config, cmdline[3])
+ if not tgtrepo then
+ log.critical("Unable to locate repository.")
+ log.critical(" * " .. (tostring(msg)))
+ log.fatal("Cannot continue")
+ return false
+ end
+ if not tgtrepo.is_nascent then
+ log.error("Repository", newrepo.name, "already exists")
+ return false
+ end
+ return true
+end
+
+local function builtin_copy_prep(config, srcrepo, cmdline, context)
+ local ctx, action, reason
+ -- Check 0, is the source repository nascent
+ if srcrepo.is_nascent then
+ return "deny", "Cannot copy a repository which does not exist"
+ end
+ -- Check 1, read the source repository
+ ctx = util.deep_copy(context)
+ ctx.operation = "read"
+ action, reason = srcrepo:run_lace(ctx)
+ if action ~= "allow" then
+ return action, reason
+ end
+ -- Check 2, create new repo
+ ctx = util.deep_copy(context)
+ local tgtrepo, msg = repository.find(config, cmdline[3])
+ if not tgtrepo then
+ return "deny", msg
+ end
+ if not tgtrepo.is_nascent then
+ return "deny", "Destination location is in use"
+ end
+ ctx.operation = "createrepo"
+ action, reason = tgtrepo:run_lace(ctx)
+ if action ~= "allow" then
+ return action, reason
+ end
+ -- Able to read and create, thus can copy
+ return "allow", "Passed all checks, can copy"
+end
+
+local function builtin_copy_run(config, repo, cmdline, env)
+ local ok, msg = repo:copy_to(cmdline[3])
+ if not ok then
+ log.error(msg)
+ return "exit", 1
+ end
+ log.state("Copied", cmdline[2], "to", cmdline[3])
+ return "exit", 0
+end
+
+local function register_commands(reg)
+ assert(reg("copy", builtin_copy_short, builtin_copy_helptext,
+ builtin_copy_validate, builtin_copy_prep, builtin_copy_run,
+ true, false, false))
+end
+
+return {
+ register = register_commands
+}
--
1.7.9.5
10:58 p.m.
New subject: [PATCH 4/5] Create a copy command and register it
On Sun, May 12, 2013 at 05:25:46PM +0100, Richard Maw wrote:
diff --git a/lib/gitano/copycommand.lua b/lib/gitano/copycommand.lua
+
+local function builtin_copy_validate(config, srcrepo, cmdline)
+ local tgtrepo, msg = repository.find(config, cmdline[3])
A trick here is to cache tgtrepo in cmdline (any non-numeric key won't be
touched). If you do that, then double-check that it works even if the command
is being run under 'as'.
+local function builtin_copy_prep(config, srcrepo, cmdline, context)
+ local ctx, action, reason
+ -- Check 0, is the source repository nascent
+ if srcrepo.is_nascent then
+ return "deny", "Cannot copy a repository which does not
exist"
+ end
Why was this not done in validate? I'm beginning to think that _prep should be
renamed as _permissions or similar, and I'd like to start rationalising the
calls.
+ local tgtrepo, msg = repository.find(config, cmdline[3])
+ if not tgtrepo then
+ return "deny", msg
+ end
+ if not tgtrepo.is_nascent then
+ return "deny", "Destination location is in use"
+ end
These checks would be unnecessary if you'd cached tgtrepo from before.
+local function builtin_copy_run(config, repo, cmdline, env)
+ local ok, msg = repo:copy_to(cmdline[3])
And here you'd pass in tgtrepo all neat and tidy and ready.
+ if not ok then
+ log.error(msg)
+ return "exit", 1
+ end
+ log.state("Copied", cmdline[2], "to", cmdline[3])
It'd be a good idea at this point to ensure that you construct a fresh
(non-nascent) repository object on the target repo name, then set the owner
(which you can get from the env). That will allow Gitano to set up all the
appropriate bits like export rules, etc.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
10:21 p.m.
New subject: [PATCH 4/5] Create a copy command and register it
On Mon, May 13, 2013 at 09:58:54PM +0100, Daniel Silverstone wrote:
A trick here is to cache tgtrepo in cmdline (any non-numeric key
won't be
touched). If you do that, then double-check that it works even if the command
is being run under 'as'.
I'd prefer a more explicit method for passing state between the different
stages.
> +local function builtin_copy_prep(config, srcrepo, cmdline,
context)
> + local ctx, action, reason
> + -- Check 0, is the source repository nascent
> + if srcrepo.is_nascent then
> + return "deny", "Cannot copy a repository which does not
exist"
> + end
Why was this not done in validate? I'm beginning to think that _prep should be
renamed as _permissions or similar, and I'd like to start rationalising the
calls.
I guess I was using commands that had not been cleaned up as examples.
> + if not ok then
> + log.error(msg)
> + return "exit", 1
> + end
> + log.state("Copied", cmdline[2], "to", cmdline[3])
It'd be a good idea at this point to ensure that you construct a fresh
(non-nascent) repository object on the target repo name, then set the owner
(which you can get from the env). That will allow Gitano to set up all the
appropriate bits like export rules, etc.
Good point, I had only tested copying repositories I owned, so didn't spot
this bug.
9:25 a.m.
New subject: [PATCH 4/5] Create a copy command and register it
On Thu, May 16, 2013 at 09:21:20PM +0100, Richard Maw wrote:
On Mon, May 13, 2013 at 09:58:54PM +0100, Daniel Silverstone wrote:
> A trick here is to cache tgtrepo in cmdline (any non-numeric key won't be
> touched). If you do that, then double-check that it works even if the command
> is being run under 'as'.
I'd prefer a more explicit method for passing state between the different
stages.
Mmm, perhaps we should introduce a state parameter, but for now, everything
uses non-numeric keys in cmdline :-)
I guess I was using commands that had not been cleaned up as
examples.
All the more reason for me to have a spring^Wsummer clean soon :-)
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
6:25 p.m.
New subject: [PATCH 5/5] Merge cp_r and cp_lr into copy_dir
It has a flag for whether to hardlink.
---
lib/gitano/repository.lua | 9 ++++----
lib/gitano/util.lua | 56 ++++++++++-----------------------------------
2 files changed, 17 insertions(+), 48 deletions(-)
diff --git a/lib/gitano/repository.lua b/lib/gitano/repository.lua
index 877e43c..55bb2c3 100644
--- a/lib/gitano/repository.lua
+++ b/lib/gitano/repository.lua
@@ -533,8 +533,9 @@ function repo_method:copy_to(somename)
if filename == "." or filename == ".." then
-- skip
elseif filename == "objects" then
- local ok, err = util.cp_lr(from .. '/objects',
- newpath .. '/objects')
+ local ok, err = util.copy_dir(from .. '/objects',
+ newpath .. '/objects',
+ true)
if not ok then
return ok, err
end
@@ -551,8 +552,8 @@ function repo_method:copy_to(somename)
return false, err
end
elseif fileinfo.d_type == luxio.DT_DIR then
- local ok, err = util.cp_r(from .. '/' .. filename,
- newpath .. '/' .. filename)
+ local ok, err = util.copy_dir(from .. '/' .. filename,
+ newpath .. '/' .. filename)
if not ok then
return false, err
end
diff --git a/lib/gitano/util.lua b/lib/gitano/util.lua
index 8586590..fda58c7 100644
--- a/lib/gitano/util.lua
+++ b/lib/gitano/util.lua
@@ -223,7 +223,7 @@ local function copy_symlink(from, to)
return true
end
-local function cp_lr(from, to)
+local function copy_dir(from, to, hardlink)
local ret, err, dirp
ret, err = mkdir_p(to)
if not ret then
@@ -237,46 +237,14 @@ local function cp_lr(from, to)
if filename == "." or filename == ".." then
-- skip
elseif fileinfo.d_type == luxio.DT_REG then
- ret, err = luxio.link(from .. '/' .. filename,
- to .. '/' .. filename)
- if ret ~= 0 then
- return false, luxio.strerror(err)
+ if hardlink then
+ ret, err = luxio.link(from .. '/' .. filename,
+ to .. '/' .. filename)
+ ret, err = ret ~= 0, luxio.strerror(err)
+ else
+ ret, err = copy_file(from .. '/' .. filename,
+ to .. '/' .. filename)
end
- elseif fileinfo.d_type == luxio.DT_LNK then
- ret, err = copy_symlink(from .. '/' .. filename,
- to .. '/' .. filename)
- if not ret then
- return false, err
- end
- elseif fileinfo.d_type == luxio.DT_DIR then
- ret, err = cp_lr(from .. '/' .. filename,
- to .. '/' .. filename)
- if not ret then
- return ret, err
- end
- else
- return false, ("Unsupported file type %d"):format(fileinfo.d_type)
- end
- end
- return true
-end
-
-local function cp_r(from, to)
- local ret, err, dirp
- ret, err = mkdir_p(to)
- if not ret then
- return ret, err
- end
- dirp, err, ret = sio.opendir(from)
- if not dirp then
- return ret, err
- end
- for filename, fileinfo in dirp:iterate() do
- if filename == "." or filename == ".." then
- -- skip
- elseif fileinfo.d_type == luxio.DT_REG then
- ret, err = copy_file(from .. '/' .. filename,
- to .. '/' .. filename)
if not ret then
return false, err
end
@@ -287,8 +255,9 @@ local function cp_r(from, to)
return false, err
end
elseif fileinfo.d_type == luxio.DT_DIR then
- ret, err = cp_r(from .. '/' .. filename,
- to .. '/' .. filename)
+ ret, err = copy_dir(from .. '/' .. filename,
+ to .. '/' .. filename,
+ hardlink)
if not ret then
return ret, err
end
@@ -445,8 +414,7 @@ return {
copy_file = copy_file,
mkdir_p = mkdir_p,
rm_rf = rm_rf,
- cp_lr = cp_lr,
- cp_r = cp_r,
+ copy_dir = copy_dir,
html_escape = html_escape,
--
1.7.9.5
10:57 p.m.
New subject: [PATCH 5/5] Merge cp_r and cp_lr into copy_dir
On Sun, May 12, 2013 at 05:25:47PM +0100, Richard Maw wrote:
It has a flag for whether to hardlink.
I'd prefer to see this properly folded into the other patches, and ideally as a
higher-order function rather than a true/false argument. That way if btrfs
reflinks were plausible in the future, we could do them easily. Otherwise it's
nice to see this cleanup; but since I'd like to move to a proper review
process, we may as well ensure we organise patches neatly instead.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
10:31 p.m.
New subject: [PATCH 5/5] Merge cp_r and cp_lr into copy_dir
On Mon, May 13, 2013 at 09:57:56PM +0100, Daniel Silverstone wrote:
I'd prefer to see this properly folded into the other patches,
and ideally as a
higher-order function rather than a true/false argument. That way if btrfs
reflinks were plausible in the future, we could do them easily. Otherwise it's
nice to see this cleanup; but since I'd like to move to a proper review
process, we may as well ensure we organise patches neatly instead.
Yeah, I didn't expect it to be ready now, but I needed the feedback for morale
purposes.
9:25 a.m.
New subject: [PATCH 5/5] Merge cp_r and cp_lr into copy_dir
On Thu, May 16, 2013 at 09:31:15PM +0100, Richard Maw wrote:
Yeah, I didn't expect it to be ready now, but I needed the
feedback for morale
purposes.
Well, overall I'm impressed with the patch series. Just a few simple
cleanups/fixes and it should be in a state to merge.
Then I can get you to review my patches too :-)
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
3857
days inactive
3862
days old
15 comments
2 participants
participants (2)
-
Daniel Silverstone -
Richard Maw