diff options
| author | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-07-30 20:55:36 +0000 |
|---|---|---|
| committer | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-07-30 20:55:36 +0000 |
| commit | 61d10c518e93482249f8b02e25453ef9e49992f4 (patch) | |
| tree | 33e51e28b3c8da02beb0d0eace99b9da22a77990 | |
| parent | b7a4d2a9341327d00b750b490cf05a3321e06eee (diff) | |
fix diffing by sending the base directory just before sending the 'diff'
command, and remove some debugging messages
| -rw-r--r-- | usr.bin/cvs/diff.c | 8 | ||||
| -rw-r--r-- | usr.bin/cvs/update.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index a68c2d222be..14e7c879329 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.4 2004/07/30 01:49:23 jfb Exp $ */ +/* $OpenBSD: diff.c,v 1.5 2004/07/30 20:55:35 jfb Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -421,8 +421,10 @@ cvs_diff(int argc, char **argv) cvs_file_examine(files, cvs_diff_file, &darg); root = files->cf_ddat->cd_root; - if (root->cr_method != CVS_METHOD_LOCAL) + if (root->cr_method != CVS_METHOD_LOCAL) { + cvs_senddir(root, files); cvs_sendreq(root, CVS_REQ_DIFF, NULL); + } return (0); } @@ -482,8 +484,6 @@ cvs_diff_file(struct cvs_file *cfp, void *arg) dap = (struct diff_arg *)arg; - cvs_log(LP_DEBUG, "%s: diffing %s", __func__, cfp->cf_path); - if (cfp->cf_type == DT_DIR) { root = cfp->cf_ddat->cd_root; if ((cfp->cf_parent == NULL) || diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index c748218eed0..5952263d4a5 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.4 2004/07/30 01:49:24 jfb Exp $ */ +/* $OpenBSD: update.c,v 1.5 2004/07/30 20:55:35 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -127,8 +127,6 @@ cvs_update_file(CVSFILE *cf, void *arg) struct cvsroot *root; struct cvs_ent *entp; - cvs_log(LP_DEBUG, "%s: updating %s", __func__, cf->cf_path); - if (cf->cf_type == DT_DIR) { root = cf->cf_ddat->cd_root; if ((cf->cf_parent == NULL) || |