From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Paul Bristow <pbristow@bluearc.com>
Cc: 7302@debbugs.gnu.org
Subject: bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.
Date: Fri, 29 Oct 2010 13:09:24 -0400 [thread overview]
Message-ID: <jwvzktx0w95.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <ABFC24E4C13D81489F7F624E14891C860992D6D837@uk-ex-mbx1.terastack.bluearc.com> (Paul Bristow's message of "Fri, 29 Oct 2010 16:21:49 +0100")
> I previously used Emacs 21.4 and its version of the vcdiff script is
> compatible with bk as it just calls "get" and bitkeeper supplies a get
> command. In 23.2.1 the command is "sccs get" but there is no sccs
> with bitkeeper.
[...]
> I have found that reverting to the old behaviour with the patch that
> I have included below solves the problem.
But using just `get' won't work with CSSC, for example.
> Perhaps the change might be reverted or parameterised in
> future releases?
We could first try `sccs get' and if that fails fallback on `get'.
Can you confirm that the patch below works for you?
Stefan
=== modified file 'lib-src/vcdiff'
--- lib-src/vcdiff 2010-01-13 08:35:10 +0000
+++ lib-src/vcdiff 2010-10-29 17:08:47 +0000
@@ -79,6 +79,12 @@
trap 'status=2; exit' 1 2 13 15
trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
+if ! type sccs >/dev/null 2>&1 && type get >/dev/null 2>&1 ; then
+ sccsget="get"
+else
+ sccsget="sccs get"
+fi
+
for f
do
s=2
@@ -87,14 +93,14 @@
s.* | */s.*)
if
rev1=`mktemp /tmp/geta.XXXXXXXX`
- sccs get -s -p -k $sid1 "$f" > $rev1 &&
+ $sccsget -s -p -k $sid1 "$f" > $rev1 &&
case $sid2 in
'')
workfile=`expr " /$f" : '.*/s.\(.*\)'`
;;
*)
rev2=`mktemp /tmp/getb.XXXXXXXX`
- sccs get -s -p -k $sid2 "$f" > $rev2
+ $sccsget -s -p -k $sid2 "$f" > $rev2
workfile=$rev2
esac
then
next prev parent reply other threads:[~2010-10-29 17:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-29 15:21 bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage Paul Bristow
2010-10-29 16:51 ` Glenn Morris
2010-10-29 17:09 ` Stefan Monnier [this message]
2010-11-01 8:44 ` bug#7302: cliff " Paul Bristow
2011-03-15 6:26 ` bug#7302: vcdiff " Glenn Morris
2011-03-15 13:19 ` Stefan Monnier
2012-06-06 0:33 ` Glenn Morris
2011-03-15 15:23 ` Oscar Bonilla
2016-02-26 6:29 ` Lars Ingebrigtsen
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvzktx0w95.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=7302@debbugs.gnu.org \
--cc=pbristow@bluearc.com \
/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.savannah.gnu.org/cgit/emacs.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).