| Message ID | 20181209200449.16342-3-t.gummerer@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | introduce no-overlay and cached mode in git checkout | expand |
On Sun, Dec 9, 2018 at 9:05 PM Thomas Gummerer <t.gummerer@gmail.com> wrote: > > Factor out the 'unlink_entry()' function from unpack-trees.c to > entry.c. It will be used in other places as well in subsequent > steps. > > As it's no longer a static function, also move the documentation to > the header file to make it more discoverable. > > Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> > --- > cache.h | 5 +++++ > entry.c | 15 +++++++++++++++ > unpack-trees.c | 19 ------------------- > 3 files changed, 20 insertions(+), 19 deletions(-) > > diff --git a/cache.h b/cache.h > index ca36b44ee0..c1c953e810 100644 > --- a/cache.h > +++ b/cache.h > @@ -1542,6 +1542,11 @@ struct checkout { > extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath); > extern void enable_delayed_checkout(struct checkout *state); > extern int finish_delayed_checkout(struct checkout *state); > +/* > + * Unlink the last component and schedule the leading directories for > + * removal, such that empty directories get removed. > + */ > +extern void unlink_entry(const struct cache_entry *ce); I'm torn. We try to remove 'extern' but I can see you may want to add it here to be consistent with others. And removing extern even from functions from entry.c only would cause some conflicts. I wonder if we should move the 'removal' variable in symlinks to 'struct checkout' to reduce another global variable. But I guess that's the problem for another day. It's not the focus of this series.
On Mon, Dec 10, 2018 at 7:50 AM Duy Nguyen <pclouds@gmail.com> wrote: > > On Sun, Dec 9, 2018 at 9:05 PM Thomas Gummerer <t.gummerer@gmail.com> wrote: > > > > Factor out the 'unlink_entry()' function from unpack-trees.c to > > entry.c. It will be used in other places as well in subsequent > > steps. > > > > As it's no longer a static function, also move the documentation to > > the header file to make it more discoverable. I also started using unlink_entry() in another place in a local patch series that I haven't submitted yet (and which I need to get back to at some point). So this will help me too. :-) > > Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> > > --- > > cache.h | 5 +++++ > > entry.c | 15 +++++++++++++++ > > unpack-trees.c | 19 ------------------- > > 3 files changed, 20 insertions(+), 19 deletions(-) > > > > diff --git a/cache.h b/cache.h > > index ca36b44ee0..c1c953e810 100644 > > --- a/cache.h > > +++ b/cache.h > > @@ -1542,6 +1542,11 @@ struct checkout { > > extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath); > > extern void enable_delayed_checkout(struct checkout *state); > > extern int finish_delayed_checkout(struct checkout *state); > > +/* > > + * Unlink the last component and schedule the leading directories for > > + * removal, such that empty directories get removed. > > + */ > > +extern void unlink_entry(const struct cache_entry *ce); > > I'm torn. We try to remove 'extern' but I can see you may want to add > it here to be consistent with others. And removing extern even from > functions from entry.c only would cause some conflicts. > > I wonder if we should move the 'removal' variable in symlinks to > 'struct checkout' to reduce another global variable. But I guess > that's the problem for another day. It's not the focus of this series. "move the 'removal' variable in symlinks"? I'm having a really hard time parsing that phrase and the sentence it's embedded in. Could you reword for me Duy?
On Mon, Dec 10, 2018 at 6:23 PM Elijah Newren <newren@gmail.com> wrote: > > I wonder if we should move the 'removal' variable in symlinks to > > 'struct checkout' to reduce another global variable. But I guess > > that's the problem for another day. It's not the focus of this series. > > "move the 'removal' variable in symlinks"? I'm having a really hard > time parsing that phrase and the sentence it's embedded in. Could you > reword for me Duy? Sorry s/in symlinks/&.c/. There's a global variable named 'removal' in symlinks.c which is used by schedule_dir_for_removal() and this function in turn is used by unlink_entry().
Duy Nguyen <pclouds@gmail.com> writes: > I wonder if we should move the 'removal' variable in symlinks to > 'struct checkout' to reduce another global variable. But I guess > that's the problem for another day. It's not the focus of this series. Before any such move, I think it is important to notice that the thing is not thread friendly and devise a way to deal with it.
On 12/10, Duy Nguyen wrote: > On Sun, Dec 9, 2018 at 9:05 PM Thomas Gummerer <t.gummerer@gmail.com> wrote: > > > > Factor out the 'unlink_entry()' function from unpack-trees.c to > > entry.c. It will be used in other places as well in subsequent > > steps. > > > > As it's no longer a static function, also move the documentation to > > the header file to make it more discoverable. > > > > Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> > > --- > > cache.h | 5 +++++ > > entry.c | 15 +++++++++++++++ > > unpack-trees.c | 19 ------------------- > > 3 files changed, 20 insertions(+), 19 deletions(-) > > > > diff --git a/cache.h b/cache.h > > index ca36b44ee0..c1c953e810 100644 > > --- a/cache.h > > +++ b/cache.h > > @@ -1542,6 +1542,11 @@ struct checkout { > > extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath); > > extern void enable_delayed_checkout(struct checkout *state); > > extern int finish_delayed_checkout(struct checkout *state); > > +/* > > + * Unlink the last component and schedule the leading directories for > > + * removal, such that empty directories get removed. > > + */ > > +extern void unlink_entry(const struct cache_entry *ce); > > I'm torn. We try to remove 'extern' but I can see you may want to add > it here to be consistent with others. And removing extern even from > functions from entry.c only would cause some conflicts. Yeah I felt like favoring consistency here would be better. Once your path counting series and my series land, this may get quieter and we can remove the 'extern' then? > I wonder if we should move the 'removal' variable in symlinks to > 'struct checkout' to reduce another global variable. But I guess > that's the problem for another day. It's not the focus of this > series. Yeah, I'd prefer leaving that for another day :) > -- > Duy
diff --git a/cache.h b/cache.h index ca36b44ee0..c1c953e810 100644 --- a/cache.h +++ b/cache.h @@ -1542,6 +1542,11 @@ struct checkout { extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath); extern void enable_delayed_checkout(struct checkout *state); extern int finish_delayed_checkout(struct checkout *state); +/* + * Unlink the last component and schedule the leading directories for + * removal, such that empty directories get removed. + */ +extern void unlink_entry(const struct cache_entry *ce); struct cache_def { struct strbuf path; diff --git a/entry.c b/entry.c index 5d136c5d55..3ec148ceee 100644 --- a/entry.c +++ b/entry.c @@ -508,3 +508,18 @@ int checkout_entry(struct cache_entry *ce, create_directories(path.buf, path.len, state); return write_entry(ce, path.buf, state, 0); } + +void unlink_entry(const struct cache_entry *ce) +{ + const struct submodule *sub = submodule_from_ce(ce); + if (sub) { + /* state.force is set at the caller. */ + submodule_move_head(ce->name, "HEAD", NULL, + SUBMODULE_MOVE_HEAD_FORCE); + } + if (!check_leading_path(ce->name, ce_namelen(ce))) + return; + if (remove_or_warn(ce->ce_mode, ce->name)) + return; + schedule_dir_for_removal(ce->name, ce_namelen(ce)); +} diff --git a/unpack-trees.c b/unpack-trees.c index 7570df481b..e8d1a6ac50 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -300,25 +300,6 @@ static void load_gitmodules_file(struct index_state *index, } } -/* - * Unlink the last component and schedule the leading directories for - * removal, such that empty directories get removed. - */ -static void unlink_entry(const struct cache_entry *ce) -{ - const struct submodule *sub = submodule_from_ce(ce); - if (sub) { - /* state.force is set at the caller. */ - submodule_move_head(ce->name, "HEAD", NULL, - SUBMODULE_MOVE_HEAD_FORCE); - } - if (!check_leading_path(ce->name, ce_namelen(ce))) - return; - if (remove_or_warn(ce->ce_mode, ce->name)) - return; - schedule_dir_for_removal(ce->name, ce_namelen(ce)); -} - static struct progress *get_progress(struct unpack_trees_options *o) { unsigned cnt = 0, total = 0;
Factor out the 'unlink_entry()' function from unpack-trees.c to entry.c. It will be used in other places as well in subsequent steps. As it's no longer a static function, also move the documentation to the header file to make it more discoverable. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> --- cache.h | 5 +++++ entry.c | 15 +++++++++++++++ unpack-trees.c | 19 ------------------- 3 files changed, 20 insertions(+), 19 deletions(-)