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

Add an option to use "remote/name" style refs rather than "name (remote)".

Browse source
This commit is contained in:
Nathan Weizenbaum 2010-06-09 22:26:13 -07:00
parent 5744d3ec98
commit f846afe850
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
magit.el
View file

@ -150,6 +150,16 @@ after a confirmation."
:group 'magit :group 'magit
:type 'boolean) :type 'boolean)
(defcustom magit-remote-ref-format 'branch-then-remote
"What format to use for autocompleting refs, in pariticular for remotes.
The value 'name-then-remote means remotes will be of the
form \"name (remote)\", while the value 'remote-slash-name
means that they'll be of the form \"remote/name\"."
:group 'magit
:type '(choice (const :tag "name (remote)" branch-then-remote)
(const :tag "remote/name" remote-slash-branch)))
(defcustom magit-process-connection-type (not (eq system-type 'cygwin)) (defcustom magit-process-connection-type (not (eq system-type 'cygwin))
"Connection type used for the git process. "Connection type used for the git process.
@ -571,12 +581,20 @@ return nil."
(let ((branch (match-string 1 ref))) (let ((branch (match-string 1 ref)))
(push (cons branch branch) refs))) (push (cons branch branch) refs)))
((string-match "refs/tags/\\(.*\\)" ref) ((string-match "refs/tags/\\(.*\\)" ref)
(push (cons (format "%s (tag)" (match-string 1 ref)) ref) (push (cons (format
(if (eq magit-remote-ref-format 'branch-then-remote)
"%s (tag)" "%s")
(match-string 1 ref))
ref)
refs)) refs))
((string-match "refs/remotes/\\([^/]+\\)/\\(.+\\)" ref) ((string-match "refs/remotes/\\([^/]+\\)/\\(.+\\)" ref)
(push (cons (format "%s (%s)" (push (cons (if (eq magit-remote-ref-format 'branch-then-remote)
(format "%s (%s)"
(match-string 2 ref) (match-string 2 ref)
(match-string 1 ref)) (match-string 1 ref))
(format "%s/%s"
(match-string 1 ref)
(match-string 2 ref)))
ref) ref)
refs)))))) refs))))))
refs)) refs))