Improve blame messages

sideline-blame.el

@@ -74,11 +74,18 @@
  :type 'string
  :group 'sideline-blame)
 
-(defcustom sideline-blame-uncommitted-author-name "Unknown"
+(defcustom sideline-blame-uncommitted-author-name
+ (if (string-empty-p user-full-name) "You"
+ user-full-name)
  "Message for commits where you are author."
  :type 'string
  :group 'sideline-blame)
 
+(defcustom sideline-blame-uncommitted-time "Now "
+ "Message for uncommitted timestamp."
+ :type 'string
+ :group 'sideline-blame)
+
 (defcustom sideline-blame-uncommitted-message "Uncommitted changes"
  "Message for uncommitted lines."
  :type 'string
@@ -111,16 +118,21 @@ Argument COMMAND is required in sideline backend."
  (funcall executer
  current-file
  (funcall vc-msg-get-line-num-function)
- (funcall vc-msg-get-version-function))))
- (id (plist-get commit-info :id)))
- (let* ((uncommitted (zerop (string-to-number id)))
+ (funcall vc-msg-get-version-function)))))
+ (let* ((id (plist-get commit-info :id))
+ (uncommitted (or (null id)
+ (null (string-match-p "[^0]" id))))
  (author (if uncommitted sideline-blame-uncommitted-author-name
  (plist-get commit-info :author)))
- (time (string-to-number (plist-get commit-info :author-time)))
+ (time (unless uncommitted
+ (ignore-errors
+ (string-to-number (plist-get commit-info :author-time)))))
  (summary (if uncommitted sideline-blame-uncommitted-message
  (plist-get commit-info :summary))))
  (concat (format sideline-blame-author-format author)
- (format-time-string sideline-blame-datetime-format time)
+ (if uncommitted
+ sideline-blame-uncommitted-time
+ (format-time-string sideline-blame-datetime-format time))
  (format sideline-blame-commit-format summary)))))
 
 (defun sideline-blame--display (callback &rest _)