Code

git.git
17 years agoAllow creating branches without committing in fast-import.
Shawn O. Pearce [Fri, 12 Jan 2007 03:28:39 +0000 (22:28 -0500)]
Allow creating branches without committing in fast-import.

Some importers may want to create a branch long before they actually
commit to it, or in some cases they may never commit to the branch
but they still need the ref to be created in the repository after
the import is complete.

This extends the 'reset ' command to automatically create a new
branch if the supplied reference isn't already known as a branch.

While I'm at it I also modified the syntax of the reset command
to terminate with an empty line, like commit and tag operate.
This just makes the command set more consistent.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoSupport creation of merge commits in fast-import.
Shawn O. Pearce [Fri, 12 Jan 2007 03:21:38 +0000 (22:21 -0500)]
Support creation of merge commits in fast-import.

Some importers are able to determine when branch merges occurred
within their source data.  In these cases they will want to supply
the correct commits to fast-import so that a proper merge commit
will exist in Git.  This is now supported by supplying a 'merge '
command after the commit message and optional from command.

A merge is not actually performed by fast-import, its assumed that
the frontend performed any sort of merging activity already and
that fast-import should simply be storing its result.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoFix repository corruption when using marks for modified blobs.
Shawn O. Pearce [Fri, 12 Jan 2007 02:25:01 +0000 (21:25 -0500)]
Fix repository corruption when using marks for modified blobs.

Apparently we did not copy the blob SHA1 into the stack variable
'sha1' when a mark is used to refer to a prior blob.  This code
was not previously tested as the Mozilla CVS -> git-fast-import
program always fed us full SHA1s for modified blobs and did not
use the mark feature there.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAdditional fast-import tree delta corruption cleanups.
Shawn O. Pearce [Tue, 29 Aug 2006 02:06:13 +0000 (22:06 -0400)]
Additional fast-import tree delta corruption cleanups.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoCorrect tree corruption problems in fast-import.
Shawn O. Pearce [Tue, 29 Aug 2006 01:43:04 +0000 (21:43 -0400)]
Correct tree corruption problems in fast-import.

The new tree delta implementation caused blob SHA1s to be used
instead of a tree SHA1 when a tree was written out.  This really
only appeared to happen when converting an existing file to a tree,
but may have been possible in some other situations.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoReplace ywrite in fast-import with the standard write_or_die.
Shawn O. Pearce [Mon, 28 Aug 2006 17:54:01 +0000 (13:54 -0400)]
Replace ywrite in fast-import with the standard write_or_die.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoReuse the same buffer for all commits/tags in fast-import.
Shawn O. Pearce [Mon, 28 Aug 2006 17:15:48 +0000 (13:15 -0400)]
Reuse the same buffer for all commits/tags in fast-import.

Since most commits and tag objects are around the same size and we
only generate one at a time we can reuse the same buffer rather than
xmalloc'ing and free'ing the buffer every time we generate a commit.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoRecycle data buffers for tree generation in fast-import.
Shawn O. Pearce [Mon, 28 Aug 2006 17:02:51 +0000 (13:02 -0400)]
Recycle data buffers for tree generation in fast-import.

We only ever generate at most two tree streams at a time.  Since most
trees are around the same size we can simply recycle the buffers from
one tree generation to the next rather than constantly xmalloc'ing
and free'ing them.  This should perform slightly better when handling
a large number of trees as malloc has less work to do.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoImplemented tree delta compression in fast-import.
Shawn O. Pearce [Mon, 28 Aug 2006 16:22:50 +0000 (12:22 -0400)]
Implemented tree delta compression in fast-import.

We now store for every tree entry two modes and two sha1 values;
the base (aka "version 0") and the current/new (aka "version 1").
When we generate a tree object we also regenerate the prior version
object and use that as our base object for a delta.  This strategy
saves a significant amount of memory as we can continue to use the
atom pool for file/directory names and only increases each tree
entry by an additional 24 bytes of memory.

Branches should automatically delta against their ancestor tree,
unless the ancestor tree is already at the delta chain limit.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoConverted hash memcpy/memcmp to new hashcpy/hashcmp/hashclr.
Shawn O. Pearce [Mon, 28 Aug 2006 14:46:58 +0000 (10:46 -0400)]
Converted hash memcpy/memcmp to new hashcpy/hashcmp/hashclr.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoDon't crash fast-import if no branch log was requested.
Shawn O. Pearce [Mon, 28 Aug 2006 00:13:44 +0000 (20:13 -0400)]
Don't crash fast-import if no branch log was requested.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAdded 'reset' command to clear a branch's tree.
Shawn O. Pearce [Sun, 27 Aug 2006 10:20:49 +0000 (06:20 -0400)]
Added 'reset' command to clear a branch's tree.

Sometimes an import frontend may need to work with a temporary branch
which will actually contain many different branches over the life
of the import.  This is especially useful when the frontend needs
to create a tag from a set of file versions which are otherwise
never a commit.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoMap only part of the generated pack file at any point in time.
Shawn O. Pearce [Sun, 27 Aug 2006 09:53:48 +0000 (05:53 -0400)]
Map only part of the generated pack file at any point in time.

When generating a very large pack file (for example close to 1 GB
in size) it may be impossible for the kernel to find a contiguous
free range within a 32 bit address space for the mapping to be
located at.  This is especially problematic on large imports where
there is a lot of malloc activity occuring within the same process
and the malloc'd regions may straddle the previously mapped regions,
thereby creating large holes in the address space.

So instead we map only 128 MB of the pack at any given time.
This will likely increase the number of times the file gets mapped
(with additional system time required to update the page tables
more frequently) but will allow the program to handle packs up to
4 GB in size.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoFixed compile error in fast-import.
Shawn O. Pearce [Sun, 27 Aug 2006 03:37:31 +0000 (23:37 -0400)]
Fixed compile error in fast-import.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoFixed GPF in fast-import caused by unterminated linked list.
Shawn O. Pearce [Sun, 27 Aug 2006 02:38:02 +0000 (22:38 -0400)]
Fixed GPF in fast-import caused by unterminated linked list.

fast-import was encounting a GPF when it ran out of free tree_entry
objects but didn't know this was the cause because the last
tree_entry wasn't terminated with a NULL pointer.  The missing NULL
pointer occurred when we allocated additional entries via xmalloc
but didn't set the last tree_entry's "next" pointer to NULL.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAdded --branch-log to option to fast-import.
Shawn O. Pearce [Sat, 26 Aug 2006 03:07:06 +0000 (23:07 -0400)]
Added --branch-log to option to fast-import.

This option can be used to have a record of every commit, the mark
(if supplied) and branch name of the commit recorded into a log file
when the commit is generated.  This log can be useful to verify the
results of an import as the commits can be compared to some source
repository matching commits through the mark value.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAdded option to export the marks table when fast-import terminates.
Shawn O. Pearce [Fri, 25 Aug 2006 20:03:04 +0000 (16:03 -0400)]
Added option to export the marks table when fast-import terminates.

The marks table can be used by the frontend to load any commit after
the import and compare it to whatever data the frontend knows about
that commit.  If the mark idnums can be easily correlated to some
reference source then its relatively trivial to compare the GIT
tree to the reference to verify the accuracy of the import.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAccount for tree entry memory costs in fast-import.
Shawn O. Pearce [Fri, 25 Aug 2006 18:53:32 +0000 (14:53 -0400)]
Account for tree entry memory costs in fast-import.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoMoved from command to after data to help cvs2svn.
Shawn O. Pearce [Fri, 25 Aug 2006 02:38:13 +0000 (22:38 -0400)]
Moved from command to after data to help cvs2svn.

cvs2svn has three phases: begin_commit, middle_commit, end_commit.
The ancester is computed in the middle_commit phase. So its easier
to generate a stream if the from command appears after the commit
message itself but before the file change commands.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoRemove branch creation command from fast-import.
Shawn O. Pearce [Thu, 24 Aug 2006 22:45:26 +0000 (18:45 -0400)]
Remove branch creation command from fast-import.

Jon Smirl was finding it difficult to alter cvs2svn to generate
branch commands prior to the first commit of the same branch.
This change moves the 'from' command to be an optional parameter of
the 'commit' command, thereby allowing a new branch to be defined
at the moment it gets used to create the first commit on that branch.

This change makes it impossible to create a branch with no commits
on it as at least one commit is needed to register the branch.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoRound out memory pool allocations in fast-import to pointer sizes.
Shawn O. Pearce [Thu, 24 Aug 2006 08:46:29 +0000 (04:46 -0400)]
Round out memory pool allocations in fast-import to pointer sizes.

Some architectures (e.g. SPARC) would require that we access pointers
only on pointer-sized alignments.  So ensure the pool allocator
rounds out non-pointer sized allocations to the next pointer so we
don't generate bad memory addresses.  This could have occurred if
we had previously allocated an atom whose string was not a whole
multiple of the pointer size, for example.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoImplemented tree reloading in fast-import.
Shawn O. Pearce [Thu, 24 Aug 2006 08:37:35 +0000 (04:37 -0400)]
Implemented tree reloading in fast-import.

Tree reloading allows fast-import to swap out the least-recently used
branch by simply deallocating the data structures from memory that
were associated with that branch.  Later if the branch becomes active
again it can lazily recreate those structures on demand by reloading
the necessary trees from the pack file it originally wrote them to.

The reloading process is implemented by mmap'ing the pack into
memory and using a much tighter variant of the pack reading code
contained in sha1_file.c.  This was a blatent copy from sha1_file.c
but the unpacking functions were significantly simplified and are
actually now in a form that should make it easier to map only the
necessary regions of a pack rather than the entire file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoImplemented 'tag' command in fast-import.
Shawn O. Pearce [Thu, 24 Aug 2006 07:12:13 +0000 (03:12 -0400)]
Implemented 'tag' command in fast-import.

Tags received from the frontend are generated in memory in a simple
linked list in the order that the tag commands were sent by the
frontend.  If multiple different tag objects for the same tag name
get generated the last one sent by the frontend will be the one
that gets written out at termination.  Multiple tag objects for
the same name will cause all older tags of the same name to be lost.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAdded branch load counter to fast-import.
Shawn O. Pearce [Wed, 23 Aug 2006 08:31:12 +0000 (04:31 -0400)]
Added branch load counter to fast-import.

If the branch load count exceeds the number of branches created then
the frontend is causing fast-import to page branches into and out of
memory due to the way its ordering its commits.  Performance can
likely be increased if the frontend were to alter its commit
sequence such that it stays on one branch before switching to another
branch, then never returns to the prior branch.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAdded mark store/find to fast-import.
Shawn O. Pearce [Wed, 23 Aug 2006 08:17:45 +0000 (04:17 -0400)]
Added mark store/find to fast-import.

Marks are now saved when the mark directive gets used by the frontend
and may be used in place of a SHA1 expression to locate a previous
SHA1 which fast-import may have generated.  This is particularly
useful with commits where the frontend does not (easily) have the
ability to compute the SHA1 for an arbitrary commit but needs it
to generate a branch or tag from that commit.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoConverted fast-import to accept standard command line parameters.
Shawn O. Pearce [Wed, 23 Aug 2006 06:00:31 +0000 (02:00 -0400)]
Converted fast-import to accept standard command line parameters.

The following command line options are now accepted before the
pack name:

  --objects=n           # replaces the object count after the pack name
  --depth=n             # delta chain depth to use (default is 10)
  --active-branches=n   # maximum number of branches to keep in memory

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoFixed segfault in fast-import after growing a tree.
Shawn O. Pearce [Wed, 23 Aug 2006 05:33:47 +0000 (01:33 -0400)]
Fixed segfault in fast-import after growing a tree.

Growing a tree caused all subtrees to be deallocated and put back
into the free list yet those subtree's contents were still actively
in use.  Consequently they were doled out again and got stomped
on elsewhere.  Releasing a tree is now performed in two parts,
either releasing only the content array or releasing the content
array and recursively releasing the subtree(s).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAllow symlink blobs in trees during fast-import.
Shawn O. Pearce [Mon, 21 Aug 2006 07:29:13 +0000 (03:29 -0400)]
Allow symlink blobs in trees during fast-import.

If a frontend is smart enough to import a symlink then we should
let them do so.  We'll assume that they were smart enough to first
generate a blob to hold the link target, as that's how symlinks
get represented in GIT.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoChanged fast-import's pack header creation to use pack.h
Shawn O. Pearce [Wed, 16 Aug 2006 05:57:57 +0000 (01:57 -0400)]
Changed fast-import's pack header creation to use pack.h

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoConverted fast-import to a text based protocol.
Shawn O. Pearce [Tue, 15 Aug 2006 00:16:28 +0000 (20:16 -0400)]
Converted fast-import to a text based protocol.

Frontend clients can now send a text stream to fast-import rather
than a binary stream.  This should facilitate developing frontend
software as the data stream is easier to view, manipulate and debug
my hand and Mark-I eyeball.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoImplement blob ID validation in fast-import.
Shawn O. Pearce [Mon, 14 Aug 2006 06:50:18 +0000 (02:50 -0400)]
Implement blob ID validation in fast-import.

When accepting revision SHA1 IDs from the frontend verify the SHA1
actually refers to a blob and is known to exist.  Its an error
to use a SHA1 in a tree if the blob doesn't exist as this would
cause git-fsck-objects to report a missing blob should the pack get
closed without the blob being appended into it or a subsequent pack.
So right now we'll just ask that the frontend "pre-declare" any
blobs it wants to use in a tree before it can use them.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAdded tree and commit writing to fast-import.
Shawn O. Pearce [Mon, 14 Aug 2006 04:58:19 +0000 (00:58 -0400)]
Added tree and commit writing to fast-import.

The tree of the current commit can be altered by file_change commands
before the commit gets written to the pack.  The file changes are
rather primitive as they simply allow removal of a tree entry or
setting/adding a tree entry.

Currently trees and commits aren't being deltafied when written to
the pack and branch reloading from the current pack doesn't work,
so at most 5 branches can be worked with at any one time.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoImplemented branch handling and basic tree support in fast-import.
Shawn O. Pearce [Tue, 8 Aug 2006 07:36:45 +0000 (03:36 -0400)]
Implemented branch handling and basic tree support in fast-import.

This provides the basic data structures needed to store trees in
memory while we are processing them for a branch.  What we are
attempting to do is track one complete tree for each branch that
the frontend has registered with us through the 'newb' (new_branch)
command.  When the frontend edits that tree through 'updf' or 'delf'
commands we'll mark the affected tree(s) as being dirty and recompute
their objects during 'comt' (commit).

Currently the protocol is decidedly _not_ user friendly.  I crashed
fast-import by giving it bad input data from Perl.  I may try to
improve upon it, or at least upon its error handling.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAdded basic command handler to fast-import.
Shawn O. Pearce [Tue, 8 Aug 2006 05:14:21 +0000 (01:14 -0400)]
Added basic command handler to fast-import.

Moved the new_blob logic off into a new subroutine and
invoked it when getting the 'blob' command.

Added statistics dump to STDERR when the program terminates listing
what it did at a high level.  This is somewhat interesting.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoRefactored fast-import's internals for future additions.
Shawn O. Pearce [Tue, 8 Aug 2006 04:46:13 +0000 (00:46 -0400)]
Refactored fast-import's internals for future additions.

Too many globals variables were being used not not enough
code was resuable to process trees and commits so this is
a simple refactoring of the existing blob processing code
to get into a state that will be easier to handle trees
and commits in.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoCleaned up memory allocation for object_entry structs.
Shawn O. Pearce [Tue, 8 Aug 2006 04:03:59 +0000 (00:03 -0400)]
Cleaned up memory allocation for object_entry structs.

Although its easy to ask the user to tell us how many objects they
will need, its probably better to dynamically grow the object table
in large units.  But if the user can give us a hint as to roughly
how many objects then we can still use it during startup.

Also stopped printing the SHA1 strings to stdout as no user is
currently making use of that facility.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoAdded automatic index generation to fast-import.
Shawn O. Pearce [Sun, 6 Aug 2006 17:51:39 +0000 (13:51 -0400)]
Added automatic index generation to fast-import.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
17 years agoCreated fast-import, a tool to quickly generating a pack from blobs.
Shawn O. Pearce [Sat, 5 Aug 2006 06:04:21 +0000 (02:04 -0400)]
Created fast-import, a tool to quickly generating a pack from blobs.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
18 years agoConvert memset(hash,0,20) to hashclr(hash).
Junio C Hamano [Wed, 23 Aug 2006 20:57:23 +0000 (13:57 -0700)]
Convert memset(hash,0,20) to hashclr(hash).

In the same spirit as hashcmp() and hashcpy().

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoConvert memcpy(a,b,20) to hashcpy(a,b).
Shawn Pearce [Wed, 23 Aug 2006 06:49:00 +0000 (02:49 -0400)]
Convert memcpy(a,b,20) to hashcpy(a,b).

This abstracts away the size of the hash values when copying them
from memory location to memory location, much as the introduction
of hashcmp abstracted away hash value comparsion.

A few call sites were using char* rather than unsigned char* so
I added the cast rather than open hashcpy to be void*.  This is a
reasonable tradeoff as most call sites already use unsigned char*
and the existing hashcmp is also declared to be unsigned char*.

[jc: Splitted the patch to "master" part, to be followed by a
 patch for merge-recursive.c which is not in "master" yet.

 Fixed the cast in the latter hunk to combine-diff.c which was
 wrong in the original.

 Also converted ones left-over in combine-diff.c, diff-lib.c and
 upload-pack.c ]

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix a comparison bug in diff-delta.c
Pierre Habouzit [Wed, 23 Aug 2006 09:17:55 +0000 (11:17 +0200)]
Fix a comparison bug in diff-delta.c

(1 << i) < hspace is compared in the `int` space rather that in the
unsigned one.  the result will be wrong if hspace is between 0x40000000
and 0x80000000.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-send-email: Don't set author_not_sender from Cc: lines
Haavard Skinnemoen [Wed, 23 Aug 2006 10:02:59 +0000 (03:02 -0700)]
git-send-email: Don't set author_not_sender from Cc: lines

When an mbox-style patch contains a Cc: line in the header,
git-send-email will check the address against the sender specified
on the command line. If they don't match, sender_not_author will
be set to the address obtained from the Cc line.

When this happens, git-send-email inserts a From: line at the
beginning of the message body with the address obtained from the
Cc line in the header, and the sender might be accused of forging
patch authors.

This patch fixes this by only updating sender_not_author when
processing From: lines, not when processing Cc: lines.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove unnecessary forward declaration of unpack_entry.
Shawn Pearce [Mon, 21 Aug 2006 07:10:36 +0000 (03:10 -0400)]
Remove unnecessary forward declaration of unpack_entry.

This declaration probably used to be necessary but the code has
been refactored since to use unpack_entry_gently instead.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoVerify we know how to read a pack before trying to using it.
Shawn Pearce [Mon, 21 Aug 2006 07:10:02 +0000 (03:10 -0400)]
Verify we know how to read a pack before trying to using it.

If the pack format were to ever change or be extended in the future
there is no assurance that just because the pack file lives in
objects/pack and doesn't end in .idx that we can read and decompress
its contents properly.

If we encounter what we think is a pack file and it isn't or we don't
recognize its version then die and suggest to the user that they
upgrade to a newer version of GIT which can handle that pack file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd write_or_die(), a helper function
Rene Scharfe [Mon, 21 Aug 2006 18:43:43 +0000 (20:43 +0200)]
Add write_or_die(), a helper function

The little helper write_or_die() won't come back with bad news about
full disks or broken pipes.  It either succeeds or terminates the
program, making additional error handling unnecessary.

This patch adds the new function and uses it to replace two similar
ones (the one in tar-tree originally has been copied from cat-file
btw.).  I chose to add the fd parameter which both lacked to make
write_or_die() just as flexible as write() and thus suitable for
lib-ification.

There is a regression: error messages emitted by this function don't
show the program name, while the replaced two functions did.  That's
acceptable, I think; a lot of other functions do the same.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAxe the last ent
Rene Scharfe [Mon, 21 Aug 2006 18:11:48 +0000 (20:11 +0200)]
Axe the last ent

In the name of Standardization, this cleanses the last usage string of
mystical creatures.  But they still dwell deep within the source and in
some debug messages, it is said.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'maint'
Junio C Hamano [Mon, 21 Aug 2006 21:16:38 +0000 (14:16 -0700)]
Merge branch 'maint'

* maint:
  builtin-mv: readability patch
  git-mv: fix off-by-one error
  git-mv: special case destination "."

18 years agobuiltin-mv: readability patch
Johannes Schindelin [Sat, 19 Aug 2006 14:52:21 +0000 (16:52 +0200)]
builtin-mv: readability patch

The old version was not liked at all. This is hopefully better. Oh, and it
gets rid of the goto.

Note that it does not change any functionality.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-mv: fix off-by-one error
Johannes Schindelin [Mon, 21 Aug 2006 20:22:25 +0000 (22:22 +0200)]
git-mv: fix off-by-one error

Embarassing.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-mv: special case destination "."
Johannes Schindelin [Fri, 18 Aug 2006 10:42:39 +0000 (12:42 +0200)]
git-mv: special case destination "."

Since the normalized basename of "." is "", the check for directory
failed erroneously.

Noticed by Fredrik Kuivinen.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-mv: readability patch
Johannes Schindelin [Sat, 19 Aug 2006 14:52:21 +0000 (16:52 +0200)]
builtin-mv: readability patch

The old version was not liked at all. This is hopefully better. Oh, and it
gets rid of the goto.

Note that it does not change any functionality.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoIndentation fix.
Tilman Sauerbeck [Thu, 17 Aug 2006 18:44:16 +0000 (20:44 +0200)]
Indentation fix.

Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDo not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
David Rientjes [Thu, 17 Aug 2006 18:54:57 +0000 (11:54 -0700)]
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.

Introduces global inline:

hashcmp(const unsigned char *sha1, const unsigned char *sha2)

Uses memcmp for comparison and returns the result based on the length of
the hash name (a future runtime decision).

Acked-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Uniquify version info output, add meta generator in page header
Jakub Narebski [Thu, 17 Aug 2006 09:21:28 +0000 (11:21 +0200)]
gitweb: Uniquify version info output, add meta generator in page header

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/format-patch'
Junio C Hamano [Thu, 17 Aug 2006 02:27:03 +0000 (19:27 -0700)]
Merge branch 'jc/format-patch'

* jc/format-patch:
  Add a newline before appending "Signed-off-by: " line

18 years agoBe nicer if git executable is not installed
Ville Skyttä [Wed, 16 Aug 2006 20:12:26 +0000 (23:12 +0300)]
Be nicer if git executable is not installed

This patch avoids problems if vc-git.el is installed and activated, but
the git executable is not available, for example
http://list-archive.xemacs.org/xemacs-beta/200608/msg00062.html

Signed-off-by: Ville Skyttä <scop@xemacs.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/racy'
Junio C Hamano [Wed, 16 Aug 2006 21:00:34 +0000 (14:00 -0700)]
Merge branch 'jc/racy'

* jc/racy:
  Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
  Add check program "git-check-racy"
  Documentation/technical/racy-git.txt
  avoid nanosleep(2)

18 years agoMerge branch 'maint'
Junio C Hamano [Wed, 16 Aug 2006 21:00:12 +0000 (14:00 -0700)]
Merge branch 'maint'

* maint:
  [PATCH] git-mv: add more path normalization

18 years agobuiltin-grep: remove unused debugging cruft.
Junio C Hamano [Wed, 16 Aug 2006 20:58:32 +0000 (13:58 -0700)]
builtin-grep: remove unused debugging cruft.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Add support for per project git URLs
Jakub Narebski [Wed, 16 Aug 2006 12:50:34 +0000 (14:50 +0200)]
gitweb: Add support for per project git URLs

It is now possible for project to have individual clone/fetch URLs.
They are provided in new file 'cloneurl' added below project's
$GIT_DIR directory.

If there is no cloneurl file, concatenation of git base URLs with
project name is used.

This is merge of Jakub Narebski and David Rientjes
  gitweb: Show project's git URL on summary page
with Aneesh Kumar
  gitweb: Add support for cloneurl.
  gitweb: Support multiple clone urls
patches.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago[PATCH] git-mv: add more path normalization
Johannes Schindelin [Wed, 16 Aug 2006 08:44:02 +0000 (10:44 +0200)]
[PATCH] git-mv: add more path normalization

We already use the normalization from get_pathspec(), but now we also
remove a trailing slash. So,

git mv some_path/ into_some_path/

works now.

Also, move the "can not move directory into itself" test before the
subdirectory expansion.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove the "delay writing to avoid runtime penalty of racy-git avoidance"
Junio C Hamano [Wed, 16 Aug 2006 04:40:43 +0000 (21:40 -0700)]
Remove the "delay writing to avoid runtime penalty of racy-git avoidance"

The work-around should not be needed.  Even if it turns out we
would want it later, git will remember the patch for us ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: consolidate action URL generation.
Martin Waitz [Tue, 15 Aug 2006 22:24:30 +0000 (00:24 +0200)]
gitweb: consolidate action URL generation.

Use the href() function instead of string concatenation to generate
most URLs to our own CGI.
This is a work in progress, not everything has been converted yet.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: provide function to format the URL for an action link.
Martin Waitz [Tue, 15 Aug 2006 22:23:50 +0000 (00:23 +0200)]
gitweb: provide function to format the URL for an action link.

Provide a new function which can be used to generate an URL for the CGI.
This makes it possible to consolidate the URL generation in order to make
it easier to change the encoding of actions into URLs.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Show project's git URL on summary page
Jakub Narebski [Tue, 15 Aug 2006 21:03:17 +0000 (23:03 +0200)]
gitweb: Show project's git URL on summary page

From 31e4de9f22a3b17d4ad0ac800132e4e1a0a15006 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Tue, 15 Aug 2006 11:43:04 -0700
Subject: [PATCH] gitweb: Show project's git URL on summary page

Add support for showing multiple clone/fetch git URLs for project on
a summary page. URL for project is created from base URL and project
name.

For example for XMMS2 project (xmms.se) the git base URL would be
git://git.xmms.se/xmms2.

With corrections from David Rientjes <rientjes@google.com>

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd check program "git-check-racy"
Junio C Hamano [Wed, 16 Aug 2006 04:38:07 +0000 (21:38 -0700)]
Add check program "git-check-racy"

This will help counting the racily clean paths, but it should be
useless for daily use.  Do not even enable it in the makefile.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/technical/racy-git.txt
Junio C Hamano [Tue, 15 Aug 2006 20:09:49 +0000 (13:09 -0700)]
Documentation/technical/racy-git.txt

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoremove unnecessary initializations
David Rientjes [Tue, 15 Aug 2006 17:23:48 +0000 (10:23 -0700)]
remove unnecessary initializations

[jc: I needed to hand merge the changes to the updated codebase,
 so the result needs to be checked.]

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'maint'
Junio C Hamano [Wed, 16 Aug 2006 04:15:32 +0000 (21:15 -0700)]
Merge branch 'maint'

* maint:
  finish_connect(): thinkofix
  git-mv: succeed even if source is a prefix of destination
  Solaris does not support C99 format strings before version 10

18 years agofinish_connect(): thinkofix
Junio C Hamano [Tue, 15 Aug 2006 23:28:08 +0000 (16:28 -0700)]
finish_connect(): thinkofix

All but one callers have ignore the return value from this
function, but the only caller, builtin-tar-tree.c::remote_tar(),
assumed it returns non-zero on failure and zero on success.  The
implementation however was returning either the waited pid
(which must be the same as its input) or -1 (an error).

Fix this thinko, while getting rid of an assignment of return
value from waitpid() into a variable of type int.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-mv: succeed even if source is a prefix of destination
Johannes Schindelin [Wed, 16 Aug 2006 00:20:32 +0000 (02:20 +0200)]
git-mv: succeed even if source is a prefix of destination

As noted by Fredrik Kuivinen, without this patch, git-mv fails on

git-mv README README-renamed

because "README" is a prefix of "README-renamed".

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agouse appropriate typedefs
David Rientjes [Tue, 15 Aug 2006 17:40:06 +0000 (10:40 -0700)]
use appropriate typedefs

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomake inline is_null_sha1 global
David Rientjes [Tue, 15 Aug 2006 20:37:19 +0000 (13:37 -0700)]
make inline is_null_sha1 global

Replace sha1 comparisons to null_sha1 with a global inline (which previously an
unused static inline in builtin-apply.c)

[jc: with a fix from Jonas Fonseca.]

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoavoid nanosleep(2)
Junio C Hamano [Tue, 15 Aug 2006 10:39:47 +0000 (03:39 -0700)]
avoid nanosleep(2)

On Solaris nanosleep(2) is not available in libc; you need to
link with -lrt to get it.

The purpose of the loop is to wait until the next filesystem
timestamp granularity, and the code uses subsecond sleep in the
hope that it can shorten the delay to 0.5 seconds on average
instead of a full second.  It is probably not worth depending on
an extra library for this.

We might want to yank out the whole "racy-git avoidance is
costly later at runtime, so let's delay writing the index out"
codepath later, but that is a separate issue and needs some
testing on large trees to figure it out.  After playing with the
kernel tree, I have a feeling that the whole thing may not be
worth it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-apply --binary: clean up and prepare for --reverse
Junio C Hamano [Tue, 15 Aug 2006 09:23:06 +0000 (02:23 -0700)]
git-apply --binary: clean up and prepare for --reverse

This cleans up the implementation of "git-apply --binary", and
implements reverse application of binary patches (when git-diff
is converted to emit reversible binary patches).

Earlier, the types of encoding (either deflated literal or
deflated delta) were stored in is_binary field in struct patch,
which meant that we cannot store more than one fragment that
differ in the encoding for a patch.  This moves the information
to a field in struct fragment that is otherwise unused for
binary patches, and makes it possible to hang two (or more, but
two is enough) hunks for a binary patch.

The original "binary patch" output from git-diff is internally
parsed into an "is_binary" patch with one fragment.  Upcoming
reversible binary patch output will have two fragments, the
first one being the forward patch and the second one the reverse
patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoFix detection of ipv6 on Solaris
Dennis Stosberg [Tue, 15 Aug 2006 09:01:27 +0000 (11:01 +0200)]
Fix detection of ipv6 on Solaris

The configuration script detects whether linking with -lsocket is
necessary but doesn't add -lsocket to LIBS.  This lets the ipv6 test
fail.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoLook for sockaddr_storage in sys/socket.h
Dennis Stosberg [Tue, 15 Aug 2006 09:01:25 +0000 (11:01 +0200)]
Look for sockaddr_storage in sys/socket.h

On Solaris and the BSDs the definition of "struct sockaddr_storage"
is not available from "netinet/in.h".  On Solaris "sys/socket.h" is
enough, at least OpenBSD needs "sys/types.h", too.

Using "sys/types.h" and "sys/socket.h" seems to be a more portable
way.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSolaris has strlcpy() at least since version 8
Dennis Stosberg [Tue, 15 Aug 2006 09:01:20 +0000 (11:01 +0200)]
Solaris has strlcpy() at least since version 8

See http://docs.sun.com/app/docs/doc/816-3321/6m9k23sjk?a=view

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoSolaris does not support C99 format strings before version 10
Dennis Stosberg [Tue, 15 Aug 2006 09:01:22 +0000 (11:01 +0200)]
Solaris does not support C99 format strings before version 10

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-apply --reverse: simplify reverse option.
Junio C Hamano [Tue, 15 Aug 2006 06:26:51 +0000 (23:26 -0700)]
git-apply --reverse: simplify reverse option.

Having is_reverse in each patch did not make sense.  This will hopefully
simplify the work needed to introduce reversible binary diff format.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot4116 apply --reverse test
Junio C Hamano [Tue, 15 Aug 2006 06:24:55 +0000 (23:24 -0700)]
t4116 apply --reverse test

The binary patch test needs to be made more careful not to have
the postimage blob in the repository in which the patch is applied

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake sha1flush void and remove conditional return.
David Rientjes [Mon, 14 Aug 2006 20:32:01 +0000 (13:32 -0700)]
Make sha1flush void and remove conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake upload_pack void and remove conditional return.
David Rientjes [Mon, 14 Aug 2006 20:40:51 +0000 (13:40 -0700)]
Make upload_pack void and remove conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake track_tree_refs void.
David Rientjes [Mon, 14 Aug 2006 20:40:06 +0000 (13:40 -0700)]
Make track_tree_refs void.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake pack_objects void.
David Rientjes [Mon, 14 Aug 2006 20:38:50 +0000 (13:38 -0700)]
Make pack_objects void.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake fsck_dir void.
David Rientjes [Mon, 14 Aug 2006 20:36:18 +0000 (13:36 -0700)]
Make fsck_dir void.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake checkout_all void.
David Rientjes [Mon, 14 Aug 2006 20:20:12 +0000 (13:20 -0700)]
Make checkout_all void.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake show_entry void
David Rientjes [Mon, 14 Aug 2006 20:39:27 +0000 (13:39 -0700)]
Make show_entry void

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake pprint_tag void and cleans up call in cmd_cat_file.
David Rientjes [Mon, 14 Aug 2006 20:19:15 +0000 (13:19 -0700)]
Make pprint_tag void and cleans up call in cmd_cat_file.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove combine-diff.c::uninteresting()
Junio C Hamano [Tue, 15 Aug 2006 01:36:00 +0000 (18:36 -0700)]
Remove combine-diff.c::uninteresting()

A patch from David Rientjes made me realize we do not have to have
this function -- just call diff_unmodified_pair() directly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoread-cache.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:38:14 +0000 (13:38 -0700)]
read-cache.c cleanup

Removes conditional returns.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agohttp-push.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:37:05 +0000 (13:37 -0700)]
http-push.c cleanup

Removes conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agodiff.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:34:16 +0000 (13:34 -0700)]
diff.c cleanup

Removes conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-push.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:26:58 +0000 (13:26 -0700)]
builtin-push.c cleanup

Removes conditional return in builtin-push.c

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-grep.c cleanup
David Rientjes [Mon, 14 Aug 2006 20:22:15 +0000 (13:22 -0700)]
builtin-grep.c cleanup

Removes conditional return.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoblame.c return cleanup
David Rientjes [Mon, 14 Aug 2006 20:18:11 +0000 (13:18 -0700)]
blame.c return cleanup

Removes conditional from return

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: configurable home link string
Yasushi SHOJI [Mon, 14 Aug 2006 22:50:49 +0000 (07:50 +0900)]
gitweb: configurable home link string

I've always found difficult to figure out git URL for clone from
gitweb URL because git:// and http:// are different on many site
including kernel.org.

I've found this enhancement at http://dev.laptop.org/git when I was on
git channel, and thought that it'd be nice if all public gitweb site
show it's git URL on its page.

This patch allow us to change the home link string.  The current
default is "projects" as we all see on gitweb now.

ie. kernel.org might set this variable to "git://git.kernel.org/pub/scm/"

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Separate printing difftree in git_commit into git_difftree_body
Jakub Narebski [Mon, 14 Aug 2006 00:18:33 +0000 (02:18 +0200)]
gitweb: Separate printing difftree in git_commit into git_difftree_body

Separate printing difftree in git_commit into separate
git_difftree_body subroutine. Add support for "C" (copied) status. For
"M" and "C" add parameter 'fp' (filename parent) to the "diff" link;
currently not supported by git_blobdiff ("blobdiff" action).

Reindented, realigned, added comments.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: True fix: Support for the standard mime.types map in gitweb
Jakub Narebski [Mon, 14 Aug 2006 00:16:33 +0000 (02:16 +0200)]
gitweb: True fix: Support for the standard mime.types map in gitweb

True fix for error in mimetype_guess, error introduced in original commit
2d00737489b8c61ed616b261c7c9bd314e2b0b41 and later fixed temporarily
by commenting out the line that caused error in commit
57bd4d3523efecf60197040cad34154aff4ddf80.

Gitweb now supports mime.types map $mimetypes_file relative to project.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitweb: Skip comments in mime.types like file
Jakub Narebski [Mon, 14 Aug 2006 00:15:22 +0000 (02:15 +0200)]
gitweb: Skip comments in mime.types like file

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>