summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] Use enhanced diff_delta() in the similarity estimator.Junio C Hamano2005-06-281-1/+6
| | | | | | | | | | | The diff_delta() interface was extended to reject generating too big a delta while we were working on the packed GIT archive format. Take advantage of that when generating delta in the similarity estimator used in diffcore-rename.c Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix unpack-objects for header length information.Junio C Hamano2005-06-282-4/+4
| | | | | | | | Standalone unpack-objects command was not adjusted for header length encoding change when dealing with deltified entry. This fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge fighting fsck-cache updates from JunioLinus Torvalds2005-06-284-28/+103
|\ | | | | | | | | It's just easier to let git help out with the merge than it is to try to fix up the diffs.
| * [PATCH] Update fsck-cache (take 2)Junio C Hamano2005-06-282-13/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fsck-cache complains if objects referred to by files in .git/refs/ or objects stored in files under .git/objects/??/ are not found as stand-alone SHA1 files (i.e. found in alternate object pools GIT_ALTERNATE_OBJECT_DIRECTORIES or packed archives stored under .git/objects/pack). Although this is a good semantics to maintain consistency of a single .git/objects directory as a self contained set of objects, it sometimes is useful to consider it is OK as long as these "outside" objects are available. This commit introduces a new flag, --standalone, to git-fsck-cache. When it is not specified, connectivity checks and .git/refs pointer checks are taught that it is OK when expected objects do not exist under .git/objects/?? hierarchy but are available from an packed archive or in an alternate object pool. Another new flag, --full, makes git-fsck-cache to check not only the current GIT_OBJECT_DIRECTORY but also objects found in alternate object pools and packed GIT archives.a Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] Expose packed_git and alt_odb.Junio C Hamano2005-06-282-19/+43
| | | | | | | | | | | | | | | | | | | | | | The commands git-fsck-cache and probably git-*-pull needs to have a way to enumerate objects contained in packed GIT archives and alternate object pools. This commit exposes the data structure used to keep track of them from sha1_file.c, and adds a couple of accessor interface functions for use by the enhanced git-fsck-cache command. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Bugfix: initialize pack_base to NULL.Junio C Hamano2005-06-281-0/+1
| | | | | | | | | | | | | | | | This was causing random segfaults, because use_packed_git() got confused by random garbage there. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Adjust fsck-cache to packed GIT and alternate object pool.Junio C Hamano2005-06-281-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fsck-cache complains if objects referred to by files in .git/refs/ or objects stored in files under .git/objects/??/ are not found as stand-alone SHA1 files (i.e. found in alternate object pools GIT_ALTERNATE_OBJECT_DIRECTORIES or packed archives stored under .git/objects/pack). Although this is a good semantics to maintain consistency of a single .git/objects directory as a self contained set of objects, it sometimes is useful to consider it is OK as long as these "outside" objects are available. This commit introduces a new flag, --standalone, to git-fsck-cache. When it is not specified, connectivity checks and .git/refs pointer checks are taught that it is OK when expected objects do not exist under .git/objects/?? hierarchy but are available from an packed archive or in an alternate object pool. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Change pack file format. Hopefully for the last time.Linus Torvalds2005-06-284-73/+174
|/ | | | | | This also adds a header with a signature, version info, and the number of objects to the pack file. It also encodes the file length and type more efficiently.
* git-pack-objects: add "--stdout" flag to write the pack file to stdoutLinus Torvalds2005-06-281-6/+15
| | | | This also suppresses creation of the index file.
* csum-file: add "sha1fd()" to create a SHA1 csum file from an existing file ↵Linus Torvalds2005-06-282-0/+21
| | | | | | descriptor We'll use this soon to write pack-files to stdout.
* Duh. Fix transposed characters in git-pull-scriptLinus Torvalds2005-06-281-1/+1
| | | | I'd stupidly only tested the non-branch-name version.
* Teach packing about "tag" objectsLinus Torvalds2005-06-283-14/+23
| | | | | (And teach sha1_file and unpack-object know how to unpack them too, of course)
* [PATCH] git-cat-file: '-s' to find out object size.Junio C Hamano2005-06-282-6/+19
| | | | | | | | | | We use sha1_object_info() now, and getting size is also trivial. I admit that this is more of "because we can" not "because I see immediate need for it", though. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] git-cat-file: use sha1_object_info() on '-t'.Junio C Hamano2005-06-281-6/+4
| | | | | | | | When trying to find out the type of the object, there is no need to uncompress the whole object. Just use sha1_object_info(). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Obtain sha1_file_info() for deltified pack entry properly.Junio C Hamano2005-06-281-4/+69
| | | | | | | | | | | | | The initial one was not doing enough to figure things out without uncompressing too much. It also fixes a potential segfault resulting from missing use_packed_git() call. We would need to introduce unuse_packed_git() call and do proper use counting to figure out when it is safe to unmap, but currently we do not unmap packed file yet. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Teach git-pull-script about pulling tagsLinus Torvalds2005-06-271-2/+7
|
* Fix another test that broke with the recent git-init-db updateLinus Torvalds2005-06-271-1/+0
| | | | | t5300-pack-object.sh test 8 expected to have to create the "pack" directory itself, and was unhappy when it already existed.
* [PATCH] Skip writing out sha1 files for objects in packed git.Junio C Hamano2005-06-271-12/+27
| | | | | | | | | | | Now, there's still a misfeature there, which is that when you create a new object, it doesn't check whether that object already exists in the pack-file, so you'll end up with a few recent objects that you really don't need (notably tree objects), and this patch fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] replace sha1sum with sum in t/t1002Mark Allen2005-06-271-15/+32
| | | | | | | | | | | | | | This replaces sha1sum(1) with sum(1) in t/t1002. GNU sum(1) runs in "BSD compatibility" mode by default, and not all systems have GNU coreutils. On any system without GNU coreutils (or sha1sum) t1002 will fail. This patch should make t1002 complete successfully everywhere that sum(1) runs. I've tested this on Darwin and Linux; it works on both platforms. Signed-off-by: Mark Allen <mrallen1@yahoo.com> Acked-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Fix up test that counted subdirectories in ".git/objects"Linus Torvalds2005-06-271-3/+3
| | | | Now there are 257 of them (256 numeric ones, and the new "pack" directory)
* git-init-db: create "pack" subdirectory under objectsLinus Torvalds2005-06-271-0/+2
| | | | | Don't make the user have to mkdir it just because he's excited about the new object pack functionality, do it for him.
* Merge rsync://rsync.kernel.org/pub/scm/gitk/gitkLinus Torvalds2005-06-271-139/+447
|\
| * Add a menu item for creating tags.Paul Mackerras2005-06-271-43/+140
| |
| * Fix a bug where we would corrupt the stuff read from git-rev-list.Paul Mackerras2005-06-271-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | If we have a very long commit message, and we end up getting a bufferfull of data from git-rev-list that all belongs to one commit, we ended up throwing away the data from a previous read that should have been included. The result was a error message about not being able to parse the output of git-rev-list. Also, if the git-rev-list output that we can't parse is long, only put the first 80 chars in the error message. Otherwise we end up with an enormous error window.
| * Add a menu entry for generating a patch between any two commits.Paul Mackerras2005-06-271-0/+87
| |
| * Fix behaviour in the case where we have no commits to display.Paul Mackerras2005-06-271-10/+17
| | | | | | | | | | I had code in there to put "No commits selected" on the canvas but it needed some globals.
| * Check for the existence of the git directory on startup.Paul Mackerras2005-06-271-1/+11
| | | | | | | | | | | | Check that $GIT_DIR (or .git, if GIT_DIR is not set) is a directory. This means we can give a more informative error message if the user runs gitk somewhere that isn't a git repository.
| * Clear the SHA1 entry field when we go to paste something into itPaul Mackerras2005-06-251-0/+8
| | | | | | | | | | If the user pastes in the selection (with the middle mouse button) and it already has 40 characters in it, clear it before pasting.
| * Add commit row context menu and handle left-click on graph linesPaul Mackerras2005-06-251-86/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
* | csum-file: fix missing buf pointer updateLinus Torvalds2005-06-271-0/+1
| | | | | | | | This would create broken pack archives for anything nontrivial.
* | [PATCH] Teach read_sha1_file() and friends about packed git object store.Junio C Hamano2005-06-272-12/+458
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GIT_OBJECT_DIRECTORY and GIT_ALTERNATE_OBJECT_DIRECTORIES can have the "pack" subdirectory that houses "packed GIT" files produced by git-pack-objects (e.g. .git/objects/pack/foo.pack and .git/objects/pack/foo.idx; always store them as pairs). The following functions in sha1_file.c can then read object contents from such packed file: - sha1_object_info() - has_sha1_file() - read_sha1_file() Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Enhance sha1_file_size() into sha1_object_info()Junio C Hamano2005-06-274-31/+27
| | | | | | | | | | | | | | | | This lets us eliminate one use of map_sha1_file() outside sha1_file.c, to bring us one step closer to the packed GIT. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Remove "delta" object representation.Junio C Hamano2005-06-2725-948/+22
| | | | | | | | | | | | | | | | | | | | | | Packed delta files created by git-pack-objects seems to be the way to go, and existing "delta" object handling code has exposed the object representation details to too many places. Remove it while we refactor code to come up with a proper interface in sha1_file.c. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] git-ssh-pull: commit-id consistencySven Verdoolaege2005-06-272-5/+15
| | | | | | | | | | | | | | | | | | | | In contrast to other plumbing tools, git-ssh-push only allow a very restrictive form of commit-id filenames. This patch removes this restriction. Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | git-checkout-script: use "--verify --revs-only" to parse revsLinus Torvalds2005-06-271-1/+1
| | | | | | | | | | | | Sven Verdoolaege points out that I added the --verify option to git-rev-parse exactly for things like this, but didn't update the users.
* | csum-file interface updates: return resulting SHA1Linus Torvalds2005-06-264-16/+26
| | | | | | | | | | | | | | | | | | | | | | Also, make the writing of the SHA1 as a end-header be conditional: not every user will necessarily want to write the SHA1 to the file itself, even though current users do (but we migh end up using the same helper functions for the object files themselves, that don't do this). This also makes the packed index file contain the SHA1 of the packed data file at the end (just before its own SHA1). That way you can validate the pairing of the two if you want to.
* | git-pack-objects: write the pack files with a SHA1 csumLinus Torvalds2005-06-265-62/+158
| | | | | | | | | | | | | | | | | | | | We want to be able to check their integrity later, and putting the sha1-sum of the contents at the end is a good thing. The writing routines are generic, so we could try to re-use them for the index file, instead of having the same logic duplicated. Update unpack-objects to know about the extra 20 bytes at the end of the index.
* | Add "--pretty=full" format that also shows committer.Linus Torvalds2005-06-264-32/+25
| | | | | | | | | | | | Also move the common implementation of parsing the --pretty argument format into commit.c rather than having duplicates in diff-tree.c and rev-list.c.
* | Add git-verify-tag scriptJan Harkes2005-06-261-0/+9
| | | | | | | | | | | | Here is a script to simplify validating the gpg signature created by git-tag-script. Might be useful to add to the git tree so that people don't have to search for the right post in the git mailinglist archives
* | git-pack-objects: use name information (if any) to sort objects for packing.Linus Torvalds2005-06-261-4/+23
| | | | | | | | This is incredibly cheezy. But it's cheap, and it works pretty well.
* | Ooh. Make git-rev-list --object associate a name with objects.Linus Torvalds2005-06-262-9/+11
| | | | | | | | | | The name isn't unique, it's just the first name that object is reached through, so it's really nothing more than a hint.
* | git-pack-objects: do the delta search in reverse size orderLinus Torvalds2005-06-261-12/+16
| | | | | | | | | | | | | | | | | | | | | | Starting from big objects and going backwards means that we end up picking a delta that goes from a bigger object to a smaller one. That's advantageous for two reasons: the bigger object is likely the newer one (since things tend to grow, rather than shrink), and doing a delete tends to be smaller than doing an add. So the deltas don't tend to be top-of-tree, and the packed end result is just slightly smaller.
* | [PATCH] Add git-relink-script to fix up missing hardlinksRyan Anderson2005-06-262-1/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | This will scan 2 or more object repositories and look for common objects, check if they are hardlinked, and replace one with a hardlink to the other if not. This version warns when skipping files because of size differences, and handle more than 2 repositories automatically. Signed-off-by: Ryan Anderson <ryan@michonline.com> Cheered-on-by: Jeff Garzik <jgarzik@pobox.com> Acked-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | git-rev-parse: add "--not" flag to mark subsequent heads negativeLinus Torvalds2005-06-261-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | If you have two lists of heads, and you want to see ones reachable from list $a but not from list $b, just do git-rev-list $(git-rev-parse $a --not $b) which is useful for both bisecting (where "b" would be the list of known good revisions, and "a" would be the latest found bad head) and for just seeing what the difference between two sets of heads are if you want to generate a pack-file for the difference.
* | git-unpack-objects: start removing debug outputLinus Torvalds2005-06-261-1/+0
| | | | | | | | At least the least interesting one.
* | Fix object packing/unpacking.Linus Torvalds2005-06-262-62/+49
| | | | | | | | | | | | | | This actually successfully packed and unpacked a git archive down to 1.3MB (17MB unpacked). Right now unpacking is way too noisy, lots of debug messages left.
* | [PATCH] Finish initial cut of git-pack-object/git-unpack-object pair.Junio C Hamano2005-06-263-18/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the initial round of git-pack-object / git-unpack-object pair. They are now good enough to be used as a transport medium: - Fix delta direction in pack-objects; the original was computing delta to create the base object from the object to be squashed, which was quite unfriendly for unpacker ;-). - Add a script to test the very basics. - Implement unpacker for both regular and deltified objects. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Add "--depth=N" parameter to git-pack-objects to limit maximum delta depthLinus Torvalds2005-06-251-7/+17
| | | | | | | | It too defaults to 10. A nice round random number.
* | git-pack-objects: make "--window=x" semantics more logical.Linus Torvalds2005-06-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | A zero disables delta generation (like before), but we make the window be one bigger than specified, since we use one entry for the one to be tested (it used to be that "--window=1" was meaningless, since we'd have used up the single-entry window with the entry to be tested, and had no chance of actually ever finding a delta). The default window remains at 10, but now it really means "test the 10 closest objects", not "test the 9 closest objects".
* | Add a "max_size" parameter to diff_delta()Linus Torvalds2005-06-257-17/+28
| | | | | | | | | | | | | | Anything that generates a delta to see if two objects are close usually isn't interested in the delta ends up being bigger than some specified size, and this allows us to stop delta generation early when that happens.
View Lorry Controller Status