author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Thu, 27 Jan 2011 20:33:44 +0200 | |
changeset 788 | 218791dc0b27 |
parent 766 | 0eb76fb9d948 |
child 793 | 7453db7e6f54 |
permissions | -rw-r--r-- |
294 | 1 |
-*- mode: outline; coding: utf-8 -*- |
2 |
||
674
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
3 |
* About. |
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
4 |
|
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
5 |
http://mercurial.selenic.com/wiki/ProjectsUsingMercurial |
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
6 |
Some Projects that Use Mercurial |
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
7 |
|
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
8 |
* User config. |
310
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
9 |
|
313
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
10 |
Put to your ~/.hgrc: |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
11 |
|
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
12 |
[ui] |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
13 |
; Editor for editing commit message. |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
14 |
editor = gvim |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
15 |
; Who commit. |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
16 |
username = Oleksandr Gavenko <gavenkoa@gmail.com> |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
17 |
; Use internal merge algorithm, which mark conflict like <<<<<< ====== >>>>>>. |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
18 |
; Save previous file version in '*.orig' file, after merge must be marked as |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
19 |
; resolved by running 'hg resolve -m <file>'. |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
20 |
merge = internal:merge |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
21 |
[web] |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
22 |
; Default encoding for file hosted by 'hg serv'. |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
23 |
encoding = utf-8 |
7cc6dcfa284e
Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
312
diff
changeset
|
24 |
|
312 | 25 |
** Useful extension. |
26 |
||
27 |
Put to your ~/.hgrc: |
|
28 |
||
29 |
[extensions] |
|
30 |
; To allow fetch command. |
|
31 |
fetch = |
|
32 |
; To allow Mercurial Queues. |
|
33 |
hgext.mq = |
|
34 |
||
310
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
35 |
** Multiline log message for log command. |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
36 |
|
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
37 |
By default 'hg log' show only first line of log message. To see all message run: |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
38 |
|
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
39 |
$ hg log -v |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
40 |
|
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
41 |
or put into ~/.hgrc: |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
42 |
|
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
43 |
[defaults] |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
44 |
log = -v |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
45 |
|
311
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
46 |
** Follow history ever when file copied. |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
47 |
|
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
48 |
By default 'hg log' show only history after last file copy. To see log message |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
49 |
before copying run: |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
50 |
|
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
51 |
$ hg log -f |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
52 |
|
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
53 |
or put into ~/.hgrc: |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
54 |
|
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
55 |
[defaults] |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
56 |
log = -f |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
57 |
|
766
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
58 |
* Remove/rename files history from repo. |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
59 |
|
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
60 |
$ cat >filemap.txt <<EOF |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
61 |
exclude path/to/file-or-dir |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
62 |
rename path/to/source path/to/destination |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
63 |
... |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
64 |
EOF |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
65 |
$ hg convert --filemap filemap.txt $repo_orig $repo_new |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
66 |
$ hg -R $repo_new up |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
67 |
|
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
68 |
* Join history of two repos. |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
69 |
|
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
70 |
$ cat >filemap1.txt <<EOF |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
71 |
rename . dir1 |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
72 |
EOF |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
73 |
$ cat >filemap2.txt <<EOF |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
74 |
rename . dir2 |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
75 |
EOF |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
76 |
$ hg convert --filemap filemap1.txt $repo1 $repo_new |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
77 |
$ hg convert --filemap filemap2.txt $repo2 $repo_new |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
78 |
$ hg -R $repo_new merge |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
79 |
$ hg -R $repo_new ci -m "Join $repo1 and $repo2." |
0eb76fb9d948
Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
678
diff
changeset
|
80 |
|
676 | 81 |
* Publishing repo. |
675 | 82 |
|
83 |
With static HTTP hosting you can copy via rsync, ftp, scp, etc., so long as all the files beneath |
|
84 |
.hg are copied. Also since 1.1 pull protocol can detect static HTTP hosting: |
|
85 |
||
86 |
$ hg clone http://example.com/project |
|
87 |
||
88 |
http://mercurial.selenic.com/wiki/hgserve |
|
676 | 89 |
http://mercurial.selenic.com/wiki/HgWebDirStepByStep |
675 | 90 |
http://mercurial.selenic.com/wiki/StaticHTTP |
91 |
||
676 | 92 |
** hgweb.config. |
93 |
||
94 |
Set allowed project by specifying paths to they (keys are URL, values are fs paths): |
|
95 |
||
96 |
[paths] |
|
97 |
myproject = /home/user/hg/myproject |
|
98 |
otherproject = /home/user/hg/otherproject |
|
99 |
||
100 |
You can use single wildcard '*' to search current subdirs or double wildcard '**' to search subdirs |
|
101 |
recursively: |
|
102 |
||
103 |
[paths] |
|
104 |
myproject = /home/user/hg/my/* |
|
105 |
otherproject = /home/user/hg/other/** |
|
106 |
||
107 |
Alternatively you can set a collection of repos (keys and values are both filesystem paths, keys |
|
108 |
should be prefixes of the values and are "subtracted" from the values in order to generate the URL |
|
109 |
paths to each repository): |
|
110 |
||
111 |
[collections] |
|
112 |
/home/user/hg = /home/user/hg |
|
113 |
/home/another/hg = /home/another/hg |
|
114 |
||
115 |
Allow archive downloads: |
|
116 |
||
117 |
[web] |
|
118 |
allow_archive = gz, zip, bz2 |
|
119 |
||
120 |
Make web page look nice: |
|
121 |
||
122 |
[web] |
|
678 | 123 |
# Use 'cd /lib/python2.x/site-packages/mercurial/templates; find . -type d' to see available |
124 |
# styles. Some interesting: gitweb, coal, monoblue. |
|
676 | 125 |
style = gitweb |
126 |
||
127 |
Set another settings: |
|
128 |
||
129 |
[web] |
|
130 |
encoding = UTF-8 |
|
131 |
||
132 |
maxchanges = 100 |
|
133 |
maxfiles = 100 |
|
134 |
||
135 |
In each $proj/.hg/hgrc put: |
|
136 |
||
137 |
[web] |
|
138 |
contact = ADMIN <admin@example.com> |
|
139 |
description = <p style="color: red;">$proj</b> allow make a <a href="http://example.com">BIG Thing.</a> |
|
140 |
# Do not use name, in this case you see dir name where project lcated. |
|
141 |
# name = $proj |
|
142 |
||
143 |
To allow push in 'hg serv': |
|
144 |
||
145 |
[web] |
|
146 |
allow_push = * |
|
147 |
push_ssl = false |
|
148 |
||
149 |
http://mercurial.selenic.com/wiki/PublishingRepositories |
|
150 |
Publishing Mercurial Repositories |
|
151 |
||
675 | 152 |
** init.d script. |
153 |
||
154 |
#!/bin/sh |
|
155 |
CMD=/usr/bin/hg |
|
156 |
||
157 |
PORT=7878 |
|
158 |
SRC=/srv/hg |
|
159 |
CONGIG=/srv/hg/hgweb.config |
|
160 |
PIDFILE=/var/run/hg.pid |
|
161 |
||
162 |
case "$1" in |
|
163 |
start) |
|
164 |
echo "Mecurial Server service starting." |
|
165 |
(cd "$SRC"; $CMD serve -d -p $PORT --pid-file "$PIDFILE") |
|
166 |
;; |
|
167 |
stop) |
|
168 |
if [ -f "$PIDFILE" ]; then |
|
169 |
PID=`cat "$PIDFILE"` |
|
170 |
if [ "$PID" -gt 1 ]; then |
|
171 |
kill -TERM $PID |
|
172 |
echo "Stopping the Mercurial service PID=$PID." |
|
173 |
else |
|
174 |
echo Bad PID for Mercurial -- \"$PID\". |
|
175 |
echo You may remove \"$PIDFILE\" manually. |
|
176 |
fi |
|
177 |
else |
|
178 |
echo No PID file recorded for mercurial. |
|
179 |
fi |
|
180 |
;; |
|
181 |
*) |
|
182 |
echo "$0 {start|stop}" |
|
183 |
exit 1 |
|
184 |
;; |
|
185 |
esac |
|
186 |
||
187 |
http://mercurial.selenic.com/wiki/hgserve |
|
188 |
||
294 | 189 |
* Manage patches with MQ. |
190 |
||
191 |
First enable MQ, add following to your ~/.hgrc: |
|
192 |
||
193 |
[extensions] |
|
194 |
hgext.mq = |
|
195 |
||
196 |
Second get unpatched sources and put it to hg repository: |
|
197 |
||
198 |
$ tar zxf proj-x.y.z.tar.gz |
|
199 |
$ mv proj-x.y.z proj |
|
200 |
$ cd proj |
|
201 |
$ hg init |
|
202 |
$ hg ci -m "Added x.y.z version of proj." |
|
203 |
||
204 |
Init MQ and take name for first patch: |
|
205 |
||
206 |
$ hg qinit |
|
207 |
$ hg qnew first.patch |
|
208 |
||
209 |
Next make changes by editing source and save it to patch: |
|
210 |
||
211 |
$ $EDITOR file.c |
|
212 |
... |
|
213 |
$ hg diff |
|
214 |
... |
|
215 |
$ hg qrefresh |
|
216 |
$ hg diff # <-- have zero diff |
|
217 |
||
218 |
You can make second patch by applying existing one: |
|
219 |
||
220 |
$ hg qnew second.patch |
|
221 |
$ patch -p1 <bugfix.patch |
|
222 |
$ hg qrefresh |
|
223 |
||
224 |
You can take list of patches (from old to new) and revert or apply patches by |
|
225 |
qpop/qpush command: |
|
226 |
||
227 |
$ hg qseries # <-- what patches have |
|
228 |
first.patch |
|
229 |
second.patch |
|
230 |
$ hg qapplied # <-- what patches applied |
|
231 |
first.patch |
|
232 |
second.patch |
|
233 |
$ hg qpop |
|
234 |
$ hg qseries |
|
235 |
first.patch |
|
236 |
second.patch |
|
237 |
$ hg qapplied |
|
238 |
first.patch |
|
239 |
||
240 |
You can revert or apply all patches by single command: |
|
241 |
||
242 |
$ hg qpop -a |
|
243 |
$ hg qpush -a |
|
244 |
||
245 |
You can delete patch from patch list (before that you need de-apply patch): |
|
246 |
||
247 |
$ hg qpop -a |
|
248 |
$ hg qdelete first.patch |
|
249 |
||
250 |
To add new version of source and fix patches for it first de apply patches, |
|
251 |
then pull new changes and try apply patches on top of new sources: |
|
252 |
||
253 |
$ hg qpop -a |
|
254 |
$ rm * # .hg dir not deleted because its name start with dot |
|
255 |
$ cd .. |
|
256 |
$ tar zxf proj-a.b.c.tar.gz |
|
257 |
$ cp -R proj-a.b.c/* proj |
|
258 |
$ cd proj |
|
259 |
$ hg addremove -s 70 |
|
260 |
$ hg ci -m "Added a.b.c version of proj." |
|
261 |
$ hg qpush -a |
|
262 |
||
295
d3f8534dadf9
Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
294
diff
changeset
|
263 |
To apply series of already done patches use: |
d3f8534dadf9
Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
294
diff
changeset
|
264 |
|
d3f8534dadf9
Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
294
diff
changeset
|
265 |
$ ls /path/to/bugfixes/*.patch | xargs hg qimport |
425
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
266 |
|
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
267 |
* Proxy. |
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
268 |
|
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
269 |
$ hg clone --config http_proxy.host=$host:$port \ |
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
270 |
--config http_proxy.user=$user --config http_proxy.passwd=$password $addr |
673
faa365425ff0
Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
425
diff
changeset
|
271 |
|
faa365425ff0
Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
425
diff
changeset
|
272 |
* Free Mercurial hosting. |
faa365425ff0
Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
425
diff
changeset
|
273 |
|
faa365425ff0
Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
425
diff
changeset
|
274 |
http://mercurial.selenic.com/wiki/MercurialHosting |
faa365425ff0
Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
425
diff
changeset
|
275 |
Free Hosting of Mercurial Repositories |