aboutsummaryrefslogtreecommitdiff
path: root/git-svnimport.perl
Commit message (Collapse)AuthorAge
* Merge branch 'sk/svn'Junio C Hamano2006-10-18
|\ | | | | | | | | * sk/svn: git-svnimport.perl: copying directory from original SVN place
| * git-svnimport.perl: copying directory from original SVN placeSasha Khapyorsky2006-10-08
| | | | | | | | | | | | | | | | | | | | | | 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 <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | svnimport: Fix broken tags being generatedPetr Baudis2006-10-15
|/ | | | | | | | 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 <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* svnimport: add support for parsing From: lines for authorAndy Whitcroft2006-09-28
| | | | | | | | | | | | | | | | | | | | | 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 <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svnimport: Parse log message for Signed-off-by: linesSasha Khapyorsky2006-09-22
| | | | | | | | | | | 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 <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Empty author may be presented by svn as an empty string or a null value.Robin Rosenberg2006-07-02
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svnimport: Improved detection of merges.Florian Forster2006-05-31
| | | | | | | | | | | | 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 <junkio@cox.net>
* Reintroduce svn pools to solve the memory leak.Santi_Béjar2006-04-20
| | | | | | | Introduced in 4802426. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svnimport symlink supportHerbert Valerio Riedel2006-04-18
| | | | | | | | | added svn:special symlink support for access methods other than direct-http Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org> Acked-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svnimport: Don't assume that copied files haven't changedKarl Hasselström2006-04-07
| | | | | | | | | | | | | 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 <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svnimport: if a limit is specified, respect itAnand Kumria2006-03-26
| | | | | | | | | 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 <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Save username -> Full Name <email@addr.es> map fileKarl Hasselström2006-02-27
| | | | | | | | | | | When the user specifies a username -> Full Name <email@addr.es> 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 <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Let git-svnimport's author file use same syntax as git-cvsimport'sKarl Hasselström2006-02-27
| | | | | | | | | | | | | git-cvsimport uses a username => Full Name <email@addr.es> mapping file with this syntax: kha=Karl Hasselström <kha@treskal.com> Since there is no reason to use another format for git-svnimport, use the same format. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* svnimport: Read author names and emails from a fileKarl Hasselström2006-02-26
| | | | | | | | | | | | | Read a file with lines on the form username User's Full Name <email@addres.org> and use "User's Full Name <email@addres.org>" 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 <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* svnimport: Convert the svn:ignore propertyKarl Hasselström2006-02-26
| | | | | | | | | | 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 <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* svnimport: Convert executable flagKarl Hasselström2006-02-26
| | | | | | | | Convert the svn:executable property to file mode 755 when converting an SVN repository to GIT. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* svnimport: avoid open "-|" list form for Perl 5.6Junio C Hamano2006-02-20
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svnimport: -r adds svn revision number to commit messagesKarl Hasselström2006-02-14
| | | | | | | | New -r flag for prepending the corresponding Subversion revision number to each commit message. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use a relative path for SVN importingChristian Biesinger2006-02-11
| | | | | | | | | 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 <cbiesinger@web.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svnimport.perl: fix for 'arg list too long...'Sasha Khapyorsky2006-02-01
| | | | | | | | | | 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 <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* svnimport: support repositories requiring SSL authenticationEric Wong2006-01-05
| | | | | | | | | | | I looked at svn-mirror to see how it did this, seems about right. "It works for me" when using it against https://svn.musicpd.org tested command-line: git-svnimport -C mpc -i -m -v \ -T mpc/trunk -b mpc/branches -t mpc/tags https://svn.musicpd.org Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* svnimport: exit cleanly when we are up to dateMartin Langhoff2005-12-14
| | | | | | | | | 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 <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* SVN import: Use one log callMatthias Urlichs2005-11-29
| | | | | | | | | | | | | 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 <junkio@cox.net>
* symref support for import scriptsPavel Roskin2005-11-16
| | | | | | | Fix git import script not to assume that .git/HEAD is a symlink. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove trailing slashesMatthias Urlichs2005-11-14
| | | | SVN dies a messy death when passed a path with trailing slashes.
* Fix a couple of obvious and insignificant typo.Junio C Hamano2005-11-08
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Lift the default limit of number of revs.Yaacov Akiba Slama2005-11-08
| | | | | | | | | 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 <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Handle a revision that only creates a new tag correctly.Yaacov Akiba Slama2005-11-08
| | | | | | | | 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 <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Bundle file copies from multiple branches into a merge.Yaacov Akiba Slama2005-11-08
| | | | | | | | 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 <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* copy_dir becomes copy_path and handles both files and directoriesYaacov Akiba Slama2005-11-08
| | | | | | | The A (Add) and R (Replace) actions handling are unified. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Don't output error on changes in the nodes /, /tags or /branchesYaacov Akiba Slama2005-11-08
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add node_kind function to differentiate between file and directoryYaacov Akiba Slama2005-11-08
| | | | | Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use svn pools to solve the memory leak problem.Yaacov Akiba Slama2005-11-08
| | | | | Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Work around an RPM build problem.Junio C Hamano2005-10-30
| | | | | | | | | | | | 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 <junkio@cox.net>
* Merge branch 'svn' of http://netz.smurf.noris.de/git/gitJunio C Hamano2005-10-16
| | | | | | | [jc: I have my pre-commit hook enabled to catch trailing whitespaces, and fixed them up while merging.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* svn commit: re-word the exit-due-to-memory-leak messageMatthias Urlichs2005-10-16
| | | | | | Reworded the exit message, as per Kalle Valo's suggestion (but shorter). Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: copy directoriesMatthias Urlichs2005-10-11
| | | | | | Import SVN-copied and -referenced directories correctly. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: Add direct HTTP accessMatthias Urlichs2005-10-11
| | | | | | | | | | | | | 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 <smurf@smurf.noris.de>
* svn import: remove some CVS cruftMatthias Urlichs2005-10-11
| | | | | | Some remains of CVS still lingered. Removed. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: make -s option actually optionalMatthias Urlichs2005-10-11
| | | | | | The -s option was accidentally not optional. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: typo fixMatthias Urlichs2005-10-11
| | | | | | Fixed a minor typo Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: get all revisionsMatthias Urlichs2005-10-10
| | | | | | Not skipping the last revision is generally seen as Good Thing. ;-) Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: unlink downlaoded filesMatthias Urlichs2005-10-10
| | | | | | | Actually removing the files that have been checked out of SVN, after checking them into git of course, is a good idea... Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: Add a loop limit optionMatthias Urlichs2005-10-10
| | | | | | | | The svn library has a serious memory leak. Added a new option (-l NUM) which causes git-svnimport to exit cleanly after fetching that many changes, in order to . Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: incremental importsMatthias Urlichs2005-10-10
| | | | | | | | | Incremental imports skipped a revision. Also improve interrupt safety -- ^C while writing a tag caused the tag to be skipped. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: skip initial revisionsMatthias Urlichs2005-10-10
| | | | | | | Add a flag to skip initial revisions: some SVN repositories have initial setup cruft in their logs which we might want to ignore. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: Do not create empty tagsMatthias Urlichs2005-10-10
| | | | | | If a tag is "clean", do not create a commit for it. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: Fix tagging.Matthias Urlichs2005-10-10
| | | | | | Tagging was 100% broken. :-/ Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: remove debuggingMatthias Urlichs2005-10-10
| | | | | | Removed debugging output used to identify the too-many-connections problem. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: wrong file open modeMatthias Urlichs2005-10-10
| | | | | | There are multiple | characters in Unicode. Don't use the wrong one ... Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-08 18:57:14 +0000