From: Matheus Tavares Bernardino <matheus.bernardino@usp.br>
To: Duy Nguyen <pclouds@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Thomas Gummerer" <t.gummerer@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [WIP RFC PATCH v2 4/5] clone: extract function from copy_or_link_directory
Date: Wed, 27 Feb 2019 14:30:27 -0300 [thread overview]
Message-ID: <CAHd-oW5aOf+TE_AeA=VkaZUt7LTeSK_buojsEgb3NYMVVm1B_g@mail.gmail.com> (raw)
In-Reply-To: <CACsJy8BztC=GNuPU_CuLbPSmhsjrSk8MmkyeK6ahgjEOzY=yOQ@mail.gmail.com>
On Tue, Feb 26, 2019 at 9:18 AM Duy Nguyen <pclouds@gmail.com> wrote:
>
> On Tue, Feb 26, 2019 at 12:18 PM Matheus Tavares
> <matheus.bernardino@usp.br> wrote:
> >
> > Extract dir creation code snippet from copy_or_link_directory to its own
> > function named mkdir_if_missing. This change will help removing
> > copy_or_link_directory's explicit recursion, which will be done in a
> > following patch. Also makes code more readable.
> >
> > Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
> > ---
> > builtin/clone.c | 27 +++++++++++++++++++--------
> > 1 file changed, 19 insertions(+), 8 deletions(-)
> >
> > diff --git a/builtin/clone.c b/builtin/clone.c
> > index cae069f03b..fd580fa98d 100644
> > --- a/builtin/clone.c
> > +++ b/builtin/clone.c
> > @@ -392,6 +392,24 @@ static void copy_alternates(struct strbuf *src, struct strbuf *dst,
> > fclose(in);
> > }
> >
> > +static void mkdir_if_missing(const char *pathname, mode_t mode)
> > +{
> > + /*
> > + * Create a dir at pathname unless there's already one.
>
> This confused me for a second because I thought it described "st"
> variable. I think we usually put the description of the function on
> top (before the "void mkdir_if.." line). But with a such a short
> function and clear name like this, I don't think we need any comments.
>
Yes, I also don't like the description being after the function
declaration, but I did this to follow the pattern from other functions
on the same file (e.g. copy_alternates). Anyway, I do agree with you
that this function don't need a description, so I'm removing it for
the next version. Thanks!
> > + */
> > + struct stat st;
> > +
> > + if (mkdir(pathname, mode)) {
>
> Good opportunity to unindent this by doing
>
> if (!mkdir(...
> return;
>
> but it's up to you.
>
Ok. But being such a small snippet, is the indentation really a code
smell here? (sorry, I'm still getting used to git's coding guidelines)
> > + if (errno != EEXIST)
> > + die_errno(_("failed to create directory '%s'"),
> > + pathname);
> > + else if (stat(pathname, &st))
> > + die_errno(_("failed to stat '%s'"), pathname);
> > + else if (!S_ISDIR(st.st_mode))
> > + die(_("%s exists and is not a directory"), pathname);
> > + }
> > +}
> > +
> > static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest,
> > const char *src_repo, int src_baselen)
> > {
> > @@ -404,14 +422,7 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest,
> > if (!dir)
> > die_errno(_("failed to open '%s'"), src->buf);
> >
> > - if (mkdir(dest->buf, 0777)) {
> > - if (errno != EEXIST)
> > - die_errno(_("failed to create directory '%s'"), dest->buf);
> > - else if (stat(dest->buf, &buf))
> > - die_errno(_("failed to stat '%s'"), dest->buf);
> > - else if (!S_ISDIR(buf.st_mode))
> > - die(_("%s exists and is not a directory"), dest->buf);
> > - }
> > + mkdir_if_missing(dest->buf, 0777);
> >
> > strbuf_addch(src, '/');
> > src_len = src->len;
> > --
> > 2.20.1
> >
>
>
> --
> Duy
next prev parent reply other threads:[~2019-02-27 17:30 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 5:17 [WIP RFC PATCH v2 0/5] clone: dir iterator refactoring with tests Matheus Tavares
2019-02-26 5:18 ` [WIP RFC PATCH v2 1/5] dir-iterator: add flags parameter to dir_iterator_begin Matheus Tavares
2019-02-26 12:01 ` Duy Nguyen
2019-02-27 13:59 ` Matheus Tavares Bernardino
2019-02-26 5:18 ` [WIP RFC PATCH v2 2/5] clone: test for our behavior on odd objects/* content Matheus Tavares
2019-02-26 5:18 ` [WIP RFC PATCH v2 3/5] clone: copy hidden paths at local clone Matheus Tavares
2019-02-26 12:13 ` Duy Nguyen
2019-02-26 5:18 ` [WIP RFC PATCH v2 4/5] clone: extract function from copy_or_link_directory Matheus Tavares
2019-02-26 12:18 ` Duy Nguyen
2019-02-27 17:30 ` Matheus Tavares Bernardino [this message]
2019-02-27 22:45 ` Thomas Gummerer
2019-02-27 22:50 ` Matheus Tavares Bernardino
2019-02-26 5:18 ` [WIP RFC PATCH v2 5/5] clone: use dir-iterator to avoid explicit dir traversal Matheus Tavares
2019-02-26 11:35 ` Ævar Arnfjörð Bjarmason
2019-02-26 12:32 ` Duy Nguyen
2019-02-26 12:50 ` Ævar Arnfjörð Bjarmason
2019-02-27 17:40 ` Matheus Tavares Bernardino
2019-02-28 7:13 ` Duy Nguyen
2019-02-28 7:53 ` Ævar Arnfjörð Bjarmason
2019-02-26 11:36 ` [WIP RFC PATCH v2 0/5] clone: dir iterator refactoring with tests Ævar Arnfjörð Bjarmason
2019-02-26 12:20 ` Duy Nguyen
2019-02-26 12:28 ` [RFC PATCH v3 " Ævar Arnfjörð Bjarmason
2019-02-26 20:56 ` Matheus Tavares Bernardino
2019-03-22 23:22 ` [GSoC][PATCH v4 0/7] clone: dir-iterator " Matheus Tavares
2019-03-22 23:22 ` [GSoC][PATCH v4 1/7] clone: test for our behavior on odd objects/* content Matheus Tavares
2019-03-24 18:09 ` Matheus Tavares Bernardino
2019-03-24 20:56 ` SZEDER Gábor
2019-03-26 19:43 ` Matheus Tavares Bernardino
2019-03-28 21:49 ` Thomas Gummerer
2019-03-29 14:06 ` Matheus Tavares Bernardino
2019-03-29 19:31 ` Thomas Gummerer
2019-03-29 19:42 ` SZEDER Gábor
2019-03-30 2:49 ` Matheus Tavares Bernardino
2019-03-22 23:22 ` [GSoC][PATCH v4 2/7] clone: better handle symlinked files at .git/objects/ Matheus Tavares
2019-03-28 22:10 ` Thomas Gummerer
2019-03-29 8:38 ` Ævar Arnfjörð Bjarmason
2019-03-29 20:15 ` Thomas Gummerer
2019-03-29 14:27 ` Matheus Tavares Bernardino
2019-03-29 20:05 ` Thomas Gummerer
2019-03-30 5:32 ` Matheus Tavares Bernardino
2019-03-30 19:27 ` Thomas Gummerer
2019-04-01 3:56 ` Matheus Tavares Bernardino
2019-03-29 15:40 ` Johannes Schindelin
2019-03-22 23:22 ` [GSoC][PATCH v4 3/7] dir-iterator: add flags parameter to dir_iterator_begin Matheus Tavares
2019-03-28 22:19 ` Thomas Gummerer
2019-03-29 13:16 ` Matheus Tavares Bernardino
2019-03-22 23:22 ` [GSoC][PATCH v4 4/7] clone: copy hidden paths at local clone Matheus Tavares
2019-03-22 23:22 ` [GSoC][PATCH v4 5/7] clone: extract function from copy_or_link_directory Matheus Tavares
2019-03-22 23:22 ` [GSoC][PATCH v4 6/7] clone: use dir-iterator to avoid explicit dir traversal Matheus Tavares
2019-03-22 23:22 ` [GSoC][PATCH v4 7/7] clone: Replace strcmp by fspathcmp Matheus Tavares
2019-03-30 22:49 ` [GSoC][PATCH v5 0/7] clone: dir-iterator refactoring with tests Matheus Tavares
2019-03-30 22:49 ` [GSoC][PATCH v5 1/7] clone: test for our behavior on odd objects/* content Matheus Tavares
2019-03-30 22:49 ` [GSoC][PATCH v5 2/7] clone: better handle symlinked files at .git/objects/ Matheus Tavares
2019-03-31 17:40 ` Thomas Gummerer
2019-04-01 3:59 ` Matheus Tavares Bernardino
2019-03-30 22:49 ` [GSoC][PATCH v5 3/7] dir-iterator: add flags parameter to dir_iterator_begin Matheus Tavares
2019-03-31 18:12 ` Thomas Gummerer
2019-04-10 20:24 ` Matheus Tavares Bernardino
2019-04-11 21:09 ` Thomas Gummerer
2019-04-23 17:07 ` Matheus Tavares Bernardino
2019-04-24 18:36 ` Thomas Gummerer
2019-04-26 4:13 ` Matheus Tavares Bernardino
2019-03-30 22:49 ` [GSoC][PATCH v5 4/7] clone: copy hidden paths at local clone Matheus Tavares
2019-03-30 22:49 ` [GSoC][PATCH v5 5/7] clone: extract function from copy_or_link_directory Matheus Tavares
2019-03-30 22:49 ` [GSoC][PATCH v5 6/7] clone: use dir-iterator to avoid explicit dir traversal Matheus Tavares
2019-03-30 22:49 ` [GSoC][PATCH v5 7/7] clone: replace strcmp by fspathcmp Matheus Tavares
2019-03-31 18:16 ` [GSoC][PATCH v5 0/7] clone: dir-iterator refactoring with tests Thomas Gummerer
2019-04-01 13:56 ` Matheus Tavares Bernardino
2019-05-02 14:48 ` [GSoC][PATCH v6 00/10] " Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 01/10] clone: test for our behavior on odd objects/* content Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 02/10] clone: better handle symlinked files at .git/objects/ Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 03/10] dir-iterator: add tests for dir-iterator API Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 04/10] dir-iterator: use warning_errno when possible Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 05/10] dir-iterator: refactor state machine model Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 06/10] dir-iterator: add flags parameter to dir_iterator_begin Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 07/10] clone: copy hidden paths at local clone Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 08/10] clone: extract function from copy_or_link_directory Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 09/10] clone: use dir-iterator to avoid explicit dir traversal Matheus Tavares
2019-05-02 14:48 ` [GSoC][PATCH v6 10/10] clone: replace strcmp by fspathcmp Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 00/10] clone: dir-iterator refactoring with tests Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 01/10] clone: test for our behavior on odd objects/* content Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 02/10] clone: better handle symlinked files at .git/objects/ Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 03/10] dir-iterator: add tests for dir-iterator API Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 04/10] dir-iterator: use warning_errno when possible Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 05/10] dir-iterator: refactor state machine model Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 06/10] dir-iterator: add flags parameter to dir_iterator_begin Matheus Tavares
2019-06-25 18:00 ` Junio C Hamano
2019-06-25 18:11 ` Matheus Tavares Bernardino
2019-06-26 13:34 ` Johannes Schindelin
2019-06-26 18:04 ` Junio C Hamano
2019-06-27 9:20 ` Duy Nguyen
2019-06-27 17:23 ` Matheus Tavares Bernardino
2019-06-27 18:48 ` Johannes Schindelin
2019-06-27 19:33 ` Matheus Tavares Bernardino
2019-06-28 12:51 ` Johannes Schindelin
2019-06-28 14:16 ` Matheus Tavares Bernardino
2019-07-01 12:15 ` Johannes Schindelin
2019-07-03 8:57 ` SZEDER Gábor
2019-07-08 22:21 ` Matheus Tavares Bernardino
2019-06-18 23:27 ` [GSoC][PATCH v7 07/10] clone: copy hidden paths at local clone Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 08/10] clone: extract function from copy_or_link_directory Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 09/10] clone: use dir-iterator to avoid explicit dir traversal Matheus Tavares
2019-06-18 23:27 ` [GSoC][PATCH v7 10/10] clone: replace strcmp by fspathcmp Matheus Tavares
2019-06-19 4:36 ` [GSoC][PATCH v7 00/10] clone: dir-iterator refactoring with tests Matheus Tavares Bernardino
2019-06-20 20:18 ` Junio C Hamano
2019-06-21 13:41 ` Matheus Tavares Bernardino
2019-07-10 23:58 ` [GSoC][PATCH v8 " Matheus Tavares
2019-07-10 23:58 ` [GSoC][PATCH v8 01/10] clone: test for our behavior on odd objects/* content Matheus Tavares
2019-07-10 23:58 ` [GSoC][PATCH v8 02/10] clone: better handle symlinked files at .git/objects/ Matheus Tavares
2019-07-10 23:58 ` [GSoC][PATCH v8 03/10] dir-iterator: add tests for dir-iterator API Matheus Tavares
2019-07-10 23:58 ` [GSoC][PATCH v8 04/10] dir-iterator: use warning_errno when possible Matheus Tavares
2019-07-10 23:58 ` [GSoC][PATCH v8 05/10] dir-iterator: refactor state machine model Matheus Tavares
2019-07-10 23:59 ` [GSoC][PATCH v8 06/10] dir-iterator: add flags parameter to dir_iterator_begin Matheus Tavares
2019-07-10 23:59 ` [GSoC][PATCH v8 07/10] clone: copy hidden paths at local clone Matheus Tavares
2019-07-10 23:59 ` [GSoC][PATCH v8 08/10] clone: extract function from copy_or_link_directory Matheus Tavares
2019-07-10 23:59 ` [GSoC][PATCH v8 09/10] clone: use dir-iterator to avoid explicit dir traversal Matheus Tavares
2019-07-10 23:59 ` [GSoC][PATCH v8 10/10] clone: replace strcmp by fspathcmp Matheus Tavares
2019-07-11 11:56 ` [GSoC][PATCH v8 00/10] clone: dir-iterator refactoring with tests Johannes Schindelin
2019-07-11 15:24 ` Matheus Tavares Bernardino
2019-02-26 12:28 ` [RFC PATCH v3 1/5] clone: test for our behavior on odd objects/* content Ævar Arnfjörð Bjarmason
2019-02-28 21:19 ` Matheus Tavares Bernardino
2019-03-01 13:49 ` Ævar Arnfjörð Bjarmason
2019-03-13 3:17 ` Matheus Tavares
2019-02-26 12:28 ` [RFC PATCH v3 2/5] dir-iterator: add flags parameter to dir_iterator_begin Ævar Arnfjörð Bjarmason
2019-02-26 12:28 ` [RFC PATCH v3 3/5] clone: copy hidden paths at local clone Ævar Arnfjörð Bjarmason
2019-02-26 12:28 ` [RFC PATCH v3 4/5] clone: extract function from copy_or_link_directory Ævar Arnfjörð Bjarmason
2019-02-26 12:28 ` [RFC PATCH v3 5/5] clone: use dir-iterator to avoid explicit dir traversal Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHd-oW5aOf+TE_AeA=VkaZUt7LTeSK_buojsEgb3NYMVVm1B_g@mail.gmail.com' \
--to=matheus.bernardino@usp.br \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=t.gummerer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).