Add vimdiff for mercurial.
author |
Steve Losh <steve@stevelosh.com> |
date |
Fri, 14 May 2010 19:36:29 -0400 |
parents |
c37b42fc8409 |
children |
4488c06ee076 |
[ui]
username = Steve Losh <steve@stevelosh.com>
editor = mate -w
[extensions]
graphlog =
record =
bookmarks =
rebase =
purge =
mq =
patchbomb =
extdiff =
color =
parentrevspec =
schemes =
progress =
paste = ~/lib/hg/hg-paste/paste.py
prompt = ~/lib/hg/hg-prompt/prompt.py
histedit = ~/lib/hg/histedit
hggit = ~/lib/hg/hg-git/hggit
collapse = ~/lib/hg/hgcollapse/hgext/collapse.py
[progress]
delay = 1.0
[schemes]
webf = ssh://sjl@sjl.webfactional.com/repos/
bbs = ssh://hg@bitbucket.org/
gh = git://github.com/
ghs = git+ssh://git@github.com/
cb = ssh://hg@codebasehq.com/
cbdw = ssh://hg@codebasehq.com/dwaiter/
[diff]
git = True
unified = 10
[extdiff]
cmd.fmdiff = fmdiff
cmd.vd = mvim
opts.vd = -f '+next' '+execute "DirDiff" argv(0) argv(1)'
[email]
method = smtp
from = Steve Losh <steve@stevelosh.com>
[smtp]
host = smtp.stevelosh.com
port = 587
username = sjl
tls = True
[web]
allow_archive = gz zip bz2
motd = more info at <a href="http://stevelosh.com/projects/">stevelosh.com/projects</a>
[color]
status.modified = cyan
status.added = green
status.removed = red
status.deleted = yellow bold underline
status.unknown = magenta bold underline
status.ignored = black bold
diff.diffline = none
diff.extended = cyan
diff.file_a = red
diff.file_b = green
diff.hunk = yellow bold
diff.deleted = red
diff.inserted = green
diff.changed = white
diff.trailingwhitespace = white_background
[bookmarks]
track.current = True
[defaults]
diff = --color auto
status = --color auto
serve = --style=gitweb
rebase = --keepbranches
addremove = --similarity 100
[alias]
nudge = push --rev .
st = status -C
? = summary
pullr = pull --remotecmd '~/bin/hg'
pushr = push --remotecmd '~/bin/hg'
cm = commit -m
cus = commit -m 'Update subrepository state.'
cuf = commit -m 'Update fixtures.' -I '**fixtures**.json'
cmwn = commit -m 'Merge with Nick.'
#mlocal = merge --config 'ui.merge=internal:local'
#mother = merge --config 'ui.merge=internal:other'
#mfail = merge --config 'ui.merge=internal:fail'
fdiff = diff -U 10000000000000
qfdiff = qdiff -U 10000000000000
dlog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.dlog
_ = dlog -l15
__ = _ -l100000000
o_ = outgoing -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.dlog
i_ = incoming -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.dlog
slog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.slog
. = slog -l15
.. = . -l100000000
o. = outgoing -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.slog
i. = incoming -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.slog
sglog = glog --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
, = sglog -l7
,, = , -l100000000
o, = outgoing --graph --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
i, = incoming --graph --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
nlog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.nlog
n = nlog -vr
show = nlog --color=always -vpr
qcm = qcommit -m