Re: [PATCH v4 3/5] refs: introduce get_worktree_ref_store()
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Apr 22, 2017, 04:52 UTC
- Message-ID
- <75cc95f4-d3e9-d483-ce9a-74cc1a356477@alum.mit.edu>
- In-Reply-To
- <20170404102123.25315-4-pclouds@gmail.com>
On 04/04/2017 12:21 PM, Nguyễn Thái Ngọc Duy wrote:
Show 51 quoted lines
> files-backend at this point is still aware of the per-repo/worktree
> separation in refs, so it can handle a linked worktree.
>
> Some refs operations are known not working when current files-backend is
> used in a linked worktree (e.g. reflog). Tests will be written when
> refs_* functions start to be called with worktree backend to verify that
> they work as expected.
>
> Note: accessing a worktree of a submodule remains unaddressed. Perhaps
> after get_worktrees() can access submodule (or rather a new function
> get_submodule_worktrees(), that lists worktrees of a submodule), we can
> update this function to work with submodules as well.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> refs.c | 31 +++++++++++++++++++++++++++++++
> refs.h | 2 ++
> 2 files changed, 33 insertions(+)
>
> diff --git a/refs.c b/refs.c
> index 875e30a0b8..a4083caf6a 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -10,6 +10,7 @@
> #include "object.h"
> #include "tag.h"
> #include "submodule.h"
> +#include "worktree.h"
>
> /*
> * List of all available backends
> @@ -1486,6 +1487,9 @@ static struct ref_store *main_ref_store;
> /* A hashmap of ref_stores, stored by submodule name: */
> static struct hashmap submodule_ref_stores;
>
> +/* A hashmap of ref_stores, stored by worktree id: */
> +static struct hashmap worktree_ref_stores;
> +
> /*
> * Look up a ref store by name. If that ref_store hasn't been
> * registered yet, return NULL.
> @@ -1590,6 +1594,33 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
> return refs;
> }
>
> +struct ref_store *get_worktree_ref_store(const struct worktree *wt)
> +{
> + struct ref_store *refs;
> + unsigned int refs_all_capabilities =
> + REF_STORE_READ | REF_STORE_WRITE |
> + REF_STORE_ODB | REF_STORE_MAIN;This constant appears another place, too. It might make sense to define a constant `REF_STORE_ALL_CAPABILITIES` in `refs-internal.h` alongside the individual bit values.
If you prefer not to, please at least declare this variable `const` to spare the reader the trouble of looking to see whether it is modified before it is used.
Otherwise, looks fine to me.
> [...]
Michael