author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Sun, 07 Nov 2010 22:24:33 +0200 | |
changeset 674 | 6429d14cfc2a |
parent 673 | faa365425ff0 |
child 675 | 47d4ad70738f |
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 |
|
674
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
58 |
* Publishing config. |
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
59 |
|
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
60 |
http://mercurial.selenic.com/wiki/PublishingRepositories |
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
61 |
Publishing Mercurial Repositories |
6429d14cfc2a
Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
673
diff
changeset
|
62 |
|
294 | 63 |
* Manage patches with MQ. |
64 |
||
65 |
First enable MQ, add following to your ~/.hgrc: |
|
66 |
||
67 |
[extensions] |
|
68 |
hgext.mq = |
|
69 |
||
70 |
Second get unpatched sources and put it to hg repository: |
|
71 |
||
72 |
$ tar zxf proj-x.y.z.tar.gz |
|
73 |
$ mv proj-x.y.z proj |
|
74 |
$ cd proj |
|
75 |
$ hg init |
|
76 |
$ hg ci -m "Added x.y.z version of proj." |
|
77 |
||
78 |
Init MQ and take name for first patch: |
|
79 |
||
80 |
$ hg qinit |
|
81 |
$ hg qnew first.patch |
|
82 |
||
83 |
Next make changes by editing source and save it to patch: |
|
84 |
||
85 |
$ $EDITOR file.c |
|
86 |
... |
|
87 |
$ hg diff |
|
88 |
... |
|
89 |
$ hg qrefresh |
|
90 |
$ hg diff # <-- have zero diff |
|
91 |
||
92 |
You can make second patch by applying existing one: |
|
93 |
||
94 |
$ hg qnew second.patch |
|
95 |
$ patch -p1 <bugfix.patch |
|
96 |
$ hg qrefresh |
|
97 |
||
98 |
You can take list of patches (from old to new) and revert or apply patches by |
|
99 |
qpop/qpush command: |
|
100 |
||
101 |
$ hg qseries # <-- what patches have |
|
102 |
first.patch |
|
103 |
second.patch |
|
104 |
$ hg qapplied # <-- what patches applied |
|
105 |
first.patch |
|
106 |
second.patch |
|
107 |
$ hg qpop |
|
108 |
$ hg qseries |
|
109 |
first.patch |
|
110 |
second.patch |
|
111 |
$ hg qapplied |
|
112 |
first.patch |
|
113 |
||
114 |
You can revert or apply all patches by single command: |
|
115 |
||
116 |
$ hg qpop -a |
|
117 |
$ hg qpush -a |
|
118 |
||
119 |
You can delete patch from patch list (before that you need de-apply patch): |
|
120 |
||
121 |
$ hg qpop -a |
|
122 |
$ hg qdelete first.patch |
|
123 |
||
124 |
To add new version of source and fix patches for it first de apply patches, |
|
125 |
then pull new changes and try apply patches on top of new sources: |
|
126 |
||
127 |
$ hg qpop -a |
|
128 |
$ rm * # .hg dir not deleted because its name start with dot |
|
129 |
$ cd .. |
|
130 |
$ tar zxf proj-a.b.c.tar.gz |
|
131 |
$ cp -R proj-a.b.c/* proj |
|
132 |
$ cd proj |
|
133 |
$ hg addremove -s 70 |
|
134 |
$ hg ci -m "Added a.b.c version of proj." |
|
135 |
$ hg qpush -a |
|
136 |
||
295
d3f8534dadf9
Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
294
diff
changeset
|
137 |
To apply series of already done patches use: |
d3f8534dadf9
Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
294
diff
changeset
|
138 |
|
d3f8534dadf9
Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
294
diff
changeset
|
139 |
$ ls /path/to/bugfixes/*.patch | xargs hg qimport |
425
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
140 |
|
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
141 |
* Proxy. |
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
142 |
|
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
143 |
$ hg clone --config http_proxy.host=$host:$port \ |
8b7a3f47dac1
Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
313
diff
changeset
|
144 |
--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
|
145 |
|
faa365425ff0
Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
425
diff
changeset
|
146 |
* Free Mercurial hosting. |
faa365425ff0
Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
425
diff
changeset
|
147 |
|
faa365425ff0
Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
425
diff
changeset
|
148 |
http://mercurial.selenic.com/wiki/MercurialHosting |
faa365425ff0
Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
425
diff
changeset
|
149 |
Free Hosting of Mercurial Repositories |