path: root/git-svnimport.perl
AgeCommit message (Collapse)Author
2007-10-31No longer install git-svnimport, move to contrib/examplesGerrit Pape
This has been proposed for a few times without much reaction from the list. Actually remove it to see who screams. Signed-off-by: Gerrit Pape <> Signed-off-by: Junio C Hamano <>
2007-09-25Fix pool handling in git-svnimport to avoid memory leaks.Stefan Sperling
- Create an explicit one-and-only root pool. - Closely follow examples in SVN::Core man page. Before calling a subversion function, create a subpool of our root pool and make it the new default pool. - Create a subpool for looping over svn revisions and clear this subpool (i.e. it mark for reuse, don't decallocate it) at the start of the loop instead of allocating new memory with each iteration. See for a detailed explanation of the issue. Signed-off-by: Stefan Sperling <> Signed-off-by: Junio C Hamano <>
2007-09-18git-svnimport: Use separate arguments in the pipe for git-rev-parseMatthias Urlichs
Some people seem to create SVN branch names with spaces or other shell metacharacters. Signed-off-by: Matthias Urlichs <> Signed-off-by: Junio C Hamano <>
2007-09-08(cvs|svn)import: Ask git-tag to overwrite old tags.Michael Smith
If the tag was moved in CVS or SVN history, it will be moved in the imported history as well. Tag history is not tracked. Signed-off-by: Junio C Hamano <>
2007-08-14Allow git-svnimport to take "" as the trunk directory.Alberto Bertogli
Some repositories started with the trunk in "/" and then moved it to the standard "trunk/" location. On these repositories, the correct thing would be to call git-svnimport -T "", but because of the way the options are handled, it uses the default "trunk" instead of the given empty string. This patch fixes that behaviour. Reported by Leandro Lucarella <>. Signed-off-by: Alberto Bertogli <> Signed-off-by: Junio C Hamano <>
2007-06-23Generate tags with correct timestamp (git-svnimport)Dave O'Neill
Now uses git-tag instead of manually constructing the tag. This gives us a correct timestamp, removes some crufty code, and makes it work the same as git-cvsimport. The generated tags are now lightweight tags instead of tag objects, which may or may not be the behaviour we want. Also, remove two unused variables from git-cvsimport. Signed-off-by: Junio C Hamano <>
2007-06-07War on whitespaceJunio C Hamano
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <>
2007-01-12use 'init' instead of 'init-db' for shipped docs and toolsNicolas Pitre
While 'init-db' still is and probably will always remain a valid git command for obvious backward compatibility reasons, it would be a good idea to move shipped tools and docs to using 'init' instead. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-01-08git-svnimport: fix edge revisions double importingSasha Khapyorsky
This fixes newly introduced bug when the incremental cycle edge revisions are imported twice. Signed-off-by: Sasha Khapyorsky <> Signed-off-by: Junio C Hamano <>
2007-01-07git-svnimport: clean svn path when accessing SVN repoSasha Khapyorsky
Clean svn path from leading '/' when accessing SVN repo. Signed-off-by: Sasha Khapyorsky <> Signed-off-by: Junio C Hamano <>
2007-01-07git-svnimport: support for incremental importSasha Khapyorsky
This adds ability to do import "in chunks" (default 1000 revisions), after each chunk git repo will be repacked. The option -R is used to change default value of chunk size (or how often repository will repacked). Signed-off-by: Sasha Khapyorsky <> Signed-off-by: Junio C Hamano <>
2006-11-01git-svnimport: support for partial importsSasha Khapyorsky
This adds support for partial svn imports. Let's assume that SVN repository layout looks like: $trunk/path/to/our/project $branches/path/to/our/project $tags/path/to/our/project , and we would like to import only tree under this specific 'path/to/our/project' and not whole tree under $trunk, $branches, etc.. Now we will be be able to do it by using '-P path/to/our/project' option with git-svnimport. Signed-off-by: Sasha Khapyorsky <> Signed-off-by: Junio C Hamano <>
2006-10-19Merge branch 'sk/svn'Junio C Hamano
* sk/svn: git-svnimport.perl: copying directory from original SVN place
2006-10-16svnimport: Fix broken tags being generatedPetr Baudis
Currently git-svnimport generates broken tags missing the timespec in the 'tagger' line. This is a random stab at a minimal fix. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2006-10-09git-svnimport.perl: copying directory from original SVN placeSasha Khapyorsky
When copying whole directory, if source directory is not in already imported tree, try to get it from original SVN location. This happens when source directory is not matched by provided 'trunk' and/or 'tags/branches' templates or when it is not part of specified SVN sub-project. Signed-off-by: Sasha Khapyorsky <> Signed-off-by: Junio C Hamano <>
2006-09-28svnimport: add support for parsing From: lines for authorAndy Whitcroft
When commiting a non-signed off contribution you cannot just add a Signed-off-by: from the author as they did not sign it off. But if you then commit it, and necessarily sign it off yourself, the change appears to be yours. In this case it is common to use the following form: Commentry From: originator <email> Signed-of-by: me <my email> Now that we have support for parsing Signed-off-by: for author information it makes sense to handle From: as well. This patch adds a new -F which will handle From: lines in the comments. It may be used in combination with -S. Signed-off-by: Andy Whitcroft <> Signed-off-by: Junio C Hamano <>
2006-09-23git-svnimport: Parse log message for Signed-off-by: linesSasha Khapyorsky
This add '-S' option. When specified svn-import will try to parse commit message for 'Signed-off-by: ...' line, and if found will use the name and email address extracted at first occurrence as this commit author name and author email address. Committer name and email are extracted in usual way. Signed-off-by: Sasha Khapyorsky <> Signed-off-by: Junio C Hamano <>
2006-07-03Empty author may be presented by svn as an empty string or a null value.Robin Rosenberg
Signed-off-by: Junio C Hamano <>
2006-05-31git-svnimport: Improved detection of merges.Florian Forster
The regexes detecting merges (while still relying on the commit messages, though) have been improved to catch saner (and hopefully more) messages. The old regex was so generic that it often matched something else and missed the actual merge-message. Also, the regex given with the `-M' commandline-option is checked first: Explicitely given regexes should be considered better than the builtin ones, and should therefore be given a chance to match a message first. Signed-off-by: Junio C Hamano <>
2006-04-21Reintroduce svn pools to solve the memory leak.Santi_Béjar
Introduced in 4802426. Signed-off-by: Santi Béjar <> Signed-off-by: Junio C Hamano <>
2006-04-18git-svnimport symlink supportHerbert Valerio Riedel
added svn:special symlink support for access methods other than direct-http Signed-off-by: Herbert Valerio Riedel <> Acked-by: Matthias Urlichs <> Signed-off-by: Junio C Hamano <>
2006-04-07git-svnimport: Don't assume that copied files haven't changedKarl Hasselström
Don't assume that a file that SVN claims was copied from somewhere else is bit-for-bit identical with its parent, since SVN allows changes to copied files before they are committed. Without this fix, such copy-modify-commit operations causes the imported file to lack the "modify" part -- that is, we get subtle data corruption. Signed-off-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
2006-03-26git-svnimport: if a limit is specified, respect itAnand Kumria
git-svnimport will import the same revision over and over again if a limit (-l <rev>) has been specified. Instead if that revision has already been processed, exit with an up-to-date message. Signed-off-by: Anand Kumria <> Signed-off-by: Junio C Hamano <>
2006-02-27Save username -> Full Name <> map fileKarl Hasselström
When the user specifies a username -> Full Name <> map file with the -A option, save a copy of that file as $git_dir/svn-authors. When running git-svnimport with an existing GIT directory, use $git_dir/svn-authors (if it exists) unless a file was explicitly specified with -A. Signed-off-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
2006-02-27Let git-svnimport's author file use same syntax as git-cvsimport'sKarl Hasselström
git-cvsimport uses a username => Full Name <> mapping file with this syntax: kha=Karl Hasselström <> Since there is no reason to use another format for git-svnimport, use the same format. Signed-off-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
2006-02-27svnimport: Read author names and emails from a fileKarl Hasselström
Read a file with lines on the form username User's Full Name <> and use "User's Full Name <>" as the GIT author and committer for Subversion commits made by "username". If encountering a commit made by a user not in the list, abort. Signed-off-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
2006-02-27svnimport: Convert the svn:ignore propertyKarl Hasselström
Put the value of the svn:ignore property in a regular file when converting a Subversion repository to GIT. The Subversion and GIT ignore syntaxes are similar enough that it often just works to set the filename to .gitignore and do nothing else. Signed-off-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
2006-02-27svnimport: Convert executable flagKarl Hasselström
Convert the svn:executable property to file mode 755 when converting an SVN repository to GIT. Signed-off-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
2006-02-20svnimport: avoid open "-|" list form for Perl 5.6Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-02-14git-svnimport: -r adds svn revision number to commit messagesKarl Hasselström
New -r flag for prepending the corresponding Subversion revision number to each commit message. Signed-off-by: Karl Hasselström <> Signed-off-by: Junio C Hamano <>
2006-02-12Use a relative path for SVN importingChristian Biesinger
The absolute path (with the leading slash) breaks SVN importing, because it then looks for /trunk/... instead of /svn/trunk/... (in my case, the repository URL was https://servername/svn/) Signed-off-by: Christian Biesinger <> Signed-off-by: Junio C Hamano <>
2006-02-01git-svnimport.perl: fix for 'arg list too long...'Sasha Khapyorsky
This fixes 'arg list too long..' problem with git-ls-files. Note that second arg list separation loop (with 'git-update-index') is needed since git-ls-files arguments can be directories. Signed-off-by: Sasha Khapyorsky <> Signed-off-by: Junio C Hamano <>
2006-01-06svnimport: support repositories requiring SSL authenticationEric Wong
I looked at svn-mirror to see how it did this, seems about right. "It works for me" when using it against tested command-line: git-svnimport -C mpc -i -m -v \ -T mpc/trunk -b mpc/branches -t mpc/tags Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2005-12-15svnimport: exit cleanly when we are up to dateMartin Langhoff
Now we detect that the SVN repo does not have new commits for us and exit cleanly, removing the lockfile. With this, svnimport supports being run on a cronjob to maintain a SVN2GIT gateway. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2005-11-29SVN import: Use one log callMatthias Urlichs
One "svn log" (or its equivalent) per revision adds delay and server load. Instead, open two SVN connections -- one for the log, and one for the files. Positive side effect: Only those log entries which actually contain data are committed => no more empty commits. Also, change the "-l" option to set the maximum revision to be pulled, not the number of revisions. Signed-off-by: Junio C Hamano <>
2005-11-16symref support for import scriptsPavel Roskin
Fix git import script not to assume that .git/HEAD is a symlink. Signed-off-by: Pavel Roskin <> Signed-off-by: Junio C Hamano <>
2005-11-14Remove trailing slashesMatthias Urlichs
SVN dies a messy death when passed a path with trailing slashes.
2005-11-08Fix a couple of obvious and insignificant typo.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-11-08Lift the default limit of number of revs.Yaacov Akiba Slama
Now that the leak is gone, there is by default no limit of revisions to import. No more message about leak when the limit (given by the -l parameter) is reached. Signed-off-by: Yaacov Akiba Slama <> Signed-off-by: Junio C Hamano <>
2005-11-08Handle a revision that only creates a new tag correctly.Yaacov Akiba Slama
Fix an error when a svn revision consists only of the creation of a new tag directory (/tags/this_is_a_tag). Signed-off-by: Yaacov Akiba Slama <> Signed-off-by: Junio C Hamano <>
2005-11-08Bundle file copies from multiple branches into a merge.Yaacov Akiba Slama
When copying files and/or directories from several branches in one single revision, all these branches are used as parents of the commit. Signed-off-by: Yaacov Akiba Slama <> Signed-off-by: Junio C Hamano <>
2005-11-08copy_dir becomes copy_path and handles both files and directoriesYaacov Akiba Slama
The A (Add) and R (Replace) actions handling are unified. Signed-off-by: Yaacov Akiba Slama <> Signed-off-by: Junio C Hamano <>
2005-11-08Don't output error on changes in the nodes /, /tags or /branchesYaacov Akiba Slama
Signed-off-by: Junio C Hamano <>
2005-11-08Add node_kind function to differentiate between file and directoryYaacov Akiba Slama
Signed-off-by: Yaacov Akiba Slama <> Signed-off-by: Junio C Hamano <>
2005-11-08Use svn pools to solve the memory leak problem.Yaacov Akiba Slama
Signed-off-by: Yaacov Akiba Slama <> Signed-off-by: Junio C Hamano <>
2005-10-31Work around an RPM build problem.Junio C Hamano
The require statement at the top of git-svnimport seems to confuse rpmbuild dependency generation. It uses the newer notation "v5.8.0", and rpm ends up requiring "perl(v5.8.0)", while we would want it to say something like "perl >= 0:5.008". Ryan suggests old-style "require 5.008" might fix this problem, so here it is. Signed-off-by: Junio C Hamano <>
2005-10-16Merge branch 'svn' of C Hamano
[jc: I have my pre-commit hook enabled to catch trailing whitespaces, and fixed them up while merging.] Signed-off-by: Junio C Hamano <>
2005-10-16svn commit: re-word the exit-due-to-memory-leak messageMatthias Urlichs
Reworded the exit message, as per Kalle Valo's suggestion (but shorter). Signed-Off-By: Matthias Urlichs <>
2005-10-11svn import: copy directoriesMatthias Urlichs
Import SVN-copied and -referenced directories correctly. Signed-Off-By: Matthias Urlichs <>
2005-10-11svn import: Add direct HTTP accessMatthias Urlichs
Some SVN repositories that are accessible through HTTP don't like when I retrieve files using SVN methods ("internal server error"). Therefore, I added an option to get the contents using (persistent) HTTP directly. This also reduces round-trip time, from two or three requests down to one. Also corrected error handling a bit. Signed-Off-By: Matthias Urlichs <>