aboutsummaryrefslogtreecommitdiff
path: root/git-cvsimport-script
Commit message (Collapse)AuthorAge
* Big tool rename.Junio C Hamano2005-09-07
| | | | | | | | | | | | | | | | | | | As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git-cvsimport-script: handling of tagsH. Peter Anvin2005-09-06
| | | | | | | | | This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git-cvsimport - remove hardcoded reference to originMartin Langhoff2005-08-17
| | | | | | | ... 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>
* [PATCH] Add merge detection to git-cvsimportMartin Langhoff2005-08-17
| | | | | | | | | | | | | 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>
* [PATCH] Also handle CVS branches with a '/' in their nameJohannes Schindelin2005-08-17
| | | | | | | | | | | 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>
* [PATCH] Add -k kill keyword expansion option to git-cvsimport - revisedMartin Langhoff2005-08-16
| | | | | | | | | | | | | | | | 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>
* [PATCH] Fixed two bugs in git-cvsimport-script.iso-8859-1?Q?David_K=E5gedal2005-08-16
| | | | | | | | | | | | | | | | | 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>
* [PATCH] cvsgit fixes: spaces in filenames and CVS server dialog woesMatthias Urlichs2005-08-16
| | | | | | | | | | | | 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>
* [PATCH] git-cvsimport-script: parse multidigit revisions.Sven Verdoolaege2005-07-12
| | | | | | | | 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>
* [PATCH] git-cvsimport-script: add "import only" optionSven Verdoolaege2005-07-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>
* [PATCH] Expose object ID computation functions.Bryan Larsen2005-07-08
| | | | | | | | | | | | | | 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>
* [PATCH] Fix fd leak in git-cvsimport-scriptSven Verdoolaege2005-07-06
| | | | | | Remember to close temporary file Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge with http://www.liacs.nl/~sverdool/git.git#cvs2gitMatthias Urlichs2005-07-05
|\
| * git-cvsimport-script: move working directory forwardSven Verdoolaege2005-07-05
| | | | | | | | | | | | | | 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.
| * git-cvsimport-script: remove unused variableSven Verdoolaege2005-07-04
| |
| * git-cvsimport-script: more error handlingSven Verdoolaege2005-07-04
| |
| * git-cvsimport-script: provide direct support for cvsps -z optionSven Verdoolaege2005-07-04
| |
| * git-cvsimport-script: update cvsps cache instead of rebuilding itSven Verdoolaege2005-07-04
| | | | | | | | | | | | Updating the cache is sufficient for most purposes. If users really want to rebuild the cache, they can specify the option themselves.
| * git-cvsimport-script: fix branch switchingSven Verdoolaege2005-07-04
| | | | | | | | Previous patch broke branch switching.
| * git-cvsimport-script: use private index.Sven Verdoolaege2005-07-04
| |
| * git-cvsimport-script: leave working directory alone.Sven Verdoolaege2005-07-04
| |
| * git-cvsimport-script: typo head -> headsSven Verdoolaege2005-07-03
| |
* | cvsimport: getopt accepted a -q option (undocumented and unused).Matthias Urlichs2005-07-05
|/ | | | Removed.
* cvsimport: Missing tests for verbosity flag.Matthias Urlichs2005-07-03
|
* Support :ext: access method.Sven Verdoolaege2005-07-03
|
* Honour CVS_SERVER.Sven Verdoolaege2005-07-03
|
* Make specification of CVS module to convert optional.Sven Verdoolaege2005-07-03
| | | | | | | | | | | 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>
* cvsimport: Added option '-p': pass options to cvspsMatthias Urlichs2005-06-30
| | | | Added option '-x' to cvsps call
* cvsimport: Exit if an existing repository doesn't have the right branch.Matthias Urlichs2005-06-30
|
* cvs import: Strip whitespace at the end of the log entryMatthias Urlichs2005-06-30
| | | | for compatibility with old cvs2git.
* cvsimport: perform string comparison on "HEAD"Sven Verdoolaege2005-06-30
|
* git-cvsimport-script: Removed redundant @old and @new clear.Matthias Urlichs2005-06-30
|
* git-cvsimport-script: Remove setting Sticky; it may cause problemsMatthias Urlichs2005-06-30
|
* cvs import: Call git-update-cache multiple timesMatthias Urlichs2005-06-30
| | | | instead of with a too-long argument list.
* Rollbak to the original branch after importingMatthias Urlichs2005-06-28
|
* Local cvsimport fixupsMatthias Urlichs2005-06-28
|
* Fix remote CVS import.Matthias Urlichs2005-06-28
|
* Added Perl git-cvsimport-scriptMatthias Urlichs2005-06-28
|
* [PATCH] git cvsimport fuzz argumentTommy M. McGuire2005-06-12
| | | | | | | | | | | | | | | 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>
* [PATCH] git cvsimport sanity checkingTommy M. McGuire2005-06-12
| | | | | | | | | | | | | | | | | | 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>
* [PATCH] cvsimport: allow remote CVS reposTommy M. McGuire2005-06-12
| | | | | | | | 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>
* Add CVS import scripts and programsLinus Torvalds2005-06-07
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.