diff options
| author |   joris <joris@openbsd.org> | 2017-06-01 08:08:24 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2017-06-01 08:08:24 +0000 |
| commit | 4dcde51379711c241d4d9b93f9d4e9eae2d51f3d (patch) | |
| tree | 22632a1596b31f59c0f619e787bb1833396c8538 /usr.bin/cvs/annotate.c | |
| parent | update currency exchange rates; (diff) | |
| download | wireguard-openbsd-4dcde51379711c241d4d9b93f9d4e9eae2d51f3d.tar.xz wireguard-openbsd-4dcde51379711c241d4d9b93f9d4e9eae2d51f3d.zip | |
Stop looking at current_cvsroot->cr_method to figure out if we're remote or not.
Instead use cvsroot_is_local() and cvsroot_is_remote().
Diffstat (limited to 'usr.bin/cvs/annotate.c')
| -rw-r--r-- | usr.bin/cvs/annotate.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c index 4c84cfc1d02..b177f9d25a6 100644 --- a/usr.bin/cvs/annotate.c +++ b/usr.bin/cvs/annotate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: annotate.c,v 1.68 2017/05/31 16:14:37 joris Exp $ */ +/* $OpenBSD: annotate.c,v 1.69 2017/06/01 08:08:24 joris Exp $ */ /* * Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -104,7 +104,7 @@ cvs_annotate(int argc, char **argv) cr.enterdir = NULL; cr.leavedir = NULL; - if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) { + if (cvsroot_is_remote()) { cvs_client_connect_to_server(); cr.fileproc = cvs_client_sendfile; @@ -130,15 +130,14 @@ cvs_annotate(int argc, char **argv) cr.flags = flags; - if (cvs_cmdop == CVS_OP_ANNOTATE || - current_cvsroot->cr_method == CVS_METHOD_LOCAL) { + if (cvs_cmdop == CVS_OP_ANNOTATE || cvsroot_is_local()) { if (argc > 0) cvs_file_run(argc, argv, &cr); else cvs_file_run(1, &arg, &cr); } - if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) { + if (cvsroot_is_remote()) { cvs_client_send_files(argv, argc); cvs_client_senddir("."); |