working annotation

Dependencies

• [2] SLZWA7AY another vc api fix
• [3] ITWH4477 reindentation
• [4] MAGPFPZB init

Change contents

• replacement in vc-darcs.el at line 10
  [4.409]→[4.409:443](∅→∅)
  − ;; Package-Version: 20141122.1326
  [4.409]

  [4.443]
  + ;; Package-Version: 20151225.1801

  + ;; Package-X-Original-Version: 20141122.1326
• replacement in vc-darcs.el at line 79
  [4.3328]→[3.1:35](∅→∅)
  − (require 'xml)

  − (require 'vc))
  [4.3328]

  [4.3360]
  + (require 'xml)

  + (require 'vc))
• replacement in vc-darcs.el at line 106
  [4.4028]→[3.36:116](∅→∅)
  − (format "%s <%s>"

  − (user-full-name) user-mail-address)))
  [4.4028]

  [4.4112]
  + (format "%s <%s>"

  + (user-full-name) user-mail-address)))
• replacement in vc-darcs.el at line 170
  [4.6215]→[3.117:573](∅→∅)
  − ((or (null rev) (eq rev t) (equal rev "")) nil)

  − ((not off-by-one)

  − (cond

  − ((vc-darcs-hash-p rev) rev)

  − (t (car (last (vc-darcs-changes files "--patch" rev))))))

  − (t

  − (let ((flags

  − (if (vc-darcs-hash-p rev)

  − (list "--from-match" (concat "hash " rev))

  − (list "--from-patch" rev))))

  − (let ((changes (apply #'vc-darcs-changes files flags)))

  − (and (cdr changes) (car (last changes 2))))))))
  [4.6215]

  [4.6687]
  + ((or (null rev) (eq rev t) (equal rev "")) nil)

  + ((not off-by-one)

  + (cond

  + ((vc-darcs-hash-p rev) rev)

  + (t (car (last (vc-darcs-changes files "--patch" rev))))))

  + (t

  + (let ((flags

  + (if (vc-darcs-hash-p rev)

  + (list "--from-match" (concat "hash " rev))

  + (list "--from-patch" rev))))

  + (let ((changes (apply #'vc-darcs-changes files flags)))

  + (and (cdr changes) (car (last changes 2))))))))
• replacement in vc-darcs.el at line 194
  [4.7097]→[3.574:612](∅→∅)
  − (list "--to-patch" rev))))
  [4.7097]

  [4.7137]
  + (list "--to-patch" rev))))
• replacement in vc-darcs.el at line 208
  [4.7464]→[3.613:1558](∅→∅)
  − ((vc-darcs-special-file-p file)

  − ;; If vc-directory-exclusion-list is set incorrectly, vc-dired will

  − ;; query us for all the files under _darcs. Get rid of them quickly.

  − nil)

  − (t

  − (when (vc-darcs-root file)

  − (let* ((file (expand-file-name file))

  − (root (vc-darcs-root file))

  − (default-directory (file-name-directory file)))

  − (with-temp-buffer

  − (catch 'found

  − (condition-case nil

  − (vc-do-command t nil vc-darcs-program-name

  − nil "show" "files")

  − (error (throw 'found nil)))

  − (goto-char (point-min))

  − (while (looking-at "[^\n]+")

  − ;; Darcs always prints relative to the root

  − (let ((file2 (expand-file-name (match-string 0) root)))

  − (when (equal file2 file)

  − (throw 'found t))

  − (forward-line)))

  − nil)))))))
  [4.7464]

  [4.8433]
  + ((vc-darcs-special-file-p file)

  + ;; If vc-directory-exclusion-list is set incorrectly, vc-dired will

  + ;; query us for all the files under _darcs. Get rid of them quickly.

  + nil)

  + (t

  + (when (vc-darcs-root file)

  + (let* ((file (expand-file-name file))

  + (root (vc-darcs-root file))

  + (default-directory (file-name-directory file)))

  + (with-temp-buffer

  + (catch 'found

  + (condition-case nil

  + (vc-do-command t nil vc-darcs-program-name

  + nil "show" "files")

  + (error (throw 'found nil)))

  + (goto-char (point-min))

  + (while (looking-at "[^\n]+")

  + ;; Darcs always prints relative to the root

  + (let ((file2 (expand-file-name (match-string 0) root)))

  + (when (equal file2 file)

  + (throw 'found t))

  + (forward-line)))

  + nil)))))))
• replacement in vc-darcs.el at line 237
  [4.8606]→[3.1559:1640](∅→∅)
  − ((equal "R" letter) 'removed)

  − ((equal "A" letter) 'added)

  − (t 'edited)))
  [4.8606]

  [4.8690]
  + ((equal "R" letter) 'removed)

  + ((equal "A" letter) 'added)

  + (t 'edited)))
• replacement in vc-darcs.el at line 249
  [4.8925]→[3.1641:2256](∅→∅)
  − ((looking-at "No changes")

  − (if (vc-darcs-registered file) 'up-to-date 'unregistered))

  − ((looking-at "\\([A-Z]\\)!? ")

  − (vc-darcs-parse-summary (match-string 1)))

  − ((looking-at " * \\([^ \n]+\\) *-> *\\([^ \n]+\\)")

  − ;; The paths printed by Darcs are relative to the root

  − (let* ((root (vc-darcs-root file))

  − (f (expand-file-name file))

  − (f1 (expand-file-name (match-string 1) root))

  − (f2 (expand-file-name (match-string 2) root)))

  − (cond

  − ((equal f f1) 'removed)

  − ((equal f f2) 'added)

  − (t nil))))

  − (t nil))))
  [4.8925]

  [4.9558]
  + ((looking-at "No changes")

  + (if (vc-darcs-registered file) 'up-to-date 'unregistered))

  + ((looking-at "\\([A-Z]\\)!? ")

  + (vc-darcs-parse-summary (match-string 1)))

  + ((looking-at " * \\([^ \n]+\\) *-> *\\([^ \n]+\\)")

  + ;; The paths printed by Darcs are relative to the root

  + (let* ((root (vc-darcs-root file))

  + (f (expand-file-name file))

  + (f1 (expand-file-name (match-string 1) root))

  + (f2 (expand-file-name (match-string 2) root)))

  + (cond

  + ((equal f f1) 'removed)

  + ((equal f f2) 'added)

  + (t nil))))

  + (t nil))))
• replacement in vc-darcs.el at line 287
  [4.10395]→[3.2257:2654](∅→∅)
  − (doit #'(lambda (file status)

  − ;; The paths printed by Darcs are relative to the root

  − (let ((path (file-relative-name

  − (expand-file-name file root))))

  − (unless (file-directory-p path)

  − (push (list path status nil) l)

  − (setq files (delete path files)))))))
  [4.10395]

  [4.10687]
  + (doit #'(lambda (file status)

  + ;; The paths printed by Darcs are relative to the root

  + (let ((path (file-relative-name

  + (expand-file-name file root))))

  + (unless (file-directory-p path)

  + (push (list path status nil) l)

  + (setq files (delete path files)))))))
• replacement in vc-darcs.el at line 297
  [4.10751]→[3.2655:2985](∅→∅)
  − ((looking-at "\\([A-Z]\\)!? \\([^ \n]+\\)")

  − (funcall doit (match-string 2)

  − (vc-darcs-parse-summary (match-string 1))))

  − ((looking-at " * \\([^ \n]+\\) *-> *\\([^ \n]+\\)")

  − (funcall doit (match-string 1) 'removed)

  − (funcall doit (match-string 2) 'added)))

  − (forward-line))
  [4.10751]

  [4.11040]
  + ((looking-at "\\([A-Z]\\)!? \\([^ \n]+\\)")

  + (funcall doit (match-string 2)

  + (vc-darcs-parse-summary (match-string 1))))

  + ((looking-at " * \\([^ \n]+\\) *-> *\\([^ \n]+\\)")

  + (funcall doit (match-string 1) 'removed)

  + (funcall doit (match-string 2) 'added)))

  + (forward-line))
• replacement in vc-darcs.el at line 340
  [4.12139]→[3.2986:3041](∅→∅)
  − (vc-darcs-dir-header "Repository :" root)))
  [4.12139]

  [4.12187]
  + (vc-darcs-dir-header "Repository :" root)))
• replacement in vc-darcs.el at line 377
  [4.13450]→[3.3042:3087](∅→∅)
  − (format "darcs/%s" (vc-state file)))))
  [4.13450]

  [4.13497]
  + (format "darcs/%s" (vc-state file)))))
• replacement in vc-darcs.el at line 390
  [4.13779]→[2.1:41](∅→∅)
  − (defun vc-darcs-checkin (files comment)
  [4.13779]

  [4.13823]
  + (defun vc-darcs-checkin (files rev comment)
• edit in vc-darcs.el at line 392
  [4.13879]

  [4.13964]
  + (when (not (null rev))

  + (error "Cannot specify check-in revision with darcs."))
• replacement in vc-darcs.el at line 399
  [4.14223]→[3.3088:3121](∅→∅)
  − comment))
  [4.14223]

  [4.14258]
  + comment))
• replacement in vc-darcs.el at line 402
  [4.14334]→[3.3122:3144](∅→∅)
  − "")))
  [4.14334]

  [4.14358]
  + "")))
• replacement in vc-darcs.el at line 419
  [4.15020]→[2.42:134](∅→∅)
  − (defun vc-darcs-checkout (file &optional rev)

  − "Check out FILE from the Darcs repository."
  [4.15020]

  [4.15143]
  + (defun vc-darcs-checkout (file &optional _editable rev)

  + "Check out FILE from the Darcs repository.

  + EDITABLE is ignored."
• replacement in vc-darcs.el at line 437
  [4.15683]→[3.3145:3589](∅→∅)
  − (require 'add-log)

  − (set (make-local-variable 'log-view-per-file-logs) nil)

  − (set (make-local-variable 'log-view-file-re) "\\`a\\`")

  − (set (make-local-variable 'log-view-message-re)

  − "^ \\* \\(.+\\)")

  − (set (make-local-variable 'log-view-font-lock-keywords)

  − '(("^\\([A-Z][a-z][a-z] .*[0-9]\\) \\([^<>]+\\) \\(<[^<>]+>\\)"

  − (1 'change-log-date)

  − (2 'change-log-name)

  − (3 'change-log-email))))

  − )
  [4.15683]

  [4.16103]
  + (require 'add-log)

  + (set (make-local-variable 'log-view-per-file-logs) nil)

  + (set (make-local-variable 'log-view-file-re) "\\`a\\`")

  + (set (make-local-variable 'log-view-message-re)

  + "^ \\* \\(.+\\)")

  + (set (make-local-variable 'log-view-font-lock-keywords)

  + '(("^\\([A-Z][a-z][a-z] .*[0-9]\\) \\([^<>]+\\) \\(<[^<>]+>\\)"

  + (1 'change-log-date)

  + (2 'change-log-name)

  + (3 'change-log-email))))

  + )
• replacement in vc-darcs.el at line 452
  [4.16225]→[3.3590:3783](∅→∅)
  − ((equal rev (car (vc-darcs-changes log-view-vc-fileset "--max-count" "1")))

  − (goto-char (point-min))

  − (re-search-forward log-view-message-re)

  − (beginning-of-line))

  − (t

  − nil)))
  [4.16225]

  [4.16424]
  + ((equal rev (car (vc-darcs-changes log-view-vc-fileset "--max-count" "1")))

  + (goto-char (point-min))

  + (re-search-forward log-view-message-re)

  + (beginning-of-line))

  + (t

  + nil)))
• replacement in vc-darcs.el at line 459
  [4.16425]→[2.135:217](∅→∅)
  − (defun vc-darcs-print-log (files buffer &optional _shortlog start-revision limit)
  [4.16425]

  [4.16507]
  + (defun vc-darcs-print-log (files &optional buffer _shortlog start-revision limit)
• replacement in vc-darcs.el at line 466
  [4.16852]→[3.3784:3926](∅→∅)
  − (append

  − (and start-hash (list "--to-hash" start-hash))

  − (and limit (list "--last" (format "%d" limit)))))))
  [4.16852]

  [4.16973]
  + (append

  + (and start-hash (list "--to-hash" start-hash))

  + (and limit (list "--last" (format "%d" limit)))))))
• replacement in vc-darcs.el at line 470
  [4.16974]→[2.218:279](∅→∅)
  − (defun vc-darcs-diff (file &optional rev1 rev2 buffer async)
  [4.16974]

  [4.17035]
  + (defun vc-darcs-diff (file &optional rev1 rev2 buffer dummy)
• replacement in vc-darcs.el at line 499
  [4.18112]→[3.3927:4393](∅→∅)
  − (with-temp-buffer

  − (vc-do-command t 0 vc-darcs-program-name file

  − "changes" "--xml"

  − "--from-match" (concat "hash " rev)

  − "--to-match" (concat "hash " rev))

  − (xml-parse-region 1 (point-max))))

  − (patch

  − (if (not (eq 'changelog (caar xml)))

  − (error "Unexpected output from darcs changes --xml")

  − (nth 3 (car xml)))))
  [4.18112]

  [4.18468]
  + (with-temp-buffer

  + (vc-do-command t 0 vc-darcs-program-name file

  + "changes" "--xml"

  + "--from-match" (concat "hash " rev)

  + "--to-match" (concat "hash " rev))

  + (xml-parse-region 1 (point-max))))

  + (patch

  + (if (not (eq 'changelog (caar xml)))

  + (error "Unexpected output from darcs changes --xml")

  + (nth 3 (car xml)))))
• replacement in vc-darcs.el at line 523
  [4.19062]→[3.4394:4644](∅→∅)
  − (goto-char (point-min))

  − (while (looking-at "^\\([-0-9a-f]+\\)\\.gz | \\(.*\\)$")

  − (push (cons (match-string 1) (match-string 2)) output)

  − (forward-line 1))

  − (nreverse output)))))
  [4.19062]

  [4.19263]
  + (goto-char (point-min))

  + (while (looking-at "^\\([-0-9a-f]+\\)\\.gz | \\(.*\\)$")

  + (push (cons (match-string 1) (match-string 2)) output)

  + (forward-line 1))

  + (nreverse output)))))
• replacement in vc-darcs.el at line 530
  [4.19317]→[3.4645:4923](∅→∅)
  − (and (fboundp 'make-progress-reporter)

  − (make-progress-reporter "Annotating..."

  − 1 (length data))))

  − (count 0)

  − (now (vc-annotate-convert-time (current-time)))

  − (cache '()))
  [4.19317]

  [4.19518]
  + (and (fboundp 'make-progress-reporter)

  + (make-progress-reporter "Annotating..."

  + 1 (length data))))

  + (count 0)

  + (now (vc-annotate-convert-time (current-time)))

  + (cache '()))
• replacement in vc-darcs.el at line 537
  [4.19543]→[3.4924:6982](∅→∅)
  − (let* ((rev (car e))

  − (line (cdr e))

  − (alist (or (cdr (assoc rev cache))

  − (let ((a (vc-darcs-alist-from-rev file rev)))

  − (push (cons rev a) cache)

  − a)))

  − (author (cdr (assoc 'author alist)))

  − (date (cdr (assoc 'date alist)))

  − (year (substring date 0 4))

  − (month (substring date 4 6))

  − (day (substring date 6 8))

  − (hour (substring date 8 10))

  − (min (substring date 10 12))

  − (sec (substring date 12 14))

  − (time (vc-annotate-convert-time

  − (encode-time

  − (vc-darcs-parse-integer sec)

  − (vc-darcs-parse-integer min)

  − (vc-darcs-parse-integer hour)

  − (vc-darcs-parse-integer day)

  − (vc-darcs-parse-integer month)

  − (vc-darcs-parse-integer year))))

  − (begin (point)))

  − (cond

  − ((string-match "<\\([^ <>@]*\\)@.*>" author)

  − (setq author (match-string 1 author)))

  − ((string-match "[^ <>@]*" author)

  − (setq author (match-string 0 author))))

  − (insert (format "%-7s "

  − (if (> (length author) 7)

  − (substring author 0 7)

  − author)))

  − (insert

  − (if (> (- now time) 0.9)

  − (format "%s/%s/%s " day month (substring year 2 4))

  − (format "%s:%s:%s " hour min sec)))

  − (insert line)

  − (insert "\n")

  − (add-text-properties

  − begin (point)

  − (list 'vc-darcs-annotate (cons rev time))))

  − (setq count (+ count 1))

  − (when reporter

  − (progress-reporter-update reporter count)))

  − (when reporter

  − (progress-reporter-done reporter))))))
  [4.19543]

  [4.20995]
  + (let* ((rev (car e))

  + (line (cdr e))

  + (alist (or (cdr (assoc rev cache))

  + (let ((a (vc-darcs-alist-from-rev file rev)))

  + (push (cons rev a) cache)

  + a)))

  + (author (cdr (assoc 'author alist)))

  + (date (cdr (assoc 'date alist)))

  + (year (substring date 0 4))

  + (month (substring date 4 6))

  + (day (substring date 6 8))

  + (hour (substring date 8 10))

  + (min (substring date 10 12))

  + (sec (substring date 12 14))

  + (time (vc-annotate-convert-time

  + (encode-time

  + (vc-darcs-parse-integer sec)

  + (vc-darcs-parse-integer min)

  + (vc-darcs-parse-integer hour)

  + (vc-darcs-parse-integer day)

  + (vc-darcs-parse-integer month)

  + (vc-darcs-parse-integer year))))

  + (begin (point)))

  + (cond

  + ((string-match "<\\([^ <>@]*\\)@.*>" author)

  + (setq author (match-string 1 author)))

  + ((string-match "[^ <>@]*" author)

  + (setq author (match-string 0 author))))

  + (insert (format "%-7s "

  + (if (> (length author) 7)

  + (substring author 0 7)

  + author)))

  + (insert

  + (if (> (- now time) 0.9)

  + (format "%s/%s/%s " day month (substring year 2 4))

  + (format "%s:%s:%s " hour min sec)))

  + (insert line)

  + (insert "\n")

  + (add-text-properties

  + begin (point)

  + (list 'vc-darcs-annotate (cons rev time))))

  + (setq count (+ count 1))

  + (when reporter

  + (progress-reporter-update reporter count)))

  + (when reporter

  + (progress-reporter-done reporter))))))
• replacement in vc-darcs.el at line 611
  [4.22081]→[3.6983:7244](∅→∅)
  − (open-instead

  − (find-alternate-file candidate))

  − (t

  − (setq buffer-read-only t)

  − (push '(:propertize "_DARCS-FILE:" face font-lock-warning-face)

  − mode-line-buffer-identification)))))))
  [4.22081]

  [4.22348]
  + (open-instead

  + (find-alternate-file candidate))

  + (t

  + (setq buffer-read-only t)

  + (push '(:propertize "_DARCS-FILE:" face font-lock-warning-face)

  + mode-line-buffer-identification)))))))