Merge branch 'jt/packmigrate'
Code movement to make it easier to hack later.
* jt/packmigrate: (23 commits)
pack: move for_each_packed_object()
pack: move has_pack_index()
pack: move has_sha1_pack()
pack: move find_pack_entry() and make it global
pack: move find_sha1_pack()
pack: move find_pack_entry_one(), is_pack_valid()
pack: move check_pack_index_ptr(), nth_packed_object_offset()
pack: move nth_packed_object_{sha1,oid}
pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry()
pack: move unpack_object_header()
pack: move get_size_from_delta()
pack: move unpack_object_header_buffer()
pack: move {,re}prepare_packed_git and approximate_object_count
pack: move install_packed_git()
pack: move add_packed_git()
pack: move unuse_pack()
pack: move use_pack()
pack: move pack-closing functions
pack: move release_pack_memory()
pack: move open_pack_index(), parse_pack_index()
...
This commit is contained in:
Junio C Hamano
122
cache.h
122
cache.h
@ -902,20 +902,6 @@ extern void check_repository_format(void);
|
||||
*/
|
||||
extern const char *sha1_file_name(const unsigned char *sha1);
|
||||
|
||||
/*
|
||||
* Return the name of the (local) packfile with the specified sha1 in
|
||||
* its name. The return value is a pointer to memory that is
|
||||
* overwritten each time this function is called.
|
||||
*/
|
||||
extern char *sha1_pack_name(const unsigned char *sha1);
|
||||
|
||||
/*
|
||||
* Return the name of the (local) pack index file with the specified
|
||||
* sha1 in its name. The return value is a pointer to memory that is
|
||||
* overwritten each time this function is called.
|
||||
*/
|
||||
extern char *sha1_pack_index_name(const unsigned char *sha1);
|
||||
|
||||
/*
|
||||
* Return an abbreviated sha1 unique within this repository's object database.
|
||||
* The result will be at least `len` characters long, and will be NUL
|
||||
@ -1201,15 +1187,10 @@ extern void *map_sha1_file(const unsigned char *sha1, unsigned long *size);
|
||||
extern int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
|
||||
extern int parse_sha1_header(const char *hdr, unsigned long *sizep);
|
||||
|
||||
/* global flag to enable extra checks when accessing packed objects */
|
||||
extern int do_check_packed_object_crc;
|
||||
|
||||
extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
|
||||
|
||||
extern int finalize_object_file(const char *tmpfile, const char *filename);
|
||||
|
||||
extern int has_sha1_pack(const unsigned char *sha1);
|
||||
|
||||
/*
|
||||
* Open the loose object at path, check its sha1, and return the contents,
|
||||
* type, and size. If the object is a blob, then "contents" may return NULL,
|
||||
@ -1245,8 +1226,6 @@ extern int has_object_file_with_flags(const struct object_id *oid, int flags);
|
||||
*/
|
||||
extern int has_loose_object_nonlocal(const unsigned char *sha1);
|
||||
|
||||
extern int has_pack_index(const unsigned char *sha1);
|
||||
|
||||
extern void assert_sha1_type(const unsigned char *sha1, enum object_type expect);
|
||||
|
||||
/* Helper to check and "touch" a file */
|
||||
@ -1619,29 +1598,6 @@ struct pack_entry {
|
||||
struct packed_git *p;
|
||||
};
|
||||
|
||||
extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
|
||||
|
||||
/* A hook to report invalid files in pack directory */
|
||||
#define PACKDIR_FILE_PACK 1
|
||||
#define PACKDIR_FILE_IDX 2
|
||||
#define PACKDIR_FILE_GARBAGE 4
|
||||
extern void (*report_garbage)(unsigned seen_bits, const char *path);
|
||||
|
||||
extern void prepare_packed_git(void);
|
||||
extern void reprepare_packed_git(void);
|
||||
extern void install_packed_git(struct packed_git *pack);
|
||||
|
||||
/*
|
||||
* Give a rough count of objects in the repository. This sacrifices accuracy
|
||||
* for speed.
|
||||
*/
|
||||
unsigned long approximate_object_count(void);
|
||||
|
||||
extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
|
||||
struct packed_git *packs);
|
||||
|
||||
extern void pack_report(void);
|
||||
|
||||
/*
|
||||
* Create a temporary file rooted in the object database directory, or
|
||||
* die on failure. The filename is taken from "pattern", which should have the
|
||||
@ -1650,15 +1606,6 @@ extern void pack_report(void);
|
||||
*/
|
||||
extern int odb_mkstemp(struct strbuf *template, const char *pattern);
|
||||
|
||||
/*
|
||||
* Generate the filename to be used for a pack file with checksum "sha1" and
|
||||
* extension "ext". The result is written into the strbuf "buf", overwriting
|
||||
* any existing contents. A pointer to buf->buf is returned as a convenience.
|
||||
*
|
||||
* Example: odb_pack_name(out, sha1, "idx") => ".git/objects/pack/pack-1234..idx"
|
||||
*/
|
||||
extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
|
||||
|
||||
/*
|
||||
* Create a pack .keep file named "name" (which should generally be the output
|
||||
* of odb_pack_name). Returns a file descriptor opened for writing, or -1 on
|
||||
@ -1666,67 +1613,6 @@ extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const
|
||||
*/
|
||||
extern int odb_pack_keep(const char *name);
|
||||
|
||||
/*
|
||||
* mmap the index file for the specified packfile (if it is not
|
||||
* already mmapped). Return 0 on success.
|
||||
*/
|
||||
extern int open_pack_index(struct packed_git *);
|
||||
|
||||
/*
|
||||
* munmap the index file for the specified packfile (if it is
|
||||
* currently mmapped).
|
||||
*/
|
||||
extern void close_pack_index(struct packed_git *);
|
||||
|
||||
extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
|
||||
extern void close_pack_windows(struct packed_git *);
|
||||
extern void close_all_packs(void);
|
||||
extern void unuse_pack(struct pack_window **);
|
||||
extern void clear_delta_base_cache(void);
|
||||
extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
|
||||
|
||||
/*
|
||||
* Make sure that a pointer access into an mmap'd index file is within bounds,
|
||||
* and can provide at least 8 bytes of data.
|
||||
*
|
||||
* Note that this is only necessary for variable-length segments of the file
|
||||
* (like the 64-bit extended offset table), as we compare the size to the
|
||||
* fixed-length parts when we open the file.
|
||||
*/
|
||||
extern void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
|
||||
|
||||
/*
|
||||
* Return the SHA-1 of the nth object within the specified packfile.
|
||||
* Open the index if it is not already open. The return value points
|
||||
* at the SHA-1 within the mmapped index. Return NULL if there is an
|
||||
* error.
|
||||
*/
|
||||
extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
|
||||
/*
|
||||
* Like nth_packed_object_sha1, but write the data into the object specified by
|
||||
* the the first argument. Returns the first argument on success, and NULL on
|
||||
* error.
|
||||
*/
|
||||
extern const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
|
||||
|
||||
/*
|
||||
* Return the offset of the nth object within the specified packfile.
|
||||
* The index must already be opened.
|
||||
*/
|
||||
extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t n);
|
||||
|
||||
/*
|
||||
* If the object named sha1 is present in the specified packfile,
|
||||
* return its offset within the packfile; otherwise, return 0.
|
||||
*/
|
||||
extern off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *);
|
||||
|
||||
extern int is_pack_valid(struct packed_git *);
|
||||
extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
|
||||
extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
|
||||
extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
|
||||
extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
|
||||
|
||||
/*
|
||||
* Iterate over the files in the loose-object parts of the object
|
||||
* directory "path", triggering the following callbacks:
|
||||
@ -1776,17 +1662,12 @@ int for_each_loose_file_in_objdir_buf(struct strbuf *path,
|
||||
void *data);
|
||||
|
||||
/*
|
||||
* Iterate over loose and packed objects in both the local
|
||||
* Iterate over loose objects in both the local
|
||||
* repository and any alternates repositories (unless the
|
||||
* LOCAL_ONLY flag is set).
|
||||
*/
|
||||
#define FOR_EACH_OBJECT_LOCAL_ONLY 0x1
|
||||
typedef int each_packed_object_fn(const struct object_id *oid,
|
||||
struct packed_git *pack,
|
||||
uint32_t pos,
|
||||
void *data);
|
||||
extern int for_each_loose_object(each_loose_object_fn, void *, unsigned flags);
|
||||
extern int for_each_packed_object(each_packed_object_fn, void *, unsigned flags);
|
||||
|
||||
struct object_info {
|
||||
/* Request */
|
||||
@ -1836,7 +1717,6 @@ struct object_info {
|
||||
/* Do not retry packed storage after checking packed and loose storage */
|
||||
#define OBJECT_INFO_QUICK 8
|
||||
extern int sha1_object_info_extended(const unsigned char *, struct object_info *, unsigned flags);
|
||||
extern int packed_object_info(struct packed_git *pack, off_t offset, struct object_info *);
|
||||
|
||||
/* Dumb servers support */
|
||||
extern int update_server_info(int);
|
||||
|
||||
Reference in New Issue
Block a user