[PATCH v3 10/12] files-backend: make reflog iterator go through per-worktree reflog
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Apr 19, 2017, 11:01 UTC
- Message-ID
- <20170419110145.5086-11-pclouds@gmail.com>
- In-Reply-To
- <20170419110145.5086-1-pclouds@gmail.com>
refs/bisect is unfortunately per-worktree, so we need to look in per-worktree logs/refs/bisect in addition to per-repo logs/refs. The current iterator only goes through per-repo logs/refs.
Ideally we should have something like merge_ref_iterator_begin (and maybe with a predicate), but for dir_iterator. Since there's only one use case for this pattern, let's not add a bunch more code for merge_dir_iterator_begin just yet.
PS. Note the unsorted order of for_each_reflog in the test. This is supposed to be OK, for now. If we enforce order on for_each_reflog() then some more work will be required.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- refs/files-backend.c | 46 ++++++++++++++++++++++++++++++++----------- t/t1407-worktree-ref-store.sh | 30 ++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 11 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c index 4149943a6e..fce380679c 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1171,15 +1171,6 @@ static void files_reflog_path(struct files_ref_store *refs, struct strbuf *sb, const char *refname) { - if (!refname) { - /* - * FIXME: of course this is wrong in multi worktree - * setting. To be fixed real soon. - */ - strbuf_addf(sb, "%s/logs", refs->gitcommondir); - return; - } - switch (ref_type(refname)) { case REF_TYPE_PER_WORKTREE: case REF_TYPE_PSEUDOREF: @@ -3368,6 +3359,7 @@ struct files_reflog_iterator { struct ref_store *ref_store; struct dir_iterator *dir_iterator; + struct dir_iterator *worktree_dir_iterator; struct object_id oid; }; @@ -3388,6 +3380,21 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator) if (ends_with(diter->basename, ".lock")) continue; + if (iter->worktree_dir_iterator) { + const char *refname = diter->relative_path; + + switch (ref_type(refname)) { + case REF_TYPE_PER_WORKTREE: + case REF_TYPE_PSEUDOREF: + continue; + case REF_TYPE_NORMAL: + break; + default: + die("BUG: unknown ref type %d of ref %s", + ref_type(refname), refname); + } + } + if (refs_read_ref_full(iter->ref_store, diter->relative_path, 0, iter->oid.hash, &flags)) { @@ -3401,7 +3408,11 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator) return ITER_OK; } - iter->dir_iterator = NULL; + iter->dir_iterator = iter->worktree_dir_iterator; + if (iter->worktree_dir_iterator) { + iter->worktree_dir_iterator = NULL; + return files_reflog_iterator_advance(ref_iterator); + } if (ref_iterator_abort(ref_iterator) == ITER_ERROR) ok = ITER_ERROR; return ok; @@ -3422,6 +3433,12 @@ static int files_reflog_iterator_abort(struct ref_iterator *ref_iterator) if (iter->dir_iterator) ok = dir_iterator_abort(iter->dir_iterator); + if (iter->worktree_dir_iterator) { + int ok2 = dir_iterator_abort(iter->worktree_dir_iterator); + if (ok2 == ITER_ERROR) + ok = ok2; + } + base_ref_iterator_free(ref_iterator); return ok; } @@ -3442,10 +3459,17 @@ static struct ref_iterator *files_reflog_iterator_begin(struct ref_store *ref_st struct strbuf sb = STRBUF_INIT; base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable); - files_reflog_path(refs, &sb, NULL); + strbuf_addf(&sb, "%s/logs", refs->gitcommondir); iter->dir_iterator = dir_iterator_begin(sb.buf); iter->ref_store = ref_store; strbuf_release(&sb); + + if (strcmp(refs->gitdir, refs->gitcommondir)) { + strbuf_addf(&sb, "%s/logs", refs->gitdir); + iter->worktree_dir_iterator = dir_iterator_begin(sb.buf); + strbuf_release(&sb); + } + return ref_iterator; } diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh index 5df06f3556..8842d0329f 100755 --- a/t/t1407-worktree-ref-store.sh +++ b/t/t1407-worktree-ref-store.sh @@ -49,4 +49,34 @@ test_expect_success 'create_symref(FOO, refs/heads/master)' ' test_cmp expected actual ' +test_expect_success 'for_each_reflog()' ' + echo $_z40 > .git/logs/PSEUDO-MAIN && + mkdir -p .git/logs/refs/bisect && + echo $_z40 > .git/logs/refs/bisect/random && + + echo $_z40 > .git/worktrees/wt/logs/PSEUDO-WT && + mkdir -p .git/worktrees/wt/logs/refs/bisect && + echo $_z40 > .git/worktrees/wt/logs/refs/bisect/wt-random && + + $RWT for-each-reflog | cut -c 42- | sort >actual && + cat >expected <<-\EOF && + HEAD 0x1 + PSEUDO-WT 0x0 + refs/bisect/wt-random 0x0 + refs/heads/master 0x0 + refs/heads/wt-master 0x0 + EOF + test_cmp expected actual && + + $RMAIN for-each-reflog | cut -c 42- | sort >actual && + cat >expected <<-\EOF && + HEAD 0x1 + PSEUDO-MAIN 0x0 + refs/bisect/random 0x0 + refs/heads/master 0x0 + refs/heads/wt-master 0x0 + EOF + test_cmp expected actual +' + test_done
-- 2.11.0.157.gd943d85