aboutsummaryrefslogtreecommitdiff
path: root/git-svn.perl
Commit message (Collapse)AuthorAge
...
* git-svn: simplify the (multi-)init methods of fetchingEric Wong2007-02-23
| | | | | | | | Also, some changes to avoid creating dead dirs under .git/svn/. We now create all directories as late as possible. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: brown paper bag fixesEric Wong2007-02-23
| | | | | | | | * avoid skipping modification-only changes in fetch * correctly fetch when we only have branches and tags to glob from (no fetch keys defined) Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: allow 'init' to act as multi-initEric Wong2007-02-23
| | | | | | | | | | | | | multi-init is now just an alias that requires -T/-t/-b; all options that 'init' can now accept. This will hopefully simplify usage and reduce typing. Also, allow the --shared option in 'init' to take an optional argument now that 'git-init --shared' supports an optional argument. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: hopefully make 'fetch' more user-friendlyEric Wong2007-02-23
| | | | | | | | | | | | | | | multi-fetch is deprecated, "fetch -a" is easier to type By default, fetch will fetch everything from its default [svn-remote]; if fetch [--all|-a] is specified, then it will fetch from all svn remotes. Refspecs on the command-line (like git-fetch) are not supported. Also, enable -r/--revision arguments for fetch so users can shoot themselves in the foot^W^W^W^W^W skip some history and do the equivalent of a shallow clone/fetch they're not interested in. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: usability fixes for the 'git svn log' commandEric Wong2007-02-23
| | | | | | | | | | | Similar in spirit to the recent dcommit change, we now look at 'HEAD' by default to look for a GIT_SVN_ID so the user won't have to pass -i <GIT_SVN_ID> argument. We are also more tolerant of of people passing bare remote names as a result (just $GIT_SVN_ID without the -i) Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: include merges when calling rev-list for decommitEric Wong2007-02-23
| | | | | | | | Merge commits can be created when following certain parents, (most notably 'R' cases) and we definitely don't want to exclude them. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: make dcommit usable for glob usersEric Wong2007-02-23
| | | | | | | | | | | | | | | | | | | | * dcommit no longer requires the correct -i/GIT_SVN_ID option passed to it. Since you're committing from HEAD (or another commit that is a parent of HEAD), you'll be able to find a commit with metadata information containing the SVN URL that your HEAD was descended from anyways. * I don't think dcommit ever worked for people using the noMetadata option; so I don't think relying on metadata is an issue. * useSvmProps users shouldn't commit to SVN::Mirror created repositories anyways, right? * Users of globbing should automatically be able to commit to paths that are not explicitly set in .git/config Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: handle multi-init without --trunk, UseSvmProps fixesEric Wong2007-02-23
| | | | | | | | | | | | | | | | multi-init did not write a svn-remote.<remote>.url config entry without a --trunk argument. Also, The svm:mirror property is used by SVN::Mirror to track the path of the repository that we are mirroring. We need to append that to the source (which is (presumably) just the URL of the repository root). Lastly, we now look harder for svm:(source|mirror|uuid) properties in sub and parent directories. Since our relative path could be tweaked. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: write the highest maxRex out for branches and tagsEric Wong2007-02-23
| | | | | | | | | Even if nothing touched paths we care about in a fetch; increment the maxRev like we do with rev_db since we don't like having to run get_log on revisions we've seen before. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: use separate, per-repository .rev_db filesEric Wong2007-02-23
| | | | | | | | | | | | | | We need a separate .rev_db file for each repository we're tracking. This allows us to track the same logical path off multiple mirrors. We preserve a symlink to the old .rev_db (no-UUID) if we're (auto-)migrating from an old version to preserve backwards compatibility. Also, get rid of the uuid() wrapper since we cache UUID in our private config, and the SVN::Ra::get_uuid() function memoizes the return value per-connection. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: extra safety for noMetadata and useSvmProps usersEric Wong2007-02-23
| | | | | | | | | | | | | Make sure we flush our userspace buffers and and fsync(2) .rev_db information to disk if we use these options because we really don't want to lose this information. Also, disallow --use-svm-props and --no-metadata from the command-line because history will be inconsistent if they're only used occasionally. If a user wants to use these options, they must be set in the config so they're always on. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: use private $GIT_DIR/svn/config file moreEric Wong2007-02-23
| | | | | | | Switch max_rev storage over to using it for globbing branches and tags. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: add support for per-[svn-remote "..."] optionsEric Wong2007-02-23
| | | | | | | | | | | | | | | Available options are currently: svn-remote.<remote>.{noMetadata,useSvmProps,followParent} These boolean switches will override options set globally in [svn], and even override options set on the command-line (this should probably change in the future, however). Note that the noMetadata and useSvmProps options conflict. It's both technically and logically impossible to use them together. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: add support for SVN::Mirror/svk using revprops for metadataEric Wong2007-02-23
| | | | | | | | | | | | | | | | | | | | Pass --use-svm-props or set the svn.usesvmprops key with git-config to enable using properties set by SVN::Mirror when it mirrored the upstream URL. This is heavily based on work from Sam Vilain: > From: Sam Vilain <sam@vilain.net> > Date: Sun, 11 Feb 2007 12:34:45 +1300 > Subject: [PATCH] git-svn: re-map repository URLs and UUIDs on SVK mirror paths > > If an SVN revision has a property, "svm:headrev", it is likely that > the revision was created by SVN::Mirror (a part of SVK). The property > contains a repository UUID and a revision. We want to make it look > like we are mirroring the original URL, so introduce a helper function > that returns the original identity URL and UUID, and use it when > generating commit messages. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: remove optimized commit stuff for set-treeEric Wong2007-02-23
| | | | | | | | I may resurrect it for dcommit at some point, but nobody really uses set-tree anymore and I don't feel like introducing more complexity into the code at this point. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: correctly handle globs with a right-hand-side path componentEric Wong2007-02-23
| | | | | | | | | | | | | | | | | | Several bugs were found and fixed while getting this to work: * Remember the 'R'(eplace) case of actions and treat it like we would an 'A'(dd) case. * Fix a small case of follow-parent missing a parent if a subdirectory was modified in the revision where the parent was copied. * dirents returned by get_dir sometimes expire if the data structure is too big and the pool is destroyed, so we cache get_dir (along with check_path and get_revprops) temporarily along with its pool. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: correctly handle the -q flag in SVN::Git::FetcherEric Wong2007-02-23
| | | | Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: fix buggy regular expression usage in several placesEric Wong2007-02-23
| | | | | | | | | | | | I incorrectly used $path/? and $path/* to strip off leading directories, but places where $path = 'branches/0.17' would incorrectly strip changes to 'branches/0.17.1' as well. For globs, we require that our '*' is its own path component (surrounded by '/' or nothing). Enforce this when --prefix= is passed to us, too. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: enable follow-parent functionality by defaultEric Wong2007-02-23
| | | | | | | | --no-follow-parent disables and reverts it back to the old default behavior of not following parents (if you don't care for full history). Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: remove some noisy debugging messagesEric Wong2007-02-23
| | | | | | | | | | | | We don't need them anymore, all the rough points of the --follow-parent implementation have been worked out. The only improvement in the future will probably be --follow-parent-harder, which will track subdirectories and follow individual file history (so annotate/blame can be complete); but that is still a ways off. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: remove check_path calls before calling do_updateEric Wong2007-02-23
| | | | | | | | | | | These checks were needed before git-svn got smarter about match_paths() and using path information returned by get_log(). We also have extra checking against fetching revisions out-of-order these days; so we don't have to worry about that as much. We also check for tree deletions in match_paths() and skip those as well. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: --follow-parent tracks multi-parent pathsEric Wong2007-02-23
| | | | | | | | | | | We can have a branch that was deleted, then re-added under the same name but copied from another path, in which case we'll have multiple parents (we don't want to break the original ref, nor lose copypath info). Add a test for this, too, of course. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: implement auto-discovery of branches/tagsEric Wong2007-02-23
| | | | | | | | | | | | | | | | | | | This is similar to the way git proper handles refs, except we use the keys 'branches' and 'tags' to distinguish when we want to use wildcards. The left-hand side of the ':' contains the remote path, and must have one asterisk ('*') in it for the branch name. The asterisk may be in any component of the path as long as is it on its own directory level. The right-hand side contains the refname and must have the asterisk as the last path component. branches = branches/*:refs/remotes/* tags = tags/*:refs/remotes/tags/* Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: run get_log() on a sub-directory if possibleEric Wong2007-02-23
| | | | | | | This is an optimization that should conserve network bandwidth on certain repositories and configurations. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: reintroduce using a single get_log() to fetchEric Wong2007-02-23
| | | | | | | We'll need to rely on path matching to handle wildcard support for branches and tags. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: prepare multi-init for wildcard supportEric Wong2007-02-23
| | | | | | | Update the tests since we no longer write so many things to the config. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: just name the default svn-remote "svn" instead of "git-svn"Eric Wong2007-02-23
| | | | | | | It can be confusing and redundant, since historically the default remote ref (not remote itself) has been "git-svn", too. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: avoid extra get_log calls when refspecs are added for fetchingEric Wong2007-02-23
| | | | | | | | Since fetch_loop_common starts from the lowest revision number in a group of Git::SVN objects; we want to avoid refetching get_log for current users for things we've already cut it. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: get rid of revisions_eq check for --follow-parentEric Wong2007-02-23
| | | | | | | | This was originally needed before we used the delta fetcher and had a less-clean follow-parent implementation that could leave holes in the history. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: migrations default to [svn-remote "git-svn"]Eric Wong2007-02-23
| | | | | | | | It looks better (like [remote "origin"]) instead of whatever refname came up first in our directory traversal. Of course --remote= overrides this. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: save paths to tags/branches with for future reuseEric Wong2007-02-23
| | | | Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: don't write to the config file from --follow-parentEric Wong2007-02-23
| | | | | | | | | Having 'fetch' entries in the config file created from --follow-parent is wasteful because it can cause *future* of invocations to follow revisions we were never interested in in the first place. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: use sys* IO functions for reading rev_dbEric Wong2007-02-23
| | | | | | | | Using buffered IO for reading 40-41 bytes at a time isn't very efficient. Buffering writes for a short duration is alright since we close() right away and buffers will be flushed. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: avoid redundant get_log calls between invocationsEric Wong2007-02-23
| | | | | | | | Prefill .rev_db to the maximum revision we tried to fetch; and take advantage of that so we can avoid using get_log() on ranges we've already seen (and have deemed uninteresting). Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: do our best to ensure that our ref and rev_db are consistentEric Wong2007-02-23
| | | | | | | | | | | | Defer any signals that cause termination while they are updating; and put the update-ref call as close to the rename() as possible. Also, make things extra-safe (but slower) for people using --no-metadata since they can't rely on .rev_db being rebuilt if it's clobbered (well, I'm calling update-ref with the -m flag for reflogs, we don't yet have a way to rebuild .rev_db from reflogs. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: re-enable repacking flagsEric Wong2007-02-23
| | | | Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: avoid a huge memory spike with high-numbered revisionsEric Wong2007-02-23
| | | | | | | | Passing very large strings as arguments is bad for memory usage as it never seems to get freed in Perl. The .rev_db format is already not optimized for projects with sparse history. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: make (multi-)fetch safer but slowerEric Wong2007-02-23
| | | | | | | | | | | | | | | | get_log with explicit paths is the safest way to get revisions that change a particular path we're interested in. Unfortunately that means we still have to run get_log multiple times for each path we're interested in, and even more if a path gets deleted. The first argument of get_log() is an array reference, but we shouldn't use more than one element in that array ref because the non-existence of _one_ of those paths for a particular range would cause an error for all paths in that range, so yes, we need multiple get_log calls to be on the safe side... Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: gracefully handle --follow-parent failuresEric Wong2007-02-23
| | | | | | | We don't always know that a path will exist at a particular revision. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanupsEric Wong2007-02-23
| | | | | | | --svn-remote allows the default remote name to be overridden (useful for tracking multiple SVN repositories). Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: fix several fetch bugs related to repeated invocationsEric Wong2007-02-23
| | | | | | | | | | | | | | | | | | | We no longer delete the top-level directory even if it got deleted from the upstream repository. In gs_do_update; we double-check that the path we're tracking exists at both endpoints before proceeding. We have also added additional protection against fetching revisions out-of-order. To simplify our internal interfaces, I've disabled passing the 'recursive' flag to the gs_do_{switch,update} wrapper functions since we always want it in git-svn. We also pass the entire Git::SVN object rather than just the path because it helped me debug. When printing progress, the refname is printed out to make it less confusing when multi-fetch is running. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: remove the 'rebuild' command and make the functionality automaticEric Wong2007-02-23
| | | | | | | | | | | Since refs/remotes/* are not automatically cloned, we expect the user to be capable of copying those references themselves anyways. Also removed the documentation for --ignore-nodate while we're at it; it has also been made automatic. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: fetch tracks initial change with --follow-parentEric Wong2007-02-23
| | | | | | | | | | We were still skipping path information from get_log if we are tracking /r9270/drunk/subversion/bindings/..., but got something like this in the log: A /r9270/drunk (from /r9270/trunk:14) Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: don't rely on do_switch + reparenting with svn(+ssh)://Eric Wong2007-02-23
| | | | | | | | | | | | | | I can't seem to figure out what I or the SVN libraries are doing wrong, but it appears to be related to reparent and probably some global structure that gets reset if multiple SVN connections are being used. So now, in order to use do_switch; we'll open a new connection to the repository with the complete URL; but we can't seem to ever use an existing Ra object after another one has been created... Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: reinstate the default SVN error handler after using get_logEric Wong2007-02-23
| | | | | | | | | We don't need our own error handler for other operations. Also add a message about the successfully do_switch or do_update in follow-parent for debugging do_switch failures with svn:// and svn+ssh:// connections. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: just use Digest::MD5 instead of requiring itEric Wong2007-02-23
| | | | | | | | Historically, git-svn did not always use Digest::MD5 because it did not use the SVN::Delta::Editor interfaces. Nowadays it does, and the requires make strace more noisy. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: cleanup: move editor-specific variables into the editor namespaceEric Wong2007-02-23
| | | | | | Also removed some unused/redundant functions. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: stop using path names as refnames with --follow-parentEric Wong2007-02-23
| | | | | | | | | | | | | | | | Using path names as refnames breaks horribly if a user is tracking one large, toplevel directory, and a lower-level directory is followed from another project is a parent of another ref, as it will cause refnames such as: 'refs/remotes/trunk/path/to/stuff', which will conflict with a refname of 'refs/remotes/trunk'. Now we just append @$revno to the end of it the current refname. And if we have followed back to a grandparent, then we'll strip any existing '@$parent_revno' strings before appending our own '@$revno' string to it. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: correctly handle do_{switch,update} in deep directoriesEric Wong2007-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The do_update or do_switch functions in SVN only allow for a single path component; so 'path/to/deep/dir' would be interpreted as 'path'. SVN 1.4.x has a reparent function that can let us change the session to use a higher-level root of the repository, so we can use that for do_switch (which still doesn't seem to work in SVN 1.4.3 (a fix was attempted, but they missed the rest of the typemap changes needed in trunk...)). On the do_update side, we can use set_path on higher level directories and set them to a newer revision so they don't get updated. We can't do this with do_switch, either, because the relative path we're tracking can change (directory moving into a child of itself). Because of these changes, we need to double check that our Fetch editor is correctly performing stripping on any prefixed paths from update, otherwise we'll just die() because that would be a bug. Added a test case which helped me notice and fix problems with do_switch, too. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* git-svn: correctly track diff-less copies with do_switchEric Wong2007-02-23
| | | | | | | Also, this should allow for the tracking of new, but empty directories where we would want to see the log message. Signed-off-by: Eric Wong <normalperson@yhbt.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-18 18:23:33 +0000