me
/
guix
Archived
1
0
Fork 0
Code

etc/committer: Avoid reading original files more than once. 

* etc/committer.scm.in (%original-file-cache): New variable.
(read-original-file): New procedure.
(read-original-file*): New procedure.
(old-sexp): Use it.
master
Ricardo Wurmus 2023-09-21 16:02:44 +02:00
parent 10c6387f5b
commit 5027bc19d8
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
etc/committer.scm.in
View File

@ -196,21 +196,34 @@ LINE-NO in PORT."
(string-ref line 0))) (string-ref line 0)))
(hunk-diff-lines hunk)))) (hunk-diff-lines hunk))))
(define %original-file-cache
(make-hash-table))
(define (read-original-file file-name)
"Return the contents of FILE-NAME prior to any changes."
(let* ((port (open-pipe* OPEN_READ
"git" "cat-file" "-p" (string-append
"HEAD:" file-name)))
(contents (get-string-all port)))
(close-pipe port)
contents))
(define (read-original-file* file-name)
"Caching variant of READ-ORIGINAL-FILE."
(or (hashv-ref %original-file-cache file-name)
(let ((value (read-original-file file-name)))
(hashv-set! %original-file-cache file-name value)
value)))
(define (old-sexp hunk) (define (old-sexp hunk)
"Using the diff information in HUNK return the unmodified S-expression "Using the diff information in HUNK return the unmodified S-expression
corresponding to the top-level definition containing the staged changes." corresponding to the top-level definition containing the staged changes."
;; TODO: We can't seek with a pipe port... ;; TODO: We can't seek with a pipe port...
(let* ((port (open-pipe* OPEN_READ (call-with-input-string (read-original-file* (hunk-file-name hunk))
"git" "cat-file" "-p" (string-append (lambda (port)
"HEAD:" (surrounding-sexp port
(hunk-file-name hunk)))) (+ (lines-to-first-change hunk)
(contents (get-string-all port))) (hunk-old-line-number hunk))))))
(close-pipe port)
(call-with-input-string contents
(lambda (port)
(surrounding-sexp port
(+ (lines-to-first-change hunk)
(hunk-old-line-number hunk)))))))
(define (new-sexp hunk) (define (new-sexp hunk)
"Using the diff information in HUNK return the modified S-expression "Using the diff information in HUNK return the modified S-expression