* bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.
@ 2010-10-29 15:21 Paul Bristow
2010-10-29 16:51 ` Glenn Morris
2010-10-29 17:09 ` Stefan Monnier
0 siblings, 2 replies; 9+ messages in thread
From: Paul Bristow @ 2010-10-29 15:21 UTC (permalink / raw)
To: 7302
[-- Attachment #1: Type: text/plain, Size: 1734 bytes --]
GNU Emacs 23.2.1 (x86_64-pc-linux-gnu, GTK+ Version 2.20.1) of 2010-08-15 on barber, modified by Debian
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.
Although I do not make much use of "M-x vc-diff" and could just use something different instead it does cause some problems as I have my "EDITOR" set to emacs in the environment and therefore when I fix merge conflicts in bitkeeper the file is passed to emacs. The call to emacs always fails like so:
/usr/lib/emacs/23.2/x86_64-linux-gnu/vcdiff: 113: sccs: not found
I have found that reverting to the old behaviour with the patch that I have included below solves the problem. Perhaps the change might be reverted or parameterised in future releases?
Regards,
Paul Bristow.
pbristow@rubin:/usr/lib/emacs/23.2/x86_64-linux-gnu$ diff -u vcdiff~ vcdiff
--- vcdiff~ 2010-08-15 06:59:41.000000000 +0100
+++ vcdiff 2010-10-29 16:00:08.000000000 +0100
@@ -87,7 +87,8 @@
s.* | */s.*)
if
rev1=`mktemp /tmp/geta.XXXXXXXX`
- sccs get -s -p -k $sid1 "$f" > $rev1 &&
+ #sccs get -s -p -k $sid1 "$f" > $rev1 &&
+ get -s -p -k $sid1 "$f" > $rev1 &&
case $sid2 in
'')
workfile=`expr " /$f" : '.*/s.\(.*\)'`
[-- Attachment #2: Type: text/html, Size: 8959 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.
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
1 sibling, 0 replies; 9+ messages in thread
From: Glenn Morris @ 2010-10-29 16:51 UTC (permalink / raw)
To: Paul Bristow; +Cc: 7302
Motivation for the original change:
http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01376.html
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.
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
2010-11-01 8:44 ` bug#7302: cliff " Paul Bristow
1 sibling, 1 reply; 9+ messages in thread
From: Stefan Monnier @ 2010-10-29 17:09 UTC (permalink / raw)
To: Paul Bristow; +Cc: 7302
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread* bug#7302: cliff using "sccs get" rather than "get" breaks bitkeeper usage.
2010-10-29 17:09 ` Stefan Monnier
@ 2010-11-01 8:44 ` Paul Bristow
2011-03-15 6:26 ` bug#7302: vcdiff " Glenn Morris
0 siblings, 1 reply; 9+ messages in thread
From: Paul Bristow @ 2010-11-01 8:44 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 7302@debbugs.gnu.org
Thanks for the quick response. I have tried that patch and can confirm that it works for me.
Regards,
Paul.
-----Original Message-----
From: Stefan Monnier [mailto:monnier@iro.umontreal.ca]
Sent: 29 October 2010 18:09
To: Paul Bristow
Cc: 7302@debbugs.gnu.org
Subject: Re: bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread* bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.
2010-11-01 8:44 ` bug#7302: cliff " Paul Bristow
@ 2011-03-15 6:26 ` Glenn Morris
2011-03-15 13:19 ` Stefan Monnier
2011-03-15 15:23 ` Oscar Bonilla
0 siblings, 2 replies; 9+ messages in thread
From: Glenn Morris @ 2011-03-15 6:26 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 7302
Paul Bristow wrote:
> I have tried that patch and can confirm that it works for me.
[...]
> -----Original Message-----
> From: Stefan Monnier [mailto:monnier@iro.umontreal.ca]
[...]
> Can you confirm that the patch below works for you?
I don't think this was ever installed; would you like to install it and
close this report?
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.
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
1 sibling, 1 reply; 9+ messages in thread
From: Stefan Monnier @ 2011-03-15 13:19 UTC (permalink / raw)
To: Glenn Morris; +Cc: 7302
>> I have tried that patch and can confirm that it works for me.
> [...]
>> -----Original Message-----
>> From: Stefan Monnier [mailto:monnier@iro.umontreal.ca]
> [...]
>> Can you confirm that the patch below works for you?
> I don't think this was ever installed; would you like to install it and
> close this report?
Actually, I don't really like the fix I suggested, and I have the
impression that it only covers a small part of the underlying problem.
Stefan
^ permalink raw reply [flat|nested] 9+ messages in thread* bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.
2011-03-15 6:26 ` bug#7302: vcdiff " Glenn Morris
2011-03-15 13:19 ` Stefan Monnier
@ 2011-03-15 15:23 ` Oscar Bonilla
2016-02-26 6:29 ` Lars Ingebrigtsen
1 sibling, 1 reply; 9+ messages in thread
From: Oscar Bonilla @ 2011-03-15 15:23 UTC (permalink / raw)
To: bug-gnu-emacs
Glenn Morris <rgm <at> gnu.org> writes:
>
> Paul Bristow wrote:
>
> > I have tried that patch and can confirm that it works for me.
> [...]
> > -----Original Message-----
> > From: Stefan Monnier [mailto:monnier <at> iro.umontreal.ca]
> [...]
> > Can you confirm that the patch below works for you?
>
> I don't think this was ever installed; would you like to install it and
> close this report?
>
>
I have absolutely no context for this question, and stumbled on it
almost by accident. But having said that, did you know newer versions
of bitkeeper ship with an emacs mode in `bk bin`/contrib/vc-bk.el ?
Cheers,
-Oscar
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#7302: vcdiff using "sccs get" rather than "get" breaks bitkeeper usage.
2011-03-15 15:23 ` Oscar Bonilla
@ 2016-02-26 6:29 ` Lars Ingebrigtsen
0 siblings, 0 replies; 9+ messages in thread
From: Lars Ingebrigtsen @ 2016-02-26 6:29 UTC (permalink / raw)
To: Oscar Bonilla; +Cc: 7302
Oscar Bonilla <ob@bitmover.com> writes:
> Glenn Morris <rgm <at> gnu.org> writes:
>
>>
>> Paul Bristow wrote:
>>
>> > I have tried that patch and can confirm that it works for me.
>> [...]
>> > -----Original Message-----
>> > From: Stefan Monnier [mailto:monnier <at> iro.umontreal.ca]
>> [...]
>> > Can you confirm that the patch below works for you?
>>
>> I don't think this was ever installed; would you like to install it and
>> close this report?
>>
>>
>
> I have absolutely no context for this question, and stumbled on it
> almost by accident. But having said that, did you know newer versions
> of bitkeeper ship with an emacs mode in `bk bin`/contrib/vc-bk.el ?
If I understand correctly, this issue is now outdated, and I'm closing
this bug report. Please reopen if this is still an issue.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-02-26 6:29 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
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).