summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* git-svn: add UTF-8 message testEric Wong2006-06-161-0/+13
| | | | Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: add some functionality to better support branches in svnEric Wong2006-06-161-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>
* git-svn: add --shared and --template= options to pass to init-dbEric Wong2006-06-161-2/+8
| | | | Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: add --repack and --repack-flags= optionsEric Wong2006-06-161-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>
* git-svn: minor cleanups, extra error-checkingEric Wong2006-06-161-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>
* git-svn: Move all git-svn-related paths into $GIT_DIR/svnEric Wong2006-06-162-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>
* git-svn: support manually placed initial trees from fetchEric Wong2006-06-161-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>
* git-svn: optimize --branch and --branch-all-refEric Wong2006-06-161-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>
* git-svn: --branch-all-refs / -B supportEric Wong2006-06-161-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>
* git-svn: support -C<num> passing to git-diff-treeEric Wong2006-06-161-2/+9
| | | | | | The repo-config key is 'svn.copysimilarity' Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: don't allow commit if svn tree is not currentEric Wong2006-06-161-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>
* git-svn: restore original LC_ALL setting (or unset) for commitEric Wong2006-06-161-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>
* git-svn: eol_cp corner-case fixesEric Wong2006-06-161-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>
* git-svn: fix handling of filenames with embedded '@'Eric Wong2006-06-161-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>
* git-svn: t0000: add -f flag to checkoutEric Wong2006-06-161-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>
* GIT 1.4.0v1.4.0Junio C Hamano2006-06-101-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge git://git.kernel.org/pub/scm/git/gitwebJunio C Hamano2006-06-105-0/+2435
|\
| * v267Kay Sievers2006-05-301-1/+1
| |
| * prepend '--' to filelist when calling git-diff-treeRocco Rutte2006-05-301-1/+1
| |
| * v266Kay Sievers2006-05-221-1/+1
| |
| * remove Christian's email addressKay Sievers2006-05-221-3/+3
| |
| * v265Kay Sievers2006-05-011-1/+1
| |
| * handle utf8 characters from /etc/passwdKay Sievers2006-05-011-3/+3
| |
| * v264Kay Sievers2006-01-171-1/+1
| |
| * fix: Use of uninitialized valueKay Sievers2006-01-171-4/+5
| | | | | | | | | | | | The subroutine did not check the case where HEAD does not verify. Patch from Junio C Hamano <junkio@cox.net>
| * v263Kay Sievers2006-01-091-1/+1
| |
| * allow working in repositories with textual symref HEADJunio C Hamano2006-01-091-16/+33
| |
| * resolve textual hashes when looking up "refs"Kay Sievers2005-12-221-4/+4
| | | | | | | | | | | | Thanks to Jon Nelson for the patch. Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * v262Kay Sievers2005-12-191-1/+1
| |
| * define default colorsKay Sievers2005-12-191-1/+4
| | | | | | | | | | | | Thanks to Kir Kolyshkin for pointing it out. Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * v261Kay Sievers2005-12-071-1/+1
| |
| * fix leading whitespace in commit textKay Sievers2005-12-071-1/+3
| | | | | | | | Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * more tagsKay Sievers2005-12-071-7/+22
| | | | | | | | Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * v260Kay Sievers2005-12-071-1/+1
| |
| * attach tag to the linkKay Sievers2005-12-071-14/+17
| | | | | | | | Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * v259Kay Sievers2005-12-071-1/+1
| |
| * show multiple tagsKay Sievers2005-12-071-1/+5
| | | | | | | | Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * v258Kay Sievers2005-12-071-1/+1
| |
| * show tags in listsKay Sievers2005-12-071-14/+45
| | | | | | | | Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * v257Kay Sievers2005-11-241-1/+1
| |
| * fix "rename" outputKay Sievers2005-11-241-1/+1
| | | | | | | | Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * v256Kay Sievers2005-11-241-1/+1
| |
| * fix quoted filename lookupKay Sievers2005-11-241-2/+2
| | | | | | | | Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * v255Kay Sievers2005-11-241-1/+1
| |
| * v254Kay Sievers2005-11-241-1/+0
| |
| * allow utf8 characters in url parameter escapeKay Sievers2005-11-241-206/+222
| | | | | | | | Signed-off-by: Kay Sievers <kay.sievers@suse.de>
| * v253Kay Sievers2005-11-231-1/+1
| |
| * set logo output to raw modeKay Sievers2005-11-231-0/+1
| |
| * add broken latin encoding to test fileKay Sievers2005-11-231-0/+1
| |
| * add ut8 test fileKay Sievers2005-11-231-0/+1
| | | | | | | | It contains Märchen. (\xc3a4)
View Lorry Controller Status