From: Aleksandr Mezin <mezin.alexander@gmail.com>
To: zsh-workers@zsh.org
Cc: Aleksandr Mezin <mezin.alexander@gmail.com>
Subject: [PATCH 2/3] vcs_info/cvs: set vcs_comm[basedir] in VCS_INFO_detect_cvs
Date: Sun, 24 Nov 2019 04:14:42 +0600 [thread overview]
Message-ID: <20191123221443.279556-3-mezin.alexander@gmail.com> (raw)
In-Reply-To: <20191123221443.279556-1-mezin.alexander@gmail.com>
---
Functions/VCS_Info/Backends/VCS_INFO_detect_cvs | 11 +++++++++--
Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs | 6 +-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_cvs b/Functions/VCS_Info/Backends/VCS_INFO_detect_cvs
index 7a5ee1eef..73b79f744 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_cvs
+++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_cvs
@@ -7,5 +7,12 @@ setopt localoptions NO_shwordsplit
[[ $1 == '--flavours' ]] && return 1
VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
-[[ -d "./CVS" ]] && [[ -r "./CVS/Repository" ]] && return 0
-return 1
+[[ -d "./CVS" ]] && [[ -r "./CVS/Repository" ]] || return 1
+
+local cvsbase="."
+while [[ -d "${cvsbase}/../CVS" ]]; do
+ cvsbase="${cvsbase}/.."
+done
+vcs_comm[basedir]=${cvsbase:P}
+
+return 0
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs b/Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs
index e9d172052..1ca0e9c16 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs
@@ -5,11 +5,7 @@
setopt localoptions NO_shwordsplit
local cvsbranch cvsbase
-cvsbase="."
-while [[ -d "${cvsbase}/../CVS" ]]; do
- cvsbase="${cvsbase}/.."
-done
-cvsbase=${cvsbase:P}
+cvsbase=${vcs_comm[basedir]}
cvsbranch=$(< ./CVS/Repository)
rrn=${cvsbase:t}
cvsbranch=${cvsbranch##${rrn}/}
--
2.24.0
next prev parent reply other threads:[~2019-11-24 22:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-23 22:14 [PATCH 0/3] vcs_info: handle nested repositories of different types Aleksandr Mezin
2019-11-23 22:14 ` [PATCH 1/3] vcs_info/git: set vcs_comm[basedir] in VCS_INFO_detect_git Aleksandr Mezin
2019-11-23 22:14 ` Aleksandr Mezin [this message]
2019-11-25 4:35 ` [PATCH 2/3] vcs_info/cvs: set vcs_comm[basedir] in VCS_INFO_detect_cvs Daniel Shahaf
2019-11-25 7:31 ` Aleksandr Mezin
2019-11-25 8:16 ` Daniel Shahaf
2019-11-26 1:26 ` Aleksandr Mezin
2019-11-26 1:28 ` Aleksandr Mezin
2019-11-26 4:52 ` Daniel Shahaf
2019-11-26 10:22 ` Aleksandr Mezin
2019-11-28 11:13 ` Daniel Shahaf
2019-11-28 21:34 ` Daniel Shahaf
2019-11-29 13:41 ` Aleksandr Mezin
2019-11-29 15:25 ` Mikael Magnusson
2019-11-29 19:55 ` Daniel Shahaf
2019-11-29 20:30 ` Daniel Shahaf
2019-11-29 20:52 ` Daniel Shahaf
2019-11-25 9:13 ` Bart Schaefer
2019-11-25 18:22 ` Daniel Shahaf
2019-11-25 18:47 ` Bart Schaefer
2019-11-23 22:14 ` [PATCH 3/3] vcs_info: choose the nearest repository Aleksandr Mezin
2019-11-25 4:33 ` Daniel Shahaf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191123221443.279556-3-mezin.alexander@gmail.com \
--to=mezin.alexander@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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).