Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve branch and checkout commands #1233

Merged
merged 2 commits into from Feb 22, 2014
Merged

improve branch and checkout commands #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9af9551
how I learned to stop worrying and love the detached HEAD
tarsius Feb 22, 2014
32c8c3a
branch: use common "magit-branch-" prefix
tarsius Feb 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions magit-topgit.el
View file
Open in desktop
Expand Up @@ -176,15 +176,15 @@
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-topgit-topics
'magit-insert-stashes t t)
(add-hook 'magit-create-branch-hook 'magit-topgit-create-branch nil t)
(add-hook 'magit-branch-create-hook 'magit-topgit-create-branch nil t)
(add-hook 'magit-remote-update-hook 'magit-topgit-remote-update nil t)
(add-hook 'magit-pull-hook 'magit-topgit-pull nil t)
(add-hook 'magit-push-hook 'magit-topgit-push nil t)
(add-hook 'magit-visit-hook 'magit-topgit-checkout nil t)
(add-hook 'magit-discard-hook 'magit-topgit-discard nil t))
(t
(remove-hook 'magit-status-sections-hook 'magit-insert-topgit-topics t)
(remove-hook 'magit-create-branch-hook 'magit-topgit-create-branch t)
(remove-hook 'magit-branch-create-hook 'magit-topgit-create-branch t)
(remove-hook 'magit-remote-update-hook 'magit-topgit-remote-update t)
(remove-hook 'magit-pull-hook 'magit-topgit-pull t)
(remove-hook 'magit-push-hook 'magit-topgit-push t)
Expand Down
80 changes: 14 additions & 66 deletions magit.el
View file
Open in desktop
Expand Up @@ -574,18 +574,6 @@ deep."
:group 'magit
:type 'integer)

(defcustom magit-default-tracking-name-function
'magit-default-tracking-name-remote-plus-branch
"Function used to generate default tracking branch names
when doing a \\[magit-checkout].

The default is `magit-default-tracking-name-remote-plus-branch',
which generates a tracking name of the form \"REMOTE-BRANCHNAME\"."
:group 'magit
:type '(radio (function-item magit-default-tracking-name-remote-plus-branch)
(function-item magit-default-tracking-name-branch-only)
(function :tag "Other")))

;;;;; Modes
;;;;;; Common

Expand Down Expand Up @@ -1550,7 +1538,7 @@ set before loading libary `magit'.")
(defvar magit-branch-manager-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map magit-mode-map)
(define-key map (kbd "c") 'magit-create-branch)
(define-key map (kbd "c") 'magit-branch-and-checkout)
(define-key map (kbd "a") 'magit-add-remote)
(define-key map (kbd "r") 'magit-rename-item)
(define-key map (kbd "k") 'magit-discard-item)
Expand Down Expand Up @@ -5125,7 +5113,7 @@ Please unstage it first")))
(if current-prefix-arg
(concat "Force delete branch [" info "]? ")
(concat "Delete branch [" info "]? ")))
(magit-delete-branch info current-prefix-arg)))
(magit-branch-delete info current-prefix-arg)))
(remote (when (yes-or-no-p "Remove remote? ")
(magit-remove-remote info)))))

Expand Down Expand Up @@ -5505,54 +5493,16 @@ inspect the merge and change the commit message.
(?n "Not merged" "--no-merged=" magit-popup-read-rev))
:actions '((?v "Branch manager" magit-branch-manager)
(?b "Checkout" magit-checkout)
(?c "Create" magit-create-branch)
(?r "Rename" magit-rename-branch)
(?k "Delete" magit-delete-branch))
(?c "Create" magit-branch-and-checkout)
(?r "Rename" magit-branch-rename)
(?k "Delete" magit-branch-delete))
:default-action 'magit-checkout)

(defun magit-escape-branch-name (branch)
"Escape branch name BRANCH to remove problematic characters."
(replace-regexp-in-string "[/]" "-" branch))

(defun magit-default-tracking-name-remote-plus-branch (remote branch)
"Use the remote name plus a hyphen plus the escaped branch name for tracking branches."
(concat remote "-" (magit-escape-branch-name branch)))

(defun magit-default-tracking-name-branch-only (remote branch)
"Use just the escaped branch name for tracking branches."
(magit-escape-branch-name branch))

(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
(funcall magit-default-tracking-name-function 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))
(user-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."
(when (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" rev)
(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))))

;;;###autoload
(defun magit-checkout (revision)
"Switch 'HEAD' to REVISION and update working tree.
Fails if working tree or staging area contain uncommitted changes.
If REVISION is a remote branch, offer to create a local tracking branch.
\('git checkout [-b] REVISION')."
\('git checkout REVISION')."
(interactive
(list (let ((current-branch (magit-get-current-branch))
(default (or (magit-guess-branch)
Expand All @@ -5561,29 +5511,27 @@ If REVISION is a remote branch, offer to create a local tracking branch.
(unless (string= current-branch default)
default)
current-branch))))
(or (magit-maybe-create-local-tracking-branch revision)
(progn
(magit-save-some-buffers)
(magit-run-git "checkout" revision))))
(magit-save-some-buffers)
(magit-run-git "checkout" revision))

;;;###autoload
(defun magit-create-branch (branch parent)
(defun magit-branch-and-checkout (branch parent)
"Switch 'HEAD' to new BRANCH at revision PARENT and update working tree.
Fails if working tree or staging area contain uncommitted changes.
\('git checkout -b BRANCH REVISION')."
(interactive
(list (read-string "Create branch: ")
(list (read-string "Create and checkout branch: ")
(magit-read-rev "Parent" (or (magit-guess-branch)
(magit-get-current-branch)))))
(cond ((run-hook-with-args-until-success
'magit-create-branch-hook branch parent))
'magit-branch-create-hook branch parent))
((and branch (not (string= branch "")))
(magit-save-some-buffers)
(magit-run-git "checkout" magit-current-popup-args
"-b" branch parent))))

;;;###autoload
(defun magit-delete-branch (branch &optional force)
(defun magit-branch-delete (branch &optional force)
"Delete the BRANCH.
If the branch is the current one, offers to switch to `master' first.
With prefix, forces the removal even if it hasn't been merged.
Expand Down Expand Up @@ -5616,7 +5564,7 @@ Works with local or remote branches.
(magit-run-git args))))))

;;;###autoload
(defun magit-rename-branch (old new &optional force)
(defun magit-branch-rename (old new &optional force)
"Rename branch OLD to NEW.
With prefix, forces the rename even if NEW already exists.
\('git branch [-m|-M] OLD NEW')."
Expand Down Expand Up @@ -7774,7 +7722,7 @@ from the parent keymap `magit-mode-map' are also available.")
"Rename the item at point."
(interactive)
(magit-section-action rename ()
(branch (call-interactively 'magit-rename-branch))
(branch (call-interactively 'magit-branch-rename))
(remote (call-interactively 'magit-rename-remote))))

(defun magit-change-what-branch-tracks ()
Expand Down