Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 270 lines (225 sloc) 8.37 kb
2ba1812 @sjl Initial revision. Finally.
authored
1 [ui]
2 username = Steve Losh <steve@stevelosh.com>
8cf00d4 @sjl hg: change editor to vim
authored
3 editor = vim
ac276b0 @sjl hg: commitsubrepos is evil
authored
4 commitsubrepos = False
7a3d2f3 @sjl Add global hgignore.
authored
5 ignore = ~/.hgignore
2ba1812 @sjl Initial revision. Finally.
authored
6
7 [extensions]
f921a7e @sjl hg: add transplant
authored
8 transplant =
77c9b65 @sjl Remove the hgext. prefixes.
authored
9 graphlog =
10 record =
11 bookmarks =
12 rebase =
13 purge =
14 mq =
15 patchbomb =
16 extdiff =
2ba1812 @sjl Initial revision. Finally.
authored
17 color =
ad8214a @sjl Add parentrevspec and smtp.port.
authored
18 parentrevspec =
275bdc4 @sjl Add the schemes extension to hgrc.
authored
19 schemes =
5a5eef7 @sjl More hgrc stuff.
authored
20 progress =
036ce5b @sjl guts: lots
authored
21 fetch =
d28b1b5 @sjl Moar.
authored
22 prompt = ~/lib/dotfiles/mercurial/hg-prompt/prompt.py
23 histedit = ~/lib/dotfiles/mercurial/histedit/hg_histedit.py
919f8f7 @sjl moar.
authored
24 hggit = ~/.hg-git/hggit
1144417 @sjl Enable transplant, use abd's fork of hg-git, and alias histedit to re…
authored
25
5a5eef7 @sjl More hgrc stuff.
authored
26 [progress]
27 delay = 1.0
28
8ce7054 @sjl Pydoc and more.
authored
29 [web]
30 cacerts = /etc/hg-dummy-cert.pem
31
275bdc4 @sjl Add the schemes extension to hgrc.
authored
32 [schemes]
33 webf = ssh://sjl@sjl.webfactional.com/repos/
34 bbs = ssh://hg@bitbucket.org/
c155728 @sjl More.
authored
35 bbss = ssh://hg@bitbucket.org/sjl/
36 bbsd = ssh://hg@bitbucket.org/dwaiter/
a19f252 @sjl Add GitHub schemes.
authored
37 gh = git://github.com/
38 ghs = git+ssh://git@github.com/
a442e3f @sjl Add two aliases.
authored
39 cb = ssh://hg@codebasehq.com/
50a1b35 @sjl Add a scheme for the Dumbwaiter codebase repos.
authored
40 cbdw = ssh://hg@codebasehq.com/dwaiter/
5e4a6a4 hg: add the cbsl scheme
Steve Losh authored
41 cbsl = ssh://hg@codebasehq.com/stevelosh/
49203ce @sjl vim: add taglist
authored
42 dwd = ssh://hg@bitbucket.org/dwaiter/
5370018 @sjl Fixes.
authored
43 nyh = ssh://sjl@gotham.nyhacker.org/
13c6e7f @sjl Moar
authored
44 dl = ssh://hg@hg.dwaiter.com:38038/
dc4fcd0 @sjl Add vimmerge.
authored
45 mirr = ssh://hg@dwaiter.com:38038/mirror/
406e558 @sjl Moar.
authored
46 gc = https://code.google.com/p/
275bdc4 @sjl Add the schemes extension to hgrc.
authored
47
2717eed @sjl Add git = True to the diff section, and sim default for addremove.
authored
48 [diff]
49 git = True
2047d9f @sjl Cleanup before going public.
authored
50 unified = 5
2717eed @sjl Add git = True to the diff section, and sim default for addremove.
authored
51
0f35fff @sjl Add the extdiff for filemerge.
authored
52 [extdiff]
568d743 @sjl Add vimdiff for mercurial.
authored
53 cmd.vd = mvim
b735ad8 @sjl Set a specific size for vimdiff windows.
authored
54 opts.vd = -c 'set lines=70' -c 'set columns=240' -f '+next' '+execute "DirDiff" argv(0) argv(1)'
acb3750 @sjl vim: kill delimitmate
authored
55 cmd.ksdiff = /usr/local/bin/ksdiff-wrapper
56 opts.ksdiff = hg
ad44ad9 @sjl mercurial: hack around Kaleidoscopes broken process detection
authored
57 cmd.dd = diffuse
58 opts.dd =
59
60 [merge-tools]
098ddcf @sjl moar
authored
61 splice.executable = vim
62 splice.args = -f $base $local $other $output -c 'SpliceInit'
63 splice.premerge = keep
64 splice.priority = 1
0f35fff @sjl Add the extdiff for filemerge.
authored
65
d26bab3 @sjl Add some very dirty merge tools.
authored
66 keepthat.executable = sh
363abed @sjl Wrap with quotes.
authored
67 keepthat.args = -c 'cp "$local" "$output.original" && cp "$other" "$output"'
d26bab3 @sjl Add some very dirty merge tools.
authored
68 keepthat.premerge = True
69
70 keepthis.executable = sh
363abed @sjl Wrap with quotes.
authored
71 keepthis.args = -c 'cp "$other" "$output.incoming" && cp "$local" "$output"'
d26bab3 @sjl Add some very dirty merge tools.
authored
72 keepthis.premerge = True
73
4ddf1cb @sjl Add the patchbomb extension with good options.
authored
74 [email]
75 method = smtp
76 from = Steve Losh <steve@stevelosh.com>
77
78 [smtp]
b22af56 @sjl vim: yep, sure haven't committed in a while'
authored
79 host = smtp.gmail.com
ad8214a @sjl Add parentrevspec and smtp.port.
authored
80 port = 587
b22af56 @sjl vim: yep, sure haven't committed in a while'
authored
81 username = steve@stevelosh.com
4ddf1cb @sjl Add the patchbomb extension with good options.
authored
82 tls = True
83
2ba1812 @sjl Initial revision. Finally.
authored
84 [color]
621fd1f @sjl Modify some hg color settings.
authored
85 status.modified = cyan
86 status.added = green
87 status.removed = red
2ba1812 @sjl Initial revision. Finally.
authored
88 status.deleted = yellow bold underline
89 status.unknown = magenta bold underline
90 status.ignored = black bold
621fd1f @sjl Modify some hg color settings.
authored
91 diff.diffline = none
92 diff.extended = cyan
93 diff.file_a = red
94 diff.file_b = green
95 diff.hunk = yellow bold
96 diff.deleted = red
97 diff.inserted = green
98 diff.changed = white
99 diff.trailingwhitespace = white_background
2ba1812 @sjl Initial revision. Finally.
authored
100
101 [bookmarks]
102 track.current = True
103
104 [defaults]
26280d8 @sjl Add branches to the glog output.
authored
105 rebase = --keepbranches
2717eed @sjl Add git = True to the diff section, and sim default for addremove.
authored
106 addremove = --similarity 100
5193f34 @sjl Major cleanup of my hg aliases.
authored
107
108 [alias]
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
109 # Nudge: just push the current branch.
ff9d4b6 @sjl hg: make nudge better
authored
110 nudge = push --branch .
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
111
112 # Some useful little aliases.
a252bd7 @sjl Moar.
authored
113 st = status -SC
9f782a8 @sjl Add an alias for summary.
authored
114 ? = summary
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
115 fdiff = diff -U 10000000000000
116 qfdiff = qdiff -U 10000000000000
5193f34 @sjl Major cleanup of my hg aliases.
authored
117
e85365f @sjl hg pg
authored
118 # Push to the git mirror at the same time.
119 pg = !"$HG" push && "$HG" push git
120
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
121 # Push the qparent revision (mnemonic: q push parent).
122 qpp = push -r qparent
123
124 # Merge with default.
125 md = merge default
126
127 # Commit message shortcuts.
3fae2d5 @sjl Add the hg cus alias.
authored
128 cm = commit -m
129 cus = commit -m 'Update subrepository state.'
43eb020 @sjl Random git and hg alias changes.
authored
130 cuf = commit -m 'Update fixtures.' -I '**fixtures**.json'
5f85f3e @sjl Wow.
authored
131 cmm = commit -m 'Merge.'
41164eb @sjl Moar.
authored
132 cws = commit -m 'Whitespace.'
3fae2d5 @sjl Add the hg cus alias.
authored
133
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
134 # Merge shortcuts.
6deb600 @sjl Moar.
authored
135 mergelocal = !$HG --config ui.merge=internal:local merge $@
136 mergeother = !$HG --config ui.merge=internal:other merge $@
137 mergefail = !$HG --config ui.merge=internal:fail merge $@
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
138
139 # Shortcuts to resolve merge conflicts by taking one side or the other.
a2b8320 @sjl Dear God can we lose the stupid previews already?
authored
140 takelocal = !"$HG" revert --rev 'p1()' $@ && "$HG" resolve -m $@
141 takeother = !"$HG" revert --rev 'p2()' $@ && "$HG" resolve -m $@
142
3798e38 @sjl Tweaks.
authored
143 # Diff.
144 d = diff -p --color=auto
145
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
146 # Run a colored diff and pipe it to less.
bdfd0b8 @sjl moar
authored
147 dl = !"$HG" diff -p --color=always $@ | less -R
174b41f @sjl ...
authored
148
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
149 # Kaleidoscope
150 # Mnemonics: "kaleidoscope diff" and "kaleidoscope show"
ad44ad9 @sjl mercurial: hack around Kaleidoscopes broken process detection
authored
151 kd = !/opt/local/bin/hg ksdiff $@
152 ks = !/opt/local/bin/hg ksdiff -c $@
e2cfe59 hg: add the ks alias
Steve Losh authored
153
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
154 # Log shortcuts --------------------------------------------------------------------
155 #
156 # Each of these can be used with -v to add a bit more info.
157
158 # Datelog: short, pretty hg log with dates.
2047d9f @sjl Cleanup before going public.
authored
159 dlog = log --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.dlog
5aee3a2 @sjl Add the dlog alias for Mercurial.
authored
160 _ = dlog -l15
161 __ = _ -l100000000
2047d9f @sjl Cleanup before going public.
authored
162 o_ = outgoing -n --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.dlog
163 i_ = incoming -n --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.dlog
5aee3a2 @sjl Add the dlog alias for Mercurial.
authored
164
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
165 # Shortlog: short, pretty hg log.
2047d9f @sjl Cleanup before going public.
authored
166 slog = log --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.slog
4f0bcd9 @sjl Reformat some of the aliases.
authored
167 . = slog -l15
646c276 @sjl Add the new style map files.
authored
168 .. = . -l100000000
2047d9f @sjl Cleanup before going public.
authored
169 o. = outgoing -n --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.slog
170 i. = incoming -n --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.slog
5193f34 @sjl Major cleanup of my hg aliases.
authored
171
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
172 # Short graphlog: short, pretty hg log with a graph.
2047d9f @sjl Cleanup before going public.
authored
173 sglog = glog --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.sglog
7bc6db5 @sjl Add qcm.
authored
174 , = sglog -l7
646c276 @sjl Add the new style map files.
authored
175 ,, = , -l100000000
2047d9f @sjl Cleanup before going public.
authored
176 o, = outgoing --graph --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.sglog
177 i, = incoming --graph --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.sglog
8faecae @sjl Add some more hg aliases.
authored
178
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
179
180 # hg n . -- show a summary of rev . without diff.
181 # hg show . -- show a summary of rev . with diff.
2047d9f @sjl Cleanup before going public.
authored
182 nlog = log --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.nlog
ff43f8a @sjl Rearrange some files, finish nlog.
authored
183 n = nlog -vr
915c720 @sjl Add and adjust some hg aliases.
authored
184 show = nlog --color=always -vpr
036ce5b @sjl guts: lots
authored
185
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
186 # Simple glog command that doesn't look bad and doesn't require my CLI templates.
4d6da1c @sjl Minor tweaks.
authored
187 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'
188
16f12a5 @sjl hg: comments for aliases
authored
189 # Make a new repo with some sensible defaults.
ad5aaa2 @sjl hg: add some shell aliases
authored
190 mkrepo = !$HG init $1 && cd $1 && \
07504e3 @sjl hg: more aliases
authored
191 echo 'syntax: glob' > .hgignore && \
192 echo '' >> .hgignore && \
193 echo '.DS_Store' >> .hgignore && \
194 echo '*.pyc' >> .hgignore && \
195 echo '*.swp' >> .hgignore && \
196 echo '*.swo' >> .hgignore && \
197 echo '*.un~' >> .hgignore && \
949fdd5 @sjl Stuff.
authored
198 echo '.ropeproject' >> .hgignore && \
199 echo 'tags' >> .hgignore && \
07504e3 @sjl hg: more aliases
authored
200 echo "[paths]\n" >> .hg/hgrc
ad5aaa2 @sjl hg: add some shell aliases
authored
201
16f12a5 @sjl hg: comments for aliases
authored
202 # Empty the current MQ patch.
ad5aaa2 @sjl hg: add some shell aliases
authored
203 qempty = !$HG qrefresh -X `$HG root`
204
16f12a5 @sjl hg: comments for aliases
authored
205 # Commit under any applied MQ patches, and go back to where you were after doing so.
206 # `hg ciunder` will use `$EDITOR` to get the commit message
207 # `hg cmunder 'message'` takes it on the command line
ad5aaa2 @sjl hg: add some shell aliases
authored
208 ciunder = !HG_CUR_PATCH=`$HG qtop --color=never` && \
209 $HG qnew temp-for-under && \
210 $HG qpop -a && \
211 $HG qpush --move temp-for-under && \
212 $HG qrefresh -e && \
213 $HG qfinish temp-for-under && \
214 $HG qpush $HG_CUR_PATCH
215 cmunder = !HG_CUR_PATCH=`$HG qtop --color=never` && \
216 $HG qnew temp-for-under && \
217 $HG qpop -a && \
218 $HG qpush --move temp-for-under && \
219 $HG qrefresh -m "$@" && \
220 $HG qfinish temp-for-under && \
221 $HG qpush $HG_CUR_PATCH
16f12a5 @sjl hg: comments for aliases
authored
222
223 # Edit the current repo's hgrc file.
07504e3 @sjl hg: more aliases
authored
224 erc = !$EDITOR `$HG root`/.hg/hgrc
225
16f12a5 @sjl hg: comments for aliases
authored
226 # Simple bug/todo tracking
227 # Idea from Justin: http://gist.github.com/464871
07504e3 @sjl hg: more aliases
authored
228 # Install t first: http://bitbucket.org/sjl/t/
229 bug = !~/lib/t/t.py --task-dir="`$HG root`" --list=BUGS $@
230 todo = !~/lib/t/t.py --task-dir="`$HG root`" --list=TODO $@
353e323 @sjl A bunch of stuff.
authored
231
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
232 # Easily add ignore patterns to .hgignore and commit.
353e323 @sjl A bunch of stuff.
authored
233 ignore = ![ -n "$@" ] && echo '$@' >> `$HG root`/.hgignore && \
234 $HG commit `$HG root`/.hgignore -Am 'Add "$@" to .hgignore.'
f6131e7 @sjl Lots.
authored
235
3697393 @sjl More random stuff.
authored
236 # Show in MacVim
237 vshow = !$HG show $@ | mvim -c ':AnsiEsc' -c 'setlocal buftype=nofile' -
d4a86a8 @sjl Moar.
authored
238
d917cd7 @sjl Random stuff.
authored
239 # Ack for non-ignored files
240 ack = !$HG locate "set:not ignored()" | xargs ack $@
241 grep-wdir = !$HG locate "set:not ignored()" | xargs grep $@
242
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
243 # Run hg commands on all subrepos at once.
70762b1 @sjl Use debugsub.
authored
244 subs = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | xargs -n1 -I SUB $HG -R "`$HG root`/SUB" $@
245 psubs = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | parallel -j10 -I SUB $HG -R "`$HG root`/SUB" $@
4be592d @sjl Docs.
authored
246
29ec657 @sjl Comment hgrc and add Clojure ML.
authored
247 # Run shell commands on all subrepos at once.
6dd7990 @sjl More.
authored
248 subscmd = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | xargs -n1 -I SUB sh -c "cd `$HG root`/SUB && $@"
249 psubscmd = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | parallel -j10 -I SUB sh -c "cd `$HG root`/SUB && $@"
250
4be592d @sjl Docs.
authored
251 # Run a command on a subrepo:
252 #
253 # hg sub SUBREPO_REGEX ...command and arguments...
254 #
255 # The SUBREPO_REGEX should be a regex that will let grep match one and only one of
256 # the subrepos in .hgsub. For example:
257 #
258 # $ cat .hgsub
259 # bundled/foo = ...
260 # bundled/bar = ...
261 #
262 # $ hg sub fo root
263 # .../bundled/foo
264 # $ hg sub ar status -m
265 # M lol.py
516a088 @sjl Moar.
authored
266 sub = !grep = "`$HG root`/.hgsub" | cut -d' ' -f1 | grep "$1" | tr -d '\n ' | xargs -0 -I SUB $HG -R SUB $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20
0686d9c @sjl Include local hgrc.
authored
267
268 # Local settings
269 %include ~/.hgrc_local
Something went wrong with that request. Please try again.