-
Notifications
You must be signed in to change notification settings - Fork 0
/
.hgrc
95 lines (76 loc) · 2.24 KB
/
.hgrc
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
[ui]
username = Jan Krag <[email protected]>
editor = vim
ignore=/Users/jankrag/.hgignore_global
ssh = ssh -C
[extensions]
fetch =
hgext.extdiff =
graphlog =
color =
progress =
prompt = /Users/jankrag/Documents/hgextensions/hg-prompt/prompt.py
compass = /Users/jankrag/Documents/hgextensions/hg-compass/compass.py
transplant =
[extdiff]
cmd.kdiff3 =
cmd.sourcetreediff=opendiff
opts.sourcetreediff=
[merge-tools]
kdiff3.args = $base $local $other -o $output
sourcetreemerge.gui=False
sourcetreebulkmerge.gui=False
sourcetreemerge.binary=False
sourcetreebulkmerge.executable=/Applications/SourceTree.app/Contents/Resources/hg-merge.sh
sourcetreemerge.args=$local $other -ancestor $base -merge $output
sourcetreemerge.checkconflicts=True
sourcetreemerge.premerge=True
sourcetreemerge.executable=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh
sourcetreebulkmerge.premerge=False
sourcetreebulkmerge.binary=True
[progress]
delay = 1.0
[web]
cacerts = /etc/hg-dummy-cert.pem
[color]
mode = auto
summary.branch = cyan bold
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
branches.active = green bold
branches.closed = blue
branches.current = green
branches.inactive = none
[alias]
#update = update -c
# Nudge: just push the current branch.
nudge = push --branch .
# Commit message shortcuts.
cm = commit -m
cmm = commit -m 'Merge.'
# Diff.
d = diff -p --color=auto
# Run a colored diff and pipe it to less.
dl = !"$HG" diff -p --color=always $@ | less -R
gl = glog -l10 --template='\033[0;33m{rev}\033[0m {desc|firstline|strip} \033[0;35m{branches}\033[0m \033[0;33m{tags}\033[0m\n\033[1;30m({date|age} by {author|person})\033[0m\n\n'
slog = log --template '{rev} {node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n'
sl = slog -l 20
overview = compass --hide-closed --hide-inactive
@ = overview --hide-branch-overview
st = status -SC
? = summary
#Show diff with full file context
fdiff = diff -U 10000000000000