[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Quilt-dev] [PATCH v2 2/7] quilt.el: Refactor config reading functions
From: |
Ondřej Lysoněk |
Subject: |
[Quilt-dev] [PATCH v2 2/7] quilt.el: Refactor config reading functions |
Date: |
Sat, 30 May 2020 18:17:19 +0200 |
quilt-patches-directory is a copy-paste of
quilt-pc-directory. Refactor the common code into a separate
function.
Signed-off-by: Ondřej Lysoněk <olysonek@redhat.com>
---
lib/quilt.el | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/lib/quilt.el b/lib/quilt.el
index 9865637..5e36746 100644
--- a/lib/quilt.el
+++ b/lib/quilt.el
@@ -29,12 +29,12 @@
"Return t if there is on the bottom of patch stack, return nil if otherwise."
(if (> (call-process "quilt" nil nil nil "applied") 0) 1))
-(defun quilt-patches-directory ()
- "Return the location of patch files."
+(defun quilt--get-config-variable (var)
+ "Return the value of a configuration variable. Return nil if it is unset."
(or (with-current-buffer (generate-new-buffer " *cmd")
(shell-command
(concat "test -f ~/.quiltrc && . ~/.quiltrc ;"
- "echo -n $QUILT_PATCHES")
+ "echo -n $" var)
t)
(unwind-protect
(let ((v (buffer-string)))
@@ -42,24 +42,17 @@
nil
v))
(kill-buffer (current-buffer))))
- (or (getenv "QUILT_PATCHES")
- "patches")))
+ (getenv var)))
+
+(defun quilt-patches-directory ()
+ "Return the location of patch files."
+ (or (quilt--get-config-variable "QUILT_PATCHES")
+ "patches"))
(defun quilt-pc-directory ()
"Return the location of the quilt working state directory."
- (or (with-current-buffer (generate-new-buffer " *cmd")
- (shell-command
- (concat "test -f ~/.quiltrc && . ~/.quiltrc ;"
- "echo -n $QUILT_PC")
- t)
- (unwind-protect
- (let ((v (buffer-string)))
- (if (string= "" (buffer-string))
- nil
- v))
- (kill-buffer (current-buffer))))
- (or (getenv "QUILT_PC")
- ".pc")))
+ (or (quilt--get-config-variable "QUILT_PC")
+ ".pc"))
(defun quilt-find-dir (fn &optional prefn)
"Return the top level dir of quilt from FN."
--
2.25.4
- [Quilt-dev] [PATCH v2 1/7] quilt.el: Fix documentation of quilt-pc-directory, Ondřej Lysoněk, 2020/05/30
- [Quilt-dev] [PATCH v2 2/7] quilt.el: Refactor config reading functions,
Ondřej Lysoněk <=
- [Quilt-dev] [PATCH v2 3/7] Document that quilt loads /etc/quilt.quiltrc, Ondřej Lysoněk, 2020/05/30
- [Quilt-dev] [PATCH v2 4/7] quilt.el: Load /etc/quilt.quiltrc if ~/.quiltrc doesn't exist, Ondřej Lysoněk, 2020/05/30
- [Quilt-dev] [PATCH v2 5/7] quilt.el: Make quilt-patches-directory return per-project setting, Ondřej Lysoněk, 2020/05/30
- [Quilt-dev] [PATCH v2 6/7] quilt.el: Fix quilt-editable when QUILT_PATCHES_PREFIX is set, Ondřej Lysoněk, 2020/05/30
- [Quilt-dev] [PATCH v2 7/7] quilt.el: Fix a typo in documentation, Ondřej Lysoněk, 2020/05/30