From: Junio C Hamano <junkio@cox.net>
Date: Wed, 1 Nov 2006 23:09:55 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc1~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7854e526ff170846aef4ae3c71588c98ed9176d0?ds=inline;hp=-c

Merge branch 'maint'

* maint:
pack-objects doesn't create random pack names
link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
---

7854e526ff170846aef4ae3c71588c98ed9176d0
diff --combined Documentation/git-pack-objects.txt
index a1e55054bd,944c9e1e8f..9bd1e39feb
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@@ -9,7 -9,7 +9,7 @@@ git-pack-objects - Create a packed arch
  SYNOPSIS
  --------
  [verse]
 -'git-pack-objects' [-q] [--no-reuse-delta] [--non-empty]
 +'git-pack-objects' [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty]
  	[--local] [--incremental] [--window=N] [--depth=N]
  	[--revs [--unpacked | --all]*] [--stdout | base-name] < object-list
  
@@@ -47,9 -47,8 +47,8 @@@ base-name:
  	<base-name> to determine the name of the created file.
  	When this option is used, the two files are written in
  	<base-name>-<SHA1>.{pack,idx} files.  <SHA1> is a hash
- 	of object names (currently in random order so it does
- 	not have any useful meaning) to make the resulting
- 	filename reasonably unique, and written to the standard
+ 	of the sorted object names to make the resulting filename
+ 	based on the pack content, and written to the standard
  	output of the command.
  
  --stdout::
@@@ -111,17 -110,6 +110,17 @@@
  	This flag tells the command not to reuse existing deltas
  	but compute them from scratch.
  
 +--delta-base-offset::
 +	A packed archive can express base object of a delta as
 +	either 20-byte object name or as an offset in the
 +	stream, but older version of git does not understand the
 +	latter.  By default, git-pack-objects only uses the
 +	former format for better compatibility.  This option
 +	allows the command to use the latter format for
 +	compactness.  Depending on the average delta chain
 +	length, this option typically shrinks the resulting
 +	packfile by 3-5 per-cent.
 +
  
  Author
  ------
diff --combined sha1_file.c
index e89d24c015,5fcad2893f..570706919a
--- a/sha1_file.c
+++ b/sha1_file.c
@@@ -877,61 -877,26 +877,61 @@@ void * unpack_sha1_file(void *map, unsi
  	return unpack_sha1_rest(&stream, hdr, *size);
  }
  
 +static unsigned long get_delta_base(struct packed_git *p,
 +				    unsigned long offset,
 +				    enum object_type kind,
 +				    unsigned long delta_obj_offset,
 +				    unsigned long *base_obj_offset)
 +{
 +	unsigned char *base_info = (unsigned char *) p->pack_base + offset;
 +	unsigned long base_offset;
 +
 +	/* there must be at least 20 bytes left regardless of delta type */
 +	if (p->pack_size <= offset + 20)
 +		die("truncated pack file");
 +
 +	if (kind == OBJ_OFS_DELTA) {
 +		unsigned used = 0;
 +		unsigned char c = base_info[used++];
 +		base_offset = c & 127;
 +		while (c & 128) {
 +			base_offset += 1;
 +			if (!base_offset || base_offset & ~(~0UL >> 7))
 +				die("offset value overflow for delta base object");
 +			c = base_info[used++];
 +			base_offset = (base_offset << 7) + (c & 127);
 +		}
 +		base_offset = delta_obj_offset - base_offset;
 +		if (base_offset >= delta_obj_offset)
 +			die("delta base offset out of bound");
 +		offset += used;
 +	} else if (kind == OBJ_REF_DELTA) {
 +		/* The base entry _must_ be in the same pack */
 +		base_offset = find_pack_entry_one(base_info, p);
 +		if (!base_offset)
 +			die("failed to find delta-pack base object %s",
 +				sha1_to_hex(base_info));
 +		offset += 20;
 +	} else
 +		die("I am totally screwed");
 +	*base_obj_offset = base_offset;
 +	return offset;
 +}
 +
  /* forward declaration for a mutually recursive function */
  static int packed_object_info(struct packed_git *p, unsigned long offset,
  			      char *type, unsigned long *sizep);
  
  static int packed_delta_info(struct packed_git *p,
  			     unsigned long offset,
 +			     enum object_type kind,
 +			     unsigned long obj_offset,
  			     char *type,
  			     unsigned long *sizep)
  {
  	unsigned long base_offset;
 -	unsigned char *base_sha1 = (unsigned char *) p->pack_base + offset;
  
 -	if (p->pack_size < offset + 20)
 -		die("truncated pack file");
 -	/* The base entry _must_ be in the same pack */
 -	base_offset = find_pack_entry_one(base_sha1, p);
 -	if (!base_offset)
 -		die("failed to find delta-pack base object %s",
 -		    sha1_to_hex(base_sha1));
 -	offset += 20;
 +	offset = get_delta_base(p, offset, kind, obj_offset, &base_offset);
  
  	/* We choose to only get the type of the base object and
  	 * ignore potentially corrupt pack file that expects the delta
@@@ -994,6 -959,25 +994,6 @@@ static unsigned long unpack_object_head
  	return offset + used;
  }
  
 -int check_reuse_pack_delta(struct packed_git *p, unsigned long offset,
 -			   unsigned char *base, unsigned long *sizep,
 -			   enum object_type *kindp)
 -{
 -	unsigned long ptr;
 -	int status = -1;
 -
 -	use_packed_git(p);
 -	ptr = offset;
 -	ptr = unpack_object_header(p, ptr, kindp, sizep);
 -	if (*kindp != OBJ_DELTA)
 -		goto done;
 -	hashcpy(base, (unsigned char *) p->pack_base + ptr);
 -	status = 0;
 - done:
 -	unuse_packed_git(p);
 -	return status;
 -}
 -
  void packed_object_info_detail(struct packed_git *p,
  			       unsigned long offset,
  			       char *type,
@@@ -1002,12 -986,11 +1002,12 @@@
  			       unsigned int *delta_chain_length,
  			       unsigned char *base_sha1)
  {
 -	unsigned long val;
 +	unsigned long obj_offset, val;
  	unsigned char *next_sha1;
  	enum object_type kind;
  
  	*delta_chain_length = 0;
 +	obj_offset = offset;
  	offset = unpack_object_header(p, offset, &kind, size);
  
  	for (;;) {
@@@ -1022,13 -1005,7 +1022,13 @@@
  			strcpy(type, type_names[kind]);
  			*store_size = 0; /* notyet */
  			return;
 -		case OBJ_DELTA:
 +		case OBJ_OFS_DELTA:
 +			get_delta_base(p, offset, kind, obj_offset, &offset);
 +			if (*delta_chain_length == 0) {
 +				/* TODO: find base_sha1 as pointed by offset */
 +			}
 +			break;
 +		case OBJ_REF_DELTA:
  			if (p->pack_size <= offset + 20)
  				die("pack file %s records an incomplete delta base",
  				    p->pack_name);
@@@ -1038,7 -1015,6 +1038,7 @@@
  			offset = find_pack_entry_one(next_sha1, p);
  			break;
  		}
 +		obj_offset = offset;
  		offset = unpack_object_header(p, offset, &kind, &val);
  		(*delta_chain_length)++;
  	}
@@@ -1047,15 -1023,15 +1047,15 @@@
  static int packed_object_info(struct packed_git *p, unsigned long offset,
  			      char *type, unsigned long *sizep)
  {
 -	unsigned long size;
 +	unsigned long size, obj_offset = offset;
  	enum object_type kind;
  
  	offset = unpack_object_header(p, offset, &kind, &size);
  
 -	if (kind == OBJ_DELTA)
 -		return packed_delta_info(p, offset, type, sizep);
 -
  	switch (kind) {
 +	case OBJ_OFS_DELTA:
 +	case OBJ_REF_DELTA:
 +		return packed_delta_info(p, offset, kind, obj_offset, type, sizep);
  	case OBJ_COMMIT:
  	case OBJ_TREE:
  	case OBJ_BLOB:
@@@ -1101,15 -1077,23 +1101,15 @@@ static void *unpack_compressed_entry(st
  static void *unpack_delta_entry(struct packed_git *p,
  				unsigned long offset,
  				unsigned long delta_size,
 +				enum object_type kind,
 +				unsigned long obj_offset,
  				char *type,
  				unsigned long *sizep)
  {
  	void *delta_data, *result, *base;
  	unsigned long result_size, base_size, base_offset;
 -	unsigned char *base_sha1;
 -
 -	if (p->pack_size < offset + 20)
 -		die("truncated pack file");
 -	/* The base entry _must_ be in the same pack */
 -	base_sha1 = (unsigned char*)p->pack_base + offset;
 -	base_offset = find_pack_entry_one(base_sha1, p);
 -	if (!base_offset)
 -		die("failed to find delta-pack base object %s",
 -		    sha1_to_hex(base_sha1));
 -	offset += 20;
  
 +	offset = get_delta_base(p, offset, kind, obj_offset, &base_offset);
  	base = unpack_entry_gently(p, base_offset, type, &base_size);
  	if (!base)
  		die("failed to read delta base object at %lu from %s",
@@@ -1146,14 -1130,13 +1146,14 @@@ static void *unpack_entry(struct pack_e
  void *unpack_entry_gently(struct packed_git *p, unsigned long offset,
  			  char *type, unsigned long *sizep)
  {
 -	unsigned long size;
 +	unsigned long size, obj_offset = offset;
  	enum object_type kind;
  
  	offset = unpack_object_header(p, offset, &kind, &size);
  	switch (kind) {
 -	case OBJ_DELTA:
 -		return unpack_delta_entry(p, offset, size, type, sizep);
 +	case OBJ_OFS_DELTA:
 +	case OBJ_REF_DELTA:
 +		return unpack_delta_entry(p, offset, size, kind, obj_offset, type, sizep);
  	case OBJ_COMMIT:
  	case OBJ_TREE:
  	case OBJ_BLOB:
@@@ -1400,8 -1383,10 +1400,10 @@@ static int link_temp_to_file(const cha
  	if (dir) {
  		*dir = 0;
  		mkdir(filename, 0777);
- 		if (adjust_shared_perm(filename))
+ 		if (adjust_shared_perm(filename)) {
+ 			*dir = '/';
  			return -2;
+ 		}
  		*dir = '/';
  		if (!link(tmpfile, filename))
  			return 0;