annotate lib-src/rcs-checkin @ 788:026c5bf9c134

[xemacs-hg @ 2002-03-21 07:29:57 by ben] chartab.c: Fix bugs in implementation and doc strings. config.h.in: Add foo_checking_assert_at_line() macros. Not clear whether these are actually useful, though; I'll take them out if not. symsinit.h, emacs.c: Some improvements to the timeline. Rearrange a bit the init calls. Add call for reinit_vars_of_object_mswindows() and declare in symsinit.h. event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, events.h: Introduce new event methods for printing, comparing, and hashing magic events, to avoid event-type-specific stuff that had crept into events.c. (And was crashing, since the channel in MS Windows magic events may be nil.) Implement the methods in event-{tty,gtk,Xt,mswindows}.c. Make wrapping functions event_stream_{compare,hash,format}_magic_event() to check if everything's OK and call the actual callback. Fix events.c to use the new methods. Add a new event-stream-operation EVENT_STREAM_NOTHING -- event stream not actually required to be able to do anything, just be open. (#### This event-stream-operation stuff needs to be rethought.) Fixed describe_event() in event-Xt.c to print its output to a stream, not always to stderr, so it can be used elsewhere. (e.g. in print-event when a magic event is encountered?) lisp.h, lrecord.h: Define new assert_at_line(), for use in asserts inside of inline functions. The assert will report the line and file of the inline function, which is almost certainly not what you want as it's useless. what you want to see is where the pseudo-macro was called from. So, when error-checking is on, we pass in the line and file into the macros, for accurate printout using assert_at_line(). Happens only when error-checking is defined so doesn't slow down non-error-checking builds. Fix XCHAR, XINT, XCHAR_OR_INT, XFOO, and wrap_foo() in this fashion. lstream.c, lstream.h: Add resizing_buffer_to_lisp_string(). objects-gtk.c: Fix typo. objects-msw.c: Implement a smarter way of determining whether a font matches a charset. Formerly we just looked at the "script" element of the font spec, converted it to a code page, and compared it with the code page derived from the charset. Now, as well as doing this, we ask the font for the list of unicode ranges it supports, see what range the charset falls into (#### bogus! need to do this char-by-char), and see if any of the font's supported ranges include the charset's range. also do some caching in Vfont_signature_data of previous inquiries. charset.h, text.c, mule-charset.c: New fun; extracted out of Fmake_char() and declare prototype in charset.h. text.h: introduce assert_by_line() to make REP_BYTES_BY_FIRST_BYTE report the file and line more accurately in an assertion failure. unicode.c: make non-static (used in objects-msw.c), declare in charset.h. mule\mule-category.el: Start implementing a category API compatible with FSF. Not there yet. We need improvements to char-tables. mule\mule-charset.el: Copy translation table code from FSF 21.1 and fix up. Eventually we'll have them in XEmacs. (used in ccl) Not here quite yet, and we need some improvements to char-tables. mule\cyril-util.el, mule\cyrillic.el, mule\devan-util.el, mule\ethio-util.el, mule\korea-util.el, mule\mule-tty-init.el, mule\tibet-util.el, mule\viet-util.el, mule\vietnamese.el: Fix numerous compilation warnings. Fix up code related to translation tables and other types of char-tables. menubar-items.el: Move the frame commands from the View menu to the File menu, to be consistent with how most other programs do things. Move less-used revert/recover items to a submenu. Make "recover" not prompt for a file, but recover the current buffer. TODO.ben-mule-21-5: Create bug list for latest problems.
author ben
date Thu, 21 Mar 2002 07:31:30 +0000
parents 3ecd8885ac67
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 #! /bin/sh
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 # This script accepts any number of file arguments and checks them into RCS.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4 #
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5 # Arguments which are detectably either RCS masters (with names ending in ,v)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 # or Emacs version files (with names of the form foo.~<number>~) are ignored.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 # For each file foo, the script looks for Emacs version files related to it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 # These files are checked in as deltas, oldest first, so that the contents of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 # the file itself becomes the latest revision in the master.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 #
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 # The first line of each file is used as its description text. The file itself
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 # is not deleted, as under VC with vc-keep-workfiles at its default of t, but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 # all the version files are.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 #
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 # If an argument file is already version-controlled under RCS, any version
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 # files are added to the list of deltas and deleted, and then the workfile
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 # is checked in again as the latest version. This is probably not quite
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 # what was wanted, and is the main reason VC doesn't simply call this to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 # do checkins.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 #
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 # This script is intended to be used to convert files with an old-Emacs-style
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 # version history for use with VC (the Emacs 19 version-control interface),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 # which likes to use RCS as its back end. It was written by Paul Eggert
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 # and revised/documented for use with VC by Eric S. Raymond, Mar 19 1993.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 case $# in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 echo "rcs-checkin: usage: rcs-checkin file ..."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29 echo "rcs-checkin: function: checks file.~*~ and file into a new RCS file"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 echo "rcs-checkin: function: uses the file's first line for the description"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31 esac
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 # expr pattern to extract owner from ls -l output
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 ls_owner_pattern='[^ ][^ ]* *[^ ][^ ]* *\([^ ][^ ]*\)'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 for file
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 do
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 # Make it easier to say `rcs-checkin *'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 # by ignoring file names that already contain `~', or end in `,v'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 case $file in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41 *~* | *,v) continue
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
42 esac
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43 # Ignore non-files too.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44 test -f "$file" || continue
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46 # Check that file is readable.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 test -r "$file" || exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 # If the RCS file does not already exist,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 # initialize it with a description from $file's first line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 rlog -R "$file" >/dev/null 2>&1 ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 rcs -i -q -t-"`sed 1q $file`" "$file" || exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 # Get list of old files.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 oldfiles=`
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 ls $file.~[0-9]*~ 2>/dev/null |
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 sort -t~ -n +1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58 `
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 # Check that they are properly sorted by date.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 case $oldfiles in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62 ?*)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 oldfiles_by_date=`ls -rt $file $oldfiles`
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 test " $oldfiles
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65 $file" = " $oldfiles_by_date" || {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 echo >&2 "rcs-checkin: skipping $file, because its mod times are out of order.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 Sorted by mod time:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 $oldfiles_by_date
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 Sorted by name:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 $oldfiles
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73 $file"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 continue
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 esac
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 echo >&2 rcs-checkin: checking in: $oldfiles $file
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
80 # Save $file as $file.~-~ temporarily.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 mv "$file" "$file.~-~" || exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
82
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
83 # Rename each old file to $file, and check it in.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
84 for oldfile in $oldfiles
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
85 do
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
86 mv "$oldfile" "$file" || exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
87 ls_l=`ls -l "$file"` || exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
88 owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner=
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89 echo "Formerly ${oldfile}" | ci -d -l -q $owner "$file" || exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 done
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 # Bring $file back from $file.~-~, and check it in.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93 mv "$file.~-~" "$file" || exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 ls_l=`ls -l "$file"` || exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner=
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
96 ci -d -q -u $owner -m"entered into RCS" "$file" || exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97 done
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98