[PATCH] Make cvs2git support remote CVS repos
- From
- Mark Allen <mrallen1@yahoo.com>
- Date
- May 25, 2005, 18:11 UTC
- Message-ID
- <20050525181132.75705.qmail@web41204.mail.yahoo.com>
Added a "--module=cvsmodule" command line option and (since we're going to process argv anyway) made "-v" for verbose mode a command line option too, instead of a compile time option.
I've tested it on some (small) private CVS repos and it *seems* to work, although some of the initial commit ordering is wrong, but I think this is due to the commit time being wrong within my CVS repo itself.
I didn't make author and email prettyprint, but I really want to make it a command line option, the discussion from yesterday about whether prettyprinting should be at the plumbing or porcelain layer notwithstanding.
Regards,
--Mark
Index: cvs2git.c =================================================================== --- a0e0d3940c350f14545a481b179217f626c93440/cvs2git.c (mode:100644) +++ uncommitted/cvs2git.c (mode:100644) @@ -32,6 +32,8 @@ }; static char *rcsdir; +static char *cvsroot; +static char *cvsmodule; static char date[100]; static char author[100]; @@ -194,9 +196,13 @@ if (dir) printf("mkdir -p %.*s\n", (int)(dir - name), name); - get_rcs_name(rcspathname, name, dir); - - printf("co -q -p -r%s '%s' > '%s'\n", version, rcspathname, name); + if ( !cvsmodule ) { + get_rcs_name(rcspathname, name, dir); + printf("co -q -p -r%s '%s' > '%s'\n", version, rcspathname, name); + } else { + printf("cvs -d %s checkout -r%s -p '%s/%s' > '%s'\n", cvsroot, version, cvsmodule, name, name); + } + printf("git-update-cache --add -- '%s'\n", name); } @@ -217,13 +223,34 @@ { static char line[1000]; enum state state = Header; + int i; + + for (i = 1; i < argc; i++) { + const char *arg = argv[i]; + if (!memcmp(arg, "--module=", 9)) { + cvsroot = getenv("CVSROOT"); + cvsmodule = (char *)arg+9; + continue; + } + if (!strcmp(arg, "-v")) { + verbose = 1; + continue; + } + } + + if (!cvsmodule) + rcsdir = getenv("RCSDIR"); - rcsdir = getenv("RCSDIR"); - if (!rcsdir) { + if (!cvsmodule && !rcsdir) { fprintf(stderr, "I need an $RCSDIR\n"); exit(1); } + if (cvsmodule && !cvsroot) { + fprintf(stderr, "I need a $CVSROOT\n"); + exit(1); + } + printf("[ -d .git ] && exit 1\n"); printf("git-init-db\n"); printf("mkdir -p .git/refs/heads\n");