gitweb.git
Merge branch 'lt/rev-list' into nextJunio C Hamano Fri, 3 Mar 2006 05:15:52 +0000 (21:15 -0800)

Merge branch 'lt/rev-list' into next

* lt/rev-list:
setup_revisions(): handle -n<n> and -<n> internally.

Merge branch 'master' into nextJunio C Hamano Fri, 3 Mar 2006 05:15:26 +0000 (21:15 -0800)

Merge branch 'master' into next

* master:
Merge branch 'jc/diff'
git-commit: make sure we protect against races.
git-commit --amend
show-branch --topics
GIT-VERSION-GEN: squelch unneeded error from "cat version"
Merge branch 'ml/cvsserver'
annotate: resurrect raw timestamps.
Documentation: rev-list --objects-edge
Documentation: read-tree --aggressive
war on whitespaces: documentation.

Merge branch 'jc/diff'Junio C Hamano Fri, 3 Mar 2006 05:15:06 +0000 (21:15 -0800)

Merge branch 'jc/diff'

* jc/diff:
diffcore-delta: stop using deltifier for packing.

git-commit: make sure we protect against races.Junio C Hamano Fri, 3 Mar 2006 05:13:24 +0000 (21:13 -0800)

git-commit: make sure we protect against races.

An earlier commit 8098a178b26dc7a158d129a092a5b78da6d12b72
accidentally lost race protection from git-commit command.
This commit reinstates it. When something else updates HEAD
pointer while you were editing your commit message, the command
would notice and abort the commit.

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

git-commit --amendJunio C Hamano Fri, 3 Mar 2006 05:04:05 +0000 (21:04 -0800)

git-commit --amend

The new flag is used to amend the tip of the current branch. Prepare
the tree object you would want to replace the latest commit as usual
(this includes the usual -i/-o and explicit paths), and the commit log
editor is seeded with the commit message from the tip of the current
branch. The commit you create replaces the current tip -- if it was a
merge, it will have the parents of the current tip as parents -- so the
current top commit is discarded.

It is a rough equivalent for:

$ git reset --soft HEAD^
$ ... do something else to come up with the right tree ...
$ git commit -c ORIG_HEAD

but can be used to amend a merge commit.

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

show-branch --topicsJunio C Hamano Fri, 3 Mar 2006 01:14:00 +0000 (17:14 -0800)

show-branch --topics

This adds a new flag, --topics, to help managing topic
branches. When you have topic branches forked some time ago
from your primary line of development, show-branch would show
many "uninteresting" things that happend on the primary line of
development when trying to see what are still not merged from
the topic branches.

With this flag, the first ref given to show-branch is taken as
the primary branch, and the rest are taken as the topic
branches. Output from the command is modified so that commits
only on the primary branch are not shown. In other words,

$ git show-branch --topics master topic1 topic2 ...

shows an (almost) equivalent of

$ git rev-list ^master topic1 topic2 ...

The major differences are that (1) you can tell which commits
are on which branch, and (2) the commit at the fork point is
shown.

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

GIT-VERSION-GEN: squelch unneeded error from "cat version"Junio C Hamano Thu, 2 Mar 2006 22:38:44 +0000 (14:38 -0800)

GIT-VERSION-GEN: squelch unneeded error from "cat version"

Now this is really a corner case, but if you have the git source
tree from somewhere other than the official tarball, you do not
have version file. And if git-describe does not work for you
(maybe you do not have git yet), we spilled an error message
from "cat version".

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

setup_revisions(): handle -n<n> and -<n> internally.Junio C Hamano Thu, 2 Mar 2006 23:24:01 +0000 (15:24 -0800)

setup_revisions(): handle -n<n> and -<n> internally.

This moves the handling of max-count shorthand from the internal
implementation of "git log" to setup_revisions() so other users
of setup_revisions() can use it.

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

Merge branch 'ml/cvsserver'Junio C Hamano Thu, 2 Mar 2006 22:19:33 +0000 (14:19 -0800)

Merge branch 'ml/cvsserver'

* ml/cvsserver:
cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
cvsserver: Checkout correctly on Eclipse

annotate: resurrect raw timestamps.Junio C Hamano Thu, 2 Mar 2006 09:50:09 +0000 (01:50 -0800)

annotate: resurrect raw timestamps.

For scripted use this is quite useful.

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

Documentation: rev-list --objects-edgeJunio C Hamano Thu, 2 Mar 2006 09:11:31 +0000 (01:11 -0800)

Documentation: rev-list --objects-edge

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

Documentation: read-tree --aggressiveJunio C Hamano Thu, 2 Mar 2006 09:11:05 +0000 (01:11 -0800)

Documentation: read-tree --aggressive

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

war on whitespaces: documentation.Junio C Hamano Thu, 2 Mar 2006 08:45:48 +0000 (00:45 -0800)

war on whitespaces: documentation.

We were missing the --whitespace option in the usage string for
git-apply and git-am, so this commit adds them.

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

Merge branch 'master' into nextJunio C Hamano Thu, 2 Mar 2006 08:02:27 +0000 (00:02 -0800)

Merge branch 'master' into next

* master:
contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
Merge branch 'maint'
read-tree --aggressive: remove deleted entry from the working tree.
Merge branch 'jc/tag'
Merge part of 'jc/diff'

contrib/git-svn: use refs/remotes/git-svn instead of... Eric Wong Thu, 2 Mar 2006 05:58:31 +0000 (21:58 -0800)

contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD

After reading a lengthy discussion on the list, I've come to the
conclusion that creating a 'remotes' directory in refs isn't
such a bad idea.

You can still branch from it by specifying remotes/git-svn (not
needing the leading 'refs/'), and the documentation has been
updated to reflect that.

The 'git-svn' part of the ref can of course be set to whatever
you want by using the GIT_SVN_ID environment variable, as
before.

I'm using refs/remotes/git-svn, and not going with something
like refs/remotes/git-svn/HEAD as it's redundant for Subversion
where there's zero distinction between branches and directories.

Run git-svn rebuild --upgrade to upgrade your repository to use
the new head. git-svn-HEAD must be manually deleted for safety
reasons.

Side note: if you ever (and I hope you never) want to run
git-update-refs on a 'remotes/' ref, make sure you have the
'refs/' prefix as you don't want to be clobbering your
'remotes/' in $GIT_DIR (where remote URLs are stored).

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

Merge branch 'maint'Junio C Hamano Thu, 2 Mar 2006 07:20:31 +0000 (23:20 -0800)

Merge branch 'maint'

* maint:
read-tree --aggressive: remove deleted entry from the working tree.

read-tree --aggressive: remove deleted entry from the... Junio C Hamano Thu, 2 Mar 2006 07:10:00 +0000 (23:10 -0800)

read-tree --aggressive: remove deleted entry from the working tree.

When both heads deleted, or our side deleted while the other
side did not touch, we did not have to update the working tree.

However, we forgot to remove existing working tree file when we
did not touch and the other side did.

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

Merge branch 'ml/cvsserver' into nextJunio C Hamano Thu, 2 Mar 2006 06:27:06 +0000 (22:27 -0800)

Merge branch 'ml/cvsserver' into next

* ml/cvsserver:
cvsserver: Eclipse compat -- now "compare with latest from HEAD" works

Merge branch 'jc/tag'Junio C Hamano Thu, 2 Mar 2006 06:17:44 +0000 (22:17 -0800)

Merge branch 'jc/tag'

* jc/tag:
Pretty-print tagger dates.

Merge part of 'jc/diff'Junio C Hamano Thu, 2 Mar 2006 06:15:38 +0000 (22:15 -0800)

Merge part of 'jc/diff'

Merge branch 'np/delta' into nextJunio C Hamano Thu, 2 Mar 2006 06:08:12 +0000 (22:08 -0800)

Merge branch 'np/delta' into next

* np/delta:
diff-delta: allow reusing of the reference buffer index
diff-delta: bound hash list length to avoid O(m*n) behavior
diff-delta: produce optimal pack data
Merge branch 'kh/svnimport'
Merge branch 'js/refs'
annotate: fix -S parameter to take a string
annotate: Add a basic set of test cases.
annotate: handle \No newline at end of file.
gitview: Use horizontal scroll bar in the tree view

diff-delta: allow reusing of the reference buffer indexNicolas Pitre Tue, 28 Feb 2006 04:38:28 +0000 (23:38 -0500)

diff-delta: allow reusing of the reference buffer index

When a reference buffer is used multiple times then its index can be
computed only once and reused multiple times. This patch adds an extra
pointer to a pointer argument (from_index) to diff_delta() for this.

If from_index is NULL then everything is like before.

If from_index is non NULL and *from_index is NULL then the index is
created and its location stored to *from_index. In this case the caller
has the responsibility to free the memory pointed to by *from_index.

If from_index and *from_index are non NULL then the index is reused as
is.

This currently saves about 10% of CPU time to repack the git archive.

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

diff-delta: bound hash list length to avoid O(m*n)... Nicolas Pitre Tue, 28 Feb 2006 04:09:55 +0000 (23:09 -0500)

diff-delta: bound hash list length to avoid O(m*n) behavior

The diff-delta code can exhibit O(m*n) behavior with some patological
data set where most hash entries end up in the same hash bucket.

The latest code rework reduced the block size making it particularly
vulnerable to this issue, but the issue was always there and can be
triggered regardless of the block size.

This patch does two things:

1) the hashing has been reworked to offer a better distribution to
atenuate the problem a bit, and

2) a limit is imposed to the number of entries that can exist in the
same hash bucket.

Because of the above the code is a bit more expensive on average, but
the problematic samples used to diagnoze the issue are now orders of
magnitude less expensive to process with only a slight loss in
compression.

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

diff-delta: produce optimal pack dataNicolas Pitre Wed, 22 Feb 2006 01:45:36 +0000 (20:45 -0500)

diff-delta: produce optimal pack data

Indexing based on adler32 has a match precision based on the block size
(currently 16). Lowering the block size would produce smaller deltas
but the indexing memory and computing cost increases significantly.

For optimal delta result the indexing block size should be 3 with an
increment of 1 (instead of 16 and 16). With such low params the adler32
becomes a clear overhead increasing the time for git-repack by a factor
of 3. And with such small blocks the adler 32 is not very useful as the
whole of the block bits can be used directly.

This patch replaces the adler32 with an open coded index value based on
3 characters directly. This gives sufficient bits for hashing and
allows for optimal delta with reasonable CPU cycles.

The resulting packs are 6% smaller on average. The increase in CPU time
is about 25%. But this cost is now hidden by the delta reuse patch
while the saving on data transfers is always there.

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

Merge branch 'kh/svnimport'Junio C Hamano Thu, 2 Mar 2006 05:46:01 +0000 (21:46 -0800)

Merge branch 'kh/svnimport'

* kh/svnimport:
Save username -> Full Name <email@addr.es> map file

Merge branch 'js/refs'Junio C Hamano Thu, 2 Mar 2006 05:45:56 +0000 (21:45 -0800)

Merge branch 'js/refs'

* js/refs:
Warn about invalid refs

cvsserver: Eclipse compat -- now "compare with latest... Martin Langhoff Thu, 2 Mar 2006 05:42:01 +0000 (18:42 +1300)

cvsserver: Eclipse compat -- now "compare with latest from HEAD" works

The Eclipse client uses cvs update when that menu option is triggered.
And doesn't like the standard cvs update response. Give it *exactly* what
it wants.

And hope the other clients don't lose the plot too badly.

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

annotate: fix -S parameter to take a stringMartin Langhoff Thu, 2 Mar 2006 04:24:30 +0000 (17:24 +1300)

annotate: fix -S parameter to take a string

In the conversion to Getopt::Long, the -S / --rev-list parameter stopped
working. We need to tell Getopt::Long that it is a string.

As a bonus, the open() now does some useful error handling.

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

annotate: Add a basic set of test cases.Ryan Anderson Thu, 2 Mar 2006 05:23:37 +0000 (00:23 -0500)

annotate: Add a basic set of test cases.

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

annotate: handle \No newline at end of file.Ryan Anderson Thu, 2 Mar 2006 05:23:37 +0000 (00:23 -0500)

annotate: handle \No newline at end of file.

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

gitview: Use horizontal scroll bar in the tree viewAneesh Kumar K.V Thu, 2 Mar 2006 04:29:53 +0000 (09:59 +0530)

gitview: Use horizontal scroll bar in the tree view

Earlier we set up the window to never scroll
horizontally, which made it harder to use on a narrow screen.
This patch allows scrollbar to be used as needed by Gtk

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

Merge branch 'ml/cvsserver' into nextJunio C Hamano Thu, 2 Mar 2006 01:45:09 +0000 (17:45 -0800)

Merge branch 'ml/cvsserver' into next

* ml/cvsserver:
cvsserver: Checkout correctly on Eclipse

cvsserver: Checkout correctly on EclipseMartin Langhoff Thu, 2 Mar 2006 00:58:57 +0000 (13:58 +1300)

cvsserver: Checkout correctly on Eclipse

Initial checkouts were failing to create Entries files under Eclipse.
Eclipse was waiting for two non-standard directory-resets to prepare for a new
directory from the server.

This patch is tricky, because the same directory resets tend to confuse other
clients. It's taken a bit of fiddling to get the commandline cvs client and
Eclipse to get a good, clean checkout.

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

Merge branch 'jc/tag' into nextJunio C Hamano Thu, 2 Mar 2006 01:43:02 +0000 (17:43 -0800)

Merge branch 'jc/tag' into next

* jc/tag:
Pretty-print tagger dates.

Pull GIT 1.2.4 fixes from masterJunio C Hamano Thu, 2 Mar 2006 01:42:30 +0000 (17:42 -0800)

Pull GIT 1.2.4 fixes from master

Re-fix compilation warnings.Luck, Tony Wed, 1 Mar 2006 23:01:53 +0000 (15:01 -0800)

Re-fix compilation warnings.

Commit 8fcf1ad9c68e15d881194c8544e7c11d33529c2b has a
combination of double cast and Andreas' switch to using
unsigned long ... just the latter is sufficient (and a lot less
ugly than using the double cast).

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

Merge branch 'jc/diff' into nextJunio C Hamano Thu, 2 Mar 2006 01:09:50 +0000 (17:09 -0800)

Merge branch 'jc/diff' into next

* jc/diff:
diffcore-delta: stop using deltifier for packing.

Up to date with GIT 1.2.4 fixesJunio C Hamano Thu, 2 Mar 2006 01:07:42 +0000 (17:07 -0800)

Up to date with GIT 1.2.4 fixes

Pretty-print tagger dates.Junio C Hamano Thu, 2 Mar 2006 00:43:19 +0000 (16:43 -0800)

Pretty-print tagger dates.

We can show commit objects with human readable dates using
various --pretty options, but there was no way to do so with
tags. This introduces two such ways:

$ git-cat-file -p v1.2.3

shows the tag object with tagger dates in human readable format.

$ git-verify-tag --verbose v1.2.3

uses it to show the contents of the tag object as well as doing
GPG verification.

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

Merge branch 'lt/fix-apply' into maint v1.2.4Junio C Hamano Thu, 2 Mar 2006 01:06:12 +0000 (17:06 -0800)

Merge branch 'lt/fix-apply' into maint

* lt/fix-apply:
git-am: --whitespace=x option.
git-apply: war on whitespace -- finishing touches.
git-apply --whitespace=nowarn
apply --whitespace: configuration option.
apply: squelch excessive errors and --whitespace=error-all
apply --whitespace fixes and enhancements.
The war on trailing whitespace

Merge branch 'lt/apply'Junio C Hamano Thu, 2 Mar 2006 01:05:57 +0000 (17:05 -0800)

Merge branch 'lt/apply'

* lt/apply:
git-am: --whitespace=x option.
git-apply: war on whitespace -- finishing touches.
git-apply --whitespace=nowarn
apply --whitespace: configuration option.
apply: squelch excessive errors and --whitespace=error-all
apply --whitespace fixes and enhancements.
The war on trailing whitespace

Merge early parts of 'np/delta' branchJunio C Hamano Thu, 2 Mar 2006 00:55:51 +0000 (16:55 -0800)

Merge early parts of 'np/delta' branch

Merge git-mv fixes from 'maint'Junio C Hamano Wed, 1 Mar 2006 20:16:25 +0000 (12:16 -0800)

Merge git-mv fixes from 'maint'

git-mv: fixes for path handlingJosef Weidendorfer Wed, 1 Mar 2006 18:09:23 +0000 (19:09 +0100)

git-mv: fixes for path handling

Moving a directory ending in a slash was not working as the
destination was not calculated correctly.
E.g. in the git repo,

git-mv t/ Documentation

gave the error

Error: destination 'Documentation' already exists

To get rid of this problem, strip trailing slashes from all arguments.
The comment in cg-mv made me curious about this issue; Pasky, thanks!
As result, the workaround in cg-mv is not needed any more.

Also, another bug was shown by cg-mv. When moving files outside of
a subdirectory, it typically calls git-mv with something like

git-mv Documentation/git.txt Documentation/../git-mv.txt

which triggers the following error from git-update-index:

Ignoring path Documentation/../git-mv.txt

The result is a moved file, removed from git revisioning, but not
added again. To fix this, the paths have to be normalized not have ".."
in the middle. This was already done in git-mv, but only for
a better visual appearance :(

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

git-mv: Allow -h without repo & fix error messageJosef Weidendorfer Wed, 1 Mar 2006 17:16:36 +0000 (18:16 +0100)

git-mv: Allow -h without repo & fix error message

This fixes "git-mv -h" to output the usage without the need
to be in a git repository.
Additionally:
- fix confusing error message when only one arg was given
- fix typo in error message

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

Allow git-mv to accept ./ in paths.Junio C Hamano Sun, 19 Feb 2006 07:42:03 +0000 (23:42 -0800)

Allow git-mv to accept ./ in paths.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 9a0e6731c632c841cd2de9dec0b9091b2f10c6fd commit)

combine-diff: Honour -z option correctly.Mark Wooding Mon, 27 Feb 2006 12:52:52 +0000 (12:52 +0000)

combine-diff: Honour -z option correctly.

Combined diffs don't null terminate things in the same way as standard
diffs. This is presumably wrong.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 6baf0484efcd29bb5e58ccd5ea0379481d4a83f4 commit)

combine-diff: Honour --full-index.Mark Wooding Mon, 27 Feb 2006 12:52:50 +0000 (12:52 +0000)

combine-diff: Honour --full-index.

For some reason, combined diffs don't honour the --full-index flag when
emitting patches. Fix this.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from e70c6b35749c316f6e97099bd6bdac895c9d6f68 commit)

diffcore-break: micro-optimize by avoiding delta betwee... Junio C Hamano Wed, 1 Mar 2006 04:19:47 +0000 (20:19 -0800)

diffcore-break: micro-optimize by avoiding delta between identical files.

We did not check if we have the same file on both sides when
computing break score. This is usually not a problem, but if
the user said --find-copies-harde with -B, we ended up trying a
delta between the same data even when we know the SHA1 hash of
both sides match.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from aeecd23ae2785a0462d42191974e9d9a8e439fbe commit)

Merge branch 'lt/rev-list' into nextJunio C Hamano Wed, 1 Mar 2006 11:17:13 +0000 (03:17 -0800)

Merge branch 'lt/rev-list' into next

* lt/rev-list:
git-log (internal): more options.
git-log (internal): add approxidate.

git-log (internal): more options.Junio C Hamano Wed, 1 Mar 2006 08:58:56 +0000 (00:58 -0800)

git-log (internal): more options.

This ports the following options from rev-list based git-log
implementation:

* -<n>, -n<n>, and -n <n>. I am still wondering if we want
this natively supported by setup_revisions(), which already
takes --max-count. We may want to move them in the next
round. Also I am not sure if we can get away with not
setting revs->limited when we set max-count. The latest
rev-list.c and revision.c in this series do not, so I left
them as they are.

* --pretty and --pretty=<fmt>.

* --abbrev=<n> and --no-abbrev.

The previous commit already handles time-based limiters
(--since, --until and friends). The remaining things that
rev-list based git-log happens to do are not useful in a pure
log-viewing purposes, and not ported:

* --bisect (obviously).

* --header. I am actually in favor of doing the NUL
terminated record format, but rev-list based one always
passed --pretty, which defeated this option. Maybe next
round.

* --parents. I do not think of a reason a log viewer wants
this. The flag is primarily for feeding squashed history
via pipe to downstream tools.

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

git-log (internal): add approxidate.Junio C Hamano Wed, 1 Mar 2006 08:12:37 +0000 (00:12 -0800)

git-log (internal): add approxidate.

Next will be the pretty-print format.

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

Merge branch 'lt/rev-list' into nextJunio C Hamano Wed, 1 Mar 2006 10:55:56 +0000 (02:55 -0800)

Merge branch 'lt/rev-list' into next

* lt/rev-list:
Rip out merge-order and make "git log <paths>..." work again.
Tie it all together: "git log"
Introduce trivial new pager.c helper infrastructure
git-rev-list libification: rev-list walking

blame.c #include's epoch.h; it needed to be killed.

Rip out merge-order and make "git log <paths>..." work... Linus Torvalds Tue, 28 Feb 2006 23:07:20 +0000 (15:07 -0800)

Rip out merge-order and make "git log <paths>..." work again.

Well, assuming breaking --merge-order is fine, here's a patch (on top of
the other ones) that makes

git log <filename>

actually work, as far as I can tell.

I didn't add the logic for --before/--after flags, but that should be
pretty trivial, and is independent of this anyway.

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

Merge part of 'jc/diff' into nextJunio C Hamano Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)

Merge part of 'jc/diff' into next

Merge part of 'sp/checkout' into nextJunio C Hamano Wed, 1 Mar 2006 09:35:51 +0000 (01:35 -0800)

Merge part of 'sp/checkout' into next

Merge branch 'lt/apply' into nextJunio C Hamano Wed, 1 Mar 2006 09:35:00 +0000 (01:35 -0800)

Merge branch 'lt/apply' into next

* lt/apply:
git-am: --whitespace=x option.

Merge branch 'js/refs' into nextJunio C Hamano Wed, 1 Mar 2006 09:34:00 +0000 (01:34 -0800)

Merge branch 'js/refs' into next

* js/refs:
Warn about invalid refs

Merge branch 'cvsserver' of locke.catalyst.net.nz/git... Junio C Hamano Wed, 1 Mar 2006 09:33:23 +0000 (01:33 -0800)

Merge branch 'cvsserver' of locke.catalyst.net.nz/git/git-martinlanghoff; branch 'master' into next

Conflicts:

Documentation/git-cvsserver.txt
git-cvsserver.perl

Originally Martin's tree was based on "next", which meant that all
the other things that I am not ready to push out to "master" were
contained in it. His changes looked good, and I wanted to have them
in "master".

So, here is what I did:

- fetch Martin's tree into a temporary topic branch.
$ git fetch $URL $remote:ml/cvsserver
$ git checkout ml/cvsserver

- rebase it on top of "master".
$ git rebase --onto master next

- pull that master into "next", recording Martin's head as well.
$ git pull --append . master

Since I have apply.whitespace=strip in my configuration file, the
rebased cvsserver changes have trailing whitespaces introduced by
Martin's tree cleansed out. Hence the above conflicts.

The reason I made this octopus is to make sure that next time Martin
pulls from my "next" branch, it results in a fast forward. There is
no reason to force him do the same conflict resolution I did with this
merge.

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

Teach git-checkout-index to read filenames from stdin.Shawn Pearce Wed, 1 Mar 2006 02:43:33 +0000 (21:43 -0500)

Teach git-checkout-index to read filenames from stdin.

Since git-checkout-index is often used from scripts which
may have a stream of filenames they wish to checkout it is
more convenient to use --stdin than xargs. On platforms
where fork performance is currently sub-optimal and
the length of a command line is limited (*cough* Cygwin
*cough*) running a single git-checkout-index process for
a large number of files beats spawning it multiple times
from xargs.

File names are still accepted on the command line if
--stdin is not supplied. Nothing is performed if no files
are supplied on the command line or by stdin.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Warn about invalid refsJohannes Schindelin Tue, 28 Feb 2006 21:16:01 +0000 (22:16 +0100)

Warn about invalid refs

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

cvsserver: Eclipse compat - browsing 'modules' (heads... Martin Langhoff Wed, 1 Mar 2006 07:03:58 +0000 (20:03 +1300)

cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works

Eclipse CVS clients have an odd way of perusing the top level of
the repository, by calling update on module "". So reproduce cvs'
odd behaviour in the interest of compatibility.

It makes it much easier to get a checkout when using Eclipse.

cvsserver: Eclipse compat fixes - implement Questionabl... Martin Langhoff Wed, 1 Mar 2006 06:30:35 +0000 (19:30 +1300)

cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U

A few things to satisfy Eclipse's strange habits as a cvs client:

- Implement Questionable
- Aliased rlog to log, but more work may be needed
- Add a space after the U that indicates updated

cvsserver: add notes on how to get a checkout under... Martin Langhoff Thu, 23 Feb 2006 23:20:51 +0000 (12:20 +1300)

cvsserver: add notes on how to get a checkout under Eclipse

cvsserver: Eclipse compat - browsing 'modules' (heads... Martin Langhoff Wed, 1 Mar 2006 07:03:58 +0000 (20:03 +1300)

cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works

Eclipse CVS clients have an odd way of perusing the top level of
the repository, by calling update on module "". So reproduce cvs'
odd behaviour in the interest of compatibility.

It makes it much easier to get a checkout when using Eclipse.

cvsserver: Eclipse compat fixes - implement Questionabl... Martin Langhoff Wed, 1 Mar 2006 06:30:35 +0000 (19:30 +1300)

cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U

A few things to satisfy Eclipse's strange habits as a cvs client:

- Implement Questionable
- Aliased rlog to log, but more work may be needed
- Add a space after the U that indicates updated

cvsserver: add notes on how to get a checkout under... Martin Langhoff Thu, 23 Feb 2006 23:20:51 +0000 (12:20 +1300)

cvsserver: add notes on how to get a checkout under Eclipse

git-am: --whitespace=x option.Junio C Hamano Wed, 1 Mar 2006 04:26:25 +0000 (20:26 -0800)

git-am: --whitespace=x option.

This is passed down to git-apply to override the built-in
default and per-repository configuration at runtime.

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

git-am: --whitespace=x option.Junio C Hamano Wed, 1 Mar 2006 04:26:25 +0000 (20:26 -0800)

git-am: --whitespace=x option.

This is passed down to git-apply to override the built-in
default and per-repository configuration at runtime.

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

diffcore-delta: stop using deltifier for packing.Junio C Hamano Wed, 1 Mar 2006 04:16:41 +0000 (20:16 -0800)

diffcore-delta: stop using deltifier for packing.

This switches the change estimation logic used by break, rename
and copy detection from delta packing code to a more line
oriented one. This way, thee performance-density tradeoff by
delta packing code can be made without worrying about breaking
the rename detection.

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

diffcore-rename: split out the delta counting code.Junio C Hamano Wed, 1 Mar 2006 00:01:36 +0000 (16:01 -0800)

diffcore-rename: split out the delta counting code.

This is to rework diffcore break/rename/copy detection code
so that it does not affected when deltifier code gets improved.

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

diffcore-break: micro-optimize by avoiding delta betwee... Junio C Hamano Wed, 1 Mar 2006 04:19:47 +0000 (20:19 -0800)

diffcore-break: micro-optimize by avoiding delta between identical files.

We did not check if we have the same file on both sides when
computing break score. This is usually not a problem, but if
the user said --find-copies-harde with -B, we ended up trying a
delta between the same data even when we know the SHA1 hash of
both sides match.

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

Tie it all together: "git log"Linus Torvalds Tue, 28 Feb 2006 19:30:19 +0000 (11:30 -0800)

Tie it all together: "git log"

This is what the previous diffs all built up to.

We can do "git log" as a trivial small helper function inside git.c,
because the infrastructure is all there for us to use as a library.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Introduce trivial new pager.c helper infrastructureLinus Torvalds Tue, 28 Feb 2006 19:26:21 +0000 (11:26 -0800)

Introduce trivial new pager.c helper infrastructure

This introduces the new function

void setup_pager(void);

to set up output to be written through a pager applocation.

All in preparation for doing the simple scripts in C.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

git-rev-list libification: rev-list walkingLinus Torvalds Tue, 28 Feb 2006 19:24:00 +0000 (11:24 -0800)

git-rev-list libification: rev-list walking

This actually moves the "meat" of the revision walking from rev-list.c
to the new library code in revision.h. It introduces the new functions

void prepare_revision_walk(struct rev_info *revs);
struct commit *get_revision(struct rev_info *revs);

to prepare and then walk the revisions that we have.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Darwin: Ignore missing /sw/libShawn Pearce Tue, 28 Feb 2006 14:03:48 +0000 (09:03 -0500)

Darwin: Ignore missing /sw/lib

When on Darwin platforms don't include Fink or DarwinPorts
into the link path unless the related library directory
is actually present. The linker on MacOS 10.4 complains
if it is given a directory which does not exist.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

gitview: Set the default width of graph cellAneesh Kumar K.V Tue, 28 Feb 2006 14:40:28 +0000 (20:10 +0530)

gitview: Set the default width of graph cell

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

gitview: Some window layout changes.Aneesh Kumar K.V Tue, 28 Feb 2006 13:42:18 +0000 (19:12 +0530)

gitview: Some window layout changes.

This makes menubar look nice

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

gitview: Select the text color based on whether the... Pavel Roskin Tue, 28 Feb 2006 13:41:08 +0000 (19:11 +0530)

gitview: Select the text color based on whether the entry in highlighted. Use standard font.

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

git-apply: war on whitespace -- finishing touches.Junio C Hamano Tue, 28 Feb 2006 09:12:52 +0000 (01:12 -0800)

git-apply: war on whitespace -- finishing touches.

This changes the default --whitespace policy to nowarn when we
are only getting --stat, --summary etc. IOW when not applying
the patch. When applying the patch, the default is warn (spit
out warning message but apply the patch).

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

Merge part of np/deltaJunio C Hamano Tue, 28 Feb 2006 09:15:29 +0000 (01:15 -0800)

Merge part of np/delta

Merge branch 'lt/apply' into nextJunio C Hamano Tue, 28 Feb 2006 09:14:56 +0000 (01:14 -0800)

Merge branch 'lt/apply' into next

* lt/apply:
git-apply: war on whitespace -- finishing touches.
git-apply --whitespace=nowarn

git-apply: war on whitespace -- finishing touches.Junio C Hamano Tue, 28 Feb 2006 09:12:52 +0000 (01:12 -0800)

git-apply: war on whitespace -- finishing touches.

This changes the default --whitespace policy to nowarn when we
are only getting --stat, --summary etc. IOW when not applying
the patch. When applying the patch, the default is warn (spit
out warning message but apply the patch).

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

diff-delta: bound hash list length to avoid O(m*n)... Nicolas Pitre Tue, 28 Feb 2006 04:09:55 +0000 (23:09 -0500)

diff-delta: bound hash list length to avoid O(m*n) behavior

The diff-delta code can exhibit O(m*n) behavior with some patological
data set where most hash entries end up in the same hash bucket.

The latest code rework reduced the block size making it particularly
vulnerable to this issue, but the issue was always there and can be
triggered regardless of the block size.

This patch does two things:

1) the hashing has been reworked to offer a better distribution to
atenuate the problem a bit, and

2) a limit is imposed to the number of entries that can exist in the
same hash bucket.

Because of the above the code is a bit more expensive on average, but
the problematic samples used to diagnoze the issue are now orders of
magnitude less expensive to process with only a slight loss in
compression.

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

Revert "Revert "diff-delta: produce optimal pack data""Junio C Hamano Tue, 28 Feb 2006 05:37:56 +0000 (21:37 -0800)

Revert "Revert "diff-delta: produce optimal pack data""

git-apply --whitespace=nowarnJunio C Hamano Tue, 28 Feb 2006 01:07:16 +0000 (17:07 -0800)

git-apply --whitespace=nowarn

Andrew insists --whitespace=warn should be the default, and I
tend to agree. This introduces --whitespace=warn, so if your
project policy is more lenient, you can squelch them by having
apply.whitespace=nowarn in your configuration file.

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

apply --whitespace: configuration option.Junio C Hamano Mon, 27 Feb 2006 22:47:45 +0000 (14:47 -0800)

apply --whitespace: configuration option.

The new configuration option apply.whitespace can take one of
"warn", "error", "error-all", or "strip". When git-apply is run
to apply the patch to the index, they are used as the default
value if there is no command line --whitespace option.

Andrew can now tell people who feed him git trees to update to
this version and say:

git repo-config apply.whitespace error

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

apply: squelch excessive errors and --whitespace=error-allJunio C Hamano Mon, 27 Feb 2006 22:16:30 +0000 (14:16 -0800)

apply: squelch excessive errors and --whitespace=error-all

This by default makes --whitespace=warn, error, and strip to
warn only the first 5 additions of trailing whitespaces. A new
option --whitespace=error-all can be used to view all of them
before applying.

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

apply --whitespace fixes and enhancements.Junio C Hamano Mon, 27 Feb 2006 02:13:25 +0000 (18:13 -0800)

apply --whitespace fixes and enhancements.

In addition to fixing obvious command line parsing bugs in the
previous round, this changes the following:

* Adds "--whitespace=strip". This applies after stripping the
new trailing whitespaces introduced to the patch.

* The output error message format is changed to say
"patch-filename:linenumber:contents of the line". This makes
it similar to typical compiler error message format, and
helps C-x ` (next-error) in Emacs compilation buffer.

* --whitespace=error and --whitespace=warn do not stop at the
first error. We might want to limit the output to say first
20 such lines to prevent cluttering, but on the other hand if
you are willing to hand-fix after inspecting them, getting
everything with a single run might be easier to work with.
After all, somebody has to do the clean-up work somewhere.

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

The war on trailing whitespaceLinus Torvalds Sun, 26 Feb 2006 17:29:00 +0000 (09:29 -0800)

The war on trailing whitespace

On Sat, 25 Feb 2006, Andrew Morton wrote:
>
> I'd suggest a) git will simply refuse to apply such a patch unless given a
> special `forcing' flag, b) even when thus forced, it will still warn and c)
> with a different flag, it will strip-then-apply, without generating a
> warning.

This doesn't do the "strip-then-apply" thing, but it allows you to make
git-apply generate a warning or error on extraneous whitespace.

Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error
to make it a fatal error to have whitespace at the end.

Totally untested, of course. But it compiles, so it must be fine.

HOWEVER! Note that this literally will check every single patch-line with
"+" at the beginning. Which means that if you fix a simple typo, and the
line had a space at the end before, and you didn't remove it, that's still
considered a "new line with whitespace at the end", even though obviously
the line wasn't really new.

I assume this is what you wanted, and there isn't really any sane
alternatives (you could make the warning activate only for _pure_
additions with no deletions at all in that hunk, but that sounds a bit
insane).

Linus

git-apply --whitespace=nowarnJunio C Hamano Tue, 28 Feb 2006 01:07:16 +0000 (17:07 -0800)

git-apply --whitespace=nowarn

Andrew insists --whitespace=warn should be the default, and I
tend to agree. This introduces --whitespace=warn, so if your
project policy is more lenient, you can squelch them by having
apply.whitespace=nowarn in your configuration file.

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

Merge branch 'master' into nextJunio C Hamano Mon, 27 Feb 2006 23:54:36 +0000 (15:54 -0800)

Merge branch 'master' into next

* master:
Merge part of kh/svnimport branch into master
contrib/git-svn: correct commit example in manpage
contrib/git-svn: tell the user to not modify git-svn-HEAD directly
gitview: Remove trailing white space
gitview: Fix the encoding related bug
git-format-patch: Always add a blank line between headers and body.
combine-diff: Honour -z option correctly.
combine-diff: Honour --full-index.

Merge branch 'lt/rev-list' into nextJunio C Hamano Mon, 27 Feb 2006 23:48:17 +0000 (15:48 -0800)

Merge branch 'lt/rev-list' into next

* lt/rev-list:
Splitting rev-list into revisions lib, end of beginning.

Merge branch 'lt/apply' into nextJunio C Hamano Mon, 27 Feb 2006 23:48:13 +0000 (15:48 -0800)

Merge branch 'lt/apply' into next

* lt/apply:
apply --whitespace: configuration option.
apply: squelch excessive errors and --whitespace=error-all

Merge branch 'kh/svnimport' into nextJunio C Hamano Mon, 27 Feb 2006 23:48:06 +0000 (15:48 -0800)

Merge branch 'kh/svnimport' into next

* kh/svnimport:
Save username -> Full Name <email@addr.es> map file
Let git-svnimport's author file use same syntax as git-cvsimport's

Merge part of kh/svnimport branch into masterJunio C Hamano Mon, 27 Feb 2006 23:46:39 +0000 (15:46 -0800)

Merge part of kh/svnimport branch into master

contrib/git-svn: correct commit example in manpageEric Wong Mon, 27 Feb 2006 20:55:45 +0000 (12:55 -0800)

contrib/git-svn: correct commit example in manpage

Thanks to Nicolas Vilz <niv@iaglans.de> for noticing this.

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

Save username -> Full Name <email@addr.es> map fileKarl Hasselström Mon, 27 Feb 2006 23:08:19 +0000 (00:08 +0100)

Save username -> Full Name <email@addr.es> map file

When the user specifies a username -> Full Name <email@addr.es> map
file with the -A option, save a copy of that file as
$git_dir/svn-authors. When running git-svnimport with an existing GIT
directory, use $git_dir/svn-authors (if it exists) unless a file was
explicitly specified with -A.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

Let git-svnimport's author file use same syntax as... Karl Hasselström Mon, 27 Feb 2006 23:08:15 +0000 (00:08 +0100)

Let git-svnimport's author file use same syntax as git-cvsimport's

git-cvsimport uses a username => Full Name <email@addr.es> mapping
file with this syntax:

kha=Karl Hasselström <kha@treskal.com>

Since there is no reason to use another format for git-svnimport, use
the same format.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

apply --whitespace: configuration option.Junio C Hamano Mon, 27 Feb 2006 22:47:45 +0000 (14:47 -0800)

apply --whitespace: configuration option.

The new configuration option apply.whitespace can take one of
"warn", "error", "error-all", or "strip". When git-apply is run
to apply the patch to the index, they are used as the default
value if there is no command line --whitespace option.

Andrew can now tell people who feed him git trees to update to
this version and say:

git repo-config apply.whitespace error

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