aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix timestamps of notes to adhere to git standards by using +0000Ulrich Spörlein2012-05-121-1/+1
| | | | instead of -0000.
* Allow user-overriding of default email domainUlrich Spörlein2012-05-113-4/+19
| | | | | | | | | | | | Lazy projects where svn user X has email X@project.org don't need to compile (and update) an identity-map for rolling conversions. This can be mixed with a real identity-map, so only misses in the map will have the user then show up as X@project.org Also change the defaults somewhat. I don't like the NFS reserved username nobody to show up in SVN or git logs, but am keeping that for now.
* Remove stray backslash in source code.Nicolás Alvarez2012-04-171-1/+1
| | | | It completely screws up KDevelop's highlighting...
* Properly expand multiple variables in the same line.Modestas Vainius2011-05-281-1/+1
| | | | | | | When were two or more different variables in the same line, ruleparser used to expand the first one and replace *all* variables (since all variables are matches of variableLine regexp) with that expanded value. The corrent way is to replace that exact variable reference with the expanded value.
* Merge commit 'refs/merge-requests/14' of gitorious.org:svn2git/svn2git into ↵Torgny Nyblom2011-05-083-3/+90
|\ | | | | | | merge-requests/14
| * Add support for adding svn commit info metadata as git notes.Modestas Vainius2011-04-243-3/+90
| | | | | | | | | | | | The patch add --add-metadata-notes command line option which is similar to --add-metadata except rather embedding svn commit info into the commit message, it is added as a note for the respective commit.
* | Merge commit 'refs/merge-requests/12' of git://gitorious.org/svn2git/svn2git ↵Torgny Nyblom2011-05-083-0/+77
|\ \ | | | | | | | | | | | | | | | | | | into merge-requests/12 Conflicts: src/ruleparser.cpp
| * | Support substitutions for repository/branch names.Modestas Vainius2011-04-243-0/+77
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for 's///' style substitutions for the repository/branch names in the match rulesets. Useful when e.g. eliminating characters not supported in git branch names. Syntax: match /... repository some_repo substitute repository s/pattern/replacement/ branch some_branch substitute branch s/pattern/replacement/ end match
* | Support 'description' field in the create repository rule.Modestas Vainius2011-04-243-0/+14
|/ | | | Its value is used to fill in repository/description file used by gitweb.
* Use +0000 instead of -0000 for timezone indicator in timestamps.Nicolás Alvarez2011-04-181-2/+2
| | | | | | Git seems to always output +0000, so when filter-branching, every single commit changes hash because dates are changed from - to +0.
* Add support for default values in variable substitutions.Nicolás Alvarez2011-04-111-4/+12
| | | | | | If there is no variable 'foo' set, ${foo} exits with a fatal error. With this patch, you can use ${foo|sometext}, which will substitute to 'sometext' if the variable 'foo' isn't set. The default text may be empty.
* Limit variable names to letters, numbers and underscores.Nicolás Alvarez2011-04-111-2/+4
| | | | | | | The parser used to allow any non-whitespace character, which could cause problems in practice. For example, you could create a variable with } or = in the name, or a character we may want to use in a syntax extension later.
* Save deleted branches in a visible namespaceSebastian Pipping2011-04-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | - The branch is first created properly and then deleted (line "progress SVN r77 branch config-header = :0 # delete") - Jehan's post-1.0.3 commit 584005f2e26149282aa12c4a0367d250caaf3918 writes a backup of the branches latest ref to refs/backup/ on deletion. Many thanks for that commit! However, in my opinion the problem with the current code is that it makes it much too easy to lose history during the conversion to Git. Without a tag or branch pointing to it the commits will fall off easily, especially if people use "git clone" on the bare Git repository created by svn2git. It would be safer and useful to create visible tags for this, e.g. refs/tags/branch-bugfix17-deleted. My attached patch changes Jehan's code to do just that. Please consider application - this patch really matters to me. If you'd rather have both a ref in refs/backup/ and in refs/tags/ or require a command line option for it I can adjust the patch for you. Thanks for listening,
* Create backup reference before deletion of the original branchJehan Bing2011-03-211-3/+4
| | | | | | Ensure that the backup reference is created before deleting the original branch. As it was, the deletion was executed earlier causing the backup reference to point to a non-existing branch so was not created.
* Remove unnecessary const casts.Nicolás Alvarez2011-03-161-4/+4
|
* Commit branch creation when requested and not on next transaction commitTorgny Nyblom2011-02-071-1/+3
| | | | | | | Branches was created by adding the command to a list, this list was then written to git when the next transaction was committed. This had the side effect that if the branch creation was the last thing the branch was never created.
* Fix encoding of author names.Nicolás Alvarez2011-01-291-0/+1
| | | | | | Author names were being properly passed through fromUtf8(), but then sent to a QTextStream using the system's locale. This patch forces the text stream to always use UTF-8.
* Support ranges in the revisions fileTorgny Nyblom2011-01-171-10/+34
|
* Delay transaction creation untill usage.Torgny Nyblom2011-01-161-8/+8
| | | | | This might fix the issue with an extra empty diff commit before all tags.
* Print how we were invokedTorgny Nyblom2011-01-151-0/+4
|
* Only print warning if it appliesTorgny Nyblom2011-01-151-1/+1
|
* Fix serious performance regression.Nicolás Alvarez2010-12-231-0/+3
| | | | | | | In Repository::commit, don't call startFastImport() if we have nothing to write to the fastImport stream. startFastImport() may start new git-fast-import processes if they were previously killed, so it may be extremely slow to call it frequently if it's not necessary.
* Add option for using the real content of an SVN branch when creating aTorgny Nyblom2010-12-212-0/+16
| | | | new branch instead of using the contents of the git "from" branch.
* Fix the --version optionTorgny Nyblom2010-12-212-0/+12
| | | | | When supplying --version the git commit that was used to create the version should be printed to stdout.
* Make sure that there are merges recorded before trying to read the last oneTorgny Nyblom2010-12-211-1/+1
|
* Try and fix cvs2svn multiple merge points for branches and tags.Torgny Nyblom2010-12-211-19/+27
| | | | Might still need some logic for detecting the correct from branch.
* Make the tagging commands visible in the gitlog aswellTorgny Nyblom2010-12-201-6/+6
|
* Only fetch revision properties once per revisionTorgny Nyblom2010-12-161-1/+6
|
* Only call startFastImport when neededTorgny Nyblom2010-12-161-1/+1
|
* Be more clear about what are warningsTorgny Nyblom2010-12-164-22/+22
|
* Move branch creation/deletion/restting to Repository and write these inTorgny Nyblom2010-12-153-5/+23
| | | | | | commit() Prepare for handling cvs2svn borked tags/branches
* Ditch PrefixingRepository in favor of a memmber variable inTorgny Nyblom2010-12-153-282/+181
| | | | | [FastExport]Repository Some minor reordering
* Delete before other changesTorgny Nyblom2010-12-131-3/+15
| | | | | Fix issue where if a branch reset was triggered before a branch deletion in the same revision the reset was overridden by the deletion
* call startFastImport where it is used.Torgny Nyblom2010-12-131-4/+2
|
* Code styleTorgny Nyblom2010-12-131-1/+2
|
* Duh, do not try and extract options before they are parsed.Torgny Nyblom2010-12-121-1/+1
|
* Add an option to print some stats after a run.Torgny Nyblom2010-12-044-4/+112
|
* Allow more then one variable to be used on a line.Torgny Nyblom2010-11-301-2/+1
|
* QList<int> -> QSet<int>Torgny Nyblom2010-11-271-5/+4
|
* Add an option to parse a list (in a file) of revisions that should beTorgny Nyblom2010-11-261-0/+40
| | | | used.
* Merge branch 'master' of gitorious.org:svn2git/svn2gitTorgny Nyblom2010-11-141-4/+1
|\
| * Fix detecting directory movesNiko Sams2010-11-131-4/+1
| | | | | | | | | | | | | | | | | | is_dir wasn't reported correctly, I guess because the path didn't exist anymore at that revision. Reuse the existing wasDir function as it works perfectly. With not detecting the path as a dir, the / got not added, an thus the rule for the source not found.
* | Print revision information with "copy from" warningTorgny Nyblom2010-11-011-1/+1
|/
* Fix issue with variables not being defined when reading include filesTorgny Nyblom2010-11-012-5/+5
|
* Print the missing from path when warning about missing sourceTorgny Nyblom2010-11-011-1/+1
|
* Fix filename and linenumber for included rulefiles.Torgny Nyblom2010-10-262-124/+117
|
* Better include path (FreeBSD patch from Uli - http://gitorious.org/~uqs)Torgny Nyblom2010-10-181-2/+2
|
* Allow files to be matchedTorgny Nyblom2010-10-081-2/+0
|
* Make sure fastImport is started before adding fileNiko Sams2010-10-071-0/+1
|
* Merge branch 'master' of gitorious.org:svn2git/svn2gitNiko Sams2010-10-048-53/+141
|\