From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jul 2011 16:54:51 +0000 (-0700)
Subject: Merge branch 'jc/index-pack'
X-Git-Tag: v1.7.7-rc0~85
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d907bf8ef327cd47433d4a4bb0a1bb4e96b6e340;p=git.git

Merge branch 'jc/index-pack'

* jc/index-pack:
  verify-pack: use index-pack --verify
  index-pack: show histogram when emulating "verify-pack -v"
  index-pack: start learning to emulate "verify-pack -v"
  index-pack: a miniscule refactor
  index-pack --verify: read anomalous offsets from v2 idx file
  write_idx_file: need_large_offset() helper function
  index-pack: --verify
  write_idx_file: introduce a struct to hold idx customization options
  index-pack: group the delta-base array entries also by type

Conflicts:
	builtin/verify-pack.c
	cache.h
	sha1_file.c
---

d907bf8ef327cd47433d4a4bb0a1bb4e96b6e340
diff --cc builtin/index-pack.c
index 81cdc28b3,ed4c3bb13..0945adbb3
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@@ -11,9 -11,10 +11,9 @@@
  #include "exec_cmd.h"
  
  static const char index_pack_usage[] =
- "git index-pack [-v] [-o <index-file>] [ --keep | --keep=<msg> ] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
+ "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
  
 -struct object_entry
 -{
 +struct object_entry {
  	struct pack_idx_entry idx;
  	unsigned long size;
  	unsigned int hdr_size;
diff --cc cache.h
index 5e80113ee,edea69e6a..9e12d5547
--- a/cache.h
+++ b/cache.h
@@@ -1010,37 -991,6 +1010,36 @@@ extern off_t find_pack_entry_one(const 
  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 packed_object_info_detail(struct packed_git *, off_t, unsigned long *, unsigned long *, unsigned int *, unsigned char *);
 +extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
 +
 +struct object_info {
 +	/* Request */
 +	unsigned long *sizep;
 +
 +	/* Response */
 +	enum {
 +		OI_CACHED,
 +		OI_LOOSE,
 +		OI_PACKED,
 +		OI_DBCACHED
 +	} whence;
 +	union {
 +		/*
 +		 * struct {
 +		 * 	... Nothing to expose in this case
 +		 * } cached;
 +		 * struct {
 +		 * 	... Nothing to expose in this case
 +		 * } loose;
 +		 */
 +		struct {
 +			struct packed_git *pack;
 +			off_t offset;
 +			unsigned int is_delta;
 +		} packed;
 +	} u;
 +};
 +extern int sha1_object_info_extended(const unsigned char *, struct object_info *);
  
  /* Dumb servers support */
  extern int update_server_info(int);
diff --cc sha1_file.c
index a6aac7092,ca87e3d51..89d7e5eb5
--- a/sha1_file.c
+++ b/sha1_file.c
@@@ -1553,63 -1496,8 +1553,8 @@@ int unpack_object_header(struct packed_
  	return type;
  }
  
- int packed_object_info_detail(struct packed_git *p,
- 				      off_t obj_offset,
- 				      unsigned long *size,
- 				      unsigned long *store_size,
- 				      unsigned int *delta_chain_length,
- 				      unsigned char *base_sha1)
- {
- 	struct pack_window *w_curs = NULL;
- 	off_t curpos;
- 	unsigned long dummy;
- 	unsigned char *next_sha1;
- 	enum object_type type;
- 	struct revindex_entry *revidx;
- 
- 	*delta_chain_length = 0;
- 	curpos = obj_offset;
- 	type = unpack_object_header(p, &w_curs, &curpos, size);
- 
- 	revidx = find_pack_revindex(p, obj_offset);
- 	*store_size = revidx[1].offset - obj_offset;
- 
- 	for (;;) {
- 		switch (type) {
- 		default:
- 			die("pack %s contains unknown object type %d",
- 			    p->pack_name, type);
- 		case OBJ_COMMIT:
- 		case OBJ_TREE:
- 		case OBJ_BLOB:
- 		case OBJ_TAG:
- 			unuse_pack(&w_curs);
- 			return type;
- 		case OBJ_OFS_DELTA:
- 			obj_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset);
- 			if (!obj_offset)
- 				die("pack %s contains bad delta base reference of type %s",
- 				    p->pack_name, typename(type));
- 			if (*delta_chain_length == 0) {
- 				revidx = find_pack_revindex(p, obj_offset);
- 				hashcpy(base_sha1, nth_packed_object_sha1(p, revidx->nr));
- 			}
- 			break;
- 		case OBJ_REF_DELTA:
- 			next_sha1 = use_pack(p, &w_curs, curpos, NULL);
- 			if (*delta_chain_length == 0)
- 				hashcpy(base_sha1, next_sha1);
- 			obj_offset = find_pack_entry_one(next_sha1, p);
- 			break;
- 		}
- 		(*delta_chain_length)++;
- 		curpos = obj_offset;
- 		type = unpack_object_header(p, &w_curs, &curpos, &dummy);
- 	}
- }
- 
  static int packed_object_info(struct packed_git *p, off_t obj_offset,
 -			      unsigned long *sizep)
 +			      unsigned long *sizep, int *rtype)
  {
  	struct pack_window *w_curs = NULL;
  	unsigned long size;