On 7/16/2017 11:23 AM, Philip Oakley wrote:
From: "Jonathan Tan" <jonathanta...@google.com>
Sent: Tuesday, July 11, 2017 8:48 PM
These patches are part of a set of patches implementing partial clone,
as you can see here:
https://github.com/jonathantanmy/git/tree/partialclone
In that branch, clone with batch checkout works, as you can see in the
README. The code and tests are generally done, but some patches are
still missing documentation and commit messages.
These 3 patches implement the foundational concept - formerly known as
"missing blobs" in the "missing blob manifest", I decided to call them
"promised blobs". The repo knows their object names and sizes. It also
does not have the blobs themselves, but can be configured to know how to
fetch them.
If I understand correctly, this method doesn't give any direct user
visibility of missing blobs in the file system. Is that correct?
That is correct
I was hoping that eventually the various 'on demand' approaches would
still allow users to continue to work as they go off-line such that they
can see directly (in the FS) where the missing blobs (and trees) are
located, so that they can continue to commit new work on existing files.
This is a challenge as git assumes all objects are always available
(that is a key design principal of a DVCS) so any missing object is
considered a corruption that typically results in a call to "die."
The GVFS solution gets around this by ensuring any missing object is
retrieved on behalf of git so that it never sees it as missing. The
obvious tradeoff is that this requires a network connection so the
object can be retrieved.
I had felt that some sort of 'gitlink' should be present (huma readable)
as a place holder for the missing blob/tree. e.g. 'gitblob: 1234abcd'
(showing the missing oid, jsut like sub-modules can do - it's no
different really.
We explored that option briefly but when you have a large number of
files, even writing out some sort of place holder can take a very long
time. In fact, since the typical source file is relatively small (a few
kilobytes), writing out a placeholder doesn't save much time vs just
writing out the actual file contents.
Another challenge is that even if there is a placeholder written to
disk, you still need a network connection to retrieve the actual
contents if/when it is needed.
I'm concerned that the various GVFS extensions haven't fully achieved a
separation of concerns surrounding the DVCS capability for
on-line/off-line conversion as comms drop in and out. The GVFS looks
great for a fully networked, always on, environment, but it would be
good to also have the sepration for those who (will) have shallow/narrow
clones that may also need to work with a local upstream that is also
shallow/narrow.
You are correct that this hasn't been tackled yet. It is a challenging
problem. I can envision something along the lines of what was done for
the shallow clone feature where there are distinct ways to change the
set of objects that are available but that would hopefully come in some
future patch series.
--
Philip
I wanted to at least get my thoughts into the discussion before it all
passes by.
An older version of these patches was sent as a single demonstration
patch in versions 1 to 3 of [1]. In there, Junio suggested that I have
only one file containing missing blob information. I have made that
suggested change in this version.
One thing remaining is to add a repository extension [2] so that older
versions of Git fail immediately instead of trying to read missing
blobs, but I thought I'd send these first in order to get some initial
feedback.
[1]
https://public-inbox.org/git/cover.1497035376.git.jonathanta...@google.com/
[2] Documentation/technical/repository-version.txt
Jonathan Tan (3):
promised-blob, fsck: introduce promised blobs
sha1-array: support appending unsigned char hash
sha1_file: add promised blob hook support
Documentation/config.txt | 8 ++
Documentation/gitrepository-layout.txt | 8 ++
Makefile | 1 +
builtin/cat-file.c | 9 ++
builtin/fsck.c | 13 +++
promised-blob.c | 170
+++++++++++++++++++++++++++++++++
promised-blob.h | 27 ++++++
sha1-array.c | 7 ++
sha1-array.h | 1 +
sha1_file.c | 44 ++++++---
t/t3907-promised-blob.sh | 65 +++++++++++++
t/test-lib-functions.sh | 6 ++
12 files changed, 345 insertions(+), 14 deletions(-)
create mode 100644 promised-blob.c
create mode 100644 promised-blob.h
create mode 100755 t/t3907-promised-blob.sh
--
2.13.2.932.g7449e964c-goog
