branch: elpa/helm
commit cbaed45fc1af531f5b190eba62fa8c486678dbcd
Author: Ta Quang Trung <taquangtrun...@gmail.com>
Commit: Ta Quang Trung <taquangtrun...@gmail.com>
helm-browse-project: handle nested projects (Hg inside Git or vice versa)
---
helm-files.el | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/helm-files.el b/helm-files.el
index c6dbb98990..5e9cecf0b5 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -7097,22 +7097,31 @@ and
<https://github.com/emacs-helm/helm-ls-hg>."
(interactive "P")
(require 'helm-x-files)
- (let ((helm-type-buffer-actions
- (remove (assoc "Browse project from buffer"
- helm-type-buffer-actions)
- helm-type-buffer-actions))
- (helm-buffers-in-project-p t))
+ (let* ((helm-type-buffer-actions
+ (remove (assoc "Browse project from buffer"
+ helm-type-buffer-actions)
+ helm-type-buffer-actions))
+ (helm-buffers-in-project-p t)
+ (git-project (when-let* ((_ (require 'helm-ls-git nil t))
+ (_ (fboundp 'helm-ls-git-root-dir))
+ (dir (helm-ls-git-root-dir)))
+ (expand-file-name dir)))
+ (hg-project (when-let* ((_ (require 'helm-ls-hg nil t))
+ (_ (fboundp 'helm-hg-root))
+ (dir (helm-hg-root)))
+ (expand-file-name dir)))
+ (project-type (cond ((and git-project (not hg-project)) 'Git)
+ ((and hg-project (not git-project)) 'Hg)
+ ((and hg-project git-project)
+ (if (string-prefix-p git-project hg-project) 'Hg
'Git))
+ (t nil))))
(cl-flet ((push-to-hist (root)
(setq helm-browse-project-history
(cons root (delete root helm-browse-project-history)))))
- (helm-acond ((and (require 'helm-ls-git nil t)
- (fboundp 'helm-ls-git-root-dir)
- (helm-ls-git-root-dir))
+ (helm-acond ((equal project-type 'Git)
(push-to-hist it)
(helm-ls-git))
- ((and (require 'helm-ls-hg nil t)
- (fboundp 'helm-hg-root)
- (helm-hg-root))
+ ((equal project-type 'Hg)
(push-to-hist it)
(helm-hg-find-files-in-project))
((helm-browse-project-get--root-dir (helm-current-directory))
@@ -7120,8 +7129,8 @@ and
(progn
(push-to-hist it)
(helm-browse-project-find-files it (equal arg '(16))))
- (helm :sources
(helm-browse-project-build-buffers-source it)
- :buffer "*helm browse project*")))))))
+ (helm :sources (helm-browse-project-build-buffers-source
it)
+ :buffer "*helm browse project*")))))))
(defun helm-browse-project-get--root-dir (directory)
(cl-loop with dname = (file-name-as-directory directory)
