##// END OF EJS Templates
merge with crew-stable
Dirkjan Ochtman -
r7040:f29b674c merge default
parent child Browse files
Show More
@@ -0,0 +1,22 b''
1 #!/bin/sh
2 #
3
4 hg init foo
5 cd foo
6 touch a
7
8
9 unset HGUSER
10 echo "[ui]" >> .hg/hgrc
11 echo "username= foo" >> .hg/hgrc
12 echo " bar1" >> .hg/hgrc
13
14 hg ci -Am m
15
16 rm .hg/hgrc
17
18 HGUSER=`(echo foo; echo bar2)` hg ci -Am m
19
20 hg ci -Am m -u "`(echo foo; echo bar3)`"
21
22 true
@@ -0,0 +1,8 b''
1 adding a
2 abort: username 'foo\nbar1' contains a newline
3
4 abort: username 'foo\nbar2' contains a newline
5
6 transaction abort!
7 rollback completed
8 abort: username 'foo\nbar3' contains a newline!
@@ -1,371 +1,371 b''
1 /*
1 /*
2 bdiff.c - efficient binary diff extension for Mercurial
2 bdiff.c - efficient binary diff extension for Mercurial
3
3
4 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
4 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
5
5
6 This software may be used and distributed according to the terms of
6 This software may be used and distributed according to the terms of
7 the GNU General Public License, incorporated herein by reference.
7 the GNU General Public License, incorporated herein by reference.
8
8
9 Based roughly on Python difflib
9 Based roughly on Python difflib
10 */
10 */
11
11
12 #include <Python.h>
12 #include <Python.h>
13 #include <stdlib.h>
13 #include <stdlib.h>
14 #include <string.h>
14 #include <string.h>
15 #include <limits.h>
15 #include <limits.h>
16
16
17 #if defined __hpux || defined __SUNPRO_C || defined _AIX
17 #if defined __hpux || defined __SUNPRO_C || defined _AIX
18 # define inline
18 # define inline
19 #endif
19 #endif
20
20
21 #ifdef _WIN32
21 #ifdef _WIN32
22 #ifdef _MSC_VER
22 #ifdef _MSC_VER
23 #define inline __inline
23 #define inline __inline
24 typedef unsigned long uint32_t;
24 typedef unsigned long uint32_t;
25 #else
25 #else
26 #include <stdint.h>
26 #include <stdint.h>
27 #endif
27 #endif
28 static uint32_t htonl(uint32_t x)
28 static uint32_t htonl(uint32_t x)
29 {
29 {
30 return ((x & 0x000000ffUL) << 24) |
30 return ((x & 0x000000ffUL) << 24) |
31 ((x & 0x0000ff00UL) << 8) |
31 ((x & 0x0000ff00UL) << 8) |
32 ((x & 0x00ff0000UL) >> 8) |
32 ((x & 0x00ff0000UL) >> 8) |
33 ((x & 0xff000000UL) >> 24);
33 ((x & 0xff000000UL) >> 24);
34 }
34 }
35 #else
35 #else
36 #include <sys/types.h>
36 #include <sys/types.h>
37 #ifdef __BEOS__
37 #if defined __BEOS__ && !defined __HAIKU__
38 #include <ByteOrder.h>
38 #include <ByteOrder.h>
39 #else
39 #else
40 #include <arpa/inet.h>
40 #include <arpa/inet.h>
41 #endif
41 #endif
42 #include <inttypes.h>
42 #include <inttypes.h>
43 #endif
43 #endif
44
44
45 struct line {
45 struct line {
46 int h, len, n, e;
46 int h, len, n, e;
47 const char *l;
47 const char *l;
48 };
48 };
49
49
50 struct pos {
50 struct pos {
51 int pos, len;
51 int pos, len;
52 };
52 };
53
53
54 struct hunk {
54 struct hunk {
55 int a1, a2, b1, b2;
55 int a1, a2, b1, b2;
56 };
56 };
57
57
58 struct hunklist {
58 struct hunklist {
59 struct hunk *base, *head;
59 struct hunk *base, *head;
60 };
60 };
61
61
62 int splitlines(const char *a, int len, struct line **lr)
62 int splitlines(const char *a, int len, struct line **lr)
63 {
63 {
64 int h, i;
64 int h, i;
65 const char *p, *b = a;
65 const char *p, *b = a;
66 const char * const plast = a + len - 1;
66 const char * const plast = a + len - 1;
67 struct line *l;
67 struct line *l;
68
68
69 /* count the lines */
69 /* count the lines */
70 i = 1; /* extra line for sentinel */
70 i = 1; /* extra line for sentinel */
71 for (p = a; p < a + len; p++)
71 for (p = a; p < a + len; p++)
72 if (*p == '\n' || p == plast)
72 if (*p == '\n' || p == plast)
73 i++;
73 i++;
74
74
75 *lr = l = (struct line *)malloc(sizeof(struct line) * i);
75 *lr = l = (struct line *)malloc(sizeof(struct line) * i);
76 if (!l)
76 if (!l)
77 return -1;
77 return -1;
78
78
79 /* build the line array and calculate hashes */
79 /* build the line array and calculate hashes */
80 h = 0;
80 h = 0;
81 for (p = a; p < a + len; p++) {
81 for (p = a; p < a + len; p++) {
82 /* Leonid Yuriev's hash */
82 /* Leonid Yuriev's hash */
83 h = (h * 1664525) + *p + 1013904223;
83 h = (h * 1664525) + *p + 1013904223;
84
84
85 if (*p == '\n' || p == plast) {
85 if (*p == '\n' || p == plast) {
86 l->h = h;
86 l->h = h;
87 h = 0;
87 h = 0;
88 l->len = p - b + 1;
88 l->len = p - b + 1;
89 l->l = b;
89 l->l = b;
90 l->n = INT_MAX;
90 l->n = INT_MAX;
91 l++;
91 l++;
92 b = p + 1;
92 b = p + 1;
93 }
93 }
94 }
94 }
95
95
96 /* set up a sentinel */
96 /* set up a sentinel */
97 l->h = l->len = 0;
97 l->h = l->len = 0;
98 l->l = a + len;
98 l->l = a + len;
99 return i - 1;
99 return i - 1;
100 }
100 }
101
101
102 int inline cmp(struct line *a, struct line *b)
102 int inline cmp(struct line *a, struct line *b)
103 {
103 {
104 return a->h != b->h || a->len != b->len || memcmp(a->l, b->l, a->len);
104 return a->h != b->h || a->len != b->len || memcmp(a->l, b->l, a->len);
105 }
105 }
106
106
107 static int equatelines(struct line *a, int an, struct line *b, int bn)
107 static int equatelines(struct line *a, int an, struct line *b, int bn)
108 {
108 {
109 int i, j, buckets = 1, t, scale;
109 int i, j, buckets = 1, t, scale;
110 struct pos *h = NULL;
110 struct pos *h = NULL;
111
111
112 /* build a hash table of the next highest power of 2 */
112 /* build a hash table of the next highest power of 2 */
113 while (buckets < bn + 1)
113 while (buckets < bn + 1)
114 buckets *= 2;
114 buckets *= 2;
115
115
116 /* try to allocate a large hash table to avoid collisions */
116 /* try to allocate a large hash table to avoid collisions */
117 for (scale = 4; scale; scale /= 2) {
117 for (scale = 4; scale; scale /= 2) {
118 h = (struct pos *)malloc(scale * buckets * sizeof(struct pos));
118 h = (struct pos *)malloc(scale * buckets * sizeof(struct pos));
119 if (h)
119 if (h)
120 break;
120 break;
121 }
121 }
122
122
123 if (!h)
123 if (!h)
124 return 0;
124 return 0;
125
125
126 buckets = buckets * scale - 1;
126 buckets = buckets * scale - 1;
127
127
128 /* clear the hash table */
128 /* clear the hash table */
129 for (i = 0; i <= buckets; i++) {
129 for (i = 0; i <= buckets; i++) {
130 h[i].pos = INT_MAX;
130 h[i].pos = INT_MAX;
131 h[i].len = 0;
131 h[i].len = 0;
132 }
132 }
133
133
134 /* add lines to the hash table chains */
134 /* add lines to the hash table chains */
135 for (i = bn - 1; i >= 0; i--) {
135 for (i = bn - 1; i >= 0; i--) {
136 /* find the equivalence class */
136 /* find the equivalence class */
137 for (j = b[i].h & buckets; h[j].pos != INT_MAX;
137 for (j = b[i].h & buckets; h[j].pos != INT_MAX;
138 j = (j + 1) & buckets)
138 j = (j + 1) & buckets)
139 if (!cmp(b + i, b + h[j].pos))
139 if (!cmp(b + i, b + h[j].pos))
140 break;
140 break;
141
141
142 /* add to the head of the equivalence class */
142 /* add to the head of the equivalence class */
143 b[i].n = h[j].pos;
143 b[i].n = h[j].pos;
144 b[i].e = j;
144 b[i].e = j;
145 h[j].pos = i;
145 h[j].pos = i;
146 h[j].len++; /* keep track of popularity */
146 h[j].len++; /* keep track of popularity */
147 }
147 }
148
148
149 /* compute popularity threshold */
149 /* compute popularity threshold */
150 t = (bn >= 4000) ? bn / 1000 : bn + 1;
150 t = (bn >= 4000) ? bn / 1000 : bn + 1;
151
151
152 /* match items in a to their equivalence class in b */
152 /* match items in a to their equivalence class in b */
153 for (i = 0; i < an; i++) {
153 for (i = 0; i < an; i++) {
154 /* find the equivalence class */
154 /* find the equivalence class */
155 for (j = a[i].h & buckets; h[j].pos != INT_MAX;
155 for (j = a[i].h & buckets; h[j].pos != INT_MAX;
156 j = (j + 1) & buckets)
156 j = (j + 1) & buckets)
157 if (!cmp(a + i, b + h[j].pos))
157 if (!cmp(a + i, b + h[j].pos))
158 break;
158 break;
159
159
160 a[i].e = j; /* use equivalence class for quick compare */
160 a[i].e = j; /* use equivalence class for quick compare */
161 if (h[j].len <= t)
161 if (h[j].len <= t)
162 a[i].n = h[j].pos; /* point to head of match list */
162 a[i].n = h[j].pos; /* point to head of match list */
163 else
163 else
164 a[i].n = INT_MAX; /* too popular */
164 a[i].n = INT_MAX; /* too popular */
165 }
165 }
166
166
167 /* discard hash tables */
167 /* discard hash tables */
168 free(h);
168 free(h);
169 return 1;
169 return 1;
170 }
170 }
171
171
172 static int longest_match(struct line *a, struct line *b, struct pos *pos,
172 static int longest_match(struct line *a, struct line *b, struct pos *pos,
173 int a1, int a2, int b1, int b2, int *omi, int *omj)
173 int a1, int a2, int b1, int b2, int *omi, int *omj)
174 {
174 {
175 int mi = a1, mj = b1, mk = 0, mb = 0, i, j, k;
175 int mi = a1, mj = b1, mk = 0, mb = 0, i, j, k;
176
176
177 for (i = a1; i < a2; i++) {
177 for (i = a1; i < a2; i++) {
178 /* skip things before the current block */
178 /* skip things before the current block */
179 for (j = a[i].n; j < b1; j = b[j].n)
179 for (j = a[i].n; j < b1; j = b[j].n)
180 ;
180 ;
181
181
182 /* loop through all lines match a[i] in b */
182 /* loop through all lines match a[i] in b */
183 for (; j < b2; j = b[j].n) {
183 for (; j < b2; j = b[j].n) {
184 /* does this extend an earlier match? */
184 /* does this extend an earlier match? */
185 if (i > a1 && j > b1 && pos[j - 1].pos == i - 1)
185 if (i > a1 && j > b1 && pos[j - 1].pos == i - 1)
186 k = pos[j - 1].len + 1;
186 k = pos[j - 1].len + 1;
187 else
187 else
188 k = 1;
188 k = 1;
189 pos[j].pos = i;
189 pos[j].pos = i;
190 pos[j].len = k;
190 pos[j].len = k;
191
191
192 /* best match so far? */
192 /* best match so far? */
193 if (k > mk) {
193 if (k > mk) {
194 mi = i;
194 mi = i;
195 mj = j;
195 mj = j;
196 mk = k;
196 mk = k;
197 }
197 }
198 }
198 }
199 }
199 }
200
200
201 if (mk) {
201 if (mk) {
202 mi = mi - mk + 1;
202 mi = mi - mk + 1;
203 mj = mj - mk + 1;
203 mj = mj - mk + 1;
204 }
204 }
205
205
206 /* expand match to include neighboring popular lines */
206 /* expand match to include neighboring popular lines */
207 while (mi - mb > a1 && mj - mb > b1 &&
207 while (mi - mb > a1 && mj - mb > b1 &&
208 a[mi - mb - 1].e == b[mj - mb - 1].e)
208 a[mi - mb - 1].e == b[mj - mb - 1].e)
209 mb++;
209 mb++;
210 while (mi + mk < a2 && mj + mk < b2 &&
210 while (mi + mk < a2 && mj + mk < b2 &&
211 a[mi + mk].e == b[mj + mk].e)
211 a[mi + mk].e == b[mj + mk].e)
212 mk++;
212 mk++;
213
213
214 *omi = mi - mb;
214 *omi = mi - mb;
215 *omj = mj - mb;
215 *omj = mj - mb;
216
216
217 return mk + mb;
217 return mk + mb;
218 }
218 }
219
219
220 static void recurse(struct line *a, struct line *b, struct pos *pos,
220 static void recurse(struct line *a, struct line *b, struct pos *pos,
221 int a1, int a2, int b1, int b2, struct hunklist *l)
221 int a1, int a2, int b1, int b2, struct hunklist *l)
222 {
222 {
223 int i, j, k;
223 int i, j, k;
224
224
225 /* find the longest match in this chunk */
225 /* find the longest match in this chunk */
226 k = longest_match(a, b, pos, a1, a2, b1, b2, &i, &j);
226 k = longest_match(a, b, pos, a1, a2, b1, b2, &i, &j);
227 if (!k)
227 if (!k)
228 return;
228 return;
229
229
230 /* and recurse on the remaining chunks on either side */
230 /* and recurse on the remaining chunks on either side */
231 recurse(a, b, pos, a1, i, b1, j, l);
231 recurse(a, b, pos, a1, i, b1, j, l);
232 l->head->a1 = i;
232 l->head->a1 = i;
233 l->head->a2 = i + k;
233 l->head->a2 = i + k;
234 l->head->b1 = j;
234 l->head->b1 = j;
235 l->head->b2 = j + k;
235 l->head->b2 = j + k;
236 l->head++;
236 l->head++;
237 recurse(a, b, pos, i + k, a2, j + k, b2, l);
237 recurse(a, b, pos, i + k, a2, j + k, b2, l);
238 }
238 }
239
239
240 static struct hunklist diff(struct line *a, int an, struct line *b, int bn)
240 static struct hunklist diff(struct line *a, int an, struct line *b, int bn)
241 {
241 {
242 struct hunklist l;
242 struct hunklist l;
243 struct pos *pos;
243 struct pos *pos;
244 int t;
244 int t;
245
245
246 /* allocate and fill arrays */
246 /* allocate and fill arrays */
247 t = equatelines(a, an, b, bn);
247 t = equatelines(a, an, b, bn);
248 pos = (struct pos *)calloc(bn ? bn : 1, sizeof(struct pos));
248 pos = (struct pos *)calloc(bn ? bn : 1, sizeof(struct pos));
249 /* we can't have more matches than lines in the shorter file */
249 /* we can't have more matches than lines in the shorter file */
250 l.head = l.base = (struct hunk *)malloc(sizeof(struct hunk) *
250 l.head = l.base = (struct hunk *)malloc(sizeof(struct hunk) *
251 ((an<bn ? an:bn) + 1));
251 ((an<bn ? an:bn) + 1));
252
252
253 if (pos && l.base && t) {
253 if (pos && l.base && t) {
254 /* generate the matching block list */
254 /* generate the matching block list */
255 recurse(a, b, pos, 0, an, 0, bn, &l);
255 recurse(a, b, pos, 0, an, 0, bn, &l);
256 l.head->a1 = l.head->a2 = an;
256 l.head->a1 = l.head->a2 = an;
257 l.head->b1 = l.head->b2 = bn;
257 l.head->b1 = l.head->b2 = bn;
258 l.head++;
258 l.head++;
259 }
259 }
260
260
261 free(pos);
261 free(pos);
262 return l;
262 return l;
263 }
263 }
264
264
265 static PyObject *blocks(PyObject *self, PyObject *args)
265 static PyObject *blocks(PyObject *self, PyObject *args)
266 {
266 {
267 PyObject *sa, *sb, *rl = NULL, *m;
267 PyObject *sa, *sb, *rl = NULL, *m;
268 struct line *a, *b;
268 struct line *a, *b;
269 struct hunklist l = {NULL, NULL};
269 struct hunklist l = {NULL, NULL};
270 struct hunk *h;
270 struct hunk *h;
271 int an, bn, pos = 0;
271 int an, bn, pos = 0;
272
272
273 if (!PyArg_ParseTuple(args, "SS:bdiff", &sa, &sb))
273 if (!PyArg_ParseTuple(args, "SS:bdiff", &sa, &sb))
274 return NULL;
274 return NULL;
275
275
276 an = splitlines(PyString_AsString(sa), PyString_Size(sa), &a);
276 an = splitlines(PyString_AsString(sa), PyString_Size(sa), &a);
277 bn = splitlines(PyString_AsString(sb), PyString_Size(sb), &b);
277 bn = splitlines(PyString_AsString(sb), PyString_Size(sb), &b);
278 if (!a || !b)
278 if (!a || !b)
279 goto nomem;
279 goto nomem;
280
280
281 l = diff(a, an, b, bn);
281 l = diff(a, an, b, bn);
282 rl = PyList_New(l.head - l.base);
282 rl = PyList_New(l.head - l.base);
283 if (!l.head || !rl)
283 if (!l.head || !rl)
284 goto nomem;
284 goto nomem;
285
285
286 for (h = l.base; h != l.head; h++) {
286 for (h = l.base; h != l.head; h++) {
287 m = Py_BuildValue("iiii", h->a1, h->a2, h->b1, h->b2);
287 m = Py_BuildValue("iiii", h->a1, h->a2, h->b1, h->b2);
288 PyList_SetItem(rl, pos, m);
288 PyList_SetItem(rl, pos, m);
289 pos++;
289 pos++;
290 }
290 }
291
291
292 nomem:
292 nomem:
293 free(a);
293 free(a);
294 free(b);
294 free(b);
295 free(l.base);
295 free(l.base);
296 return rl ? rl : PyErr_NoMemory();
296 return rl ? rl : PyErr_NoMemory();
297 }
297 }
298
298
299 static PyObject *bdiff(PyObject *self, PyObject *args)
299 static PyObject *bdiff(PyObject *self, PyObject *args)
300 {
300 {
301 char *sa, *sb;
301 char *sa, *sb;
302 PyObject *result = NULL;
302 PyObject *result = NULL;
303 struct line *al, *bl;
303 struct line *al, *bl;
304 struct hunklist l = {NULL, NULL};
304 struct hunklist l = {NULL, NULL};
305 struct hunk *h;
305 struct hunk *h;
306 char encode[12], *rb;
306 char encode[12], *rb;
307 int an, bn, len = 0, la, lb;
307 int an, bn, len = 0, la, lb;
308
308
309 if (!PyArg_ParseTuple(args, "s#s#:bdiff", &sa, &la, &sb, &lb))
309 if (!PyArg_ParseTuple(args, "s#s#:bdiff", &sa, &la, &sb, &lb))
310 return NULL;
310 return NULL;
311
311
312 an = splitlines(sa, la, &al);
312 an = splitlines(sa, la, &al);
313 bn = splitlines(sb, lb, &bl);
313 bn = splitlines(sb, lb, &bl);
314 if (!al || !bl)
314 if (!al || !bl)
315 goto nomem;
315 goto nomem;
316
316
317 l = diff(al, an, bl, bn);
317 l = diff(al, an, bl, bn);
318 if (!l.head)
318 if (!l.head)
319 goto nomem;
319 goto nomem;
320
320
321 /* calculate length of output */
321 /* calculate length of output */
322 la = lb = 0;
322 la = lb = 0;
323 for (h = l.base; h != l.head; h++) {
323 for (h = l.base; h != l.head; h++) {
324 if (h->a1 != la || h->b1 != lb)
324 if (h->a1 != la || h->b1 != lb)
325 len += 12 + bl[h->b1].l - bl[lb].l;
325 len += 12 + bl[h->b1].l - bl[lb].l;
326 la = h->a2;
326 la = h->a2;
327 lb = h->b2;
327 lb = h->b2;
328 }
328 }
329
329
330 result = PyString_FromStringAndSize(NULL, len);
330 result = PyString_FromStringAndSize(NULL, len);
331 if (!result)
331 if (!result)
332 goto nomem;
332 goto nomem;
333
333
334 /* build binary patch */
334 /* build binary patch */
335 rb = PyString_AsString(result);
335 rb = PyString_AsString(result);
336 la = lb = 0;
336 la = lb = 0;
337
337
338 for (h = l.base; h != l.head; h++) {
338 for (h = l.base; h != l.head; h++) {
339 if (h->a1 != la || h->b1 != lb) {
339 if (h->a1 != la || h->b1 != lb) {
340 len = bl[h->b1].l - bl[lb].l;
340 len = bl[h->b1].l - bl[lb].l;
341 *(uint32_t *)(encode) = htonl(al[la].l - al->l);
341 *(uint32_t *)(encode) = htonl(al[la].l - al->l);
342 *(uint32_t *)(encode + 4) = htonl(al[h->a1].l - al->l);
342 *(uint32_t *)(encode + 4) = htonl(al[h->a1].l - al->l);
343 *(uint32_t *)(encode + 8) = htonl(len);
343 *(uint32_t *)(encode + 8) = htonl(len);
344 memcpy(rb, encode, 12);
344 memcpy(rb, encode, 12);
345 memcpy(rb + 12, bl[lb].l, len);
345 memcpy(rb + 12, bl[lb].l, len);
346 rb += 12 + len;
346 rb += 12 + len;
347 }
347 }
348 la = h->a2;
348 la = h->a2;
349 lb = h->b2;
349 lb = h->b2;
350 }
350 }
351
351
352 nomem:
352 nomem:
353 free(al);
353 free(al);
354 free(bl);
354 free(bl);
355 free(l.base);
355 free(l.base);
356 return result ? result : PyErr_NoMemory();
356 return result ? result : PyErr_NoMemory();
357 }
357 }
358
358
359 static char mdiff_doc[] = "Efficient binary diff.";
359 static char mdiff_doc[] = "Efficient binary diff.";
360
360
361 static PyMethodDef methods[] = {
361 static PyMethodDef methods[] = {
362 {"bdiff", bdiff, METH_VARARGS, "calculate a binary diff\n"},
362 {"bdiff", bdiff, METH_VARARGS, "calculate a binary diff\n"},
363 {"blocks", blocks, METH_VARARGS, "find a list of matching lines\n"},
363 {"blocks", blocks, METH_VARARGS, "find a list of matching lines\n"},
364 {NULL, NULL}
364 {NULL, NULL}
365 };
365 };
366
366
367 PyMODINIT_FUNC initbdiff(void)
367 PyMODINIT_FUNC initbdiff(void)
368 {
368 {
369 Py_InitModule3("bdiff", methods, mdiff_doc);
369 Py_InitModule3("bdiff", methods, mdiff_doc);
370 }
370 }
371
371
@@ -1,192 +1,196 b''
1 # changelog.py - changelog class for mercurial
1 # changelog.py - changelog class for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms
5 # This software may be used and distributed according to the terms
6 # of the GNU General Public License, incorporated herein by reference.
6 # of the GNU General Public License, incorporated herein by reference.
7
7
8 from node import bin, hex, nullid
8 from node import bin, hex, nullid
9 from revlog import revlog
9 from revlog import revlog, RevlogError
10 from i18n import _
10 import util
11 import util
11
12
12 def _string_escape(text):
13 def _string_escape(text):
13 """
14 """
14 >>> d = {'nl': chr(10), 'bs': chr(92), 'cr': chr(13), 'nul': chr(0)}
15 >>> d = {'nl': chr(10), 'bs': chr(92), 'cr': chr(13), 'nul': chr(0)}
15 >>> s = "ab%(nl)scd%(bs)s%(bs)sn%(nul)sab%(cr)scd%(bs)s%(nl)s" % d
16 >>> s = "ab%(nl)scd%(bs)s%(bs)sn%(nul)sab%(cr)scd%(bs)s%(nl)s" % d
16 >>> s
17 >>> s
17 'ab\\ncd\\\\\\\\n\\x00ab\\rcd\\\\\\n'
18 'ab\\ncd\\\\\\\\n\\x00ab\\rcd\\\\\\n'
18 >>> res = _string_escape(s)
19 >>> res = _string_escape(s)
19 >>> s == res.decode('string_escape')
20 >>> s == res.decode('string_escape')
20 True
21 True
21 """
22 """
22 # subset of the string_escape codec
23 # subset of the string_escape codec
23 text = text.replace('\\', '\\\\').replace('\n', '\\n').replace('\r', '\\r')
24 text = text.replace('\\', '\\\\').replace('\n', '\\n').replace('\r', '\\r')
24 return text.replace('\0', '\\0')
25 return text.replace('\0', '\\0')
25
26
26 class appender:
27 class appender:
27 '''the changelog index must be update last on disk, so we use this class
28 '''the changelog index must be update last on disk, so we use this class
28 to delay writes to it'''
29 to delay writes to it'''
29 def __init__(self, fp, buf):
30 def __init__(self, fp, buf):
30 self.data = buf
31 self.data = buf
31 self.fp = fp
32 self.fp = fp
32 self.offset = fp.tell()
33 self.offset = fp.tell()
33 self.size = util.fstat(fp).st_size
34 self.size = util.fstat(fp).st_size
34
35
35 def end(self):
36 def end(self):
36 return self.size + len("".join(self.data))
37 return self.size + len("".join(self.data))
37 def tell(self):
38 def tell(self):
38 return self.offset
39 return self.offset
39 def flush(self):
40 def flush(self):
40 pass
41 pass
41 def close(self):
42 def close(self):
42 self.fp.close()
43 self.fp.close()
43
44
44 def seek(self, offset, whence=0):
45 def seek(self, offset, whence=0):
45 '''virtual file offset spans real file and data'''
46 '''virtual file offset spans real file and data'''
46 if whence == 0:
47 if whence == 0:
47 self.offset = offset
48 self.offset = offset
48 elif whence == 1:
49 elif whence == 1:
49 self.offset += offset
50 self.offset += offset
50 elif whence == 2:
51 elif whence == 2:
51 self.offset = self.end() + offset
52 self.offset = self.end() + offset
52 if self.offset < self.size:
53 if self.offset < self.size:
53 self.fp.seek(self.offset)
54 self.fp.seek(self.offset)
54
55
55 def read(self, count=-1):
56 def read(self, count=-1):
56 '''only trick here is reads that span real file and data'''
57 '''only trick here is reads that span real file and data'''
57 ret = ""
58 ret = ""
58 if self.offset < self.size:
59 if self.offset < self.size:
59 s = self.fp.read(count)
60 s = self.fp.read(count)
60 ret = s
61 ret = s
61 self.offset += len(s)
62 self.offset += len(s)
62 if count > 0:
63 if count > 0:
63 count -= len(s)
64 count -= len(s)
64 if count != 0:
65 if count != 0:
65 doff = self.offset - self.size
66 doff = self.offset - self.size
66 self.data.insert(0, "".join(self.data))
67 self.data.insert(0, "".join(self.data))
67 del self.data[1:]
68 del self.data[1:]
68 s = self.data[0][doff:doff+count]
69 s = self.data[0][doff:doff+count]
69 self.offset += len(s)
70 self.offset += len(s)
70 ret += s
71 ret += s
71 return ret
72 return ret
72
73
73 def write(self, s):
74 def write(self, s):
74 self.data.append(str(s))
75 self.data.append(str(s))
75 self.offset += len(s)
76 self.offset += len(s)
76
77
77 class changelog(revlog):
78 class changelog(revlog):
78 def __init__(self, opener):
79 def __init__(self, opener):
79 revlog.__init__(self, opener, "00changelog.i")
80 revlog.__init__(self, opener, "00changelog.i")
80
81
81 def delayupdate(self):
82 def delayupdate(self):
82 "delay visibility of index updates to other readers"
83 "delay visibility of index updates to other readers"
83 self._realopener = self.opener
84 self._realopener = self.opener
84 self.opener = self._delayopener
85 self.opener = self._delayopener
85 self._delaycount = len(self)
86 self._delaycount = len(self)
86 self._delaybuf = []
87 self._delaybuf = []
87 self._delayname = None
88 self._delayname = None
88
89
89 def finalize(self, tr):
90 def finalize(self, tr):
90 "finalize index updates"
91 "finalize index updates"
91 self.opener = self._realopener
92 self.opener = self._realopener
92 # move redirected index data back into place
93 # move redirected index data back into place
93 if self._delayname:
94 if self._delayname:
94 util.rename(self._delayname + ".a", self._delayname)
95 util.rename(self._delayname + ".a", self._delayname)
95 elif self._delaybuf:
96 elif self._delaybuf:
96 fp = self.opener(self.indexfile, 'a')
97 fp = self.opener(self.indexfile, 'a')
97 fp.write("".join(self._delaybuf))
98 fp.write("".join(self._delaybuf))
98 fp.close()
99 fp.close()
99 del self._delaybuf
100 del self._delaybuf
100 # split when we're done
101 # split when we're done
101 self.checkinlinesize(tr)
102 self.checkinlinesize(tr)
102
103
103 def _delayopener(self, name, mode='r'):
104 def _delayopener(self, name, mode='r'):
104 fp = self._realopener(name, mode)
105 fp = self._realopener(name, mode)
105 # only divert the index
106 # only divert the index
106 if not name == self.indexfile:
107 if not name == self.indexfile:
107 return fp
108 return fp
108 # if we're doing an initial clone, divert to another file
109 # if we're doing an initial clone, divert to another file
109 if self._delaycount == 0:
110 if self._delaycount == 0:
110 self._delayname = fp.name
111 self._delayname = fp.name
111 if not len(self):
112 if not len(self):
112 # make sure to truncate the file
113 # make sure to truncate the file
113 mode = mode.replace('a', 'w')
114 mode = mode.replace('a', 'w')
114 return self._realopener(name + ".a", mode)
115 return self._realopener(name + ".a", mode)
115 # otherwise, divert to memory
116 # otherwise, divert to memory
116 return appender(fp, self._delaybuf)
117 return appender(fp, self._delaybuf)
117
118
118 def checkinlinesize(self, tr, fp=None):
119 def checkinlinesize(self, tr, fp=None):
119 if self.opener == self._delayopener:
120 if self.opener == self._delayopener:
120 return
121 return
121 return revlog.checkinlinesize(self, tr, fp)
122 return revlog.checkinlinesize(self, tr, fp)
122
123
123 def decode_extra(self, text):
124 def decode_extra(self, text):
124 extra = {}
125 extra = {}
125 for l in text.split('\0'):
126 for l in text.split('\0'):
126 if l:
127 if l:
127 k, v = l.decode('string_escape').split(':', 1)
128 k, v = l.decode('string_escape').split(':', 1)
128 extra[k] = v
129 extra[k] = v
129 return extra
130 return extra
130
131
131 def encode_extra(self, d):
132 def encode_extra(self, d):
132 # keys must be sorted to produce a deterministic changelog entry
133 # keys must be sorted to produce a deterministic changelog entry
133 items = [_string_escape('%s:%s' % (k, d[k])) for k in util.sort(d)]
134 items = [_string_escape('%s:%s' % (k, d[k])) for k in util.sort(d)]
134 return "\0".join(items)
135 return "\0".join(items)
135
136
136 def read(self, node):
137 def read(self, node):
137 """
138 """
138 format used:
139 format used:
139 nodeid\n : manifest node in ascii
140 nodeid\n : manifest node in ascii
140 user\n : user, no \n or \r allowed
141 user\n : user, no \n or \r allowed
141 time tz extra\n : date (time is int or float, timezone is int)
142 time tz extra\n : date (time is int or float, timezone is int)
142 : extra is metadatas, encoded and separated by '\0'
143 : extra is metadatas, encoded and separated by '\0'
143 : older versions ignore it
144 : older versions ignore it
144 files\n\n : files modified by the cset, no \n or \r allowed
145 files\n\n : files modified by the cset, no \n or \r allowed
145 (.*) : comment (free text, ideally utf-8)
146 (.*) : comment (free text, ideally utf-8)
146
147
147 changelog v0 doesn't use extra
148 changelog v0 doesn't use extra
148 """
149 """
149 text = self.revision(node)
150 text = self.revision(node)
150 if not text:
151 if not text:
151 return (nullid, "", (0, 0), [], "", {'branch': 'default'})
152 return (nullid, "", (0, 0), [], "", {'branch': 'default'})
152 last = text.index("\n\n")
153 last = text.index("\n\n")
153 desc = util.tolocal(text[last + 2:])
154 desc = util.tolocal(text[last + 2:])
154 l = text[:last].split('\n')
155 l = text[:last].split('\n')
155 manifest = bin(l[0])
156 manifest = bin(l[0])
156 user = util.tolocal(l[1])
157 user = util.tolocal(l[1])
157
158
158 extra_data = l[2].split(' ', 2)
159 extra_data = l[2].split(' ', 2)
159 if len(extra_data) != 3:
160 if len(extra_data) != 3:
160 time = float(extra_data.pop(0))
161 time = float(extra_data.pop(0))
161 try:
162 try:
162 # various tools did silly things with the time zone field.
163 # various tools did silly things with the time zone field.
163 timezone = int(extra_data[0])
164 timezone = int(extra_data[0])
164 except:
165 except:
165 timezone = 0
166 timezone = 0
166 extra = {}
167 extra = {}
167 else:
168 else:
168 time, timezone, extra = extra_data
169 time, timezone, extra = extra_data
169 time, timezone = float(time), int(timezone)
170 time, timezone = float(time), int(timezone)
170 extra = self.decode_extra(extra)
171 extra = self.decode_extra(extra)
171 if not extra.get('branch'):
172 if not extra.get('branch'):
172 extra['branch'] = 'default'
173 extra['branch'] = 'default'
173 files = l[3:]
174 files = l[3:]
174 return (manifest, user, (time, timezone), files, desc, extra)
175 return (manifest, user, (time, timezone), files, desc, extra)
175
176
176 def add(self, manifest, files, desc, transaction, p1=None, p2=None,
177 def add(self, manifest, files, desc, transaction, p1=None, p2=None,
177 user=None, date=None, extra={}):
178 user=None, date=None, extra={}):
178
179
180 user = user.strip()
181 if "\n" in user:
182 raise RevlogError(_("username %s contains a newline") % `user`)
179 user, desc = util.fromlocal(user), util.fromlocal(desc)
183 user, desc = util.fromlocal(user), util.fromlocal(desc)
180
184
181 if date:
185 if date:
182 parseddate = "%d %d" % util.parsedate(date)
186 parseddate = "%d %d" % util.parsedate(date)
183 else:
187 else:
184 parseddate = "%d %d" % util.makedate()
188 parseddate = "%d %d" % util.makedate()
185 if extra and extra.get("branch") in ("default", ""):
189 if extra and extra.get("branch") in ("default", ""):
186 del extra["branch"]
190 del extra["branch"]
187 if extra:
191 if extra:
188 extra = self.encode_extra(extra)
192 extra = self.encode_extra(extra)
189 parseddate = "%s %s" % (parseddate, extra)
193 parseddate = "%s %s" % (parseddate, extra)
190 l = [hex(manifest), user, parseddate] + util.sort(files) + ["", desc]
194 l = [hex(manifest), user, parseddate] + util.sort(files) + ["", desc]
191 text = "\n".join(l)
195 text = "\n".join(l)
192 return self.addrevision(text, transaction, len(self), p1, p2)
196 return self.addrevision(text, transaction, len(self), p1, p2)
@@ -1,3326 +1,3327 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms
5 # This software may be used and distributed according to the terms
6 # of the GNU General Public License, incorporated herein by reference.
6 # of the GNU General Public License, incorporated herein by reference.
7
7
8 from node import hex, nullid, nullrev, short
8 from node import hex, nullid, nullrev, short
9 from repo import RepoError, NoCapability
9 from repo import RepoError, NoCapability
10 from i18n import _, gettext
10 from i18n import _, gettext
11 import os, re, sys, urllib
11 import os, re, sys, urllib
12 import hg, util, revlog, bundlerepo, extensions, copies
12 import hg, util, revlog, bundlerepo, extensions, copies
13 import difflib, patch, time, help, mdiff, tempfile
13 import difflib, patch, time, help, mdiff, tempfile
14 import version, socket
14 import version, socket
15 import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect
15 import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect
16 import merge as merge_
16 import merge as merge_
17
17
18 # Commands start here, listed alphabetically
18 # Commands start here, listed alphabetically
19
19
20 def add(ui, repo, *pats, **opts):
20 def add(ui, repo, *pats, **opts):
21 """add the specified files on the next commit
21 """add the specified files on the next commit
22
22
23 Schedule files to be version controlled and added to the repository.
23 Schedule files to be version controlled and added to the repository.
24
24
25 The files will be added to the repository at the next commit. To
25 The files will be added to the repository at the next commit. To
26 undo an add before that, see hg revert.
26 undo an add before that, see hg revert.
27
27
28 If no names are given, add all files in the repository.
28 If no names are given, add all files in the repository.
29 """
29 """
30
30
31 rejected = None
31 rejected = None
32 exacts = {}
32 exacts = {}
33 names = []
33 names = []
34 m = cmdutil.match(repo, pats, opts)
34 m = cmdutil.match(repo, pats, opts)
35 m.bad = lambda x,y: True
35 m.bad = lambda x,y: True
36 for abs in repo.walk(m):
36 for abs in repo.walk(m):
37 if m.exact(abs):
37 if m.exact(abs):
38 if ui.verbose:
38 if ui.verbose:
39 ui.status(_('adding %s\n') % m.rel(abs))
39 ui.status(_('adding %s\n') % m.rel(abs))
40 names.append(abs)
40 names.append(abs)
41 exacts[abs] = 1
41 exacts[abs] = 1
42 elif abs not in repo.dirstate:
42 elif abs not in repo.dirstate:
43 ui.status(_('adding %s\n') % m.rel(abs))
43 ui.status(_('adding %s\n') % m.rel(abs))
44 names.append(abs)
44 names.append(abs)
45 if not opts.get('dry_run'):
45 if not opts.get('dry_run'):
46 rejected = repo.add(names)
46 rejected = repo.add(names)
47 rejected = [p for p in rejected if p in exacts]
47 rejected = [p for p in rejected if p in exacts]
48 return rejected and 1 or 0
48 return rejected and 1 or 0
49
49
50 def addremove(ui, repo, *pats, **opts):
50 def addremove(ui, repo, *pats, **opts):
51 """add all new files, delete all missing files
51 """add all new files, delete all missing files
52
52
53 Add all new files and remove all missing files from the repository.
53 Add all new files and remove all missing files from the repository.
54
54
55 New files are ignored if they match any of the patterns in .hgignore. As
55 New files are ignored if they match any of the patterns in .hgignore. As
56 with add, these changes take effect at the next commit.
56 with add, these changes take effect at the next commit.
57
57
58 Use the -s option to detect renamed files. With a parameter > 0,
58 Use the -s option to detect renamed files. With a parameter > 0,
59 this compares every removed file with every added file and records
59 this compares every removed file with every added file and records
60 those similar enough as renames. This option takes a percentage
60 those similar enough as renames. This option takes a percentage
61 between 0 (disabled) and 100 (files must be identical) as its
61 between 0 (disabled) and 100 (files must be identical) as its
62 parameter. Detecting renamed files this way can be expensive.
62 parameter. Detecting renamed files this way can be expensive.
63 """
63 """
64 try:
64 try:
65 sim = float(opts.get('similarity') or 0)
65 sim = float(opts.get('similarity') or 0)
66 except ValueError:
66 except ValueError:
67 raise util.Abort(_('similarity must be a number'))
67 raise util.Abort(_('similarity must be a number'))
68 if sim < 0 or sim > 100:
68 if sim < 0 or sim > 100:
69 raise util.Abort(_('similarity must be between 0 and 100'))
69 raise util.Abort(_('similarity must be between 0 and 100'))
70 return cmdutil.addremove(repo, pats, opts, similarity=sim/100.)
70 return cmdutil.addremove(repo, pats, opts, similarity=sim/100.)
71
71
72 def annotate(ui, repo, *pats, **opts):
72 def annotate(ui, repo, *pats, **opts):
73 """show changeset information per file line
73 """show changeset information per file line
74
74
75 List changes in files, showing the revision id responsible for each line
75 List changes in files, showing the revision id responsible for each line
76
76
77 This command is useful to discover who did a change or when a change took
77 This command is useful to discover who did a change or when a change took
78 place.
78 place.
79
79
80 Without the -a option, annotate will avoid processing files it
80 Without the -a option, annotate will avoid processing files it
81 detects as binary. With -a, annotate will generate an annotation
81 detects as binary. With -a, annotate will generate an annotation
82 anyway, probably with undesirable results.
82 anyway, probably with undesirable results.
83 """
83 """
84 datefunc = ui.quiet and util.shortdate or util.datestr
84 datefunc = ui.quiet and util.shortdate or util.datestr
85 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
85 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
86
86
87 if not pats:
87 if not pats:
88 raise util.Abort(_('at least one file name or pattern required'))
88 raise util.Abort(_('at least one file name or pattern required'))
89
89
90 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
90 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
91 ('number', lambda x: str(x[0].rev())),
91 ('number', lambda x: str(x[0].rev())),
92 ('changeset', lambda x: short(x[0].node())),
92 ('changeset', lambda x: short(x[0].node())),
93 ('date', getdate),
93 ('date', getdate),
94 ('follow', lambda x: x[0].path()),
94 ('follow', lambda x: x[0].path()),
95 ]
95 ]
96
96
97 if (not opts['user'] and not opts['changeset'] and not opts['date']
97 if (not opts['user'] and not opts['changeset'] and not opts['date']
98 and not opts['follow']):
98 and not opts['follow']):
99 opts['number'] = 1
99 opts['number'] = 1
100
100
101 linenumber = opts.get('line_number') is not None
101 linenumber = opts.get('line_number') is not None
102 if (linenumber and (not opts['changeset']) and (not opts['number'])):
102 if (linenumber and (not opts['changeset']) and (not opts['number'])):
103 raise util.Abort(_('at least one of -n/-c is required for -l'))
103 raise util.Abort(_('at least one of -n/-c is required for -l'))
104
104
105 funcmap = [func for op, func in opmap if opts.get(op)]
105 funcmap = [func for op, func in opmap if opts.get(op)]
106 if linenumber:
106 if linenumber:
107 lastfunc = funcmap[-1]
107 lastfunc = funcmap[-1]
108 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
108 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
109
109
110 ctx = repo[opts['rev']]
110 ctx = repo[opts['rev']]
111
111
112 m = cmdutil.match(repo, pats, opts)
112 m = cmdutil.match(repo, pats, opts)
113 for abs in ctx.walk(m):
113 for abs in ctx.walk(m):
114 fctx = ctx[abs]
114 fctx = ctx[abs]
115 if not opts['text'] and util.binary(fctx.data()):
115 if not opts['text'] and util.binary(fctx.data()):
116 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
116 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
117 continue
117 continue
118
118
119 lines = fctx.annotate(follow=opts.get('follow'),
119 lines = fctx.annotate(follow=opts.get('follow'),
120 linenumber=linenumber)
120 linenumber=linenumber)
121 pieces = []
121 pieces = []
122
122
123 for f in funcmap:
123 for f in funcmap:
124 l = [f(n) for n, dummy in lines]
124 l = [f(n) for n, dummy in lines]
125 if l:
125 if l:
126 m = max(map(len, l))
126 m = max(map(len, l))
127 pieces.append(["%*s" % (m, x) for x in l])
127 pieces.append(["%*s" % (m, x) for x in l])
128
128
129 if pieces:
129 if pieces:
130 for p, l in zip(zip(*pieces), lines):
130 for p, l in zip(zip(*pieces), lines):
131 ui.write("%s: %s" % (" ".join(p), l[1]))
131 ui.write("%s: %s" % (" ".join(p), l[1]))
132
132
133 def archive(ui, repo, dest, **opts):
133 def archive(ui, repo, dest, **opts):
134 '''create unversioned archive of a repository revision
134 '''create unversioned archive of a repository revision
135
135
136 By default, the revision used is the parent of the working
136 By default, the revision used is the parent of the working
137 directory; use "-r" to specify a different revision.
137 directory; use "-r" to specify a different revision.
138
138
139 To specify the type of archive to create, use "-t". Valid
139 To specify the type of archive to create, use "-t". Valid
140 types are:
140 types are:
141
141
142 "files" (default): a directory full of files
142 "files" (default): a directory full of files
143 "tar": tar archive, uncompressed
143 "tar": tar archive, uncompressed
144 "tbz2": tar archive, compressed using bzip2
144 "tbz2": tar archive, compressed using bzip2
145 "tgz": tar archive, compressed using gzip
145 "tgz": tar archive, compressed using gzip
146 "uzip": zip archive, uncompressed
146 "uzip": zip archive, uncompressed
147 "zip": zip archive, compressed using deflate
147 "zip": zip archive, compressed using deflate
148
148
149 The exact name of the destination archive or directory is given
149 The exact name of the destination archive or directory is given
150 using a format string; see "hg help export" for details.
150 using a format string; see "hg help export" for details.
151
151
152 Each member added to an archive file has a directory prefix
152 Each member added to an archive file has a directory prefix
153 prepended. Use "-p" to specify a format string for the prefix.
153 prepended. Use "-p" to specify a format string for the prefix.
154 The default is the basename of the archive, with suffixes removed.
154 The default is the basename of the archive, with suffixes removed.
155 '''
155 '''
156
156
157 ctx = repo[opts['rev']]
157 ctx = repo[opts['rev']]
158 if not ctx:
158 if not ctx:
159 raise util.Abort(_('repository has no revisions'))
159 raise util.Abort(_('repository has no revisions'))
160 node = ctx.node()
160 node = ctx.node()
161 dest = cmdutil.make_filename(repo, dest, node)
161 dest = cmdutil.make_filename(repo, dest, node)
162 if os.path.realpath(dest) == repo.root:
162 if os.path.realpath(dest) == repo.root:
163 raise util.Abort(_('repository root cannot be destination'))
163 raise util.Abort(_('repository root cannot be destination'))
164 matchfn = cmdutil.match(repo, [], opts)
164 matchfn = cmdutil.match(repo, [], opts)
165 kind = opts.get('type') or 'files'
165 kind = opts.get('type') or 'files'
166 prefix = opts['prefix']
166 prefix = opts['prefix']
167 if dest == '-':
167 if dest == '-':
168 if kind == 'files':
168 if kind == 'files':
169 raise util.Abort(_('cannot archive plain files to stdout'))
169 raise util.Abort(_('cannot archive plain files to stdout'))
170 dest = sys.stdout
170 dest = sys.stdout
171 if not prefix: prefix = os.path.basename(repo.root) + '-%h'
171 if not prefix: prefix = os.path.basename(repo.root) + '-%h'
172 prefix = cmdutil.make_filename(repo, prefix, node)
172 prefix = cmdutil.make_filename(repo, prefix, node)
173 archival.archive(repo, dest, node, kind, not opts['no_decode'],
173 archival.archive(repo, dest, node, kind, not opts['no_decode'],
174 matchfn, prefix)
174 matchfn, prefix)
175
175
176 def backout(ui, repo, node=None, rev=None, **opts):
176 def backout(ui, repo, node=None, rev=None, **opts):
177 '''reverse effect of earlier changeset
177 '''reverse effect of earlier changeset
178
178
179 Commit the backed out changes as a new changeset. The new
179 Commit the backed out changes as a new changeset. The new
180 changeset is a child of the backed out changeset.
180 changeset is a child of the backed out changeset.
181
181
182 If you back out a changeset other than the tip, a new head is
182 If you back out a changeset other than the tip, a new head is
183 created. This head will be the new tip and you should merge this
183 created. This head will be the new tip and you should merge this
184 backout changeset with another head (current one by default).
184 backout changeset with another head (current one by default).
185
185
186 The --merge option remembers the parent of the working directory
186 The --merge option remembers the parent of the working directory
187 before starting the backout, then merges the new head with that
187 before starting the backout, then merges the new head with that
188 changeset afterwards. This saves you from doing the merge by
188 changeset afterwards. This saves you from doing the merge by
189 hand. The result of this merge is not committed, as for a normal
189 hand. The result of this merge is not committed, as for a normal
190 merge.
190 merge.
191
191
192 See \'hg help dates\' for a list of formats valid for -d/--date.
192 See \'hg help dates\' for a list of formats valid for -d/--date.
193 '''
193 '''
194 if rev and node:
194 if rev and node:
195 raise util.Abort(_("please specify just one revision"))
195 raise util.Abort(_("please specify just one revision"))
196
196
197 if not rev:
197 if not rev:
198 rev = node
198 rev = node
199
199
200 if not rev:
200 if not rev:
201 raise util.Abort(_("please specify a revision to backout"))
201 raise util.Abort(_("please specify a revision to backout"))
202
202
203 date = opts.get('date')
203 date = opts.get('date')
204 if date:
204 if date:
205 opts['date'] = util.parsedate(date)
205 opts['date'] = util.parsedate(date)
206
206
207 cmdutil.bail_if_changed(repo)
207 cmdutil.bail_if_changed(repo)
208 node = repo.lookup(rev)
208 node = repo.lookup(rev)
209
209
210 op1, op2 = repo.dirstate.parents()
210 op1, op2 = repo.dirstate.parents()
211 a = repo.changelog.ancestor(op1, node)
211 a = repo.changelog.ancestor(op1, node)
212 if a != node:
212 if a != node:
213 raise util.Abort(_('cannot back out change on a different branch'))
213 raise util.Abort(_('cannot back out change on a different branch'))
214
214
215 p1, p2 = repo.changelog.parents(node)
215 p1, p2 = repo.changelog.parents(node)
216 if p1 == nullid:
216 if p1 == nullid:
217 raise util.Abort(_('cannot back out a change with no parents'))
217 raise util.Abort(_('cannot back out a change with no parents'))
218 if p2 != nullid:
218 if p2 != nullid:
219 if not opts['parent']:
219 if not opts['parent']:
220 raise util.Abort(_('cannot back out a merge changeset without '
220 raise util.Abort(_('cannot back out a merge changeset without '
221 '--parent'))
221 '--parent'))
222 p = repo.lookup(opts['parent'])
222 p = repo.lookup(opts['parent'])
223 if p not in (p1, p2):
223 if p not in (p1, p2):
224 raise util.Abort(_('%s is not a parent of %s') %
224 raise util.Abort(_('%s is not a parent of %s') %
225 (short(p), short(node)))
225 (short(p), short(node)))
226 parent = p
226 parent = p
227 else:
227 else:
228 if opts['parent']:
228 if opts['parent']:
229 raise util.Abort(_('cannot use --parent on non-merge changeset'))
229 raise util.Abort(_('cannot use --parent on non-merge changeset'))
230 parent = p1
230 parent = p1
231
231
232 # the backout should appear on the same branch
232 # the backout should appear on the same branch
233 branch = repo.dirstate.branch()
233 branch = repo.dirstate.branch()
234 hg.clean(repo, node, show_stats=False)
234 hg.clean(repo, node, show_stats=False)
235 repo.dirstate.setbranch(branch)
235 repo.dirstate.setbranch(branch)
236 revert_opts = opts.copy()
236 revert_opts = opts.copy()
237 revert_opts['date'] = None
237 revert_opts['date'] = None
238 revert_opts['all'] = True
238 revert_opts['all'] = True
239 revert_opts['rev'] = hex(parent)
239 revert_opts['rev'] = hex(parent)
240 revert_opts['no_backup'] = None
240 revert_opts['no_backup'] = None
241 revert(ui, repo, **revert_opts)
241 revert(ui, repo, **revert_opts)
242 commit_opts = opts.copy()
242 commit_opts = opts.copy()
243 commit_opts['addremove'] = False
243 commit_opts['addremove'] = False
244 if not commit_opts['message'] and not commit_opts['logfile']:
244 if not commit_opts['message'] and not commit_opts['logfile']:
245 commit_opts['message'] = _("Backed out changeset %s") % (short(node))
245 commit_opts['message'] = _("Backed out changeset %s") % (short(node))
246 commit_opts['force_editor'] = True
246 commit_opts['force_editor'] = True
247 commit(ui, repo, **commit_opts)
247 commit(ui, repo, **commit_opts)
248 def nice(node):
248 def nice(node):
249 return '%d:%s' % (repo.changelog.rev(node), short(node))
249 return '%d:%s' % (repo.changelog.rev(node), short(node))
250 ui.status(_('changeset %s backs out changeset %s\n') %
250 ui.status(_('changeset %s backs out changeset %s\n') %
251 (nice(repo.changelog.tip()), nice(node)))
251 (nice(repo.changelog.tip()), nice(node)))
252 if op1 != node:
252 if op1 != node:
253 hg.clean(repo, op1, show_stats=False)
253 hg.clean(repo, op1, show_stats=False)
254 if opts['merge']:
254 if opts['merge']:
255 ui.status(_('merging with changeset %s\n') % nice(repo.changelog.tip()))
255 ui.status(_('merging with changeset %s\n') % nice(repo.changelog.tip()))
256 hg.merge(repo, hex(repo.changelog.tip()))
256 hg.merge(repo, hex(repo.changelog.tip()))
257 else:
257 else:
258 ui.status(_('the backout changeset is a new head - '
258 ui.status(_('the backout changeset is a new head - '
259 'do not forget to merge\n'))
259 'do not forget to merge\n'))
260 ui.status(_('(use "backout --merge" '
260 ui.status(_('(use "backout --merge" '
261 'if you want to auto-merge)\n'))
261 'if you want to auto-merge)\n'))
262
262
263 def bisect(ui, repo, rev=None, extra=None,
263 def bisect(ui, repo, rev=None, extra=None,
264 reset=None, good=None, bad=None, skip=None, noupdate=None):
264 reset=None, good=None, bad=None, skip=None, noupdate=None):
265 """subdivision search of changesets
265 """subdivision search of changesets
266
266
267 This command helps to find changesets which introduce problems.
267 This command helps to find changesets which introduce problems.
268 To use, mark the earliest changeset you know exhibits the problem
268 To use, mark the earliest changeset you know exhibits the problem
269 as bad, then mark the latest changeset which is free from the
269 as bad, then mark the latest changeset which is free from the
270 problem as good. Bisect will update your working directory to a
270 problem as good. Bisect will update your working directory to a
271 revision for testing (unless the --noupdate option is specified).
271 revision for testing (unless the --noupdate option is specified).
272 Once you have performed tests, mark the working directory as bad
272 Once you have performed tests, mark the working directory as bad
273 or good and bisect will either update to another candidate changeset
273 or good and bisect will either update to another candidate changeset
274 or announce that it has found the bad revision.
274 or announce that it has found the bad revision.
275
275
276 As a shortcut, you can also use the revision argument to mark a
276 As a shortcut, you can also use the revision argument to mark a
277 revision as good or bad without checking it out first.
277 revision as good or bad without checking it out first.
278 """
278 """
279 # backward compatibility
279 # backward compatibility
280 if rev in "good bad reset init".split():
280 if rev in "good bad reset init".split():
281 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
281 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
282 cmd, rev, extra = rev, extra, None
282 cmd, rev, extra = rev, extra, None
283 if cmd == "good":
283 if cmd == "good":
284 good = True
284 good = True
285 elif cmd == "bad":
285 elif cmd == "bad":
286 bad = True
286 bad = True
287 else:
287 else:
288 reset = True
288 reset = True
289 elif extra or good + bad + skip + reset > 1:
289 elif extra or good + bad + skip + reset > 1:
290 raise util.Abort(_('incompatible arguments'))
290 raise util.Abort(_('incompatible arguments'))
291
291
292 if reset:
292 if reset:
293 p = repo.join("bisect.state")
293 p = repo.join("bisect.state")
294 if os.path.exists(p):
294 if os.path.exists(p):
295 os.unlink(p)
295 os.unlink(p)
296 return
296 return
297
297
298 # load state
298 # load state
299 state = {'good': [], 'bad': [], 'skip': []}
299 state = {'good': [], 'bad': [], 'skip': []}
300 if os.path.exists(repo.join("bisect.state")):
300 if os.path.exists(repo.join("bisect.state")):
301 for l in repo.opener("bisect.state"):
301 for l in repo.opener("bisect.state"):
302 kind, node = l[:-1].split()
302 kind, node = l[:-1].split()
303 node = repo.lookup(node)
303 node = repo.lookup(node)
304 if kind not in state:
304 if kind not in state:
305 raise util.Abort(_("unknown bisect kind %s") % kind)
305 raise util.Abort(_("unknown bisect kind %s") % kind)
306 state[kind].append(node)
306 state[kind].append(node)
307
307
308 # update state
308 # update state
309 node = repo.lookup(rev or '.')
309 node = repo.lookup(rev or '.')
310 if good:
310 if good:
311 state['good'].append(node)
311 state['good'].append(node)
312 elif bad:
312 elif bad:
313 state['bad'].append(node)
313 state['bad'].append(node)
314 elif skip:
314 elif skip:
315 state['skip'].append(node)
315 state['skip'].append(node)
316
316
317 # save state
317 # save state
318 f = repo.opener("bisect.state", "w", atomictemp=True)
318 f = repo.opener("bisect.state", "w", atomictemp=True)
319 wlock = repo.wlock()
319 wlock = repo.wlock()
320 try:
320 try:
321 for kind in state:
321 for kind in state:
322 for node in state[kind]:
322 for node in state[kind]:
323 f.write("%s %s\n" % (kind, hex(node)))
323 f.write("%s %s\n" % (kind, hex(node)))
324 f.rename()
324 f.rename()
325 finally:
325 finally:
326 del wlock
326 del wlock
327
327
328 if not state['good'] or not state['bad']:
328 if not state['good'] or not state['bad']:
329 if (good or bad or skip or reset):
329 if (good or bad or skip or reset):
330 return
330 return
331 if not state['good']:
331 if not state['good']:
332 raise util.Abort(_('cannot bisect (no known good revisions)'))
332 raise util.Abort(_('cannot bisect (no known good revisions)'))
333 else:
333 else:
334 raise util.Abort(_('cannot bisect (no known bad revisions)'))
334 raise util.Abort(_('cannot bisect (no known bad revisions)'))
335
335
336 # actually bisect
336 # actually bisect
337 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
337 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
338 if changesets == 0:
338 if changesets == 0:
339 displayer = cmdutil.show_changeset(ui, repo, {})
339 displayer = cmdutil.show_changeset(ui, repo, {})
340 transition = (good and "good" or "bad")
340 transition = (good and "good" or "bad")
341 if len(nodes) == 1:
341 if len(nodes) == 1:
342 # narrowed it down to a single revision
342 # narrowed it down to a single revision
343 ui.write(_("The first %s revision is:\n") % transition)
343 ui.write(_("The first %s revision is:\n") % transition)
344 displayer.show(changenode=nodes[0])
344 displayer.show(changenode=nodes[0])
345 else:
345 else:
346 # multiple possible revisions
346 # multiple possible revisions
347 ui.write(_("Due to skipped revisions, the first "
347 ui.write(_("Due to skipped revisions, the first "
348 "%s revision could be any of:\n") % transition)
348 "%s revision could be any of:\n") % transition)
349 for n in nodes:
349 for n in nodes:
350 displayer.show(changenode=n)
350 displayer.show(changenode=n)
351 else:
351 else:
352 assert len(nodes) == 1 # only a single node can be tested next
352 assert len(nodes) == 1 # only a single node can be tested next
353 node = nodes[0]
353 node = nodes[0]
354 # compute the approximate number of remaining tests
354 # compute the approximate number of remaining tests
355 tests, size = 0, 2
355 tests, size = 0, 2
356 while size <= changesets:
356 while size <= changesets:
357 tests, size = tests + 1, size * 2
357 tests, size = tests + 1, size * 2
358 rev = repo.changelog.rev(node)
358 rev = repo.changelog.rev(node)
359 ui.write(_("Testing changeset %s:%s "
359 ui.write(_("Testing changeset %s:%s "
360 "(%s changesets remaining, ~%s tests)\n")
360 "(%s changesets remaining, ~%s tests)\n")
361 % (rev, short(node), changesets, tests))
361 % (rev, short(node), changesets, tests))
362 if not noupdate:
362 if not noupdate:
363 cmdutil.bail_if_changed(repo)
363 cmdutil.bail_if_changed(repo)
364 return hg.clean(repo, node)
364 return hg.clean(repo, node)
365
365
366 def branch(ui, repo, label=None, **opts):
366 def branch(ui, repo, label=None, **opts):
367 """set or show the current branch name
367 """set or show the current branch name
368
368
369 With no argument, show the current branch name. With one argument,
369 With no argument, show the current branch name. With one argument,
370 set the working directory branch name (the branch does not exist in
370 set the working directory branch name (the branch does not exist in
371 the repository until the next commit).
371 the repository until the next commit).
372
372
373 Unless --force is specified, branch will not let you set a
373 Unless --force is specified, branch will not let you set a
374 branch name that shadows an existing branch.
374 branch name that shadows an existing branch.
375
375
376 Use --clean to reset the working directory branch to that of the
376 Use --clean to reset the working directory branch to that of the
377 parent of the working directory, negating a previous branch change.
377 parent of the working directory, negating a previous branch change.
378
378
379 Use the command 'hg update' to switch to an existing branch.
379 Use the command 'hg update' to switch to an existing branch.
380 """
380 """
381
381
382 if opts.get('clean'):
382 if opts.get('clean'):
383 label = repo[None].parents()[0].branch()
383 label = repo[None].parents()[0].branch()
384 repo.dirstate.setbranch(label)
384 repo.dirstate.setbranch(label)
385 ui.status(_('reset working directory to branch %s\n') % label)
385 ui.status(_('reset working directory to branch %s\n') % label)
386 elif label:
386 elif label:
387 if not opts.get('force') and label in repo.branchtags():
387 if not opts.get('force') and label in repo.branchtags():
388 if label not in [p.branch() for p in repo.parents()]:
388 if label not in [p.branch() for p in repo.parents()]:
389 raise util.Abort(_('a branch of the same name already exists'
389 raise util.Abort(_('a branch of the same name already exists'
390 ' (use --force to override)'))
390 ' (use --force to override)'))
391 repo.dirstate.setbranch(util.fromlocal(label))
391 repo.dirstate.setbranch(util.fromlocal(label))
392 ui.status(_('marked working directory as branch %s\n') % label)
392 ui.status(_('marked working directory as branch %s\n') % label)
393 else:
393 else:
394 ui.write("%s\n" % util.tolocal(repo.dirstate.branch()))
394 ui.write("%s\n" % util.tolocal(repo.dirstate.branch()))
395
395
396 def branches(ui, repo, active=False):
396 def branches(ui, repo, active=False):
397 """list repository named branches
397 """list repository named branches
398
398
399 List the repository's named branches, indicating which ones are
399 List the repository's named branches, indicating which ones are
400 inactive. If active is specified, only show active branches.
400 inactive. If active is specified, only show active branches.
401
401
402 A branch is considered active if it contains repository heads.
402 A branch is considered active if it contains repository heads.
403
403
404 Use the command 'hg update' to switch to an existing branch.
404 Use the command 'hg update' to switch to an existing branch.
405 """
405 """
406 hexfunc = ui.debugflag and hex or short
406 hexfunc = ui.debugflag and hex or short
407 activebranches = [util.tolocal(repo[n].branch())
407 activebranches = [util.tolocal(repo[n].branch())
408 for n in repo.heads()]
408 for n in repo.heads()]
409 branches = util.sort([(tag in activebranches, repo.changelog.rev(node), tag)
409 branches = util.sort([(tag in activebranches, repo.changelog.rev(node), tag)
410 for tag, node in repo.branchtags().items()])
410 for tag, node in repo.branchtags().items()])
411 branches.reverse()
411 branches.reverse()
412
412
413 for isactive, node, tag in branches:
413 for isactive, node, tag in branches:
414 if (not active) or isactive:
414 if (not active) or isactive:
415 if ui.quiet:
415 if ui.quiet:
416 ui.write("%s\n" % tag)
416 ui.write("%s\n" % tag)
417 else:
417 else:
418 rev = str(node).rjust(31 - util.locallen(tag))
418 rev = str(node).rjust(31 - util.locallen(tag))
419 isinactive = ((not isactive) and " (inactive)") or ''
419 isinactive = ((not isactive) and " (inactive)") or ''
420 data = tag, rev, hexfunc(repo.lookup(node)), isinactive
420 data = tag, rev, hexfunc(repo.lookup(node)), isinactive
421 ui.write("%s %s:%s%s\n" % data)
421 ui.write("%s %s:%s%s\n" % data)
422
422
423 def bundle(ui, repo, fname, dest=None, **opts):
423 def bundle(ui, repo, fname, dest=None, **opts):
424 """create a changegroup file
424 """create a changegroup file
425
425
426 Generate a compressed changegroup file collecting changesets not
426 Generate a compressed changegroup file collecting changesets not
427 found in the other repository.
427 found in the other repository.
428
428
429 If no destination repository is specified the destination is
429 If no destination repository is specified the destination is
430 assumed to have all the nodes specified by one or more --base
430 assumed to have all the nodes specified by one or more --base
431 parameters. To create a bundle containing all changesets, use
431 parameters. To create a bundle containing all changesets, use
432 --all (or --base null). To change the compression method applied,
432 --all (or --base null). To change the compression method applied,
433 use the -t option (by default, bundles are compressed using bz2).
433 use the -t option (by default, bundles are compressed using bz2).
434
434
435 The bundle file can then be transferred using conventional means and
435 The bundle file can then be transferred using conventional means and
436 applied to another repository with the unbundle or pull command.
436 applied to another repository with the unbundle or pull command.
437 This is useful when direct push and pull are not available or when
437 This is useful when direct push and pull are not available or when
438 exporting an entire repository is undesirable.
438 exporting an entire repository is undesirable.
439
439
440 Applying bundles preserves all changeset contents including
440 Applying bundles preserves all changeset contents including
441 permissions, copy/rename information, and revision history.
441 permissions, copy/rename information, and revision history.
442 """
442 """
443 revs = opts.get('rev') or None
443 revs = opts.get('rev') or None
444 if revs:
444 if revs:
445 revs = [repo.lookup(rev) for rev in revs]
445 revs = [repo.lookup(rev) for rev in revs]
446 if opts.get('all'):
446 if opts.get('all'):
447 base = ['null']
447 base = ['null']
448 else:
448 else:
449 base = opts.get('base')
449 base = opts.get('base')
450 if base:
450 if base:
451 if dest:
451 if dest:
452 raise util.Abort(_("--base is incompatible with specifiying "
452 raise util.Abort(_("--base is incompatible with specifiying "
453 "a destination"))
453 "a destination"))
454 base = [repo.lookup(rev) for rev in base]
454 base = [repo.lookup(rev) for rev in base]
455 # create the right base
455 # create the right base
456 # XXX: nodesbetween / changegroup* should be "fixed" instead
456 # XXX: nodesbetween / changegroup* should be "fixed" instead
457 o = []
457 o = []
458 has = {nullid: None}
458 has = {nullid: None}
459 for n in base:
459 for n in base:
460 has.update(repo.changelog.reachable(n))
460 has.update(repo.changelog.reachable(n))
461 if revs:
461 if revs:
462 visit = list(revs)
462 visit = list(revs)
463 else:
463 else:
464 visit = repo.changelog.heads()
464 visit = repo.changelog.heads()
465 seen = {}
465 seen = {}
466 while visit:
466 while visit:
467 n = visit.pop(0)
467 n = visit.pop(0)
468 parents = [p for p in repo.changelog.parents(n) if p not in has]
468 parents = [p for p in repo.changelog.parents(n) if p not in has]
469 if len(parents) == 0:
469 if len(parents) == 0:
470 o.insert(0, n)
470 o.insert(0, n)
471 else:
471 else:
472 for p in parents:
472 for p in parents:
473 if p not in seen:
473 if p not in seen:
474 seen[p] = 1
474 seen[p] = 1
475 visit.append(p)
475 visit.append(p)
476 else:
476 else:
477 cmdutil.setremoteconfig(ui, opts)
477 cmdutil.setremoteconfig(ui, opts)
478 dest, revs, checkout = hg.parseurl(
478 dest, revs, checkout = hg.parseurl(
479 ui.expandpath(dest or 'default-push', dest or 'default'), revs)
479 ui.expandpath(dest or 'default-push', dest or 'default'), revs)
480 other = hg.repository(ui, dest)
480 other = hg.repository(ui, dest)
481 o = repo.findoutgoing(other, force=opts['force'])
481 o = repo.findoutgoing(other, force=opts['force'])
482
482
483 if revs:
483 if revs:
484 cg = repo.changegroupsubset(o, revs, 'bundle')
484 cg = repo.changegroupsubset(o, revs, 'bundle')
485 else:
485 else:
486 cg = repo.changegroup(o, 'bundle')
486 cg = repo.changegroup(o, 'bundle')
487
487
488 bundletype = opts.get('type', 'bzip2').lower()
488 bundletype = opts.get('type', 'bzip2').lower()
489 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
489 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
490 bundletype = btypes.get(bundletype)
490 bundletype = btypes.get(bundletype)
491 if bundletype not in changegroup.bundletypes:
491 if bundletype not in changegroup.bundletypes:
492 raise util.Abort(_('unknown bundle type specified with --type'))
492 raise util.Abort(_('unknown bundle type specified with --type'))
493
493
494 changegroup.writebundle(cg, fname, bundletype)
494 changegroup.writebundle(cg, fname, bundletype)
495
495
496 def cat(ui, repo, file1, *pats, **opts):
496 def cat(ui, repo, file1, *pats, **opts):
497 """output the current or given revision of files
497 """output the current or given revision of files
498
498
499 Print the specified files as they were at the given revision.
499 Print the specified files as they were at the given revision.
500 If no revision is given, the parent of the working directory is used,
500 If no revision is given, the parent of the working directory is used,
501 or tip if no revision is checked out.
501 or tip if no revision is checked out.
502
502
503 Output may be to a file, in which case the name of the file is
503 Output may be to a file, in which case the name of the file is
504 given using a format string. The formatting rules are the same as
504 given using a format string. The formatting rules are the same as
505 for the export command, with the following additions:
505 for the export command, with the following additions:
506
506
507 %s basename of file being printed
507 %s basename of file being printed
508 %d dirname of file being printed, or '.' if in repo root
508 %d dirname of file being printed, or '.' if in repo root
509 %p root-relative path name of file being printed
509 %p root-relative path name of file being printed
510 """
510 """
511 ctx = repo[opts['rev']]
511 ctx = repo[opts['rev']]
512 err = 1
512 err = 1
513 m = cmdutil.match(repo, (file1,) + pats, opts)
513 m = cmdutil.match(repo, (file1,) + pats, opts)
514 for abs in ctx.walk(m):
514 for abs in ctx.walk(m):
515 fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs)
515 fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs)
516 data = ctx[abs].data()
516 data = ctx[abs].data()
517 if opts.get('decode'):
517 if opts.get('decode'):
518 data = repo.wwritedata(abs, data)
518 data = repo.wwritedata(abs, data)
519 fp.write(data)
519 fp.write(data)
520 err = 0
520 err = 0
521 return err
521 return err
522
522
523 def clone(ui, source, dest=None, **opts):
523 def clone(ui, source, dest=None, **opts):
524 """make a copy of an existing repository
524 """make a copy of an existing repository
525
525
526 Create a copy of an existing repository in a new directory.
526 Create a copy of an existing repository in a new directory.
527
527
528 If no destination directory name is specified, it defaults to the
528 If no destination directory name is specified, it defaults to the
529 basename of the source.
529 basename of the source.
530
530
531 The location of the source is added to the new repository's
531 The location of the source is added to the new repository's
532 .hg/hgrc file, as the default to be used for future pulls.
532 .hg/hgrc file, as the default to be used for future pulls.
533
533
534 For efficiency, hardlinks are used for cloning whenever the source
534 For efficiency, hardlinks are used for cloning whenever the source
535 and destination are on the same filesystem (note this applies only
535 and destination are on the same filesystem (note this applies only
536 to the repository data, not to the checked out files). Some
536 to the repository data, not to the checked out files). Some
537 filesystems, such as AFS, implement hardlinking incorrectly, but
537 filesystems, such as AFS, implement hardlinking incorrectly, but
538 do not report errors. In these cases, use the --pull option to
538 do not report errors. In these cases, use the --pull option to
539 avoid hardlinking.
539 avoid hardlinking.
540
540
541 In some cases, you can clone repositories and checked out files
541 In some cases, you can clone repositories and checked out files
542 using full hardlinks with
542 using full hardlinks with
543
543
544 $ cp -al REPO REPOCLONE
544 $ cp -al REPO REPOCLONE
545
545
546 This is the fastest way to clone, but it is not always safe. The
546 This is the fastest way to clone, but it is not always safe. The
547 operation is not atomic (making sure REPO is not modified during
547 operation is not atomic (making sure REPO is not modified during
548 the operation is up to you) and you have to make sure your editor
548 the operation is up to you) and you have to make sure your editor
549 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
549 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
550 this is not compatible with certain extensions that place their
550 this is not compatible with certain extensions that place their
551 metadata under the .hg directory, such as mq.
551 metadata under the .hg directory, such as mq.
552
552
553 If you use the -r option to clone up to a specific revision, no
553 If you use the -r option to clone up to a specific revision, no
554 subsequent revisions will be present in the cloned repository.
554 subsequent revisions will be present in the cloned repository.
555 This option implies --pull, even on local repositories.
555 This option implies --pull, even on local repositories.
556
556
557 If the -U option is used, the new clone will contain only a repository
557 If the -U option is used, the new clone will contain only a repository
558 (.hg) and no working copy (the working copy parent is the null revision).
558 (.hg) and no working copy (the working copy parent is the null revision).
559
559
560 See pull for valid source format details.
560 See pull for valid source format details.
561
561
562 It is possible to specify an ssh:// URL as the destination, but no
562 It is possible to specify an ssh:// URL as the destination, but no
563 .hg/hgrc and working directory will be created on the remote side.
563 .hg/hgrc and working directory will be created on the remote side.
564 Look at the help text for the pull command for important details
564 Look at the help text for the pull command for important details
565 about ssh:// URLs.
565 about ssh:// URLs.
566 """
566 """
567 cmdutil.setremoteconfig(ui, opts)
567 cmdutil.setremoteconfig(ui, opts)
568 hg.clone(ui, source, dest,
568 hg.clone(ui, source, dest,
569 pull=opts['pull'],
569 pull=opts['pull'],
570 stream=opts['uncompressed'],
570 stream=opts['uncompressed'],
571 rev=opts['rev'],
571 rev=opts['rev'],
572 update=not opts['noupdate'])
572 update=not opts['noupdate'])
573
573
574 def commit(ui, repo, *pats, **opts):
574 def commit(ui, repo, *pats, **opts):
575 """commit the specified files or all outstanding changes
575 """commit the specified files or all outstanding changes
576
576
577 Commit changes to the given files into the repository.
577 Commit changes to the given files into the repository.
578
578
579 If a list of files is omitted, all changes reported by "hg status"
579 If a list of files is omitted, all changes reported by "hg status"
580 will be committed.
580 will be committed.
581
581
582 If you are committing the result of a merge, do not provide any
582 If you are committing the result of a merge, do not provide any
583 file names or -I/-X filters.
583 file names or -I/-X filters.
584
584
585 If no commit message is specified, the configured editor is started to
585 If no commit message is specified, the configured editor is started to
586 enter a message.
586 enter a message.
587
587
588 See 'hg help dates' for a list of formats valid for -d/--date.
588 See 'hg help dates' for a list of formats valid for -d/--date.
589 """
589 """
590 def commitfunc(ui, repo, message, match, opts):
590 def commitfunc(ui, repo, message, match, opts):
591 return repo.commit(match.files(), message, opts['user'], opts['date'],
591 return repo.commit(match.files(), message, opts['user'], opts['date'],
592 match, force_editor=opts.get('force_editor'))
592 match, force_editor=opts.get('force_editor'))
593
593
594 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
594 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
595 if not node:
595 if not node:
596 return
596 return
597 cl = repo.changelog
597 cl = repo.changelog
598 rev = cl.rev(node)
598 rev = cl.rev(node)
599 parents = cl.parentrevs(rev)
599 parents = cl.parentrevs(rev)
600 if rev - 1 in parents:
600 if rev - 1 in parents:
601 # one of the parents was the old tip
601 # one of the parents was the old tip
602 pass
602 pass
603 elif (parents == (nullrev, nullrev) or
603 elif (parents == (nullrev, nullrev) or
604 len(cl.heads(cl.node(parents[0]))) > 1 and
604 len(cl.heads(cl.node(parents[0]))) > 1 and
605 (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)):
605 (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)):
606 ui.status(_('created new head\n'))
606 ui.status(_('created new head\n'))
607
607
608 if ui.debugflag:
608 if ui.debugflag:
609 ui.write(_('committed changeset %d:%s\n') % (rev,hex(node)))
609 ui.write(_('committed changeset %d:%s\n') % (rev,hex(node)))
610 elif ui.verbose:
610 elif ui.verbose:
611 ui.write(_('committed changeset %d:%s\n') % (rev,short(node)))
611 ui.write(_('committed changeset %d:%s\n') % (rev,short(node)))
612
612
613 def copy(ui, repo, *pats, **opts):
613 def copy(ui, repo, *pats, **opts):
614 """mark files as copied for the next commit
614 """mark files as copied for the next commit
615
615
616 Mark dest as having copies of source files. If dest is a
616 Mark dest as having copies of source files. If dest is a
617 directory, copies are put in that directory. If dest is a file,
617 directory, copies are put in that directory. If dest is a file,
618 there can only be one source.
618 there can only be one source.
619
619
620 By default, this command copies the contents of files as they
620 By default, this command copies the contents of files as they
621 stand in the working directory. If invoked with --after, the
621 stand in the working directory. If invoked with --after, the
622 operation is recorded, but no copying is performed.
622 operation is recorded, but no copying is performed.
623
623
624 This command takes effect in the next commit. To undo a copy
624 This command takes effect in the next commit. To undo a copy
625 before that, see hg revert.
625 before that, see hg revert.
626 """
626 """
627 wlock = repo.wlock(False)
627 wlock = repo.wlock(False)
628 try:
628 try:
629 return cmdutil.copy(ui, repo, pats, opts)
629 return cmdutil.copy(ui, repo, pats, opts)
630 finally:
630 finally:
631 del wlock
631 del wlock
632
632
633 def debugancestor(ui, repo, *args):
633 def debugancestor(ui, repo, *args):
634 """find the ancestor revision of two revisions in a given index"""
634 """find the ancestor revision of two revisions in a given index"""
635 if len(args) == 3:
635 if len(args) == 3:
636 index, rev1, rev2 = args
636 index, rev1, rev2 = args
637 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
637 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
638 lookup = r.lookup
638 lookup = r.lookup
639 elif len(args) == 2:
639 elif len(args) == 2:
640 if not repo:
640 if not repo:
641 raise util.Abort(_("There is no Mercurial repository here "
641 raise util.Abort(_("There is no Mercurial repository here "
642 "(.hg not found)"))
642 "(.hg not found)"))
643 rev1, rev2 = args
643 rev1, rev2 = args
644 r = repo.changelog
644 r = repo.changelog
645 lookup = repo.lookup
645 lookup = repo.lookup
646 else:
646 else:
647 raise util.Abort(_('either two or three arguments required'))
647 raise util.Abort(_('either two or three arguments required'))
648 a = r.ancestor(lookup(rev1), lookup(rev2))
648 a = r.ancestor(lookup(rev1), lookup(rev2))
649 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
649 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
650
650
651 def debugcomplete(ui, cmd='', **opts):
651 def debugcomplete(ui, cmd='', **opts):
652 """returns the completion list associated with the given command"""
652 """returns the completion list associated with the given command"""
653
653
654 if opts['options']:
654 if opts['options']:
655 options = []
655 options = []
656 otables = [globalopts]
656 otables = [globalopts]
657 if cmd:
657 if cmd:
658 aliases, entry = cmdutil.findcmd(ui, cmd, table)
658 aliases, entry = cmdutil.findcmd(ui, cmd, table)
659 otables.append(entry[1])
659 otables.append(entry[1])
660 for t in otables:
660 for t in otables:
661 for o in t:
661 for o in t:
662 if o[0]:
662 if o[0]:
663 options.append('-%s' % o[0])
663 options.append('-%s' % o[0])
664 options.append('--%s' % o[1])
664 options.append('--%s' % o[1])
665 ui.write("%s\n" % "\n".join(options))
665 ui.write("%s\n" % "\n".join(options))
666 return
666 return
667
667
668 ui.write("%s\n" % "\n".join(util.sort(cmdutil.findpossible(ui, cmd, table))))
668 ui.write("%s\n" % "\n".join(util.sort(cmdutil.findpossible(ui, cmd, table))))
669
669
670 def debugfsinfo(ui, path = "."):
670 def debugfsinfo(ui, path = "."):
671 file('.debugfsinfo', 'w').write('')
671 file('.debugfsinfo', 'w').write('')
672 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
672 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
673 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
673 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
674 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
674 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
675 and 'yes' or 'no'))
675 and 'yes' or 'no'))
676 os.unlink('.debugfsinfo')
676 os.unlink('.debugfsinfo')
677
677
678 def debugrebuildstate(ui, repo, rev="tip"):
678 def debugrebuildstate(ui, repo, rev="tip"):
679 """rebuild the dirstate as it would look like for the given revision"""
679 """rebuild the dirstate as it would look like for the given revision"""
680 ctx = repo[rev]
680 ctx = repo[rev]
681 wlock = repo.wlock()
681 wlock = repo.wlock()
682 try:
682 try:
683 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
683 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
684 finally:
684 finally:
685 del wlock
685 del wlock
686
686
687 def debugcheckstate(ui, repo):
687 def debugcheckstate(ui, repo):
688 """validate the correctness of the current dirstate"""
688 """validate the correctness of the current dirstate"""
689 parent1, parent2 = repo.dirstate.parents()
689 parent1, parent2 = repo.dirstate.parents()
690 m1 = repo[parent1].manifest()
690 m1 = repo[parent1].manifest()
691 m2 = repo[parent2].manifest()
691 m2 = repo[parent2].manifest()
692 errors = 0
692 errors = 0
693 for f in repo.dirstate:
693 for f in repo.dirstate:
694 state = repo.dirstate[f]
694 state = repo.dirstate[f]
695 if state in "nr" and f not in m1:
695 if state in "nr" and f not in m1:
696 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
696 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
697 errors += 1
697 errors += 1
698 if state in "a" and f in m1:
698 if state in "a" and f in m1:
699 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
699 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
700 errors += 1
700 errors += 1
701 if state in "m" and f not in m1 and f not in m2:
701 if state in "m" and f not in m1 and f not in m2:
702 ui.warn(_("%s in state %s, but not in either manifest\n") %
702 ui.warn(_("%s in state %s, but not in either manifest\n") %
703 (f, state))
703 (f, state))
704 errors += 1
704 errors += 1
705 for f in m1:
705 for f in m1:
706 state = repo.dirstate[f]
706 state = repo.dirstate[f]
707 if state not in "nrm":
707 if state not in "nrm":
708 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
708 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
709 errors += 1
709 errors += 1
710 if errors:
710 if errors:
711 error = _(".hg/dirstate inconsistent with current parent's manifest")
711 error = _(".hg/dirstate inconsistent with current parent's manifest")
712 raise util.Abort(error)
712 raise util.Abort(error)
713
713
714 def showconfig(ui, repo, *values, **opts):
714 def showconfig(ui, repo, *values, **opts):
715 """show combined config settings from all hgrc files
715 """show combined config settings from all hgrc files
716
716
717 With no args, print names and values of all config items.
717 With no args, print names and values of all config items.
718
718
719 With one arg of the form section.name, print just the value of
719 With one arg of the form section.name, print just the value of
720 that config item.
720 that config item.
721
721
722 With multiple args, print names and values of all config items
722 With multiple args, print names and values of all config items
723 with matching section names."""
723 with matching section names."""
724
724
725 untrusted = bool(opts.get('untrusted'))
725 untrusted = bool(opts.get('untrusted'))
726 if values:
726 if values:
727 if len([v for v in values if '.' in v]) > 1:
727 if len([v for v in values if '.' in v]) > 1:
728 raise util.Abort(_('only one config item permitted'))
728 raise util.Abort(_('only one config item permitted'))
729 for section, name, value in ui.walkconfig(untrusted=untrusted):
729 for section, name, value in ui.walkconfig(untrusted=untrusted):
730 sectname = section + '.' + name
730 sectname = section + '.' + name
731 if values:
731 if values:
732 for v in values:
732 for v in values:
733 if v == section:
733 if v == section:
734 ui.write('%s=%s\n' % (sectname, value))
734 ui.write('%s=%s\n' % (sectname, value))
735 elif v == sectname:
735 elif v == sectname:
736 ui.write(value, '\n')
736 ui.write(value, '\n')
737 else:
737 else:
738 ui.write('%s=%s\n' % (sectname, value))
738 ui.write('%s=%s\n' % (sectname, value))
739
739
740 def debugsetparents(ui, repo, rev1, rev2=None):
740 def debugsetparents(ui, repo, rev1, rev2=None):
741 """manually set the parents of the current working directory
741 """manually set the parents of the current working directory
742
742
743 This is useful for writing repository conversion tools, but should
743 This is useful for writing repository conversion tools, but should
744 be used with care.
744 be used with care.
745 """
745 """
746
746
747 if not rev2:
747 if not rev2:
748 rev2 = hex(nullid)
748 rev2 = hex(nullid)
749
749
750 wlock = repo.wlock()
750 wlock = repo.wlock()
751 try:
751 try:
752 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
752 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
753 finally:
753 finally:
754 del wlock
754 del wlock
755
755
756 def debugstate(ui, repo, nodates=None):
756 def debugstate(ui, repo, nodates=None):
757 """show the contents of the current dirstate"""
757 """show the contents of the current dirstate"""
758 timestr = ""
758 timestr = ""
759 showdate = not nodates
759 showdate = not nodates
760 for file_, ent in util.sort(repo.dirstate._map.items()):
760 for file_, ent in util.sort(repo.dirstate._map.items()):
761 if showdate:
761 if showdate:
762 if ent[3] == -1:
762 if ent[3] == -1:
763 # Pad or slice to locale representation
763 # Pad or slice to locale representation
764 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(0)))
764 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(0)))
765 timestr = 'unset'
765 timestr = 'unset'
766 timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr))
766 timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr))
767 else:
767 else:
768 timestr = time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(ent[3]))
768 timestr = time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(ent[3]))
769 if ent[1] & 020000:
769 if ent[1] & 020000:
770 mode = 'lnk'
770 mode = 'lnk'
771 else:
771 else:
772 mode = '%3o' % (ent[1] & 0777)
772 mode = '%3o' % (ent[1] & 0777)
773 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
773 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
774 for f in repo.dirstate.copies():
774 for f in repo.dirstate.copies():
775 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
775 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
776
776
777 def debugdata(ui, file_, rev):
777 def debugdata(ui, file_, rev):
778 """dump the contents of a data file revision"""
778 """dump the contents of a data file revision"""
779 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
779 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
780 try:
780 try:
781 ui.write(r.revision(r.lookup(rev)))
781 ui.write(r.revision(r.lookup(rev)))
782 except KeyError:
782 except KeyError:
783 raise util.Abort(_('invalid revision identifier %s') % rev)
783 raise util.Abort(_('invalid revision identifier %s') % rev)
784
784
785 def debugdate(ui, date, range=None, **opts):
785 def debugdate(ui, date, range=None, **opts):
786 """parse and display a date"""
786 """parse and display a date"""
787 if opts["extended"]:
787 if opts["extended"]:
788 d = util.parsedate(date, util.extendeddateformats)
788 d = util.parsedate(date, util.extendeddateformats)
789 else:
789 else:
790 d = util.parsedate(date)
790 d = util.parsedate(date)
791 ui.write("internal: %s %s\n" % d)
791 ui.write("internal: %s %s\n" % d)
792 ui.write("standard: %s\n" % util.datestr(d))
792 ui.write("standard: %s\n" % util.datestr(d))
793 if range:
793 if range:
794 m = util.matchdate(range)
794 m = util.matchdate(range)
795 ui.write("match: %s\n" % m(d[0]))
795 ui.write("match: %s\n" % m(d[0]))
796
796
797 def debugindex(ui, file_):
797 def debugindex(ui, file_):
798 """dump the contents of an index file"""
798 """dump the contents of an index file"""
799 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
799 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
800 ui.write(" rev offset length base linkrev" +
800 ui.write(" rev offset length base linkrev" +
801 " nodeid p1 p2\n")
801 " nodeid p1 p2\n")
802 for i in r:
802 for i in r:
803 node = r.node(i)
803 node = r.node(i)
804 try:
804 try:
805 pp = r.parents(node)
805 pp = r.parents(node)
806 except:
806 except:
807 pp = [nullid, nullid]
807 pp = [nullid, nullid]
808 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
808 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
809 i, r.start(i), r.length(i), r.base(i), r.linkrev(node),
809 i, r.start(i), r.length(i), r.base(i), r.linkrev(node),
810 short(node), short(pp[0]), short(pp[1])))
810 short(node), short(pp[0]), short(pp[1])))
811
811
812 def debugindexdot(ui, file_):
812 def debugindexdot(ui, file_):
813 """dump an index DAG as a .dot file"""
813 """dump an index DAG as a .dot file"""
814 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
814 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
815 ui.write("digraph G {\n")
815 ui.write("digraph G {\n")
816 for i in r:
816 for i in r:
817 node = r.node(i)
817 node = r.node(i)
818 pp = r.parents(node)
818 pp = r.parents(node)
819 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
819 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
820 if pp[1] != nullid:
820 if pp[1] != nullid:
821 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
821 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
822 ui.write("}\n")
822 ui.write("}\n")
823
823
824 def debuginstall(ui):
824 def debuginstall(ui):
825 '''test Mercurial installation'''
825 '''test Mercurial installation'''
826
826
827 def writetemp(contents):
827 def writetemp(contents):
828 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
828 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
829 f = os.fdopen(fd, "wb")
829 f = os.fdopen(fd, "wb")
830 f.write(contents)
830 f.write(contents)
831 f.close()
831 f.close()
832 return name
832 return name
833
833
834 problems = 0
834 problems = 0
835
835
836 # encoding
836 # encoding
837 ui.status(_("Checking encoding (%s)...\n") % util._encoding)
837 ui.status(_("Checking encoding (%s)...\n") % util._encoding)
838 try:
838 try:
839 util.fromlocal("test")
839 util.fromlocal("test")
840 except util.Abort, inst:
840 except util.Abort, inst:
841 ui.write(" %s\n" % inst)
841 ui.write(" %s\n" % inst)
842 ui.write(_(" (check that your locale is properly set)\n"))
842 ui.write(_(" (check that your locale is properly set)\n"))
843 problems += 1
843 problems += 1
844
844
845 # compiled modules
845 # compiled modules
846 ui.status(_("Checking extensions...\n"))
846 ui.status(_("Checking extensions...\n"))
847 try:
847 try:
848 import bdiff, mpatch, base85
848 import bdiff, mpatch, base85
849 except Exception, inst:
849 except Exception, inst:
850 ui.write(" %s\n" % inst)
850 ui.write(" %s\n" % inst)
851 ui.write(_(" One or more extensions could not be found"))
851 ui.write(_(" One or more extensions could not be found"))
852 ui.write(_(" (check that you compiled the extensions)\n"))
852 ui.write(_(" (check that you compiled the extensions)\n"))
853 problems += 1
853 problems += 1
854
854
855 # templates
855 # templates
856 ui.status(_("Checking templates...\n"))
856 ui.status(_("Checking templates...\n"))
857 try:
857 try:
858 import templater
858 import templater
859 t = templater.templater(templater.templatepath("map-cmdline.default"))
859 t = templater.templater(templater.templatepath("map-cmdline.default"))
860 except Exception, inst:
860 except Exception, inst:
861 ui.write(" %s\n" % inst)
861 ui.write(" %s\n" % inst)
862 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
862 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
863 problems += 1
863 problems += 1
864
864
865 # patch
865 # patch
866 ui.status(_("Checking patch...\n"))
866 ui.status(_("Checking patch...\n"))
867 patchproblems = 0
867 patchproblems = 0
868 a = "1\n2\n3\n4\n"
868 a = "1\n2\n3\n4\n"
869 b = "1\n2\n3\ninsert\n4\n"
869 b = "1\n2\n3\ninsert\n4\n"
870 fa = writetemp(a)
870 fa = writetemp(a)
871 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
871 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
872 os.path.basename(fa))
872 os.path.basename(fa))
873 fd = writetemp(d)
873 fd = writetemp(d)
874
874
875 files = {}
875 files = {}
876 try:
876 try:
877 patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
877 patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
878 except util.Abort, e:
878 except util.Abort, e:
879 ui.write(_(" patch call failed:\n"))
879 ui.write(_(" patch call failed:\n"))
880 ui.write(" " + str(e) + "\n")
880 ui.write(" " + str(e) + "\n")
881 patchproblems += 1
881 patchproblems += 1
882 else:
882 else:
883 if list(files) != [os.path.basename(fa)]:
883 if list(files) != [os.path.basename(fa)]:
884 ui.write(_(" unexpected patch output!\n"))
884 ui.write(_(" unexpected patch output!\n"))
885 patchproblems += 1
885 patchproblems += 1
886 a = file(fa).read()
886 a = file(fa).read()
887 if a != b:
887 if a != b:
888 ui.write(_(" patch test failed!\n"))
888 ui.write(_(" patch test failed!\n"))
889 patchproblems += 1
889 patchproblems += 1
890
890
891 if patchproblems:
891 if patchproblems:
892 if ui.config('ui', 'patch'):
892 if ui.config('ui', 'patch'):
893 ui.write(_(" (Current patch tool may be incompatible with patch,"
893 ui.write(_(" (Current patch tool may be incompatible with patch,"
894 " or misconfigured. Please check your .hgrc file)\n"))
894 " or misconfigured. Please check your .hgrc file)\n"))
895 else:
895 else:
896 ui.write(_(" Internal patcher failure, please report this error"
896 ui.write(_(" Internal patcher failure, please report this error"
897 " to http://www.selenic.com/mercurial/bts\n"))
897 " to http://www.selenic.com/mercurial/bts\n"))
898 problems += patchproblems
898 problems += patchproblems
899
899
900 os.unlink(fa)
900 os.unlink(fa)
901 os.unlink(fd)
901 os.unlink(fd)
902
902
903 # editor
903 # editor
904 ui.status(_("Checking commit editor...\n"))
904 ui.status(_("Checking commit editor...\n"))
905 editor = ui.geteditor()
905 editor = ui.geteditor()
906 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
906 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
907 if not cmdpath:
907 if not cmdpath:
908 if editor == 'vi':
908 if editor == 'vi':
909 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
909 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
910 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
910 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
911 else:
911 else:
912 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
912 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
913 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
913 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
914 problems += 1
914 problems += 1
915
915
916 # check username
916 # check username
917 ui.status(_("Checking username...\n"))
917 ui.status(_("Checking username...\n"))
918 user = os.environ.get("HGUSER")
918 user = os.environ.get("HGUSER")
919 if user is None:
919 if user is None:
920 user = ui.config("ui", "username")
920 user = ui.config("ui", "username")
921 if user is None:
921 if user is None:
922 user = os.environ.get("EMAIL")
922 user = os.environ.get("EMAIL")
923 if not user:
923 if not user:
924 ui.warn(" ")
924 ui.warn(" ")
925 ui.username()
925 ui.username()
926 ui.write(_(" (specify a username in your .hgrc file)\n"))
926 ui.write(_(" (specify a username in your .hgrc file)\n"))
927
927
928 if not problems:
928 if not problems:
929 ui.status(_("No problems detected\n"))
929 ui.status(_("No problems detected\n"))
930 else:
930 else:
931 ui.write(_("%s problems detected,"
931 ui.write(_("%s problems detected,"
932 " please check your install!\n") % problems)
932 " please check your install!\n") % problems)
933
933
934 return problems
934 return problems
935
935
936 def debugrename(ui, repo, file1, *pats, **opts):
936 def debugrename(ui, repo, file1, *pats, **opts):
937 """dump rename information"""
937 """dump rename information"""
938
938
939 ctx = repo[opts.get('rev')]
939 ctx = repo[opts.get('rev')]
940 m = cmdutil.match(repo, (file1,) + pats, opts)
940 m = cmdutil.match(repo, (file1,) + pats, opts)
941 for abs in ctx.walk(m):
941 for abs in ctx.walk(m):
942 fctx = ctx[abs]
942 fctx = ctx[abs]
943 o = fctx.filelog().renamed(fctx.filenode())
943 o = fctx.filelog().renamed(fctx.filenode())
944 rel = m.rel(abs)
944 rel = m.rel(abs)
945 if o:
945 if o:
946 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
946 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
947 else:
947 else:
948 ui.write(_("%s not renamed\n") % rel)
948 ui.write(_("%s not renamed\n") % rel)
949
949
950 def debugwalk(ui, repo, *pats, **opts):
950 def debugwalk(ui, repo, *pats, **opts):
951 """show how files match on given patterns"""
951 """show how files match on given patterns"""
952 m = cmdutil.match(repo, pats, opts)
952 m = cmdutil.match(repo, pats, opts)
953 items = list(repo.walk(m))
953 items = list(repo.walk(m))
954 if not items:
954 if not items:
955 return
955 return
956 fmt = 'f %%-%ds %%-%ds %%s' % (
956 fmt = 'f %%-%ds %%-%ds %%s' % (
957 max([len(abs) for abs in items]),
957 max([len(abs) for abs in items]),
958 max([len(m.rel(abs)) for abs in items]))
958 max([len(m.rel(abs)) for abs in items]))
959 for abs in items:
959 for abs in items:
960 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
960 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
961 ui.write("%s\n" % line.rstrip())
961 ui.write("%s\n" % line.rstrip())
962
962
963 def diff(ui, repo, *pats, **opts):
963 def diff(ui, repo, *pats, **opts):
964 """diff repository (or selected files)
964 """diff repository (or selected files)
965
965
966 Show differences between revisions for the specified files.
966 Show differences between revisions for the specified files.
967
967
968 Differences between files are shown using the unified diff format.
968 Differences between files are shown using the unified diff format.
969
969
970 NOTE: diff may generate unexpected results for merges, as it will
970 NOTE: diff may generate unexpected results for merges, as it will
971 default to comparing against the working directory's first parent
971 default to comparing against the working directory's first parent
972 changeset if no revisions are specified.
972 changeset if no revisions are specified.
973
973
974 When two revision arguments are given, then changes are shown
974 When two revision arguments are given, then changes are shown
975 between those revisions. If only one revision is specified then
975 between those revisions. If only one revision is specified then
976 that revision is compared to the working directory, and, when no
976 that revision is compared to the working directory, and, when no
977 revisions are specified, the working directory files are compared
977 revisions are specified, the working directory files are compared
978 to its parent.
978 to its parent.
979
979
980 Without the -a option, diff will avoid generating diffs of files
980 Without the -a option, diff will avoid generating diffs of files
981 it detects as binary. With -a, diff will generate a diff anyway,
981 it detects as binary. With -a, diff will generate a diff anyway,
982 probably with undesirable results.
982 probably with undesirable results.
983 """
983 """
984 node1, node2 = cmdutil.revpair(repo, opts['rev'])
984 node1, node2 = cmdutil.revpair(repo, opts['rev'])
985
985
986 m = cmdutil.match(repo, pats, opts)
986 m = cmdutil.match(repo, pats, opts)
987 patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts))
987 patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts))
988
988
989 def export(ui, repo, *changesets, **opts):
989 def export(ui, repo, *changesets, **opts):
990 """dump the header and diffs for one or more changesets
990 """dump the header and diffs for one or more changesets
991
991
992 Print the changeset header and diffs for one or more revisions.
992 Print the changeset header and diffs for one or more revisions.
993
993
994 The information shown in the changeset header is: author,
994 The information shown in the changeset header is: author,
995 changeset hash, parent(s) and commit comment.
995 changeset hash, parent(s) and commit comment.
996
996
997 NOTE: export may generate unexpected diff output for merge changesets,
997 NOTE: export may generate unexpected diff output for merge changesets,
998 as it will compare the merge changeset against its first parent only.
998 as it will compare the merge changeset against its first parent only.
999
999
1000 Output may be to a file, in which case the name of the file is
1000 Output may be to a file, in which case the name of the file is
1001 given using a format string. The formatting rules are as follows:
1001 given using a format string. The formatting rules are as follows:
1002
1002
1003 %% literal "%" character
1003 %% literal "%" character
1004 %H changeset hash (40 bytes of hexadecimal)
1004 %H changeset hash (40 bytes of hexadecimal)
1005 %N number of patches being generated
1005 %N number of patches being generated
1006 %R changeset revision number
1006 %R changeset revision number
1007 %b basename of the exporting repository
1007 %b basename of the exporting repository
1008 %h short-form changeset hash (12 bytes of hexadecimal)
1008 %h short-form changeset hash (12 bytes of hexadecimal)
1009 %n zero-padded sequence number, starting at 1
1009 %n zero-padded sequence number, starting at 1
1010 %r zero-padded changeset revision number
1010 %r zero-padded changeset revision number
1011
1011
1012 Without the -a option, export will avoid generating diffs of files
1012 Without the -a option, export will avoid generating diffs of files
1013 it detects as binary. With -a, export will generate a diff anyway,
1013 it detects as binary. With -a, export will generate a diff anyway,
1014 probably with undesirable results.
1014 probably with undesirable results.
1015
1015
1016 With the --switch-parent option, the diff will be against the second
1016 With the --switch-parent option, the diff will be against the second
1017 parent. It can be useful to review a merge.
1017 parent. It can be useful to review a merge.
1018 """
1018 """
1019 if not changesets:
1019 if not changesets:
1020 raise util.Abort(_("export requires at least one changeset"))
1020 raise util.Abort(_("export requires at least one changeset"))
1021 revs = cmdutil.revrange(repo, changesets)
1021 revs = cmdutil.revrange(repo, changesets)
1022 if len(revs) > 1:
1022 if len(revs) > 1:
1023 ui.note(_('exporting patches:\n'))
1023 ui.note(_('exporting patches:\n'))
1024 else:
1024 else:
1025 ui.note(_('exporting patch:\n'))
1025 ui.note(_('exporting patch:\n'))
1026 patch.export(repo, revs, template=opts['output'],
1026 patch.export(repo, revs, template=opts['output'],
1027 switch_parent=opts['switch_parent'],
1027 switch_parent=opts['switch_parent'],
1028 opts=patch.diffopts(ui, opts))
1028 opts=patch.diffopts(ui, opts))
1029
1029
1030 def grep(ui, repo, pattern, *pats, **opts):
1030 def grep(ui, repo, pattern, *pats, **opts):
1031 """search for a pattern in specified files and revisions
1031 """search for a pattern in specified files and revisions
1032
1032
1033 Search revisions of files for a regular expression.
1033 Search revisions of files for a regular expression.
1034
1034
1035 This command behaves differently than Unix grep. It only accepts
1035 This command behaves differently than Unix grep. It only accepts
1036 Python/Perl regexps. It searches repository history, not the
1036 Python/Perl regexps. It searches repository history, not the
1037 working directory. It always prints the revision number in which
1037 working directory. It always prints the revision number in which
1038 a match appears.
1038 a match appears.
1039
1039
1040 By default, grep only prints output for the first revision of a
1040 By default, grep only prints output for the first revision of a
1041 file in which it finds a match. To get it to print every revision
1041 file in which it finds a match. To get it to print every revision
1042 that contains a change in match status ("-" for a match that
1042 that contains a change in match status ("-" for a match that
1043 becomes a non-match, or "+" for a non-match that becomes a match),
1043 becomes a non-match, or "+" for a non-match that becomes a match),
1044 use the --all flag.
1044 use the --all flag.
1045 """
1045 """
1046 reflags = 0
1046 reflags = 0
1047 if opts['ignore_case']:
1047 if opts['ignore_case']:
1048 reflags |= re.I
1048 reflags |= re.I
1049 try:
1049 try:
1050 regexp = re.compile(pattern, reflags)
1050 regexp = re.compile(pattern, reflags)
1051 except Exception, inst:
1051 except Exception, inst:
1052 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1052 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1053 return None
1053 return None
1054 sep, eol = ':', '\n'
1054 sep, eol = ':', '\n'
1055 if opts['print0']:
1055 if opts['print0']:
1056 sep = eol = '\0'
1056 sep = eol = '\0'
1057
1057
1058 fcache = {}
1058 fcache = {}
1059 def getfile(fn):
1059 def getfile(fn):
1060 if fn not in fcache:
1060 if fn not in fcache:
1061 fcache[fn] = repo.file(fn)
1061 fcache[fn] = repo.file(fn)
1062 return fcache[fn]
1062 return fcache[fn]
1063
1063
1064 def matchlines(body):
1064 def matchlines(body):
1065 begin = 0
1065 begin = 0
1066 linenum = 0
1066 linenum = 0
1067 while True:
1067 while True:
1068 match = regexp.search(body, begin)
1068 match = regexp.search(body, begin)
1069 if not match:
1069 if not match:
1070 break
1070 break
1071 mstart, mend = match.span()
1071 mstart, mend = match.span()
1072 linenum += body.count('\n', begin, mstart) + 1
1072 linenum += body.count('\n', begin, mstart) + 1
1073 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1073 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1074 lend = body.find('\n', mend)
1074 lend = body.find('\n', mend)
1075 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1075 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1076 begin = lend + 1
1076 begin = lend + 1
1077
1077
1078 class linestate(object):
1078 class linestate(object):
1079 def __init__(self, line, linenum, colstart, colend):
1079 def __init__(self, line, linenum, colstart, colend):
1080 self.line = line
1080 self.line = line
1081 self.linenum = linenum
1081 self.linenum = linenum
1082 self.colstart = colstart
1082 self.colstart = colstart
1083 self.colend = colend
1083 self.colend = colend
1084
1084
1085 def __hash__(self):
1085 def __hash__(self):
1086 return hash((self.linenum, self.line))
1086 return hash((self.linenum, self.line))
1087
1087
1088 def __eq__(self, other):
1088 def __eq__(self, other):
1089 return self.line == other.line
1089 return self.line == other.line
1090
1090
1091 matches = {}
1091 matches = {}
1092 copies = {}
1092 copies = {}
1093 def grepbody(fn, rev, body):
1093 def grepbody(fn, rev, body):
1094 matches[rev].setdefault(fn, [])
1094 matches[rev].setdefault(fn, [])
1095 m = matches[rev][fn]
1095 m = matches[rev][fn]
1096 for lnum, cstart, cend, line in matchlines(body):
1096 for lnum, cstart, cend, line in matchlines(body):
1097 s = linestate(line, lnum, cstart, cend)
1097 s = linestate(line, lnum, cstart, cend)
1098 m.append(s)
1098 m.append(s)
1099
1099
1100 def difflinestates(a, b):
1100 def difflinestates(a, b):
1101 sm = difflib.SequenceMatcher(None, a, b)
1101 sm = difflib.SequenceMatcher(None, a, b)
1102 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1102 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1103 if tag == 'insert':
1103 if tag == 'insert':
1104 for i in xrange(blo, bhi):
1104 for i in xrange(blo, bhi):
1105 yield ('+', b[i])
1105 yield ('+', b[i])
1106 elif tag == 'delete':
1106 elif tag == 'delete':
1107 for i in xrange(alo, ahi):
1107 for i in xrange(alo, ahi):
1108 yield ('-', a[i])
1108 yield ('-', a[i])
1109 elif tag == 'replace':
1109 elif tag == 'replace':
1110 for i in xrange(alo, ahi):
1110 for i in xrange(alo, ahi):
1111 yield ('-', a[i])
1111 yield ('-', a[i])
1112 for i in xrange(blo, bhi):
1112 for i in xrange(blo, bhi):
1113 yield ('+', b[i])
1113 yield ('+', b[i])
1114
1114
1115 prev = {}
1115 prev = {}
1116 def display(fn, rev, states, prevstates):
1116 def display(fn, rev, states, prevstates):
1117 datefunc = ui.quiet and util.shortdate or util.datestr
1117 datefunc = ui.quiet and util.shortdate or util.datestr
1118 found = False
1118 found = False
1119 filerevmatches = {}
1119 filerevmatches = {}
1120 r = prev.get(fn, -1)
1120 r = prev.get(fn, -1)
1121 if opts['all']:
1121 if opts['all']:
1122 iter = difflinestates(states, prevstates)
1122 iter = difflinestates(states, prevstates)
1123 else:
1123 else:
1124 iter = [('', l) for l in prevstates]
1124 iter = [('', l) for l in prevstates]
1125 for change, l in iter:
1125 for change, l in iter:
1126 cols = [fn, str(r)]
1126 cols = [fn, str(r)]
1127 if opts['line_number']:
1127 if opts['line_number']:
1128 cols.append(str(l.linenum))
1128 cols.append(str(l.linenum))
1129 if opts['all']:
1129 if opts['all']:
1130 cols.append(change)
1130 cols.append(change)
1131 if opts['user']:
1131 if opts['user']:
1132 cols.append(ui.shortuser(get(r)[1]))
1132 cols.append(ui.shortuser(get(r)[1]))
1133 if opts.get('date'):
1133 if opts.get('date'):
1134 cols.append(datefunc(get(r)[2]))
1134 cols.append(datefunc(get(r)[2]))
1135 if opts['files_with_matches']:
1135 if opts['files_with_matches']:
1136 c = (fn, r)
1136 c = (fn, r)
1137 if c in filerevmatches:
1137 if c in filerevmatches:
1138 continue
1138 continue
1139 filerevmatches[c] = 1
1139 filerevmatches[c] = 1
1140 else:
1140 else:
1141 cols.append(l.line)
1141 cols.append(l.line)
1142 ui.write(sep.join(cols), eol)
1142 ui.write(sep.join(cols), eol)
1143 found = True
1143 found = True
1144 return found
1144 return found
1145
1145
1146 fstate = {}
1146 fstate = {}
1147 skip = {}
1147 skip = {}
1148 get = util.cachefunc(lambda r: repo[r].changeset())
1148 get = util.cachefunc(lambda r: repo[r].changeset())
1149 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
1149 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
1150 found = False
1150 found = False
1151 follow = opts.get('follow')
1151 follow = opts.get('follow')
1152 for st, rev, fns in changeiter:
1152 for st, rev, fns in changeiter:
1153 if st == 'window':
1153 if st == 'window':
1154 matches.clear()
1154 matches.clear()
1155 elif st == 'add':
1155 elif st == 'add':
1156 ctx = repo[rev]
1156 ctx = repo[rev]
1157 matches[rev] = {}
1157 matches[rev] = {}
1158 for fn in fns:
1158 for fn in fns:
1159 if fn in skip:
1159 if fn in skip:
1160 continue
1160 continue
1161 try:
1161 try:
1162 grepbody(fn, rev, getfile(fn).read(ctx.filenode(fn)))
1162 grepbody(fn, rev, getfile(fn).read(ctx.filenode(fn)))
1163 fstate.setdefault(fn, [])
1163 fstate.setdefault(fn, [])
1164 if follow:
1164 if follow:
1165 copied = getfile(fn).renamed(ctx.filenode(fn))
1165 copied = getfile(fn).renamed(ctx.filenode(fn))
1166 if copied:
1166 if copied:
1167 copies.setdefault(rev, {})[fn] = copied[0]
1167 copies.setdefault(rev, {})[fn] = copied[0]
1168 except revlog.LookupError:
1168 except revlog.LookupError:
1169 pass
1169 pass
1170 elif st == 'iter':
1170 elif st == 'iter':
1171 for fn, m in util.sort(matches[rev].items()):
1171 for fn, m in util.sort(matches[rev].items()):
1172 copy = copies.get(rev, {}).get(fn)
1172 copy = copies.get(rev, {}).get(fn)
1173 if fn in skip:
1173 if fn in skip:
1174 if copy:
1174 if copy:
1175 skip[copy] = True
1175 skip[copy] = True
1176 continue
1176 continue
1177 if fn in prev or fstate[fn]:
1177 if fn in prev or fstate[fn]:
1178 r = display(fn, rev, m, fstate[fn])
1178 r = display(fn, rev, m, fstate[fn])
1179 found = found or r
1179 found = found or r
1180 if r and not opts['all']:
1180 if r and not opts['all']:
1181 skip[fn] = True
1181 skip[fn] = True
1182 if copy:
1182 if copy:
1183 skip[copy] = True
1183 skip[copy] = True
1184 fstate[fn] = m
1184 fstate[fn] = m
1185 if copy:
1185 if copy:
1186 fstate[copy] = m
1186 fstate[copy] = m
1187 prev[fn] = rev
1187 prev[fn] = rev
1188
1188
1189 for fn, state in util.sort(fstate.items()):
1189 for fn, state in util.sort(fstate.items()):
1190 if fn in skip:
1190 if fn in skip:
1191 continue
1191 continue
1192 if fn not in copies.get(prev[fn], {}):
1192 if fn not in copies.get(prev[fn], {}):
1193 found = display(fn, rev, {}, state) or found
1193 found = display(fn, rev, {}, state) or found
1194 return (not found and 1) or 0
1194 return (not found and 1) or 0
1195
1195
1196 def heads(ui, repo, *branchrevs, **opts):
1196 def heads(ui, repo, *branchrevs, **opts):
1197 """show current repository heads or show branch heads
1197 """show current repository heads or show branch heads
1198
1198
1199 With no arguments, show all repository head changesets.
1199 With no arguments, show all repository head changesets.
1200
1200
1201 If branch or revisions names are given this will show the heads of
1201 If branch or revisions names are given this will show the heads of
1202 the specified branches or the branches those revisions are tagged
1202 the specified branches or the branches those revisions are tagged
1203 with.
1203 with.
1204
1204
1205 Repository "heads" are changesets that don't have child
1205 Repository "heads" are changesets that don't have child
1206 changesets. They are where development generally takes place and
1206 changesets. They are where development generally takes place and
1207 are the usual targets for update and merge operations.
1207 are the usual targets for update and merge operations.
1208
1208
1209 Branch heads are changesets that have a given branch tag, but have
1209 Branch heads are changesets that have a given branch tag, but have
1210 no child changesets with that tag. They are usually where
1210 no child changesets with that tag. They are usually where
1211 development on the given branch takes place.
1211 development on the given branch takes place.
1212 """
1212 """
1213 if opts['rev']:
1213 if opts['rev']:
1214 start = repo.lookup(opts['rev'])
1214 start = repo.lookup(opts['rev'])
1215 else:
1215 else:
1216 start = None
1216 start = None
1217 if not branchrevs:
1217 if not branchrevs:
1218 # Assume we're looking repo-wide heads if no revs were specified.
1218 # Assume we're looking repo-wide heads if no revs were specified.
1219 heads = repo.heads(start)
1219 heads = repo.heads(start)
1220 else:
1220 else:
1221 heads = []
1221 heads = []
1222 visitedset = util.set()
1222 visitedset = util.set()
1223 for branchrev in branchrevs:
1223 for branchrev in branchrevs:
1224 branch = repo[branchrev].branch()
1224 branch = repo[branchrev].branch()
1225 if branch in visitedset:
1225 if branch in visitedset:
1226 continue
1226 continue
1227 visitedset.add(branch)
1227 visitedset.add(branch)
1228 bheads = repo.branchheads(branch, start)
1228 bheads = repo.branchheads(branch, start)
1229 if not bheads:
1229 if not bheads:
1230 if branch != branchrev:
1230 if branch != branchrev:
1231 ui.warn(_("no changes on branch %s containing %s are "
1231 ui.warn(_("no changes on branch %s containing %s are "
1232 "reachable from %s\n")
1232 "reachable from %s\n")
1233 % (branch, branchrev, opts['rev']))
1233 % (branch, branchrev, opts['rev']))
1234 else:
1234 else:
1235 ui.warn(_("no changes on branch %s are reachable from %s\n")
1235 ui.warn(_("no changes on branch %s are reachable from %s\n")
1236 % (branch, opts['rev']))
1236 % (branch, opts['rev']))
1237 heads.extend(bheads)
1237 heads.extend(bheads)
1238 if not heads:
1238 if not heads:
1239 return 1
1239 return 1
1240 displayer = cmdutil.show_changeset(ui, repo, opts)
1240 displayer = cmdutil.show_changeset(ui, repo, opts)
1241 for n in heads:
1241 for n in heads:
1242 displayer.show(changenode=n)
1242 displayer.show(changenode=n)
1243
1243
1244 def help_(ui, name=None, with_version=False):
1244 def help_(ui, name=None, with_version=False):
1245 """show help for a command, extension, or list of commands
1245 """show help for a command, extension, or list of commands
1246
1246
1247 With no arguments, print a list of commands and short help.
1247 With no arguments, print a list of commands and short help.
1248
1248
1249 Given a command name, print help for that command.
1249 Given a command name, print help for that command.
1250
1250
1251 Given an extension name, print help for that extension, and the
1251 Given an extension name, print help for that extension, and the
1252 commands it provides."""
1252 commands it provides."""
1253 option_lists = []
1253 option_lists = []
1254
1254
1255 def addglobalopts(aliases):
1255 def addglobalopts(aliases):
1256 if ui.verbose:
1256 if ui.verbose:
1257 option_lists.append((_("global options:"), globalopts))
1257 option_lists.append((_("global options:"), globalopts))
1258 if name == 'shortlist':
1258 if name == 'shortlist':
1259 option_lists.append((_('use "hg help" for the full list '
1259 option_lists.append((_('use "hg help" for the full list '
1260 'of commands'), ()))
1260 'of commands'), ()))
1261 else:
1261 else:
1262 if name == 'shortlist':
1262 if name == 'shortlist':
1263 msg = _('use "hg help" for the full list of commands '
1263 msg = _('use "hg help" for the full list of commands '
1264 'or "hg -v" for details')
1264 'or "hg -v" for details')
1265 elif aliases:
1265 elif aliases:
1266 msg = _('use "hg -v help%s" to show aliases and '
1266 msg = _('use "hg -v help%s" to show aliases and '
1267 'global options') % (name and " " + name or "")
1267 'global options') % (name and " " + name or "")
1268 else:
1268 else:
1269 msg = _('use "hg -v help %s" to show global options') % name
1269 msg = _('use "hg -v help %s" to show global options') % name
1270 option_lists.append((msg, ()))
1270 option_lists.append((msg, ()))
1271
1271
1272 def helpcmd(name):
1272 def helpcmd(name):
1273 if with_version:
1273 if with_version:
1274 version_(ui)
1274 version_(ui)
1275 ui.write('\n')
1275 ui.write('\n')
1276
1276
1277 try:
1277 try:
1278 aliases, i = cmdutil.findcmd(ui, name, table)
1278 aliases, i = cmdutil.findcmd(ui, name, table)
1279 except cmdutil.AmbiguousCommand, inst:
1279 except cmdutil.AmbiguousCommand, inst:
1280 select = lambda c: c.lstrip('^').startswith(inst.args[0])
1280 select = lambda c: c.lstrip('^').startswith(inst.args[0])
1281 helplist(_('list of commands:\n\n'), select)
1281 helplist(_('list of commands:\n\n'), select)
1282 return
1282 return
1283
1283
1284 # synopsis
1284 # synopsis
1285 ui.write("%s\n" % i[2])
1285 ui.write("%s\n" % i[2])
1286
1286
1287 # aliases
1287 # aliases
1288 if not ui.quiet and len(aliases) > 1:
1288 if not ui.quiet and len(aliases) > 1:
1289 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
1289 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
1290
1290
1291 # description
1291 # description
1292 doc = gettext(i[0].__doc__)
1292 doc = gettext(i[0].__doc__)
1293 if not doc:
1293 if not doc:
1294 doc = _("(No help text available)")
1294 doc = _("(No help text available)")
1295 if ui.quiet:
1295 if ui.quiet:
1296 doc = doc.splitlines(0)[0]
1296 doc = doc.splitlines(0)[0]
1297 ui.write("\n%s\n" % doc.rstrip())
1297 ui.write("\n%s\n" % doc.rstrip())
1298
1298
1299 if not ui.quiet:
1299 if not ui.quiet:
1300 # options
1300 # options
1301 if i[1]:
1301 if i[1]:
1302 option_lists.append((_("options:\n"), i[1]))
1302 option_lists.append((_("options:\n"), i[1]))
1303
1303
1304 addglobalopts(False)
1304 addglobalopts(False)
1305
1305
1306 def helplist(header, select=None):
1306 def helplist(header, select=None):
1307 h = {}
1307 h = {}
1308 cmds = {}
1308 cmds = {}
1309 for c, e in table.items():
1309 for c, e in table.items():
1310 f = c.split("|", 1)[0]
1310 f = c.split("|", 1)[0]
1311 if select and not select(f):
1311 if select and not select(f):
1312 continue
1312 continue
1313 if name == "shortlist" and not f.startswith("^"):
1313 if name == "shortlist" and not f.startswith("^"):
1314 continue
1314 continue
1315 f = f.lstrip("^")
1315 f = f.lstrip("^")
1316 if not ui.debugflag and f.startswith("debug"):
1316 if not ui.debugflag and f.startswith("debug"):
1317 continue
1317 continue
1318 doc = gettext(e[0].__doc__)
1318 doc = gettext(e[0].__doc__)
1319 if not doc:
1319 if not doc:
1320 doc = _("(No help text available)")
1320 doc = _("(No help text available)")
1321 h[f] = doc.splitlines(0)[0].rstrip()
1321 h[f] = doc.splitlines(0)[0].rstrip()
1322 cmds[f] = c.lstrip("^")
1322 cmds[f] = c.lstrip("^")
1323
1323
1324 if not h:
1324 if not h:
1325 ui.status(_('no commands defined\n'))
1325 ui.status(_('no commands defined\n'))
1326 return
1326 return
1327
1327
1328 ui.status(header)
1328 ui.status(header)
1329 fns = util.sort(h)
1329 fns = util.sort(h)
1330 m = max(map(len, fns))
1330 m = max(map(len, fns))
1331 for f in fns:
1331 for f in fns:
1332 if ui.verbose:
1332 if ui.verbose:
1333 commands = cmds[f].replace("|",", ")
1333 commands = cmds[f].replace("|",", ")
1334 ui.write(" %s:\n %s\n"%(commands, h[f]))
1334 ui.write(" %s:\n %s\n"%(commands, h[f]))
1335 else:
1335 else:
1336 ui.write(' %-*s %s\n' % (m, f, h[f]))
1336 ui.write(' %-*s %s\n' % (m, f, h[f]))
1337
1337
1338 if not ui.quiet:
1338 if not ui.quiet:
1339 addglobalopts(True)
1339 addglobalopts(True)
1340
1340
1341 def helptopic(name):
1341 def helptopic(name):
1342 for names, header, doc in help.helptable:
1342 for names, header, doc in help.helptable:
1343 if name in names:
1343 if name in names:
1344 break
1344 break
1345 else:
1345 else:
1346 raise cmdutil.UnknownCommand(name)
1346 raise cmdutil.UnknownCommand(name)
1347
1347
1348 # description
1348 # description
1349 if not doc:
1349 if not doc:
1350 doc = _("(No help text available)")
1350 doc = _("(No help text available)")
1351 if callable(doc):
1351 if callable(doc):
1352 doc = doc()
1352 doc = doc()
1353
1353
1354 ui.write("%s\n" % header)
1354 ui.write("%s\n" % header)
1355 ui.write("%s\n" % doc.rstrip())
1355 ui.write("%s\n" % doc.rstrip())
1356
1356
1357 def helpext(name):
1357 def helpext(name):
1358 try:
1358 try:
1359 mod = extensions.find(name)
1359 mod = extensions.find(name)
1360 except KeyError:
1360 except KeyError:
1361 raise cmdutil.UnknownCommand(name)
1361 raise cmdutil.UnknownCommand(name)
1362
1362
1363 doc = gettext(mod.__doc__) or _('No help text available')
1363 doc = gettext(mod.__doc__) or _('No help text available')
1364 doc = doc.splitlines(0)
1364 doc = doc.splitlines(0)
1365 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
1365 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
1366 for d in doc[1:]:
1366 for d in doc[1:]:
1367 ui.write(d, '\n')
1367 ui.write(d, '\n')
1368
1368
1369 ui.status('\n')
1369 ui.status('\n')
1370
1370
1371 try:
1371 try:
1372 ct = mod.cmdtable
1372 ct = mod.cmdtable
1373 except AttributeError:
1373 except AttributeError:
1374 ct = {}
1374 ct = {}
1375
1375
1376 modcmds = dict.fromkeys([c.split('|', 1)[0] for c in ct])
1376 modcmds = dict.fromkeys([c.split('|', 1)[0] for c in ct])
1377 helplist(_('list of commands:\n\n'), modcmds.has_key)
1377 helplist(_('list of commands:\n\n'), modcmds.has_key)
1378
1378
1379 if name and name != 'shortlist':
1379 if name and name != 'shortlist':
1380 i = None
1380 i = None
1381 for f in (helpcmd, helptopic, helpext):
1381 for f in (helpcmd, helptopic, helpext):
1382 try:
1382 try:
1383 f(name)
1383 f(name)
1384 i = None
1384 i = None
1385 break
1385 break
1386 except cmdutil.UnknownCommand, inst:
1386 except cmdutil.UnknownCommand, inst:
1387 i = inst
1387 i = inst
1388 if i:
1388 if i:
1389 raise i
1389 raise i
1390
1390
1391 else:
1391 else:
1392 # program name
1392 # program name
1393 if ui.verbose or with_version:
1393 if ui.verbose or with_version:
1394 version_(ui)
1394 version_(ui)
1395 else:
1395 else:
1396 ui.status(_("Mercurial Distributed SCM\n"))
1396 ui.status(_("Mercurial Distributed SCM\n"))
1397 ui.status('\n')
1397 ui.status('\n')
1398
1398
1399 # list of commands
1399 # list of commands
1400 if name == "shortlist":
1400 if name == "shortlist":
1401 header = _('basic commands:\n\n')
1401 header = _('basic commands:\n\n')
1402 else:
1402 else:
1403 header = _('list of commands:\n\n')
1403 header = _('list of commands:\n\n')
1404
1404
1405 helplist(header)
1405 helplist(header)
1406
1406
1407 # list all option lists
1407 # list all option lists
1408 opt_output = []
1408 opt_output = []
1409 for title, options in option_lists:
1409 for title, options in option_lists:
1410 opt_output.append(("\n%s" % title, None))
1410 opt_output.append(("\n%s" % title, None))
1411 for shortopt, longopt, default, desc in options:
1411 for shortopt, longopt, default, desc in options:
1412 if "DEPRECATED" in desc and not ui.verbose: continue
1412 if "DEPRECATED" in desc and not ui.verbose: continue
1413 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
1413 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
1414 longopt and " --%s" % longopt),
1414 longopt and " --%s" % longopt),
1415 "%s%s" % (desc,
1415 "%s%s" % (desc,
1416 default
1416 default
1417 and _(" (default: %s)") % default
1417 and _(" (default: %s)") % default
1418 or "")))
1418 or "")))
1419
1419
1420 if ui.verbose:
1420 if ui.verbose:
1421 ui.write(_("\nspecial help topics:\n"))
1421 ui.write(_("\nspecial help topics:\n"))
1422 topics = []
1422 topics = []
1423 for names, header, doc in help.helptable:
1423 for names, header, doc in help.helptable:
1424 topics.append((", ".join(names), header))
1424 topics.append((", ".join(names), header))
1425 topics_len = max([len(s[0]) for s in topics])
1425 topics_len = max([len(s[0]) for s in topics])
1426 for t, desc in topics:
1426 for t, desc in topics:
1427 ui.write(" %-*s %s\n" % (topics_len, t, desc))
1427 ui.write(" %-*s %s\n" % (topics_len, t, desc))
1428
1428
1429 if opt_output:
1429 if opt_output:
1430 opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])
1430 opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])
1431 for first, second in opt_output:
1431 for first, second in opt_output:
1432 if second:
1432 if second:
1433 ui.write(" %-*s %s\n" % (opts_len, first, second))
1433 ui.write(" %-*s %s\n" % (opts_len, first, second))
1434 else:
1434 else:
1435 ui.write("%s\n" % first)
1435 ui.write("%s\n" % first)
1436
1436
1437 def identify(ui, repo, source=None,
1437 def identify(ui, repo, source=None,
1438 rev=None, num=None, id=None, branch=None, tags=None):
1438 rev=None, num=None, id=None, branch=None, tags=None):
1439 """identify the working copy or specified revision
1439 """identify the working copy or specified revision
1440
1440
1441 With no revision, print a summary of the current state of the repo.
1441 With no revision, print a summary of the current state of the repo.
1442
1442
1443 With a path, do a lookup in another repository.
1443 With a path, do a lookup in another repository.
1444
1444
1445 This summary identifies the repository state using one or two parent
1445 This summary identifies the repository state using one or two parent
1446 hash identifiers, followed by a "+" if there are uncommitted changes
1446 hash identifiers, followed by a "+" if there are uncommitted changes
1447 in the working directory, a list of tags for this revision and a branch
1447 in the working directory, a list of tags for this revision and a branch
1448 name for non-default branches.
1448 name for non-default branches.
1449 """
1449 """
1450
1450
1451 if not repo and not source:
1451 if not repo and not source:
1452 raise util.Abort(_("There is no Mercurial repository here "
1452 raise util.Abort(_("There is no Mercurial repository here "
1453 "(.hg not found)"))
1453 "(.hg not found)"))
1454
1454
1455 hexfunc = ui.debugflag and hex or short
1455 hexfunc = ui.debugflag and hex or short
1456 default = not (num or id or branch or tags)
1456 default = not (num or id or branch or tags)
1457 output = []
1457 output = []
1458
1458
1459 if source:
1459 if source:
1460 source, revs, checkout = hg.parseurl(ui.expandpath(source), [])
1460 source, revs, checkout = hg.parseurl(ui.expandpath(source), [])
1461 srepo = hg.repository(ui, source)
1461 srepo = hg.repository(ui, source)
1462 if not rev and revs:
1462 if not rev and revs:
1463 rev = revs[0]
1463 rev = revs[0]
1464 if not rev:
1464 if not rev:
1465 rev = "tip"
1465 rev = "tip"
1466 if num or branch or tags:
1466 if num or branch or tags:
1467 raise util.Abort(
1467 raise util.Abort(
1468 "can't query remote revision number, branch, or tags")
1468 "can't query remote revision number, branch, or tags")
1469 output = [hexfunc(srepo.lookup(rev))]
1469 output = [hexfunc(srepo.lookup(rev))]
1470 elif not rev:
1470 elif not rev:
1471 ctx = repo[None]
1471 ctx = repo[None]
1472 parents = ctx.parents()
1472 parents = ctx.parents()
1473 changed = False
1473 changed = False
1474 if default or id or num:
1474 if default or id or num:
1475 changed = ctx.files() + ctx.deleted()
1475 changed = ctx.files() + ctx.deleted()
1476 if default or id:
1476 if default or id:
1477 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
1477 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
1478 (changed) and "+" or "")]
1478 (changed) and "+" or "")]
1479 if num:
1479 if num:
1480 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
1480 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
1481 (changed) and "+" or ""))
1481 (changed) and "+" or ""))
1482 else:
1482 else:
1483 ctx = repo[rev]
1483 ctx = repo[rev]
1484 if default or id:
1484 if default or id:
1485 output = [hexfunc(ctx.node())]
1485 output = [hexfunc(ctx.node())]
1486 if num:
1486 if num:
1487 output.append(str(ctx.rev()))
1487 output.append(str(ctx.rev()))
1488
1488
1489 if not source and default and not ui.quiet:
1489 if not source and default and not ui.quiet:
1490 b = util.tolocal(ctx.branch())
1490 b = util.tolocal(ctx.branch())
1491 if b != 'default':
1491 if b != 'default':
1492 output.append("(%s)" % b)
1492 output.append("(%s)" % b)
1493
1493
1494 # multiple tags for a single parent separated by '/'
1494 # multiple tags for a single parent separated by '/'
1495 t = "/".join(ctx.tags())
1495 t = "/".join(ctx.tags())
1496 if t:
1496 if t:
1497 output.append(t)
1497 output.append(t)
1498
1498
1499 if branch:
1499 if branch:
1500 output.append(util.tolocal(ctx.branch()))
1500 output.append(util.tolocal(ctx.branch()))
1501
1501
1502 if tags:
1502 if tags:
1503 output.extend(ctx.tags())
1503 output.extend(ctx.tags())
1504
1504
1505 ui.write("%s\n" % ' '.join(output))
1505 ui.write("%s\n" % ' '.join(output))
1506
1506
1507 def import_(ui, repo, patch1, *patches, **opts):
1507 def import_(ui, repo, patch1, *patches, **opts):
1508 """import an ordered set of patches
1508 """import an ordered set of patches
1509
1509
1510 Import a list of patches and commit them individually.
1510 Import a list of patches and commit them individually.
1511
1511
1512 If there are outstanding changes in the working directory, import
1512 If there are outstanding changes in the working directory, import
1513 will abort unless given the -f flag.
1513 will abort unless given the -f flag.
1514
1514
1515 You can import a patch straight from a mail message. Even patches
1515 You can import a patch straight from a mail message. Even patches
1516 as attachments work (body part must be type text/plain or
1516 as attachments work (body part must be type text/plain or
1517 text/x-patch to be used). From and Subject headers of email
1517 text/x-patch to be used). From and Subject headers of email
1518 message are used as default committer and commit message. All
1518 message are used as default committer and commit message. All
1519 text/plain body parts before first diff are added to commit
1519 text/plain body parts before first diff are added to commit
1520 message.
1520 message.
1521
1521
1522 If the imported patch was generated by hg export, user and description
1522 If the imported patch was generated by hg export, user and description
1523 from patch override values from message headers and body. Values
1523 from patch override values from message headers and body. Values
1524 given on command line with -m and -u override these.
1524 given on command line with -m and -u override these.
1525
1525
1526 If --exact is specified, import will set the working directory
1526 If --exact is specified, import will set the working directory
1527 to the parent of each patch before applying it, and will abort
1527 to the parent of each patch before applying it, and will abort
1528 if the resulting changeset has a different ID than the one
1528 if the resulting changeset has a different ID than the one
1529 recorded in the patch. This may happen due to character set
1529 recorded in the patch. This may happen due to character set
1530 problems or other deficiencies in the text patch format.
1530 problems or other deficiencies in the text patch format.
1531
1531
1532 To read a patch from standard input, use patch name "-".
1532 To read a patch from standard input, use patch name "-".
1533 See 'hg help dates' for a list of formats valid for -d/--date.
1533 See 'hg help dates' for a list of formats valid for -d/--date.
1534 """
1534 """
1535 patches = (patch1,) + patches
1535 patches = (patch1,) + patches
1536
1536
1537 date = opts.get('date')
1537 date = opts.get('date')
1538 if date:
1538 if date:
1539 opts['date'] = util.parsedate(date)
1539 opts['date'] = util.parsedate(date)
1540
1540
1541 if opts.get('exact') or not opts['force']:
1541 if opts.get('exact') or not opts['force']:
1542 cmdutil.bail_if_changed(repo)
1542 cmdutil.bail_if_changed(repo)
1543
1543
1544 d = opts["base"]
1544 d = opts["base"]
1545 strip = opts["strip"]
1545 strip = opts["strip"]
1546 wlock = lock = None
1546 wlock = lock = None
1547 try:
1547 try:
1548 wlock = repo.wlock()
1548 wlock = repo.wlock()
1549 lock = repo.lock()
1549 lock = repo.lock()
1550 for p in patches:
1550 for p in patches:
1551 pf = os.path.join(d, p)
1551 pf = os.path.join(d, p)
1552
1552
1553 if pf == '-':
1553 if pf == '-':
1554 ui.status(_("applying patch from stdin\n"))
1554 ui.status(_("applying patch from stdin\n"))
1555 data = patch.extract(ui, sys.stdin)
1555 data = patch.extract(ui, sys.stdin)
1556 else:
1556 else:
1557 ui.status(_("applying %s\n") % p)
1557 ui.status(_("applying %s\n") % p)
1558 if os.path.exists(pf):
1558 if os.path.exists(pf):
1559 data = patch.extract(ui, file(pf, 'rb'))
1559 data = patch.extract(ui, file(pf, 'rb'))
1560 else:
1560 else:
1561 data = patch.extract(ui, urllib.urlopen(pf))
1561 data = patch.extract(ui, urllib.urlopen(pf))
1562 tmpname, message, user, date, branch, nodeid, p1, p2 = data
1562 tmpname, message, user, date, branch, nodeid, p1, p2 = data
1563
1563
1564 if tmpname is None:
1564 if tmpname is None:
1565 raise util.Abort(_('no diffs found'))
1565 raise util.Abort(_('no diffs found'))
1566
1566
1567 try:
1567 try:
1568 cmdline_message = cmdutil.logmessage(opts)
1568 cmdline_message = cmdutil.logmessage(opts)
1569 if cmdline_message:
1569 if cmdline_message:
1570 # pickup the cmdline msg
1570 # pickup the cmdline msg
1571 message = cmdline_message
1571 message = cmdline_message
1572 elif message:
1572 elif message:
1573 # pickup the patch msg
1573 # pickup the patch msg
1574 message = message.strip()
1574 message = message.strip()
1575 else:
1575 else:
1576 # launch the editor
1576 # launch the editor
1577 message = None
1577 message = None
1578 ui.debug(_('message:\n%s\n') % message)
1578 ui.debug(_('message:\n%s\n') % message)
1579
1579
1580 wp = repo.parents()
1580 wp = repo.parents()
1581 if opts.get('exact'):
1581 if opts.get('exact'):
1582 if not nodeid or not p1:
1582 if not nodeid or not p1:
1583 raise util.Abort(_('not a mercurial patch'))
1583 raise util.Abort(_('not a mercurial patch'))
1584 p1 = repo.lookup(p1)
1584 p1 = repo.lookup(p1)
1585 p2 = repo.lookup(p2 or hex(nullid))
1585 p2 = repo.lookup(p2 or hex(nullid))
1586
1586
1587 if p1 != wp[0].node():
1587 if p1 != wp[0].node():
1588 hg.clean(repo, p1)
1588 hg.clean(repo, p1)
1589 repo.dirstate.setparents(p1, p2)
1589 repo.dirstate.setparents(p1, p2)
1590 elif p2:
1590 elif p2:
1591 try:
1591 try:
1592 p1 = repo.lookup(p1)
1592 p1 = repo.lookup(p1)
1593 p2 = repo.lookup(p2)
1593 p2 = repo.lookup(p2)
1594 if p1 == wp[0].node():
1594 if p1 == wp[0].node():
1595 repo.dirstate.setparents(p1, p2)
1595 repo.dirstate.setparents(p1, p2)
1596 except RepoError:
1596 except RepoError:
1597 pass
1597 pass
1598 if opts.get('exact') or opts.get('import_branch'):
1598 if opts.get('exact') or opts.get('import_branch'):
1599 repo.dirstate.setbranch(branch or 'default')
1599 repo.dirstate.setbranch(branch or 'default')
1600
1600
1601 files = {}
1601 files = {}
1602 try:
1602 try:
1603 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
1603 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
1604 files=files)
1604 files=files)
1605 finally:
1605 finally:
1606 files = patch.updatedir(ui, repo, files)
1606 files = patch.updatedir(ui, repo, files)
1607 if not opts.get('no_commit'):
1607 if not opts.get('no_commit'):
1608 n = repo.commit(files, message, opts.get('user') or user,
1608 n = repo.commit(files, message, opts.get('user') or user,
1609 opts.get('date') or date)
1609 opts.get('date') or date)
1610 if opts.get('exact'):
1610 if opts.get('exact'):
1611 if hex(n) != nodeid:
1611 if hex(n) != nodeid:
1612 repo.rollback()
1612 repo.rollback()
1613 raise util.Abort(_('patch is damaged'
1613 raise util.Abort(_('patch is damaged'
1614 ' or loses information'))
1614 ' or loses information'))
1615 # Force a dirstate write so that the next transaction
1615 # Force a dirstate write so that the next transaction
1616 # backups an up-do-date file.
1616 # backups an up-do-date file.
1617 repo.dirstate.write()
1617 repo.dirstate.write()
1618 finally:
1618 finally:
1619 os.unlink(tmpname)
1619 os.unlink(tmpname)
1620 finally:
1620 finally:
1621 del lock, wlock
1621 del lock, wlock
1622
1622
1623 def incoming(ui, repo, source="default", **opts):
1623 def incoming(ui, repo, source="default", **opts):
1624 """show new changesets found in source
1624 """show new changesets found in source
1625
1625
1626 Show new changesets found in the specified path/URL or the default
1626 Show new changesets found in the specified path/URL or the default
1627 pull location. These are the changesets that would be pulled if a pull
1627 pull location. These are the changesets that would be pulled if a pull
1628 was requested.
1628 was requested.
1629
1629
1630 For remote repository, using --bundle avoids downloading the changesets
1630 For remote repository, using --bundle avoids downloading the changesets
1631 twice if the incoming is followed by a pull.
1631 twice if the incoming is followed by a pull.
1632
1632
1633 See pull for valid source format details.
1633 See pull for valid source format details.
1634 """
1634 """
1635 limit = cmdutil.loglimit(opts)
1635 limit = cmdutil.loglimit(opts)
1636 source, revs, checkout = hg.parseurl(ui.expandpath(source), opts['rev'])
1636 source, revs, checkout = hg.parseurl(ui.expandpath(source), opts['rev'])
1637 cmdutil.setremoteconfig(ui, opts)
1637 cmdutil.setremoteconfig(ui, opts)
1638
1638
1639 other = hg.repository(ui, source)
1639 other = hg.repository(ui, source)
1640 ui.status(_('comparing with %s\n') % util.hidepassword(source))
1640 ui.status(_('comparing with %s\n') % util.hidepassword(source))
1641 if revs:
1641 if revs:
1642 revs = [other.lookup(rev) for rev in revs]
1642 revs = [other.lookup(rev) for rev in revs]
1643 incoming = repo.findincoming(other, heads=revs, force=opts["force"])
1643 incoming = repo.findincoming(other, heads=revs, force=opts["force"])
1644 if not incoming:
1644 if not incoming:
1645 try:
1645 try:
1646 os.unlink(opts["bundle"])
1646 os.unlink(opts["bundle"])
1647 except:
1647 except:
1648 pass
1648 pass
1649 ui.status(_("no changes found\n"))
1649 ui.status(_("no changes found\n"))
1650 return 1
1650 return 1
1651
1651
1652 cleanup = None
1652 cleanup = None
1653 try:
1653 try:
1654 fname = opts["bundle"]
1654 fname = opts["bundle"]
1655 if fname or not other.local():
1655 if fname or not other.local():
1656 # create a bundle (uncompressed if other repo is not local)
1656 # create a bundle (uncompressed if other repo is not local)
1657 if revs is None:
1657 if revs is None:
1658 cg = other.changegroup(incoming, "incoming")
1658 cg = other.changegroup(incoming, "incoming")
1659 else:
1659 else:
1660 cg = other.changegroupsubset(incoming, revs, 'incoming')
1660 cg = other.changegroupsubset(incoming, revs, 'incoming')
1661 bundletype = other.local() and "HG10BZ" or "HG10UN"
1661 bundletype = other.local() and "HG10BZ" or "HG10UN"
1662 fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
1662 fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
1663 # keep written bundle?
1663 # keep written bundle?
1664 if opts["bundle"]:
1664 if opts["bundle"]:
1665 cleanup = None
1665 cleanup = None
1666 if not other.local():
1666 if not other.local():
1667 # use the created uncompressed bundlerepo
1667 # use the created uncompressed bundlerepo
1668 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1668 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1669
1669
1670 o = other.changelog.nodesbetween(incoming, revs)[0]
1670 o = other.changelog.nodesbetween(incoming, revs)[0]
1671 if opts['newest_first']:
1671 if opts['newest_first']:
1672 o.reverse()
1672 o.reverse()
1673 displayer = cmdutil.show_changeset(ui, other, opts)
1673 displayer = cmdutil.show_changeset(ui, other, opts)
1674 count = 0
1674 count = 0
1675 for n in o:
1675 for n in o:
1676 if count >= limit:
1676 if count >= limit:
1677 break
1677 break
1678 parents = [p for p in other.changelog.parents(n) if p != nullid]
1678 parents = [p for p in other.changelog.parents(n) if p != nullid]
1679 if opts['no_merges'] and len(parents) == 2:
1679 if opts['no_merges'] and len(parents) == 2:
1680 continue
1680 continue
1681 count += 1
1681 count += 1
1682 displayer.show(changenode=n)
1682 displayer.show(changenode=n)
1683 finally:
1683 finally:
1684 if hasattr(other, 'close'):
1684 if hasattr(other, 'close'):
1685 other.close()
1685 other.close()
1686 if cleanup:
1686 if cleanup:
1687 os.unlink(cleanup)
1687 os.unlink(cleanup)
1688
1688
1689 def init(ui, dest=".", **opts):
1689 def init(ui, dest=".", **opts):
1690 """create a new repository in the given directory
1690 """create a new repository in the given directory
1691
1691
1692 Initialize a new repository in the given directory. If the given
1692 Initialize a new repository in the given directory. If the given
1693 directory does not exist, it is created.
1693 directory does not exist, it is created.
1694
1694
1695 If no directory is given, the current directory is used.
1695 If no directory is given, the current directory is used.
1696
1696
1697 It is possible to specify an ssh:// URL as the destination.
1697 It is possible to specify an ssh:// URL as the destination.
1698 Look at the help text for the pull command for important details
1698 Look at the help text for the pull command for important details
1699 about ssh:// URLs.
1699 about ssh:// URLs.
1700 """
1700 """
1701 cmdutil.setremoteconfig(ui, opts)
1701 cmdutil.setremoteconfig(ui, opts)
1702 hg.repository(ui, dest, create=1)
1702 hg.repository(ui, dest, create=1)
1703
1703
1704 def locate(ui, repo, *pats, **opts):
1704 def locate(ui, repo, *pats, **opts):
1705 """locate files matching specific patterns
1705 """locate files matching specific patterns
1706
1706
1707 Print all files under Mercurial control whose names match the
1707 Print all files under Mercurial control whose names match the
1708 given patterns.
1708 given patterns.
1709
1709
1710 This command searches the entire repository by default. To search
1710 This command searches the entire repository by default. To search
1711 just the current directory and its subdirectories, use
1711 just the current directory and its subdirectories, use
1712 "--include .".
1712 "--include .".
1713
1713
1714 If no patterns are given to match, this command prints all file
1714 If no patterns are given to match, this command prints all file
1715 names.
1715 names.
1716
1716
1717 If you want to feed the output of this command into the "xargs"
1717 If you want to feed the output of this command into the "xargs"
1718 command, use the "-0" option to both this command and "xargs".
1718 command, use the "-0" option to both this command and "xargs".
1719 This will avoid the problem of "xargs" treating single filenames
1719 This will avoid the problem of "xargs" treating single filenames
1720 that contain white space as multiple filenames.
1720 that contain white space as multiple filenames.
1721 """
1721 """
1722 end = opts['print0'] and '\0' or '\n'
1722 end = opts['print0'] and '\0' or '\n'
1723 rev = opts.get('rev') or None
1723 rev = opts.get('rev') or None
1724
1724
1725 ret = 1
1725 ret = 1
1726 m = cmdutil.match(repo, pats, opts, default='relglob')
1726 m = cmdutil.match(repo, pats, opts, default='relglob')
1727 m.bad = lambda x,y: False
1727 m.bad = lambda x,y: False
1728 for abs in repo[rev].walk(m):
1728 for abs in repo[rev].walk(m):
1729 if not rev and abs not in repo.dirstate:
1729 if not rev and abs not in repo.dirstate:
1730 continue
1730 continue
1731 if opts['fullpath']:
1731 if opts['fullpath']:
1732 ui.write(os.path.join(repo.root, abs), end)
1732 ui.write(os.path.join(repo.root, abs), end)
1733 else:
1733 else:
1734 ui.write(((pats and m.rel(abs)) or abs), end)
1734 ui.write(((pats and m.rel(abs)) or abs), end)
1735 ret = 0
1735 ret = 0
1736
1736
1737 return ret
1737 return ret
1738
1738
1739 def log(ui, repo, *pats, **opts):
1739 def log(ui, repo, *pats, **opts):
1740 """show revision history of entire repository or files
1740 """show revision history of entire repository or files
1741
1741
1742 Print the revision history of the specified files or the entire
1742 Print the revision history of the specified files or the entire
1743 project.
1743 project.
1744
1744
1745 File history is shown without following rename or copy history of
1745 File history is shown without following rename or copy history of
1746 files. Use -f/--follow with a file name to follow history across
1746 files. Use -f/--follow with a file name to follow history across
1747 renames and copies. --follow without a file name will only show
1747 renames and copies. --follow without a file name will only show
1748 ancestors or descendants of the starting revision. --follow-first
1748 ancestors or descendants of the starting revision. --follow-first
1749 only follows the first parent of merge revisions.
1749 only follows the first parent of merge revisions.
1750
1750
1751 If no revision range is specified, the default is tip:0 unless
1751 If no revision range is specified, the default is tip:0 unless
1752 --follow is set, in which case the working directory parent is
1752 --follow is set, in which case the working directory parent is
1753 used as the starting revision.
1753 used as the starting revision.
1754
1754
1755 See 'hg help dates' for a list of formats valid for -d/--date.
1755 See 'hg help dates' for a list of formats valid for -d/--date.
1756
1756
1757 By default this command outputs: changeset id and hash, tags,
1757 By default this command outputs: changeset id and hash, tags,
1758 non-trivial parents, user, date and time, and a summary for each
1758 non-trivial parents, user, date and time, and a summary for each
1759 commit. When the -v/--verbose switch is used, the list of changed
1759 commit. When the -v/--verbose switch is used, the list of changed
1760 files and full commit message is shown.
1760 files and full commit message is shown.
1761
1761
1762 NOTE: log -p may generate unexpected diff output for merge
1762 NOTE: log -p may generate unexpected diff output for merge
1763 changesets, as it will compare the merge changeset against its
1763 changesets, as it will compare the merge changeset against its
1764 first parent only. Also, the files: list will only reflect files
1764 first parent only. Also, the files: list will only reflect files
1765 that are different from BOTH parents.
1765 that are different from BOTH parents.
1766
1766
1767 """
1767 """
1768
1768
1769 get = util.cachefunc(lambda r: repo[r].changeset())
1769 get = util.cachefunc(lambda r: repo[r].changeset())
1770 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
1770 changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
1771
1771
1772 limit = cmdutil.loglimit(opts)
1772 limit = cmdutil.loglimit(opts)
1773 count = 0
1773 count = 0
1774
1774
1775 if opts['copies'] and opts['rev']:
1775 if opts['copies'] and opts['rev']:
1776 endrev = max(cmdutil.revrange(repo, opts['rev'])) + 1
1776 endrev = max(cmdutil.revrange(repo, opts['rev'])) + 1
1777 else:
1777 else:
1778 endrev = len(repo)
1778 endrev = len(repo)
1779 rcache = {}
1779 rcache = {}
1780 ncache = {}
1780 ncache = {}
1781 def getrenamed(fn, rev):
1781 def getrenamed(fn, rev):
1782 '''looks up all renames for a file (up to endrev) the first
1782 '''looks up all renames for a file (up to endrev) the first
1783 time the file is given. It indexes on the changerev and only
1783 time the file is given. It indexes on the changerev and only
1784 parses the manifest if linkrev != changerev.
1784 parses the manifest if linkrev != changerev.
1785 Returns rename info for fn at changerev rev.'''
1785 Returns rename info for fn at changerev rev.'''
1786 if fn not in rcache:
1786 if fn not in rcache:
1787 rcache[fn] = {}
1787 rcache[fn] = {}
1788 ncache[fn] = {}
1788 ncache[fn] = {}
1789 fl = repo.file(fn)
1789 fl = repo.file(fn)
1790 for i in fl:
1790 for i in fl:
1791 node = fl.node(i)
1791 node = fl.node(i)
1792 lr = fl.linkrev(node)
1792 lr = fl.linkrev(node)
1793 renamed = fl.renamed(node)
1793 renamed = fl.renamed(node)
1794 rcache[fn][lr] = renamed
1794 rcache[fn][lr] = renamed
1795 if renamed:
1795 if renamed:
1796 ncache[fn][node] = renamed
1796 ncache[fn][node] = renamed
1797 if lr >= endrev:
1797 if lr >= endrev:
1798 break
1798 break
1799 if rev in rcache[fn]:
1799 if rev in rcache[fn]:
1800 return rcache[fn][rev]
1800 return rcache[fn][rev]
1801
1801
1802 # If linkrev != rev (i.e. rev not found in rcache) fallback to
1802 # If linkrev != rev (i.e. rev not found in rcache) fallback to
1803 # filectx logic.
1803 # filectx logic.
1804
1804
1805 try:
1805 try:
1806 return repo[rev][fn].renamed()
1806 return repo[rev][fn].renamed()
1807 except revlog.LookupError:
1807 except revlog.LookupError:
1808 pass
1808 pass
1809 return None
1809 return None
1810
1810
1811 df = False
1811 df = False
1812 if opts["date"]:
1812 if opts["date"]:
1813 df = util.matchdate(opts["date"])
1813 df = util.matchdate(opts["date"])
1814
1814
1815 only_branches = opts['only_branch']
1815 only_branches = opts['only_branch']
1816
1816
1817 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
1817 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
1818 for st, rev, fns in changeiter:
1818 for st, rev, fns in changeiter:
1819 if st == 'add':
1819 if st == 'add':
1820 changenode = repo.changelog.node(rev)
1820 changenode = repo.changelog.node(rev)
1821 parents = [p for p in repo.changelog.parentrevs(rev)
1821 parents = [p for p in repo.changelog.parentrevs(rev)
1822 if p != nullrev]
1822 if p != nullrev]
1823 if opts['no_merges'] and len(parents) == 2:
1823 if opts['no_merges'] and len(parents) == 2:
1824 continue
1824 continue
1825 if opts['only_merges'] and len(parents) != 2:
1825 if opts['only_merges'] and len(parents) != 2:
1826 continue
1826 continue
1827
1827
1828 if only_branches:
1828 if only_branches:
1829 revbranch = get(rev)[5]['branch']
1829 revbranch = get(rev)[5]['branch']
1830 if revbranch not in only_branches:
1830 if revbranch not in only_branches:
1831 continue
1831 continue
1832
1832
1833 if df:
1833 if df:
1834 changes = get(rev)
1834 changes = get(rev)
1835 if not df(changes[2][0]):
1835 if not df(changes[2][0]):
1836 continue
1836 continue
1837
1837
1838 if opts['keyword']:
1838 if opts['keyword']:
1839 changes = get(rev)
1839 changes = get(rev)
1840 miss = 0
1840 miss = 0
1841 for k in [kw.lower() for kw in opts['keyword']]:
1841 for k in [kw.lower() for kw in opts['keyword']]:
1842 if not (k in changes[1].lower() or
1842 if not (k in changes[1].lower() or
1843 k in changes[4].lower() or
1843 k in changes[4].lower() or
1844 k in " ".join(changes[3]).lower()):
1844 k in " ".join(changes[3]).lower()):
1845 miss = 1
1845 miss = 1
1846 break
1846 break
1847 if miss:
1847 if miss:
1848 continue
1848 continue
1849
1849
1850 copies = []
1850 copies = []
1851 if opts.get('copies') and rev:
1851 if opts.get('copies') and rev:
1852 for fn in get(rev)[3]:
1852 for fn in get(rev)[3]:
1853 rename = getrenamed(fn, rev)
1853 rename = getrenamed(fn, rev)
1854 if rename:
1854 if rename:
1855 copies.append((fn, rename[0]))
1855 copies.append((fn, rename[0]))
1856 displayer.show(rev, changenode, copies=copies)
1856 displayer.show(rev, changenode, copies=copies)
1857 elif st == 'iter':
1857 elif st == 'iter':
1858 if count == limit: break
1858 if count == limit: break
1859 if displayer.flush(rev):
1859 if displayer.flush(rev):
1860 count += 1
1860 count += 1
1861
1861
1862 def manifest(ui, repo, node=None, rev=None):
1862 def manifest(ui, repo, node=None, rev=None):
1863 """output the current or given revision of the project manifest
1863 """output the current or given revision of the project manifest
1864
1864
1865 Print a list of version controlled files for the given revision.
1865 Print a list of version controlled files for the given revision.
1866 If no revision is given, the parent of the working directory is used,
1866 If no revision is given, the parent of the working directory is used,
1867 or tip if no revision is checked out.
1867 or tip if no revision is checked out.
1868
1868
1869 The manifest is the list of files being version controlled. If no revision
1869 The manifest is the list of files being version controlled. If no revision
1870 is given then the first parent of the working directory is used.
1870 is given then the first parent of the working directory is used.
1871
1871
1872 With -v flag, print file permissions, symlink and executable bits. With
1872 With -v flag, print file permissions, symlink and executable bits. With
1873 --debug flag, print file revision hashes.
1873 --debug flag, print file revision hashes.
1874 """
1874 """
1875
1875
1876 if rev and node:
1876 if rev and node:
1877 raise util.Abort(_("please specify just one revision"))
1877 raise util.Abort(_("please specify just one revision"))
1878
1878
1879 if not node:
1879 if not node:
1880 node = rev
1880 node = rev
1881
1881
1882 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
1882 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
1883 ctx = repo[node]
1883 ctx = repo[node]
1884 for f in ctx:
1884 for f in ctx:
1885 if ui.debugflag:
1885 if ui.debugflag:
1886 ui.write("%40s " % hex(ctx.manifest()[f]))
1886 ui.write("%40s " % hex(ctx.manifest()[f]))
1887 if ui.verbose:
1887 if ui.verbose:
1888 ui.write(decor[ctx.flags(f)])
1888 ui.write(decor[ctx.flags(f)])
1889 ui.write("%s\n" % f)
1889 ui.write("%s\n" % f)
1890
1890
1891 def merge(ui, repo, node=None, force=None, rev=None):
1891 def merge(ui, repo, node=None, force=None, rev=None):
1892 """merge working directory with another revision
1892 """merge working directory with another revision
1893
1893
1894 Merge the contents of the current working directory and the
1894 Merge the contents of the current working directory and the
1895 requested revision. Files that changed between either parent are
1895 requested revision. Files that changed between either parent are
1896 marked as changed for the next commit and a commit must be
1896 marked as changed for the next commit and a commit must be
1897 performed before any further updates are allowed.
1897 performed before any further updates are allowed.
1898
1898
1899 If no revision is specified, the working directory's parent is a
1899 If no revision is specified, the working directory's parent is a
1900 head revision, and the current branch contains exactly one other head,
1900 head revision, and the current branch contains exactly one other head,
1901 the other head is merged with by default. Otherwise, an explicit
1901 the other head is merged with by default. Otherwise, an explicit
1902 revision to merge with must be provided.
1902 revision to merge with must be provided.
1903 """
1903 """
1904
1904
1905 if rev and node:
1905 if rev and node:
1906 raise util.Abort(_("please specify just one revision"))
1906 raise util.Abort(_("please specify just one revision"))
1907 if not node:
1907 if not node:
1908 node = rev
1908 node = rev
1909
1909
1910 if not node:
1910 if not node:
1911 branch = repo.changectx(None).branch()
1911 branch = repo.changectx(None).branch()
1912 bheads = repo.branchheads(branch)
1912 bheads = repo.branchheads(branch)
1913 if len(bheads) > 2:
1913 if len(bheads) > 2:
1914 raise util.Abort(_("branch '%s' has %d heads - "
1914 raise util.Abort(_("branch '%s' has %d heads - "
1915 "please merge with an explicit rev") %
1915 "please merge with an explicit rev") %
1916 (branch, len(bheads)))
1916 (branch, len(bheads)))
1917
1917
1918 parent = repo.dirstate.parents()[0]
1918 parent = repo.dirstate.parents()[0]
1919 if len(bheads) == 1:
1919 if len(bheads) == 1:
1920 if len(repo.heads()) > 1:
1920 if len(repo.heads()) > 1:
1921 raise util.Abort(_("branch '%s' has one head - "
1921 raise util.Abort(_("branch '%s' has one head - "
1922 "please merge with an explicit rev") %
1922 "please merge with an explicit rev") %
1923 branch)
1923 branch)
1924 msg = _('there is nothing to merge')
1924 msg = _('there is nothing to merge')
1925 if parent != repo.lookup(repo[None].branch()):
1925 if parent != repo.lookup(repo[None].branch()):
1926 msg = _('%s - use "hg update" instead') % msg
1926 msg = _('%s - use "hg update" instead') % msg
1927 raise util.Abort(msg)
1927 raise util.Abort(msg)
1928
1928
1929 if parent not in bheads:
1929 if parent not in bheads:
1930 raise util.Abort(_('working dir not at a head rev - '
1930 raise util.Abort(_('working dir not at a head rev - '
1931 'use "hg update" or merge with an explicit rev'))
1931 'use "hg update" or merge with an explicit rev'))
1932 node = parent == bheads[0] and bheads[-1] or bheads[0]
1932 node = parent == bheads[0] and bheads[-1] or bheads[0]
1933 return hg.merge(repo, node, force=force)
1933 return hg.merge(repo, node, force=force)
1934
1934
1935 def outgoing(ui, repo, dest=None, **opts):
1935 def outgoing(ui, repo, dest=None, **opts):
1936 """show changesets not found in destination
1936 """show changesets not found in destination
1937
1937
1938 Show changesets not found in the specified destination repository or
1938 Show changesets not found in the specified destination repository or
1939 the default push location. These are the changesets that would be pushed
1939 the default push location. These are the changesets that would be pushed
1940 if a push was requested.
1940 if a push was requested.
1941
1941
1942 See pull for valid destination format details.
1942 See pull for valid destination format details.
1943 """
1943 """
1944 limit = cmdutil.loglimit(opts)
1944 limit = cmdutil.loglimit(opts)
1945 dest, revs, checkout = hg.parseurl(
1945 dest, revs, checkout = hg.parseurl(
1946 ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev'])
1946 ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev'])
1947 cmdutil.setremoteconfig(ui, opts)
1947 cmdutil.setremoteconfig(ui, opts)
1948 if revs:
1948 if revs:
1949 revs = [repo.lookup(rev) for rev in revs]
1949 revs = [repo.lookup(rev) for rev in revs]
1950
1950
1951 other = hg.repository(ui, dest)
1951 other = hg.repository(ui, dest)
1952 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
1952 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
1953 o = repo.findoutgoing(other, force=opts['force'])
1953 o = repo.findoutgoing(other, force=opts['force'])
1954 if not o:
1954 if not o:
1955 ui.status(_("no changes found\n"))
1955 ui.status(_("no changes found\n"))
1956 return 1
1956 return 1
1957 o = repo.changelog.nodesbetween(o, revs)[0]
1957 o = repo.changelog.nodesbetween(o, revs)[0]
1958 if opts['newest_first']:
1958 if opts['newest_first']:
1959 o.reverse()
1959 o.reverse()
1960 displayer = cmdutil.show_changeset(ui, repo, opts)
1960 displayer = cmdutil.show_changeset(ui, repo, opts)
1961 count = 0
1961 count = 0
1962 for n in o:
1962 for n in o:
1963 if count >= limit:
1963 if count >= limit:
1964 break
1964 break
1965 parents = [p for p in repo.changelog.parents(n) if p != nullid]
1965 parents = [p for p in repo.changelog.parents(n) if p != nullid]
1966 if opts['no_merges'] and len(parents) == 2:
1966 if opts['no_merges'] and len(parents) == 2:
1967 continue
1967 continue
1968 count += 1
1968 count += 1
1969 displayer.show(changenode=n)
1969 displayer.show(changenode=n)
1970
1970
1971 def parents(ui, repo, file_=None, **opts):
1971 def parents(ui, repo, file_=None, **opts):
1972 """show the parents of the working dir or revision
1972 """show the parents of the working dir or revision
1973
1973
1974 Print the working directory's parent revisions. If a
1974 Print the working directory's parent revisions. If a
1975 revision is given via --rev, the parent of that revision
1975 revision is given via --rev, the parent of that revision
1976 will be printed. If a file argument is given, revision in
1976 will be printed. If a file argument is given, revision in
1977 which the file was last changed (before the working directory
1977 which the file was last changed (before the working directory
1978 revision or the argument to --rev if given) is printed.
1978 revision or the argument to --rev if given) is printed.
1979 """
1979 """
1980 rev = opts.get('rev')
1980 rev = opts.get('rev')
1981 if rev:
1981 if rev:
1982 ctx = repo[rev]
1982 ctx = repo[rev]
1983 else:
1983 else:
1984 ctx = repo[None]
1984 ctx = repo[None]
1985
1985
1986 if file_:
1986 if file_:
1987 m = cmdutil.match(repo, (file_,), opts)
1987 m = cmdutil.match(repo, (file_,), opts)
1988 if m.anypats() or len(m.files()) != 1:
1988 if m.anypats() or len(m.files()) != 1:
1989 raise util.Abort(_('can only specify an explicit file name'))
1989 raise util.Abort(_('can only specify an explicit file name'))
1990 file_ = m.files()[0]
1990 file_ = m.files()[0]
1991 filenodes = []
1991 filenodes = []
1992 for cp in ctx.parents():
1992 for cp in ctx.parents():
1993 if not cp:
1993 if not cp:
1994 continue
1994 continue
1995 try:
1995 try:
1996 filenodes.append(cp.filenode(file_))
1996 filenodes.append(cp.filenode(file_))
1997 except revlog.LookupError:
1997 except revlog.LookupError:
1998 pass
1998 pass
1999 if not filenodes:
1999 if not filenodes:
2000 raise util.Abort(_("'%s' not found in manifest!") % file_)
2000 raise util.Abort(_("'%s' not found in manifest!") % file_)
2001 fl = repo.file(file_)
2001 fl = repo.file(file_)
2002 p = [repo.lookup(fl.linkrev(fn)) for fn in filenodes]
2002 p = [repo.lookup(fl.linkrev(fn)) for fn in filenodes]
2003 else:
2003 else:
2004 p = [cp.node() for cp in ctx.parents()]
2004 p = [cp.node() for cp in ctx.parents()]
2005
2005
2006 displayer = cmdutil.show_changeset(ui, repo, opts)
2006 displayer = cmdutil.show_changeset(ui, repo, opts)
2007 for n in p:
2007 for n in p:
2008 if n != nullid:
2008 if n != nullid:
2009 displayer.show(changenode=n)
2009 displayer.show(changenode=n)
2010
2010
2011 def paths(ui, repo, search=None):
2011 def paths(ui, repo, search=None):
2012 """show definition of symbolic path names
2012 """show definition of symbolic path names
2013
2013
2014 Show definition of symbolic path name NAME. If no name is given, show
2014 Show definition of symbolic path name NAME. If no name is given, show
2015 definition of available names.
2015 definition of available names.
2016
2016
2017 Path names are defined in the [paths] section of /etc/mercurial/hgrc
2017 Path names are defined in the [paths] section of /etc/mercurial/hgrc
2018 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
2018 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
2019 """
2019 """
2020 if search:
2020 if search:
2021 for name, path in ui.configitems("paths"):
2021 for name, path in ui.configitems("paths"):
2022 if name == search:
2022 if name == search:
2023 ui.write("%s\n" % util.hidepassword(path))
2023 ui.write("%s\n" % util.hidepassword(path))
2024 return
2024 return
2025 ui.warn(_("not found!\n"))
2025 ui.warn(_("not found!\n"))
2026 return 1
2026 return 1
2027 else:
2027 else:
2028 for name, path in ui.configitems("paths"):
2028 for name, path in ui.configitems("paths"):
2029 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
2029 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
2030
2030
2031 def postincoming(ui, repo, modheads, optupdate, checkout):
2031 def postincoming(ui, repo, modheads, optupdate, checkout):
2032 if modheads == 0:
2032 if modheads == 0:
2033 return
2033 return
2034 if optupdate:
2034 if optupdate:
2035 if modheads <= 1 or checkout:
2035 if modheads <= 1 or checkout:
2036 return hg.update(repo, checkout)
2036 return hg.update(repo, checkout)
2037 else:
2037 else:
2038 ui.status(_("not updating, since new heads added\n"))
2038 ui.status(_("not updating, since new heads added\n"))
2039 if modheads > 1:
2039 if modheads > 1:
2040 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2040 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2041 else:
2041 else:
2042 ui.status(_("(run 'hg update' to get a working copy)\n"))
2042 ui.status(_("(run 'hg update' to get a working copy)\n"))
2043
2043
2044 def pull(ui, repo, source="default", **opts):
2044 def pull(ui, repo, source="default", **opts):
2045 """pull changes from the specified source
2045 """pull changes from the specified source
2046
2046
2047 Pull changes from a remote repository to a local one.
2047 Pull changes from a remote repository to a local one.
2048
2048
2049 This finds all changes from the repository at the specified path
2049 This finds all changes from the repository at the specified path
2050 or URL and adds them to the local repository. By default, this
2050 or URL and adds them to the local repository. By default, this
2051 does not update the copy of the project in the working directory.
2051 does not update the copy of the project in the working directory.
2052
2052
2053 Valid URLs are of the form:
2053 Valid URLs are of the form:
2054
2054
2055 local/filesystem/path (or file://local/filesystem/path)
2055 local/filesystem/path (or file://local/filesystem/path)
2056 http://[user[:pass]@]host[:port]/[path]
2056 http://[user[:pass]@]host[:port]/[path]
2057 https://[user[:pass]@]host[:port]/[path]
2057 https://[user[:pass]@]host[:port]/[path]
2058 ssh://[user[:pass]@]host[:port]/[path]
2058 ssh://[user[:pass]@]host[:port]/[path]
2059 static-http://host[:port]/[path]
2059 static-http://host[:port]/[path]
2060
2060
2061 Paths in the local filesystem can either point to Mercurial
2061 Paths in the local filesystem can either point to Mercurial
2062 repositories or to bundle files (as created by 'hg bundle' or
2062 repositories or to bundle files (as created by 'hg bundle' or
2063 'hg incoming --bundle'). The static-http:// protocol, albeit slow,
2063 'hg incoming --bundle'). The static-http:// protocol, albeit slow,
2064 allows access to a Mercurial repository where you simply use a web
2064 allows access to a Mercurial repository where you simply use a web
2065 server to publish the .hg directory as static content.
2065 server to publish the .hg directory as static content.
2066
2066
2067 An optional identifier after # indicates a particular branch, tag,
2067 An optional identifier after # indicates a particular branch, tag,
2068 or changeset to pull.
2068 or changeset to pull.
2069
2069
2070 Some notes about using SSH with Mercurial:
2070 Some notes about using SSH with Mercurial:
2071 - SSH requires an accessible shell account on the destination machine
2071 - SSH requires an accessible shell account on the destination machine
2072 and a copy of hg in the remote path or specified with as remotecmd.
2072 and a copy of hg in the remote path or specified with as remotecmd.
2073 - path is relative to the remote user's home directory by default.
2073 - path is relative to the remote user's home directory by default.
2074 Use an extra slash at the start of a path to specify an absolute path:
2074 Use an extra slash at the start of a path to specify an absolute path:
2075 ssh://example.com//tmp/repository
2075 ssh://example.com//tmp/repository
2076 - Mercurial doesn't use its own compression via SSH; the right thing
2076 - Mercurial doesn't use its own compression via SSH; the right thing
2077 to do is to configure it in your ~/.ssh/config, e.g.:
2077 to do is to configure it in your ~/.ssh/config, e.g.:
2078 Host *.mylocalnetwork.example.com
2078 Host *.mylocalnetwork.example.com
2079 Compression no
2079 Compression no
2080 Host *
2080 Host *
2081 Compression yes
2081 Compression yes
2082 Alternatively specify "ssh -C" as your ssh command in your hgrc or
2082 Alternatively specify "ssh -C" as your ssh command in your hgrc or
2083 with the --ssh command line option.
2083 with the --ssh command line option.
2084 """
2084 """
2085 source, revs, checkout = hg.parseurl(ui.expandpath(source), opts['rev'])
2085 source, revs, checkout = hg.parseurl(ui.expandpath(source), opts['rev'])
2086 cmdutil.setremoteconfig(ui, opts)
2086 cmdutil.setremoteconfig(ui, opts)
2087
2087
2088 other = hg.repository(ui, source)
2088 other = hg.repository(ui, source)
2089 ui.status(_('pulling from %s\n') % util.hidepassword(source))
2089 ui.status(_('pulling from %s\n') % util.hidepassword(source))
2090 if revs:
2090 if revs:
2091 try:
2091 try:
2092 revs = [other.lookup(rev) for rev in revs]
2092 revs = [other.lookup(rev) for rev in revs]
2093 except NoCapability:
2093 except NoCapability:
2094 error = _("Other repository doesn't support revision lookup, "
2094 error = _("Other repository doesn't support revision lookup, "
2095 "so a rev cannot be specified.")
2095 "so a rev cannot be specified.")
2096 raise util.Abort(error)
2096 raise util.Abort(error)
2097
2097
2098 modheads = repo.pull(other, heads=revs, force=opts['force'])
2098 modheads = repo.pull(other, heads=revs, force=opts['force'])
2099 return postincoming(ui, repo, modheads, opts['update'], checkout)
2099 return postincoming(ui, repo, modheads, opts['update'], checkout)
2100
2100
2101 def push(ui, repo, dest=None, **opts):
2101 def push(ui, repo, dest=None, **opts):
2102 """push changes to the specified destination
2102 """push changes to the specified destination
2103
2103
2104 Push changes from the local repository to the given destination.
2104 Push changes from the local repository to the given destination.
2105
2105
2106 This is the symmetrical operation for pull. It helps to move
2106 This is the symmetrical operation for pull. It helps to move
2107 changes from the current repository to a different one. If the
2107 changes from the current repository to a different one. If the
2108 destination is local this is identical to a pull in that directory
2108 destination is local this is identical to a pull in that directory
2109 from the current one.
2109 from the current one.
2110
2110
2111 By default, push will refuse to run if it detects the result would
2111 By default, push will refuse to run if it detects the result would
2112 increase the number of remote heads. This generally indicates the
2112 increase the number of remote heads. This generally indicates the
2113 the client has forgotten to pull and merge before pushing.
2113 the client has forgotten to pull and merge before pushing.
2114
2114
2115 Valid URLs are of the form:
2115 Valid URLs are of the form:
2116
2116
2117 local/filesystem/path (or file://local/filesystem/path)
2117 local/filesystem/path (or file://local/filesystem/path)
2118 ssh://[user[:pass]@]host[:port]/[path]
2118 ssh://[user[:pass]@]host[:port]/[path]
2119 http://[user[:pass]@]host[:port]/[path]
2119 http://[user[:pass]@]host[:port]/[path]
2120 https://[user[:pass]@]host[:port]/[path]
2120 https://[user[:pass]@]host[:port]/[path]
2121
2121
2122 An optional identifier after # indicates a particular branch, tag,
2122 An optional identifier after # indicates a particular branch, tag,
2123 or changeset to push. If -r is used, the named changeset and all its
2123 or changeset to push. If -r is used, the named changeset and all its
2124 ancestors will be pushed to the remote repository.
2124 ancestors will be pushed to the remote repository.
2125
2125
2126 Look at the help text for the pull command for important details
2126 Look at the help text for the pull command for important details
2127 about ssh:// URLs.
2127 about ssh:// URLs.
2128
2128
2129 Pushing to http:// and https:// URLs is only possible, if this
2129 Pushing to http:// and https:// URLs is only possible, if this
2130 feature is explicitly enabled on the remote Mercurial server.
2130 feature is explicitly enabled on the remote Mercurial server.
2131 """
2131 """
2132 dest, revs, checkout = hg.parseurl(
2132 dest, revs, checkout = hg.parseurl(
2133 ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev'])
2133 ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev'])
2134 cmdutil.setremoteconfig(ui, opts)
2134 cmdutil.setremoteconfig(ui, opts)
2135
2135
2136 other = hg.repository(ui, dest)
2136 other = hg.repository(ui, dest)
2137 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
2137 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
2138 if revs:
2138 if revs:
2139 revs = [repo.lookup(rev) for rev in revs]
2139 revs = [repo.lookup(rev) for rev in revs]
2140 r = repo.push(other, opts['force'], revs=revs)
2140 r = repo.push(other, opts['force'], revs=revs)
2141 return r == 0
2141 return r == 0
2142
2142
2143 def rawcommit(ui, repo, *pats, **opts):
2143 def rawcommit(ui, repo, *pats, **opts):
2144 """raw commit interface (DEPRECATED)
2144 """raw commit interface (DEPRECATED)
2145
2145
2146 (DEPRECATED)
2146 (DEPRECATED)
2147 Lowlevel commit, for use in helper scripts.
2147 Lowlevel commit, for use in helper scripts.
2148
2148
2149 This command is not intended to be used by normal users, as it is
2149 This command is not intended to be used by normal users, as it is
2150 primarily useful for importing from other SCMs.
2150 primarily useful for importing from other SCMs.
2151
2151
2152 This command is now deprecated and will be removed in a future
2152 This command is now deprecated and will be removed in a future
2153 release, please use debugsetparents and commit instead.
2153 release, please use debugsetparents and commit instead.
2154 """
2154 """
2155
2155
2156 ui.warn(_("(the rawcommit command is deprecated)\n"))
2156 ui.warn(_("(the rawcommit command is deprecated)\n"))
2157
2157
2158 message = cmdutil.logmessage(opts)
2158 message = cmdutil.logmessage(opts)
2159
2159
2160 files = cmdutil.match(repo, pats, opts).files()
2160 files = cmdutil.match(repo, pats, opts).files()
2161 if opts['files']:
2161 if opts['files']:
2162 files += open(opts['files']).read().splitlines()
2162 files += open(opts['files']).read().splitlines()
2163
2163
2164 parents = [repo.lookup(p) for p in opts['parent']]
2164 parents = [repo.lookup(p) for p in opts['parent']]
2165
2165
2166 try:
2166 try:
2167 repo.rawcommit(files, message, opts['user'], opts['date'], *parents)
2167 repo.rawcommit(files, message, opts['user'], opts['date'], *parents)
2168 except ValueError, inst:
2168 except ValueError, inst:
2169 raise util.Abort(str(inst))
2169 raise util.Abort(str(inst))
2170
2170
2171 def recover(ui, repo):
2171 def recover(ui, repo):
2172 """roll back an interrupted transaction
2172 """roll back an interrupted transaction
2173
2173
2174 Recover from an interrupted commit or pull.
2174 Recover from an interrupted commit or pull.
2175
2175
2176 This command tries to fix the repository status after an interrupted
2176 This command tries to fix the repository status after an interrupted
2177 operation. It should only be necessary when Mercurial suggests it.
2177 operation. It should only be necessary when Mercurial suggests it.
2178 """
2178 """
2179 if repo.recover():
2179 if repo.recover():
2180 return hg.verify(repo)
2180 return hg.verify(repo)
2181 return 1
2181 return 1
2182
2182
2183 def remove(ui, repo, *pats, **opts):
2183 def remove(ui, repo, *pats, **opts):
2184 """remove the specified files on the next commit
2184 """remove the specified files on the next commit
2185
2185
2186 Schedule the indicated files for removal from the repository.
2186 Schedule the indicated files for removal from the repository.
2187
2187
2188 This only removes files from the current branch, not from the entire
2188 This only removes files from the current branch, not from the entire
2189 project history. -A can be used to remove only files that have already
2189 project history. -A can be used to remove only files that have already
2190 been deleted, -f can be used to force deletion, and -Af can be used
2190 been deleted, -f can be used to force deletion, and -Af can be used
2191 to remove files from the next revision without deleting them.
2191 to remove files from the next revision without deleting them.
2192
2192
2193 The following table details the behavior of remove for different file
2193 The following table details the behavior of remove for different file
2194 states (columns) and option combinations (rows). The file states are
2194 states (columns) and option combinations (rows). The file states are
2195 Added, Clean, Modified and Missing (as reported by hg status). The
2195 Added, Clean, Modified and Missing (as reported by hg status). The
2196 actions are Warn, Remove (from branch) and Delete (from disk).
2196 actions are Warn, Remove (from branch) and Delete (from disk).
2197
2197
2198 A C M !
2198 A C M !
2199 none W RD W R
2199 none W RD W R
2200 -f R RD RD R
2200 -f R RD RD R
2201 -A W W W R
2201 -A W W W R
2202 -Af R R R R
2202 -Af R R R R
2203
2203
2204 This command schedules the files to be removed at the next commit.
2204 This command schedules the files to be removed at the next commit.
2205 To undo a remove before that, see hg revert.
2205 To undo a remove before that, see hg revert.
2206 """
2206 """
2207
2207
2208 after, force = opts.get('after'), opts.get('force')
2208 after, force = opts.get('after'), opts.get('force')
2209 if not pats and not after:
2209 if not pats and not after:
2210 raise util.Abort(_('no files specified'))
2210 raise util.Abort(_('no files specified'))
2211
2211
2212 m = cmdutil.match(repo, pats, opts)
2212 m = cmdutil.match(repo, pats, opts)
2213 s = repo.status(match=m, clean=True)
2213 s = repo.status(match=m, clean=True)
2214 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2214 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2215
2215
2216 def warn(files, reason):
2216 def warn(files, reason):
2217 for f in files:
2217 for f in files:
2218 ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
2218 ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
2219 % (m.rel(f), reason))
2219 % (m.rel(f), reason))
2220
2220
2221 if force:
2221 if force:
2222 remove, forget = modified + deleted + clean, added
2222 remove, forget = modified + deleted + clean, added
2223 elif after:
2223 elif after:
2224 remove, forget = deleted, []
2224 remove, forget = deleted, []
2225 warn(modified + added + clean, _('still exists'))
2225 warn(modified + added + clean, _('still exists'))
2226 else:
2226 else:
2227 remove, forget = deleted + clean, []
2227 remove, forget = deleted + clean, []
2228 warn(modified, _('is modified'))
2228 warn(modified, _('is modified'))
2229 warn(added, _('has been marked for add'))
2229 warn(added, _('has been marked for add'))
2230
2230
2231 for f in util.sort(remove + forget):
2231 for f in util.sort(remove + forget):
2232 if ui.verbose or not m.exact(f):
2232 if ui.verbose or not m.exact(f):
2233 ui.status(_('removing %s\n') % m.rel(f))
2233 ui.status(_('removing %s\n') % m.rel(f))
2234
2234
2235 repo.forget(forget)
2235 repo.forget(forget)
2236 repo.remove(remove, unlink=not after)
2236 repo.remove(remove, unlink=not after)
2237
2237
2238 def rename(ui, repo, *pats, **opts):
2238 def rename(ui, repo, *pats, **opts):
2239 """rename files; equivalent of copy + remove
2239 """rename files; equivalent of copy + remove
2240
2240
2241 Mark dest as copies of sources; mark sources for deletion. If
2241 Mark dest as copies of sources; mark sources for deletion. If
2242 dest is a directory, copies are put in that directory. If dest is
2242 dest is a directory, copies are put in that directory. If dest is
2243 a file, there can only be one source.
2243 a file, there can only be one source.
2244
2244
2245 By default, this command copies the contents of files as they
2245 By default, this command copies the contents of files as they
2246 stand in the working directory. If invoked with --after, the
2246 stand in the working directory. If invoked with --after, the
2247 operation is recorded, but no copying is performed.
2247 operation is recorded, but no copying is performed.
2248
2248
2249 This command takes effect in the next commit. To undo a rename
2249 This command takes effect in the next commit. To undo a rename
2250 before that, see hg revert.
2250 before that, see hg revert.
2251 """
2251 """
2252 wlock = repo.wlock(False)
2252 wlock = repo.wlock(False)
2253 try:
2253 try:
2254 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2254 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2255 finally:
2255 finally:
2256 del wlock
2256 del wlock
2257
2257
2258 def resolve(ui, repo, *pats, **opts):
2258 def resolve(ui, repo, *pats, **opts):
2259 """resolve file merges from a branch merge or update
2259 """resolve file merges from a branch merge or update
2260
2260
2261 This command will attempt to resolve unresolved merges from the
2261 This command will attempt to resolve unresolved merges from the
2262 last update or merge command. This will use the local file
2262 last update or merge command. This will use the local file
2263 revision preserved at the last update or merge to cleanly retry
2263 revision preserved at the last update or merge to cleanly retry
2264 the file merge attempt. With no file or options specified, this
2264 the file merge attempt. With no file or options specified, this
2265 command will attempt to resolve all unresolved files.
2265 command will attempt to resolve all unresolved files.
2266
2266
2267 The codes used to show the status of files are:
2267 The codes used to show the status of files are:
2268 U = unresolved
2268 U = unresolved
2269 R = resolved
2269 R = resolved
2270 """
2270 """
2271
2271
2272 if len([x for x in opts if opts[x]]) > 1:
2272 if len([x for x in opts if opts[x]]) > 1:
2273 raise util.Abort(_("too many options specified"))
2273 raise util.Abort(_("too many options specified"))
2274
2274
2275 ms = merge_.mergestate(repo)
2275 ms = merge_.mergestate(repo)
2276 m = cmdutil.match(repo, pats, opts)
2276 m = cmdutil.match(repo, pats, opts)
2277
2277
2278 for f in ms:
2278 for f in ms:
2279 if m(f):
2279 if m(f):
2280 if opts.get("list"):
2280 if opts.get("list"):
2281 ui.write("%s %s\n" % (ms[f].upper(), f))
2281 ui.write("%s %s\n" % (ms[f].upper(), f))
2282 elif opts.get("mark"):
2282 elif opts.get("mark"):
2283 ms.mark(f, "r")
2283 ms.mark(f, "r")
2284 elif opts.get("unmark"):
2284 elif opts.get("unmark"):
2285 ms.mark(f, "u")
2285 ms.mark(f, "u")
2286 else:
2286 else:
2287 wctx = repo[None]
2287 wctx = repo[None]
2288 mctx = wctx.parents()[-1]
2288 mctx = wctx.parents()[-1]
2289 ms.resolve(f, wctx, mctx)
2289 ms.resolve(f, wctx, mctx)
2290
2290
2291 def revert(ui, repo, *pats, **opts):
2291 def revert(ui, repo, *pats, **opts):
2292 """restore individual files or dirs to an earlier state
2292 """restore individual files or dirs to an earlier state
2293
2293
2294 (use update -r to check out earlier revisions, revert does not
2294 (use update -r to check out earlier revisions, revert does not
2295 change the working dir parents)
2295 change the working dir parents)
2296
2296
2297 With no revision specified, revert the named files or directories
2297 With no revision specified, revert the named files or directories
2298 to the contents they had in the parent of the working directory.
2298 to the contents they had in the parent of the working directory.
2299 This restores the contents of the affected files to an unmodified
2299 This restores the contents of the affected files to an unmodified
2300 state and unschedules adds, removes, copies, and renames. If the
2300 state and unschedules adds, removes, copies, and renames. If the
2301 working directory has two parents, you must explicitly specify the
2301 working directory has two parents, you must explicitly specify the
2302 revision to revert to.
2302 revision to revert to.
2303
2303
2304 Using the -r option, revert the given files or directories to their
2304 Using the -r option, revert the given files or directories to their
2305 contents as of a specific revision. This can be helpful to "roll
2305 contents as of a specific revision. This can be helpful to "roll
2306 back" some or all of an earlier change.
2306 back" some or all of an earlier change.
2307 See 'hg help dates' for a list of formats valid for -d/--date.
2307 See 'hg help dates' for a list of formats valid for -d/--date.
2308
2308
2309 Revert modifies the working directory. It does not commit any
2309 Revert modifies the working directory. It does not commit any
2310 changes, or change the parent of the working directory. If you
2310 changes, or change the parent of the working directory. If you
2311 revert to a revision other than the parent of the working
2311 revert to a revision other than the parent of the working
2312 directory, the reverted files will thus appear modified
2312 directory, the reverted files will thus appear modified
2313 afterwards.
2313 afterwards.
2314
2314
2315 If a file has been deleted, it is restored. If the executable
2315 If a file has been deleted, it is restored. If the executable
2316 mode of a file was changed, it is reset.
2316 mode of a file was changed, it is reset.
2317
2317
2318 If names are given, all files matching the names are reverted.
2318 If names are given, all files matching the names are reverted.
2319 If no arguments are given, no files are reverted.
2319 If no arguments are given, no files are reverted.
2320
2320
2321 Modified files are saved with a .orig suffix before reverting.
2321 Modified files are saved with a .orig suffix before reverting.
2322 To disable these backups, use --no-backup.
2322 To disable these backups, use --no-backup.
2323 """
2323 """
2324
2324
2325 if opts["date"]:
2325 if opts["date"]:
2326 if opts["rev"]:
2326 if opts["rev"]:
2327 raise util.Abort(_("you can't specify a revision and a date"))
2327 raise util.Abort(_("you can't specify a revision and a date"))
2328 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
2328 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
2329
2329
2330 if not pats and not opts['all']:
2330 if not pats and not opts['all']:
2331 raise util.Abort(_('no files or directories specified; '
2331 raise util.Abort(_('no files or directories specified; '
2332 'use --all to revert the whole repo'))
2332 'use --all to revert the whole repo'))
2333
2333
2334 parent, p2 = repo.dirstate.parents()
2334 parent, p2 = repo.dirstate.parents()
2335 if not opts['rev'] and p2 != nullid:
2335 if not opts['rev'] and p2 != nullid:
2336 raise util.Abort(_('uncommitted merge - please provide a '
2336 raise util.Abort(_('uncommitted merge - please provide a '
2337 'specific revision'))
2337 'specific revision'))
2338 ctx = repo[opts['rev']]
2338 ctx = repo[opts['rev']]
2339 node = ctx.node()
2339 node = ctx.node()
2340 mf = ctx.manifest()
2340 mf = ctx.manifest()
2341 if node == parent:
2341 if node == parent:
2342 pmf = mf
2342 pmf = mf
2343 else:
2343 else:
2344 pmf = None
2344 pmf = None
2345
2345
2346 # need all matching names in dirstate and manifest of target rev,
2346 # need all matching names in dirstate and manifest of target rev,
2347 # so have to walk both. do not print errors if files exist in one
2347 # so have to walk both. do not print errors if files exist in one
2348 # but not other.
2348 # but not other.
2349
2349
2350 names = {}
2350 names = {}
2351
2351
2352 wlock = repo.wlock()
2352 wlock = repo.wlock()
2353 try:
2353 try:
2354 # walk dirstate.
2354 # walk dirstate.
2355 files = []
2355 files = []
2356
2356
2357 m = cmdutil.match(repo, pats, opts)
2357 m = cmdutil.match(repo, pats, opts)
2358 m.bad = lambda x,y: False
2358 m.bad = lambda x,y: False
2359 for abs in repo.walk(m):
2359 for abs in repo.walk(m):
2360 names[abs] = m.rel(abs), m.exact(abs)
2360 names[abs] = m.rel(abs), m.exact(abs)
2361
2361
2362 # walk target manifest.
2362 # walk target manifest.
2363
2363
2364 def badfn(path, msg):
2364 def badfn(path, msg):
2365 if path in names:
2365 if path in names:
2366 return False
2366 return False
2367 path_ = path + '/'
2367 path_ = path + '/'
2368 for f in names:
2368 for f in names:
2369 if f.startswith(path_):
2369 if f.startswith(path_):
2370 return False
2370 return False
2371 repo.ui.warn("%s: %s\n" % (m.rel(path), msg))
2371 repo.ui.warn("%s: %s\n" % (m.rel(path), msg))
2372 return False
2372 return False
2373
2373
2374 m = cmdutil.match(repo, pats, opts)
2374 m = cmdutil.match(repo, pats, opts)
2375 m.bad = badfn
2375 m.bad = badfn
2376 for abs in repo[node].walk(m):
2376 for abs in repo[node].walk(m):
2377 if abs not in names:
2377 if abs not in names:
2378 names[abs] = m.rel(abs), m.exact(abs)
2378 names[abs] = m.rel(abs), m.exact(abs)
2379
2379
2380 m = cmdutil.matchfiles(repo, names)
2380 m = cmdutil.matchfiles(repo, names)
2381 changes = repo.status(match=m)[:4]
2381 changes = repo.status(match=m)[:4]
2382 modified, added, removed, deleted = map(dict.fromkeys, changes)
2382 modified, added, removed, deleted = map(dict.fromkeys, changes)
2383
2383
2384 # if f is a rename, also revert the source
2384 # if f is a rename, also revert the source
2385 cwd = repo.getcwd()
2385 cwd = repo.getcwd()
2386 for f in added:
2386 for f in added:
2387 src = repo.dirstate.copied(f)
2387 src = repo.dirstate.copied(f)
2388 if src and src not in names and repo.dirstate[src] == 'r':
2388 if src and src not in names and repo.dirstate[src] == 'r':
2389 removed[src] = None
2389 removed[src] = None
2390 names[src] = (repo.pathto(src, cwd), True)
2390 names[src] = (repo.pathto(src, cwd), True)
2391
2391
2392 def removeforget(abs):
2392 def removeforget(abs):
2393 if repo.dirstate[abs] == 'a':
2393 if repo.dirstate[abs] == 'a':
2394 return _('forgetting %s\n')
2394 return _('forgetting %s\n')
2395 return _('removing %s\n')
2395 return _('removing %s\n')
2396
2396
2397 revert = ([], _('reverting %s\n'))
2397 revert = ([], _('reverting %s\n'))
2398 add = ([], _('adding %s\n'))
2398 add = ([], _('adding %s\n'))
2399 remove = ([], removeforget)
2399 remove = ([], removeforget)
2400 undelete = ([], _('undeleting %s\n'))
2400 undelete = ([], _('undeleting %s\n'))
2401
2401
2402 disptable = (
2402 disptable = (
2403 # dispatch table:
2403 # dispatch table:
2404 # file state
2404 # file state
2405 # action if in target manifest
2405 # action if in target manifest
2406 # action if not in target manifest
2406 # action if not in target manifest
2407 # make backup if in target manifest
2407 # make backup if in target manifest
2408 # make backup if not in target manifest
2408 # make backup if not in target manifest
2409 (modified, revert, remove, True, True),
2409 (modified, revert, remove, True, True),
2410 (added, revert, remove, True, False),
2410 (added, revert, remove, True, False),
2411 (removed, undelete, None, False, False),
2411 (removed, undelete, None, False, False),
2412 (deleted, revert, remove, False, False),
2412 (deleted, revert, remove, False, False),
2413 )
2413 )
2414
2414
2415 for abs, (rel, exact) in util.sort(names.items()):
2415 for abs, (rel, exact) in util.sort(names.items()):
2416 mfentry = mf.get(abs)
2416 mfentry = mf.get(abs)
2417 target = repo.wjoin(abs)
2417 target = repo.wjoin(abs)
2418 def handle(xlist, dobackup):
2418 def handle(xlist, dobackup):
2419 xlist[0].append(abs)
2419 xlist[0].append(abs)
2420 if dobackup and not opts['no_backup'] and util.lexists(target):
2420 if dobackup and not opts['no_backup'] and util.lexists(target):
2421 bakname = "%s.orig" % rel
2421 bakname = "%s.orig" % rel
2422 ui.note(_('saving current version of %s as %s\n') %
2422 ui.note(_('saving current version of %s as %s\n') %
2423 (rel, bakname))
2423 (rel, bakname))
2424 if not opts.get('dry_run'):
2424 if not opts.get('dry_run'):
2425 util.copyfile(target, bakname)
2425 util.copyfile(target, bakname)
2426 if ui.verbose or not exact:
2426 if ui.verbose or not exact:
2427 msg = xlist[1]
2427 msg = xlist[1]
2428 if not isinstance(msg, basestring):
2428 if not isinstance(msg, basestring):
2429 msg = msg(abs)
2429 msg = msg(abs)
2430 ui.status(msg % rel)
2430 ui.status(msg % rel)
2431 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2431 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2432 if abs not in table: continue
2432 if abs not in table: continue
2433 # file has changed in dirstate
2433 # file has changed in dirstate
2434 if mfentry:
2434 if mfentry:
2435 handle(hitlist, backuphit)
2435 handle(hitlist, backuphit)
2436 elif misslist is not None:
2436 elif misslist is not None:
2437 handle(misslist, backupmiss)
2437 handle(misslist, backupmiss)
2438 break
2438 break
2439 else:
2439 else:
2440 if abs not in repo.dirstate:
2440 if abs not in repo.dirstate:
2441 if mfentry:
2441 if mfentry:
2442 handle(add, True)
2442 handle(add, True)
2443 elif exact:
2443 elif exact:
2444 ui.warn(_('file not managed: %s\n') % rel)
2444 ui.warn(_('file not managed: %s\n') % rel)
2445 continue
2445 continue
2446 # file has not changed in dirstate
2446 # file has not changed in dirstate
2447 if node == parent:
2447 if node == parent:
2448 if exact: ui.warn(_('no changes needed to %s\n') % rel)
2448 if exact: ui.warn(_('no changes needed to %s\n') % rel)
2449 continue
2449 continue
2450 if pmf is None:
2450 if pmf is None:
2451 # only need parent manifest in this unlikely case,
2451 # only need parent manifest in this unlikely case,
2452 # so do not read by default
2452 # so do not read by default
2453 pmf = repo[parent].manifest()
2453 pmf = repo[parent].manifest()
2454 if abs in pmf:
2454 if abs in pmf:
2455 if mfentry:
2455 if mfentry:
2456 # if version of file is same in parent and target
2456 # if version of file is same in parent and target
2457 # manifests, do nothing
2457 # manifests, do nothing
2458 if (pmf[abs] != mfentry or
2458 if (pmf[abs] != mfentry or
2459 pmf.flags(abs) != mf.flags(abs)):
2459 pmf.flags(abs) != mf.flags(abs)):
2460 handle(revert, False)
2460 handle(revert, False)
2461 else:
2461 else:
2462 handle(remove, False)
2462 handle(remove, False)
2463
2463
2464 if not opts.get('dry_run'):
2464 if not opts.get('dry_run'):
2465 def checkout(f):
2465 def checkout(f):
2466 fc = ctx[f]
2466 fc = ctx[f]
2467 repo.wwrite(f, fc.data(), fc.flags())
2467 repo.wwrite(f, fc.data(), fc.flags())
2468
2468
2469 audit_path = util.path_auditor(repo.root)
2469 audit_path = util.path_auditor(repo.root)
2470 for f in remove[0]:
2470 for f in remove[0]:
2471 if repo.dirstate[f] == 'a':
2471 if repo.dirstate[f] == 'a':
2472 repo.dirstate.forget(f)
2472 repo.dirstate.forget(f)
2473 continue
2473 continue
2474 audit_path(f)
2474 audit_path(f)
2475 try:
2475 try:
2476 util.unlink(repo.wjoin(f))
2476 util.unlink(repo.wjoin(f))
2477 except OSError:
2477 except OSError:
2478 pass
2478 pass
2479 repo.dirstate.remove(f)
2479 repo.dirstate.remove(f)
2480
2480
2481 normal = None
2481 normal = None
2482 if node == parent:
2482 if node == parent:
2483 # We're reverting to our parent. If possible, we'd like status
2483 # We're reverting to our parent. If possible, we'd like status
2484 # to report the file as clean. We have to use normallookup for
2484 # to report the file as clean. We have to use normallookup for
2485 # merges to avoid losing information about merged/dirty files.
2485 # merges to avoid losing information about merged/dirty files.
2486 if p2 != nullid:
2486 if p2 != nullid:
2487 normal = repo.dirstate.normallookup
2487 normal = repo.dirstate.normallookup
2488 else:
2488 else:
2489 normal = repo.dirstate.normal
2489 normal = repo.dirstate.normal
2490 for f in revert[0]:
2490 for f in revert[0]:
2491 checkout(f)
2491 checkout(f)
2492 if normal:
2492 if normal:
2493 normal(f)
2493 normal(f)
2494
2494
2495 for f in add[0]:
2495 for f in add[0]:
2496 checkout(f)
2496 checkout(f)
2497 repo.dirstate.add(f)
2497 repo.dirstate.add(f)
2498
2498
2499 normal = repo.dirstate.normallookup
2499 normal = repo.dirstate.normallookup
2500 if node == parent and p2 == nullid:
2500 if node == parent and p2 == nullid:
2501 normal = repo.dirstate.normal
2501 normal = repo.dirstate.normal
2502 for f in undelete[0]:
2502 for f in undelete[0]:
2503 checkout(f)
2503 checkout(f)
2504 normal(f)
2504 normal(f)
2505
2505
2506 finally:
2506 finally:
2507 del wlock
2507 del wlock
2508
2508
2509 def rollback(ui, repo):
2509 def rollback(ui, repo):
2510 """roll back the last transaction
2510 """roll back the last transaction
2511
2511
2512 This command should be used with care. There is only one level of
2512 This command should be used with care. There is only one level of
2513 rollback, and there is no way to undo a rollback. It will also
2513 rollback, and there is no way to undo a rollback. It will also
2514 restore the dirstate at the time of the last transaction, losing
2514 restore the dirstate at the time of the last transaction, losing
2515 any dirstate changes since that time.
2515 any dirstate changes since that time.
2516
2516
2517 Transactions are used to encapsulate the effects of all commands
2517 Transactions are used to encapsulate the effects of all commands
2518 that create new changesets or propagate existing changesets into a
2518 that create new changesets or propagate existing changesets into a
2519 repository. For example, the following commands are transactional,
2519 repository. For example, the following commands are transactional,
2520 and their effects can be rolled back:
2520 and their effects can be rolled back:
2521
2521
2522 commit
2522 commit
2523 import
2523 import
2524 pull
2524 pull
2525 push (with this repository as destination)
2525 push (with this repository as destination)
2526 unbundle
2526 unbundle
2527
2527
2528 This command is not intended for use on public repositories. Once
2528 This command is not intended for use on public repositories. Once
2529 changes are visible for pull by other users, rolling a transaction
2529 changes are visible for pull by other users, rolling a transaction
2530 back locally is ineffective (someone else may already have pulled
2530 back locally is ineffective (someone else may already have pulled
2531 the changes). Furthermore, a race is possible with readers of the
2531 the changes). Furthermore, a race is possible with readers of the
2532 repository; for example an in-progress pull from the repository
2532 repository; for example an in-progress pull from the repository
2533 may fail if a rollback is performed.
2533 may fail if a rollback is performed.
2534 """
2534 """
2535 repo.rollback()
2535 repo.rollback()
2536
2536
2537 def root(ui, repo):
2537 def root(ui, repo):
2538 """print the root (top) of the current working dir
2538 """print the root (top) of the current working dir
2539
2539
2540 Print the root directory of the current repository.
2540 Print the root directory of the current repository.
2541 """
2541 """
2542 ui.write(repo.root + "\n")
2542 ui.write(repo.root + "\n")
2543
2543
2544 def serve(ui, repo, **opts):
2544 def serve(ui, repo, **opts):
2545 """export the repository via HTTP
2545 """export the repository via HTTP
2546
2546
2547 Start a local HTTP repository browser and pull server.
2547 Start a local HTTP repository browser and pull server.
2548
2548
2549 By default, the server logs accesses to stdout and errors to
2549 By default, the server logs accesses to stdout and errors to
2550 stderr. Use the "-A" and "-E" options to log to files.
2550 stderr. Use the "-A" and "-E" options to log to files.
2551 """
2551 """
2552
2552
2553 if opts["stdio"]:
2553 if opts["stdio"]:
2554 if repo is None:
2554 if repo is None:
2555 raise RepoError(_("There is no Mercurial repository here"
2555 raise RepoError(_("There is no Mercurial repository here"
2556 " (.hg not found)"))
2556 " (.hg not found)"))
2557 s = sshserver.sshserver(ui, repo)
2557 s = sshserver.sshserver(ui, repo)
2558 s.serve_forever()
2558 s.serve_forever()
2559
2559
2560 parentui = ui.parentui or ui
2560 parentui = ui.parentui or ui
2561 optlist = ("name templates style address port prefix ipv6"
2561 optlist = ("name templates style address port prefix ipv6"
2562 " accesslog errorlog webdir_conf certificate")
2562 " accesslog errorlog webdir_conf certificate")
2563 for o in optlist.split():
2563 for o in optlist.split():
2564 if opts[o]:
2564 if opts[o]:
2565 parentui.setconfig("web", o, str(opts[o]))
2565 parentui.setconfig("web", o, str(opts[o]))
2566 if (repo is not None) and (repo.ui != parentui):
2566 if (repo is not None) and (repo.ui != parentui):
2567 repo.ui.setconfig("web", o, str(opts[o]))
2567 repo.ui.setconfig("web", o, str(opts[o]))
2568
2568
2569 if repo is None and not ui.config("web", "webdir_conf"):
2569 if repo is None and not ui.config("web", "webdir_conf"):
2570 raise RepoError(_("There is no Mercurial repository here"
2570 raise RepoError(_("There is no Mercurial repository here"
2571 " (.hg not found)"))
2571 " (.hg not found)"))
2572
2572
2573 class service:
2573 class service:
2574 def init(self):
2574 def init(self):
2575 util.set_signal_handler()
2575 util.set_signal_handler()
2576 self.httpd = hgweb.server.create_server(parentui, repo)
2576 self.httpd = hgweb.server.create_server(parentui, repo)
2577
2577
2578 if not ui.verbose: return
2578 if not ui.verbose: return
2579
2579
2580 if self.httpd.prefix:
2580 if self.httpd.prefix:
2581 prefix = self.httpd.prefix.strip('/') + '/'
2581 prefix = self.httpd.prefix.strip('/') + '/'
2582 else:
2582 else:
2583 prefix = ''
2583 prefix = ''
2584
2584
2585 port = ':%d' % self.httpd.port
2585 port = ':%d' % self.httpd.port
2586 if port == ':80':
2586 if port == ':80':
2587 port = ''
2587 port = ''
2588
2588
2589 bindaddr = self.httpd.addr
2589 bindaddr = self.httpd.addr
2590 if bindaddr == '0.0.0.0':
2590 if bindaddr == '0.0.0.0':
2591 bindaddr = '*'
2591 bindaddr = '*'
2592 elif ':' in bindaddr: # IPv6
2592 elif ':' in bindaddr: # IPv6
2593 bindaddr = '[%s]' % bindaddr
2593 bindaddr = '[%s]' % bindaddr
2594
2594
2595 fqaddr = self.httpd.fqaddr
2595 fqaddr = self.httpd.fqaddr
2596 if ':' in fqaddr:
2596 if ':' in fqaddr:
2597 fqaddr = '[%s]' % fqaddr
2597 fqaddr = '[%s]' % fqaddr
2598 ui.status(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
2598 ui.status(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
2599 (fqaddr, port, prefix, bindaddr, self.httpd.port))
2599 (fqaddr, port, prefix, bindaddr, self.httpd.port))
2600
2600
2601 def run(self):
2601 def run(self):
2602 self.httpd.serve_forever()
2602 self.httpd.serve_forever()
2603
2603
2604 service = service()
2604 service = service()
2605
2605
2606 cmdutil.service(opts, initfn=service.init, runfn=service.run)
2606 cmdutil.service(opts, initfn=service.init, runfn=service.run)
2607
2607
2608 def status(ui, repo, *pats, **opts):
2608 def status(ui, repo, *pats, **opts):
2609 """show changed files in the working directory
2609 """show changed files in the working directory
2610
2610
2611 Show status of files in the repository. If names are given, only
2611 Show status of files in the repository. If names are given, only
2612 files that match are shown. Files that are clean or ignored or
2612 files that match are shown. Files that are clean or ignored or
2613 source of a copy/move operation, are not listed unless -c (clean),
2613 source of a copy/move operation, are not listed unless -c (clean),
2614 -i (ignored), -C (copies) or -A is given. Unless options described
2614 -i (ignored), -C (copies) or -A is given. Unless options described
2615 with "show only ..." are given, the options -mardu are used.
2615 with "show only ..." are given, the options -mardu are used.
2616
2616
2617 Option -q/--quiet hides untracked (unknown and ignored) files
2617 Option -q/--quiet hides untracked (unknown and ignored) files
2618 unless explicitly requested with -u/--unknown or -i/-ignored.
2618 unless explicitly requested with -u/--unknown or -i/-ignored.
2619
2619
2620 NOTE: status may appear to disagree with diff if permissions have
2620 NOTE: status may appear to disagree with diff if permissions have
2621 changed or a merge has occurred. The standard diff format does not
2621 changed or a merge has occurred. The standard diff format does not
2622 report permission changes and diff only reports changes relative
2622 report permission changes and diff only reports changes relative
2623 to one merge parent.
2623 to one merge parent.
2624
2624
2625 If one revision is given, it is used as the base revision.
2625 If one revision is given, it is used as the base revision.
2626 If two revisions are given, the difference between them is shown.
2626 If two revisions are given, the difference between them is shown.
2627
2627
2628 The codes used to show the status of files are:
2628 The codes used to show the status of files are:
2629 M = modified
2629 M = modified
2630 A = added
2630 A = added
2631 R = removed
2631 R = removed
2632 C = clean
2632 C = clean
2633 ! = deleted, but still tracked
2633 ! = deleted, but still tracked
2634 ? = not tracked
2634 ? = not tracked
2635 I = ignored
2635 I = ignored
2636 = the previous added file was copied from here
2636 = the previous added file was copied from here
2637 """
2637 """
2638
2638
2639 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
2639 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
2640 cwd = (pats and repo.getcwd()) or ''
2640 cwd = (pats and repo.getcwd()) or ''
2641 end = opts['print0'] and '\0' or '\n'
2641 end = opts['print0'] and '\0' or '\n'
2642 copy = {}
2642 copy = {}
2643 states = 'modified added removed deleted unknown ignored clean'.split()
2643 states = 'modified added removed deleted unknown ignored clean'.split()
2644 show = [k for k in states if opts[k]]
2644 show = [k for k in states if opts[k]]
2645 if opts['all']:
2645 if opts['all']:
2646 show += ui.quiet and (states[:4] + ['clean']) or states
2646 show += ui.quiet and (states[:4] + ['clean']) or states
2647 if not show:
2647 if not show:
2648 show = ui.quiet and states[:4] or states[:5]
2648 show = ui.quiet and states[:4] or states[:5]
2649
2649
2650 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
2650 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
2651 'ignored' in show, 'clean' in show, 'unknown' in show)
2651 'ignored' in show, 'clean' in show, 'unknown' in show)
2652 changestates = zip(states, 'MAR!?IC', stat)
2652 changestates = zip(states, 'MAR!?IC', stat)
2653
2653
2654 if (opts['all'] or opts['copies']) and not opts['no_status']:
2654 if (opts['all'] or opts['copies']) and not opts['no_status']:
2655 ctxn = repo[nullid]
2655 ctxn = repo[nullid]
2656 ctx1 = repo[node1]
2656 ctx1 = repo[node1]
2657 ctx2 = repo[node2]
2657 ctx2 = repo[node2]
2658 added = stat[1]
2658 added = stat[1]
2659 if node2 is None:
2659 if node2 is None:
2660 added = stat[0] + stat[1] # merged?
2660 added = stat[0] + stat[1] # merged?
2661
2661
2662 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].items():
2662 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].items():
2663 if k in added:
2663 if k in added:
2664 copy[k] = v
2664 copy[k] = v
2665 elif v in added:
2665 elif v in added:
2666 copy[v] = k
2666 copy[v] = k
2667
2667
2668 for state, char, files in changestates:
2668 for state, char, files in changestates:
2669 if state in show:
2669 if state in show:
2670 format = "%s %%s%s" % (char, end)
2670 format = "%s %%s%s" % (char, end)
2671 if opts['no_status']:
2671 if opts['no_status']:
2672 format = "%%s%s" % end
2672 format = "%%s%s" % end
2673
2673
2674 for f in files:
2674 for f in files:
2675 ui.write(format % repo.pathto(f, cwd))
2675 ui.write(format % repo.pathto(f, cwd))
2676 if f in copy:
2676 if f in copy:
2677 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end))
2677 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end))
2678
2678
2679 def tag(ui, repo, name1, *names, **opts):
2679 def tag(ui, repo, name1, *names, **opts):
2680 """add one or more tags for the current or given revision
2680 """add one or more tags for the current or given revision
2681
2681
2682 Name a particular revision using <name>.
2682 Name a particular revision using <name>.
2683
2683
2684 Tags are used to name particular revisions of the repository and are
2684 Tags are used to name particular revisions of the repository and are
2685 very useful to compare different revisions, to go back to significant
2685 very useful to compare different revisions, to go back to significant
2686 earlier versions or to mark branch points as releases, etc.
2686 earlier versions or to mark branch points as releases, etc.
2687
2687
2688 If no revision is given, the parent of the working directory is used,
2688 If no revision is given, the parent of the working directory is used,
2689 or tip if no revision is checked out.
2689 or tip if no revision is checked out.
2690
2690
2691 To facilitate version control, distribution, and merging of tags,
2691 To facilitate version control, distribution, and merging of tags,
2692 they are stored as a file named ".hgtags" which is managed
2692 they are stored as a file named ".hgtags" which is managed
2693 similarly to other project files and can be hand-edited if
2693 similarly to other project files and can be hand-edited if
2694 necessary. The file '.hg/localtags' is used for local tags (not
2694 necessary. The file '.hg/localtags' is used for local tags (not
2695 shared among repositories).
2695 shared among repositories).
2696
2696
2697 See 'hg help dates' for a list of formats valid for -d/--date.
2697 See 'hg help dates' for a list of formats valid for -d/--date.
2698 """
2698 """
2699
2699
2700 rev_ = "."
2700 rev_ = "."
2701 names = (name1,) + names
2701 names = (name1,) + names
2702 if len(names) != len(dict.fromkeys(names)):
2702 if len(names) != len(dict.fromkeys(names)):
2703 raise util.Abort(_('tag names must be unique'))
2703 raise util.Abort(_('tag names must be unique'))
2704 for n in names:
2704 for n in names:
2705 if n in ['tip', '.', 'null']:
2705 if n in ['tip', '.', 'null']:
2706 raise util.Abort(_('the name \'%s\' is reserved') % n)
2706 raise util.Abort(_('the name \'%s\' is reserved') % n)
2707 if opts['rev'] and opts['remove']:
2707 if opts['rev'] and opts['remove']:
2708 raise util.Abort(_("--rev and --remove are incompatible"))
2708 raise util.Abort(_("--rev and --remove are incompatible"))
2709 if opts['rev']:
2709 if opts['rev']:
2710 rev_ = opts['rev']
2710 rev_ = opts['rev']
2711 message = opts['message']
2711 message = opts['message']
2712 if opts['remove']:
2712 if opts['remove']:
2713 expectedtype = opts['local'] and 'local' or 'global'
2713 expectedtype = opts['local'] and 'local' or 'global'
2714 for n in names:
2714 for n in names:
2715 if not repo.tagtype(n):
2715 if not repo.tagtype(n):
2716 raise util.Abort(_('tag \'%s\' does not exist') % n)
2716 raise util.Abort(_('tag \'%s\' does not exist') % n)
2717 if repo.tagtype(n) != expectedtype:
2717 if repo.tagtype(n) != expectedtype:
2718 raise util.Abort(_('tag \'%s\' is not a %s tag') %
2718 raise util.Abort(_('tag \'%s\' is not a %s tag') %
2719 (n, expectedtype))
2719 (n, expectedtype))
2720 rev_ = nullid
2720 rev_ = nullid
2721 if not message:
2721 if not message:
2722 message = _('Removed tag %s') % ', '.join(names)
2722 message = _('Removed tag %s') % ', '.join(names)
2723 elif not opts['force']:
2723 elif not opts['force']:
2724 for n in names:
2724 for n in names:
2725 if n in repo.tags():
2725 if n in repo.tags():
2726 raise util.Abort(_('tag \'%s\' already exists '
2726 raise util.Abort(_('tag \'%s\' already exists '
2727 '(use -f to force)') % n)
2727 '(use -f to force)') % n)
2728 if not rev_ and repo.dirstate.parents()[1] != nullid:
2728 if not rev_ and repo.dirstate.parents()[1] != nullid:
2729 raise util.Abort(_('uncommitted merge - please provide a '
2729 raise util.Abort(_('uncommitted merge - please provide a '
2730 'specific revision'))
2730 'specific revision'))
2731 r = repo[rev_].node()
2731 r = repo[rev_].node()
2732
2732
2733 if not message:
2733 if not message:
2734 message = (_('Added tag %s for changeset %s') %
2734 message = (_('Added tag %s for changeset %s') %
2735 (', '.join(names), short(r)))
2735 (', '.join(names), short(r)))
2736
2736
2737 date = opts.get('date')
2737 date = opts.get('date')
2738 if date:
2738 if date:
2739 date = util.parsedate(date)
2739 date = util.parsedate(date)
2740
2740
2741 repo.tag(names, r, message, opts['local'], opts['user'], date)
2741 repo.tag(names, r, message, opts['local'], opts['user'], date)
2742
2742
2743 def tags(ui, repo):
2743 def tags(ui, repo):
2744 """list repository tags
2744 """list repository tags
2745
2745
2746 List the repository tags.
2746 List the repository tags.
2747
2747
2748 This lists both regular and local tags. When the -v/--verbose switch
2748 This lists both regular and local tags. When the -v/--verbose switch
2749 is used, a third column "local" is printed for local tags.
2749 is used, a third column "local" is printed for local tags.
2750 """
2750 """
2751
2751
2752 l = repo.tagslist()
2752 l = repo.tagslist()
2753 l.reverse()
2753 l.reverse()
2754 hexfunc = ui.debugflag and hex or short
2754 hexfunc = ui.debugflag and hex or short
2755 tagtype = ""
2755 tagtype = ""
2756
2756
2757 for t, n in l:
2757 for t, n in l:
2758 if ui.quiet:
2758 if ui.quiet:
2759 ui.write("%s\n" % t)
2759 ui.write("%s\n" % t)
2760 continue
2760 continue
2761
2761
2762 try:
2762 try:
2763 hn = hexfunc(n)
2763 hn = hexfunc(n)
2764 r = "%5d:%s" % (repo.changelog.rev(n), hn)
2764 r = "%5d:%s" % (repo.changelog.rev(n), hn)
2765 except revlog.LookupError:
2765 except revlog.LookupError:
2766 r = " ?:%s" % hn
2766 r = " ?:%s" % hn
2767 else:
2767 else:
2768 spaces = " " * (30 - util.locallen(t))
2768 spaces = " " * (30 - util.locallen(t))
2769 if ui.verbose:
2769 if ui.verbose:
2770 if repo.tagtype(t) == 'local':
2770 if repo.tagtype(t) == 'local':
2771 tagtype = " local"
2771 tagtype = " local"
2772 else:
2772 else:
2773 tagtype = ""
2773 tagtype = ""
2774 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
2774 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
2775
2775
2776 def tip(ui, repo, **opts):
2776 def tip(ui, repo, **opts):
2777 """show the tip revision
2777 """show the tip revision
2778
2778
2779 The tip revision (usually just called the tip) is the most
2779 The tip revision (usually just called the tip) is the most
2780 recently added changeset in the repository, the most recently
2780 recently added changeset in the repository, the most recently
2781 changed head.
2781 changed head.
2782
2782
2783 If you have just made a commit, that commit will be the tip. If
2783 If you have just made a commit, that commit will be the tip. If
2784 you have just pulled changes from another repository, the tip of
2784 you have just pulled changes from another repository, the tip of
2785 that repository becomes the current tip. The "tip" tag is special
2785 that repository becomes the current tip. The "tip" tag is special
2786 and cannot be renamed or assigned to a different changeset.
2786 and cannot be renamed or assigned to a different changeset.
2787 """
2787 """
2788 cmdutil.show_changeset(ui, repo, opts).show(len(repo) - 1)
2788 cmdutil.show_changeset(ui, repo, opts).show(len(repo) - 1)
2789
2789
2790 def unbundle(ui, repo, fname1, *fnames, **opts):
2790 def unbundle(ui, repo, fname1, *fnames, **opts):
2791 """apply one or more changegroup files
2791 """apply one or more changegroup files
2792
2792
2793 Apply one or more compressed changegroup files generated by the
2793 Apply one or more compressed changegroup files generated by the
2794 bundle command.
2794 bundle command.
2795 """
2795 """
2796 fnames = (fname1,) + fnames
2796 fnames = (fname1,) + fnames
2797
2797
2798 lock = None
2798 lock = None
2799 try:
2799 try:
2800 lock = repo.lock()
2800 lock = repo.lock()
2801 for fname in fnames:
2801 for fname in fnames:
2802 if os.path.exists(fname):
2802 if os.path.exists(fname):
2803 f = open(fname, "rb")
2803 f = open(fname, "rb")
2804 else:
2804 else:
2805 f = urllib.urlopen(fname)
2805 f = urllib.urlopen(fname)
2806 gen = changegroup.readbundle(f, fname)
2806 gen = changegroup.readbundle(f, fname)
2807 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
2807 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
2808 finally:
2808 finally:
2809 del lock
2809 del lock
2810
2810
2811 return postincoming(ui, repo, modheads, opts['update'], None)
2811 return postincoming(ui, repo, modheads, opts['update'], None)
2812
2812
2813 def update(ui, repo, node=None, rev=None, clean=False, date=None):
2813 def update(ui, repo, node=None, rev=None, clean=False, date=None):
2814 """update working directory
2814 """update working directory
2815
2815
2816 Update the repository's working directory to the specified revision,
2816 Update the repository's working directory to the specified revision,
2817 or the tip of the current branch if none is specified.
2817 or the tip of the current branch if none is specified. Use null as
2818 the revision to remove the working copy (like 'hg clone -U').
2818
2819
2819 If the requested revision is a descendant of the working
2820 If the requested revision is a descendant of the working
2820 directory, any outstanding changes in the working directory will
2821 directory, any outstanding changes in the working directory will
2821 be merged into the result. If it is not directly descended but is
2822 be merged into the result. If it is not directly descended but is
2822 on the same named branch, update aborts with a suggestion to use
2823 on the same named branch, update aborts with a suggestion to use
2823 merge or update -C instead.
2824 merge or update -C instead.
2824
2825
2825 If the requested revision is on a different named branch and the
2826 If the requested revision is on a different named branch and the
2826 working directory is clean, update quietly switches branches.
2827 working directory is clean, update quietly switches branches.
2827
2828
2828 If you want to update just one file to an older revision, use revert.
2829 If you want to update just one file to an older revision, use revert.
2829
2830
2830 See 'hg help dates' for a list of formats valid for --date.
2831 See 'hg help dates' for a list of formats valid for --date.
2831 """
2832 """
2832 if rev and node:
2833 if rev and node:
2833 raise util.Abort(_("please specify just one revision"))
2834 raise util.Abort(_("please specify just one revision"))
2834
2835
2835 if not rev:
2836 if not rev:
2836 rev = node
2837 rev = node
2837
2838
2838 if date:
2839 if date:
2839 if rev:
2840 if rev:
2840 raise util.Abort(_("you can't specify a revision and a date"))
2841 raise util.Abort(_("you can't specify a revision and a date"))
2841 rev = cmdutil.finddate(ui, repo, date)
2842 rev = cmdutil.finddate(ui, repo, date)
2842
2843
2843 if clean:
2844 if clean:
2844 return hg.clean(repo, rev)
2845 return hg.clean(repo, rev)
2845 else:
2846 else:
2846 return hg.update(repo, rev)
2847 return hg.update(repo, rev)
2847
2848
2848 def verify(ui, repo):
2849 def verify(ui, repo):
2849 """verify the integrity of the repository
2850 """verify the integrity of the repository
2850
2851
2851 Verify the integrity of the current repository.
2852 Verify the integrity of the current repository.
2852
2853
2853 This will perform an extensive check of the repository's
2854 This will perform an extensive check of the repository's
2854 integrity, validating the hashes and checksums of each entry in
2855 integrity, validating the hashes and checksums of each entry in
2855 the changelog, manifest, and tracked files, as well as the
2856 the changelog, manifest, and tracked files, as well as the
2856 integrity of their crosslinks and indices.
2857 integrity of their crosslinks and indices.
2857 """
2858 """
2858 return hg.verify(repo)
2859 return hg.verify(repo)
2859
2860
2860 def version_(ui):
2861 def version_(ui):
2861 """output version and copyright information"""
2862 """output version and copyright information"""
2862 ui.write(_("Mercurial Distributed SCM (version %s)\n")
2863 ui.write(_("Mercurial Distributed SCM (version %s)\n")
2863 % version.get_version())
2864 % version.get_version())
2864 ui.status(_(
2865 ui.status(_(
2865 "\nCopyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others\n"
2866 "\nCopyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others\n"
2866 "This is free software; see the source for copying conditions. "
2867 "This is free software; see the source for copying conditions. "
2867 "There is NO\nwarranty; "
2868 "There is NO\nwarranty; "
2868 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
2869 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
2869 ))
2870 ))
2870
2871
2871 # Command options and aliases are listed here, alphabetically
2872 # Command options and aliases are listed here, alphabetically
2872
2873
2873 globalopts = [
2874 globalopts = [
2874 ('R', 'repository', '',
2875 ('R', 'repository', '',
2875 _('repository root directory or symbolic path name')),
2876 _('repository root directory or symbolic path name')),
2876 ('', 'cwd', '', _('change working directory')),
2877 ('', 'cwd', '', _('change working directory')),
2877 ('y', 'noninteractive', None,
2878 ('y', 'noninteractive', None,
2878 _('do not prompt, assume \'yes\' for any required answers')),
2879 _('do not prompt, assume \'yes\' for any required answers')),
2879 ('q', 'quiet', None, _('suppress output')),
2880 ('q', 'quiet', None, _('suppress output')),
2880 ('v', 'verbose', None, _('enable additional output')),
2881 ('v', 'verbose', None, _('enable additional output')),
2881 ('', 'config', [], _('set/override config option')),
2882 ('', 'config', [], _('set/override config option')),
2882 ('', 'debug', None, _('enable debugging output')),
2883 ('', 'debug', None, _('enable debugging output')),
2883 ('', 'debugger', None, _('start debugger')),
2884 ('', 'debugger', None, _('start debugger')),
2884 ('', 'encoding', util._encoding, _('set the charset encoding')),
2885 ('', 'encoding', util._encoding, _('set the charset encoding')),
2885 ('', 'encodingmode', util._encodingmode, _('set the charset encoding mode')),
2886 ('', 'encodingmode', util._encodingmode, _('set the charset encoding mode')),
2886 ('', 'lsprof', None, _('print improved command execution profile')),
2887 ('', 'lsprof', None, _('print improved command execution profile')),
2887 ('', 'traceback', None, _('print traceback on exception')),
2888 ('', 'traceback', None, _('print traceback on exception')),
2888 ('', 'time', None, _('time how long the command takes')),
2889 ('', 'time', None, _('time how long the command takes')),
2889 ('', 'profile', None, _('print command execution profile')),
2890 ('', 'profile', None, _('print command execution profile')),
2890 ('', 'version', None, _('output version information and exit')),
2891 ('', 'version', None, _('output version information and exit')),
2891 ('h', 'help', None, _('display help and exit')),
2892 ('h', 'help', None, _('display help and exit')),
2892 ]
2893 ]
2893
2894
2894 dryrunopts = [('n', 'dry-run', None,
2895 dryrunopts = [('n', 'dry-run', None,
2895 _('do not perform actions, just print output'))]
2896 _('do not perform actions, just print output'))]
2896
2897
2897 remoteopts = [
2898 remoteopts = [
2898 ('e', 'ssh', '', _('specify ssh command to use')),
2899 ('e', 'ssh', '', _('specify ssh command to use')),
2899 ('', 'remotecmd', '', _('specify hg command to run on the remote side')),
2900 ('', 'remotecmd', '', _('specify hg command to run on the remote side')),
2900 ]
2901 ]
2901
2902
2902 walkopts = [
2903 walkopts = [
2903 ('I', 'include', [], _('include names matching the given patterns')),
2904 ('I', 'include', [], _('include names matching the given patterns')),
2904 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2905 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2905 ]
2906 ]
2906
2907
2907 commitopts = [
2908 commitopts = [
2908 ('m', 'message', '', _('use <text> as commit message')),
2909 ('m', 'message', '', _('use <text> as commit message')),
2909 ('l', 'logfile', '', _('read commit message from <file>')),
2910 ('l', 'logfile', '', _('read commit message from <file>')),
2910 ]
2911 ]
2911
2912
2912 commitopts2 = [
2913 commitopts2 = [
2913 ('d', 'date', '', _('record datecode as commit date')),
2914 ('d', 'date', '', _('record datecode as commit date')),
2914 ('u', 'user', '', _('record user as committer')),
2915 ('u', 'user', '', _('record user as committer')),
2915 ]
2916 ]
2916
2917
2917 templateopts = [
2918 templateopts = [
2918 ('', 'style', '', _('display using template map file')),
2919 ('', 'style', '', _('display using template map file')),
2919 ('', 'template', '', _('display with template')),
2920 ('', 'template', '', _('display with template')),
2920 ]
2921 ]
2921
2922
2922 logopts = [
2923 logopts = [
2923 ('p', 'patch', None, _('show patch')),
2924 ('p', 'patch', None, _('show patch')),
2924 ('l', 'limit', '', _('limit number of changes displayed')),
2925 ('l', 'limit', '', _('limit number of changes displayed')),
2925 ('M', 'no-merges', None, _('do not show merges')),
2926 ('M', 'no-merges', None, _('do not show merges')),
2926 ] + templateopts
2927 ] + templateopts
2927
2928
2928 diffopts = [
2929 diffopts = [
2929 ('a', 'text', None, _('treat all files as text')),
2930 ('a', 'text', None, _('treat all files as text')),
2930 ('g', 'git', None, _('use git extended diff format')),
2931 ('g', 'git', None, _('use git extended diff format')),
2931 ('', 'nodates', None, _("don't include dates in diff headers"))
2932 ('', 'nodates', None, _("don't include dates in diff headers"))
2932 ]
2933 ]
2933
2934
2934 diffopts2 = [
2935 diffopts2 = [
2935 ('p', 'show-function', None, _('show which function each change is in')),
2936 ('p', 'show-function', None, _('show which function each change is in')),
2936 ('w', 'ignore-all-space', None,
2937 ('w', 'ignore-all-space', None,
2937 _('ignore white space when comparing lines')),
2938 _('ignore white space when comparing lines')),
2938 ('b', 'ignore-space-change', None,
2939 ('b', 'ignore-space-change', None,
2939 _('ignore changes in the amount of white space')),
2940 _('ignore changes in the amount of white space')),
2940 ('B', 'ignore-blank-lines', None,
2941 ('B', 'ignore-blank-lines', None,
2941 _('ignore changes whose lines are all blank')),
2942 _('ignore changes whose lines are all blank')),
2942 ('U', 'unified', '', _('number of lines of context to show'))
2943 ('U', 'unified', '', _('number of lines of context to show'))
2943 ]
2944 ]
2944
2945
2945 table = {
2946 table = {
2946 "^add": (add, walkopts + dryrunopts, _('hg add [OPTION]... [FILE]...')),
2947 "^add": (add, walkopts + dryrunopts, _('hg add [OPTION]... [FILE]...')),
2947 "addremove":
2948 "addremove":
2948 (addremove,
2949 (addremove,
2949 [('s', 'similarity', '',
2950 [('s', 'similarity', '',
2950 _('guess renamed files by similarity (0<=s<=100)')),
2951 _('guess renamed files by similarity (0<=s<=100)')),
2951 ] + walkopts + dryrunopts,
2952 ] + walkopts + dryrunopts,
2952 _('hg addremove [OPTION]... [FILE]...')),
2953 _('hg addremove [OPTION]... [FILE]...')),
2953 "^annotate|blame":
2954 "^annotate|blame":
2954 (annotate,
2955 (annotate,
2955 [('r', 'rev', '', _('annotate the specified revision')),
2956 [('r', 'rev', '', _('annotate the specified revision')),
2956 ('f', 'follow', None, _('follow file copies and renames')),
2957 ('f', 'follow', None, _('follow file copies and renames')),
2957 ('a', 'text', None, _('treat all files as text')),
2958 ('a', 'text', None, _('treat all files as text')),
2958 ('u', 'user', None, _('list the author (long with -v)')),
2959 ('u', 'user', None, _('list the author (long with -v)')),
2959 ('d', 'date', None, _('list the date (short with -q)')),
2960 ('d', 'date', None, _('list the date (short with -q)')),
2960 ('n', 'number', None, _('list the revision number (default)')),
2961 ('n', 'number', None, _('list the revision number (default)')),
2961 ('c', 'changeset', None, _('list the changeset')),
2962 ('c', 'changeset', None, _('list the changeset')),
2962 ('l', 'line-number', None,
2963 ('l', 'line-number', None,
2963 _('show line number at the first appearance'))
2964 _('show line number at the first appearance'))
2964 ] + walkopts,
2965 ] + walkopts,
2965 _('hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
2966 _('hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
2966 "archive":
2967 "archive":
2967 (archive,
2968 (archive,
2968 [('', 'no-decode', None, _('do not pass files through decoders')),
2969 [('', 'no-decode', None, _('do not pass files through decoders')),
2969 ('p', 'prefix', '', _('directory prefix for files in archive')),
2970 ('p', 'prefix', '', _('directory prefix for files in archive')),
2970 ('r', 'rev', '', _('revision to distribute')),
2971 ('r', 'rev', '', _('revision to distribute')),
2971 ('t', 'type', '', _('type of distribution to create')),
2972 ('t', 'type', '', _('type of distribution to create')),
2972 ] + walkopts,
2973 ] + walkopts,
2973 _('hg archive [OPTION]... DEST')),
2974 _('hg archive [OPTION]... DEST')),
2974 "backout":
2975 "backout":
2975 (backout,
2976 (backout,
2976 [('', 'merge', None,
2977 [('', 'merge', None,
2977 _('merge with old dirstate parent after backout')),
2978 _('merge with old dirstate parent after backout')),
2978 ('', 'parent', '', _('parent to choose when backing out merge')),
2979 ('', 'parent', '', _('parent to choose when backing out merge')),
2979 ('r', 'rev', '', _('revision to backout')),
2980 ('r', 'rev', '', _('revision to backout')),
2980 ] + walkopts + commitopts + commitopts2,
2981 ] + walkopts + commitopts + commitopts2,
2981 _('hg backout [OPTION]... [-r] REV')),
2982 _('hg backout [OPTION]... [-r] REV')),
2982 "bisect":
2983 "bisect":
2983 (bisect,
2984 (bisect,
2984 [('r', 'reset', False, _('reset bisect state')),
2985 [('r', 'reset', False, _('reset bisect state')),
2985 ('g', 'good', False, _('mark changeset good')),
2986 ('g', 'good', False, _('mark changeset good')),
2986 ('b', 'bad', False, _('mark changeset bad')),
2987 ('b', 'bad', False, _('mark changeset bad')),
2987 ('s', 'skip', False, _('skip testing changeset')),
2988 ('s', 'skip', False, _('skip testing changeset')),
2988 ('U', 'noupdate', False, _('do not update to target'))],
2989 ('U', 'noupdate', False, _('do not update to target'))],
2989 _("hg bisect [-gbsr] [REV]")),
2990 _("hg bisect [-gbsr] [REV]")),
2990 "branch":
2991 "branch":
2991 (branch,
2992 (branch,
2992 [('f', 'force', None,
2993 [('f', 'force', None,
2993 _('set branch name even if it shadows an existing branch')),
2994 _('set branch name even if it shadows an existing branch')),
2994 ('C', 'clean', None, _('reset branch name to parent branch name'))],
2995 ('C', 'clean', None, _('reset branch name to parent branch name'))],
2995 _('hg branch [-fC] [NAME]')),
2996 _('hg branch [-fC] [NAME]')),
2996 "branches":
2997 "branches":
2997 (branches,
2998 (branches,
2998 [('a', 'active', False,
2999 [('a', 'active', False,
2999 _('show only branches that have unmerged heads'))],
3000 _('show only branches that have unmerged heads'))],
3000 _('hg branches [-a]')),
3001 _('hg branches [-a]')),
3001 "bundle":
3002 "bundle":
3002 (bundle,
3003 (bundle,
3003 [('f', 'force', None,
3004 [('f', 'force', None,
3004 _('run even when remote repository is unrelated')),
3005 _('run even when remote repository is unrelated')),
3005 ('r', 'rev', [],
3006 ('r', 'rev', [],
3006 _('a changeset up to which you would like to bundle')),
3007 _('a changeset up to which you would like to bundle')),
3007 ('', 'base', [],
3008 ('', 'base', [],
3008 _('a base changeset to specify instead of a destination')),
3009 _('a base changeset to specify instead of a destination')),
3009 ('a', 'all', None, _('bundle all changesets in the repository')),
3010 ('a', 'all', None, _('bundle all changesets in the repository')),
3010 ('t', 'type', 'bzip2', _('bundle compression type to use')),
3011 ('t', 'type', 'bzip2', _('bundle compression type to use')),
3011 ] + remoteopts,
3012 ] + remoteopts,
3012 _('hg bundle [-f] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
3013 _('hg bundle [-f] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
3013 "cat":
3014 "cat":
3014 (cat,
3015 (cat,
3015 [('o', 'output', '', _('print output to file with formatted name')),
3016 [('o', 'output', '', _('print output to file with formatted name')),
3016 ('r', 'rev', '', _('print the given revision')),
3017 ('r', 'rev', '', _('print the given revision')),
3017 ('', 'decode', None, _('apply any matching decode filter')),
3018 ('', 'decode', None, _('apply any matching decode filter')),
3018 ] + walkopts,
3019 ] + walkopts,
3019 _('hg cat [OPTION]... FILE...')),
3020 _('hg cat [OPTION]... FILE...')),
3020 "^clone":
3021 "^clone":
3021 (clone,
3022 (clone,
3022 [('U', 'noupdate', None,
3023 [('U', 'noupdate', None,
3023 _('the clone will only contain a repository (no working copy)')),
3024 _('the clone will only contain a repository (no working copy)')),
3024 ('r', 'rev', [],
3025 ('r', 'rev', [],
3025 _('a changeset you would like to have after cloning')),
3026 _('a changeset you would like to have after cloning')),
3026 ('', 'pull', None, _('use pull protocol to copy metadata')),
3027 ('', 'pull', None, _('use pull protocol to copy metadata')),
3027 ('', 'uncompressed', None,
3028 ('', 'uncompressed', None,
3028 _('use uncompressed transfer (fast over LAN)')),
3029 _('use uncompressed transfer (fast over LAN)')),
3029 ] + remoteopts,
3030 ] + remoteopts,
3030 _('hg clone [OPTION]... SOURCE [DEST]')),
3031 _('hg clone [OPTION]... SOURCE [DEST]')),
3031 "^commit|ci":
3032 "^commit|ci":
3032 (commit,
3033 (commit,
3033 [('A', 'addremove', None,
3034 [('A', 'addremove', None,
3034 _('mark new/missing files as added/removed before committing')),
3035 _('mark new/missing files as added/removed before committing')),
3035 ] + walkopts + commitopts + commitopts2,
3036 ] + walkopts + commitopts + commitopts2,
3036 _('hg commit [OPTION]... [FILE]...')),
3037 _('hg commit [OPTION]... [FILE]...')),
3037 "copy|cp":
3038 "copy|cp":
3038 (copy,
3039 (copy,
3039 [('A', 'after', None, _('record a copy that has already occurred')),
3040 [('A', 'after', None, _('record a copy that has already occurred')),
3040 ('f', 'force', None,
3041 ('f', 'force', None,
3041 _('forcibly copy over an existing managed file')),
3042 _('forcibly copy over an existing managed file')),
3042 ] + walkopts + dryrunopts,
3043 ] + walkopts + dryrunopts,
3043 _('hg copy [OPTION]... [SOURCE]... DEST')),
3044 _('hg copy [OPTION]... [SOURCE]... DEST')),
3044 "debugancestor": (debugancestor, [],
3045 "debugancestor": (debugancestor, [],
3045 _('hg debugancestor [INDEX] REV1 REV2')),
3046 _('hg debugancestor [INDEX] REV1 REV2')),
3046 "debugcheckstate": (debugcheckstate, [], _('hg debugcheckstate')),
3047 "debugcheckstate": (debugcheckstate, [], _('hg debugcheckstate')),
3047 "debugcomplete":
3048 "debugcomplete":
3048 (debugcomplete,
3049 (debugcomplete,
3049 [('o', 'options', None, _('show the command options'))],
3050 [('o', 'options', None, _('show the command options'))],
3050 _('hg debugcomplete [-o] CMD')),
3051 _('hg debugcomplete [-o] CMD')),
3051 "debugdate":
3052 "debugdate":
3052 (debugdate,
3053 (debugdate,
3053 [('e', 'extended', None, _('try extended date formats'))],
3054 [('e', 'extended', None, _('try extended date formats'))],
3054 _('hg debugdate [-e] DATE [RANGE]')),
3055 _('hg debugdate [-e] DATE [RANGE]')),
3055 "debugdata": (debugdata, [], _('hg debugdata FILE REV')),
3056 "debugdata": (debugdata, [], _('hg debugdata FILE REV')),
3056 "debugfsinfo": (debugfsinfo, [], _('hg debugfsinfo [PATH]')),
3057 "debugfsinfo": (debugfsinfo, [], _('hg debugfsinfo [PATH]')),
3057 "debugindex": (debugindex, [], _('hg debugindex FILE')),
3058 "debugindex": (debugindex, [], _('hg debugindex FILE')),
3058 "debugindexdot": (debugindexdot, [], _('hg debugindexdot FILE')),
3059 "debugindexdot": (debugindexdot, [], _('hg debugindexdot FILE')),
3059 "debuginstall": (debuginstall, [], _('hg debuginstall')),
3060 "debuginstall": (debuginstall, [], _('hg debuginstall')),
3060 "debugrawcommit|rawcommit":
3061 "debugrawcommit|rawcommit":
3061 (rawcommit,
3062 (rawcommit,
3062 [('p', 'parent', [], _('parent')),
3063 [('p', 'parent', [], _('parent')),
3063 ('F', 'files', '', _('file list'))
3064 ('F', 'files', '', _('file list'))
3064 ] + commitopts + commitopts2,
3065 ] + commitopts + commitopts2,
3065 _('hg debugrawcommit [OPTION]... [FILE]...')),
3066 _('hg debugrawcommit [OPTION]... [FILE]...')),
3066 "debugrebuildstate":
3067 "debugrebuildstate":
3067 (debugrebuildstate,
3068 (debugrebuildstate,
3068 [('r', 'rev', '', _('revision to rebuild to'))],
3069 [('r', 'rev', '', _('revision to rebuild to'))],
3069 _('hg debugrebuildstate [-r REV] [REV]')),
3070 _('hg debugrebuildstate [-r REV] [REV]')),
3070 "debugrename":
3071 "debugrename":
3071 (debugrename,
3072 (debugrename,
3072 [('r', 'rev', '', _('revision to debug'))],
3073 [('r', 'rev', '', _('revision to debug'))],
3073 _('hg debugrename [-r REV] FILE')),
3074 _('hg debugrename [-r REV] FILE')),
3074 "debugsetparents":
3075 "debugsetparents":
3075 (debugsetparents,
3076 (debugsetparents,
3076 [],
3077 [],
3077 _('hg debugsetparents REV1 [REV2]')),
3078 _('hg debugsetparents REV1 [REV2]')),
3078 "debugstate":
3079 "debugstate":
3079 (debugstate,
3080 (debugstate,
3080 [('', 'nodates', None, _('do not display the saved mtime'))],
3081 [('', 'nodates', None, _('do not display the saved mtime'))],
3081 _('hg debugstate [OPTS]')),
3082 _('hg debugstate [OPTS]')),
3082 "debugwalk": (debugwalk, walkopts, _('hg debugwalk [OPTION]... [FILE]...')),
3083 "debugwalk": (debugwalk, walkopts, _('hg debugwalk [OPTION]... [FILE]...')),
3083 "^diff":
3084 "^diff":
3084 (diff,
3085 (diff,
3085 [('r', 'rev', [], _('revision'))
3086 [('r', 'rev', [], _('revision'))
3086 ] + diffopts + diffopts2 + walkopts,
3087 ] + diffopts + diffopts2 + walkopts,
3087 _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')),
3088 _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')),
3088 "^export":
3089 "^export":
3089 (export,
3090 (export,
3090 [('o', 'output', '', _('print output to file with formatted name')),
3091 [('o', 'output', '', _('print output to file with formatted name')),
3091 ('', 'switch-parent', None, _('diff against the second parent'))
3092 ('', 'switch-parent', None, _('diff against the second parent'))
3092 ] + diffopts,
3093 ] + diffopts,
3093 _('hg export [OPTION]... [-o OUTFILESPEC] REV...')),
3094 _('hg export [OPTION]... [-o OUTFILESPEC] REV...')),
3094 "grep":
3095 "grep":
3095 (grep,
3096 (grep,
3096 [('0', 'print0', None, _('end fields with NUL')),
3097 [('0', 'print0', None, _('end fields with NUL')),
3097 ('', 'all', None, _('print all revisions that match')),
3098 ('', 'all', None, _('print all revisions that match')),
3098 ('f', 'follow', None,
3099 ('f', 'follow', None,
3099 _('follow changeset history, or file history across copies and renames')),
3100 _('follow changeset history, or file history across copies and renames')),
3100 ('i', 'ignore-case', None, _('ignore case when matching')),
3101 ('i', 'ignore-case', None, _('ignore case when matching')),
3101 ('l', 'files-with-matches', None,
3102 ('l', 'files-with-matches', None,
3102 _('print only filenames and revs that match')),
3103 _('print only filenames and revs that match')),
3103 ('n', 'line-number', None, _('print matching line numbers')),
3104 ('n', 'line-number', None, _('print matching line numbers')),
3104 ('r', 'rev', [], _('search in given revision range')),
3105 ('r', 'rev', [], _('search in given revision range')),
3105 ('u', 'user', None, _('list the author (long with -v)')),
3106 ('u', 'user', None, _('list the author (long with -v)')),
3106 ('d', 'date', None, _('list the date (short with -q)')),
3107 ('d', 'date', None, _('list the date (short with -q)')),
3107 ] + walkopts,
3108 ] + walkopts,
3108 _('hg grep [OPTION]... PATTERN [FILE]...')),
3109 _('hg grep [OPTION]... PATTERN [FILE]...')),
3109 "heads":
3110 "heads":
3110 (heads,
3111 (heads,
3111 [('r', 'rev', '', _('show only heads which are descendants of rev')),
3112 [('r', 'rev', '', _('show only heads which are descendants of rev')),
3112 ] + templateopts,
3113 ] + templateopts,
3113 _('hg heads [-r REV] [REV]...')),
3114 _('hg heads [-r REV] [REV]...')),
3114 "help": (help_, [], _('hg help [COMMAND]')),
3115 "help": (help_, [], _('hg help [COMMAND]')),
3115 "identify|id":
3116 "identify|id":
3116 (identify,
3117 (identify,
3117 [('r', 'rev', '', _('identify the specified rev')),
3118 [('r', 'rev', '', _('identify the specified rev')),
3118 ('n', 'num', None, _('show local revision number')),
3119 ('n', 'num', None, _('show local revision number')),
3119 ('i', 'id', None, _('show global revision id')),
3120 ('i', 'id', None, _('show global revision id')),
3120 ('b', 'branch', None, _('show branch')),
3121 ('b', 'branch', None, _('show branch')),
3121 ('t', 'tags', None, _('show tags'))],
3122 ('t', 'tags', None, _('show tags'))],
3122 _('hg identify [-nibt] [-r REV] [SOURCE]')),
3123 _('hg identify [-nibt] [-r REV] [SOURCE]')),
3123 "import|patch":
3124 "import|patch":
3124 (import_,
3125 (import_,
3125 [('p', 'strip', 1,
3126 [('p', 'strip', 1,
3126 _('directory strip option for patch. This has the same\n'
3127 _('directory strip option for patch. This has the same\n'
3127 'meaning as the corresponding patch option')),
3128 'meaning as the corresponding patch option')),
3128 ('b', 'base', '', _('base path')),
3129 ('b', 'base', '', _('base path')),
3129 ('f', 'force', None,
3130 ('f', 'force', None,
3130 _('skip check for outstanding uncommitted changes')),
3131 _('skip check for outstanding uncommitted changes')),
3131 ('', 'no-commit', None, _("don't commit, just update the working directory")),
3132 ('', 'no-commit', None, _("don't commit, just update the working directory")),
3132 ('', 'exact', None,
3133 ('', 'exact', None,
3133 _('apply patch to the nodes from which it was generated')),
3134 _('apply patch to the nodes from which it was generated')),
3134 ('', 'import-branch', None,
3135 ('', 'import-branch', None,
3135 _('Use any branch information in patch (implied by --exact)'))] +
3136 _('Use any branch information in patch (implied by --exact)'))] +
3136 commitopts + commitopts2,
3137 commitopts + commitopts2,
3137 _('hg import [OPTION]... PATCH...')),
3138 _('hg import [OPTION]... PATCH...')),
3138 "incoming|in":
3139 "incoming|in":
3139 (incoming,
3140 (incoming,
3140 [('f', 'force', None,
3141 [('f', 'force', None,
3141 _('run even when remote repository is unrelated')),
3142 _('run even when remote repository is unrelated')),
3142 ('n', 'newest-first', None, _('show newest record first')),
3143 ('n', 'newest-first', None, _('show newest record first')),
3143 ('', 'bundle', '', _('file to store the bundles into')),
3144 ('', 'bundle', '', _('file to store the bundles into')),
3144 ('r', 'rev', [],
3145 ('r', 'rev', [],
3145 _('a specific revision up to which you would like to pull')),
3146 _('a specific revision up to which you would like to pull')),
3146 ] + logopts + remoteopts,
3147 ] + logopts + remoteopts,
3147 _('hg incoming [-p] [-n] [-M] [-f] [-r REV]...'
3148 _('hg incoming [-p] [-n] [-M] [-f] [-r REV]...'
3148 ' [--bundle FILENAME] [SOURCE]')),
3149 ' [--bundle FILENAME] [SOURCE]')),
3149 "^init":
3150 "^init":
3150 (init,
3151 (init,
3151 remoteopts,
3152 remoteopts,
3152 _('hg init [-e CMD] [--remotecmd CMD] [DEST]')),
3153 _('hg init [-e CMD] [--remotecmd CMD] [DEST]')),
3153 "locate":
3154 "locate":
3154 (locate,
3155 (locate,
3155 [('r', 'rev', '', _('search the repository as it stood at rev')),
3156 [('r', 'rev', '', _('search the repository as it stood at rev')),
3156 ('0', 'print0', None,
3157 ('0', 'print0', None,
3157 _('end filenames with NUL, for use with xargs')),
3158 _('end filenames with NUL, for use with xargs')),
3158 ('f', 'fullpath', None,
3159 ('f', 'fullpath', None,
3159 _('print complete paths from the filesystem root')),
3160 _('print complete paths from the filesystem root')),
3160 ] + walkopts,
3161 ] + walkopts,
3161 _('hg locate [OPTION]... [PATTERN]...')),
3162 _('hg locate [OPTION]... [PATTERN]...')),
3162 "^log|history":
3163 "^log|history":
3163 (log,
3164 (log,
3164 [('f', 'follow', None,
3165 [('f', 'follow', None,
3165 _('follow changeset history, or file history across copies and renames')),
3166 _('follow changeset history, or file history across copies and renames')),
3166 ('', 'follow-first', None,
3167 ('', 'follow-first', None,
3167 _('only follow the first parent of merge changesets')),
3168 _('only follow the first parent of merge changesets')),
3168 ('d', 'date', '', _('show revs matching date spec')),
3169 ('d', 'date', '', _('show revs matching date spec')),
3169 ('C', 'copies', None, _('show copied files')),
3170 ('C', 'copies', None, _('show copied files')),
3170 ('k', 'keyword', [], _('do case-insensitive search for a keyword')),
3171 ('k', 'keyword', [], _('do case-insensitive search for a keyword')),
3171 ('r', 'rev', [], _('show the specified revision or range')),
3172 ('r', 'rev', [], _('show the specified revision or range')),
3172 ('', 'removed', None, _('include revs where files were removed')),
3173 ('', 'removed', None, _('include revs where files were removed')),
3173 ('m', 'only-merges', None, _('show only merges')),
3174 ('m', 'only-merges', None, _('show only merges')),
3174 ('b', 'only-branch', [],
3175 ('b', 'only-branch', [],
3175 _('show only changesets within the given named branch')),
3176 _('show only changesets within the given named branch')),
3176 ('P', 'prune', [], _('do not display revision or any of its ancestors')),
3177 ('P', 'prune', [], _('do not display revision or any of its ancestors')),
3177 ] + logopts + walkopts,
3178 ] + logopts + walkopts,
3178 _('hg log [OPTION]... [FILE]')),
3179 _('hg log [OPTION]... [FILE]')),
3179 "manifest":
3180 "manifest":
3180 (manifest,
3181 (manifest,
3181 [('r', 'rev', '', _('revision to display'))],
3182 [('r', 'rev', '', _('revision to display'))],
3182 _('hg manifest [-r REV]')),
3183 _('hg manifest [-r REV]')),
3183 "^merge":
3184 "^merge":
3184 (merge,
3185 (merge,
3185 [('f', 'force', None, _('force a merge with outstanding changes')),
3186 [('f', 'force', None, _('force a merge with outstanding changes')),
3186 ('r', 'rev', '', _('revision to merge')),
3187 ('r', 'rev', '', _('revision to merge')),
3187 ],
3188 ],
3188 _('hg merge [-f] [[-r] REV]')),
3189 _('hg merge [-f] [[-r] REV]')),
3189 "outgoing|out":
3190 "outgoing|out":
3190 (outgoing,
3191 (outgoing,
3191 [('f', 'force', None,
3192 [('f', 'force', None,
3192 _('run even when remote repository is unrelated')),
3193 _('run even when remote repository is unrelated')),
3193 ('r', 'rev', [],
3194 ('r', 'rev', [],
3194 _('a specific revision up to which you would like to push')),
3195 _('a specific revision up to which you would like to push')),
3195 ('n', 'newest-first', None, _('show newest record first')),
3196 ('n', 'newest-first', None, _('show newest record first')),
3196 ] + logopts + remoteopts,
3197 ] + logopts + remoteopts,
3197 _('hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
3198 _('hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
3198 "^parents":
3199 "^parents":
3199 (parents,
3200 (parents,
3200 [('r', 'rev', '', _('show parents from the specified rev')),
3201 [('r', 'rev', '', _('show parents from the specified rev')),
3201 ] + templateopts,
3202 ] + templateopts,
3202 _('hg parents [-r REV] [FILE]')),
3203 _('hg parents [-r REV] [FILE]')),
3203 "paths": (paths, [], _('hg paths [NAME]')),
3204 "paths": (paths, [], _('hg paths [NAME]')),
3204 "^pull":
3205 "^pull":
3205 (pull,
3206 (pull,
3206 [('u', 'update', None,
3207 [('u', 'update', None,
3207 _('update to new tip if changesets were pulled')),
3208 _('update to new tip if changesets were pulled')),
3208 ('f', 'force', None,
3209 ('f', 'force', None,
3209 _('run even when remote repository is unrelated')),
3210 _('run even when remote repository is unrelated')),
3210 ('r', 'rev', [],
3211 ('r', 'rev', [],
3211 _('a specific revision up to which you would like to pull')),
3212 _('a specific revision up to which you would like to pull')),
3212 ] + remoteopts,
3213 ] + remoteopts,
3213 _('hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
3214 _('hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
3214 "^push":
3215 "^push":
3215 (push,
3216 (push,
3216 [('f', 'force', None, _('force push')),
3217 [('f', 'force', None, _('force push')),
3217 ('r', 'rev', [],
3218 ('r', 'rev', [],
3218 _('a specific revision up to which you would like to push')),
3219 _('a specific revision up to which you would like to push')),
3219 ] + remoteopts,
3220 ] + remoteopts,
3220 _('hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
3221 _('hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
3221 "recover": (recover, [], _('hg recover')),
3222 "recover": (recover, [], _('hg recover')),
3222 "^remove|rm":
3223 "^remove|rm":
3223 (remove,
3224 (remove,
3224 [('A', 'after', None, _('record delete for missing files')),
3225 [('A', 'after', None, _('record delete for missing files')),
3225 ('f', 'force', None,
3226 ('f', 'force', None,
3226 _('remove (and delete) file even if added or modified')),
3227 _('remove (and delete) file even if added or modified')),
3227 ] + walkopts,
3228 ] + walkopts,
3228 _('hg remove [OPTION]... FILE...')),
3229 _('hg remove [OPTION]... FILE...')),
3229 "rename|mv":
3230 "rename|mv":
3230 (rename,
3231 (rename,
3231 [('A', 'after', None, _('record a rename that has already occurred')),
3232 [('A', 'after', None, _('record a rename that has already occurred')),
3232 ('f', 'force', None,
3233 ('f', 'force', None,
3233 _('forcibly copy over an existing managed file')),
3234 _('forcibly copy over an existing managed file')),
3234 ] + walkopts + dryrunopts,
3235 ] + walkopts + dryrunopts,
3235 _('hg rename [OPTION]... SOURCE... DEST')),
3236 _('hg rename [OPTION]... SOURCE... DEST')),
3236 "resolve":
3237 "resolve":
3237 (resolve,
3238 (resolve,
3238 [('l', 'list', None, _('list state of files needing merge')),
3239 [('l', 'list', None, _('list state of files needing merge')),
3239 ('m', 'mark', None, _('mark files as resolved')),
3240 ('m', 'mark', None, _('mark files as resolved')),
3240 ('u', 'unmark', None, _('unmark files as resolved'))],
3241 ('u', 'unmark', None, _('unmark files as resolved'))],
3241 _('hg resolve [OPTION] [FILES...]')),
3242 _('hg resolve [OPTION] [FILES...]')),
3242 "revert":
3243 "revert":
3243 (revert,
3244 (revert,
3244 [('a', 'all', None, _('revert all changes when no arguments given')),
3245 [('a', 'all', None, _('revert all changes when no arguments given')),
3245 ('d', 'date', '', _('tipmost revision matching date')),
3246 ('d', 'date', '', _('tipmost revision matching date')),
3246 ('r', 'rev', '', _('revision to revert to')),
3247 ('r', 'rev', '', _('revision to revert to')),
3247 ('', 'no-backup', None, _('do not save backup copies of files')),
3248 ('', 'no-backup', None, _('do not save backup copies of files')),
3248 ] + walkopts + dryrunopts,
3249 ] + walkopts + dryrunopts,
3249 _('hg revert [OPTION]... [-r REV] [NAME]...')),
3250 _('hg revert [OPTION]... [-r REV] [NAME]...')),
3250 "rollback": (rollback, [], _('hg rollback')),
3251 "rollback": (rollback, [], _('hg rollback')),
3251 "root": (root, [], _('hg root')),
3252 "root": (root, [], _('hg root')),
3252 "^serve":
3253 "^serve":
3253 (serve,
3254 (serve,
3254 [('A', 'accesslog', '', _('name of access log file to write to')),
3255 [('A', 'accesslog', '', _('name of access log file to write to')),
3255 ('d', 'daemon', None, _('run server in background')),
3256 ('d', 'daemon', None, _('run server in background')),
3256 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
3257 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
3257 ('E', 'errorlog', '', _('name of error log file to write to')),
3258 ('E', 'errorlog', '', _('name of error log file to write to')),
3258 ('p', 'port', 0, _('port to listen on (default: 8000)')),
3259 ('p', 'port', 0, _('port to listen on (default: 8000)')),
3259 ('a', 'address', '', _('address to listen on (default: all interfaces)')),
3260 ('a', 'address', '', _('address to listen on (default: all interfaces)')),
3260 ('', 'prefix', '', _('prefix path to serve from (default: server root)')),
3261 ('', 'prefix', '', _('prefix path to serve from (default: server root)')),
3261 ('n', 'name', '',
3262 ('n', 'name', '',
3262 _('name to show in web pages (default: working dir)')),
3263 _('name to show in web pages (default: working dir)')),
3263 ('', 'webdir-conf', '', _('name of the webdir config file'
3264 ('', 'webdir-conf', '', _('name of the webdir config file'
3264 ' (serve more than one repo)')),
3265 ' (serve more than one repo)')),
3265 ('', 'pid-file', '', _('name of file to write process ID to')),
3266 ('', 'pid-file', '', _('name of file to write process ID to')),
3266 ('', 'stdio', None, _('for remote clients')),
3267 ('', 'stdio', None, _('for remote clients')),
3267 ('t', 'templates', '', _('web templates to use')),
3268 ('t', 'templates', '', _('web templates to use')),
3268 ('', 'style', '', _('template style to use')),
3269 ('', 'style', '', _('template style to use')),
3269 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
3270 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
3270 ('', 'certificate', '', _('SSL certificate file'))],
3271 ('', 'certificate', '', _('SSL certificate file'))],
3271 _('hg serve [OPTION]...')),
3272 _('hg serve [OPTION]...')),
3272 "showconfig|debugconfig":
3273 "showconfig|debugconfig":
3273 (showconfig,
3274 (showconfig,
3274 [('u', 'untrusted', None, _('show untrusted configuration options'))],
3275 [('u', 'untrusted', None, _('show untrusted configuration options'))],
3275 _('hg showconfig [-u] [NAME]...')),
3276 _('hg showconfig [-u] [NAME]...')),
3276 "^status|st":
3277 "^status|st":
3277 (status,
3278 (status,
3278 [('A', 'all', None, _('show status of all files')),
3279 [('A', 'all', None, _('show status of all files')),
3279 ('m', 'modified', None, _('show only modified files')),
3280 ('m', 'modified', None, _('show only modified files')),
3280 ('a', 'added', None, _('show only added files')),
3281 ('a', 'added', None, _('show only added files')),
3281 ('r', 'removed', None, _('show only removed files')),
3282 ('r', 'removed', None, _('show only removed files')),
3282 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
3283 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
3283 ('c', 'clean', None, _('show only files without changes')),
3284 ('c', 'clean', None, _('show only files without changes')),
3284 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
3285 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
3285 ('i', 'ignored', None, _('show only ignored files')),
3286 ('i', 'ignored', None, _('show only ignored files')),
3286 ('n', 'no-status', None, _('hide status prefix')),
3287 ('n', 'no-status', None, _('hide status prefix')),
3287 ('C', 'copies', None, _('show source of copied files')),
3288 ('C', 'copies', None, _('show source of copied files')),
3288 ('0', 'print0', None,
3289 ('0', 'print0', None,
3289 _('end filenames with NUL, for use with xargs')),
3290 _('end filenames with NUL, for use with xargs')),
3290 ('', 'rev', [], _('show difference from revision')),
3291 ('', 'rev', [], _('show difference from revision')),
3291 ] + walkopts,
3292 ] + walkopts,
3292 _('hg status [OPTION]... [FILE]...')),
3293 _('hg status [OPTION]... [FILE]...')),
3293 "tag":
3294 "tag":
3294 (tag,
3295 (tag,
3295 [('f', 'force', None, _('replace existing tag')),
3296 [('f', 'force', None, _('replace existing tag')),
3296 ('l', 'local', None, _('make the tag local')),
3297 ('l', 'local', None, _('make the tag local')),
3297 ('r', 'rev', '', _('revision to tag')),
3298 ('r', 'rev', '', _('revision to tag')),
3298 ('', 'remove', None, _('remove a tag')),
3299 ('', 'remove', None, _('remove a tag')),
3299 # -l/--local is already there, commitopts cannot be used
3300 # -l/--local is already there, commitopts cannot be used
3300 ('m', 'message', '', _('use <text> as commit message')),
3301 ('m', 'message', '', _('use <text> as commit message')),
3301 ] + commitopts2,
3302 ] + commitopts2,
3302 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
3303 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
3303 "tags": (tags, [], _('hg tags')),
3304 "tags": (tags, [], _('hg tags')),
3304 "tip":
3305 "tip":
3305 (tip,
3306 (tip,
3306 [('p', 'patch', None, _('show patch')),
3307 [('p', 'patch', None, _('show patch')),
3307 ] + templateopts,
3308 ] + templateopts,
3308 _('hg tip [-p]')),
3309 _('hg tip [-p]')),
3309 "unbundle":
3310 "unbundle":
3310 (unbundle,
3311 (unbundle,
3311 [('u', 'update', None,
3312 [('u', 'update', None,
3312 _('update to new tip if changesets were unbundled'))],
3313 _('update to new tip if changesets were unbundled'))],
3313 _('hg unbundle [-u] FILE...')),
3314 _('hg unbundle [-u] FILE...')),
3314 "^update|up|checkout|co":
3315 "^update|up|checkout|co":
3315 (update,
3316 (update,
3316 [('C', 'clean', None, _('overwrite locally modified files (no backup)')),
3317 [('C', 'clean', None, _('overwrite locally modified files (no backup)')),
3317 ('d', 'date', '', _('tipmost revision matching date')),
3318 ('d', 'date', '', _('tipmost revision matching date')),
3318 ('r', 'rev', '', _('revision'))],
3319 ('r', 'rev', '', _('revision'))],
3319 _('hg update [-C] [-d DATE] [[-r] REV]')),
3320 _('hg update [-C] [-d DATE] [[-r] REV]')),
3320 "verify": (verify, [], _('hg verify')),
3321 "verify": (verify, [], _('hg verify')),
3321 "version": (version_, [], _('hg version')),
3322 "version": (version_, [], _('hg version')),
3322 }
3323 }
3323
3324
3324 norepo = ("clone init version help debugcomplete debugdata"
3325 norepo = ("clone init version help debugcomplete debugdata"
3325 " debugindex debugindexdot debugdate debuginstall debugfsinfo")
3326 " debugindex debugindexdot debugdate debuginstall debugfsinfo")
3326 optionalrepo = ("identify paths serve showconfig debugancestor")
3327 optionalrepo = ("identify paths serve showconfig debugancestor")
@@ -1,444 +1,444 b''
1 /*
1 /*
2 mpatch.c - efficient binary patching for Mercurial
2 mpatch.c - efficient binary patching for Mercurial
3
3
4 This implements a patch algorithm that's O(m + nlog n) where m is the
4 This implements a patch algorithm that's O(m + nlog n) where m is the
5 size of the output and n is the number of patches.
5 size of the output and n is the number of patches.
6
6
7 Given a list of binary patches, it unpacks each into a hunk list,
7 Given a list of binary patches, it unpacks each into a hunk list,
8 then combines the hunk lists with a treewise recursion to form a
8 then combines the hunk lists with a treewise recursion to form a
9 single hunk list. This hunk list is then applied to the original
9 single hunk list. This hunk list is then applied to the original
10 text.
10 text.
11
11
12 The text (or binary) fragments are copied directly from their source
12 The text (or binary) fragments are copied directly from their source
13 Python objects into a preallocated output string to avoid the
13 Python objects into a preallocated output string to avoid the
14 allocation of intermediate Python objects. Working memory is about 2x
14 allocation of intermediate Python objects. Working memory is about 2x
15 the total number of hunks.
15 the total number of hunks.
16
16
17 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
17 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
18
18
19 This software may be used and distributed according to the terms
19 This software may be used and distributed according to the terms
20 of the GNU General Public License, incorporated herein by reference.
20 of the GNU General Public License, incorporated herein by reference.
21 */
21 */
22
22
23 #include <Python.h>
23 #include <Python.h>
24 #include <stdlib.h>
24 #include <stdlib.h>
25 #include <string.h>
25 #include <string.h>
26
26
27 /* Definitions to get compatibility with python 2.4 and earlier which
27 /* Definitions to get compatibility with python 2.4 and earlier which
28 does not have Py_ssize_t. See also PEP 353.
28 does not have Py_ssize_t. See also PEP 353.
29 Note: msvc (8 or earlier) does not have ssize_t, so we use Py_ssize_t.
29 Note: msvc (8 or earlier) does not have ssize_t, so we use Py_ssize_t.
30 */
30 */
31 #if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
31 #if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
32 typedef int Py_ssize_t;
32 typedef int Py_ssize_t;
33 #define PY_SSIZE_T_MAX INT_MAX
33 #define PY_SSIZE_T_MAX INT_MAX
34 #define PY_SSIZE_T_MIN INT_MIN
34 #define PY_SSIZE_T_MIN INT_MIN
35 #endif
35 #endif
36
36
37 #ifdef _WIN32
37 #ifdef _WIN32
38 # ifdef _MSC_VER
38 # ifdef _MSC_VER
39 /* msvc 6.0 has problems */
39 /* msvc 6.0 has problems */
40 # define inline __inline
40 # define inline __inline
41 typedef unsigned long uint32_t;
41 typedef unsigned long uint32_t;
42 # else
42 # else
43 # include <stdint.h>
43 # include <stdint.h>
44 # endif
44 # endif
45 static uint32_t ntohl(uint32_t x)
45 static uint32_t ntohl(uint32_t x)
46 {
46 {
47 return ((x & 0x000000ffUL) << 24) |
47 return ((x & 0x000000ffUL) << 24) |
48 ((x & 0x0000ff00UL) << 8) |
48 ((x & 0x0000ff00UL) << 8) |
49 ((x & 0x00ff0000UL) >> 8) |
49 ((x & 0x00ff0000UL) >> 8) |
50 ((x & 0xff000000UL) >> 24);
50 ((x & 0xff000000UL) >> 24);
51 }
51 }
52 #else
52 #else
53 /* not windows */
53 /* not windows */
54 # include <sys/types.h>
54 # include <sys/types.h>
55 # ifdef __BEOS__
55 # if defined __BEOS__ && !defined __HAIKU__
56 # include <ByteOrder.h>
56 # include <ByteOrder.h>
57 # else
57 # else
58 # include <arpa/inet.h>
58 # include <arpa/inet.h>
59 # endif
59 # endif
60 # include <inttypes.h>
60 # include <inttypes.h>
61 #endif
61 #endif
62
62
63 static char mpatch_doc[] = "Efficient binary patching.";
63 static char mpatch_doc[] = "Efficient binary patching.";
64 static PyObject *mpatch_Error;
64 static PyObject *mpatch_Error;
65
65
66 struct frag {
66 struct frag {
67 int start, end, len;
67 int start, end, len;
68 const char *data;
68 const char *data;
69 };
69 };
70
70
71 struct flist {
71 struct flist {
72 struct frag *base, *head, *tail;
72 struct frag *base, *head, *tail;
73 };
73 };
74
74
75 static struct flist *lalloc(int size)
75 static struct flist *lalloc(int size)
76 {
76 {
77 struct flist *a = NULL;
77 struct flist *a = NULL;
78
78
79 if (size < 1)
79 if (size < 1)
80 size = 1;
80 size = 1;
81
81
82 a = (struct flist *)malloc(sizeof(struct flist));
82 a = (struct flist *)malloc(sizeof(struct flist));
83 if (a) {
83 if (a) {
84 a->base = (struct frag *)malloc(sizeof(struct frag) * size);
84 a->base = (struct frag *)malloc(sizeof(struct frag) * size);
85 if (a->base) {
85 if (a->base) {
86 a->head = a->tail = a->base;
86 a->head = a->tail = a->base;
87 return a;
87 return a;
88 }
88 }
89 free(a);
89 free(a);
90 a = NULL;
90 a = NULL;
91 }
91 }
92 if (!PyErr_Occurred())
92 if (!PyErr_Occurred())
93 PyErr_NoMemory();
93 PyErr_NoMemory();
94 return NULL;
94 return NULL;
95 }
95 }
96
96
97 static void lfree(struct flist *a)
97 static void lfree(struct flist *a)
98 {
98 {
99 if (a) {
99 if (a) {
100 free(a->base);
100 free(a->base);
101 free(a);
101 free(a);
102 }
102 }
103 }
103 }
104
104
105 static int lsize(struct flist *a)
105 static int lsize(struct flist *a)
106 {
106 {
107 return a->tail - a->head;
107 return a->tail - a->head;
108 }
108 }
109
109
110 /* move hunks in source that are less cut to dest, compensating
110 /* move hunks in source that are less cut to dest, compensating
111 for changes in offset. the last hunk may be split if necessary.
111 for changes in offset. the last hunk may be split if necessary.
112 */
112 */
113 static int gather(struct flist *dest, struct flist *src, int cut, int offset)
113 static int gather(struct flist *dest, struct flist *src, int cut, int offset)
114 {
114 {
115 struct frag *d = dest->tail, *s = src->head;
115 struct frag *d = dest->tail, *s = src->head;
116 int postend, c, l;
116 int postend, c, l;
117
117
118 while (s != src->tail) {
118 while (s != src->tail) {
119 if (s->start + offset >= cut)
119 if (s->start + offset >= cut)
120 break; /* we've gone far enough */
120 break; /* we've gone far enough */
121
121
122 postend = offset + s->start + s->len;
122 postend = offset + s->start + s->len;
123 if (postend <= cut) {
123 if (postend <= cut) {
124 /* save this hunk */
124 /* save this hunk */
125 offset += s->start + s->len - s->end;
125 offset += s->start + s->len - s->end;
126 *d++ = *s++;
126 *d++ = *s++;
127 }
127 }
128 else {
128 else {
129 /* break up this hunk */
129 /* break up this hunk */
130 c = cut - offset;
130 c = cut - offset;
131 if (s->end < c)
131 if (s->end < c)
132 c = s->end;
132 c = s->end;
133 l = cut - offset - s->start;
133 l = cut - offset - s->start;
134 if (s->len < l)
134 if (s->len < l)
135 l = s->len;
135 l = s->len;
136
136
137 offset += s->start + l - c;
137 offset += s->start + l - c;
138
138
139 d->start = s->start;
139 d->start = s->start;
140 d->end = c;
140 d->end = c;
141 d->len = l;
141 d->len = l;
142 d->data = s->data;
142 d->data = s->data;
143 d++;
143 d++;
144 s->start = c;
144 s->start = c;
145 s->len = s->len - l;
145 s->len = s->len - l;
146 s->data = s->data + l;
146 s->data = s->data + l;
147
147
148 break;
148 break;
149 }
149 }
150 }
150 }
151
151
152 dest->tail = d;
152 dest->tail = d;
153 src->head = s;
153 src->head = s;
154 return offset;
154 return offset;
155 }
155 }
156
156
157 /* like gather, but with no output list */
157 /* like gather, but with no output list */
158 static int discard(struct flist *src, int cut, int offset)
158 static int discard(struct flist *src, int cut, int offset)
159 {
159 {
160 struct frag *s = src->head;
160 struct frag *s = src->head;
161 int postend, c, l;
161 int postend, c, l;
162
162
163 while (s != src->tail) {
163 while (s != src->tail) {
164 if (s->start + offset >= cut)
164 if (s->start + offset >= cut)
165 break;
165 break;
166
166
167 postend = offset + s->start + s->len;
167 postend = offset + s->start + s->len;
168 if (postend <= cut) {
168 if (postend <= cut) {
169 offset += s->start + s->len - s->end;
169 offset += s->start + s->len - s->end;
170 s++;
170 s++;
171 }
171 }
172 else {
172 else {
173 c = cut - offset;
173 c = cut - offset;
174 if (s->end < c)
174 if (s->end < c)
175 c = s->end;
175 c = s->end;
176 l = cut - offset - s->start;
176 l = cut - offset - s->start;
177 if (s->len < l)
177 if (s->len < l)
178 l = s->len;
178 l = s->len;
179
179
180 offset += s->start + l - c;
180 offset += s->start + l - c;
181 s->start = c;
181 s->start = c;
182 s->len = s->len - l;
182 s->len = s->len - l;
183 s->data = s->data + l;
183 s->data = s->data + l;
184
184
185 break;
185 break;
186 }
186 }
187 }
187 }
188
188
189 src->head = s;
189 src->head = s;
190 return offset;
190 return offset;
191 }
191 }
192
192
193 /* combine hunk lists a and b, while adjusting b for offset changes in a/
193 /* combine hunk lists a and b, while adjusting b for offset changes in a/
194 this deletes a and b and returns the resultant list. */
194 this deletes a and b and returns the resultant list. */
195 static struct flist *combine(struct flist *a, struct flist *b)
195 static struct flist *combine(struct flist *a, struct flist *b)
196 {
196 {
197 struct flist *c = NULL;
197 struct flist *c = NULL;
198 struct frag *bh, *ct;
198 struct frag *bh, *ct;
199 int offset = 0, post;
199 int offset = 0, post;
200
200
201 if (a && b)
201 if (a && b)
202 c = lalloc((lsize(a) + lsize(b)) * 2);
202 c = lalloc((lsize(a) + lsize(b)) * 2);
203
203
204 if (c) {
204 if (c) {
205
205
206 for (bh = b->head; bh != b->tail; bh++) {
206 for (bh = b->head; bh != b->tail; bh++) {
207 /* save old hunks */
207 /* save old hunks */
208 offset = gather(c, a, bh->start, offset);
208 offset = gather(c, a, bh->start, offset);
209
209
210 /* discard replaced hunks */
210 /* discard replaced hunks */
211 post = discard(a, bh->end, offset);
211 post = discard(a, bh->end, offset);
212
212
213 /* insert new hunk */
213 /* insert new hunk */
214 ct = c->tail;
214 ct = c->tail;
215 ct->start = bh->start - offset;
215 ct->start = bh->start - offset;
216 ct->end = bh->end - post;
216 ct->end = bh->end - post;
217 ct->len = bh->len;
217 ct->len = bh->len;
218 ct->data = bh->data;
218 ct->data = bh->data;
219 c->tail++;
219 c->tail++;
220 offset = post;
220 offset = post;
221 }
221 }
222
222
223 /* hold on to tail from a */
223 /* hold on to tail from a */
224 memcpy(c->tail, a->head, sizeof(struct frag) * lsize(a));
224 memcpy(c->tail, a->head, sizeof(struct frag) * lsize(a));
225 c->tail += lsize(a);
225 c->tail += lsize(a);
226 }
226 }
227
227
228 lfree(a);
228 lfree(a);
229 lfree(b);
229 lfree(b);
230 return c;
230 return c;
231 }
231 }
232
232
233 /* decode a binary patch into a hunk list */
233 /* decode a binary patch into a hunk list */
234 static struct flist *decode(const char *bin, int len)
234 static struct flist *decode(const char *bin, int len)
235 {
235 {
236 struct flist *l;
236 struct flist *l;
237 struct frag *lt;
237 struct frag *lt;
238 const char *data = bin + 12, *end = bin + len;
238 const char *data = bin + 12, *end = bin + len;
239 char decode[12]; /* for dealing with alignment issues */
239 char decode[12]; /* for dealing with alignment issues */
240
240
241 /* assume worst case size, we won't have many of these lists */
241 /* assume worst case size, we won't have many of these lists */
242 l = lalloc(len / 12);
242 l = lalloc(len / 12);
243 if (!l)
243 if (!l)
244 return NULL;
244 return NULL;
245
245
246 lt = l->tail;
246 lt = l->tail;
247
247
248 while (data <= end) {
248 while (data <= end) {
249 memcpy(decode, bin, 12);
249 memcpy(decode, bin, 12);
250 lt->start = ntohl(*(uint32_t *)decode);
250 lt->start = ntohl(*(uint32_t *)decode);
251 lt->end = ntohl(*(uint32_t *)(decode + 4));
251 lt->end = ntohl(*(uint32_t *)(decode + 4));
252 lt->len = ntohl(*(uint32_t *)(decode + 8));
252 lt->len = ntohl(*(uint32_t *)(decode + 8));
253 if (lt->start > lt->end)
253 if (lt->start > lt->end)
254 break; /* sanity check */
254 break; /* sanity check */
255 bin = data + lt->len;
255 bin = data + lt->len;
256 if (bin < data)
256 if (bin < data)
257 break; /* big data + big (bogus) len can wrap around */
257 break; /* big data + big (bogus) len can wrap around */
258 lt->data = data;
258 lt->data = data;
259 data = bin + 12;
259 data = bin + 12;
260 lt++;
260 lt++;
261 }
261 }
262
262
263 if (bin != end) {
263 if (bin != end) {
264 if (!PyErr_Occurred())
264 if (!PyErr_Occurred())
265 PyErr_SetString(mpatch_Error, "patch cannot be decoded");
265 PyErr_SetString(mpatch_Error, "patch cannot be decoded");
266 lfree(l);
266 lfree(l);
267 return NULL;
267 return NULL;
268 }
268 }
269
269
270 l->tail = lt;
270 l->tail = lt;
271 return l;
271 return l;
272 }
272 }
273
273
274 /* calculate the size of resultant text */
274 /* calculate the size of resultant text */
275 static int calcsize(int len, struct flist *l)
275 static int calcsize(int len, struct flist *l)
276 {
276 {
277 int outlen = 0, last = 0;
277 int outlen = 0, last = 0;
278 struct frag *f = l->head;
278 struct frag *f = l->head;
279
279
280 while (f != l->tail) {
280 while (f != l->tail) {
281 if (f->start < last || f->end > len) {
281 if (f->start < last || f->end > len) {
282 if (!PyErr_Occurred())
282 if (!PyErr_Occurred())
283 PyErr_SetString(mpatch_Error,
283 PyErr_SetString(mpatch_Error,
284 "invalid patch");
284 "invalid patch");
285 return -1;
285 return -1;
286 }
286 }
287 outlen += f->start - last;
287 outlen += f->start - last;
288 last = f->end;
288 last = f->end;
289 outlen += f->len;
289 outlen += f->len;
290 f++;
290 f++;
291 }
291 }
292
292
293 outlen += len - last;
293 outlen += len - last;
294 return outlen;
294 return outlen;
295 }
295 }
296
296
297 static int apply(char *buf, const char *orig, int len, struct flist *l)
297 static int apply(char *buf, const char *orig, int len, struct flist *l)
298 {
298 {
299 struct frag *f = l->head;
299 struct frag *f = l->head;
300 int last = 0;
300 int last = 0;
301 char *p = buf;
301 char *p = buf;
302
302
303 while (f != l->tail) {
303 while (f != l->tail) {
304 if (f->start < last || f->end > len) {
304 if (f->start < last || f->end > len) {
305 if (!PyErr_Occurred())
305 if (!PyErr_Occurred())
306 PyErr_SetString(mpatch_Error,
306 PyErr_SetString(mpatch_Error,
307 "invalid patch");
307 "invalid patch");
308 return 0;
308 return 0;
309 }
309 }
310 memcpy(p, orig + last, f->start - last);
310 memcpy(p, orig + last, f->start - last);
311 p += f->start - last;
311 p += f->start - last;
312 memcpy(p, f->data, f->len);
312 memcpy(p, f->data, f->len);
313 last = f->end;
313 last = f->end;
314 p += f->len;
314 p += f->len;
315 f++;
315 f++;
316 }
316 }
317 memcpy(p, orig + last, len - last);
317 memcpy(p, orig + last, len - last);
318 return 1;
318 return 1;
319 }
319 }
320
320
321 /* recursively generate a patch of all bins between start and end */
321 /* recursively generate a patch of all bins between start and end */
322 static struct flist *fold(PyObject *bins, int start, int end)
322 static struct flist *fold(PyObject *bins, int start, int end)
323 {
323 {
324 int len;
324 int len;
325 Py_ssize_t blen;
325 Py_ssize_t blen;
326 const char *buffer;
326 const char *buffer;
327
327
328 if (start + 1 == end) {
328 if (start + 1 == end) {
329 /* trivial case, output a decoded list */
329 /* trivial case, output a decoded list */
330 PyObject *tmp = PyList_GetItem(bins, start);
330 PyObject *tmp = PyList_GetItem(bins, start);
331 if (!tmp)
331 if (!tmp)
332 return NULL;
332 return NULL;
333 if (PyObject_AsCharBuffer(tmp, &buffer, &blen))
333 if (PyObject_AsCharBuffer(tmp, &buffer, &blen))
334 return NULL;
334 return NULL;
335 return decode(buffer, blen);
335 return decode(buffer, blen);
336 }
336 }
337
337
338 /* divide and conquer, memory management is elsewhere */
338 /* divide and conquer, memory management is elsewhere */
339 len = (end - start) / 2;
339 len = (end - start) / 2;
340 return combine(fold(bins, start, start + len),
340 return combine(fold(bins, start, start + len),
341 fold(bins, start + len, end));
341 fold(bins, start + len, end));
342 }
342 }
343
343
344 static PyObject *
344 static PyObject *
345 patches(PyObject *self, PyObject *args)
345 patches(PyObject *self, PyObject *args)
346 {
346 {
347 PyObject *text, *bins, *result;
347 PyObject *text, *bins, *result;
348 struct flist *patch;
348 struct flist *patch;
349 const char *in;
349 const char *in;
350 char *out;
350 char *out;
351 int len, outlen;
351 int len, outlen;
352 Py_ssize_t inlen;
352 Py_ssize_t inlen;
353
353
354 if (!PyArg_ParseTuple(args, "OO:mpatch", &text, &bins))
354 if (!PyArg_ParseTuple(args, "OO:mpatch", &text, &bins))
355 return NULL;
355 return NULL;
356
356
357 len = PyList_Size(bins);
357 len = PyList_Size(bins);
358 if (!len) {
358 if (!len) {
359 /* nothing to do */
359 /* nothing to do */
360 Py_INCREF(text);
360 Py_INCREF(text);
361 return text;
361 return text;
362 }
362 }
363
363
364 if (PyObject_AsCharBuffer(text, &in, &inlen))
364 if (PyObject_AsCharBuffer(text, &in, &inlen))
365 return NULL;
365 return NULL;
366
366
367 patch = fold(bins, 0, len);
367 patch = fold(bins, 0, len);
368 if (!patch)
368 if (!patch)
369 return NULL;
369 return NULL;
370
370
371 outlen = calcsize(inlen, patch);
371 outlen = calcsize(inlen, patch);
372 if (outlen < 0) {
372 if (outlen < 0) {
373 result = NULL;
373 result = NULL;
374 goto cleanup;
374 goto cleanup;
375 }
375 }
376 result = PyString_FromStringAndSize(NULL, outlen);
376 result = PyString_FromStringAndSize(NULL, outlen);
377 if (!result) {
377 if (!result) {
378 result = NULL;
378 result = NULL;
379 goto cleanup;
379 goto cleanup;
380 }
380 }
381 out = PyString_AsString(result);
381 out = PyString_AsString(result);
382 if (!apply(out, in, inlen, patch)) {
382 if (!apply(out, in, inlen, patch)) {
383 Py_DECREF(result);
383 Py_DECREF(result);
384 result = NULL;
384 result = NULL;
385 }
385 }
386 cleanup:
386 cleanup:
387 lfree(patch);
387 lfree(patch);
388 return result;
388 return result;
389 }
389 }
390
390
391 /* calculate size of a patched file directly */
391 /* calculate size of a patched file directly */
392 static PyObject *
392 static PyObject *
393 patchedsize(PyObject *self, PyObject *args)
393 patchedsize(PyObject *self, PyObject *args)
394 {
394 {
395 long orig, start, end, len, outlen = 0, last = 0;
395 long orig, start, end, len, outlen = 0, last = 0;
396 int patchlen;
396 int patchlen;
397 char *bin, *binend, *data;
397 char *bin, *binend, *data;
398 char decode[12]; /* for dealing with alignment issues */
398 char decode[12]; /* for dealing with alignment issues */
399
399
400 if (!PyArg_ParseTuple(args, "ls#", &orig, &bin, &patchlen))
400 if (!PyArg_ParseTuple(args, "ls#", &orig, &bin, &patchlen))
401 return NULL;
401 return NULL;
402
402
403 binend = bin + patchlen;
403 binend = bin + patchlen;
404 data = bin + 12;
404 data = bin + 12;
405
405
406 while (data <= binend) {
406 while (data <= binend) {
407 memcpy(decode, bin, 12);
407 memcpy(decode, bin, 12);
408 start = ntohl(*(uint32_t *)decode);
408 start = ntohl(*(uint32_t *)decode);
409 end = ntohl(*(uint32_t *)(decode + 4));
409 end = ntohl(*(uint32_t *)(decode + 4));
410 len = ntohl(*(uint32_t *)(decode + 8));
410 len = ntohl(*(uint32_t *)(decode + 8));
411 if (start > end)
411 if (start > end)
412 break; /* sanity check */
412 break; /* sanity check */
413 bin = data + len;
413 bin = data + len;
414 if (bin < data)
414 if (bin < data)
415 break; /* big data + big (bogus) len can wrap around */
415 break; /* big data + big (bogus) len can wrap around */
416 data = bin + 12;
416 data = bin + 12;
417 outlen += start - last;
417 outlen += start - last;
418 last = end;
418 last = end;
419 outlen += len;
419 outlen += len;
420 }
420 }
421
421
422 if (bin != binend) {
422 if (bin != binend) {
423 if (!PyErr_Occurred())
423 if (!PyErr_Occurred())
424 PyErr_SetString(mpatch_Error, "patch cannot be decoded");
424 PyErr_SetString(mpatch_Error, "patch cannot be decoded");
425 return NULL;
425 return NULL;
426 }
426 }
427
427
428 outlen += orig - last;
428 outlen += orig - last;
429 return Py_BuildValue("l", outlen);
429 return Py_BuildValue("l", outlen);
430 }
430 }
431
431
432 static PyMethodDef methods[] = {
432 static PyMethodDef methods[] = {
433 {"patches", patches, METH_VARARGS, "apply a series of patches\n"},
433 {"patches", patches, METH_VARARGS, "apply a series of patches\n"},
434 {"patchedsize", patchedsize, METH_VARARGS, "calculed patched size\n"},
434 {"patchedsize", patchedsize, METH_VARARGS, "calculed patched size\n"},
435 {NULL, NULL}
435 {NULL, NULL}
436 };
436 };
437
437
438 PyMODINIT_FUNC
438 PyMODINIT_FUNC
439 initmpatch(void)
439 initmpatch(void)
440 {
440 {
441 Py_InitModule3("mpatch", methods, mpatch_doc);
441 Py_InitModule3("mpatch", methods, mpatch_doc);
442 mpatch_Error = PyErr_NewException("mpatch.mpatchError", NULL, NULL);
442 mpatch_Error = PyErr_NewException("mpatch.mpatchError", NULL, NULL);
443 }
443 }
444
444
@@ -1,82 +1,82 b''
1 #!/bin/sh
1 #!/bin/sh
2
2
3 "$TESTDIR/hghave" pygments || exit 80
3 "$TESTDIR/hghave" pygments || exit 80
4
4
5 cat <<EOF >> $HGRCPATH
5 cat <<EOF >> $HGRCPATH
6 [extensions]
6 [extensions]
7 hgext.highlight =
7 hgext.highlight =
8 [web]
8 [web]
9 pygments_style = friendly
9 pygments_style = friendly
10 EOF
10 EOF
11
11
12 hg init test
12 hg init test
13 cd test
13 cd test
14 cp $TESTDIR/get-with-headers.py ./
14 cp $TESTDIR/get-with-headers.py ./
15 hg ci -Ama
15 hg ci -Ama
16
16
17 echo % hg serve
17 echo % hg serve
18 hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log
18 hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log
19 cat hg.pid >> $DAEMON_PIDS
19 cat hg.pid >> $DAEMON_PIDS
20
20
21 echo % hgweb filerevision, html
21 echo % hgweb filerevision, html
22 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py') \
22 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py') \
23 | sed "s/[0-9]* years ago/long ago/g"
23 | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g"
24
24
25 echo % hgweb fileannotate, html
25 echo % hgweb fileannotate, html
26 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py') \
26 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py') \
27 | sed "s/[0-9]* years ago/long ago/g"
27 | sed "s/[0-9]* years ago/long ago/g" | sed "s/class=\"k\"/class=\"kn\"/g"
28
28
29 echo % hgweb fileannotate, raw
29 echo % hgweb fileannotate, raw
30 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py?style=raw') \
30 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py?style=raw') \
31 | sed "s/test@//" > a
31 | sed "s/test@//" > a
32
32
33 echo "200 Script output follows" > b
33 echo "200 Script output follows" > b
34 echo "" >> b
34 echo "" >> b
35 echo "" >> b
35 echo "" >> b
36 hg annotate "get-with-headers.py" >> b
36 hg annotate "get-with-headers.py" >> b
37 echo "" >> b
37 echo "" >> b
38 echo "" >> b
38 echo "" >> b
39 echo "" >> b
39 echo "" >> b
40 echo "" >> b
40 echo "" >> b
41
41
42 diff -u b a
42 diff -u b a
43
43
44 echo
44 echo
45 echo % hgweb filerevision, raw
45 echo % hgweb filerevision, raw
46 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py?style=raw') \
46 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py?style=raw') \
47 > a
47 > a
48
48
49 echo "200 Script output follows" > b
49 echo "200 Script output follows" > b
50 echo "" >> b
50 echo "" >> b
51 hg cat get-with-headers.py >> b
51 hg cat get-with-headers.py >> b
52
52
53 diff -u b a
53 diff -u b a
54
54
55 echo
55 echo
56 echo % hgweb highlightcss friendly
56 echo % hgweb highlightcss friendly
57 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out
57 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out
58 head -n 4 out
58 head -n 4 out
59 rm out
59 rm out
60
60
61 echo % errors encountered
61 echo % errors encountered
62 cat errors.log
62 cat errors.log
63 kill `cat hg.pid`
63 kill `cat hg.pid`
64
64
65 # Change the pygments style
65 # Change the pygments style
66 cat > .hg/hgrc <<EOF
66 cat > .hg/hgrc <<EOF
67 [web]
67 [web]
68 pygments_style = fruity
68 pygments_style = fruity
69 EOF
69 EOF
70
70
71 echo % hg serve again
71 echo % hg serve again
72 hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log
72 hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log
73 cat hg.pid >> $DAEMON_PIDS
73 cat hg.pid >> $DAEMON_PIDS
74
74
75 echo % hgweb highlightcss fruity
75 echo % hgweb highlightcss fruity
76 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out
76 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out
77 head -n 4 out
77 head -n 4 out
78 rm out
78 rm out
79
79
80 echo % errors encountered
80 echo % errors encountered
81 cat errors.log
81 cat errors.log
82
82
@@ -1,149 +1,149 b''
1 adding get-with-headers.py
1 adding get-with-headers.py
2 % hg serve
2 % hg serve
3 % hgweb filerevision, html
3 % hgweb filerevision, html
4 200 Script output follows
4 200 Script output follows
5
5
6 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
6 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
7 <html>
7 <html>
8 <head>
8 <head>
9 <link rel="icon" href="/static/hgicon.png" type="image/png">
9 <link rel="icon" href="/static/hgicon.png" type="image/png">
10 <meta name="robots" content="index, nofollow" />
10 <meta name="robots" content="index, nofollow" />
11 <link rel="stylesheet" href="/static/style.css" type="text/css" />
11 <link rel="stylesheet" href="/static/style.css" type="text/css" />
12
12
13 <link rel="stylesheet" href="/highlightcss" type="text/css" />
13 <link rel="stylesheet" href="/highlightcss" type="text/css" />
14 <title>test:get-with-headers.py</title>
14 <title>test:get-with-headers.py</title>
15 </head>
15 </head>
16 <body>
16 <body>
17
17
18 <div class="buttons">
18 <div class="buttons">
19 <a href="/log/0">changelog</a>
19 <a href="/log/0">changelog</a>
20 <a href="/shortlog/0">shortlog</a>
20 <a href="/shortlog/0">shortlog</a>
21 <a href="/graph">graph</a>
21 <a href="/graph">graph</a>
22 <a href="/tags">tags</a>
22 <a href="/tags">tags</a>
23 <a href="/rev/79ee608ca36d">changeset</a>
23 <a href="/rev/79ee608ca36d">changeset</a>
24 <a href="/file/79ee608ca36d/">files</a>
24 <a href="/file/79ee608ca36d/">files</a>
25 <a href="/log/79ee608ca36d/get-with-headers.py">revisions</a>
25 <a href="/log/79ee608ca36d/get-with-headers.py">revisions</a>
26 <a href="/annotate/79ee608ca36d/get-with-headers.py">annotate</a>
26 <a href="/annotate/79ee608ca36d/get-with-headers.py">annotate</a>
27 <a href="/raw-file/79ee608ca36d/get-with-headers.py">raw</a>
27 <a href="/raw-file/79ee608ca36d/get-with-headers.py">raw</a>
28 </div>
28 </div>
29
29
30 <h2>get-with-headers.py</h2>
30 <h2>get-with-headers.py</h2>
31
31
32 <table>
32 <table>
33 <tr>
33 <tr>
34 <td class="metatag">changeset 0:</td>
34 <td class="metatag">changeset 0:</td>
35 <td><a href="/rev/79ee608ca36d">79ee608ca36d</a></td></tr>
35 <td><a href="/rev/79ee608ca36d">79ee608ca36d</a></td></tr>
36
36
37
37
38 <tr>
38 <tr>
39 <td class="metatag">author:</td>
39 <td class="metatag">author:</td>
40 <td>&#116;&#101;&#115;&#116;</td></tr>
40 <td>&#116;&#101;&#115;&#116;</td></tr>
41 <tr>
41 <tr>
42 <td class="metatag">date:</td>
42 <td class="metatag">date:</td>
43 <td>Thu Jan 01 00:00:00 1970 +0000 (long ago)</td></tr>
43 <td>Thu Jan 01 00:00:00 1970 +0000 (long ago)</td></tr>
44 <tr>
44 <tr>
45 <td class="metatag">permissions:</td>
45 <td class="metatag">permissions:</td>
46 <td>-rwxr-xr-x</td></tr>
46 <td>-rwxr-xr-x</td></tr>
47 <tr>
47 <tr>
48 <td class="metatag">description:</td>
48 <td class="metatag">description:</td>
49 <td>a</td>
49 <td>a</td>
50 </tr>
50 </tr>
51 </table>
51 </table>
52
52
53 <pre>
53 <pre>
54 <div class="parity0"><a class="lineno" href="#l1" id="l1"> 1</a><span class="c">#!/usr/bin/env python</span></div><div class="parity1"><a class="lineno" href="#l2" id="l2"> 2</a></div><div class="parity0"><a class="lineno" href="#l3" id="l3"> 3</a><span class="n">__doc__</span> <span class="o">=</span> <span class="s">&quot;&quot;&quot;This does HTTP get requests given a host:port and path and returns</span></div><div class="parity1"><a class="lineno" href="#l4" id="l4"> 4</a><span class="s">a subset of the headers plus the body of the result.&quot;&quot;&quot;</span></div><div class="parity0"><a class="lineno" href="#l5" id="l5"> 5</a></div><div class="parity1"><a class="lineno" href="#l6" id="l6"> 6</a><span class="k">import</span> <span class="nn">httplib</span><span class="o">,</span> <span class="nn">sys</span></div><div class="parity0"><a class="lineno" href="#l7" id="l7"> 7</a><span class="n">headers</span> <span class="o">=</span> <span class="p">[</span><span class="n">h</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="k">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">3</span><span class="p">:]]</span></div><div class="parity1"><a class="lineno" href="#l8" id="l8"> 8</a><span class="n">conn</span> <span class="o">=</span> <span class="n">httplib</span><span class="o">.</span><span class="n">HTTPConnection</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></div><div class="parity0"><a class="lineno" href="#l9" id="l9"> 9</a><span class="n">conn</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s">&quot;GET&quot;</span><span class="p">,</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">2</span><span class="p">])</span></div><div class="parity1"><a class="lineno" href="#l10" id="l10"> 10</a><span class="n">response</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="n">getresponse</span><span class="p">()</span></div><div class="parity0"><a class="lineno" href="#l11" id="l11"> 11</a><span class="k">print</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">reason</span></div><div class="parity1"><a class="lineno" href="#l12" id="l12"> 12</a><span class="k">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">headers</span><span class="p">:</span></div><div class="parity0"><a class="lineno" href="#l13" id="l13"> 13</a> <span class="k">if</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="bp">None</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="bp">None</span><span class="p">:</span></div><div class="parity1"><a class="lineno" href="#l14" id="l14"> 14</a> <span class="k">print</span> <span class="s">&quot;</span><span class="si">%s</span><span class="s">: </span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">))</span></div><div class="parity0"><a class="lineno" href="#l15" id="l15"> 15</a><span class="k">print</span></div><div class="parity1"><a class="lineno" href="#l16" id="l16"> 16</a><span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">response</span><span class="o">.</span><span class="n">read</span><span class="p">())</span></div><div class="parity0"><a class="lineno" href="#l17" id="l17"> 17</a></div><div class="parity1"><a class="lineno" href="#l18" id="l18"> 18</a><span class="k">if</span> <span class="mf">200</span> <span class="o">&lt;=</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span> <span class="o">&lt;=</span> <span class="mf">299</span><span class="p">:</span></div><div class="parity0"><a class="lineno" href="#l19" id="l19"> 19</a> <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">0</span><span class="p">)</span></div><div class="parity1"><a class="lineno" href="#l20" id="l20"> 20</a><span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">1</span><span class="p">)</span></div>
54 <div class="parity0"><a class="lineno" href="#l1" id="l1"> 1</a><span class="c">#!/usr/bin/env python</span></div><div class="parity1"><a class="lineno" href="#l2" id="l2"> 2</a></div><div class="parity0"><a class="lineno" href="#l3" id="l3"> 3</a><span class="n">__doc__</span> <span class="o">=</span> <span class="s">&quot;&quot;&quot;This does HTTP get requests given a host:port and path and returns</span></div><div class="parity1"><a class="lineno" href="#l4" id="l4"> 4</a><span class="s">a subset of the headers plus the body of the result.&quot;&quot;&quot;</span></div><div class="parity0"><a class="lineno" href="#l5" id="l5"> 5</a></div><div class="parity1"><a class="lineno" href="#l6" id="l6"> 6</a><span class="kn">import</span> <span class="nn">httplib</span><span class="o">,</span> <span class="nn">sys</span></div><div class="parity0"><a class="lineno" href="#l7" id="l7"> 7</a><span class="n">headers</span> <span class="o">=</span> <span class="p">[</span><span class="n">h</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">3</span><span class="p">:]]</span></div><div class="parity1"><a class="lineno" href="#l8" id="l8"> 8</a><span class="n">conn</span> <span class="o">=</span> <span class="n">httplib</span><span class="o">.</span><span class="n">HTTPConnection</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></div><div class="parity0"><a class="lineno" href="#l9" id="l9"> 9</a><span class="n">conn</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s">&quot;GET&quot;</span><span class="p">,</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">2</span><span class="p">])</span></div><div class="parity1"><a class="lineno" href="#l10" id="l10"> 10</a><span class="n">response</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="n">getresponse</span><span class="p">()</span></div><div class="parity0"><a class="lineno" href="#l11" id="l11"> 11</a><span class="kn">print</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">reason</span></div><div class="parity1"><a class="lineno" href="#l12" id="l12"> 12</a><span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">headers</span><span class="p">:</span></div><div class="parity0"><a class="lineno" href="#l13" id="l13"> 13</a> <span class="kn">if</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="bp">None</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="bp">None</span><span class="p">:</span></div><div class="parity1"><a class="lineno" href="#l14" id="l14"> 14</a> <span class="kn">print</span> <span class="s">&quot;</span><span class="si">%s</span><span class="s">: </span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">))</span></div><div class="parity0"><a class="lineno" href="#l15" id="l15"> 15</a><span class="kn">print</span></div><div class="parity1"><a class="lineno" href="#l16" id="l16"> 16</a><span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">response</span><span class="o">.</span><span class="n">read</span><span class="p">())</span></div><div class="parity0"><a class="lineno" href="#l17" id="l17"> 17</a></div><div class="parity1"><a class="lineno" href="#l18" id="l18"> 18</a><span class="kn">if</span> <span class="mf">200</span> <span class="o">&lt;=</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span> <span class="o">&lt;=</span> <span class="mf">299</span><span class="p">:</span></div><div class="parity0"><a class="lineno" href="#l19" id="l19"> 19</a> <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">0</span><span class="p">)</span></div><div class="parity1"><a class="lineno" href="#l20" id="l20"> 20</a><span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">1</span><span class="p">)</span></div>
55 </pre>
55 </pre>
56
56
57
57
58 <div class="logo">
58 <div class="logo">
59 <a href="http://www.selenic.com/mercurial/">
59 <a href="http://www.selenic.com/mercurial/">
60 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
60 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
61 </div>
61 </div>
62
62
63 </body>
63 </body>
64 </html>
64 </html>
65
65
66 % hgweb fileannotate, html
66 % hgweb fileannotate, html
67 200 Script output follows
67 200 Script output follows
68
68
69 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
69 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
70 <html>
70 <html>
71 <head>
71 <head>
72 <link rel="icon" href="/static/hgicon.png" type="image/png">
72 <link rel="icon" href="/static/hgicon.png" type="image/png">
73 <meta name="robots" content="index, nofollow" />
73 <meta name="robots" content="index, nofollow" />
74 <link rel="stylesheet" href="/static/style.css" type="text/css" />
74 <link rel="stylesheet" href="/static/style.css" type="text/css" />
75
75
76 <link rel="stylesheet" href="/highlightcss" type="text/css" />
76 <link rel="stylesheet" href="/highlightcss" type="text/css" />
77 <title>test: get-with-headers.py annotate</title>
77 <title>test: get-with-headers.py annotate</title>
78 </head>
78 </head>
79 <body>
79 <body>
80
80
81 <div class="buttons">
81 <div class="buttons">
82 <a href="/log/0">changelog</a>
82 <a href="/log/0">changelog</a>
83 <a href="/shortlog/0">shortlog</a>
83 <a href="/shortlog/0">shortlog</a>
84 <a href="/graph">graph</a>
84 <a href="/graph">graph</a>
85 <a href="/tags">tags</a>
85 <a href="/tags">tags</a>
86 <a href="/rev/79ee608ca36d">changeset</a>
86 <a href="/rev/79ee608ca36d">changeset</a>
87 <a href="/file/79ee608ca36d/">files</a>
87 <a href="/file/79ee608ca36d/">files</a>
88 <a href="/file/79ee608ca36d/get-with-headers.py">file</a>
88 <a href="/file/79ee608ca36d/get-with-headers.py">file</a>
89 <a href="/log/79ee608ca36d/get-with-headers.py">revisions</a>
89 <a href="/log/79ee608ca36d/get-with-headers.py">revisions</a>
90 <a href="/raw-annotate/79ee608ca36d/get-with-headers.py">raw</a>
90 <a href="/raw-annotate/79ee608ca36d/get-with-headers.py">raw</a>
91 </div>
91 </div>
92
92
93 <h2>Annotate get-with-headers.py</h2>
93 <h2>Annotate get-with-headers.py</h2>
94
94
95 <table>
95 <table>
96 <tr>
96 <tr>
97 <td class="metatag">changeset 0:</td>
97 <td class="metatag">changeset 0:</td>
98 <td><a href="/rev/79ee608ca36d">79ee608ca36d</a></td></tr>
98 <td><a href="/rev/79ee608ca36d">79ee608ca36d</a></td></tr>
99
99
100
100
101 <tr>
101 <tr>
102 <td class="metatag">author:</td>
102 <td class="metatag">author:</td>
103 <td>&#116;&#101;&#115;&#116;</td></tr>
103 <td>&#116;&#101;&#115;&#116;</td></tr>
104 <tr>
104 <tr>
105 <td class="metatag">date:</td>
105 <td class="metatag">date:</td>
106 <td>Thu Jan 01 00:00:00 1970 +0000 (long ago)</td>
106 <td>Thu Jan 01 00:00:00 1970 +0000 (long ago)</td>
107 </tr>
107 </tr>
108 <tr>
108 <tr>
109 <td class="metatag">permissions:</td>
109 <td class="metatag">permissions:</td>
110 <td>-rwxr-xr-x</td>
110 <td>-rwxr-xr-x</td>
111 </tr>
111 </tr>
112 <tr>
112 <tr>
113 <td class="metatag">description:</td>
113 <td class="metatag">description:</td>
114 <td>a</td>
114 <td>a</td>
115 </tr>
115 </tr>
116 </table>
116 </table>
117
117
118 <br/>
118 <br/>
119
119
120 <table cellspacing="0" cellpadding="0">
120 <table cellspacing="0" cellpadding="0">
121 <tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l1" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l1" id="l1"> 1</a></td><td><pre><span class="c">#!/usr/bin/env python</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l2" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l2" id="l2"> 2</a></td><td><pre></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l3" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l3" id="l3"> 3</a></td><td><pre><span class="n">__doc__</span> <span class="o">=</span> <span class="s">&quot;&quot;&quot;This does HTTP get requests given a host:port and path and returns</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l4" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l4" id="l4"> 4</a></td><td><pre><span class="s">a subset of the headers plus the body of the result.&quot;&quot;&quot;</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l5" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l5" id="l5"> 5</a></td><td><pre></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l6" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l6" id="l6"> 6</a></td><td><pre><span class="k">import</span> <span class="nn">httplib</span><span class="o">,</span> <span class="nn">sys</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l7" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l7" id="l7"> 7</a></td><td><pre><span class="n">headers</span> <span class="o">=</span> <span class="p">[</span><span class="n">h</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="k">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">3</span><span class="p">:]]</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l8" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l8" id="l8"> 8</a></td><td><pre><span class="n">conn</span> <span class="o">=</span> <span class="n">httplib</span><span class="o">.</span><span class="n">HTTPConnection</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l9" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l9" id="l9"> 9</a></td><td><pre><span class="n">conn</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s">&quot;GET&quot;</span><span class="p">,</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">2</span><span class="p">])</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l10" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l10" id="l10"> 10</a></td><td><pre><span class="n">response</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="n">getresponse</span><span class="p">()</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l11" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l11" id="l11"> 11</a></td><td><pre><span class="k">print</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">reason</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l12" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l12" id="l12"> 12</a></td><td><pre><span class="k">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">headers</span><span class="p">:</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l13" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l13" id="l13"> 13</a></td><td><pre> <span class="k">if</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="bp">None</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="bp">None</span><span class="p">:</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l14" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l14" id="l14"> 14</a></td><td><pre> <span class="k">print</span> <span class="s">&quot;</span><span class="si">%s</span><span class="s">: </span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">))</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l15" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l15" id="l15"> 15</a></td><td><pre><span class="k">print</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l16" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l16" id="l16"> 16</a></td><td><pre><span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">response</span><span class="o">.</span><span class="n">read</span><span class="p">())</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l17" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l17" id="l17"> 17</a></td><td><pre></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l18" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l18" id="l18"> 18</a></td><td><pre><span class="k">if</span> <span class="mf">200</span> <span class="o">&lt;=</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span> <span class="o">&lt;=</span> <span class="mf">299</span><span class="p">:</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l19" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l19" id="l19"> 19</a></td><td><pre> <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">0</span><span class="p">)</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l20" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l20" id="l20"> 20</a></td><td><pre><span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">1</span><span class="p">)</span></pre></td></tr>
121 <tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l1" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l1" id="l1"> 1</a></td><td><pre><span class="c">#!/usr/bin/env python</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l2" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l2" id="l2"> 2</a></td><td><pre></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l3" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l3" id="l3"> 3</a></td><td><pre><span class="n">__doc__</span> <span class="o">=</span> <span class="s">&quot;&quot;&quot;This does HTTP get requests given a host:port and path and returns</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l4" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l4" id="l4"> 4</a></td><td><pre><span class="s">a subset of the headers plus the body of the result.&quot;&quot;&quot;</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l5" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l5" id="l5"> 5</a></td><td><pre></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l6" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l6" id="l6"> 6</a></td><td><pre><span class="kn">import</span> <span class="nn">httplib</span><span class="o">,</span> <span class="nn">sys</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l7" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l7" id="l7"> 7</a></td><td><pre><span class="n">headers</span> <span class="o">=</span> <span class="p">[</span><span class="n">h</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">3</span><span class="p">:]]</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l8" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l8" id="l8"> 8</a></td><td><pre><span class="n">conn</span> <span class="o">=</span> <span class="n">httplib</span><span class="o">.</span><span class="n">HTTPConnection</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l9" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l9" id="l9"> 9</a></td><td><pre><span class="n">conn</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s">&quot;GET&quot;</span><span class="p">,</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">2</span><span class="p">])</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l10" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l10" id="l10"> 10</a></td><td><pre><span class="n">response</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="n">getresponse</span><span class="p">()</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l11" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l11" id="l11"> 11</a></td><td><pre><span class="kn">print</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">reason</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l12" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l12" id="l12"> 12</a></td><td><pre><span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">headers</span><span class="p">:</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l13" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l13" id="l13"> 13</a></td><td><pre> <span class="kn">if</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="bp">None</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="bp">None</span><span class="p">:</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l14" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l14" id="l14"> 14</a></td><td><pre> <span class="kn">print</span> <span class="s">&quot;</span><span class="si">%s</span><span class="s">: </span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">))</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l15" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l15" id="l15"> 15</a></td><td><pre><span class="kn">print</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l16" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l16" id="l16"> 16</a></td><td><pre><span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">response</span><span class="o">.</span><span class="n">read</span><span class="p">())</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l17" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l17" id="l17"> 17</a></td><td><pre></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l18" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l18" id="l18"> 18</a></td><td><pre><span class="kn">if</span> <span class="mf">200</span> <span class="o">&lt;=</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span> <span class="o">&lt;=</span> <span class="mf">299</span><span class="p">:</span></pre></td></tr><tr class="parity0"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l19" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l19" id="l19"> 19</a></td><td><pre> <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">0</span><span class="p">)</span></pre></td></tr><tr class="parity1"><td class="annotate"><a href="/annotate/79ee608ca36d/get-with-headers.py#l20" title="79ee608ca36d: a">test@0</a></td><td><a class="lineno" href="#l20" id="l20"> 20</a></td><td><pre><span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">1</span><span class="p">)</span></pre></td></tr>
122 </table>
122 </table>
123
123
124
124
125 <div class="logo">
125 <div class="logo">
126 <a href="http://www.selenic.com/mercurial/">
126 <a href="http://www.selenic.com/mercurial/">
127 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
127 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
128 </div>
128 </div>
129
129
130 </body>
130 </body>
131 </html>
131 </html>
132
132
133 % hgweb fileannotate, raw
133 % hgweb fileannotate, raw
134
134
135 % hgweb filerevision, raw
135 % hgweb filerevision, raw
136
136
137 % hgweb highlightcss friendly
137 % hgweb highlightcss friendly
138 200 Script output follows
138 200 Script output follows
139
139
140 /* pygments_style = friendly */
140 /* pygments_style = friendly */
141
141
142 % errors encountered
142 % errors encountered
143 % hg serve again
143 % hg serve again
144 % hgweb highlightcss fruity
144 % hgweb highlightcss fruity
145 200 Script output follows
145 200 Script output follows
146
146
147 /* pygments_style = fruity */
147 /* pygments_style = fruity */
148
148
149 % errors encountered
149 % errors encountered
General Comments 0
You need to be logged in to leave comments. Login now