gitweb.git
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.

diff-delta: cull collided hash bucket more aggressively.Junio C Hamano Tue, 28 Feb 2006 07:38:50 +0000 (23:38 -0800)

diff-delta: cull collided hash bucket more aggressively.

This tries to limit collided hash buckets by removing identical
three-byte prefix from the same hashbucket.

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>

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>

contrib/git-svn: tell the user to not modify git-svn... Eric Wong Mon, 27 Feb 2006 19:04:02 +0000 (11:04 -0800)

contrib/git-svn: tell the user to not modify git-svn-HEAD directly

As a rule, interface branches to different SCMs should never be modified
directly by the user. They are used exclusively for talking to the
foreign SCM.

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

Splitting rev-list into revisions lib, end of beginning.Linus Torvalds Mon, 27 Feb 2006 16:54:36 +0000 (08:54 -0800)

Splitting rev-list into revisions lib, end of beginning.

This makes the rewrite easier to validate in that revision flag
parsing and warlking part are now all in rev_info structure.

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

gitview: Remove trailing white spaceAneesh Kumar K.V Mon, 27 Feb 2006 17:12:07 +0000 (22:42 +0530)

gitview: Remove trailing white space

Do the cleanup using Dave jones vim script

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

gitview: Fix the encoding related bugAneesh Kumar K.V Mon, 27 Feb 2006 15:55:13 +0000 (21:25 +0530)

gitview: Fix the encoding related bug

Get the encoding information from repository and convert it to utf-8 before
passing to gtk.TextBuffer.set_text. gtk.TextBuffer.set_text work only with utf-8

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

git-format-patch: Always add a blank line between heade... Alexandre Julliard Mon, 27 Feb 2006 13:09:56 +0000 (14:09 +0100)

git-format-patch: Always add a blank line between headers and body.

If the second line of the commit message isn't empty, git-format-patch
needs to add an empty line in order to generate a properly formatted
mail. Otherwise git-rebase drops the rest of the commit message.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

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>

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>

Merge branch 'kh/svnimport' into nextJunio C Hamano Mon, 27 Feb 2006 05:55:16 +0000 (21:55 -0800)

Merge branch 'kh/svnimport' into next

* kh/svnimport:
svnimport: Read author names and emails from a file

Merge branch 'lt/apply' into nextJunio C Hamano Mon, 27 Feb 2006 05:55:08 +0000 (21:55 -0800)

Merge branch 'lt/apply' into next

* lt/apply:
apply --whitespace fixes and enhancements.
The war on trailing whitespace
svnimport: Convert the svn:ignore property
svnimport: Convert executable flag
svnimport: Mention -r in usage summary
Make git diff-generation use a simpler spawn-like interface

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

Merge branch 'lt/rev-list' into nextJunio C Hamano Mon, 27 Feb 2006 05:53:56 +0000 (21:53 -0800)

Merge branch 'lt/rev-list' into next

* lt/rev-list:
rev-list split: minimum fixup.

svnimport: Read author names and emails from a fileKarl Hasselström Sun, 26 Feb 2006 05:11:31 +0000 (06:11 +0100)

svnimport: Read author names and emails from a file

Read a file with lines on the form

username User's Full Name <email@addres.org>

and use "User's Full Name <email@addres.org>" as the GIT author and
committer for Subversion commits made by "username". If encountering a
commit made by a user not in the list, abort.

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

svnimport: Convert the svn:ignore propertyKarl Hasselström Sun, 26 Feb 2006 05:11:29 +0000 (06:11 +0100)

svnimport: Convert the svn:ignore property

Put the value of the svn:ignore property in a regular file when
converting a Subversion repository to GIT. The Subversion and GIT
ignore syntaxes are similar enough that it often just works to set the
filename to .gitignore and do nothing else.

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

svnimport: Convert executable flagKarl Hasselström Sun, 26 Feb 2006 05:11:27 +0000 (06:11 +0100)

svnimport: Convert executable flag

Convert the svn:executable property to file mode 755 when converting
an SVN repository to GIT.

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

svnimport: Mention -r in usage summaryKarl Hasselström Sun, 26 Feb 2006 05:11:24 +0000 (06:11 +0100)

svnimport: Mention -r in usage summary

I added the -r option to git-svnimport some time ago, but forgot to
update the usage summary in the documentation.

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

rev-list split: minimum fixup.Junio C Hamano Mon, 27 Feb 2006 05:19:14 +0000 (21:19 -0800)

rev-list split: minimum fixup.

This fixes "the other end has commit X but since then we tagged
that commit with tag T, and he says he wants T -- what is the
list of objects we need to send him?" question:

git-rev-list --objects ^X T

We ended up sending everything since the beginning of time X-<.

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

Make git diff-generation use a simpler spawn-like interfaceLinus Torvalds Sun, 26 Feb 2006 23:51:24 +0000 (15:51 -0800)

Make git diff-generation use a simpler spawn-like interface

Instead of depending of fork() and execve() and doing things in between
the two, make the git diff functions do everything up front, and then do
a single "spawn_prog()" invocation to run the actual external diff
program (if any is even needed).

This actually ends up simplifying the code, and should make it much
easier to make it efficient under broken operating systems (read: Windows).

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

Merge branch 'lt/rev-list' into nextJunio C Hamano Sun, 26 Feb 2006 23:33:49 +0000 (15:33 -0800)

Merge branch 'lt/rev-list' into next

* lt/rev-list:
First cut at libifying revlist generation
Merge branch 'maint'
sample hooks template.
Teach the "git" command to handle some commands internally
Use setenv(), fix warnings
contrib/git-svn: version 0.10.0
contrib/git-svn: optimize sequential commits to svn
contrib/git-svn: add show-ignore command
annotate: Use qx{} for pipes on activestate.
annotate: Convert all -| calls to use a helper open_pipe().
annotate: Handle dirty state and arbitrary revisions.
git-fetch: print the new and old ref when fast-forwarding

First cut at libifying revlist generationLinus Torvalds Sun, 26 Feb 2006 00:19:46 +0000 (16:19 -0800)

First cut at libifying revlist generation

This really just splits things up partially, and creates the
interface to set things up by parsing the command line.

No real code changes so far, although the parsing of filenames is a bit
stricter. In particular, if there is a "--", then we do not accept any
filenames before it, and if there isn't any "--", then we check that _all_
paths listed are valid, not just the first one.

The new argument parsing automatically also gives us "--default" and
"--not" handling as in git-rev-parse.

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

Merge branch 'maint'Junio C Hamano Sun, 26 Feb 2006 23:25:52 +0000 (15:25 -0800)

Merge branch 'maint'

* maint:
sample hooks template.

sample hooks template.Junio C Hamano Sun, 26 Feb 2006 23:16:41 +0000 (15:16 -0800)

sample hooks template.

These two sample hooks try to detect and use the corresponding
commit hook from the same repository. However, they forgot to
set up GIT_DIR for their own use, so was not in effect.

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

Teach the "git" command to handle some commands internallyLinus Torvalds Sun, 26 Feb 2006 20:34:51 +0000 (12:34 -0800)

Teach the "git" command to handle some commands internally

This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.

Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.

This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.

In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.

There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.

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

Use setenv(), fix warningsTimo Hirvonen Sun, 26 Feb 2006 15:13:46 +0000 (17:13 +0200)

Use setenv(), fix warnings

- Fix -Wundef -Wold-style-definition warnings
- Make pll_free() static

[jc: original patch by Timo had another unrelated bits:

- Use setenv() instead of putenv()

I'm postponing that part for now.]

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

contrib/git-svn: version 0.10.0Eric Wong Sun, 26 Feb 2006 10:22:27 +0000 (02:22 -0800)

contrib/git-svn: version 0.10.0

New features deserve an increment of the minor version. This will very
likely become 1.0.0 unless release-critical bugs are found.

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