summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-06-16git-svn: add 'log' command, a facsimile of basic `svn log'Libravatar Eric Wong1-17/+243
This quick feature should make it easy to look up svn log messages when svn users refer to -r/--revision numbers. The following features from `svn log' are supported: --revision=<n>[:<n>] - is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ... -v/--verbose - just maps to --raw (in git log), so it's completely incompatible with the --verbose output in svn log --limit=<n> - is NOT the same as --max-count, doesn't count merged/excluded commits --incremental - supported (trivial :P) New features: --show-commit - shows the git commit sha1, as well --oneline - our version of --pretty=oneline Any other arguments are passed directly to `git log' Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: add UTF-8 message testLibravatar Eric Wong1-0/+13
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: add some functionality to better support branches in svnLibravatar Eric Wong1-5/+424
New commands: graft-branches - The most interesting command of the bunch. It detects branches in SVN via various techniques (currently regexes and file copies). It can be later extended to handle svk and other properties people may use to track merges in svk. Basically, merge tracking is not standardized at all in the SVN world, and git grafts are perfect for dealing with this situation. Existing branch support (via tree matches) is only handled at fetch time. The following tow were originally implemented as shell scripts several months ago, but I just decided to streamline things a bit and added them to the main script. multi-init - supports git-svnimport-like command-line syntax for importing repositories that are layed out as recommended by the SVN folks. This is a bit more tolerant than the git-svnimport command-line syntax and doesn't require the user to figure out where the repository URL ends and where the repository path begins. multi-fetch - runs fetch on all known SVN branches we're tracking. This will NOT discover new branches (unlike git-svnimport), so multi-init will need to be re-run (it's idempotent). Consider these three to be auxilliary commands (like show-ignore, and rebuild) so their behavior won't receive as much testing or scrutiny as the core commands (fetch and commit). Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: add --shared and --template= options to pass to init-dbLibravatar Eric Wong1-2/+8
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: add --repack and --repack-flags= optionsLibravatar Eric Wong1-1/+17
This should help keep disk usage sane for large imports. --repack takes an optional argument for the interval, it defaults to 1000 if no argument is specified. Arguments to --repack-flags are passed directly to git-repack. No arguments are passed by default. Idea stolen from git-cvsimport :) Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: minor cleanups, extra error-checkingLibravatar Eric Wong1-36/+46
While we're at it, read_repo_config has been added and expanded to handle case where command-line arguments are optional to Getopt::Long Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: Move all git-svn-related paths into $GIT_DIR/svnLibravatar Eric Wong2-16/+85
Since GIT_SVN_ID usage is probably going to become more widespread <evil grin>, we won't run the chance of somebody having a GIT_SVN_ID name that conflicts with one of the default directories that already exist in $GIT_DIR (branches/tags). Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: support manually placed initial trees from fetchLibravatar Eric Wong1-1/+8
Sometimes I don't feel like downloading an entire tree again when I actually decide a branch is worth tracking, so some users can get around it more easily with this. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: optimize --branch and --branch-all-refLibravatar Eric Wong1-2/+9
By breaking the pipe read once we've seen a commit twice. This should make -B/--branch-all-ref faster and usable on a frequent basis. We use topological order now for calling git-rev-list, and any commit we've seen before should imply that all parents have been seen (at least I hope that's the case for --topo-order). Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: --branch-all-refs / -B supportLibravatar Eric Wong1-1/+14
This should make life easier for all those who type: `git-rev-parse --symbolic --all | xargs -n1 echo -b` every time they run git-svn fetch. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: support -C<num> passing to git-diff-treeLibravatar Eric Wong1-2/+9
The repo-config key is 'svn.copysimilarity' Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: don't allow commit if svn tree is not currentLibravatar Eric Wong1-2/+9
If new revisions are fetched, that implies we haven't merged, acked, or nacked them yet, and attempting to write the tree we're committing means we'd silently clobber the newly fetched changes. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: restore original LC_ALL setting (or unset) for commitLibravatar Eric Wong1-11/+23
svn forces UTF-8 for commit messages, and with LC_ALL set to 'C' it is unable to determine encoding of the git commit message. Now we'll just assume the user has set LC_* correctly for the commit message they're using. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: eol_cp corner-case fixesLibravatar Eric Wong1-4/+11
If we read the maximum size of our buffer into $buf, and the last character is '\015', there's a chance that the character is '\012', which means our regex won't work correctly. At the worst case, this could introduce an extra newline into the code. We'll now read an extra character if we see '\015' is the last character in $buf. We also forgot to recalculate the length of $buf after doing the newline substitution, causing some files to appeare truncated. We'll do that now and force byte semantics in length() for good measure. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: fix handling of filenames with embedded '@'Libravatar Eric Wong1-4/+13
svn has trouble parsing files with embedded '@' characters. For example, svn propget svn:keywords foo@bar.c svn: Syntax error parsing revision 'bar.c' I asked about this on #svn and the workaround suggested was to append an explicit revision specifier: svn propget svn:keywords foo@bar.c@BASE This patch appends '@BASE' to the filename in all calls to 'svn propget'. Patch originally by Seth Falcon <sethfalcon@gmail.com> Seth: signoff? [ew: Made to work with older svn that don't support peg revisions] Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-16git-svn: t0000: add -f flag to checkoutLibravatar Eric Wong1-5/+5
Some changes to the latest git.git made this test croak. So we'll always just force everything when using a new branch. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-06-10GIT 1.4.0Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-10Merge git://git.kernel.org/pub/scm/git/gitwebLibravatar Junio C Hamano5-0/+2435
2006-06-10Built-in git-get-tar-commit-idLibravatar Rene Scharfe5-33/+29
By being an internal command git-get-commit-id can make use of struct ustar_header and other stuff and stops wasting precious disk space. Note: I recycled one of the two "tar-tree" entries instead of splitting that cleanup into a separate patch. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-10git-clone: fix --bare over dumb-httpLibravatar Junio C Hamano1-6/+2
It left an extra .git/ directory under the target directory by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-09shared repository - add a few missing calls to adjust_shared_perm().Libravatar Junio C Hamano6-29/+54
There were a few calls to adjust_shared_perm() that were missing: - init-db creates refs, refs/heads, and refs/tags before reading from templates that could specify sharedrepository in the config file; - updating config file created it under user's umask without adjusting; - updating refs created it under user's umask without adjusting; - switching branches created .git/HEAD under user's umask without adjusting. This moves adjust_shared_perm() from sha1_file.c to path.c, since a few SIMPLE_PROGRAM need to call repository configuration functions which in turn need to call adjust_shared_perm(). sha1_file.c needs to link with SHA1 computation library which is usually not linked to SIMPLE_PROGRAM. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-09Fix formatting of Documentation/git-clone.txtLibravatar Horst H. von Brand1-2/+2
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-09builtin-init-db: spell the in-program configuration variable in lowercase.Libravatar Junio C Hamano1-1/+1
Just for consistency -- setup.c spells it in lowercase. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-08git-rm: honor -n flag.Libravatar Junio C Hamano1-7/+10
Even when invoked with -n flag, git-rm removed the matching paths anyway. Also includes the missing check spotted by SungHyun Nam, which caused it to segfault. Now we refuse to run without any paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-08git-clone: fix duplicated "master" in $GIT_DIR/remotes/originLibravatar Junio C Hamano1-5/+10
Under --use-separate-remote we ended up duplicating the branch remote HEAD pointed at in $GIT_DIR/remotes/origin file. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-08check for error return from fork()Libravatar Paul T Darga3-2/+12
Trivial fixup for fork() callsites which do not check for errors. Signed-off-by: Paul T Darga <pdarga@umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-08Document git-clone --use-separate-remoteLibravatar Uwe Zeisberger1-3/+8
Signed-off-by: Uwe Zeisberger <uzeisberger@io.fsforth.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Documentation: add another example to git-ls-filesLibravatar Junio C Hamano1-2/+14
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Documentation: git aliasesLibravatar Petr Baudis1-3/+4
Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07git-cvsserver asciidoc formatting tweaksLibravatar Francis Daly1-18/+31
No content change here. html output improved. man output changed. Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07config.txt grammar, typo, and asciidoc fixesLibravatar Francis Daly1-9/+9
Nothing major. Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Documentation: git-ls-tree (typofix)Libravatar Junio C Hamano1-1/+1
spotted by jdl. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Document git-ls-tree --fullnameLibravatar Jonas Fonseca1-4/+7
Additionally, reformat synopsis and remove stub notice. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Document git aliases supportLibravatar Petr Baudis2-0/+11
This patch ports and modifies appropriately the git aliases documentation from my patch, shall it rest in peace. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07make clean: remove dist-doc targets.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Misc doc improvementsLibravatar Jonas Fonseca3-4/+24
Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Documentation: add missing docs make check-docs found.Libravatar Junio C Hamano3-1/+76
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Some doc typo fixesLibravatar Francis Daly10-13/+14
All should be clear enough, except perhaps committish / commitish. I just kept the more-used one within the current docs. [jc: with rephrasing of check-ref-format description later discussed on the list] Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Off-by-one error in get_path_prefix(), found by ValgrindLibravatar Rene Scharfe1-1/+2
[jc: original fix was done by Pavel and this contains improvements by Rene.] Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-384/+1094
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Re-read the descendent/ancestor tag & head info on update gitk: Show branch name(s) as well, if "show nearby tags" is enabled gitk: Show nearby tags gitk: Add a goto next/previous highlighted commit function gitk: Provide ability to highlight based on relationship to selected commit gitk: Fix bug in highlight stuff when no line is selected gitk: Move "pickaxe" find function to highlight facility gitk: Improve the text window search function gitk: First cut at a search function in the patch/file display window gitk: Highlight paths of interest in tree view as well gitk: Highlight entries in the file list as well gitk: Make a row of controls for controlling highlighting
2006-06-06http-fetch: fix possible segfaultLibravatar Nick Hengeveld1-0/+1
Initialize an object request's slot to a safe value. A non-NULL value can cause a segfault if the request is aborted before it starts. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06Refactor git_tcp_connect() functions a little.Libravatar Jon Loeliger2-20/+49
Add client side sending of "\0host=%s\0" extended arg for git native protocol, backwards compatibly. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06Merge branch 'jc/lockfile'Libravatar Junio C Hamano14-120/+127
* jc/lockfile: ref-log: style fixes. refs.c: convert it to use lockfile interface. Make index file locking code reusable to others.
2006-06-06Merge branch 'js/alias'Libravatar Junio C Hamano1-4/+123
* js/alias: git alias: try alias last. If you have a config containing something like this:
2006-06-06Merge branch 'vb/sendemail'Libravatar Junio C Hamano1-8/+7
* vb/sendemail: send-email: a bit more careful domain regexp. send-email: be more lenient and just catch obvious mistakes. Cleanup git-send-email.perl:extract_valid_email
2006-06-06builtin-grep: pass ignore case option to external grepLibravatar Robert Fitzsimons1-0/+2
Don't just read the --ignore-case/-i option, pass the flag on to the external grep program. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07gitk: Re-read the descendent/ancestor tag & head info on updateLibravatar Paul Mackerras1-1/+17
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-06-06ref-log: style fixes.Libravatar Junio C Hamano3-13/+18
A few style fixes to get the code in line with the rest. - asterisk to make a type a pointer to something goes in front of the variable, not at the end of the base type. E.g. a pointer to an integer is "int *ip", not "int* ip". - open parenthesis for function parameter list, unlike syntactic constructs, comes immediately after the function name. E.g. "if (foo) bar();" not "if(foo) bar ();". - "else" does not come on the same line as the closing brace of corresponding "if". The style is mostly a matter of personal taste, and people may disagree, but consistency is important. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06refs.c: convert it to use lockfile interface.Libravatar Junio C Hamano2-12/+11
This updates the ref locking code to use creat-rename locking code we use for the index file, so that it can borrow the code to clean things up upon signals and program termination. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06Make index file locking code reusable to others.Libravatar Junio C Hamano11-95/+98
The framework to create lockfiles that are removed at exit is first used to reliably write the index file, but it is applicable to other things, so stop calling it "cache_file". This also rewords a few remaining error message that called the index file "cache file". Signed-off-by: Junio C Hamano <junkio@cox.net>