;;; vc-rcs.el --- support for RCS version-control
-;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
(vc-file-setprop file 'vc-checkout-model 'locking))))
state)
(if (not (vc-mistrust-permissions file))
- (let* ((attributes (file-attributes file))
- (owner-uid (nth 2 attributes))
+ (let* ((attributes (file-attributes file 'string))
+ (owner-name (nth 2 attributes))
(permissions (nth 8 attributes)))
(cond ((string-match ".r-..-..-." permissions)
(vc-file-setprop file 'vc-checkout-model 'locking)
(if (eq (vc-checkout-model file) 'locking)
(if (file-ownership-preserved-p file)
'edited
- (vc-user-login-name owner-uid))
+ owner-name)
(if (vc-rcs-workfile-is-newer file)
'edited
'up-to-date)))
(defun vc-rcs-annotate-command (file buffer &optional revision)
"Annotate FILE, inserting the results in BUFFER.
Optional arg REVISION is a revision to annotate from."
+ (vc-setup-buffer buffer)
;; Aside from the "head revision on the trunk", the instructions for
;; each revision on the trunk are an ordered list of kill and insert
;; commands necessary to go from the chronologically-following
'needs-patch))
;; locked by the calling user
((and (stringp locking-user)
- (string= locking-user (vc-user-login-name)))
+ (string= locking-user (vc-user-login-name file)))
(if (or (eq (vc-checkout-model file) 'locking)
workfile-is-latest
(vc-rcs-latest-on-branch-p file workfile-version))
(vc-file-setprop file 'vc-state
(cond
((eq locking-user 'none) 'up-to-date)
- ((string= locking-user (vc-user-login-name)) 'edited)
+ ((string= locking-user (vc-user-login-name file))
+ 'edited)
(t locking-user)))
;; If the file has headers, we don't want to query the
;; master file, because that would eliminate all the