* [PATCH] support incremental cvs2git-ing
@ 2005-06-10 19:35 Panagiotis Issaris
2005-06-17 16:26 ` Sven Verdoolaege
0 siblings, 1 reply; 2+ messages in thread
From: Panagiotis Issaris @ 2005-06-10 19:35 UTC (permalink / raw)
To: torvalds; +Cc: git
Hi Linus,
I wanted to be able to track CVS repositories in a GIT repository. The
cvs2git program worked fine with the initial import but needed a tiny
modification to enable me to resync the GIT repository with the updated
CVS tree.
With friendly regards,
Takis
Signed-off-by: Panagiotis Issaris <takis@lumumba.luc.ac.be>
---
diff --git a/cvs2git.c b/cvs2git.c
--- a/cvs2git.c
+++ b/cvs2git.c
@@ -11,6 +11,7 @@
#include <unistd.h>
static int verbose = 0;
+static int updating = 0;
/*
* This is a really stupid program that takes cvsps output, and
@@ -28,11 +29,17 @@ static int verbose = 0;
* Usage:
*
* TZ=UTC cvsps -A |
- * cvs2git --cvsroot=[root] --module=[module] > script
+ * git-cvs2git --cvsroot=[root] --module=[module] > script
*
* Creates a shell script that will generate the .git archive of
* the names CVS repository.
*
+ * TZ=UTC cvsps -s 1234- -A |
+ * git-cvs2git -u --cvsroot=[root] --module=[module] > script
+ *
+ * Creates a shell script that will update the .git archive with
+ * CVS changes from patchset 1234 until the last one.
+ *
* IMPORTANT NOTE ABOUT "cvsps"! This requires version 2.1 or better,
* and the "TZ=UTC" and the "-A" flag is required for sane results!
*/
@@ -113,7 +120,7 @@ static void prepare_commit(void)
static void commit(void)
{
- const char *cmit_parent = initial_commit ? "" : "-p HEAD";
+ const char *cmit_parent = (initial_commit && !updating) ? "" : "-p HEAD";
const char *dst_branch;
char *space;
int i;
@@ -230,6 +237,10 @@ int main(int argc, char **argv)
verbose = 1;
continue;
}
+ if (!strcmp(arg, "-u")) {
+ updating = 1;
+ continue;
+ }
}
@@ -241,11 +252,13 @@ int main(int argc, char **argv)
exit(1);
}
- printf("[ -d .git ] && exit 1\n");
- printf("git-init-db\n");
- printf("mkdir -p .git/refs/heads\n");
- printf("mkdir -p .git/refs/tags\n");
- printf("ln -sf refs/heads/master .git/HEAD\n");
+ if (!updating) {
+ printf("[ -d .git ] && exit 1\n");
+ printf("git-init-db\n");
+ printf("mkdir -p .git/refs/heads\n");
+ printf("mkdir -p .git/refs/tags\n");
+ printf("ln -sf refs/heads/master .git/HEAD\n");
+ }
while (fgets(line, sizeof(line), stdin) != NULL) {
int linelen = strlen(line);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] support incremental cvs2git-ing
2005-06-10 19:35 [PATCH] support incremental cvs2git-ing Panagiotis Issaris
@ 2005-06-17 16:26 ` Sven Verdoolaege
0 siblings, 0 replies; 2+ messages in thread
From: Sven Verdoolaege @ 2005-06-17 16:26 UTC (permalink / raw)
To: Panagiotis Issaris; +Cc: torvalds, git
On Fri, Jun 10, 2005 at 09:35:19PM +0200, Panagiotis Issaris wrote:
> Hi Linus,
>
> I wanted to be able to track CVS repositories in a GIT repository. The
> cvs2git program worked fine with the initial import but needed a tiny
> modification to enable me to resync the GIT repository with the updated
> CVS tree.
>
The original version of this patch failed to track the correct
branch on the first new commit.
Fixed and tested patch below.
skimo
--
cvs2git.c: support incremental conversion
Add -u option to indicate incremental conversion.
Signed-off-by: Panagiotis Issaris <takis@lumumba.luc.ac.be>
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---
commit 67fcd1648f66d04972c90860b58449f586718653
tree 698e9c37f91c88c797cab7324d69106b898987a3
parent 4fd62062eb2d52d32cb771feb05bf1ee29d760f9
author Panagiotis Issaris <takis@lumumba.luc.ac.be> Fri, 17 Jun 2005 18:30:27 +0200
committer Sven Verdoolaege <skimo@kotnet.org> Fri, 17 Jun 2005 18:30:27 +0200
cvs2git.c | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/cvs2git.c b/cvs2git.c
--- a/cvs2git.c
+++ b/cvs2git.c
@@ -28,11 +28,17 @@ static int verbose = 0;
* Usage:
*
* TZ=UTC cvsps -A |
- * cvs2git --cvsroot=[root] --module=[module] > script
+ * git-cvs2git --cvsroot=[root] --module=[module] > script
*
* Creates a shell script that will generate the .git archive of
* the names CVS repository.
*
+ * TZ=UTC cvsps -s 1234- -A |
+ * git-cvs2git -u --cvsroot=[root] --module=[module] > script
+ *
+ * Creates a shell script that will update the .git archive with
+ * CVS changes from patchset 1234 until the last one.
+ *
* IMPORTANT NOTE ABOUT "cvsps"! This requires version 2.1 or better,
* and the "TZ=UTC" and the "-A" flag is required for sane results!
*/
@@ -230,6 +236,10 @@ int main(int argc, char **argv)
verbose = 1;
continue;
}
+ if (!strcmp(arg, "-u")) {
+ initial_commit = 0;
+ continue;
+ }
}
@@ -241,11 +251,13 @@ int main(int argc, char **argv)
exit(1);
}
- printf("[ -d .git ] && exit 1\n");
- printf("git-init-db\n");
- printf("mkdir -p .git/refs/heads\n");
- printf("mkdir -p .git/refs/tags\n");
- printf("ln -sf refs/heads/master .git/HEAD\n");
+ if (initial_commit) {
+ printf("[ -d .git ] && exit 1\n");
+ printf("git-init-db\n");
+ printf("mkdir -p .git/refs/heads\n");
+ printf("mkdir -p .git/refs/tags\n");
+ printf("ln -sf refs/heads/master .git/HEAD\n");
+ }
while (fgets(line, sizeof(line), stdin) != NULL) {
int linelen = strlen(line);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-06-17 16:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-06-10 19:35 [PATCH] support incremental cvs2git-ing Panagiotis Issaris
2005-06-17 16:26 ` Sven Verdoolaege
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).