gitweb.git
contrib/git-svn: optimize sequential commits to svnEric Wong Sun, 26 Feb 2006 10:22:27 +0000 (02:22 -0800)

contrib/git-svn: optimize sequential commits to svn

Avoid running 'svn up' to a previous revision if we know the
revision we just committed is the first descendant of the
revision we came from.

This reduces the time to do a series of commits by about 25%.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

contrib/git-svn: add show-ignore commandEric Wong Sun, 26 Feb 2006 10:22:27 +0000 (02:22 -0800)

contrib/git-svn: add show-ignore command

Recursively finds and lists the svn:ignore property on
directories. The output is suitable for appending to the
$GIT_DIR/info/exclude file.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

annotate: Use qx{} for pipes on activestate.Ryan Anderson Sun, 26 Feb 2006 21:09:12 +0000 (16:09 -0500)

annotate: Use qx{} for pipes on activestate.

Note: This needs someone to tell me what the value of $^O is on ActiveState.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

annotate: Convert all -| calls to use a helper open_pipe().Ryan Anderson Sun, 26 Feb 2006 03:02:05 +0000 (22:02 -0500)

annotate: Convert all -| calls to use a helper open_pipe().

When we settle on a solution for ActiveState's forking issues, all
compatibility checks can be handled inside this one function.

Also, fixed an abuse of global variables in the process of cleaning this up.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

annotate: Handle dirty state and arbitrary revisions.Ryan Anderson Sun, 26 Feb 2006 01:48:33 +0000 (20:48 -0500)

annotate: Handle dirty state and arbitrary revisions.

Also, use Getopt::Long and only process each rev once.

(Thanks to Morten Welinder for spotting the performance problems.)

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-fetch: print the new and old ref when fast-forwardingLukas Sandström Sat, 25 Feb 2006 11:20:13 +0000 (12:20 +0100)

git-fetch: print the new and old ref when fast-forwarding

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

fix warning from pack-objects.cLuck, Tony Thu, 23 Feb 2006 22:42:39 +0000 (14:42 -0800)

fix warning from pack-objects.c

When compiling on ia64 I get this warning (from gcc 3.4.3):

gcc -o pack-objects.o -c -g -O2 -Wall -DSHA1_HEADER='<openssl/sha.h>' pack-objects.c
pack-objects.c: In function `pack_revindex_ix':
pack-objects.c:94: warning: cast from pointer to integer of different size

A double cast (first to long, then to int) shuts gcc up, but is there
a better way?

[jc: Andreas Ericsson suggests to use ulong instead. ]

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branches 'jc/rev-list' and 'jc/pack-thin'Junio C Hamano Sat, 25 Feb 2006 05:55:23 +0000 (21:55 -0800)

Merge branches 'jc/rev-list' and 'jc/pack-thin'

* jc/rev-list:
rev-list --objects: use full pathname to help hashing.
rev-list --objects-edge: remove duplicated edge commit output.
rev-list --objects-edge

* jc/pack-thin:
pack-objects: hash basename and direname a bit differently.
pack-objects: allow "thin" packs to exceed depth limits
pack-objects: use full pathname to help hashing with "thin" pack.
pack-objects: thin pack micro-optimization.
Use thin pack transfer in "git fetch".
Add git-push --thin.
send-pack --thin: use "thin pack" delta transfer.
Thin pack - create packfile with missing delta base.

Conflicts:

pack-objects.c (taking "next")
send-pack.c (taking "next")

gitview: Fix the graph display .Aneesh Kumar K.V Fri, 24 Feb 2006 16:27:51 +0000 (21:57 +0530)

gitview: Fix the graph display .

This fix all the known issue with the graph display
The bug need to be explained graphically

|
a
This line need not be there ---->| \
b |
| /
c

c is parent of a and all a,b and c are placed on the same line and b is child of c
With my last checkin I added a seperate line to indicate that a is
connected to c. But then we had the line connecting a and b which should
not be ther. This changes fixes the same bug

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitview: Code cleanupAneesh Kumar K.V Fri, 24 Feb 2006 16:19:54 +0000 (21:49 +0530)

gitview: Code cleanup

Rearrange the code little bit so that it is easier to read

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add missing programs to ignore listShawn Pearce Fri, 24 Feb 2006 22:51:15 +0000 (17:51 -0500)

Add missing programs to ignore list

Added recently added programs to the default exclude list.

Signed-off-by: Junio C Hamano <junkio@cox.net>

git ls files recursively show ignored filesShawn Pearce Fri, 24 Feb 2006 22:02:34 +0000 (17:02 -0500)

git ls files recursively show ignored files

Make git-ls-files --others --ignored recurse into non-excluded
subdirectories.

Typically when asking git-ls-files to display all files which are
ignored by one or more exclude patterns one would want it to recurse
into subdirectories which are not themselves excluded to see if
there are any excluded files contained within those subdirectories.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Build and install git-mailinfo.Junio C Hamano Sat, 25 Feb 2006 00:16:10 +0000 (16:16 -0800)

Build and install git-mailinfo.

The merge 712b1dd389ad5bcdbaab0279641f0970702fc1f1 was done
incorrectly, and lost this program from Makefile.

Big thanks go to Tony Luck for noticing it, and Linus for
diagnosing it.

Signed-off-by: Junio C Hamano <junkio@cox.net>

gitview: Bump the revAneesh Kumar Fri, 24 Feb 2006 08:38:35 +0000 (14:08 +0530)

gitview: Bump the rev

Make the 0.7 release

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitview: Fix DeprecationWarningAneesh Kumar Fri, 24 Feb 2006 08:32:32 +0000 (14:02 +0530)

gitview: Fix DeprecationWarning

DeprecationWarning: integer argument expected, got float

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge fixes early for next maint series.Junio C Hamano Fri, 24 Feb 2006 10:21:28 +0000 (02:21 -0800)

Merge fixes early for next maint series.

Merge branch 'fix' into maintJunio C Hamano Fri, 24 Feb 2006 10:21:00 +0000 (02:21 -0800)

Merge branch 'fix' into maint

* fix:
git-am: do not allow empty commits by mistake.

pack-objects: hash basename and direname a bit differently.Junio C Hamano Fri, 24 Feb 2006 07:27:49 +0000 (23:27 -0800)

pack-objects: hash basename and direname a bit differently.

...so that "Makefile"s from different revs are sorted together,
separate from "t/Makefile"s, but close enough.

Signed-off-by: Junio C Hamano <junkio@cox.net>

rev-list --objects: use full pathname to help hashing.Junio C Hamano Thu, 23 Feb 2006 06:10:24 +0000 (22:10 -0800)

rev-list --objects: use full pathname to help hashing.

This helps to group the same files from different revs together,
while spreading files with the same basename in different
directories, to help pack-object.

Signed-off-by: Junio C Hamano <junkio@cox.net>

rev-list --objects-edge: remove duplicated edge commit... Junio C Hamano Fri, 24 Feb 2006 07:44:15 +0000 (23:44 -0800)

rev-list --objects-edge: remove duplicated edge commit output.

Signed-off-by: Junio C Hamano <junkio@cox.net>

pack-objects: allow "thin" packs to exceed depth limitsJunio C Hamano Fri, 24 Feb 2006 07:04:52 +0000 (23:04 -0800)

pack-objects: allow "thin" packs to exceed depth limits

When creating a new pack to be used in .git/objects/pack/
directory, we carefully count the depth of deltified objects to
be reused, so that the generated pack does not to exceed the
specified depth limit for runtime efficiency. However, when we
are generating a thin pack that does not contain base objects,
such a pack can only be used during network transfer that is
expanded on the other end upon reception, so being careful and
artificially cutting the delta chain does not buy us anything
except increased bandwidth requirement. This patch disables the
delta chain depth limit check when reusing an existing delta.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'ar/win'Junio C Hamano Fri, 24 Feb 2006 06:35:55 +0000 (22:35 -0800)

Merge branch 'ar/win'

* ar/win:
PATCH: simplify calls to git programs in git-fmt-merge-msg

Merge branch 'jc/send-insane-refs'Junio C Hamano Fri, 24 Feb 2006 06:34:39 +0000 (22:34 -0800)

Merge branch 'jc/send-insane-refs'

* jc/send-insane-refs:
send-pack: do not give up when remote has insanely large number of refs.

Merge fixes early for next maint series.Junio C Hamano Fri, 24 Feb 2006 06:27:03 +0000 (22:27 -0800)

Merge fixes early for next maint series.

Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak... Junio C Hamano Fri, 24 Feb 2006 06:25:32 +0000 (22:25 -0800)

Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into maint

* jc/fix-co-candy:
checkout - eye candy.

* jc/fix-rename-leak:
diffcore-rename: plug memory leak.

* ar/fix-win:
fix t5600-clone-fail-cleanup.sh on windows

Merge branch 'ak/gitview'Junio C Hamano Fri, 24 Feb 2006 06:20:30 +0000 (22:20 -0800)

Merge branch 'ak/gitview'

* ak/gitview:
gitview: Display the lines joining commit nodes clearly.

gitview: Display the lines joining commit nodes clearly.Aneesh Kumar K.V Thu, 23 Feb 2006 19:29:42 +0000 (00:59 +0530)

gitview: Display the lines joining commit nodes clearly.

Since i wanted to limit the graph box size i was resetting
the window after an index of 5. This result in line joining
commit nodes to pass over nodes which are not related. The
changes fixes the same

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-am: do not allow empty commits by mistake.Junio C Hamano Fri, 24 Feb 2006 06:14:47 +0000 (22:14 -0800)

git-am: do not allow empty commits by mistake.

Running "git-am --resolved" without doing anything can create an empty
commit. Prevent it.

Thanks for Eric W. Biederman for spotting this.

Signed-off-by: Junio C Hamano <junkio@cox.net>

PATCH: simplify calls to git programs in git-fmt-merge-msgAlex Riesen Thu, 23 Feb 2006 10:26:46 +0000 (11:26 +0100)

PATCH: simplify calls to git programs in git-fmt-merge-msg

It also makes it work on ActiveState Perl.

Signed-off-by: Junio C Hamano <junkio@cox.net>

fix t5600-clone-fail-cleanup.sh on windowsAlex Riesen Thu, 23 Feb 2006 11:25:20 +0000 (12:25 +0100)

fix t5600-clone-fail-cleanup.sh on windows

In windows you cannot remove current or opened directory,
an opened file, a running program, a loaded library, etc...

[jc: signoffs? With a minor quoting fix.]

Signed-off-by: Junio C Hamano <junkio@cox.net>

pack-objects: use full pathname to help hashing with... Junio C Hamano Thu, 23 Feb 2006 06:10:24 +0000 (22:10 -0800)

pack-objects: use full pathname to help hashing with "thin" pack.

This uses the same hashing algorithm to the "preferred base
tree" objects and the incoming pathnames, to group the same
files from different revs together, while spreading files with
the same basename in different directories.

Signed-off-by: Junio C Hamano <junkio@cox.net>

pack-objects: thin pack micro-optimization.Junio C Hamano Thu, 23 Feb 2006 05:45:45 +0000 (21:45 -0800)

pack-objects: thin pack micro-optimization.

Since we sort objects by type, hash, preferredness and then
size, after we have a delta against preferred base, there is no
point trying a delta with non-preferred base. This seems to
save expensive calls to diff-delta and it also seems to save the
output space as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diffcore-rename: plug memory leak.Junio C Hamano Thu, 23 Feb 2006 03:45:48 +0000 (19:45 -0800)

diffcore-rename: plug memory leak.

Spotted by Nicolas Pitre.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'ml/cvs'Junio C Hamano Thu, 23 Feb 2006 03:20:55 +0000 (19:20 -0800)

Merge branch 'ml/cvs'

* ml/cvs:
Introducing git-cvsserver -- a CVS emulator for git.

Merge branch 'ra/anno'Junio C Hamano Thu, 23 Feb 2006 03:20:08 +0000 (19:20 -0800)

Merge branch 'ra/anno'

* ra/anno:
Use Ryan's git-annotate instead of jsannotate
Add git-annotate, a tool for assigning blame.

Give no terminating LF to error() function.Junio C Hamano Thu, 23 Feb 2006 01:47:10 +0000 (17:47 -0800)

Give no terminating LF to error() function.

Signed-off-by: Junio C Hamano <junkio@cox.net>

checkout - eye candy.Junio C Hamano Thu, 23 Feb 2006 03:02:39 +0000 (19:02 -0800)

checkout - eye candy.

This implements "eye candy" similar to the pack-object/unpack-object
to entertain users while a large tree is being checked out after
a clone or a pull.

Signed-off-by: Junio C Hamano <junkio@cox.net>

git-rm: Fix to properly handle files with spaces, tabs... Carl Worth Thu, 23 Feb 2006 00:37:27 +0000 (16:37 -0800)

git-rm: Fix to properly handle files with spaces, tabs, newlines, etc.

New tests are added to the git-rm test case to cover this as well.

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Add new git-rm command with documentationCarl Worth Tue, 21 Feb 2006 23:04:51 +0000 (15:04 -0800)

Add new git-rm command with documentation

This adds a git-rm command which provides convenience similar to
git-add, (and a bit more since it takes care of the rm as well if
given -f).

Like git-add, git-rm expands the given path names through
git-ls-files. This means it only acts on files listed in the
index. And it does act recursively on directories by default, (no -r
needed as in the case of rm itself). When it recurses, it does not
remove empty directories that are left behind.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge fixes up to GIT 1.2.3Junio C Hamano Thu, 23 Feb 2006 00:15:42 +0000 (16:15 -0800)

Merge fixes up to GIT 1.2.3

git-fetch: follow tag only when tracking remote branch. v1.2.3Junio C Hamano Wed, 22 Feb 2006 21:10:37 +0000 (13:10 -0800)

git-fetch: follow tag only when tracking remote branch.

Unless --no-tags flag was given, git-fetch tried to always
follow remote tags that point at the commits we picked up.

It is not very useful to pick up tags from remote unless storing
the fetched branch head in a local tracking branch. This is
especially true if the fetch is done to merge the remote branch
into our current branch as one-shot basis (i.e. "please pull"),
and is even harmful if the remote repository has many irrelevant
tags.

This proposed update disables the automated tag following unless
we are storing the a fetched branch head in a local tracking
branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>

pack-objects eye-candy: finishing touches.Junio C Hamano Thu, 23 Feb 2006 00:02:59 +0000 (16:02 -0800)

pack-objects eye-candy: finishing touches.

This updates the progress output to match "every one second or
every percent whichever comes early" used by unpack-objects, as
discussed on the list.

Signed-off-by: Junio C Hamano <junkio@cox.net>

also adds progress when actually writing a packNicolas Pitre Wed, 22 Feb 2006 22:41:32 +0000 (17:41 -0500)

also adds progress when actually writing a pack

If that pack is big, it takes significant time to write and might
benefit from some more eye candies as well. This is however disabled
when the pack is written to stdout since in that case the output is
usually piped into unpack_objects which already does its own progress
reporting.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

nicer eye candies for pack-objectsNicolas Pitre Wed, 22 Feb 2006 21:00:08 +0000 (16:00 -0500)

nicer eye candies for pack-objects

This provides a stable and simpler progress reporting mechanism that
updates progress as often as possible but accurately not updating more
than once a second. The deltification phase is also made more
interesting to watch (since repacking a big repository and only seeing a
dot appear once every many seconds is rather boring and doesn't provide
much food for anticipation).

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Keep Porcelainish from failing by broken ident after... Junio C Hamano Sun, 19 Feb 2006 04:51:26 +0000 (20:51 -0800)

Keep Porcelainish from failing by broken ident after making changes.

"empty ident not allowed" error makes commit-tree fail, so we
are already safer in that we would not end up with commit
objects that have bogus names on the author or committer fields.
However, before commit-tree is called there are already changes
made to the index file and the working tree. The operation can
be resumed after fixing the environment problem, but when this
triggers to a newcomer with unusable gecos, the first question
becomes "what did I lose and how would I recover".

This patch modifies some Porcelainish commands to verify
GIT_COMMITTER_IDENT as soon as we know we are going to make some
commits before doing much damage to prevent confusion.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Delay "empty ident" errors until they really matter.Junio C Hamano Sun, 19 Feb 2006 04:31:05 +0000 (20:31 -0800)

Delay "empty ident" errors until they really matter.

Previous one warned people upfront to encourage fixing their
environment early, but some people just use repositories and git
tools read-only without making any changes, and in such a case
there is not much point insisting on them having a usable ident.

This round attempts to move the error until either "git-var"
asks for the ident explicitly or "commit-tree" wants to use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Make "empty ident" error message a bit more helpful.Junio C Hamano Sat, 18 Feb 2006 09:20:06 +0000 (01:20 -0800)

Make "empty ident" error message a bit more helpful.

It appears that some people who did not care about having bogus
names in their own commit messages are bitten by the recent
change to require a sane environment [*1*].

While it was a good idea to prevent people from using bogus
names to create commits and doing sign-offs, the error message
is not very informative. This patch attempts to warn things
upfront and hint people how to fix their environments.

[Footnote]

*1* The thread is this one.

http://marc.theaimsgroup.com/?t=113868084800004

Especially this message.

http://marc.theaimsgroup.com/?m=113932830015032

Signed-off-by: Junio C Hamano <junkio@cox.net>

pack-objects: avoid delta chains that are too long.Junio C Hamano Sat, 18 Feb 2006 04:58:45 +0000 (20:58 -0800)

pack-objects: avoid delta chains that are too long.

This tries to rework the solution for the excess delta chain
problem. An earlier commit worked it around ``cheaply'', but
repeated repacking risks unbound growth of delta chains.

This version counts the length of delta chain we are reusing
from the existing pack, and makes sure a base object that has
sufficiently long delta chain does not get deltified.

Signed-off-by: Junio C Hamano <junkio@cox.net>

git-repack: allow passing a couple of flags to pack... Junio C Hamano Thu, 16 Feb 2006 19:57:18 +0000 (11:57 -0800)

git-repack: allow passing a couple of flags to pack-objects.

A new flag -q makes underlying pack-objects less chatty.
A new flag -f forces delta to be recomputed from scratch.

Signed-off-by: Junio C Hamano <junkio@cox.net>

pack-objects: finishing touches.Junio C Hamano Thu, 16 Feb 2006 19:55:51 +0000 (11:55 -0800)

pack-objects: finishing touches.

This introduces --no-reuse-delta option to disable reusing of
existing delta, which is a large part of the optimization
introduced by this series. This may become necessary if
repeated repacking makes delta chain too long. With this, the
output of the command becomes identical to that of the older
implementation. But the performance suffers greatly.

It still allows reusing non-deltified representations; there is
no point uncompressing and recompressing the whole text.

It also adds a couple more statistics output, while squelching
it under -q flag, which the last round forgot to do.

$ time old-git-pack-objects --stdout >/dev/null <RL
Generating pack...
Done counting 184141 objects.
Packing 184141 objects....................
real 12m8.530s user 11m1.450s sys 0m57.920s
$ time git-pack-objects --stdout >/dev/null <RL
Generating pack...
Done counting 184141 objects.
Packing 184141 objects.....................
Total 184141, written 184141 (delta 138297), reused 178833 (delta 134081)
real 0m59.549s user 0m56.670s sys 0m2.400s
$ time git-pack-objects --stdout --no-reuse-delta >/dev/null <RL
Generating pack...
Done counting 184141 objects.
Packing 184141 objects.....................
Total 184141, written 184141 (delta 134833), reused 47904 (delta 0)
real 11m13.830s user 9m45.240s sys 0m44.330s

There is one remaining issue when --no-reuse-delta option is not
used. It can create delta chains that are deeper than specified.

A<--B<--C<--D E F G

Suppose we have a delta chain A to D (A is stored in full either
in a pack or as a loose object. B is depth1 delta relative to A,
C is depth2 delta relative to B...) with loose objects E, F, G.
And we are going to pack all of them.

B, C and D are left as delta against A, B and C respectively.
So A, E, F, and G are examined for deltification, and let's say
we decided to keep E expanded, and store the rest as deltas like
this:

E<--F<--G<--A

Oops. We ended up making D a bit too deep, didn't we? B, C and
D form a chain on top of A!

This is because we did not know what the final depth of A would
be, when we checked objects and decided to keep the existing
delta. Unfortunately, deferring the decision until just before
the deltification is not an option. To be able to make B, C,
and D candidates for deltification with the rest, we need to
know the type and final unexpanded size of them, but the major
part of the optimization comes from the fact that we do not read
the delta data to do so -- getting the final size is quite an
expensive operation.

To prevent this from happening, we should keep A from being
deltified. But how would we tell that, cheaply?

To do this most precisely, after check_object() runs, each
object that is used as the base object of some existing delta
needs to be marked with the maximum depth of the objects we
decided to keep deltified (in this case, D is depth 3 relative
to A, so if no other delta chain that is longer than 3 based on
A exists, mark A with 3). Then when attempting to deltify A, we
would take that number into account to see if the final delta
chain that leads to D becomes too deep.

However, this is a bit cumbersome to compute, so we would cheat
and reduce the maximum depth for A arbitrarily to depth/4 in
this implementation.

Signed-off-by: Junio C Hamano <junkio@cox.net>

pack-objects: reuse data from existing packs.Junio C Hamano Thu, 16 Feb 2006 01:34:29 +0000 (17:34 -0800)

pack-objects: reuse data from existing packs.

When generating a new pack, notice if we have already needed
objects in existing packs. If an object is stored deltified,
and its base object is also what we are going to pack, then
reuse the existing deltified representation unconditionally,
bypassing all the expensive find_deltas() and try_deltas()
calls.

Also, notice if what we are going to write out exactly match
what is already in an existing pack (either deltified or just
compressed). In such a case, we can just copy it instead of
going through the usual uncompressing & recompressing cycle.

Without this patch, in linux-2.6 repository with about 1500
loose objects and a single mega pack:

$ git-rev-list --objects v2.6.16-rc3 >RL
$ wc -l RL
184141 RL
$ time git-pack-objects p <RL
Generating pack...
Done counting 184141 objects.
Packing 184141 objects....................
a1fc7b3e537fcb9b3c46b7505df859f0a11e79d2

real 12m4.323s
user 11m2.560s
sys 0m55.950s

With this patch, the same input:

$ time ../git.junio/git-pack-objects q <RL
Generating pack...
Done counting 184141 objects.
Packing 184141 objects.....................
a1fc7b3e537fcb9b3c46b7505df859f0a11e79d2
Total 184141, written 184141, reused 182441

real 1m2.608s
user 0m55.090s
sys 0m1.830s

Signed-off-by: Junio C Hamano <junkio@cox.net>

detect broken alternates.Junio C Hamano Wed, 22 Feb 2006 19:16:38 +0000 (11:16 -0800)

detect broken alternates.

The real problem triggered an earlier fix was that an alternate
entry was pointing at a removed directory. Complaining on
object/pack directory that cannot be opendir-ed produces noise
in an ancient repository that does not have object/pack
directory and has never been packed.

Detect the real user error and report it. Also if opendir
failed for other reasons (e.g. no read permissions), report that
as well.

Spotted by Andrew Vasquez <andrew.vasquez@qlogic.com>.

Signed-off-by: Junio C Hamano <junkio@cox.net>

gitview: ls-remote invocation shellquote safety.Junio C Hamano Wed, 22 Feb 2006 11:47:20 +0000 (03:47 -0800)

gitview: ls-remote invocation shellquote safety.

This will allow you to point GIT_DIR at directories with funny names.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Introducing git-cvsserver -- a CVS emulator for git.Martin Langhoff Wed, 22 Feb 2006 09:50:15 +0000 (22:50 +1300)

Introducing git-cvsserver -- a CVS emulator for git.

git-cvsserver is highly functional. However, not all methods are implemented,
and for those methods that are implemented, not all switches are implemented.
All the common read operations are implemented, and add/remove/commit are
supported.

Testing has been done using both the CLI CVS client, and the Eclipse CVS
plugin. Most functionality works fine with both of these clients.

Currently git-cvsserver only works over SSH connections, see the
Documentation for more details on how to configure your client. It
does not support pserver for anonymous access but it should not be
hard to implement. Anonymous access will need tighter input validation.

In our very informal tests, it seems to be significantly faster than a real
CVS server.

This utility depends on a version of git-cvsannotate that supports -S and on
DBD::SQLite.

Licensed under GPLv2. Copyright The Open University UK.

Authors: Martyn Smith <martyn@catalyst.net.nz>
Martin Langhoff <martin@catalyst.net.nz>

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Use Ryan's git-annotate instead of jsannotateJohannes Schindelin Mon, 20 Feb 2006 15:20:10 +0000 (16:20 +0100)

Use Ryan's git-annotate instead of jsannotate

Since Ryan's git-annotate is much faster, and has support for renames,
it is likely it goes into the mainstream git soon. Adapt it a little to
work with gitcvs, and actually use it.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

send-pack: do not give up when remote has insanely... Junio C Hamano Wed, 22 Feb 2006 02:59:37 +0000 (18:59 -0800)

send-pack: do not give up when remote has insanely large number of refs.

Stephen C. Tweedie noticed that we give up running rev-list when
we see too many refs on the remote side. Limit the number of
negative references we give to rev-list and continue.

Not sending any negative references to rev-list is very bad --
we may be pushing a ref that is new to the other end.

Signed-off-by: Junio C Hamano <junkio@cox.net>

rev-list.c: fix non-grammatical comments.Junio C Hamano Wed, 22 Feb 2006 09:27:02 +0000 (01:27 -0800)

rev-list.c: fix non-grammatical comments.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano Wed, 22 Feb 2006 08:35:18 +0000 (00:35 -0800)

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Make "find" on "Files" work again.

Merge branch 'fix'Junio C Hamano Wed, 22 Feb 2006 08:35:07 +0000 (00:35 -0800)

Merge branch 'fix'

* fix:
git-push: Update documentation to describe the no-refspec behavior.
format-patch: pretty-print timestamp correctly.
git-add: Add support for --, documentation, and test.

Merge branch 'jc/perl'Junio C Hamano Wed, 22 Feb 2006 06:51:21 +0000 (22:51 -0800)

Merge branch 'jc/perl'

* jc/perl:
cvsimport: avoid open "-|" list form for Perl 5.6
svnimport: avoid open "-|" list form for Perl 5.6
send-email: avoid open "-|" list form for Perl 5.6
rerere: avoid open "-|" list form for Perl 5.6
fmt-merge-msg: avoid open "-|" list form for Perl 5.6

Merge branch 'jc/pack-reuse'Junio C Hamano Wed, 22 Feb 2006 06:38:43 +0000 (22:38 -0800)

Merge branch 'jc/pack-reuse'

* jc/pack-reuse:
pack-objects: avoid delta chains that are too long.
git-repack: allow passing a couple of flags to pack-objects.
pack-objects: finishing touches.
pack-objects: reuse data from existing packs.

Merge branch 'jc/nostat'Junio C Hamano Wed, 22 Feb 2006 06:33:21 +0000 (22:33 -0800)

Merge branch 'jc/nostat'

* jc/nostat:
cache_name_compare() compares name and stage, nothing else.
"assume unchanged" git: documentation.
ls-files: split "show-valid-bit" into a different option.
"Assume unchanged" git: --really-refresh fix.
ls-files: debugging aid for CE_VALID changes.
"Assume unchanged" git: do not set CE_VALID with --refresh
"Assume unchanged" git

Merge branch 'js/portable'Junio C Hamano Wed, 22 Feb 2006 06:28:40 +0000 (22:28 -0800)

Merge branch 'js/portable'

* js/portable:
Fix "gmake -j"
Really honour NO_PYTHON
avoid makefile override warning
Fixes for ancient versions of GNU make

git-push: Update documentation to describe the no-refsp... Carl Worth Wed, 22 Feb 2006 04:28:50 +0000 (20:28 -0800)

git-push: Update documentation to describe the no-refspec behavior.

It turns out that the git-push documentation didn't describe what it
would do when not given a refspec, (not on the command line, nor in a
remotes file). This is fairly important for the user who is trying to
understand operations such as:

git clone git://something/some/where
# hack, hack, hack
git push origin

I tracked the mystery behavior down to git-send-pack and lifted the
relevant portion of its documentation up to git-push, (namely that all
refs existing both locally and remotely are updated).

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitview: Use monospace font to draw the branch and... aneesh.kumar@gmail.com Tue, 21 Feb 2006 10:30:10 +0000 (16:00 +0530)

gitview: Use monospace font to draw the branch and tag name

This patch address the below:
Use monospace font to draw branch and tag name
set the font size to 13.
Make the graph column resizable. This helps to accommodate large tag names

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitview: Read tag and branch information using git... aneesh.kumar@gmail.com Tue, 21 Feb 2006 10:30:04 +0000 (16:00 +0530)

gitview: Read tag and branch information using git ls-remote

This fix the below bug

Junio C Hamano <junkio@cox.net> writes:

>
> It does not work in my repository, since you do not seem to
> handle branch and tag names with slashes in them. All of my
> topic branches live in directories with two-letter names
> (e.g. ak/gitview).

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-ls-files: Fix, document, and add test for --error... Carl Worth Tue, 21 Feb 2006 20:48:30 +0000 (12:48 -0800)

git-ls-files: Fix, document, and add test for --error-unmatch option.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix typo in git-rebase.sh.Jason Riedy Tue, 21 Feb 2006 20:56:14 +0000 (12:56 -0800)

Fix typo in git-rebase.sh.

s/upsteram/upstream in git-rebase.sh.

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>

New test to verify that when git-clone fails it cleans... Carl Worth Fri, 17 Feb 2006 21:33:28 +0000 (13:33 -0800)

New test to verify that when git-clone fails it cleans up the new directory.

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'pj/portable'Junio C Hamano Wed, 22 Feb 2006 02:16:29 +0000 (18:16 -0800)

Merge branch 'pj/portable'

* pj/portable:
Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables

format-patch: pretty-print timestamp correctly.Junio C Hamano Wed, 22 Feb 2006 02:13:32 +0000 (18:13 -0800)

format-patch: pretty-print timestamp correctly.

Perl is not C and does not truncate the division result. Arghh!

Signed-off-by: Junio C Hamano <junkio@cox.net>

git-rebase: Clarify usage statement and copy it into... Carl Worth Wed, 22 Feb 2006 01:10:12 +0000 (17:10 -0800)

git-rebase: Clarify usage statement and copy it into the actual documentation.

I found a paper thin man page for git-rebase, but was quite happy to
see something much more useful in the usage statement of the script
when I went there to find out how this thing worked. Here it is
cleaned up slightly and expanded a bit into the actual documentation.

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-add: Add support for --, documentation, and test.Carl Worth Tue, 21 Feb 2006 23:33:49 +0000 (15:33 -0800)

git-add: Add support for --, documentation, and test.

This adds support to git-add to allow the common -- to separate
command-line options and file names. It adds documentation and a new
git-add test case as well.

[jc: this should apply to 1.2.X maintenance series, so I reworked
git-ls-files --error-unmatch test. ]

Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix "gmake -j"Johannes Schindelin Tue, 21 Feb 2006 12:08:21 +0000 (13:08 +0100)

Fix "gmake -j"

In my attempt to port git to IRIX, I broke it. Sorry.

Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Makefile tweaks: Solaris 9+ dont need iconv / move... Paul Jakma Mon, 20 Feb 2006 23:36:28 +0000 (23:36 +0000)

Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables

- Solaris 9 and up do not need -liconv, so NEEDS_LIBICONV should be set
only for S8.
- Move the declaration of the uname variables to early in the Makefile
so they can be referenced by prefix and gitexecdir variables.
- gitexecdir defaults to being same as bindir, it might as well reference
that variable.

[jc: corrupt patch, sneakily tried to remove inclusion of GIT-VERSION-FILE
I do not know why I am applying this...]

Signed-off-by: Paul Jakma <paul@quagga.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge part of jc/portable branchJunio C Hamano Tue, 21 Feb 2006 08:52:18 +0000 (00:52 -0800)

Merge part of jc/portable branch

git-mktree: reverse of git-ls-tree.Junio C Hamano Tue, 21 Feb 2006 05:50:01 +0000 (21:50 -0800)

git-mktree: reverse of git-ls-tree.

This reads data in the format a (non recursive) ls-tree outputs
and writes a tree object to the object database. The created
tree object name is output to the standard output.

For convenience, the input data does not need to be sorted; the
command sorts the input lines internally.

By request from Tommi Virtanen.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Merge branch 'lt/merge-tree'Junio C Hamano Tue, 21 Feb 2006 08:49:38 +0000 (00:49 -0800)

Merge branch 'lt/merge-tree'

* lt/merge-tree:
git-merge-tree: generalize the "traverse <n> trees in sync" functionality
Handling large files with GIT
Handling large files with GIT

Merge branch 'jc/ident'Junio C Hamano Tue, 21 Feb 2006 08:46:07 +0000 (00:46 -0800)

Merge branch 'jc/ident'

* jc/ident:
Keep Porcelainish from failing by broken ident after making changes.
Delay "empty ident" errors until they really matter.
Make "empty ident" error message a bit more helpful.

cherry-pick/revert: error-help message rewording.Junio C Hamano Tue, 21 Feb 2006 08:28:04 +0000 (00:28 -0800)

cherry-pick/revert: error-help message rewording.

It said "after fixing up, commit the result using -F .msg", but
it was not clear for new people how "fix up" should be done.
Hint "git-update-index <path>".

We could recommend "git commit -a -F .msg" instead, but I am
hesitant to give that suggestion in the blind -- you could do a
cherry-pick, revert or a merge in general in a dirty working
tree as long as local modifications do not overlap with the
merge, but using "commit -a" would include them in the result.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Fix fmt-merge-msg counting.Junio C Hamano Tue, 21 Feb 2006 03:26:21 +0000 (19:26 -0800)

Fix fmt-merge-msg counting.

Signed-off-by: Junio C Hamano <junkio@cox.net>

cvsimport: avoid open "-|" list form for Perl 5.6Junio C Hamano Mon, 20 Feb 2006 22:17:28 +0000 (14:17 -0800)

cvsimport: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>

svnimport: avoid open "-|" list form for Perl 5.6Junio C Hamano Mon, 20 Feb 2006 22:14:15 +0000 (14:14 -0800)

svnimport: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>

send-email: avoid open "-|" list form for Perl 5.6Junio C Hamano Mon, 20 Feb 2006 22:23:51 +0000 (14:23 -0800)

send-email: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>

rerere: avoid open "-|" list form for Perl 5.6Junio C Hamano Mon, 20 Feb 2006 22:02:47 +0000 (14:02 -0800)

rerere: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>

fmt-merge-msg: avoid open "-|" list form for Perl 5.6Junio C Hamano Mon, 20 Feb 2006 22:02:25 +0000 (14:02 -0800)

fmt-merge-msg: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>

Add git-annotate, a tool for assigning blame.Ryan Anderson Mon, 20 Feb 2006 10:46:09 +0000 (05:46 -0500)

Add git-annotate, a tool for assigning blame.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: 0.9.1: add --version and copyright/license... Eric Wong Mon, 20 Feb 2006 18:57:29 +0000 (10:57 -0800)

git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

contrib/git-svn: add Makefile, test, and associated... Eric Wong Mon, 20 Feb 2006 18:57:29 +0000 (10:57 -0800)

contrib/git-svn: add Makefile, test, and associated ignores

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: fix several corner-case and rare bugs with... Eric Wong Mon, 20 Feb 2006 18:57:28 +0000 (10:57 -0800)

git-svn: fix several corner-case and rare bugs with 'commit'

None of these were really show-stoppers (or even triggered)
on most of the trees I've tracked.

* Node change prevention for identically named nodes. This is
a limitation of SVN, but we find the error and exit before
it's passed to SVN so we don't dirty our working tree when our
commit fails. git-svn will exit with an error code 1 if any
of the following conditions are found:

1. a directory is removed and a file of the same name of the
removed directory is created
1a. a file has its parent directory removed and the file is
takes the name of the removed parent directory::
baz/zzz => baz
2. a file is removed and a directory of the same name of the
removed file is created.
2a. a file is moved into a deeper directory that shares the
previous name of the file::
dir/$file => dir/file/$file

Since SVN cannot handle these cases, the user will have to
manually split the commit into several parts.

* --rmdir now handles nested/deep removals. If dir/a/b/c/d/e/file
is removed, and everything else is in the dir/ hierarchy is
otherwise empty, then dir/ will be deleted when file is deleted
from svn and --rmdir specified.

* Always assert that we have written the tree we want to write
on commits. This helped me find several bugs in the symlink
handling code (which as been fixed).

* Several symlink handling fixes. We now refuse to set
permissions on symlinks. We also always unlink a file
if we're going to overwrite it.

* Apply changes in a pre-determined order, so we always have
rename from locations handy before we delete them.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

contrib/git-svn.txt: add a note about renamed/copied... Eric Wong Mon, 20 Feb 2006 18:57:28 +0000 (10:57 -0800)

contrib/git-svn.txt: add a note about renamed/copied directory support

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: change ; to && in addremove()Eric Wong Mon, 20 Feb 2006 18:57:28 +0000 (10:57 -0800)

git-svn: change ; to && in addremove()

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: remove any need for the XML::Simple dependencyEric Wong Mon, 20 Feb 2006 18:57:28 +0000 (10:57 -0800)

git-svn: remove any need for the XML::Simple dependency

XML::Simple was originally required back when I made svn-arch-mirror
because I needed to explictly track renames with Arch. Then I carried
it over to git-svn because I was afraid somebody could commit an svn
log message that could throw off a non-XML log parser. Then I noticed
the <n> lines column in the header. So, no more XML :)

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: Allow for more argument types for commit ... Eric Wong Mon, 20 Feb 2006 18:57:26 +0000 (10:57 -0800)

git-svn: Allow for more argument types for commit (from..to)

Allow 'from..to' notation from the command line.

More liberal sha1 parsing when reading from stdin no longer requires the
sha1 to be the first character, so a leading 'commit ' string is OK.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: allow --find-copies-harder and -l<num> to... Eric Wong Mon, 20 Feb 2006 18:57:26 +0000 (10:57 -0800)

git-svn: allow --find-copies-harder and -l<num> to be passed on commit

Both of these options are passed directly to git-diff-tree when
committing to a SVN repository.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-svn: fix a typo in defining the --no-stop-on-copy... Eric Wong Mon, 20 Feb 2006 18:57:25 +0000 (10:57 -0800)

git-svn: fix a typo in defining the --no-stop-on-copy option

Just a typo, I doubt anybody would use (and I highly recommend not
using) this option anyways. But you never know...

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Use thin pack transfer in "git fetch".Junio C Hamano Mon, 20 Feb 2006 08:38:39 +0000 (00:38 -0800)

Use thin pack transfer in "git fetch".

Signed-off-by: Junio C Hamano <junkio@cox.net>

Add git-push --thin.Junio C Hamano Mon, 20 Feb 2006 08:09:41 +0000 (00:09 -0800)

Add git-push --thin.

Maybe we would want to make this default before it graduates to
the master branch, but in the meantime to help testing things,
this allows you to say "git push --thin destination".

Signed-off-by: Junio C Hamano <junkio@cox.net>

send-pack --thin: use "thin pack" delta transfer.Junio C Hamano Sun, 19 Feb 2006 23:03:49 +0000 (15:03 -0800)

send-pack --thin: use "thin pack" delta transfer.

The new flag loosens the usual "self containedness" requirment
of packfiles, and sends deltified representation of objects when
we know the other side has the base objects needed to unpack
them. This would help reducing the transfer size.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Thin pack - create packfile with missing delta base.Junio C Hamano Sun, 19 Feb 2006 22:47:21 +0000 (14:47 -0800)

Thin pack - create packfile with missing delta base.

This goes together with "rev-list --object-edge" change, to feed
pack-objects list of edge commits in addition to the usual
object list. Upon seeing such list, pack-objects loosens the
usual "self contained delta" constraints, and can produce delta
against blobs and trees contained in the edge commits without
storing the delta base objects themselves.

The resulting packfile is not usable in .git/object/packs, but
is a good way to implement "delta-only" transfer.

Signed-off-by: Junio C Hamano <junkio@cox.net>