Skip to content

Update Emacs integration and interaction with modern git. #12

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

Closed
slippycheeze wants to merge 6 commits into from
Closed

Update Emacs integration and interaction with modern git. #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b0660e
merge in some emacs git-wip-mode updates from robertkrimen
bartman Apr 7, 2012
08685cb
change default: untracked changes are added unless -t / --only-tracke…
MSch Jan 3, 2010
c45a1c6
More robust .git/* editing detection
robertkrimen Mar 16, 2011
88b8d5c
Emacs 23.4.1 returns symbols from `vc-backend`, not strings.
slippycheeze Apr 20, 2012
816989a
Invoke `git-wip` through git magic, not directly.
slippycheeze Apr 20, 2012
361f5e1
Use the right branch in `git wip log` error message.
slippycheeze Apr 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions emacs/git-wip-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@

(require 'vc)

(defun git-wip-buffer-is-git-p ()
"Return true if the current buffer is managed by git, false otherwise."
(string= "git" (downcase (format "%s" (vc-backend (buffer-file-name))))))

(defun git-wip-after-save ()
(interactive)
(when (string= (vc-backend (buffer-file-name)) "Git")
(when (git-wip-buffer-is-git-p)
(start-process "git-wip" "*git-wip*"
"git-wip" "save" (concat "WIP from emacs: "
(file-name-nondirectory
buffer-file-name))
"git" "wip" "save" (concat "WIP from emacs: "
(file-name-nondirectory
buffer-file-name))
"--editor" "--"
(file-name-nondirectory buffer-file-name))
(message (concat "Wrote and git-wip'd " (buffer-file-name)))))
Expand All @@ -35,7 +39,7 @@ you save a buffer."

(defun git-wip-mode-if-git ()
(interactive)
(when (string= (vc-backend (buffer-file-name)) "Git")
(when (git-wip-buffer-is-git-p)
(git-wip-mode t)))

(add-hook 'find-file-hook 'git-wip-mode-if-git)
Expand Down
12 changes: 6 additions & 6 deletions git-wip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Please see http://www.gnu.org/licenses/gpl-2.0.txt
#

USAGE='[ info | save <message> [ --editor | --untracked ] | log [ --pretty ] | delete ] [ [--] <file>... ]'
USAGE='[ info | save <message> [ --editor | --only-tracked ] | log [ --pretty ] | delete ] [ [--] <file>... ]'
LONG_USAGE="Manage Work In Progress branches

Commands:
Expand All @@ -27,7 +27,7 @@ Commands:

Options for save:
-e --editor - be less verbose, assume called from an editor
-u --untracked - capture also untracked files
-t --only-tracked - only capture untracked files
-i --ignored - capture also ignored files

Options for log:
Expand Down Expand Up @@ -120,7 +120,7 @@ build_new_tree () {

do_save () {
local msg="$1" ; shift
local add_untracked=
local add_untracked=t
local add_ignored=

while test $# != 0
Expand All @@ -129,8 +129,8 @@ do_save () {
-e|--editor)
EDITOR_MODE=true
;;
-u|--untracked)
add_untracked=t
-t|--only-tracked)
add_untracked=
;;
-i|--ignored)
add_ignored=t
Expand Down Expand Up @@ -242,7 +242,7 @@ do_log () {

if ! wip_last=$(git rev-parse --quiet --verify $wip_branch)
then
die "'$work_branch' branch has no commits."
die "'$wip_branch' branch has no commits."
fi

dbg wip_last=$wip_last
Expand Down
11 changes: 11 additions & 0 deletions vim/plugin/git-wip.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ endif

function! GitWipSave()
let dir = expand("%:p:h")
let show_cdup = system('cd ' . dir . ' && git rev-parse --show-cdup 2>/dev/null')
if v:shell_error
" We're not editing a file anywhere near a .git repository, so abort
return
endif
let show_cdup_len = len( show_cdup )
if show_cdup_len == 0
" We're editing a file in the .git directory
" (.git/EDIT_COMMITMSG, .git/config, etc.), so abort
return
endif
let file = expand("%:t")
let out = system('cd ' . dir . ' && git wip save "WIP from vim (' . file . ')" --editor -- "' . file . '" 2>&1')
let err = v:shell_error
Expand Down