header + reindentation

[?]

Apr 9, 2017, 1:23 PM

PQKTNYVZZ3Q5XJGTFX7YZYMCO5V5C3LSUGPTUVBLV7QLUI32JDOQC

Dependencies

[2] WDF2IVVT Don't populate the initial hash in annotate command
[3] PQQ5PEUO fixed vc-darcs-annotate-command & other fixes
[4] MOPDXS3Y Fix annotate hash regexp
[5] MAGPFPZB init
[6] ITWH4477 reindentation
[7] SLZWA7AY another vc api fix
[8] CJQZS55X working annotation
[9] VADHZAID Silence byte-compiler

Change contents

replacement in vc-darcs.el at line 8

[4.327]→[4.327:393](∅→∅)

;; Maintainer: Juliusz Chroboczek <jch@pps.univ-paris-diderot.fr>

[4.327]

[4.393]

;; Maintainer: Libor Čapák <capak@inputwish.com>
replacement in vc-darcs.el at line 10

[4.409]→[4.1:35](∅→∅)

;; Package-Version: 20151225.1801

[4.409]

[4.35]

;; Package-Version: 20170409.1521
replacement in vc-darcs.el at line 80

[4.3328]→[4.81:113](∅→∅)

(require 'xml)
(require 'vc))

[4.3328]

[4.3360]

(require 'xml)
(require 'vc))
replacement in vc-darcs.el at line 109

[4.4028]→[4.114:198](∅→∅)

(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 171

[4.6215]→[4.199:671](∅→∅)

((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 195

[4.7097]→[4.672:712](∅→∅)

(list "--to-patch" rev))))

[4.7097]

[4.7137]

(list "--to-patch" rev))))
replacement in vc-darcs.el at line 209

[4.7464]→[4.713:1682](∅→∅)

((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 238

[4.8606]→[4.1683:1767](∅→∅)

((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 250

[4.8925]→[4.1768:2401](∅→∅)

((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 288

[4.10395]→[4.2402:2694](∅→∅)

(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 298

[4.10751]→[4.2695:2984](∅→∅)

((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 341

[4.12139]→[4.2985:3033](∅→∅)

(vc-darcs-dir-header "Repository :" root)))

[4.12139]

[4.12187]

(vc-darcs-dir-header "Repository :" root)))
replacement in vc-darcs.el at line 378

[4.13450]→[4.3034:3081](∅→∅)

(format "darcs/%s" (vc-state file)))))

[4.13450]

[4.13497]

(format "darcs/%s" (vc-state file)))))
replacement in vc-darcs.el at line 400

[4.14223]→[4.3213:3248](∅→∅)

comment))

[4.14223]

[4.14258]

comment))
replacement in vc-darcs.el at line 403

[4.14334]→[4.3249:3273](∅→∅)

"")))

[4.14334]

[4.14358]

"")))
replacement in vc-darcs.el at line 438

[4.15683]→[4.3398:3818](∅→∅)

(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 453

[4.16225]→[4.3819:4018](∅→∅)

((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 467

[4.16852]→[4.4102:4223](∅→∅)

(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 499

[4.18112]→[4.4286:4307](∅→∅),[4.4307]→[3.81:131](∅→∅),[3.131]→[4.4358:4382](∅→∅),[4.4358]→[4.4358:4382](∅→∅),[4.4382]→[3.132:152](∅→∅),[3.152]→[4.4465:4642](∅→∅),[4.4465]→[4.4465:4642](∅→∅)

(with-temp-buffer
(vc-do-command t 0 vc-darcs-program-name '()
"changes" "--xml"
"--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 '()
"changes" "--xml"
"--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 522

[4.19062]→[4.4643:4674](∅→∅),[4.4674]→[4.1:74](∅→∅)

(goto-char (point-min))
(while (looking-at "^\$[-0-9a-f]+\$\$?:\\.gz\$? | \$.*\$$")

[4.19062]

[2.1]

(goto-char (point-min))
(while (looking-at "^\$[-0-9a-f]+\$\$?:\\.gz\$? | \$.*\$$")
replacement in vc-darcs.el at line 526

[2.169]→[4.4795:4844](∅→∅),[4.4795]→[4.4795:4844](∅→∅)

(forward-line 1))
(nreverse output)))))

[2.169]

[4.19263]

(forward-line 1))
(nreverse output)))))
replacement in vc-darcs.el at line 530

[4.19317]→[4.4845:5046](∅→∅)

(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]→[4.5047:5750](∅→∅),[4.5750]→[3.153:222](∅→∅),[3.222]→[4.5770:6499](∅→∅),[4.5770]→[4.5770:6499](∅→∅)

(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))
)
(insert (format "%-40s " rev))
(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))
)
(insert (format "%-40s " rev))
(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 613

[4.22081]→[4.6500:6767](∅→∅)

(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)))))))