10:41 a.m.
Repo: git://git.gitano.org.uk/personal/richardmaw/gitano.git
Ref: yarns
Sha1: 777046e0b2d5451a47536d7c5c5e71ebea1f1e26
There's more server-side copy behaviour to test,
but I thought I'd send what I have now while I have time.
There's something a little weird going on with `$GTT serverlocation`
as it wasn't giving me the path with .git suffixed by itself,
but I wasn't sure whether I had time to look at it at the time,
so the fsck check unconditionally adds it for now.
Richard Maw (2):
util.copy_dir: Make more tolerant to DT_UNKNOWN
yarns: Test basic server side copy behaviour
lib/gitano/util.lua | 38 +++++++++++++++++++-------------------
testing/02-commands-copy.yarn | 24 ++++++++++++++++++++++++
testing/library.yarn | 10 ++++++++--
3 files changed, 51 insertions(+), 21 deletions(-)
--
1.9.1
10:41 a.m.
New subject: [PATCH 1/2] util.copy_dir: Make more tolerant to DT_UNKNOWN
---
lib/gitano/util.lua | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/lib/gitano/util.lua b/lib/gitano/util.lua
index a07b410..dd40eb3 100644
--- a/lib/gitano/util.lua
+++ b/lib/gitano/util.lua
@@ -299,23 +299,6 @@ end
local _exclude_builtin = { ["."] = true, [".."] = true }
local copy_dir_filter_base = copy_pathname_filter(_exclude_builtin)
-local function gen_cb(cbs, ftype, fname)
- if ftype == luxio.DT_UNKNOWN then
- local statdata, err = sio.lstat(fname)
- if not statdata then
- return nil, err
- end
- if luxio.S_ISDIR(statdata.mode) ~= 0 then
- ftype = luxio.DT_DIR
- elseif luxio.S_ISLNK(statdata.mode) ~= 0 then
- ftype = luxio.DT_LNK
- elseif luxio.S_ISREG(statdata.mode) ~= 0 then
- ftype = luxio.DT_REG
- end
- end
- return cbs[ftype], "No callback provided"
-end
-
local copy_dir_copy_callbacks
-- filter_cb is a function, which takes (parent_path, filename, fileinfo)
-- and returns true if the component should not be copied
@@ -335,10 +318,27 @@ local function copy_dir(from, to, copy_cbs, filter_cb)
end
for filename, fileinfo in dirp:iterate() do
local filefrom = path_join(from, filename)
+ if fileinfo.d_type == luxio.DT_UNKNOWN then
+ -- Stat and translate mode to type if type unknown
+ local stat, err = sio.lstat(filefrom)
+ if not stat then
+ log.critical("Stat file", filefrom, "failed:", err)
+ return false, err
+ end
+ fileinfo.d_type = ({
+ [luxio.S_IFBLK] = luxio.DT_BLK,
+ [luxio.S_IFCHR] = luxio.DT_CHR,
+ [luxio.S_IFDIR] = luxio.DT_DIR,
+ [luxio.S_IFIFO] = luxio.DT_FIFO,
+ [luxio.S_IFLNK] = luxio.DT_LNK,
+ [luxio.S_IFREG] = luxio.DT_REG,
+ [luxio.S_IFSOCK] = luxio.DT_SOCK,
+ })[luxio.bit.band(stat.mode, luxio.S_IFMT)]
+ end
local fileto = path_join(to, filename)
- local copycb, err = gen_cb(copy_cbs, fileinfo.d_type, filefrom)
+ local copycb = copy_cbs[fileinfo.d_type]
if not copycb then
- return false, err
+ return false, "No callback provided"
end
if filter_cb(from, filename, fileinfo) then
log.ddebug("Skipping file", filename)
--
1.9.1
10:41 a.m.
New subject: [PATCH 2/2] yarns: Test basic server side copy behaviour
---
testing/02-commands-copy.yarn | 24 ++++++++++++++++++++++++
testing/library.yarn | 10 ++++++++--
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/testing/02-commands-copy.yarn b/testing/02-commands-copy.yarn
index f282cb0..ee5c48f 100644
--- a/testing/02-commands-copy.yarn
+++ b/testing/02-commands-copy.yarn
@@ -1 +1,25 @@
<!-- -*- markdown -*- -->
+
+You may want to copy a repository from one place on the server
+to another place on the same server,
+since access control is repository based
+and another user of the server may want to push their own branches.
+
+This can be accomplished by:
+
+1. Creating the destination repository.
+2. Cloning the source repository locally.
+3. Pushing the local clone to the destination repository.
+
+This requires many round trips
+and sending the entire repository's contents across the internet twice,
+so there's use for server-side clone operation.
+
+ SCENARIO server-side clone
+ GIVEN a standard instance
+
+Users may copy repositories they can read to paths they can write to.
+
+ WHEN testinstance adminkey runs copy gitano-admin public/testrepo
+ THEN server-side public/testrepo has identical refs to gitano-admin
+ AND server-side public/testrepo has no missing objects
diff --git a/testing/library.yarn b/testing/library.yarn
index bda2aa5..a0bb6e2 100644
--- a/testing/library.yarn
+++ b/testing/library.yarn
@@ -40,10 +40,16 @@ Repository access
Server-side repository checking for behind-the-scenes work
----------------------------------------------------------
- IMPLEMENTS THEN server-side ([^ ]+) file ([^ ]+) contains (.+)
- cd "$($GTT serverlocation $MATCH_1)"
+ IMPLEMENTS THEN server-side ([^ ]+) file ([^ ]+) contains (.+)
+ cd "$($GTT serverlocation $MATCH_1)"
grep -q "$MATCH_3" "$MATCH_2"
+ IMPLEMENTS THEN server-side ([^ ]+) has identical refs to ([^ ]+)
+ bash -c 'diff -u <(git ls-remote -ht "$($GTT serverlocation
"$MATCH_1")" | sort -k2) <(git ls-remote -ht "$($GTT serverlocation
"$MATCH_2")" | sort -k2)'
+
+ IMPLEMENTS THEN server-side ([^ ]+) has no missing objects
+ cd "$($GTT serverlocation $MATCH_1)".git
+ git fsck
Clone manipulation
------------------
--
1.9.1
4:32 a.m.
On Tue, Jan 05, 2016 at 15:41:21 +0000, Richard Maw wrote:
Repo: git://git.gitano.org.uk/personal/richardmaw/gitano.git
Ref: yarns
Sha1: 777046e0b2d5451a47536d7c5c5e71ebea1f1e26
Some of the intentation in the implements looked odd, but "meh"
merged.
Sorry for the delay.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
2676
days inactive
2704
days old
3 comments
2 participants
participants (2)
-
Daniel Silverstone -
Richard Maw