Mercurial > emacs

comparison lisp/vc.el @ 83461:9b150bc96d33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 187, 704) Patches applied: * emacs@sv.gnu.org/emacs--devo--0--base-0 tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704 * emacs@sv.gnu.org/emacs--devo--0--patch-1 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-2 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-3 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-4 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-5 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-6 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-7 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-8 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-9 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-10 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-11 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-12 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-13 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-14 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-15 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-16 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-17 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-18 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-19 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-20 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-21 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-22 Install ERC. * emacs@sv.gnu.org/emacs--devo--0--patch-23 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-24 Fix ERC compiler warnings. * emacs@sv.gnu.org/emacs--devo--0--patch-25 Use utf-8 encoding in ERC ChangeLogs. * emacs@sv.gnu.org/emacs--devo--0--patch-26 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-27 Merge ERC-related Viper hacks into Viper. * emacs@sv.gnu.org/emacs--devo--0--patch-28 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-29 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-30 Merge from erc--main--0 * emacs@sv.gnu.org/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187 * emacs@sv.gnu.org/gnus--rel--5.10--patch-1 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-2 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-3 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-4 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-5 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-6 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-7 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-501
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 30 Jan 2006 18:06:22 +0000
parents ec395f552d45 1d4de26bcb1f
children b98066f4aa10
comparison
equal deleted inserted replaced
83460:dbd791ef90a1 83461:9b150bc96d33
2117 2117
2118 (defun vc-default-dired-state-info (backend file) 2118 (defun vc-default-dired-state-info (backend file)
2119 (let ((state (vc-state file))) 2119 (let ((state (vc-state file)))
2120 (cond 2120 (cond
2121 ((stringp state) (concat "(" state ")")) 2121 ((stringp state) (concat "(" state ")"))
2122 ((eq state 'edited) (concat "(" (vc-user-login-name) ")")) 2122 ((eq state 'edited) (concat "(" (vc-user-login-name file) ")"))
2123 ((eq state 'needs-merge) "(merge)") 2123 ((eq state 'needs-merge) "(merge)")
2124 ((eq state 'needs-patch) "(patch)") 2124 ((eq state 'needs-patch) "(patch)")
2125 ((eq state 'unlocked-changes) "(stale)")))) 2125 ((eq state 'unlocked-changes) "(stale)"))))
2126 2126
2127 (defun vc-dired-reformat-line (vc-info) 2127 (defun vc-dired-reformat-line (vc-info)
2850 ;; Presumably not portable to non-Unixy systems, along with rcs2log: 2850 ;; Presumably not portable to non-Unixy systems, along with rcs2log:
2851 (tempfile (make-temp-file 2851 (tempfile (make-temp-file
2852 (expand-file-name "vc" 2852 (expand-file-name "vc"
2853 (or small-temporary-file-directory 2853 (or small-temporary-file-directory
2854 temporary-file-directory)))) 2854 temporary-file-directory))))
2855 (login-name (or user-login-name
2856 (format "uid%d" (number-to-string (user-uid)))))
2855 (full-name (or add-log-full-name 2857 (full-name (or add-log-full-name
2856 (user-full-name) 2858 (user-full-name)
2857 (user-login-name) 2859 (user-login-name)
2858 (format "uid%d" (number-to-string (user-uid))))) 2860 (format "uid%d" (number-to-string (user-uid)))))
2859 (mailing-address (or add-log-mailing-address 2861 (mailing-address (or add-log-mailing-address
2872 (if (eq 0 (apply 'call-process 2874 (if (eq 0 (apply 'call-process
2873 (expand-file-name "rcs2log" 2875 (expand-file-name "rcs2log"
2874 exec-directory) 2876 exec-directory)
2875 nil (list t tempfile) nil 2877 nil (list t tempfile) nil
2876 "-c" changelog 2878 "-c" changelog
2877 "-u" (concat (vc-user-login-name) 2879 "-u" (concat login-name
2878 "\t" full-name 2880 "\t" full-name
2879 "\t" mailing-address) 2881 "\t" mailing-address)
2880 (mapcar 2882 (mapcar
2881 (lambda (f) 2883 (lambda (f)
2882 (file-relative-name 2884 (file-relative-name