branch: elpa/hyperdrive
commit 257c361e0307f688bdae30c70e5a3b76ec427e01
Author: Joseph Turner <jos...@ushin.org>
Commit: Joseph Turner <jos...@ushin.org>
Change: (he//fill) Rename from h//fill
---
hyperdrive-dir.el | 2 +-
hyperdrive-lib.el | 12 ++++++------
hyperdrive.el | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hyperdrive-dir.el b/hyperdrive-dir.el
index c54f19d508..2dd6b622d8 100644
--- a/hyperdrive-dir.el
+++ b/hyperdrive-dir.el
@@ -72,7 +72,7 @@ If THEN, call it in the directory buffer with no arguments."
(json-read-from-string body)
hyperdrive version))
(parent-entry (h/parent directory-entry)))
- (setf directory-entry (h//fill directory-entry headers))
+ (setf directory-entry (he//fill directory-entry headers))
(when parent-entry
(setf (alist-get 'display-name (he/etc parent-entry))
"../")
(push parent-entry entries))
diff --git a/hyperdrive-lib.el b/hyperdrive-lib.el
index 882388d67b..f08de5833b 100644
--- a/hyperdrive-lib.el
+++ b/hyperdrive-lib.el
@@ -590,7 +590,7 @@ echo area when the request for the file is made."
nil nil #'string-match-p)))
(unless (h//entry-directory-p entry)
;; No need to fill latest version for directories,
- ;; since we do it in `h//fill' already.
+ ;; since we do it in `he//fill' already.
(h/fill-latest-version hyperdrive))
(h/persist hyperdrive)
(funcall (or handler #'h/handler-default) entry :then then)))
@@ -674,8 +674,8 @@ the given `plz-queue'"
(h/message "hyperdrive-entry-fill: error: %S"
plz-error))))))
(pcase then
('sync (condition-case err
- (h//fill entry (plz-response-headers
- (he/api 'head entry :then 'sync :noquery t)))
+ (he//fill entry (plz-response-headers
+ (he/api 'head entry :then 'sync :noquery t)))
(plz-error
(pcase (plz-response-status (plz-error-response (caddr err)))
;; FIXME: If plz-error is a curl-error, this block will fail.
@@ -686,7 +686,7 @@ the given `plz-queue'"
(_ (he/api 'head entry
:queue queue
:then (lambda (response)
- (funcall then (h//fill entry (plz-response-headers
response))))
+ (funcall then (he//fill entry (plz-response-headers
response))))
:else (lambda (&rest args)
(when (he/version entry)
;; If request is canceled, the entry may not have a version.
@@ -695,7 +695,7 @@ the given `plz-queue'"
(apply else args))
:noquery t))))
-(defun h//fill (entry headers)
+(defun he//fill (entry headers)
"Fill ENTRY and its hyperdrive from HEADERS.
The following ENTRY slots are filled:
@@ -1356,7 +1356,7 @@ hyperdrive."
:as 'response :noquery t)))
;; TODO: Update hyperdrive disk-usage. The following doesn't work
;; because the response doesn't have the proper ETag header:
- ;; (h//fill (h/url-entry url) headers)
+ ;; (he//fill (h/url-entry url) headers)
url)
(plz-error (if (= 400 (plz-response-status (plz-error-response (caddr
err))))
;; FIXME: If plz-error is a curl-error, this block will
fail.
diff --git a/hyperdrive.el b/hyperdrive.el
index d2e42a96cf..2b84e2852b 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -518,7 +518,7 @@ use, see `hyperdrive-write'."
(set-auto-mode)))
(h/mode))
;; NOTE: `h/fill-latest-version' must come before
- ;; `h//fill' because the latter calls
+ ;; `he//fill' because the latter calls
;; `h/update-existent-version-range' internally.
;; TODO: Instead of calling `h/fill-latest-version', we
should
@@ -527,7 +527,7 @@ use, see `hyperdrive-write'."
;; on the latest version of the hyperdrive.
(h/fill-latest-version hyperdrive)
- (h//fill entry (plz-response-headers response))
+ (he//fill entry (plz-response-headers response))
;; PUT responses only include ETag and Last-Modified
;; headers, so we need to set other entry metadata manually.
;; FIXME: For large buffers, `buffer-size' returns a
different
