author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Fri, 26 Feb 2010 23:45:14 +0200 | |
changeset 311 | e3d3fd4c128b |
parent 310 | 4af75f7ab947 |
child 312 | f2fafacd39e6 |
permissions | -rw-r--r-- |
294 | 1 |
-*- mode: outline; coding: utf-8 -*- |
2 |
||
310
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
3 |
* Useful customization. |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
4 |
|
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
5 |
** Multiline log message for log command. |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
6 |
|
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
7 |
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
|
8 |
|
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
9 |
$ hg log -v |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
10 |
|
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
11 |
or put into ~/.hgrc: |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
12 |
|
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
13 |
[defaults] |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
14 |
log = -v |
4af75f7ab947
Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
295
diff
changeset
|
15 |
|
311
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
16 |
** Follow history ever when file copied. |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
17 |
|
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
18 |
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
|
19 |
before copying run: |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
20 |
|
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
21 |
$ hg log -f |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
22 |
|
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
23 |
or put into ~/.hgrc: |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
24 |
|
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
25 |
[defaults] |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
26 |
log = -f |
e3d3fd4c128b
Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
310
diff
changeset
|
27 |
|
294 | 28 |
* Manage patches with MQ. |
29 |
||
30 |
First enable MQ, add following to your ~/.hgrc: |
|
31 |
||
32 |
[extensions] |
|
33 |
hgext.mq = |
|
34 |
||
35 |
Second get unpatched sources and put it to hg repository: |
|
36 |
||
37 |
$ tar zxf proj-x.y.z.tar.gz |
|
38 |
$ mv proj-x.y.z proj |
|
39 |
$ cd proj |
|
40 |
$ hg init |
|
41 |
$ hg ci -m "Added x.y.z version of proj." |
|
42 |
||
43 |
Init MQ and take name for first patch: |
|
44 |
||
45 |
$ hg qinit |
|
46 |
$ hg qnew first.patch |
|
47 |
||
48 |
Next make changes by editing source and save it to patch: |
|
49 |
||
50 |
$ $EDITOR file.c |
|
51 |
... |
|
52 |
$ hg diff |
|
53 |
... |
|
54 |
$ hg qrefresh |
|
55 |
$ hg diff # <-- have zero diff |
|
56 |
||
57 |
You can make second patch by applying existing one: |
|
58 |
||
59 |
$ hg qnew second.patch |
|
60 |
$ patch -p1 <bugfix.patch |
|
61 |
$ hg qrefresh |
|
62 |
||
63 |
You can take list of patches (from old to new) and revert or apply patches by |
|
64 |
qpop/qpush command: |
|
65 |
||
66 |
$ hg qseries # <-- what patches have |
|
67 |
first.patch |
|
68 |
second.patch |
|
69 |
$ hg qapplied # <-- what patches applied |
|
70 |
first.patch |
|
71 |
second.patch |
|
72 |
$ hg qpop |
|
73 |
$ hg qseries |
|
74 |
first.patch |
|
75 |
second.patch |
|
76 |
$ hg qapplied |
|
77 |
first.patch |
|
78 |
||
79 |
You can revert or apply all patches by single command: |
|
80 |
||
81 |
$ hg qpop -a |
|
82 |
$ hg qpush -a |
|
83 |
||
84 |
You can delete patch from patch list (before that you need de-apply patch): |
|
85 |
||
86 |
$ hg qpop -a |
|
87 |
$ hg qdelete first.patch |
|
88 |
||
89 |
To add new version of source and fix patches for it first de apply patches, |
|
90 |
then pull new changes and try apply patches on top of new sources: |
|
91 |
||
92 |
$ hg qpop -a |
|
93 |
$ rm * # .hg dir not deleted because its name start with dot |
|
94 |
$ cd .. |
|
95 |
$ tar zxf proj-a.b.c.tar.gz |
|
96 |
$ cp -R proj-a.b.c/* proj |
|
97 |
$ cd proj |
|
98 |
$ hg addremove -s 70 |
|
99 |
$ hg ci -m "Added a.b.c version of proj." |
|
100 |
$ hg qpush -a |
|
101 |
||
295
d3f8534dadf9
Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
294
diff
changeset
|
102 |
To apply series of already done patches use: |
d3f8534dadf9
Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
294
diff
changeset
|
103 |
|
d3f8534dadf9
Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
294
diff
changeset
|
104 |
$ ls /path/to/bugfixes/*.patch | xargs hg qimport |