From: Junio C Hamano <gitster@pobox.com>
To: Antoine Pelisse <apelisse@gmail.com>
Cc: git <git@vger.kernel.org>, Joern Hees <dev@joernhees.de>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: Re: [PATCH] remote-hg: add shared repo upgrade
Date: Mon, 05 Aug 2013 23:36:25 -0700 [thread overview]
Message-ID: <7vfvuniavq.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CALWbr2wynb-K-r0sehuBUtmkbgp9Ev5iYK_v2ZFxsjcewTCmfQ@mail.gmail.com> (Antoine Pelisse's message of "Tue, 6 Aug 2013 08:22:19 +0200")
Antoine Pelisse <apelisse@gmail.com> writes:
> On Mon, Aug 5, 2013 at 11:02 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Antoine Pelisse <apelisse@gmail.com> writes:
>> Is the untold
>> and obvious-to-those-who-are-familiar-with-this-codepath assumption
>> that it is guaranteed that there is at most one "*/clone/.hg" under
>> shared_path?
>
> No, there is no such assumption.
> That is why we create a repository just below if it doesn't exist (no
> copy was found).
> That's also why I don't see how we could split the patch.
>
> We could improve that part of the commit message:
>
> It's trivial to upgrade to the new organization by copying the Mercurial
> repo from one of the remotes (e.g. 'origin'), so let's do so. If
> we can't find
> any existing repo, we create an empty one.
That is fine, and I do not (yet) have an opinion on this patch
needing to be further split.
Quoting that part I was asking about again:
> + # check and upgrade old organization
> + hg_path = os.path.join(shared_path, '.hg')
> + if os.path.exists(shared_path) and not os.path.exists(hg_path):
> + repos = os.listdir(shared_path)
> + for x in repos:
> + local_hg = os.path.join(shared_path, x, 'clone', '.hg')
> + if not os.path.exists(local_hg):
> + continue
> + shutil.copytree(local_hg, hg_path)
if you can have more than one 'x' such that
local_hg = os.path.join(shared_path, x, 'clone', '.hg')
exists, that means in repos[], there are two (or more) x1,and x2,
and in this loop you will run
shutil.copytree(local_hg, hg_path)
twice, once for local_hg derived from x1 and another time from x2,
both to the same hg_path directory that does not change inside the
loop. shutil.copytree(src, dst) however creates leading paths down
to dst and it would barf when dst already exists, no?
That is what I was puzzled about the code. The log message says "we
can copy from one of them if exists, so let's do so", which makes
sense, and a code structure that may match would have looked like
so:
for x in repos:
'''pick one at random, copy it and leave'''
copytree()
break
else:
'''nothing to be copied, do it the hard way by cloning'''
but that is not what I saw so that is where my confusion came from.
next prev parent reply other threads:[~2013-08-06 6:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-05 19:22 [PATCH] remote-hg: add shared repo upgrade Antoine Pelisse
2013-08-05 19:31 ` Felipe Contreras
2013-08-05 19:54 ` Antoine Pelisse
2013-08-05 21:02 ` Junio C Hamano
2013-08-06 6:22 ` Antoine Pelisse
2013-08-06 6:36 ` Junio C Hamano [this message]
2013-08-06 6:53 ` Antoine Pelisse
2013-08-09 16:49 ` [PATCH 1/2] " Antoine Pelisse
-- strict thread matches above, loose matches on Subject: below --
2013-08-05 19:29 [PATCH] " Antoine Pelisse
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vfvuniavq.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=apelisse@gmail.com \
--cc=dev@joernhees.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.