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

User now asked for the name of a local tracking branch. Sensible default given. [R]

Browse source
This commit is contained in:
Phil Jackson 2010-06-09 22:50:20 +01:00
parent 78867ac94d
commit fce3ef1fd0
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
magit.el
View file

@ -2581,15 +2581,30 @@ With prefix argument, add remaining untracked files as well.
;;; Branches
(defun magit-get-tracking-name (remote branch)
"Given a REMOTE and a BRANCH name, ask the user for a local
tracking brach name suggesting a sensible default."
(when (yes-or-no-p
(format "Create local tracking branch for %s? " branch))
(let* ((default-name (concat remote "-" branch))
(chosen-name (read-string (format "Call local branch (%s): " default-name)
nil
nil
default-name)))
(when (magit-ref-exists-p (concat "refs/heads/" chosen-name))
(error "'%s' already exists." chosen-name))
chosen-name)))
(defun magit-maybe-create-local-tracking-branch (rev)
"Depending on the users wishes, create a tracking branch for
rev... maybe."
(if (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" rev)
(let ((remote (match-string 1 rev))
(branch (match-string 2 rev)))
(when (and (not (magit-ref-exists-p (concat "refs/heads/" branch)))
(yes-or-no-p
(format "Create local tracking branch for %s? " branch)))
(magit-run-git "checkout" "-b" branch rev)
t))
(let* ((remote (match-string 1 rev))
(branch (match-string 2 rev))
(tracker-name (magit-get-tracking-name remote branch)))
(when tracker-name
(magit-run-git "checkout" "-b" tracker-name rev)
t))
nil))
(defun magit-checkout (revision)