Shawn O. Pearce [Mon, 14 Aug 2006 04:58:19 +0000 (00:58 -0400)]
Added tree and commit writing to fast-import.
The tree of the current commit can be altered by file_change commands
before the commit gets written to the pack. The file changes are
rather primitive as they simply allow removal of a tree entry or
setting/adding a tree entry.
Currently trees and commits aren't being deltafied when written to
the pack and branch reloading from the current pack doesn't work,
so at most 5 branches can be worked with at any one time.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 8 Aug 2006 07:36:45 +0000 (03:36 -0400)]
Implemented branch handling and basic tree support in fast-import.
This provides the basic data structures needed to store trees in
memory while we are processing them for a branch. What we are
attempting to do is track one complete tree for each branch that
the frontend has registered with us through the 'newb' (new_branch)
command. When the frontend edits that tree through 'updf' or 'delf'
commands we'll mark the affected tree(s) as being dirty and recompute
their objects during 'comt' (commit).
Currently the protocol is decidedly _not_ user friendly. I crashed
fast-import by giving it bad input data from Perl. I may try to
improve upon it, or at least upon its error handling.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 8 Aug 2006 05:14:21 +0000 (01:14 -0400)]
Added basic command handler to fast-import.
Moved the new_blob logic off into a new subroutine and
invoked it when getting the 'blob' command.
Added statistics dump to STDERR when the program terminates listing
what it did at a high level. This is somewhat interesting.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 8 Aug 2006 04:46:13 +0000 (00:46 -0400)]
Refactored fast-import's internals for future additions.
Too many globals variables were being used not not enough
code was resuable to process trees and commits so this is
a simple refactoring of the existing blob processing code
to get into a state that will be easier to handle trees
and commits in.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Tue, 8 Aug 2006 04:03:59 +0000 (00:03 -0400)]
Cleaned up memory allocation for object_entry structs.
Although its easy to ask the user to tell us how many objects they
will need, its probably better to dynamically grow the object table
in large units. But if the user can give us a hint as to roughly
how many objects then we can still use it during startup.
Also stopped printing the SHA1 strings to stdout as no user is
currently making use of that facility.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sun, 6 Aug 2006 17:51:39 +0000 (13:51 -0400)]
Added automatic index generation to fast-import.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Sat, 5 Aug 2006 06:04:21 +0000 (02:04 -0400)]
Created fast-import, a tool to quickly generating a pack from blobs.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Junio C Hamano [Wed, 23 Aug 2006 20:57:23 +0000 (13:57 -0700)]
Convert memset(hash,0,20) to hashclr(hash).
In the same spirit as hashcmp() and hashcpy().
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Wed, 23 Aug 2006 06:49:00 +0000 (02:49 -0400)]
Convert memcpy(a,b,20) to hashcpy(a,b).
This abstracts away the size of the hash values when copying them
from memory location to memory location, much as the introduction
of hashcmp abstracted away hash value comparsion.
A few call sites were using char* rather than unsigned char* so
I added the cast rather than open hashcpy to be void*. This is a
reasonable tradeoff as most call sites already use unsigned char*
and the existing hashcmp is also declared to be unsigned char*.
[jc: Splitted the patch to "master" part, to be followed by a
patch for merge-recursive.c which is not in "master" yet.
Fixed the cast in the latter hunk to combine-diff.c which was
wrong in the original.
Also converted ones left-over in combine-diff.c, diff-lib.c and
upload-pack.c ]
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Pierre Habouzit [Wed, 23 Aug 2006 09:17:55 +0000 (11:17 +0200)]
Fix a comparison bug in diff-delta.c
(1 << i) < hspace is compared in the `int` space rather that in the
unsigned one. the result will be wrong if hspace is between 0x40000000
and 0x80000000.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Haavard Skinnemoen [Wed, 23 Aug 2006 10:02:59 +0000 (03:02 -0700)]
git-send-email: Don't set author_not_sender from Cc: lines
When an mbox-style patch contains a Cc: line in the header,
git-send-email will check the address against the sender specified
on the command line. If they don't match, sender_not_author will
be set to the address obtained from the Cc line.
When this happens, git-send-email inserts a From: line at the
beginning of the message body with the address obtained from the
Cc line in the header, and the sender might be accused of forging
patch authors.
This patch fixes this by only updating sender_not_author when
processing From: lines, not when processing Cc: lines.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Mon, 21 Aug 2006 07:10:36 +0000 (03:10 -0400)]
Remove unnecessary forward declaration of unpack_entry.
This declaration probably used to be necessary but the code has
been refactored since to use unpack_entry_gently instead.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn Pearce [Mon, 21 Aug 2006 07:10:02 +0000 (03:10 -0400)]
Verify we know how to read a pack before trying to using it.
If the pack format were to ever change or be extended in the future
there is no assurance that just because the pack file lives in
objects/pack and doesn't end in .idx that we can read and decompress
its contents properly.
If we encounter what we think is a pack file and it isn't or we don't
recognize its version then die and suggest to the user that they
upgrade to a newer version of GIT which can handle that pack file.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Rene Scharfe [Mon, 21 Aug 2006 18:43:43 +0000 (20:43 +0200)]
Add write_or_die(), a helper function
The little helper write_or_die() won't come back with bad news about
full disks or broken pipes. It either succeeds or terminates the
program, making additional error handling unnecessary.
This patch adds the new function and uses it to replace two similar
ones (the one in tar-tree originally has been copied from cat-file
btw.). I chose to add the fd parameter which both lacked to make
write_or_die() just as flexible as write() and thus suitable for
lib-ification.
There is a regression: error messages emitted by this function don't
show the program name, while the replaced two functions did. That's
acceptable, I think; a lot of other functions do the same.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Rene Scharfe [Mon, 21 Aug 2006 18:11:48 +0000 (20:11 +0200)]
Axe the last ent
In the name of Standardization, this cleanses the last usage string of
mystical creatures. But they still dwell deep within the source and in
some debug messages, it is said.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 21 Aug 2006 21:16:38 +0000 (14:16 -0700)]
Merge branch 'maint'
* maint:
builtin-mv: readability patch
git-mv: fix off-by-one error
git-mv: special case destination "."
Johannes Schindelin [Sat, 19 Aug 2006 14:52:21 +0000 (16:52 +0200)]
builtin-mv: readability patch
The old version was not liked at all. This is hopefully better. Oh, and it
gets rid of the goto.
Note that it does not change any functionality.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Mon, 21 Aug 2006 20:22:25 +0000 (22:22 +0200)]
git-mv: fix off-by-one error
Embarassing.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Fri, 18 Aug 2006 10:42:39 +0000 (12:42 +0200)]
git-mv: special case destination "."
Since the normalized basename of "." is "", the check for directory
failed erroneously.
Noticed by Fredrik Kuivinen.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Sat, 19 Aug 2006 14:52:21 +0000 (16:52 +0200)]
builtin-mv: readability patch
The old version was not liked at all. This is hopefully better. Oh, and it
gets rid of the goto.
Note that it does not change any functionality.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Tilman Sauerbeck [Thu, 17 Aug 2006 18:44:16 +0000 (20:44 +0200)]
Indentation fix.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Thu, 17 Aug 2006 18:54:57 +0000 (11:54 -0700)]
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
Introduces global inline:
hashcmp(const unsigned char *sha1, const unsigned char *sha2)
Uses memcmp for comparison and returns the result based on the length of
the hash name (a future runtime decision).
Acked-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Thu, 17 Aug 2006 09:21:28 +0000 (11:21 +0200)]
gitweb: Uniquify version info output, add meta generator in page header
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 17 Aug 2006 02:27:03 +0000 (19:27 -0700)]
Merge branch 'jc/format-patch'
* jc/format-patch:
Add a newline before appending "Signed-off-by: " line
Ville Skyttä [Wed, 16 Aug 2006 20:12:26 +0000 (23:12 +0300)]
Be nicer if git executable is not installed
This patch avoids problems if vc-git.el is installed and activated, but
the git executable is not available, for example
http://list-archive.xemacs.org/xemacs-beta/200608/msg00062.html
Signed-off-by: Ville Skyttä <scop@xemacs.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 16 Aug 2006 21:00:34 +0000 (14:00 -0700)]
Merge branch 'jc/racy'
* jc/racy:
Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
Add check program "git-check-racy"
Documentation/technical/racy-git.txt
avoid nanosleep(2)
Junio C Hamano [Wed, 16 Aug 2006 21:00:12 +0000 (14:00 -0700)]
Merge branch 'maint'
* maint:
[PATCH] git-mv: add more path normalization
Junio C Hamano [Wed, 16 Aug 2006 20:58:32 +0000 (13:58 -0700)]
builtin-grep: remove unused debugging cruft.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Wed, 16 Aug 2006 12:50:34 +0000 (14:50 +0200)]
gitweb: Add support for per project git URLs
It is now possible for project to have individual clone/fetch URLs.
They are provided in new file 'cloneurl' added below project's
$GIT_DIR directory.
If there is no cloneurl file, concatenation of git base URLs with
project name is used.
This is merge of Jakub Narebski and David Rientjes
gitweb: Show project's git URL on summary page
with Aneesh Kumar
gitweb: Add support for cloneurl.
gitweb: Support multiple clone urls
patches.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Wed, 16 Aug 2006 08:44:02 +0000 (10:44 +0200)]
[PATCH] git-mv: add more path normalization
We already use the normalization from get_pathspec(), but now we also
remove a trailing slash. So,
git mv some_path/ into_some_path/
works now.
Also, move the "can not move directory into itself" test before the
subdirectory expansion.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 16 Aug 2006 04:40:43 +0000 (21:40 -0700)]
Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
The work-around should not be needed. Even if it turns out we
would want it later, git will remember the patch for us ;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Waitz [Tue, 15 Aug 2006 22:24:30 +0000 (00:24 +0200)]
gitweb: consolidate action URL generation.
Use the href() function instead of string concatenation to generate
most URLs to our own CGI.
This is a work in progress, not everything has been converted yet.
Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Waitz [Tue, 15 Aug 2006 22:23:50 +0000 (00:23 +0200)]
gitweb: provide function to format the URL for an action link.
Provide a new function which can be used to generate an URL for the CGI.
This makes it possible to consolidate the URL generation in order to make
it easier to change the encoding of actions into URLs.
Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Tue, 15 Aug 2006 21:03:17 +0000 (23:03 +0200)]
gitweb: Show project's git URL on summary page
From
31e4de9f22a3b17d4ad0ac800132e4e1a0a15006 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Tue, 15 Aug 2006 11:43:04 -0700
Subject: [PATCH] gitweb: Show project's git URL on summary page
Add support for showing multiple clone/fetch git URLs for project on
a summary page. URL for project is created from base URL and project
name.
For example for XMMS2 project (xmms.se) the git base URL would be
git://git.xmms.se/xmms2.
With corrections from David Rientjes <rientjes@google.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 16 Aug 2006 04:38:07 +0000 (21:38 -0700)]
Add check program "git-check-racy"
This will help counting the racily clean paths, but it should be
useless for daily use. Do not even enable it in the makefile.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 15 Aug 2006 20:09:49 +0000 (13:09 -0700)]
Documentation/technical/racy-git.txt
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Tue, 15 Aug 2006 17:23:48 +0000 (10:23 -0700)]
remove unnecessary initializations
[jc: I needed to hand merge the changes to the updated codebase,
so the result needs to be checked.]
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 16 Aug 2006 04:15:32 +0000 (21:15 -0700)]
Merge branch 'maint'
* maint:
finish_connect(): thinkofix
git-mv: succeed even if source is a prefix of destination
Solaris does not support C99 format strings before version 10
Junio C Hamano [Tue, 15 Aug 2006 23:28:08 +0000 (16:28 -0700)]
finish_connect(): thinkofix
All but one callers have ignore the return value from this
function, but the only caller, builtin-tar-tree.c::remote_tar(),
assumed it returns non-zero on failure and zero on success. The
implementation however was returning either the waited pid
(which must be the same as its input) or -1 (an error).
Fix this thinko, while getting rid of an assignment of return
value from waitpid() into a variable of type int.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin [Wed, 16 Aug 2006 00:20:32 +0000 (02:20 +0200)]
git-mv: succeed even if source is a prefix of destination
As noted by Fredrik Kuivinen, without this patch, git-mv fails on
git-mv README README-renamed
because "README" is a prefix of "README-renamed".
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Tue, 15 Aug 2006 17:40:06 +0000 (10:40 -0700)]
use appropriate typedefs
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Tue, 15 Aug 2006 20:37:19 +0000 (13:37 -0700)]
make inline is_null_sha1 global
Replace sha1 comparisons to null_sha1 with a global inline (which previously an
unused static inline in builtin-apply.c)
[jc: with a fix from Jonas Fonseca.]
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 15 Aug 2006 10:39:47 +0000 (03:39 -0700)]
avoid nanosleep(2)
On Solaris nanosleep(2) is not available in libc; you need to
link with -lrt to get it.
The purpose of the loop is to wait until the next filesystem
timestamp granularity, and the code uses subsecond sleep in the
hope that it can shorten the delay to 0.5 seconds on average
instead of a full second. It is probably not worth depending on
an extra library for this.
We might want to yank out the whole "racy-git avoidance is
costly later at runtime, so let's delay writing the index out"
codepath later, but that is a separate issue and needs some
testing on large trees to figure it out. After playing with the
kernel tree, I have a feeling that the whole thing may not be
worth it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 15 Aug 2006 09:23:06 +0000 (02:23 -0700)]
git-apply --binary: clean up and prepare for --reverse
This cleans up the implementation of "git-apply --binary", and
implements reverse application of binary patches (when git-diff
is converted to emit reversible binary patches).
Earlier, the types of encoding (either deflated literal or
deflated delta) were stored in is_binary field in struct patch,
which meant that we cannot store more than one fragment that
differ in the encoding for a patch. This moves the information
to a field in struct fragment that is otherwise unused for
binary patches, and makes it possible to hang two (or more, but
two is enough) hunks for a binary patch.
The original "binary patch" output from git-diff is internally
parsed into an "is_binary" patch with one fragment. Upcoming
reversible binary patch output will have two fragments, the
first one being the forward patch and the second one the reverse
patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Dennis Stosberg [Tue, 15 Aug 2006 09:01:27 +0000 (11:01 +0200)]
Fix detection of ipv6 on Solaris
The configuration script detects whether linking with -lsocket is
necessary but doesn't add -lsocket to LIBS. This lets the ipv6 test
fail.
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Dennis Stosberg [Tue, 15 Aug 2006 09:01:25 +0000 (11:01 +0200)]
Look for sockaddr_storage in sys/socket.h
On Solaris and the BSDs the definition of "struct sockaddr_storage"
is not available from "netinet/in.h". On Solaris "sys/socket.h" is
enough, at least OpenBSD needs "sys/types.h", too.
Using "sys/types.h" and "sys/socket.h" seems to be a more portable
way.
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Dennis Stosberg [Tue, 15 Aug 2006 09:01:20 +0000 (11:01 +0200)]
Solaris has strlcpy() at least since version 8
See http://docs.sun.com/app/docs/doc/816-3321/6m9k23sjk?a=view
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Dennis Stosberg [Tue, 15 Aug 2006 09:01:22 +0000 (11:01 +0200)]
Solaris does not support C99 format strings before version 10
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 15 Aug 2006 06:26:51 +0000 (23:26 -0700)]
git-apply --reverse: simplify reverse option.
Having is_reverse in each patch did not make sense. This will hopefully
simplify the work needed to introduce reversible binary diff format.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 15 Aug 2006 06:24:55 +0000 (23:24 -0700)]
t4116 apply --reverse test
The binary patch test needs to be made more careful not to have
the postimage blob in the repository in which the patch is applied
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:32:01 +0000 (13:32 -0700)]
Make sha1flush void and remove conditional return.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:40:51 +0000 (13:40 -0700)]
Make upload_pack void and remove conditional return.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:40:06 +0000 (13:40 -0700)]
Make track_tree_refs void.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:38:50 +0000 (13:38 -0700)]
Make pack_objects void.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:36:18 +0000 (13:36 -0700)]
Make fsck_dir void.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:20:12 +0000 (13:20 -0700)]
Make checkout_all void.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:39:27 +0000 (13:39 -0700)]
Make show_entry void
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:19:15 +0000 (13:19 -0700)]
Make pprint_tag void and cleans up call in cmd_cat_file.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 15 Aug 2006 01:36:00 +0000 (18:36 -0700)]
Remove combine-diff.c::uninteresting()
A patch from David Rientjes made me realize we do not have to have
this function -- just call diff_unmodified_pair() directly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:38:14 +0000 (13:38 -0700)]
read-cache.c cleanup
Removes conditional returns.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:37:05 +0000 (13:37 -0700)]
http-push.c cleanup
Removes conditional return.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:34:16 +0000 (13:34 -0700)]
diff.c cleanup
Removes conditional return.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:26:58 +0000 (13:26 -0700)]
builtin-push.c cleanup
Removes conditional return in builtin-push.c
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:22:15 +0000 (13:22 -0700)]
builtin-grep.c cleanup
Removes conditional return.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Rientjes [Mon, 14 Aug 2006 20:18:11 +0000 (13:18 -0700)]
blame.c return cleanup
Removes conditional from return
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Yasushi SHOJI [Mon, 14 Aug 2006 22:50:49 +0000 (07:50 +0900)]
gitweb: configurable home link string
I've always found difficult to figure out git URL for clone from
gitweb URL because git:// and http:// are different on many site
including kernel.org.
I've found this enhancement at http://dev.laptop.org/git when I was on
git channel, and thought that it'd be nice if all public gitweb site
show it's git URL on its page.
This patch allow us to change the home link string. The current
default is "projects" as we all see on gitweb now.
ie. kernel.org might set this variable to "git://git.kernel.org/pub/scm/"
Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Mon, 14 Aug 2006 00:18:33 +0000 (02:18 +0200)]
gitweb: Separate printing difftree in git_commit into git_difftree_body
Separate printing difftree in git_commit into separate
git_difftree_body subroutine. Add support for "C" (copied) status. For
"M" and "C" add parameter 'fp' (filename parent) to the "diff" link;
currently not supported by git_blobdiff ("blobdiff" action).
Reindented, realigned, added comments.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Mon, 14 Aug 2006 00:16:33 +0000 (02:16 +0200)]
gitweb: True fix: Support for the standard mime.types map in gitweb
True fix for error in mimetype_guess, error introduced in original commit
2d00737489b8c61ed616b261c7c9bd314e2b0b41 and later fixed temporarily
by commenting out the line that caused error in commit
57bd4d3523efecf60197040cad34154aff4ddf80.
Gitweb now supports mime.types map $mimetypes_file relative to project.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Mon, 14 Aug 2006 00:15:22 +0000 (02:15 +0200)]
gitweb: Skip comments in mime.types like file
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Mon, 14 Aug 2006 00:14:20 +0000 (02:14 +0200)]
gitweb: Change appereance of marker of refs pointing to given object
Change git_get_references to include type of ref in the %refs value, which
means putting everything after 'refs/' as a ref name, not only last
part of the name. Instead of separating refs pointing to the same
object by " / " separator, use anonymous array reference to store all
refs pointing to given object.
Use 'git-ls-remote .' if $projectroot/$project/info/refs does not
exist. (Perhaps it should be used always.)
Refs are now in separate span elements. Class is dependent on the ref
type: currently known classes are 'tag', 'head', 'remote', and 'ref'
(last one for HEAD and other refs in the main directory). There is
encompassing span element of class refs, just in case of unknown ref
type.
This might be considered cleaner separating of git_get_references into
filling %refs hash only, and not taking part in formatting ref marker.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Mon, 14 Aug 2006 00:10:06 +0000 (02:10 +0200)]
gitweb: Separate finding project owner into git_get_project_owner
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Mon, 14 Aug 2006 00:09:08 +0000 (02:09 +0200)]
gitweb: Separate main part of git_history into git_history_body
Separates main part of git_history into git_history_body subroutine,
and makes output more similar to git_shortlog. Adds "diff to current"
link only for history of regular file (blob).
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Mon, 14 Aug 2006 00:08:27 +0000 (02:08 +0200)]
gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body
Separate printing of perhaps shortened title (subject) in
git_shortlog_body and git_tags_body into format_subject_html.
While at it, remove presentation element <b>...</b> used to format
title (subject) and move formatting to CSS.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Mon, 14 Aug 2006 00:07:00 +0000 (02:07 +0200)]
gitweb: Separate ref parsing in git_get_refs_list into parse_ref
Note that for each ref there are usually two calls to git subroutines:
first to get the type of ref, second to parse ref if ref is of commit
or tag type.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski [Mon, 14 Aug 2006 00:05:47 +0000 (02:05 +0200)]
gitweb: Great subroutines renaming
Rename some of subroutines to better reflect what they do.
Some renames were not performed because subroutine name
reflects hash key.
Subroutines name guideline:
* git_ prefix for subroutines related to git commands,
git repository, or to gitweb actions
* git_get_ prefix for inner subroutines calling git command
or reading some file in the repository and returning some output
* parse_ prefix for subroutines parsing some text (or reading and
parsing some text) into hash or list
* format_ prefix for subroutines formatting, post-processing
or generating some HTML/text fragment
* _get_ infix for subroutines which return result
* _print_ infix for subroutines which print fragment of output
* _body suffix for subroutines which outputs main part (body)
of related action (usually table)
* _nav suffix for subroutines related to navigation bars
* _div suffix for subroutines returning or printing div element
* subroutine names should not be based on how the result is obtained,
as this might change easily
Renames performed:
- git_get_referencing => format_ref_marker
- git_get_paging_nav => format_paging_nav
- git_read_head => git_get_head_hash
- git_read_hash => git_get_hash_by_ref
- git_read_description => git_get_project_description
- git_read_projects => git_get_projects_list
- read_info_ref => git_get_references
- git_read_refs => git_get_refs_list
- date_str => parse_date
- git_read_tag => parse_tag
- git_read_commit => parse_commit
- git_blob_plain_mimetype => blob_mimetype
- git_page_nav => git_print_page_nav
- git_header_div => git_print_header_div
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Franck Bui-Huu [Sun, 13 Aug 2006 18:30:27 +0000 (11:30 -0700)]
Add a newline before appending "Signed-off-by: " line
Whef the last line of the commit log message does not end with
"^[-A-Za-z]+: [^@]+@", append a newline after it to separate
the body of the commit log message from the run of sign-off and
ack lines. e.g. "Signed-off-by: A U Thor <au.thor@example.com>" or
"Acked-by: Me <myself@example.org>".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 14 Aug 2006 05:58:23 +0000 (22:58 -0700)]
Merge branch 'maint'
* maint:
sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
Fix regex pattern in commit-msg
Junio C Hamano [Mon, 14 Aug 2006 02:19:34 +0000 (19:19 -0700)]
Fix type of combine-diff.c::show_patch_diff()
The other function, show_raw_diff() is void and no callers use
return value from neither.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Luben Tuikov [Sun, 13 Aug 2006 08:41:22 +0000 (01:41 -0700)]
sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
git-commit would silently exit if duplicate Signed-off-by
lines were found. Users of git-commit would not know it,
unless they checked '$?'. This patch makes git-commit
actually print out a message that nothing was commited
since duplicate Signed-off-lines were found.
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Luben Tuikov [Sun, 13 Aug 2006 07:34:37 +0000 (00:34 -0700)]
Fix regex pattern in commit-msg
Between the count and the line output, some
uniq(1) versions put a TAB character, not a space.
Make sure both are handled.
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 13 Aug 2006 05:16:51 +0000 (22:16 -0700)]
Merge branch 'jc/upload-pack'
Junio C Hamano [Sun, 13 Aug 2006 02:41:44 +0000 (19:41 -0700)]
Merge branch 'jc/racy-delay'
Junio C Hamano [Sun, 13 Aug 2006 02:34:41 +0000 (19:34 -0700)]
Merge branch 'th/diff-extra'
Junio C Hamano [Sun, 13 Aug 2006 02:33:16 +0000 (19:33 -0700)]
Merge branch 'jc/pack-objects'
Junio C Hamano [Sun, 13 Aug 2006 02:29:11 +0000 (19:29 -0700)]
Merge branch 'js/read-tree'
Junio C Hamano [Sun, 13 Aug 2006 02:24:51 +0000 (19:24 -0700)]
Merge branch 'js/http-mb'
Junio C Hamano [Sun, 13 Aug 2006 02:24:47 +0000 (19:24 -0700)]
Merge branch 'js/color-diff'
Junio C Hamano [Sun, 13 Aug 2006 02:24:15 +0000 (19:24 -0700)]
Merge branch 'jn/web'
Junio C Hamano [Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)]
Merge branch 'lt/web'
Junio C Hamano [Sun, 13 Aug 2006 02:23:09 +0000 (19:23 -0700)]
Merge branch 'jn/conf'
Junio C Hamano [Sun, 13 Aug 2006 02:16:33 +0000 (19:16 -0700)]
Merge branch 'jc/grep'
Junio C Hamano [Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)]
Merge branch 'mk/rename'
Junio C Hamano [Sun, 13 Aug 2006 02:13:25 +0000 (19:13 -0700)]
Merge branch 'ml/pager'
Junio C Hamano [Sun, 13 Aug 2006 01:32:31 +0000 (18:32 -0700)]
GIT 1.4.2
Junio C Hamano [Sun, 13 Aug 2006 01:32:17 +0000 (18:32 -0700)]
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Show the currently checked-out head in bold font
gitk: Allow the user to set some colors
Junio C Hamano [Sun, 13 Aug 2006 01:04:07 +0000 (18:04 -0700)]
t/t4013: fix futzing with the version string.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 12 Aug 2006 08:03:47 +0000 (01:03 -0700)]
Better error message when we are unable to lock the index file
Most of the callers except the one in refs.c use the function to
update the index file. Among the index writers, everybody
except write-tree dies if they cannot open it for writing.
This gives the function an extra argument, to tell it to die
when it cannot create a new file as the lockfile.
The only caller that does not have to die is write-tree, because
updating the index for the cache-tree part is optional and not
being able to do so does not affect the correctness. I think we
do not have to be so careful and make the failure into die() the
same way as other callers, but that would be a different patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 12 Aug 2006 23:16:47 +0000 (16:16 -0700)]
git-am: give better diagnostics when the patch does not apply during --3way
If the user tries to apply a patch that was hand-edited in such
a way that it does not apply to the original file recorded on
its "index" line anymore, we did detect the situation but did
not issue an error message that is specific enough.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 12 Aug 2006 23:09:19 +0000 (16:09 -0700)]
Merge branch 'rj/header'
* rj/header:
Fix header breakage with _XOPEN_SOURCE.
Eric Wong [Sat, 12 Aug 2006 06:21:41 +0000 (23:21 -0700)]
git-svn: split the path from the url correctly with limited perms
This version of the splitter (that only affects SVN:: library
users) works when one only has limited read-permissions to
the repository they're fetching from.
Updated from the original patch to workaround some SVN bug
somewhere, which only seems to happen against file://
repositories... Here's the diff against the original patch I
submitted:
@@ -1159,8 +1159,8 @@ sub repo_path_split {
}
if ($_use_lib) {
- $SVN = libsvn_connect($full_url);
- my $url = $SVN->get_repos_root;
+ my $tmp = libsvn_connect($full_url);
+ my $url = $tmp->get_repos_root;
$full_url =~ s#^\Q$url\E/*##;
push @repo_path_split_cache, qr/^(\Q$url\E)/;
return ($url, $full_url);
Somehow connecting to a repository with the full url makes the
returned SVN::Ra object act strangely and break things, so now
we just drop the SVN::Ra object that we made our initial
connection with.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>