From 418cd7265a941032b467215839b3726b3ba37b0b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 3 Jun 2012 16:49:12 -0700 Subject: [PATCH] Remove lib-src/rcs-checkin This script isn't used by Emacs, and I can't imagine anyone else is using it any more either... From the commentary: "This script is intended to be used to convert files with an old-Emacs-style version history for use with VC (the Emacs 19 version-control interface), which likes to use RCS as its back end." * lib-src/rcs-checkin: Remove file. * lib-src/Makefile.in (INSTALLABLE_SCRIPTS, STAMP_INST_SCRIPTS): Remove rcs-checkin. (stamp-rcs-checkin): Remove. * INSTALL, make-dist: Remove rcs-checkin. * admin/quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove rcs-checkin. * doc/man/rcs-checkin.1: Remove. --- ChangeLog | 4 ++ INSTALL | 13 ++--- admin/ChangeLog | 4 ++ admin/quick-install-emacs | 4 +- doc/man/ChangeLog | 8 ++- doc/man/rcs-checkin.1 | 87 ---------------------------- lib-src/ChangeLog | 7 +++ lib-src/Makefile.in | 8 +-- lib-src/rcs-checkin | 116 -------------------------------------- make-dist | 2 +- 10 files changed, 31 insertions(+), 222 deletions(-) delete mode 100644 doc/man/rcs-checkin.1 delete mode 100755 lib-src/rcs-checkin diff --git a/ChangeLog b/ChangeLog index 4aeffbcc4e9..3a4c7fee5f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-06-03 Glenn Morris + + * INSTALL, make-dist: Remove rcs-checkin. + 2012-06-03 Ulrich Müller * configure.in (PAXCTL): Check for paxctl. (Bug#11398) diff --git a/INSTALL b/INSTALL index 1df686ae636..f0b22260a50 100644 --- a/INSTALL +++ b/INSTALL @@ -474,8 +474,8 @@ installed locations, with `make install'. By default, Emacs's files are installed in the following directories: `/usr/local/bin' holds the executable programs users normally run - - `emacs', `etags', `ctags', `emacsclient', - `grep-changelog', and `rcs-checkin'. + `emacs', `etags', `ctags', `emacsclient', and + `grep-changelog'. `/usr/local/share/emacs/VERSION/lisp' holds the Emacs Lisp library; `VERSION' stands for the number of the Emacs version @@ -721,8 +721,8 @@ in `./lib-src' to their final destinations, as selected in `./src/epaths.h'. Strictly speaking, not all of the executables in `./lib-src' need be copied. - The programs `hexl', `movemail', `profile', `rcs2log', and `vcdiff' are used by Emacs; they do need to be copied. -- The programs `etags', `ctags', `emacsclient', and `rcs-checkin' - are intended to be run by users; they are handled below. +- The programs `etags', `ctags', and `emacsclient' are intended to be + run by users; they are handled below. - The programs `make-docfile' and `test-distrib' were used in building Emacs, and are not needed any more. @@ -741,9 +741,8 @@ of installing different versions. You can delete `./src/temacs'. -4) Copy the programs `emacsclient', `ctags', `etags', and `rcs-checkin' -from `./lib-src' to `/usr/local/bin'. These programs are intended for -users to run. +4) Copy the programs `emacsclient', `ctags', and `etags' from `./lib-src' +to `/usr/local/bin'. These programs are intended for users to run. 5) Copy the man pages in `./doc/man' into the appropriate man directory. diff --git a/admin/ChangeLog b/admin/ChangeLog index 3ed52c68154..e425c99b8d0 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2012-06-03 Glenn Morris + + * quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove rcs-checkin. + 2012-06-01 Paul Eggert Remove --disable-maintainer-mode option from 'configure'. (Bug#11555) diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 06cd2d40901..7004e8f1b27 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -1,7 +1,7 @@ #!/bin/sh ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly -## Copyright (C) 2001-2012 Free Software Foundation, Inc. +## Copyright (C) 2001-2012 Free Software Foundation, Inc. ## Author: Miles Bader @@ -28,7 +28,7 @@ PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse' -PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin' +PUBLIC_LIBSRC_SCRIPTS='grep-changelog' AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib" diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index cf7e1a50c9f..cc54cd254b5 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2012-06-03 Glenn Morris + + * rcs-checkin.1: Remove. + 2012-04-07 Glenn Morris * emacs.1: Bump version to 24.1.50. @@ -134,11 +138,9 @@ ;; Local Variables: ;; coding: utf-8 -;; fill-column: 79 -;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2007-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/man/rcs-checkin.1 b/doc/man/rcs-checkin.1 deleted file mode 100644 index a17c28a4d58..00000000000 --- a/doc/man/rcs-checkin.1 +++ /dev/null @@ -1,87 +0,0 @@ -.\" See section COPYING for copyright and redistribution information. -.TH rcs-checkin 1 -.SH NAME -rcs-checkin \- check files into RCS -.SH SYNOPSIS -.B rcs-checkin -.RI [ FILE .\|.\|.] -.SH DESCRIPTION -.B rcs-checkin -is a helper script for checking files into RCS. This program is -distributed with -.BR "GNU Emacs" . - -This program converts files with an old -.BR Emacs -style -version history for use with the -.B "Emacs 19" -version control interface -.BR VC , -which likes to use RCS as its back end. - -For each file to be processed, the script looks for -.B Emacs -version files related to it. These files are checked in as deltas, -oldest first, so that the contents of the file itself becomes the -latest revision in the master. - -The first line of each file is used as its description. The file -itself is not deleted, as under -.B VC -with -.B vc-keep-workfiles -at its default of -.BR t , -but all the version files are. - -If an argument file is already version-controlled under RCS, any -version files are added to the list of deltas and deleted, and then -the workfile is checked in again as the latest version. This is -probably not quite what was wanted, and is the main reason VC doesn't -simply call this to do checkins. - -In order to make it easier to use -.BR "rcs-checkin *" , -files which are detectably either RCS masters (with names ending in -.BR ,v ) -or Emacs version files (with names containing -.BR ~ ) -are ignored. -. -.PP -.SH OPTIONS -The program accepts no options. -. -.SH SEE ALSO -The Emacs version control interface is documented in the GNU Emacs manual, -which you can read using -.BR Info , -either from Emacs or as a standalone program. -. -.SH AUTHORS -.I rcs-checkin -was originally written by Paul Eggert. It was revised for use with -.B "GNU Emacs" -.B VC -by Eric S. Raymond. -. -.SH COPYING -Copyright -.if t \(co -.if n (C) -2008-2012 Free Software Foundation, Inc. -.PP -Permission is granted to make and distribute verbatim copies of this -document provided the copyright notice and this permission notice are -preserved on all copies. -.PP -Permission is granted to copy and distribute modified versions of -this document under the conditions for verbatim copying, provided that -the entire resulting derived work is distributed under the terms of -a permission notice identical to this one. -.PP -Permission is granted to copy and distribute translations of this -document into another language, under the above conditions for -modified versions, except that this permission notice may be stated -in a translation approved by the Free Software Foundation. -. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index ff631d09fcd..5a5a04a770e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,10 @@ +2012-06-03 Glenn Morris + + * rcs-checkin: Remove file. + * Makefile.in (INSTALLABLE_SCRIPTS, STAMP_INST_SCRIPTS): + Remove rcs-checkin. + (stamp-rcs-checkin): Remove. + 2012-05-31 Eli Zaretskii * makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS) diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index f1ad84f4d44..f3fd640576b 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -117,8 +117,8 @@ MKDIR_P = @MKDIR_P@ INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \ ebrowse${EXEEXT} -INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog -STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog +INSTALLABLE_SCRIPTS = grep-changelog +STAMP_INST_SCRIPTS = stamp-grep-changelog # Things that Emacs runs internally, or during the build process, # which should not be installed in bindir. @@ -195,10 +195,6 @@ stamp-rcs2log: $(srcdir)/rcs2log $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log touch $@ -stamp-rcs-checkin: $(srcdir)/rcs-checkin - $(insrcdir) || cp -p $(srcdir)/rcs-checkin rcs-checkin - touch $@ - stamp-grep-changelog: $(srcdir)/grep-changelog $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog touch $@ diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin deleted file mode 100755 index 57e91becf9d..00000000000 --- a/lib-src/rcs-checkin +++ /dev/null @@ -1,116 +0,0 @@ -#! /bin/sh - -# This script accepts any number of file arguments and checks them into RCS. - -# Copyright (C) 1993-1995, 2001-2012 Free Software Foundation, Inc. - -# This file is part of GNU Emacs. - -# GNU Emacs is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# GNU Emacs is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with GNU Emacs. If not, see . - - -# Arguments which are detectably either RCS masters (with names ending in ,v) -# or Emacs version files (with names of the form foo.~~) are ignored. -# For each file foo, the script looks for Emacs version files related to it. -# These files are checked in as deltas, oldest first, so that the contents of -# the file itself becomes the latest revision in the master. -# -# The first line of each file is used as its description text. The file itself -# is not deleted, as under VC with vc-keep-workfiles at its default of t, but -# all the version files are. -# -# If an argument file is already version-controlled under RCS, any version -# files are added to the list of deltas and deleted, and then the workfile -# is checked in again as the latest version. This is probably not quite -# what was wanted, and is the main reason VC doesn't simply call this to -# do checkins. -# -# This script is intended to be used to convert files with an old-Emacs-style -# version history for use with VC (the Emacs 19 version-control interface), -# which likes to use RCS as its back end. It was written by Paul Eggert -# and revised/documented for use with VC by Eric S. Raymond, Mar 19 1993. - -case $# in -0) - echo "rcs-checkin: usage: rcs-checkin file ..." - echo "rcs-checkin: function: checks file.~*~ and file into a new RCS file" - echo "rcs-checkin: function: uses the file's first line for the description" -esac - -# expr pattern to extract owner from ls -l output -ls_owner_pattern='[^ ][^ ]* *[^ ][^ ]* *\([^ ][^ ]*\)' - -for file -do - # Make it easier to say `rcs-checkin *' - # by ignoring file names that already contain `~', or end in `,v'. - case $file in - *~* | *,v) continue - esac - # Ignore non-files too. - test -f "$file" || continue - - # Check that file is readable. - test -r "$file" || exit - - # If the RCS file does not already exist, - # initialize it with a description from $file's first line. - rlog -R "$file" >/dev/null 2>&1 || - rcs -i -q -t-"`sed 1q $file`" "$file" || exit - - # Get list of old files. - oldfiles=` - ls $file.~[0-9]*~ 2>/dev/null | - sort -t~ -n -k 2 - ` - - # Check that they are properly sorted by date. - case $oldfiles in - ?*) - oldfiles_by_date=`ls -rt $file $oldfiles` - test " $oldfiles -$file" = " $oldfiles_by_date" || { - echo >&2 "rcs-checkin: skipping $file, because its mod times are out of order. - -Sorted by mod time: -$oldfiles_by_date - -Sorted by name: -$oldfiles -$file" - continue - } - esac - - echo >&2 rcs-checkin: checking in: $oldfiles $file - - # Save $file as $file.~-~ temporarily. - mv "$file" "$file.~-~" || exit - - # Rename each old file to $file, and check it in. - for oldfile in $oldfiles - do - mv "$oldfile" "$file" || exit - ls_l=`ls -l "$file"` || exit - owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner= - echo "Formerly ${oldfile}" | ci -d -l -q $owner "$file" || exit - done - - # Bring $file back from $file.~-~, and check it in. - mv "$file.~-~" "$file" || exit - ls_l=`ls -l "$file"` || exit - owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner= - ci -d -q -u $owner -m"entered into RCS" "$file" || exit -done - diff --git a/make-dist b/make-dist index ead1fa544ec..fd2c0743cdf 100755 --- a/make-dist +++ b/make-dist @@ -387,7 +387,7 @@ echo "Making links to \`lib-src'" (cd lib-src ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src - ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src + ln grep-changelog rcs2log ../${tempdir}/lib-src ln makefile.w32-in ../${tempdir}/lib-src) echo "Making links to \`m4'"