Commit Graph

1141 Commits

Author SHA1 Message Date
Sven Verdoolaege
fc6e714c83 git-cvsimport-script: remove unused variable 2005-07-04 23:18:35 +02:00
Linus Torvalds
def88e9afb Commit first cut at "git-fetch-pack"
It's meant to be used by "git fetch" for the local and ssh case.

It doesn't actually do the fetching now, but it does discover the common
commit point.
2005-07-04 13:26:53 -07:00
Linus Torvalds
013e7c7ff4 Move ref path matching to connect.c library
It's a generic thing for matching refs from the other side.
2005-07-04 13:24:30 -07:00
Linus Torvalds
f71925983d Factor out the ssh connection stuff from send-pack.c
I want to use it for git-fetch-pack too.
2005-07-04 11:57:58 -07:00
Sven Verdoolaege
1750113206 git-cvsimport-script: more error handling 2005-07-04 17:36:25 +02:00
Jon Seymour
a61eea6abd [PATCH] Fixup t/t5300 unit tests broken by 5f3de58ff8
This patch fixes up the t/t5300 unit tests which were broken by the changes in:

	Make the name of a pack-file depend on the objects packed there-in.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-04 08:22:32 -07:00
Sven Verdoolaege
28537171e7 git-cvsimport-script: provide direct support for cvsps -z option 2005-07-04 17:10:06 +02:00
Sven Verdoolaege
6e7e37b0bf git-cvsimport-script: update cvsps cache instead of rebuilding it
Updating the cache is sufficient for most purposes.
If users really want to rebuild the cache, they can specify
the option themselves.
2005-07-04 15:35:30 +02:00
Sven Verdoolaege
46e63efc07 git-cvsimport-script: fix branch switching
Previous patch broke branch switching.
2005-07-04 15:28:36 +02:00
Sven Verdoolaege
79ee456cf2 git-cvsimport-script: use private index. 2005-07-04 13:36:59 +02:00
Linus Torvalds
671fe4bb20 git-rev-parse: support show sha1 names for pack entries
This is actually subtly wrong.  If a short match is found in the object
directory, but would _also_ match another SHA1 ID in a pack (or it shows
in one pack but not another), we'll never have done the pack lookup, and
we think it's unique.

I can't find it in myself to care.  You really want to use enough of a
SHA1 that there is never any ambiguity.
2005-07-03 21:01:11 -07:00
Linus Torvalds
5736bef18c Make git-rev-parse support cogito-style "short hex names"
Currently only for unpacked objects, but the infrastructure
is there to do it for packed objects too.
2005-07-03 20:27:06 -07:00
Sven Verdoolaege
2eb6d82eaa git-cvsimport-script: leave working directory alone. 2005-07-04 00:43:26 +02:00
Linus Torvalds
5f3de58ff8 Make the name of a pack-file depend on the objects packed there-in.
This means that the .git/objects/pack directory is also rsync'able,
since the filenames created there-in are either unique or refer to the
same data.

Otherwise you might not be able to pull from a directory that is partly
packed without having to worry about missing objects due to pack-file
name clashes.
2005-07-03 15:34:04 -07:00
Sven Verdoolaege
866d13108e git-cvsimport-script: typo head -> heads 2005-07-03 23:40:48 +02:00
Linus Torvalds
2396ec85bd Add "git-prune-packed" that removes objects that exist in a pack.
This, together with "git repack" can be used to clean up unpacked
git archives.
2005-07-03 14:27:34 -07:00
Linus Torvalds
b2d46199d2 Add "git repack" command that does an incremental pack 2005-07-03 13:38:01 -07:00
Linus Torvalds
1c4a291202 Add "--non-empty" flag to git-pack-objects
It skips writing the pack-file if it ends up being empty.
2005-07-03 13:36:58 -07:00
Linus Torvalds
12d2a18780 "git rev-list --unpacked" shows only unpacked commits
More infrastructure to do efficient incremental packs.
2005-07-03 13:29:54 -07:00
Linus Torvalds
eb019375ab Add "--incremental" flag to git-pack-objects
It won't add an object that is already in a pack to the new pack.
2005-07-03 13:08:40 -07:00
Linus Torvalds
960bba0d8c Add "--all" flag to rev-parse that shows all refs
And make git-rev-list just silently ignore non-commit refs if we're not
asking for all objects.
2005-07-03 13:07:52 -07:00
Linus Torvalds
dade09c226 Add "has_sha1_pack()" function to query whether the object is available in a pack
We'll want this for incremental packing.
2005-07-03 13:06:36 -07:00
Linus Torvalds
c33303839c Make git-fsck-cache check HEAD integrity
In particular, check that it's a symlink, and points to refs/heads/.  We
depend on that these days not only for "git checkout", but also because
fsck and others only check for references in the .git/refs/
subdirectory, not things like HEAD itself.
2005-07-03 10:40:38 -07:00
Linus Torvalds
6da4016aea Fix sparse warnings.
Mainly making a lot of local functions and variables be marked "static",
but there was a "zero as NULL" warning in there too.
2005-07-03 10:10:45 -07:00
Matthias Urlichs
9da07f3493 cvsimport: Missing tests for verbosity flag. 2005-07-03 19:03:30 +02:00
Linus Torvalds
44c9e8594e Fix up header file dependencies and add sparse checking rules
We're pretty sparse-clean already, thanks to earlier efforts, but some
things inevitably creep in.
2005-07-03 10:02:35 -07:00
Linus Torvalds
944d858969 Fix up "for_each_ref()" to be more usable, and use it in git-fsck-cache
It needed to take the GIT_DIR information into account, something that
the original receive-pack usage just never cared about.
2005-07-03 10:01:38 -07:00
Linus Torvalds
7ec4e60819 Fix gcc warning in send-pack.c
send_pack() was declared to return "int" (although nobody cared), but
didn't actually return anything.
2005-07-03 10:00:01 -07:00
Linus Torvalds
4d235c8044 Avoid gcc warnings in sha1_file.c
A couple of bogus "might be used undefined" warnings are avoided
by moving the initializations unnecessarily early.
2005-07-03 09:58:44 -07:00
Sven Verdoolaege
34155390a5 Support :ext: access method. 2005-07-03 13:02:06 +02:00
Sven Verdoolaege
8d0ea31175 Honour CVS_SERVER. 2005-07-03 12:26:51 +02:00
Sven Verdoolaege
a92bebe697 git-cvsimport-script: clean up documentation
Remove documentation of irrelevant "type" option.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
2005-07-03 11:40:45 +02:00
Sven Verdoolaege
f9714a4a0c Make specification of CVS module to convert optional.
If we're inside a checked out CVS repository, there is
no need to explicitly specify the module as it is
available in CVS/Repository.
Also read CVS/Root if it's available and -d is not specified.
Finally, explicitly pass root to cvsps as CVS/Root takes
precedence over CVSROOT.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
2005-07-03 11:40:44 +02:00
Sven Verdoolaege
1cd3674add Fixed a typo in Documentation/git-cvsimport-script.txt. 2005-07-03 09:43:00 +02:00
Linus Torvalds
8a65ff7666 Generalize the "show each ref" code in receice-pack
This turns it into a generic "do xyz for each ref" library function.
2005-07-02 20:23:36 -07:00
Junio C Hamano
ad8c80a58f [PATCH] Show more details of packfile with verify-pack -v.
This implements show_pack_info() function used in verify-pack
command when -v flag is used to obtain something like
unpack-objects used to give when it was first written.

It shows the following for each non-deltified object found in
the pack:

    SHA1 type size offset

For deltified objects, it shows this instead:

    SHA1 type size offset depth base_sha1

In order to get the output in the order that appear in the pack
file for debugging purposes, you can do this:

 $ git-verify-pack -v packfile | sort -n -k 4,4

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-30 22:33:47 -07:00
Junio C Hamano
f3bf922409 [PATCH] verify-pack updates.
Nico pointed out that having verify_pack.c and verify-pack.c was
confusing.  Rename verify_pack.c to pack-check.c as suggested,
and enhances the verification done quite a bit.

 - Built-in sha1_file unpacking knows that a base object of a
   deltified object _must_ be in the same pack, and takes
   advantage of that fact.

 - Earlier verify-pack command only checked the SHA1 sum for the
   entire pack file and did not look into its contents.  It now
   checks everything idx file claims to have unpacks correctly.

 - It now has a hook to give more detailed information for
   objects contained in the pack under -v flag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-30 22:33:47 -07:00
Junio C Hamano
c62266f37c [PATCH] Avoid unnecessarily inflating and interpreting delta
This teaches packed_delta_info() that it only needs to look at
the type of the base object to figure out both type and size of
a deltified object.  This saves quite a many calls to inflate()
when dealing with a deep delta chain.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-30 22:33:47 -07:00
Matthias Urlichs
f21140605c cvsimport: add documentation. 2005-06-30 22:54:33 +02:00
Matthias Urlichs
2be4fcc345 cvsimport: Added option '-p': pass options to cvsps
Added option '-x' to cvsps call
2005-06-30 22:54:01 +02:00
Matthias Urlichs
4c24e089a3 cvsimport: Exit if an existing repository doesn't have the right branch. 2005-06-30 22:10:32 +02:00
Matthias Urlichs
e371046b64 cvs import: Strip whitespace at the end of the log entry
for compatibility with old cvs2git.
2005-06-30 22:09:42 +02:00
Linus Torvalds
d0efc8a71d Do ref matching on the sender side rather than on receiver
This makes the receiver always send a full list of valid refs, which
will allow us to do better packs, as well as handle creation of new
refs.  Eventually.  Right now we just moved the matching and enabled it.

So now you can do

	git-send-pack host:path branch1 branch2

to only send branches "branch1" and "branch2".
2005-06-30 12:28:24 -07:00
Linus Torvalds
f65fdf04a1 Add support for "forcing" a ref on the remote side
A "old ref" of all zeroes is considered a "don't care" ref, and allows
us to say "write the new ref regardless of what the old ref contained
(or even if it existed at all)".

This allows (if git-send-pack were to do it) creating new refs, and
fixing up old ones.
2005-06-30 11:04:59 -07:00
Linus Torvalds
94fdb7aa17 git-send-pack: actually send the object pack
This concludes this lesson.  I've actually successfully sent an update
using the git-send-pack command.

Probably tons of work still to do, and nasty debugging, but it's now
actually potentially useful.
2005-06-30 10:17:39 -07:00
Linus Torvalds
2eca23daf5 git-receive-pack: implement ref switch command handling
After unpacking the object pack successfully, we go through the list of
refs, and verify that they still contain their expected values.  Then we
replace them with the new ones.
2005-06-30 10:15:22 -07:00
Sven Verdoolaege
0fa2824f35 cvsimport: perform string comparison on "HEAD" 2005-06-30 17:23:22 +02:00
Matthias Urlichs
dbc1aeace6 git-cvsimport-script: Removed redundant @old and @new clear. 2005-06-30 12:28:31 +02:00
Matthias Urlichs
4f7c0caa8f git-cvsimport-script: Remove setting Sticky; it may cause problems 2005-06-30 12:19:48 +02:00
Matthias Urlichs
4abdecbf85 cvs import: Call git-update-cache multiple times
instead of with a too-long argument list.
2005-06-30 11:55:57 +02:00