git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle git p4 submit.
[profile.git]
/
.profile.d
/
p4.bashrc
diff --git
a/.profile.d/p4.bashrc
b/.profile.d/p4.bashrc
index
0422ee8
..
b4134c0
100644
(file)
--- a/
.profile.d/p4.bashrc
+++ b/
.profile.d/p4.bashrc
@@
-5,10
+5,19
@@
else
export P4USER=$USER
fi
export P4CONFIG=.p4config
export P4USER=$USER
fi
export P4CONFIG=.p4config
-export P4DIFF="diff -u"
-export P4EDITOR="vim -S '$HOME/.vim/script/p4'"
+eval $(alias diff 2>/dev/null | sed 's/^alias diff/P4DIFF/')
+export P4DIFF="${P4DIFF:-diff} -u"
+if [ -e "$HOME/.vim/script/p4" ]; then
+ export P4EDITOR="vim -S '$HOME/.vim/script/p4'"
+else
+ export P4EDITOR=vim
+fi
if [ -z "$DISPLAY" ]; then
if [ -z "$DISPLAY" ]; then
- export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
+ if [ -e "$HOME/.vim/script/p4" ]; then
+ export P4MERGE="vim -S '$HOME/.vim/script/p4'"
+ else
+ export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
+ fi
else
else
- export P4MERGE="p4
v -
merge"
+ export P4MERGE="p4merge"
fi
fi