emacs: lisp/vc-bzr.el comparison

comparison lisp/vc-bzr.el @ 91048:d38543a1c0f9

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 880-885) - Remove RCS keywords from doc/misc/cc-mode.texi - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-264

author	Miles Bader <miles@gnu.org>
date	Sat, 13 Oct 2007 05:53:03 +0000
parents	14c4a6aac623 b16f7408cd3f
children	4b09bb044f38

comparison

equal deleted inserted replaced

-:1cf8ecbaa1dc
+:d38543a1c0f9
 (unchanged . up-to-date)))))))
 (defun vc-bzr-workfile-unchanged-p (file)
 (eq 'unchanged (car (vc-bzr-status file))))
-(defun vc-bzr-workfile-version (file)
+(defun vc-bzr-working-revision (file)
 (lexical-let*
 ((rootdir (vc-bzr-root file))
 (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file
 rootdir))
 (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir))
 (defun vc-bzr-register (files &optional rev comment)
 "Register FILE under bzr.
 Signal an error unless REV is nil.
 COMMENT is ignored."
-(if rev (error "Can't register explicit version with bzr"))
+(if rev (error "Can't register explicit revision with bzr"))
 (vc-bzr-command "add" nil 0 files))
 ;; Could run `bzr status' in the directory and see if it succeeds, but
 ;; that's relatively expensive.
 (defalias 'vc-bzr-responsible-p 'vc-bzr-root
 (vc-bzr-command "remove" nil 0 file))
 (defun vc-bzr-checkin (files rev comment)
 "Check FILE in to bzr with log message COMMENT.
 REV non-nil gets an error."
-(if rev (error "Can't check in a specific version with bzr"))
+(if rev (error "Can't check in a specific revision with bzr"))
 (vc-bzr-command "commit" nil 0 files "-m" comment))
 (defun vc-bzr-checkout (file &optional editable rev destfile)
 "Checkout revision REV of FILE from bzr to DESTFILE.
 EDITABLE is ignored."
 ;; FIXME: Until Emacs-23, VC was missing a hook to sort out the mode for
 ;; the buffer, or at least set the regexps right.
 (unless (fboundp 'vc-default-log-view-mode)
 (add-hook 'log-view-mode-hook 'vc-bzr-log-view-mode)))
-(defun vc-bzr-show-log-entry (version)
+(defun vc-bzr-show-log-entry (revision)
-"Find entry for patch name VERSION in bzr change log buffer."
+"Find entry for patch name REVISION in bzr change log buffer."
 (goto-char (point-min))
 (let (case-fold-search)
-(if (re-search-forward (concat "^-+\nrevno: " version "$") nil t)
+(if (re-search-forward (concat "^-+\nrevno: " revision "$") nil t)
 (beginning-of-line 0)
 (goto-char (point-min)))))
 (autoload 'vc-diff-switches-list "vc" nil nil t)
 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
 "VC bzr backend for diff."
-(let ((working (vc-workfile-version (if (consp files) (car files) files))))
+(let ((working (vc-working-revision (if (consp files) (car files) files))))
 (if (and (equal rev1 working) (not rev2))
 (setq rev1 nil))
 (if (and (not rev1) rev2)
 (setq rev1 working))
 ;; bzr diff produces condition code 1 for some reason.
 (list "-r" rev1))))))
 (defalias 'vc-bzr-diff-tree 'vc-bzr-diff)
-;; FIXME: vc-{next,previous}-version need fixing in vc.el to deal with
+;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with
-;; straight integer versions.
+;; straight integer revisions.
 (defun vc-bzr-delete-file (file)
 "Delete FILE and delete it in the bzr repository."
 (condition-case ()
 (delete-file file)
 (defvar vc-bzr-annotation-table nil
 "Internal use.")
 (make-variable-buffer-local 'vc-bzr-annotation-table)
-(defun vc-bzr-annotate-command (file buffer &optional version)
+(defun vc-bzr-annotate-command (file buffer &optional revision)
 "Prepare BUFFER for `vc-annotate' on FILE.
 Each line is tagged with the revision number, which has a `help-echo'
 property containing author and date information."
 (apply #'vc-bzr-command "annotate" buffer 0 file "--long" "--all"
-(if version (list "-r" version)))
+(if revision (list "-r" revision)))
 (with-current-buffer buffer
 ;; Store the tags for the annotated source lines in a hash table
 ;; to allow saving space by sharing the text properties.
 (setq vc-bzr-annotation-table (make-hash-table :test 'equal))
 (goto-char (point-min))
 (match-end 0) (line-end-position))
 bzr-root-directory)))
 (vc-file-setprop file 'vc-state current-vc-state)
 (vc-file-setprop file 'vc-bzr-state current-bzr-state)
 (when (eq 'added current-bzr-state)
-(vc-file-setprop file 'vc-workfile-version "0"))))
+(vc-file-setprop file 'vc-working-revision "0"))))
 (when (eq 'not-versioned current-bzr-state)
 (let ((file (expand-file-name
 (buffer-substring-no-properties
 (match-end 0) (line-end-position))
 bzr-root-directory)))

Mercurial > emacs

comparison lisp/vc-bzr.el @ 91048:d38543a1c0f9