2005-04-07 22:13:13 +00:00
|
|
|
#ifndef CACHE_H
|
|
|
|
#define CACHE_H
|
|
|
|
|
2005-12-05 19:54:29 +00:00
|
|
|
#include "git-compat-util.h"
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-04-21 19:33:22 +00:00
|
|
|
#include SHA1_HEADER
|
2005-04-07 22:13:13 +00:00
|
|
|
#include <zlib.h>
|
|
|
|
|
2005-04-30 16:51:03 +00:00
|
|
|
#if ZLIB_VERNUM < 0x1200
|
|
|
|
#define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
|
|
|
|
#endif
|
|
|
|
|
2006-02-26 15:13:46 +00:00
|
|
|
#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
|
2005-04-30 16:51:03 +00:00
|
|
|
#define DTYPE(de) ((de)->d_type)
|
|
|
|
#else
|
2006-01-20 21:33:20 +00:00
|
|
|
#undef DT_UNKNOWN
|
|
|
|
#undef DT_DIR
|
|
|
|
#undef DT_REG
|
|
|
|
#undef DT_LNK
|
2005-04-30 16:51:03 +00:00
|
|
|
#define DT_UNKNOWN 0
|
|
|
|
#define DT_DIR 1
|
|
|
|
#define DT_REG 2
|
2005-05-13 00:16:04 +00:00
|
|
|
#define DT_LNK 3
|
2005-04-30 16:51:03 +00:00
|
|
|
#define DTYPE(de) DT_UNKNOWN
|
|
|
|
#endif
|
|
|
|
|
2005-07-14 01:46:20 +00:00
|
|
|
/*
|
|
|
|
* Intensive research over the course of many years has shown that
|
|
|
|
* port 9418 is totally unused by anything else. Or
|
|
|
|
*
|
|
|
|
* Your search - "port 9418" - did not match any documents.
|
|
|
|
*
|
|
|
|
* as www.google.com puts it.
|
2005-09-12 18:23:00 +00:00
|
|
|
*
|
|
|
|
* This port has been properly assigned for git use by IANA:
|
|
|
|
* git (Assigned-9418) [I06-050728-0001].
|
|
|
|
*
|
|
|
|
* git 9418/tcp git pack transfer service
|
|
|
|
* git 9418/udp git pack transfer service
|
|
|
|
*
|
|
|
|
* with Linus Torvalds <torvalds@osdl.org> as the point of
|
|
|
|
* contact. September 2005.
|
|
|
|
*
|
|
|
|
* See http://www.iana.org/assignments/port-numbers
|
2005-07-14 01:46:20 +00:00
|
|
|
*/
|
|
|
|
#define DEFAULT_GIT_PORT 9418
|
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
/*
|
|
|
|
* Basic data structures for the directory cache
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define CACHE_SIGNATURE 0x44495243 /* "DIRC" */
|
|
|
|
struct cache_header {
|
2005-04-15 17:44:27 +00:00
|
|
|
unsigned int hdr_signature;
|
|
|
|
unsigned int hdr_version;
|
|
|
|
unsigned int hdr_entries;
|
2005-04-07 22:13:13 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The "cache_time" is just the low 32 bits of the
|
|
|
|
* time. It doesn't matter if it overflows - we only
|
|
|
|
* check it for equality in the 32 bits we save.
|
|
|
|
*/
|
|
|
|
struct cache_time {
|
|
|
|
unsigned int sec;
|
|
|
|
unsigned int nsec;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* dev/ino/uid/gid/size are also just tracked to the low 32 bits
|
|
|
|
* Again - this is just a (very strong in practice) heuristic that
|
|
|
|
* the inode hasn't changed.
|
2005-04-15 17:44:27 +00:00
|
|
|
*
|
|
|
|
* We save the fields in big-endian order to allow using the
|
|
|
|
* index file over NFS transparently.
|
2005-04-07 22:13:13 +00:00
|
|
|
*/
|
|
|
|
struct cache_entry {
|
2005-04-15 17:44:27 +00:00
|
|
|
struct cache_time ce_ctime;
|
|
|
|
struct cache_time ce_mtime;
|
|
|
|
unsigned int ce_dev;
|
|
|
|
unsigned int ce_ino;
|
|
|
|
unsigned int ce_mode;
|
|
|
|
unsigned int ce_uid;
|
|
|
|
unsigned int ce_gid;
|
|
|
|
unsigned int ce_size;
|
2005-04-07 22:13:13 +00:00
|
|
|
unsigned char sha1[20];
|
2005-04-16 04:45:38 +00:00
|
|
|
unsigned short ce_flags;
|
2006-01-07 09:33:54 +00:00
|
|
|
char name[FLEX_ARRAY]; /* more */
|
2005-04-07 22:13:13 +00:00
|
|
|
};
|
|
|
|
|
2005-04-16 05:51:44 +00:00
|
|
|
#define CE_NAMEMASK (0x0fff)
|
|
|
|
#define CE_STAGEMASK (0x3000)
|
2005-06-06 05:07:31 +00:00
|
|
|
#define CE_UPDATE (0x4000)
|
2006-02-09 05:15:24 +00:00
|
|
|
#define CE_VALID (0x8000)
|
2005-04-16 15:33:23 +00:00
|
|
|
#define CE_STAGESHIFT 12
|
2005-04-16 05:51:44 +00:00
|
|
|
|
2005-04-16 15:33:23 +00:00
|
|
|
#define create_ce_flags(len, stage) htons((len) | ((stage) << CE_STAGESHIFT))
|
|
|
|
#define ce_namelen(ce) (CE_NAMEMASK & ntohs((ce)->ce_flags))
|
|
|
|
#define ce_size(ce) cache_entry_size(ce_namelen(ce))
|
|
|
|
#define ce_stage(ce) ((CE_STAGEMASK & ntohs((ce)->ce_flags)) >> CE_STAGESHIFT)
|
|
|
|
|
2005-04-17 05:26:31 +00:00
|
|
|
#define ce_permissions(mode) (((mode) & 0100) ? 0755 : 0644)
|
2005-05-05 12:38:25 +00:00
|
|
|
static inline unsigned int create_ce_mode(unsigned int mode)
|
|
|
|
{
|
|
|
|
if (S_ISLNK(mode))
|
|
|
|
return htonl(S_IFLNK);
|
2005-05-05 23:01:46 +00:00
|
|
|
return htonl(S_IFREG | ce_permissions(mode));
|
2005-05-05 12:38:25 +00:00
|
|
|
}
|
2006-03-30 06:55:43 +00:00
|
|
|
#define canon_mode(mode) \
|
|
|
|
(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
|
|
|
|
S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
|
2005-04-17 05:26:31 +00:00
|
|
|
|
2005-04-16 15:33:23 +00:00
|
|
|
#define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
|
2005-04-16 04:45:38 +00:00
|
|
|
|
2005-05-10 22:58:16 +00:00
|
|
|
extern struct cache_entry **active_cache;
|
|
|
|
extern unsigned int active_nr, active_alloc, active_cache_changed;
|
2006-04-25 04:18:58 +00:00
|
|
|
extern struct cache_tree *active_cache_tree;
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-05-10 05:57:58 +00:00
|
|
|
#define GIT_DIR_ENVIRONMENT "GIT_DIR"
|
|
|
|
#define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
|
2005-05-10 00:57:56 +00:00
|
|
|
#define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
|
2005-04-21 17:55:18 +00:00
|
|
|
#define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
|
2005-07-30 07:58:28 +00:00
|
|
|
#define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
|
2005-04-21 17:55:18 +00:00
|
|
|
|
2005-09-26 20:54:01 +00:00
|
|
|
extern char *get_git_dir(void);
|
2005-05-10 05:57:58 +00:00
|
|
|
extern char *get_object_directory(void);
|
2005-06-06 20:31:29 +00:00
|
|
|
extern char *get_refs_directory(void);
|
2005-05-10 05:57:58 +00:00
|
|
|
extern char *get_index_file(void);
|
2005-07-30 07:58:28 +00:00
|
|
|
extern char *get_graft_file(void);
|
2005-05-10 05:57:58 +00:00
|
|
|
|
|
|
|
#define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
|
2005-04-21 17:55:18 +00:00
|
|
|
|
2005-09-21 07:00:47 +00:00
|
|
|
extern const char **get_pathspec(const char *prefix, const char **pathspec);
|
2005-11-26 07:14:15 +00:00
|
|
|
extern const char *setup_git_directory_gently(int *);
|
2005-08-17 01:06:34 +00:00
|
|
|
extern const char *setup_git_directory(void);
|
2005-09-21 07:00:47 +00:00
|
|
|
extern const char *prefix_path(const char *prefix, int len, const char *path);
|
2005-11-26 07:14:15 +00:00
|
|
|
extern const char *prefix_filename(const char *prefix, int len, const char *path);
|
2006-04-26 17:15:54 +00:00
|
|
|
extern void verify_filename(const char *prefix, const char *name);
|
2006-04-26 22:09:27 +00:00
|
|
|
extern void verify_non_filename(const char *prefix, const char *name);
|
2005-08-17 01:06:34 +00:00
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
#define alloc_nr(x) (((x)+16)*3/2)
|
|
|
|
|
2005-04-09 16:48:20 +00:00
|
|
|
/* Initialize and use the cache information */
|
2005-04-07 22:13:13 +00:00
|
|
|
extern int read_cache(void);
|
2005-04-09 19:09:27 +00:00
|
|
|
extern int write_cache(int newfd, struct cache_entry **cache, int entries);
|
2005-04-09 16:26:55 +00:00
|
|
|
extern int cache_name_pos(const char *name, int namelen);
|
2005-05-08 04:55:21 +00:00
|
|
|
#define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */
|
|
|
|
#define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */
|
2005-06-25 09:25:29 +00:00
|
|
|
#define ADD_CACHE_SKIP_DFCHECK 4 /* Ok to skip DF conflict checks */
|
2005-05-08 04:55:21 +00:00
|
|
|
extern int add_cache_entry(struct cache_entry *ce, int option);
|
2005-05-15 02:04:25 +00:00
|
|
|
extern int remove_cache_entry_at(int pos);
|
2005-09-21 07:00:47 +00:00
|
|
|
extern int remove_file_from_cache(const char *path);
|
2005-05-15 02:04:25 +00:00
|
|
|
extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
|
2006-02-09 05:15:24 +00:00
|
|
|
extern int ce_match_stat(struct cache_entry *ce, struct stat *st, int);
|
|
|
|
extern int ce_modified(struct cache_entry *ce, struct stat *st, int);
|
2005-07-14 23:55:06 +00:00
|
|
|
extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
|
2005-07-08 23:51:55 +00:00
|
|
|
extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, const char *type);
|
2005-12-10 22:25:24 +00:00
|
|
|
extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object);
|
2005-10-07 10:42:00 +00:00
|
|
|
extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
|
2005-05-15 21:23:12 +00:00
|
|
|
extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
|
|
|
|
|
2006-05-19 16:56:35 +00:00
|
|
|
#define REFRESH_REALLY 0x0001 /* ignore_valid */
|
|
|
|
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */
|
|
|
|
#define REFRESH_QUIET 0x0004 /* be quiet about it */
|
|
|
|
#define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */
|
|
|
|
extern int refresh_cache(unsigned int flags);
|
|
|
|
|
2005-05-15 21:23:12 +00:00
|
|
|
struct cache_file {
|
|
|
|
struct cache_file *next;
|
|
|
|
char lockfile[PATH_MAX];
|
|
|
|
};
|
|
|
|
extern int hold_index_file_for_update(struct cache_file *, const char *path);
|
|
|
|
extern int commit_index_file(struct cache_file *);
|
|
|
|
extern void rollback_index_file(struct cache_file *);
|
2005-04-09 16:48:20 +00:00
|
|
|
|
2006-02-27 22:47:45 +00:00
|
|
|
/* Environment bits from configuration mechanism */
|
2005-10-10 23:31:08 +00:00
|
|
|
extern int trust_executable_bit;
|
2006-02-09 05:15:24 +00:00
|
|
|
extern int assume_unchanged;
|
2006-05-02 07:40:24 +00:00
|
|
|
extern int prefer_symlink_refs;
|
2006-03-21 02:45:47 +00:00
|
|
|
extern int warn_ambiguous_refs;
|
2005-11-15 20:48:08 +00:00
|
|
|
extern int diff_rename_limit_default;
|
2005-12-22 22:13:56 +00:00
|
|
|
extern int shared_repository;
|
2006-02-27 22:47:45 +00:00
|
|
|
extern const char *apply_default_whitespace;
|
2005-10-10 23:31:08 +00:00
|
|
|
|
2005-11-25 23:59:09 +00:00
|
|
|
#define GIT_REPO_VERSION 0
|
|
|
|
extern int repository_format_version;
|
|
|
|
extern int check_repository_format(void);
|
|
|
|
|
2005-04-09 16:48:20 +00:00
|
|
|
#define MTIME_CHANGED 0x0001
|
|
|
|
#define CTIME_CHANGED 0x0002
|
|
|
|
#define OWNER_CHANGED 0x0004
|
|
|
|
#define MODE_CHANGED 0x0008
|
|
|
|
#define INODE_CHANGED 0x0010
|
|
|
|
#define DATA_CHANGED 0x0020
|
2005-05-05 12:38:25 +00:00
|
|
|
#define TYPE_CHANGED 0x0040
|
2005-04-07 22:13:13 +00:00
|
|
|
|
|
|
|
/* Return a statically allocated filename matching the sha1 signature */
|
2005-08-09 15:30:22 +00:00
|
|
|
extern char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
|
|
|
|
extern char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
|
2005-04-10 21:03:58 +00:00
|
|
|
extern char *sha1_file_name(const unsigned char *sha1);
|
2005-08-01 00:53:44 +00:00
|
|
|
extern char *sha1_pack_name(const unsigned char *sha1);
|
|
|
|
extern char *sha1_pack_index_name(const unsigned char *sha1);
|
2005-10-11 22:22:48 +00:00
|
|
|
extern const char *find_unique_abbrev(const unsigned char *sha1, int);
|
2005-09-30 21:02:47 +00:00
|
|
|
extern const unsigned char null_sha1[20];
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-08-04 20:43:03 +00:00
|
|
|
int git_mkstemp(char *path, size_t n, const char *template);
|
|
|
|
|
2005-12-22 22:13:56 +00:00
|
|
|
int adjust_shared_perm(const char *path);
|
2005-07-06 08:11:52 +00:00
|
|
|
int safe_create_leading_directories(char *path);
|
2005-08-04 20:43:03 +00:00
|
|
|
char *safe_strncpy(char *, const char *, size_t);
|
2005-11-21 00:52:52 +00:00
|
|
|
char *enter_repo(char *path, int strict);
|
2005-07-06 08:11:52 +00:00
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
/* Read and unpack a sha1 file into memory, write memory to a sha1 file */
|
2005-06-02 00:54:59 +00:00
|
|
|
extern int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size);
|
2005-06-02 14:57:25 +00:00
|
|
|
extern int parse_sha1_header(char *hdr, char *type, unsigned long *sizep);
|
2005-06-27 10:34:06 +00:00
|
|
|
extern int sha1_object_info(const unsigned char *, char *, unsigned long *);
|
2005-04-08 22:01:15 +00:00
|
|
|
extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size);
|
2005-04-10 21:03:58 +00:00
|
|
|
extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
|
2005-05-18 12:14:09 +00:00
|
|
|
extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
|
2005-07-08 23:51:55 +00:00
|
|
|
extern char *write_sha1_file_prepare(void *buf,
|
|
|
|
unsigned long len,
|
|
|
|
const char *type,
|
|
|
|
unsigned char *sha1,
|
|
|
|
unsigned char *hdr,
|
|
|
|
int *hdrlen);
|
2005-04-24 01:47:23 +00:00
|
|
|
|
2005-06-03 15:05:39 +00:00
|
|
|
extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-08-02 23:46:29 +00:00
|
|
|
extern int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer,
|
|
|
|
size_t bufsize, size_t *bufposn);
|
2005-07-10 22:25:38 +00:00
|
|
|
extern int write_sha1_to_fd(int fd, const unsigned char *sha1);
|
2005-10-11 06:22:01 +00:00
|
|
|
extern int move_temp_to_file(const char *tmpfile, char *filename);
|
2005-04-24 01:47:23 +00:00
|
|
|
|
2005-07-03 20:06:36 +00:00
|
|
|
extern int has_sha1_pack(const unsigned char *sha1);
|
2005-04-24 01:47:23 +00:00
|
|
|
extern int has_sha1_file(const unsigned char *sha1);
|
|
|
|
|
2005-08-01 00:53:44 +00:00
|
|
|
extern int has_pack_file(const unsigned char *sha1);
|
|
|
|
extern int has_pack_index(const unsigned char *sha1);
|
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
/* Convert to/from hex/sha1 representation */
|
2006-01-25 09:03:18 +00:00
|
|
|
#define MINIMUM_ABBREV 4
|
|
|
|
#define DEFAULT_ABBREV 7
|
|
|
|
|
2005-05-01 23:36:56 +00:00
|
|
|
extern int get_sha1(const char *str, unsigned char *sha1);
|
2005-04-09 19:09:27 +00:00
|
|
|
extern int get_sha1_hex(const char *hex, unsigned char *sha1);
|
|
|
|
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
|
2005-09-25 16:59:37 +00:00
|
|
|
extern int read_ref(const char *filename, unsigned char *sha1);
|
2005-09-30 21:08:25 +00:00
|
|
|
extern const char *resolve_ref(const char *path, unsigned char *sha1, int);
|
2005-09-30 21:26:57 +00:00
|
|
|
extern int create_symref(const char *git_HEAD, const char *refs_heads_master);
|
|
|
|
extern int validate_symref(const char *git_HEAD);
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-05-20 16:09:18 +00:00
|
|
|
extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
|
2005-04-09 19:59:11 +00:00
|
|
|
extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-04-28 23:42:27 +00:00
|
|
|
extern void *read_object_with_reference(const unsigned char *sha1,
|
2005-05-18 12:14:09 +00:00
|
|
|
const char *required_type,
|
2005-04-28 23:42:27 +00:00
|
|
|
unsigned long *size,
|
|
|
|
unsigned char *sha1_ret);
|
2005-04-21 01:06:49 +00:00
|
|
|
|
2005-05-06 22:28:59 +00:00
|
|
|
const char *show_date(unsigned long time, int timezone);
|
2005-09-19 22:53:50 +00:00
|
|
|
int parse_date(const char *date, char *buf, int bufsize);
|
2005-04-30 16:46:49 +00:00
|
|
|
void datestamp(char *buf, int bufsize);
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 03:29:06 +00:00
|
|
|
unsigned long approxidate(const char *);
|
2005-04-30 16:46:49 +00:00
|
|
|
|
2005-07-12 18:49:27 +00:00
|
|
|
extern int setup_ident(void);
|
2006-02-19 04:31:05 +00:00
|
|
|
extern const char *git_author_info(int);
|
|
|
|
extern const char *git_committer_info(int);
|
2005-07-12 18:49:27 +00:00
|
|
|
|
2005-06-06 04:59:54 +00:00
|
|
|
struct checkout {
|
|
|
|
const char *base_dir;
|
|
|
|
int base_dir_len;
|
|
|
|
unsigned force:1,
|
|
|
|
quiet:1,
|
|
|
|
not_new:1,
|
|
|
|
refresh_cache:1;
|
|
|
|
};
|
|
|
|
|
2006-03-05 08:24:15 +00:00
|
|
|
extern int checkout_entry(struct cache_entry *ce, struct checkout *state, char *topath);
|
2005-06-06 04:59:54 +00:00
|
|
|
|
2005-06-28 21:56:57 +00:00
|
|
|
extern struct alternate_object_database {
|
2005-08-15 00:25:57 +00:00
|
|
|
struct alternate_object_database *next;
|
2005-06-28 21:56:57 +00:00
|
|
|
char *name;
|
2006-01-07 09:33:54 +00:00
|
|
|
char base[FLEX_ARRAY]; /* more */
|
2005-08-15 00:25:57 +00:00
|
|
|
} *alt_odb_list;
|
2005-06-28 21:56:57 +00:00
|
|
|
extern void prepare_alt_odb(void);
|
|
|
|
|
|
|
|
extern struct packed_git {
|
|
|
|
struct packed_git *next;
|
|
|
|
unsigned long index_size;
|
|
|
|
unsigned long pack_size;
|
|
|
|
unsigned int *index_base;
|
|
|
|
void *pack_base;
|
|
|
|
unsigned int pack_last_used;
|
2005-06-29 09:51:27 +00:00
|
|
|
unsigned int pack_use_cnt;
|
2005-10-13 22:38:28 +00:00
|
|
|
int pack_local;
|
2005-08-01 00:53:44 +00:00
|
|
|
unsigned char sha1[20];
|
2006-01-07 09:33:54 +00:00
|
|
|
/* something like ".git/objects/pack/xxxxx.pack" */
|
|
|
|
char pack_name[FLEX_ARRAY]; /* more */
|
2005-06-28 21:56:57 +00:00
|
|
|
} *packed_git;
|
2005-07-01 00:15:39 +00:00
|
|
|
|
|
|
|
struct pack_entry {
|
|
|
|
unsigned int offset;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
struct packed_git *p;
|
|
|
|
};
|
|
|
|
|
2005-07-16 20:55:50 +00:00
|
|
|
struct ref {
|
|
|
|
struct ref *next;
|
|
|
|
unsigned char old_sha1[20];
|
|
|
|
unsigned char new_sha1[20];
|
2005-08-24 07:40:14 +00:00
|
|
|
unsigned char force;
|
2005-08-03 23:35:29 +00:00
|
|
|
struct ref *peer_ref; /* when renaming */
|
2006-01-07 09:33:54 +00:00
|
|
|
char name[FLEX_ARRAY]; /* more */
|
2005-07-16 20:55:50 +00:00
|
|
|
};
|
|
|
|
|
2005-07-04 18:57:58 +00:00
|
|
|
extern int git_connect(int fd[2], char *url, const char *prog);
|
|
|
|
extern int finish_connect(pid_t pid);
|
2005-07-04 20:24:30 +00:00
|
|
|
extern int path_match(const char *path, int nr, char **match);
|
2005-08-03 23:35:29 +00:00
|
|
|
extern int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
|
|
|
|
int nr_refspec, char **refspec, int all);
|
2005-07-05 22:44:09 +00:00
|
|
|
extern int get_ack(int fd, unsigned char *result_sha1);
|
2005-10-14 01:57:40 +00:00
|
|
|
extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, int ignore_funny);
|
2005-10-28 02:48:54 +00:00
|
|
|
extern int server_supports(const char *feature);
|
2005-07-04 18:57:58 +00:00
|
|
|
|
2005-08-01 00:53:44 +00:00
|
|
|
extern struct packed_git *parse_pack_index(unsigned char *sha1);
|
2005-09-02 12:17:10 +00:00
|
|
|
extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
|
2005-08-16 04:10:03 +00:00
|
|
|
char *idx_path);
|
2005-08-01 00:53:44 +00:00
|
|
|
|
2005-06-28 21:56:57 +00:00
|
|
|
extern void prepare_packed_git(void);
|
2005-08-01 00:53:44 +00:00
|
|
|
extern void install_packed_git(struct packed_git *pack);
|
|
|
|
|
|
|
|
extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
|
|
|
|
struct packed_git *packs);
|
|
|
|
|
2005-06-29 09:51:27 +00:00
|
|
|
extern int use_packed_git(struct packed_git *);
|
|
|
|
extern void unuse_packed_git(struct packed_git *);
|
2005-10-13 22:38:28 +00:00
|
|
|
extern struct packed_git *add_packed_git(char *, int, int);
|
2005-06-28 21:56:57 +00:00
|
|
|
extern int num_packed_objects(const struct packed_git *p);
|
|
|
|
extern int nth_packed_object_sha1(const struct packed_git *, int, unsigned char*);
|
2005-07-01 00:15:39 +00:00
|
|
|
extern int find_pack_entry_one(const unsigned char *, struct pack_entry *, struct packed_git *);
|
|
|
|
extern void *unpack_entry_gently(struct pack_entry *, char *, unsigned long *);
|
2006-02-15 20:47:43 +00:00
|
|
|
extern void packed_object_info_detail(struct pack_entry *, char *, unsigned long *, unsigned long *, unsigned int *, unsigned char *);
|
2005-06-28 21:56:57 +00:00
|
|
|
|
[PATCH] Add update-server-info.
The git-update-server-info command prepares informational files
to help clients discover the contents of a repository, and pull
from it via a dumb transport protocols. Currently, the
following files are produced.
- The $repo/info/refs file lists the name of heads and tags
available in the $repo/refs/ directory, along with their
SHA1. This can be used by git-ls-remote command running on
the client side.
- The $repo/info/rev-cache file describes the commit ancestry
reachable from references in the $repo/refs/ directory. This
file is in an append-only binary format to make the server
side friendly to rsync mirroring scheme, and can be read by
git-show-rev-cache command.
- The $repo/objects/info/pack file lists the name of the packs
available, the interdependencies among them, and the head
commits and tags contained in them. Along with the other two
files, this is designed to help clients to make smart pull
decisions.
The git-receive-pack command is changed to invoke it at the end,
so just after a push to a public repository finishes via "git
push", the server info is automatically updated.
In addition, building of the rev-cache file can be done by a
standalone git-build-rev-cache command separately.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-24 00:54:41 +00:00
|
|
|
/* Dumb servers support */
|
|
|
|
extern int update_server_info(int);
|
|
|
|
|
2005-10-10 23:31:08 +00:00
|
|
|
typedef int (*config_fn_t)(const char *, const char *);
|
|
|
|
extern int git_default_config(const char *, const char *);
|
2005-11-26 00:03:56 +00:00
|
|
|
extern int git_config_from_file(config_fn_t fn, const char *);
|
2005-10-10 23:31:08 +00:00
|
|
|
extern int git_config(config_fn_t fn);
|
|
|
|
extern int git_config_int(const char *, const char *);
|
|
|
|
extern int git_config_bool(const char *, const char *);
|
2005-11-17 21:32:36 +00:00
|
|
|
extern int git_config_set(const char *, const char *);
|
2005-11-20 05:52:22 +00:00
|
|
|
extern int git_config_set_multivar(const char *, const char *, const char *, int);
|
2005-11-25 23:59:09 +00:00
|
|
|
extern int check_repository_format_version(const char *var, const char *value);
|
2005-10-10 23:31:08 +00:00
|
|
|
|
2005-10-12 01:47:34 +00:00
|
|
|
#define MAX_GITNAME (1000)
|
|
|
|
extern char git_default_email[MAX_GITNAME];
|
|
|
|
extern char git_default_name[MAX_GITNAME];
|
|
|
|
|
2005-11-28 00:09:40 +00:00
|
|
|
#define MAX_ENCODING_LENGTH 64
|
|
|
|
extern char git_commit_encoding[MAX_ENCODING_LENGTH];
|
|
|
|
|
2005-10-22 08:28:13 +00:00
|
|
|
extern int copy_fd(int ifd, int ofd);
|
2005-12-15 06:17:38 +00:00
|
|
|
|
|
|
|
/* Finish off pack transfer receiving end */
|
|
|
|
extern int receive_unpack_pack(int fd[2], const char *me, int quiet);
|
Make "git clone" less of a deathly quiet experience
It used to be that "git-unpack-objects" would give nice percentages, but
now that we don't unpack the initial clone pack any more, it doesn't. And
I'd love to do that nice percentage view in the pack objects downloader
too, but the thing doesn't even read the pack header, much less know how
much it's going to get, so I was lazy and didn't.
Instead, it at least prints out how much data it's gotten, and what the
packing speed is. Which makes the user realize that it's actually doing
something useful instead of sitting there silently (and if the recipient
knows how large the final result is, he can at least make a guess about
when it migt be done).
So with this patch, I get something like this on my DSL line:
[torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test
Packing 188543 objects
48.398MB (154 kB/s)
where even the speed approximation seems to be roughtly correct (even
though my algorithm is a truly stupid one, and only really gives "speed in
the last half second or so").
Anyway, _something_ like this is definitely needed. It could certainly be
better (if it showed the same kind of thing that git-unpack-objects did,
that would be much nicer, but would require parsing the object stream as
it comes in). But this is big step forward, I think.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-11 04:31:09 +00:00
|
|
|
extern int receive_keep_pack(int fd[2], const char *me, int quiet);
|
2005-12-15 06:17:38 +00:00
|
|
|
|
2006-02-28 19:26:21 +00:00
|
|
|
/* pager.c */
|
|
|
|
extern void setup_pager(void);
|
|
|
|
|
binary patch.
This adds "binary patch" to the diff output and teaches apply
what to do with them.
On the diff generation side, traditionally, we said "Binary
files differ\n" without giving anything other than the preimage
and postimage object name on the index line. This was good
enough for applying a patch generated from your own repository
(very useful while rebasing), because the postimage would be
available in such a case. However, this was not useful when the
recipient of such a patch via e-mail were to apply it, even if
the preimage was available.
This patch allows the diff to generate "binary" patch when
operating under --full-index option. The binary patch follows
the usual extended git diff headers, and looks like this:
"GIT binary patch\n"
<length byte><data>"\n"
...
"\n"
Each line is prefixed with a "length-byte", whose value is upper
or lowercase alphabet that encodes number of bytes that the data
on the line decodes to (1..52 -- 'A' means 1, 'B' means 2, ...,
'Z' means 26, 'a' means 27, ...). <data> is 1 or more groups of
5-byte sequence, each of which encodes up to 4 bytes in base85
encoding. Because 52 / 4 * 5 = 65 and we have the length byte,
an output line is capped to 66 characters. The payload is the
same diff-delta as we use in the packfiles.
On the consumption side, git-apply now can decode and apply the
binary patch when --allow-binary-replacement is given, the diff
was generated with --full-index, and the receiving repository
has the preimage blob, which is the same condition as it always
required when accepting an "Binary files differ\n" patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-04 23:51:44 +00:00
|
|
|
/* base85 */
|
|
|
|
int decode_85(char *dst, char *line, int linelen);
|
2006-05-05 09:41:53 +00:00
|
|
|
void encode_85(char *buf, unsigned char *data, int bytes);
|
binary patch.
This adds "binary patch" to the diff output and teaches apply
what to do with them.
On the diff generation side, traditionally, we said "Binary
files differ\n" without giving anything other than the preimage
and postimage object name on the index line. This was good
enough for applying a patch generated from your own repository
(very useful while rebasing), because the postimage would be
available in such a case. However, this was not useful when the
recipient of such a patch via e-mail were to apply it, even if
the preimage was available.
This patch allows the diff to generate "binary" patch when
operating under --full-index option. The binary patch follows
the usual extended git diff headers, and looks like this:
"GIT binary patch\n"
<length byte><data>"\n"
...
"\n"
Each line is prefixed with a "length-byte", whose value is upper
or lowercase alphabet that encodes number of bytes that the data
on the line decodes to (1..52 -- 'A' means 1, 'B' means 2, ...,
'Z' means 26, 'a' means 27, ...). <data> is 1 or more groups of
5-byte sequence, each of which encodes up to 4 bytes in base85
encoding. Because 52 / 4 * 5 = 65 and we have the length byte,
an output line is capped to 66 characters. The payload is the
same diff-delta as we use in the packfiles.
On the consumption side, git-apply now can decode and apply the
binary patch when --allow-binary-replacement is given, the diff
was generated with --full-index, and the receiving repository
has the preimage blob, which is the same condition as it always
required when accepting an "Binary files differ\n" patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-04 23:51:44 +00:00
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
#endif /* CACHE_H */
|