Mercurial > emacs

changeset 68384:1d4de26bcb1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-default-dired-state-info): Pass FILE to vc-user-login-name. (vc-default-update-changelog): Don't use vc-user-login-name, we don't need it here.
author André Spiegel <spiegel@gnu.org>
date Wed, 25 Jan 2006 18:55:41 +0000
parents 4e64c3323161
children 774d8922e2c3
files lisp/vc.el
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc.el	Wed Jan 25 18:54:26 2006 +0000
+++ b/lisp/vc.el	Wed Jan 25 18:55:41 2006 +0000
@@ -2119,7 +2119,7 @@
   (let ((state (vc-state file)))
     (cond
      ((stringp state) (concat "(" state ")"))
-     ((eq state 'edited) (concat "(" (vc-user-login-name) ")"))
+     ((eq state 'edited) (concat "(" (vc-user-login-name file) ")"))
      ((eq state 'needs-merge) "(merge)")
      ((eq state 'needs-patch) "(patch)")
      ((eq state 'unlocked-changes) "(stale)"))))
@@ -2852,6 +2852,8 @@
 		   (expand-file-name "vc"
 				     (or small-temporary-file-directory
 					 temporary-file-directory))))
+        (login-name (or user-login-name
+                        (format "uid%d" (number-to-string (user-uid)))))
 	(full-name (or add-log-full-name
 		       (user-full-name)
 		       (user-login-name)
@@ -2874,7 +2876,7 @@
                                                       exec-directory)
                                     nil (list t tempfile) nil
                                     "-c" changelog
-                                    "-u" (concat (vc-user-login-name)
+                                    "-u" (concat login-name
                                                  "\t" full-name
                                                  "\t" mailing-address)
                                     (mapcar