gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A simple caching mechanism to ease the `magit-get-svn-ref-info' pain.

Browse source 
* magit.el: Every call to `magit-get-svn-ref-info', post the first, retrieves a cached list.
This commit is contained in:
Phil Jackson 2009-10-28 20:37:35 +00:00
parent 3bfe230051
commit 8ea39540d9
2 changed files with 52 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
magit.el
View file

@ -1935,17 +1935,17 @@ in log buffer."
"log" "--pretty=format:* %H %s"
(format "%s/%s..HEAD" remote branch)))
(defun magit-insert-unpulled-svn-commits ()
(defun magit-insert-unpulled-svn-commits (&optional use-cache)
(magit-git-section 'svn-unpulled
"Unpulled commits (SVN):" 'magit-wash-log
"log" "--pretty=format:* %H %s"
(format "HEAD..%s" (magit-get-svn-ref))))
(format "HEAD..%s" (magit-get-svn-ref use-cache))))
(defun magit-insert-unpushed-svn-commits ()
(defun magit-insert-unpushed-svn-commits (&optional use-cache)
(magit-git-section 'svn-unpushed
"Unpushed commits (SVN):" 'magit-wash-log
"log" "--pretty=format:* %H %s"
(format "%s..HEAD" (magit-get-svn-ref))))
(format "%s..HEAD" (magit-get-svn-ref use-cache))))
;;; Status
@ -1986,7 +1986,7 @@ in log buffer."
(when remote
(magit-insert-unpulled-commits remote branch))
(when svn-enabled
(magit-insert-unpulled-svn-commits))
(magit-insert-unpulled-svn-commits t))
(let ((staged (or no-commit (magit-anything-staged-p))))
(magit-insert-unstaged-changes
(if staged "Unstaged changes:" "Changes:"))
@ -1995,7 +1995,7 @@ in log buffer."
(when remote
(magit-insert-unpushed-commits remote branch))
(when svn-enabled
(magit-insert-unpushed-svn-commits))))))
(magit-insert-unpushed-svn-commits t))))))
(defun magit-init (dir)
"Initialize git repository in specified directory"
@ -2190,15 +2190,26 @@ in log buffer."
(magit-run-git-async "svn" "dcommit"))
(defun magit-svn-enabled ()
(not (null (magit-get "svn-remote" "svn" "fetch"))))
(not (null (magit-get-svn-ref-info))))
(defun magit-get-svn-ref-info ()
(defvar magit-get-svn-ref-info-cache nil
"As `magit-get-svn-ref-info' might be considered a quite
expensive operation a cache is taken so that `magit-status'
doesn't repeatedly call it.")
(defun magit-get-svn-ref-info (&optional use-cache)
"Gather details about the current git-svn repository (nil if
there isn't one). Keys of the alist are ref-path, trunk-ref-name
and local-ref-name."
and local-ref-name. If USE-CACHE is non-nil then return the value
of `magit-get-svn-ref-info-cache'."
(if use-cache
magit-get-svn-ref-info-cache
(let* ((fetch (magit-get "svn-remote" "svn" "fetch"))
(branches (magit-get "svn-remote" "svn" "fetch")))
(branches (magit-get "svn-remote" "svn" "fetch"))
(url)
(revision))
(when fetch
(setq magit-get-svn-ref-info-cache
(list
(cons 'ref-path (file-name-directory
(cadr (split-string fetch ":"))))
@ -2210,20 +2221,17 @@ and local-ref-name."
(with-temp-buffer
(insert (magit-git-string "log" "--first-parent"))
(goto-char (point-min))
(when (re-search-forward "git-svn-id: .+/\\(.+?\\)@" nil t)
(match-string 1))))))))
(when (re-search-forward "git-svn-id: \\(.+/\\(.+?\\)\\)@\\([0-9]+\\)" nil t)
(setq url (match-string 1)
revision (match-string 3))
(match-string 2))))
(cons 'revision revision)
(cons 'url url)))))))
(defun magit-get-svn-trunk-ref ()
"Get the best guess remote trunk ref for the current git-svn
based branch."
(let ((info (magit-get-svn-ref-info)))
(concat (cdr (assoc 'ref-path info))
(cdr (assoc 'trunk-ref-name info)))))
(defun magit-get-svn-ref ()
(defun magit-get-svn-ref (&optional use-cache)
"Get the best guess remote ref for the current git-svn based
branch."
(let ((info (magit-get-svn-ref-info)))
(let ((info (magit-get-svn-ref-info use-cache)))
(concat (cdr (assoc 'ref-path info))
(cdr (assoc 'local-ref-name info)))))

4
magit.etest
View file

@ -7,8 +7,8 @@
(stub magit-get => "someproject/trunk:refs/remotes/hello/trunk")
(magit-get-svn-ref-info)))
'(trunk-ref-name . "trunk")
"correct refpath from `magit-get-svn-ref-info'")
(equal (assoc 'refpath
"correct trunk-ref-name from `magit-get-svn-ref-info'")
(equal (assoc 'ref-path
(with-mock
(stub magit-get => "someproject/trunk:refs/remotes/hello/trunk")
(magit-get-svn-ref-info)))