diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2007-09-22 15:30:30 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2007-09-22 15:30:30 +0000 |
| commit | acc63f92f03623ac223849c524dc055a5c318d18 (patch) | |
| tree | 2abbaa8ddcab2221a8371d9973dec855e2c89c05 | |
| parent | b09b9dcec7c5b9e8c9843e74967362d18c3a4827 (diff) | |
Support for checkout with a local repository already in place.
OK joris@
| -rw-r--r-- | usr.bin/cvs/checkout.c | 9 | ||||
| -rw-r--r-- | usr.bin/cvs/client.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c index aaa18bc6752..a0b2f567e4e 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.102 2007/09/09 20:24:06 tobias Exp $ */ +/* $OpenBSD: checkout.c,v 1.103 2007/09/22 15:30:29 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -163,7 +163,12 @@ checkout_check_repository(int argc, char **argv) cr.enterdir = NULL; cr.leavedir = NULL; - cr.fileproc = NULL; + if (print_stdout) + cr.fileproc = NULL; + else + cr.fileproc = cvs_client_sendfile; + + flags &= ~CR_REPO; cr.flags = flags; cvs_file_run(argc, argv, &cr); diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c index 0a3e9ce9842..237bd6034f9 100644 --- a/usr.bin/cvs/client.c +++ b/usr.bin/cvs/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.80 2007/09/17 18:36:54 tobias Exp $ */ +/* $OpenBSD: client.c,v 1.81 2007/09/22 15:30:29 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -398,9 +398,7 @@ cvs_client_senddir(const char *dir) cvs_get_repository_path(dir, repo, MAXPATHLEN); - if (cvs_cmdop == CVS_OP_CHECKOUT && strcmp(dir, ".")) - return; - else if (cvs_cmdop != CVS_OP_RLOG) + if (cvs_cmdop != CVS_OP_RLOG) cvs_client_send_request("Directory %s\n%s", dir, repo); (void)xsnprintf(fpath, MAXPATHLEN, "%s/%s", |