summaryrefslogtreecommitdiff
path: root/git-cvsimport-script
AgeCommit message (Collapse)AuthorFilesLines
2005-08-17[PATCH] git-cvsimport - remove hardcoded reference to originLibravatar Martin Langhoff1-1/+1
... in the newly introduced merge detection code. Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-17[PATCH] Add merge detection to git-cvsimportLibravatar Martin Langhoff1-4/+44
Added -m and -M flags for git-cvsimport to detect merge commits in cvs. While this trusts the commit message, in repositories where merge commits indicate 'merged from FOOBRANCH' the import works surprisingly well. Even if some merges from CVS are bogus or incomplete, the resulting branches are in better state to go forward (and merge) than without any merge detection. Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-17[PATCH] Also handle CVS branches with a '/' in their nameLibravatar Johannes Schindelin1-3/+5
I track a CVS project which has a branch with a '/' in the branch name. Since git wants the branch name to be a file name at the same time, substitute that character to a '-' by default (override with "-s <subst>"). This should work well, despite the fact that a division and a difference are completely different :-) Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-16[PATCH] Add -k kill keyword expansion option to git-cvsimport - revisedLibravatar Martin Langhoff1-5/+7
Early versions of git-cvsimport defaulted to using preexisting keyword expansion settings. This change preserves compatibility with existing cvs imports and allows new repository migrations to kill keyword expansion. After exploration of the different -k modes in the cvs protocol, we use -kk which kills keyword expansion wherever possible. Against the protocol spec, -ko and -kb will sometimes expand keywords. Should improve our chances of detecting merges and reduce imported repository size. Signed-off: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-16[PATCH] Fixed two bugs in git-cvsimport-script.Libravatar iso-8859-1?Q?David_K=E5gedal1-2/+2
The git-cvsimport-script had a copule of small bugs that prevented me from importing a big CVS repository. The first was that it didn't handle removed files with a multi-digit primary revision number. The second was that it was asking the CVS server for "F" messages, although they were not handled. I also updated the documentation for that script to correspond to actual flags. Signed-off-by: David K?5gedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-16[PATCH] cvsgit fixes: spaces in filenames and CVS server dialog woesLibravatar Matthias Urlichs1-11/+23
Problems found while importing dasher's CVS: * Allow spaces in filenames. * cvsps may create unnamed branches with revisions that don't really exist, which causes the CVS server to return something we haven't hitherto expected. * Report deleted files when being verbose. * Also, report the commit date. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-12[PATCH] git-cvsimport-script: parse multidigit revisions.Libravatar Sven Verdoolaege1-1/+1
Previously, git-cvsimport-script would fail on revisions with more than one digit. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-11[PATCH] git-cvsimport-script: add "import only" optionLibravatar Sven Verdoolaege1-7/+11
git-cvsimport-script: add "import only" option which tells the script not to perform a checkout after importing. This ensures that the working directory and cache remain untouched and will not create them if they do not exist. Acked-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-08[PATCH] Expose object ID computation functions.Libravatar Bryan Larsen1-1/+1
This patch makes the first half of write_sha1_file() and index_fd() externally visible, to allow callers to compute the object ID without actually storing it in the object database. [JC demangled the whitespaces himself because he liked the patch so much, and reworked the interface to index_fd() slightly, taking suggestion from Linus and of his own.] Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-06[PATCH] Fix fd leak in git-cvsimport-scriptLibravatar Sven Verdoolaege1-0/+1
Remember to close temporary file Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-05Merge with http://www.liacs.nl/~sverdool/git.git#cvs2gitLibravatar Matthias Urlichs1-54/+95
2005-07-05cvsimport: getopt accepted a -q option (undocumented and unused).Libravatar Matthias Urlichs1-1/+1
Removed.
2005-07-05git-cvsimport-script: move working directory forwardLibravatar Sven Verdoolaege1-5/+27
If HEAD happened to point to a cvs branch, move the working directory forward to the tip of the branch. Additionally, if master and "origin" are equal, move master forward to new origin first.
2005-07-04git-cvsimport-script: remove unused variableLibravatar Sven Verdoolaege1-2/+0
2005-07-04git-cvsimport-script: more error handlingLibravatar Sven Verdoolaege1-2/+3
2005-07-04git-cvsimport-script: provide direct support for cvsps -z optionLibravatar Sven Verdoolaege1-4/+5
2005-07-04git-cvsimport-script: update cvsps cache instead of rebuilding itLibravatar Sven Verdoolaege1-1/+1
Updating the cache is sufficient for most purposes. If users really want to rebuild the cache, they can specify the option themselves.
2005-07-04git-cvsimport-script: fix branch switchingLibravatar Sven Verdoolaege1-1/+2
Previous patch broke branch switching.
2005-07-04git-cvsimport-script: use private index.Libravatar Sven Verdoolaege1-20/+23
2005-07-04git-cvsimport-script: leave working directory alone.Libravatar Sven Verdoolaege1-33/+48
2005-07-03git-cvsimport-script: typo head -> headsLibravatar Sven Verdoolaege1-1/+1
2005-07-03cvsimport: Missing tests for verbosity flag.Libravatar Matthias Urlichs1-2/+2
2005-07-03Support :ext: access method.Libravatar Sven Verdoolaege1-2/+21
2005-07-03Honour CVS_SERVER.Libravatar Sven Verdoolaege1-1/+3
2005-07-03Make specification of CVS module to convert optional.Libravatar Sven Verdoolaege1-8/+26
If we're inside a checked out CVS repository, there is no need to explicitly specify the module as it is available in CVS/Repository. Also read CVS/Root if it's available and -d is not specified. Finally, explicitly pass root to cvsps as CVS/Root takes precedence over CVSROOT. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
2005-06-30cvsimport: Added option '-p': pass options to cvspsLibravatar Matthias Urlichs1-3/+6
Added option '-x' to cvsps call
2005-06-30cvsimport: Exit if an existing repository doesn't have the right branch.Libravatar Matthias Urlichs1-0/+5
2005-06-30cvs import: Strip whitespace at the end of the log entryLibravatar Matthias Urlichs1-1/+6
for compatibility with old cvs2git.
2005-06-30cvsimport: perform string comparison on "HEAD"Libravatar Sven Verdoolaege1-1/+1
2005-06-30git-cvsimport-script: Removed redundant @old and @new clear.Libravatar Matthias Urlichs1-3/+0
2005-06-30git-cvsimport-script: Remove setting Sticky; it may cause problemsLibravatar Matthias Urlichs1-1/+1
2005-06-30cvs import: Call git-update-cache multiple timesLibravatar Matthias Urlichs1-4/+22
instead of with a too-long argument list.
2005-06-28Rollbak to the original branch after importingLibravatar Matthias Urlichs1-4/+25
2005-06-28Local cvsimport fixupsLibravatar Matthias Urlichs1-2/+8
2005-06-28Fix remote CVS import.Libravatar Matthias Urlichs1-30/+48
2005-06-28Added Perl git-cvsimport-scriptLibravatar Matthias Urlichs1-29/+575
2005-06-12[PATCH] git cvsimport fuzz argumentLibravatar Tommy M. McGuire1-8/+19
Add "-z fuzz" argument, passed to cvsps, and clean up argument processing. Also, use "cvsps --cvs-direct", which is is somewhat faster. Give the user the option of specifying the timestamp fuzz passed to cvsps. Looking at the other arguments to it, I can't see anything else that would be sane to play with. Also, use --cvs-direct, which speeds up cvsps for remote repositories and doesn't seem to do anything bad to local repositories. Signed-off-by: Tommy McGuire <mcguire@crsr.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-12[PATCH] git cvsimport sanity checkingLibravatar Tommy M. McGuire1-1/+3
This patch adds some sanity checking to git-cvsimport-script, specifically forcing the use of cvsps -x (to get the latest information from the repository, rather than whatever is in the cache) and aborting early if cvsps does not produce any output. I debated removing the $MODULE directory following an abort, but I eventually decided leaving stuff behind would make debugging easier. On the other hand, this patch should help with the "cvsimport left me with an empty repository" complaints. Call cvsps with the -x flag, to get the current state of the repository, and abort the cvs import early if cvsps does not produce any output. Signed-off-by: Tommy McGuire <mcguire@crsr.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-12[PATCH] cvsimport: allow remote CVS reposLibravatar Tommy M. McGuire1-1/+1
Remove unneeded sanity tests. Remote repositories do, indeed, just work. Signed-off-by: Tommy McGuire <mcguire@crsr.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-07Add CVS import scripts and programsLibravatar Linus Torvalds1-0/+25
This gets the "cvs2git" program from the old git-tools archive, and adds a nice script around it that makes it much easier to use. With this, you should be able to import a CVS archive using just a simple git cvsimport <cvsroot> <module> and you're done. At least it worked for my one single test. NOTE!! This may need tweaking. It currently expects (and verifies) that cvsps version 2.1 is installed, but you can't actually set any of the cvsps parameters, like the time fuzz.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 22:54:17 +0000