##// END OF EJS Templates
pvec: introduce pvecs
Matt Mackall -
r16249:0d175ac5 default
parent child Browse files
Show More
@@ -0,0 +1,210 b''
1 # pvec.py - probabilistic vector clocks for Mercurial
2 #
3 # Copyright 2012 Matt Mackall <mpm@selenic.com>
4 #
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
7
8 '''
9 A "pvec" is a changeset property based on the theory of vector clocks
10 that can be compared to discover relatedness without consulting a
11 graph. This can be useful for tasks like determining how a
12 disconnected patch relates to a repository.
13
14 Currently a pvec consist of 448 bits, of which 24 are 'depth' and the
15 remainder are a bit vector. It is represented as a 70-character base85
16 string.
17
18 Construction:
19
20 - a root changeset has a depth of 0 and a bit vector based on its hash
21 - a normal commit has a changeset where depth is increased by one and
22 one bit vector bit is flipped based on its hash
23 - a merge changeset pvec is constructed by copying changes from one pvec into
24 the other to balance its depth
25
26 Properties:
27
28 - for linear changes, difference in depth is always <= hamming distance
29 - otherwise, changes are probably divergent
30 - when hamming distance is < 200, we can reliably detect when pvecs are near
31
32 Issues:
33
34 - hamming distance ceases to work over distances of ~ 200
35 - detecting divergence is less accurate when the common ancestor is very close
36 to either revision or total distance is high
37 - this could probably be improved by modeling the relation between
38 delta and hdist
39
40 Uses:
41
42 - a patch pvec can be used to locate the nearest available common ancestor for
43 resolving conflicts
44 - ordering of patches can be established without a DAG
45 - two head pvecs can be compared to determine whether push/pull/merge is needed
46 and approximately how many changesets are involved
47 - can be used to find a heuristic divergence measure between changesets on
48 different branches
49 '''
50
51 import base85, util
52 from node import nullrev
53
54 _size = 448 # 70 chars b85-encoded
55 _bytes = _size / 8
56 _depthbits = 24
57 _depthbytes = _depthbits / 8
58 _vecbytes = _bytes - _depthbytes
59 _vecbits = _vecbytes * 8
60 _radius = (_vecbits - 30) / 2 # high probability vecs are related
61
62 def _bin(bs):
63 '''convert a bytestring to a long'''
64 v = 0
65 for b in bs:
66 v = v * 256 + ord(b)
67 return v
68
69 def _str(v, l):
70 bs = ""
71 for p in xrange(l):
72 bs = chr(v & 255) + bs
73 v >>= 8
74 return bs
75
76 def _split(b):
77 '''depth and bitvec'''
78 return _bin(b[:_depthbytes]), _bin(b[_depthbytes:])
79
80 def _join(depth, bitvec):
81 return _str(depth, _depthbytes) + _str(bitvec, _vecbytes)
82
83 def _hweight(x):
84 c = 0
85 while x:
86 if x & 1:
87 c += 1
88 x >>= 1
89 return c
90 _htab = [_hweight(x) for x in xrange(256)]
91
92 def _hamming(a, b):
93 '''find the hamming distance between two longs'''
94 d = a ^ b
95 c = 0
96 while d:
97 c += _htab[d & 0xff]
98 d >>= 8
99 return c
100
101 def _mergevec(x, y, c):
102 # Ideally, this function would be x ^ y ^ ancestor, but finding
103 # ancestors is a nuisance. So instead we find the minimal number
104 # of changes to balance the depth and hamming distance
105
106 d1, v1 = x
107 d2, v2 = y
108 if d1 < d2:
109 d1, d2, v1, v2 = d2, d1, v2, v1
110
111 hdist = _hamming(v1, v2)
112 ddist = d1 - d2
113 v = v1
114 m = v1 ^ v2 # mask of different bits
115 i = 1
116
117 if hdist > ddist:
118 # if delta = 10 and hdist = 100, then we need to go up 55 steps
119 # to the ancestor and down 45
120 changes = (hdist - ddist + 1) / 2
121 else:
122 # must make at least one change
123 changes = 1
124 depth = d1 + changes
125
126 # copy changes from v2
127 if m:
128 while changes:
129 if m & i:
130 v ^= i
131 changes -= 1
132 i <<= 1
133 else:
134 v = _flipbit(v, c)
135
136 return depth, v
137
138 def _flipbit(v, node):
139 # converting bit strings to longs is slow
140 bit = (hash(node) & 0xffffffff) % _vecbits
141 return v ^ (1<<bit)
142
143 def ctxpvec(ctx):
144 '''construct a pvec for ctx while filling in the cache'''
145 r = ctx._repo
146 if not util.safehasattr(r, "_pveccache"):
147 r._pveccache = {}
148 pvc = r._pveccache
149 if ctx.rev() not in pvc:
150 cl = r.changelog
151 for n in xrange(ctx.rev() + 1):
152 if n not in pvc:
153 node = cl.node(n)
154 p1, p2 = cl.parentrevs(n)
155 if p1 == nullrev:
156 # start with a 'random' vector at root
157 pvc[n] = (0, _bin((node * 3)[:_vecbytes]))
158 elif p2 == nullrev:
159 d, v = pvc[p1]
160 pvc[n] = (d + 1, _flipbit(v, node))
161 else:
162 pvc[n] = _mergevec(pvc[p1], pvc[p2], node)
163 bs = _join(*pvc[ctx.rev()])
164 return pvec(base85.b85encode(bs))
165
166 class pvec(object):
167 def __init__(self, hashorctx):
168 if isinstance(hashorctx, str):
169 self._bs = hashorctx
170 self._depth, self._vec = _split(base85.b85decode(hashorctx))
171 else:
172 self._vec = ctxpvec(ctx)
173
174 def __str__(self):
175 return self._bs
176
177 def __eq__(self, b):
178 return self._vec == b._vec and self._depth == b._depth
179
180 def __lt__(self, b):
181 delta = b._depth - self._depth
182 if delta < 0:
183 return False # always correct
184 if _hamming(self._vec, b._vec) > delta:
185 return False
186 return True
187
188 def __gt__(self, b):
189 return b < self
190
191 def __or__(self, b):
192 delta = abs(b._depth - self._depth)
193 if _hamming(self._vec, b._vec) <= delta:
194 return False
195 return True
196
197 def __sub__(self, b):
198 if self | b:
199 raise ValueError("concurrent pvecs")
200 return self._depth - b._depth
201
202 def distance(self, b):
203 d = abs(b._depth - self._depth)
204 h = _hamming(self._vec, b._vec)
205 return max(d, h)
206
207 def near(self, b):
208 dist = abs(b.depth - self._depth)
209 if dist > _radius or _hamming(self._vec, b._vec) > _radius:
210 return False
@@ -1,432 +1,432 b''
1 1 #!/usr/bin/env python
2 2 #
3 3 # check-code - a style and portability checker for Mercurial
4 4 #
5 5 # Copyright 2010 Matt Mackall <mpm@selenic.com>
6 6 #
7 7 # This software may be used and distributed according to the terms of the
8 8 # GNU General Public License version 2 or any later version.
9 9
10 10 import re, glob, os, sys
11 11 import keyword
12 12 import optparse
13 13
14 14 def repquote(m):
15 15 t = re.sub(r"\w", "x", m.group('text'))
16 16 t = re.sub(r"[^\s\nx]", "o", t)
17 17 return m.group('quote') + t + m.group('quote')
18 18
19 19 def reppython(m):
20 20 comment = m.group('comment')
21 21 if comment:
22 22 return "#" * len(comment)
23 23 return repquote(m)
24 24
25 25 def repcomment(m):
26 26 return m.group(1) + "#" * len(m.group(2))
27 27
28 28 def repccomment(m):
29 29 t = re.sub(r"((?<=\n) )|\S", "x", m.group(2))
30 30 return m.group(1) + t + "*/"
31 31
32 32 def repcallspaces(m):
33 33 t = re.sub(r"\n\s+", "\n", m.group(2))
34 34 return m.group(1) + t
35 35
36 36 def repinclude(m):
37 37 return m.group(1) + "<foo>"
38 38
39 39 def rephere(m):
40 40 t = re.sub(r"\S", "x", m.group(2))
41 41 return m.group(1) + t
42 42
43 43
44 44 testpats = [
45 45 [
46 46 (r'(pushd|popd)', "don't use 'pushd' or 'popd', use 'cd'"),
47 47 (r'\W\$?\(\([^\)\n]*\)\)', "don't use (()) or $(()), use 'expr'"),
48 48 (r'^function', "don't use 'function', use old style"),
49 49 (r'grep.*-q', "don't use 'grep -q', redirect to /dev/null"),
50 50 (r'echo.*\\n', "don't use 'echo \\n', use printf"),
51 51 (r'echo -n', "don't use 'echo -n', use printf"),
52 52 (r'^diff.*-\w*N', "don't use 'diff -N'"),
53 53 (r'(^| )wc[^|]*$\n(?!.*\(re\))', "filter wc output"),
54 54 (r'head -c', "don't use 'head -c', use 'dd'"),
55 55 (r'sha1sum', "don't use sha1sum, use $TESTDIR/md5sum.py"),
56 56 (r'ls.*-\w*R', "don't use 'ls -R', use 'find'"),
57 57 (r'printf.*\\\d{1,3}', "don't use 'printf \NNN', use Python"),
58 58 (r'printf.*\\x', "don't use printf \\x, use Python"),
59 59 (r'\$\(.*\)', "don't use $(expr), use `expr`"),
60 60 (r'rm -rf \*', "don't use naked rm -rf, target a directory"),
61 61 (r'(^|\|\s*)grep (-\w\s+)*[^|]*[(|]\w',
62 62 "use egrep for extended grep syntax"),
63 63 (r'/bin/', "don't use explicit paths for tools"),
64 64 (r'\$PWD', "don't use $PWD, use `pwd`"),
65 65 (r'[^\n]\Z', "no trailing newline"),
66 66 (r'export.*=', "don't export and assign at once"),
67 67 (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\\^', "^ must be quoted"),
68 68 (r'^source\b', "don't use 'source', use '.'"),
69 69 (r'touch -d', "don't use 'touch -d', use 'touch -t' instead"),
70 70 (r'ls +[^|\n-]+ +-', "options to 'ls' must come before filenames"),
71 71 (r'[^>\n]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"),
72 72 (r'^stop\(\)', "don't use 'stop' as a shell function name"),
73 73 (r'(\[|\btest\b).*-e ', "don't use 'test -e', use 'test -f'"),
74 74 (r'^alias\b.*=', "don't use alias, use a function"),
75 75 ],
76 76 # warnings
77 77 []
78 78 ]
79 79
80 80 testfilters = [
81 81 (r"( *)(#([^\n]*\S)?)", repcomment),
82 82 (r"<<(\S+)((.|\n)*?\n\1)", rephere),
83 83 ]
84 84
85 85 uprefix = r"^ \$ "
86 86 uprefixc = r"^ > "
87 87 utestpats = [
88 88 [
89 89 (r'^(\S| $ ).*(\S[ \t]+|^[ \t]+)\n', "trailing whitespace on non-output"),
90 90 (uprefix + r'.*\|\s*sed', "use regex test output patterns instead of sed"),
91 91 (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"),
92 92 (uprefix + r'.*(?<!\[)\$\?', "explicit exit code checks unnecessary"),
93 93 (uprefix + r'.*\|\| echo.*(fail|error)',
94 94 "explicit exit code checks unnecessary"),
95 95 (uprefix + r'set -e', "don't use set -e"),
96 96 (uprefixc + r'( *)\t', "don't use tabs to indent"),
97 97 ],
98 98 # warnings
99 99 []
100 100 ]
101 101
102 102 for i in [0, 1]:
103 103 for p, m in testpats[i]:
104 104 if p.startswith(r'^'):
105 105 p = uprefix + p[1:]
106 106 else:
107 107 p = uprefix + ".*" + p
108 108 utestpats[i].append((p, m))
109 109
110 110 utestfilters = [
111 111 (r"( *)(#([^\n]*\S)?)", repcomment),
112 112 ]
113 113
114 114 pypats = [
115 115 [
116 116 (r'^\s*def\s*\w+\s*\(.*,\s*\(',
117 117 "tuple parameter unpacking not available in Python 3+"),
118 118 (r'lambda\s*\(.*,.*\)',
119 119 "tuple parameter unpacking not available in Python 3+"),
120 120 (r'(?<!def)\s+(cmp)\(', "cmp is not available in Python 3+"),
121 121 (r'\breduce\s*\(.*', "reduce is not available in Python 3+"),
122 122 (r'\.has_key\b', "dict.has_key is not available in Python 3+"),
123 123 (r'^\s*\t', "don't use tabs"),
124 124 (r'\S;\s*\n', "semicolon"),
125 125 (r'[^_]_\("[^"]+"\s*%', "don't use % inside _()"),
126 126 (r"[^_]_\('[^']+'\s*%", "don't use % inside _()"),
127 127 (r'\w,\w', "missing whitespace after ,"),
128 128 (r'\w[+/*\-<>]\w', "missing whitespace in expression"),
129 129 (r'^\s+\w+=\w+[^,)\n]$', "missing whitespace in assignment"),
130 130 (r'(\s+)try:\n((?:\n|\1\s.*\n)+?)\1except.*?:\n'
131 131 r'((?:\n|\1\s.*\n)+?)\1finally:', 'no try/except/finally in Py2.4'),
132 132 (r'.{85}', "line too long"),
133 133 (r' x+[xo][\'"]\n\s+[\'"]x', 'string join across lines with no space'),
134 134 (r'[^\n]\Z', "no trailing newline"),
135 135 (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"),
136 136 # (r'^\s+[^_ \n][^_. \n]+_[^_\n]+\s*=', "don't use underbars in identifiers"),
137 137 (r'^\s+(self\.)?[A-za-z][a-z0-9]+[A-Z]\w* = ',
138 138 "don't use camelcase in identifiers"),
139 139 (r'^\s*(if|while|def|class|except|try)\s[^[\n]*:\s*[^\\n]#\s]+',
140 140 "linebreak after :"),
141 141 (r'class\s[^( \n]+:', "old-style class, use class foo(object)"),
142 142 (r'class\s[^( \n]+\(\):',
143 143 "class foo() not available in Python 2.4, use class foo(object)"),
144 144 (r'\b(%s)\(' % '|'.join(keyword.kwlist),
145 145 "Python keyword is not a function"),
146 146 (r',]', "unneeded trailing ',' in list"),
147 147 # (r'class\s[A-Z][^\(]*\((?!Exception)',
148 148 # "don't capitalize non-exception classes"),
149 149 # (r'in range\(', "use xrange"),
150 150 # (r'^\s*print\s+', "avoid using print in core and extensions"),
151 151 (r'[\x80-\xff]', "non-ASCII character literal"),
152 152 (r'("\')\.format\(', "str.format() not available in Python 2.4"),
153 153 (r'^\s*with\s+', "with not available in Python 2.4"),
154 154 (r'\.isdisjoint\(', "set.isdisjoint not available in Python 2.4"),
155 155 (r'^\s*except.* as .*:', "except as not available in Python 2.4"),
156 156 (r'^\s*os\.path\.relpath', "relpath not available in Python 2.4"),
157 157 (r'(?<!def)\s+(any|all|format)\(',
158 158 "any/all/format not available in Python 2.4"),
159 159 (r'(?<!def)\s+(callable)\(',
160 160 "callable not available in Python 3, use getattr(f, '__call__', None)"),
161 161 (r'if\s.*\selse', "if ... else form not available in Python 2.4"),
162 162 (r'^\s*(%s)\s\s' % '|'.join(keyword.kwlist),
163 163 "gratuitous whitespace after Python keyword"),
164 164 (r'([\(\[][ \t]\S)|(\S[ \t][\)\]])', "gratuitous whitespace in () or []"),
165 165 # (r'\s\s=', "gratuitous whitespace before ="),
166 166 (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=)\S',
167 167 "missing whitespace around operator"),
168 168 (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=)\s',
169 169 "missing whitespace around operator"),
170 170 (r'\s(\+=|-=|!=|<>|<=|>=|<<=|>>=)\S',
171 171 "missing whitespace around operator"),
172 (r'[^+=*/!<>&| -](\s=|=\s)[^= ]',
172 (r'[^^+=*/!<>&| -](\s=|=\s)[^= ]',
173 173 "wrong whitespace around ="),
174 174 (r'raise Exception', "don't raise generic exceptions"),
175 175 (r' is\s+(not\s+)?["\'0-9-]', "object comparison with literal"),
176 176 (r' [=!]=\s+(True|False|None)',
177 177 "comparison with singleton, use 'is' or 'is not' instead"),
178 178 (r'^\s*(while|if) [01]:',
179 179 "use True/False for constant Boolean expression"),
180 180 (r'(?<!def)\s+hasattr',
181 181 'hasattr(foo, bar) is broken, use util.safehasattr(foo, bar) instead'),
182 182 (r'opener\([^)]*\).read\(',
183 183 "use opener.read() instead"),
184 184 (r'BaseException', 'not in Py2.4, use Exception'),
185 185 (r'os\.path\.relpath', 'os.path.relpath is not in Py2.5'),
186 186 (r'opener\([^)]*\).write\(',
187 187 "use opener.write() instead"),
188 188 (r'[\s\(](open|file)\([^)]*\)\.read\(',
189 189 "use util.readfile() instead"),
190 190 (r'[\s\(](open|file)\([^)]*\)\.write\(',
191 191 "use util.readfile() instead"),
192 192 (r'^[\s\(]*(open(er)?|file)\([^)]*\)',
193 193 "always assign an opened file to a variable, and close it afterwards"),
194 194 (r'[\s\(](open|file)\([^)]*\)\.',
195 195 "always assign an opened file to a variable, and close it afterwards"),
196 196 (r'(?i)descendent', "the proper spelling is descendAnt"),
197 197 (r'\.debug\(\_', "don't mark debug messages for translation"),
198 198 ],
199 199 # warnings
200 200 [
201 201 (r'.{81}', "warning: line over 80 characters"),
202 202 (r'^\s*except:$', "warning: naked except clause"),
203 203 (r'ui\.(status|progress|write|note|warn)\([\'\"]x',
204 204 "warning: unwrapped ui message"),
205 205 ]
206 206 ]
207 207
208 208 pyfilters = [
209 209 (r"""(?msx)(?P<comment>\#.*?$)|
210 210 ((?P<quote>('''|\"\"\"|(?<!')'(?!')|(?<!")"(?!")))
211 211 (?P<text>(([^\\]|\\.)*?))
212 212 (?P=quote))""", reppython),
213 213 ]
214 214
215 215 cpats = [
216 216 [
217 217 (r'//', "don't use //-style comments"),
218 218 (r'^ ', "don't use spaces to indent"),
219 219 (r'\S\t', "don't use tabs except for indent"),
220 220 (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"),
221 221 (r'.{85}', "line too long"),
222 222 (r'(while|if|do|for)\(', "use space after while/if/do/for"),
223 223 (r'return\(', "return is not a function"),
224 224 (r' ;', "no space before ;"),
225 225 (r'\w+\* \w+', "use int *foo, not int* foo"),
226 226 (r'\([^\)]+\) \w+', "use (int)foo, not (int) foo"),
227 227 (r'\S+ (\+\+|--)', "use foo++, not foo ++"),
228 228 (r'\w,\w', "missing whitespace after ,"),
229 229 (r'^[^#]\w[+/*]\w', "missing whitespace in expression"),
230 230 (r'^#\s+\w', "use #foo, not # foo"),
231 231 (r'[^\n]\Z', "no trailing newline"),
232 232 (r'^\s*#import\b', "use only #include in standard C code"),
233 233 ],
234 234 # warnings
235 235 []
236 236 ]
237 237
238 238 cfilters = [
239 239 (r'(/\*)(((\*(?!/))|[^*])*)\*/', repccomment),
240 240 (r'''(?P<quote>(?<!")")(?P<text>([^"]|\\")+)"(?!")''', repquote),
241 241 (r'''(#\s*include\s+<)([^>]+)>''', repinclude),
242 242 (r'(\()([^)]+\))', repcallspaces),
243 243 ]
244 244
245 245 inutilpats = [
246 246 [
247 247 (r'\bui\.', "don't use ui in util"),
248 248 ],
249 249 # warnings
250 250 []
251 251 ]
252 252
253 253 inrevlogpats = [
254 254 [
255 255 (r'\brepo\.', "don't use repo in revlog"),
256 256 ],
257 257 # warnings
258 258 []
259 259 ]
260 260
261 261 checks = [
262 262 ('python', r'.*\.(py|cgi)$', pyfilters, pypats),
263 263 ('test script', r'(.*/)?test-[^.~]*$', testfilters, testpats),
264 264 ('c', r'.*\.c$', cfilters, cpats),
265 265 ('unified test', r'.*\.t$', utestfilters, utestpats),
266 266 ('layering violation repo in revlog', r'mercurial/revlog\.py', pyfilters,
267 267 inrevlogpats),
268 268 ('layering violation ui in util', r'mercurial/util\.py', pyfilters,
269 269 inutilpats),
270 270 ]
271 271
272 272 class norepeatlogger(object):
273 273 def __init__(self):
274 274 self._lastseen = None
275 275
276 276 def log(self, fname, lineno, line, msg, blame):
277 277 """print error related a to given line of a given file.
278 278
279 279 The faulty line will also be printed but only once in the case
280 280 of multiple errors.
281 281
282 282 :fname: filename
283 283 :lineno: line number
284 284 :line: actual content of the line
285 285 :msg: error message
286 286 """
287 287 msgid = fname, lineno, line
288 288 if msgid != self._lastseen:
289 289 if blame:
290 290 print "%s:%d (%s):" % (fname, lineno, blame)
291 291 else:
292 292 print "%s:%d:" % (fname, lineno)
293 293 print " > %s" % line
294 294 self._lastseen = msgid
295 295 print " " + msg
296 296
297 297 _defaultlogger = norepeatlogger()
298 298
299 299 def getblame(f):
300 300 lines = []
301 301 for l in os.popen('hg annotate -un %s' % f):
302 302 start, line = l.split(':', 1)
303 303 user, rev = start.split()
304 304 lines.append((line[1:-1], user, rev))
305 305 return lines
306 306
307 307 def checkfile(f, logfunc=_defaultlogger.log, maxerr=None, warnings=False,
308 308 blame=False, debug=False, lineno=True):
309 309 """checks style and portability of a given file
310 310
311 311 :f: filepath
312 312 :logfunc: function used to report error
313 313 logfunc(filename, linenumber, linecontent, errormessage)
314 314 :maxerr: number of error to display before arborting.
315 315 Set to false (default) to report all errors
316 316
317 317 return True if no error is found, False otherwise.
318 318 """
319 319 blamecache = None
320 320 result = True
321 321 for name, match, filters, pats in checks:
322 322 if debug:
323 323 print name, f
324 324 fc = 0
325 325 if not re.match(match, f):
326 326 if debug:
327 327 print "Skipping %s for %s it doesn't match %s" % (
328 328 name, match, f)
329 329 continue
330 330 fp = open(f)
331 331 pre = post = fp.read()
332 332 fp.close()
333 333 if "no-" + "check-code" in pre:
334 334 if debug:
335 335 print "Skipping %s for %s it has no- and check-code" % (
336 336 name, f)
337 337 break
338 338 for p, r in filters:
339 339 post = re.sub(p, r, post)
340 340 if warnings:
341 341 pats = pats[0] + pats[1]
342 342 else:
343 343 pats = pats[0]
344 344 # print post # uncomment to show filtered version
345 345
346 346 if debug:
347 347 print "Checking %s for %s" % (name, f)
348 348
349 349 prelines = None
350 350 errors = []
351 351 for p, msg in pats:
352 352 # fix-up regexes for multiline searches
353 353 po = p
354 354 # \s doesn't match \n
355 355 p = re.sub(r'(?<!\\)\\s', r'[ \\t]', p)
356 356 # [^...] doesn't match newline
357 357 p = re.sub(r'(?<!\\)\[\^', r'[^\\n', p)
358 358
359 359 #print po, '=>', p
360 360
361 361 pos = 0
362 362 n = 0
363 363 for m in re.finditer(p, post, re.MULTILINE):
364 364 if prelines is None:
365 365 prelines = pre.splitlines()
366 366 postlines = post.splitlines(True)
367 367
368 368 start = m.start()
369 369 while n < len(postlines):
370 370 step = len(postlines[n])
371 371 if pos + step > start:
372 372 break
373 373 pos += step
374 374 n += 1
375 375 l = prelines[n]
376 376
377 377 if "check-code" + "-ignore" in l:
378 378 if debug:
379 379 print "Skipping %s for %s:%s (check-code -ignore)" % (
380 380 name, f, n)
381 381 continue
382 382 bd = ""
383 383 if blame:
384 384 bd = 'working directory'
385 385 if not blamecache:
386 386 blamecache = getblame(f)
387 387 if n < len(blamecache):
388 388 bl, bu, br = blamecache[n]
389 389 if bl == l:
390 390 bd = '%s@%s' % (bu, br)
391 391 errors.append((f, lineno and n + 1, l, msg, bd))
392 392 result = False
393 393
394 394 errors.sort()
395 395 for e in errors:
396 396 logfunc(*e)
397 397 fc += 1
398 398 if maxerr and fc >= maxerr:
399 399 print " (too many errors, giving up)"
400 400 break
401 401
402 402 return result
403 403
404 404 if __name__ == "__main__":
405 405 parser = optparse.OptionParser("%prog [options] [files]")
406 406 parser.add_option("-w", "--warnings", action="store_true",
407 407 help="include warning-level checks")
408 408 parser.add_option("-p", "--per-file", type="int",
409 409 help="max warnings per file")
410 410 parser.add_option("-b", "--blame", action="store_true",
411 411 help="use annotate to generate blame info")
412 412 parser.add_option("", "--debug", action="store_true",
413 413 help="show debug information")
414 414 parser.add_option("", "--nolineno", action="store_false",
415 415 dest='lineno', help="don't show line numbers")
416 416
417 417 parser.set_defaults(per_file=15, warnings=False, blame=False, debug=False,
418 418 lineno=True)
419 419 (options, args) = parser.parse_args()
420 420
421 421 if len(args) == 0:
422 422 check = glob.glob("*")
423 423 else:
424 424 check = args
425 425
426 426 ret = 0
427 427 for f in check:
428 428 if not checkfile(f, maxerr=options.per_file, warnings=options.warnings,
429 429 blame=options.blame, debug=options.debug,
430 430 lineno=options.lineno):
431 431 ret = 1
432 432 sys.exit(ret)
@@ -1,5795 +1,5816 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from node import hex, bin, nullid, nullrev, short
9 9 from lock import release
10 10 from i18n import _, gettext
11 11 import os, re, difflib, time, tempfile, errno
12 12 import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
13 13 import patch, help, url, encoding, templatekw, discovery
14 14 import archival, changegroup, cmdutil, hbisect
15 15 import sshserver, hgweb, hgweb.server, commandserver
16 16 import merge as mergemod
17 17 import minirst, revset, fileset
18 18 import dagparser, context, simplemerge
19 import random, setdiscovery, treediscovery, dagutil
19 import random, setdiscovery, treediscovery, dagutil, pvec
20 20 import phases
21 21
22 22 table = {}
23 23
24 24 command = cmdutil.command(table)
25 25
26 26 # common command options
27 27
28 28 globalopts = [
29 29 ('R', 'repository', '',
30 30 _('repository root directory or name of overlay bundle file'),
31 31 _('REPO')),
32 32 ('', 'cwd', '',
33 33 _('change working directory'), _('DIR')),
34 34 ('y', 'noninteractive', None,
35 35 _('do not prompt, automatically pick the first choice for all prompts')),
36 36 ('q', 'quiet', None, _('suppress output')),
37 37 ('v', 'verbose', None, _('enable additional output')),
38 38 ('', 'config', [],
39 39 _('set/override config option (use \'section.name=value\')'),
40 40 _('CONFIG')),
41 41 ('', 'debug', None, _('enable debugging output')),
42 42 ('', 'debugger', None, _('start debugger')),
43 43 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
44 44 _('ENCODE')),
45 45 ('', 'encodingmode', encoding.encodingmode,
46 46 _('set the charset encoding mode'), _('MODE')),
47 47 ('', 'traceback', None, _('always print a traceback on exception')),
48 48 ('', 'time', None, _('time how long the command takes')),
49 49 ('', 'profile', None, _('print command execution profile')),
50 50 ('', 'version', None, _('output version information and exit')),
51 51 ('h', 'help', None, _('display help and exit')),
52 52 ]
53 53
54 54 dryrunopts = [('n', 'dry-run', None,
55 55 _('do not perform actions, just print output'))]
56 56
57 57 remoteopts = [
58 58 ('e', 'ssh', '',
59 59 _('specify ssh command to use'), _('CMD')),
60 60 ('', 'remotecmd', '',
61 61 _('specify hg command to run on the remote side'), _('CMD')),
62 62 ('', 'insecure', None,
63 63 _('do not verify server certificate (ignoring web.cacerts config)')),
64 64 ]
65 65
66 66 walkopts = [
67 67 ('I', 'include', [],
68 68 _('include names matching the given patterns'), _('PATTERN')),
69 69 ('X', 'exclude', [],
70 70 _('exclude names matching the given patterns'), _('PATTERN')),
71 71 ]
72 72
73 73 commitopts = [
74 74 ('m', 'message', '',
75 75 _('use text as commit message'), _('TEXT')),
76 76 ('l', 'logfile', '',
77 77 _('read commit message from file'), _('FILE')),
78 78 ]
79 79
80 80 commitopts2 = [
81 81 ('d', 'date', '',
82 82 _('record the specified date as commit date'), _('DATE')),
83 83 ('u', 'user', '',
84 84 _('record the specified user as committer'), _('USER')),
85 85 ]
86 86
87 87 templateopts = [
88 88 ('', 'style', '',
89 89 _('display using template map file'), _('STYLE')),
90 90 ('', 'template', '',
91 91 _('display with template'), _('TEMPLATE')),
92 92 ]
93 93
94 94 logopts = [
95 95 ('p', 'patch', None, _('show patch')),
96 96 ('g', 'git', None, _('use git extended diff format')),
97 97 ('l', 'limit', '',
98 98 _('limit number of changes displayed'), _('NUM')),
99 99 ('M', 'no-merges', None, _('do not show merges')),
100 100 ('', 'stat', None, _('output diffstat-style summary of changes')),
101 101 ] + templateopts
102 102
103 103 diffopts = [
104 104 ('a', 'text', None, _('treat all files as text')),
105 105 ('g', 'git', None, _('use git extended diff format')),
106 106 ('', 'nodates', None, _('omit dates from diff headers'))
107 107 ]
108 108
109 109 diffwsopts = [
110 110 ('w', 'ignore-all-space', None,
111 111 _('ignore white space when comparing lines')),
112 112 ('b', 'ignore-space-change', None,
113 113 _('ignore changes in the amount of white space')),
114 114 ('B', 'ignore-blank-lines', None,
115 115 _('ignore changes whose lines are all blank')),
116 116 ]
117 117
118 118 diffopts2 = [
119 119 ('p', 'show-function', None, _('show which function each change is in')),
120 120 ('', 'reverse', None, _('produce a diff that undoes the changes')),
121 121 ] + diffwsopts + [
122 122 ('U', 'unified', '',
123 123 _('number of lines of context to show'), _('NUM')),
124 124 ('', 'stat', None, _('output diffstat-style summary of changes')),
125 125 ]
126 126
127 127 mergetoolopts = [
128 128 ('t', 'tool', '', _('specify merge tool')),
129 129 ]
130 130
131 131 similarityopts = [
132 132 ('s', 'similarity', '',
133 133 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
134 134 ]
135 135
136 136 subrepoopts = [
137 137 ('S', 'subrepos', None,
138 138 _('recurse into subrepositories'))
139 139 ]
140 140
141 141 # Commands start here, listed alphabetically
142 142
143 143 @command('^add',
144 144 walkopts + subrepoopts + dryrunopts,
145 145 _('[OPTION]... [FILE]...'))
146 146 def add(ui, repo, *pats, **opts):
147 147 """add the specified files on the next commit
148 148
149 149 Schedule files to be version controlled and added to the
150 150 repository.
151 151
152 152 The files will be added to the repository at the next commit. To
153 153 undo an add before that, see :hg:`forget`.
154 154
155 155 If no names are given, add all files to the repository.
156 156
157 157 .. container:: verbose
158 158
159 159 An example showing how new (unknown) files are added
160 160 automatically by :hg:`add`::
161 161
162 162 $ ls
163 163 foo.c
164 164 $ hg status
165 165 ? foo.c
166 166 $ hg add
167 167 adding foo.c
168 168 $ hg status
169 169 A foo.c
170 170
171 171 Returns 0 if all files are successfully added.
172 172 """
173 173
174 174 m = scmutil.match(repo[None], pats, opts)
175 175 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
176 176 opts.get('subrepos'), prefix="", explicitonly=False)
177 177 return rejected and 1 or 0
178 178
179 179 @command('addremove',
180 180 similarityopts + walkopts + dryrunopts,
181 181 _('[OPTION]... [FILE]...'))
182 182 def addremove(ui, repo, *pats, **opts):
183 183 """add all new files, delete all missing files
184 184
185 185 Add all new files and remove all missing files from the
186 186 repository.
187 187
188 188 New files are ignored if they match any of the patterns in
189 189 ``.hgignore``. As with add, these changes take effect at the next
190 190 commit.
191 191
192 192 Use the -s/--similarity option to detect renamed files. With a
193 193 parameter greater than 0, this compares every removed file with
194 194 every added file and records those similar enough as renames. This
195 195 option takes a percentage between 0 (disabled) and 100 (files must
196 196 be identical) as its parameter. Detecting renamed files this way
197 197 can be expensive. After using this option, :hg:`status -C` can be
198 198 used to check which files were identified as moved or renamed.
199 199
200 200 Returns 0 if all files are successfully added.
201 201 """
202 202 try:
203 203 sim = float(opts.get('similarity') or 100)
204 204 except ValueError:
205 205 raise util.Abort(_('similarity must be a number'))
206 206 if sim < 0 or sim > 100:
207 207 raise util.Abort(_('similarity must be between 0 and 100'))
208 208 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
209 209
210 210 @command('^annotate|blame',
211 211 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
212 212 ('', 'follow', None,
213 213 _('follow copies/renames and list the filename (DEPRECATED)')),
214 214 ('', 'no-follow', None, _("don't follow copies and renames")),
215 215 ('a', 'text', None, _('treat all files as text')),
216 216 ('u', 'user', None, _('list the author (long with -v)')),
217 217 ('f', 'file', None, _('list the filename')),
218 218 ('d', 'date', None, _('list the date (short with -q)')),
219 219 ('n', 'number', None, _('list the revision number (default)')),
220 220 ('c', 'changeset', None, _('list the changeset')),
221 221 ('l', 'line-number', None, _('show line number at the first appearance'))
222 222 ] + diffwsopts + walkopts,
223 223 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
224 224 def annotate(ui, repo, *pats, **opts):
225 225 """show changeset information by line for each file
226 226
227 227 List changes in files, showing the revision id responsible for
228 228 each line
229 229
230 230 This command is useful for discovering when a change was made and
231 231 by whom.
232 232
233 233 Without the -a/--text option, annotate will avoid processing files
234 234 it detects as binary. With -a, annotate will annotate the file
235 235 anyway, although the results will probably be neither useful
236 236 nor desirable.
237 237
238 238 Returns 0 on success.
239 239 """
240 240 if opts.get('follow'):
241 241 # --follow is deprecated and now just an alias for -f/--file
242 242 # to mimic the behavior of Mercurial before version 1.5
243 243 opts['file'] = True
244 244
245 245 datefunc = ui.quiet and util.shortdate or util.datestr
246 246 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
247 247
248 248 if not pats:
249 249 raise util.Abort(_('at least one filename or pattern is required'))
250 250
251 251 hexfn = ui.debugflag and hex or short
252 252
253 253 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
254 254 ('number', ' ', lambda x: str(x[0].rev())),
255 255 ('changeset', ' ', lambda x: hexfn(x[0].node())),
256 256 ('date', ' ', getdate),
257 257 ('file', ' ', lambda x: x[0].path()),
258 258 ('line_number', ':', lambda x: str(x[1])),
259 259 ]
260 260
261 261 if (not opts.get('user') and not opts.get('changeset')
262 262 and not opts.get('date') and not opts.get('file')):
263 263 opts['number'] = True
264 264
265 265 linenumber = opts.get('line_number') is not None
266 266 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
267 267 raise util.Abort(_('at least one of -n/-c is required for -l'))
268 268
269 269 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
270 270 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
271 271
272 272 def bad(x, y):
273 273 raise util.Abort("%s: %s" % (x, y))
274 274
275 275 ctx = scmutil.revsingle(repo, opts.get('rev'))
276 276 m = scmutil.match(ctx, pats, opts)
277 277 m.bad = bad
278 278 follow = not opts.get('no_follow')
279 279 diffopts = patch.diffopts(ui, opts, section='annotate')
280 280 for abs in ctx.walk(m):
281 281 fctx = ctx[abs]
282 282 if not opts.get('text') and util.binary(fctx.data()):
283 283 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
284 284 continue
285 285
286 286 lines = fctx.annotate(follow=follow, linenumber=linenumber,
287 287 diffopts=diffopts)
288 288 pieces = []
289 289
290 290 for f, sep in funcmap:
291 291 l = [f(n) for n, dummy in lines]
292 292 if l:
293 293 sized = [(x, encoding.colwidth(x)) for x in l]
294 294 ml = max([w for x, w in sized])
295 295 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
296 296 for x, w in sized])
297 297
298 298 if pieces:
299 299 for p, l in zip(zip(*pieces), lines):
300 300 ui.write("%s: %s" % ("".join(p), l[1]))
301 301
302 302 if lines and not lines[-1][1].endswith('\n'):
303 303 ui.write('\n')
304 304
305 305 @command('archive',
306 306 [('', 'no-decode', None, _('do not pass files through decoders')),
307 307 ('p', 'prefix', '', _('directory prefix for files in archive'),
308 308 _('PREFIX')),
309 309 ('r', 'rev', '', _('revision to distribute'), _('REV')),
310 310 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
311 311 ] + subrepoopts + walkopts,
312 312 _('[OPTION]... DEST'))
313 313 def archive(ui, repo, dest, **opts):
314 314 '''create an unversioned archive of a repository revision
315 315
316 316 By default, the revision used is the parent of the working
317 317 directory; use -r/--rev to specify a different revision.
318 318
319 319 The archive type is automatically detected based on file
320 320 extension (or override using -t/--type).
321 321
322 322 .. container:: verbose
323 323
324 324 Examples:
325 325
326 326 - create a zip file containing the 1.0 release::
327 327
328 328 hg archive -r 1.0 project-1.0.zip
329 329
330 330 - create a tarball excluding .hg files::
331 331
332 332 hg archive project.tar.gz -X ".hg*"
333 333
334 334 Valid types are:
335 335
336 336 :``files``: a directory full of files (default)
337 337 :``tar``: tar archive, uncompressed
338 338 :``tbz2``: tar archive, compressed using bzip2
339 339 :``tgz``: tar archive, compressed using gzip
340 340 :``uzip``: zip archive, uncompressed
341 341 :``zip``: zip archive, compressed using deflate
342 342
343 343 The exact name of the destination archive or directory is given
344 344 using a format string; see :hg:`help export` for details.
345 345
346 346 Each member added to an archive file has a directory prefix
347 347 prepended. Use -p/--prefix to specify a format string for the
348 348 prefix. The default is the basename of the archive, with suffixes
349 349 removed.
350 350
351 351 Returns 0 on success.
352 352 '''
353 353
354 354 ctx = scmutil.revsingle(repo, opts.get('rev'))
355 355 if not ctx:
356 356 raise util.Abort(_('no working directory: please specify a revision'))
357 357 node = ctx.node()
358 358 dest = cmdutil.makefilename(repo, dest, node)
359 359 if os.path.realpath(dest) == repo.root:
360 360 raise util.Abort(_('repository root cannot be destination'))
361 361
362 362 kind = opts.get('type') or archival.guesskind(dest) or 'files'
363 363 prefix = opts.get('prefix')
364 364
365 365 if dest == '-':
366 366 if kind == 'files':
367 367 raise util.Abort(_('cannot archive plain files to stdout'))
368 368 dest = cmdutil.makefileobj(repo, dest)
369 369 if not prefix:
370 370 prefix = os.path.basename(repo.root) + '-%h'
371 371
372 372 prefix = cmdutil.makefilename(repo, prefix, node)
373 373 matchfn = scmutil.match(ctx, [], opts)
374 374 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
375 375 matchfn, prefix, subrepos=opts.get('subrepos'))
376 376
377 377 @command('backout',
378 378 [('', 'merge', None, _('merge with old dirstate parent after backout')),
379 379 ('', 'parent', '',
380 380 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
381 381 ('r', 'rev', '', _('revision to backout'), _('REV')),
382 382 ] + mergetoolopts + walkopts + commitopts + commitopts2,
383 383 _('[OPTION]... [-r] REV'))
384 384 def backout(ui, repo, node=None, rev=None, **opts):
385 385 '''reverse effect of earlier changeset
386 386
387 387 Prepare a new changeset with the effect of REV undone in the
388 388 current working directory.
389 389
390 390 If REV is the parent of the working directory, then this new changeset
391 391 is committed automatically. Otherwise, hg needs to merge the
392 392 changes and the merged result is left uncommitted.
393 393
394 394 .. note::
395 395 backout cannot be used to fix either an unwanted or
396 396 incorrect merge.
397 397
398 398 .. container:: verbose
399 399
400 400 By default, the pending changeset will have one parent,
401 401 maintaining a linear history. With --merge, the pending
402 402 changeset will instead have two parents: the old parent of the
403 403 working directory and a new child of REV that simply undoes REV.
404 404
405 405 Before version 1.7, the behavior without --merge was equivalent
406 406 to specifying --merge followed by :hg:`update --clean .` to
407 407 cancel the merge and leave the child of REV as a head to be
408 408 merged separately.
409 409
410 410 See :hg:`help dates` for a list of formats valid for -d/--date.
411 411
412 412 Returns 0 on success.
413 413 '''
414 414 if rev and node:
415 415 raise util.Abort(_("please specify just one revision"))
416 416
417 417 if not rev:
418 418 rev = node
419 419
420 420 if not rev:
421 421 raise util.Abort(_("please specify a revision to backout"))
422 422
423 423 date = opts.get('date')
424 424 if date:
425 425 opts['date'] = util.parsedate(date)
426 426
427 427 cmdutil.bailifchanged(repo)
428 428 node = scmutil.revsingle(repo, rev).node()
429 429
430 430 op1, op2 = repo.dirstate.parents()
431 431 a = repo.changelog.ancestor(op1, node)
432 432 if a != node:
433 433 raise util.Abort(_('cannot backout change on a different branch'))
434 434
435 435 p1, p2 = repo.changelog.parents(node)
436 436 if p1 == nullid:
437 437 raise util.Abort(_('cannot backout a change with no parents'))
438 438 if p2 != nullid:
439 439 if not opts.get('parent'):
440 440 raise util.Abort(_('cannot backout a merge changeset'))
441 441 p = repo.lookup(opts['parent'])
442 442 if p not in (p1, p2):
443 443 raise util.Abort(_('%s is not a parent of %s') %
444 444 (short(p), short(node)))
445 445 parent = p
446 446 else:
447 447 if opts.get('parent'):
448 448 raise util.Abort(_('cannot use --parent on non-merge changeset'))
449 449 parent = p1
450 450
451 451 # the backout should appear on the same branch
452 452 branch = repo.dirstate.branch()
453 453 hg.clean(repo, node, show_stats=False)
454 454 repo.dirstate.setbranch(branch)
455 455 revert_opts = opts.copy()
456 456 revert_opts['date'] = None
457 457 revert_opts['all'] = True
458 458 revert_opts['rev'] = hex(parent)
459 459 revert_opts['no_backup'] = None
460 460 revert(ui, repo, **revert_opts)
461 461 if not opts.get('merge') and op1 != node:
462 462 try:
463 463 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
464 464 return hg.update(repo, op1)
465 465 finally:
466 466 ui.setconfig('ui', 'forcemerge', '')
467 467
468 468 commit_opts = opts.copy()
469 469 commit_opts['addremove'] = False
470 470 if not commit_opts['message'] and not commit_opts['logfile']:
471 471 # we don't translate commit messages
472 472 commit_opts['message'] = "Backed out changeset %s" % short(node)
473 473 commit_opts['force_editor'] = True
474 474 commit(ui, repo, **commit_opts)
475 475 def nice(node):
476 476 return '%d:%s' % (repo.changelog.rev(node), short(node))
477 477 ui.status(_('changeset %s backs out changeset %s\n') %
478 478 (nice(repo.changelog.tip()), nice(node)))
479 479 if opts.get('merge') and op1 != node:
480 480 hg.clean(repo, op1, show_stats=False)
481 481 ui.status(_('merging with changeset %s\n')
482 482 % nice(repo.changelog.tip()))
483 483 try:
484 484 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
485 485 return hg.merge(repo, hex(repo.changelog.tip()))
486 486 finally:
487 487 ui.setconfig('ui', 'forcemerge', '')
488 488 return 0
489 489
490 490 @command('bisect',
491 491 [('r', 'reset', False, _('reset bisect state')),
492 492 ('g', 'good', False, _('mark changeset good')),
493 493 ('b', 'bad', False, _('mark changeset bad')),
494 494 ('s', 'skip', False, _('skip testing changeset')),
495 495 ('e', 'extend', False, _('extend the bisect range')),
496 496 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
497 497 ('U', 'noupdate', False, _('do not update to target'))],
498 498 _("[-gbsr] [-U] [-c CMD] [REV]"))
499 499 def bisect(ui, repo, rev=None, extra=None, command=None,
500 500 reset=None, good=None, bad=None, skip=None, extend=None,
501 501 noupdate=None):
502 502 """subdivision search of changesets
503 503
504 504 This command helps to find changesets which introduce problems. To
505 505 use, mark the earliest changeset you know exhibits the problem as
506 506 bad, then mark the latest changeset which is free from the problem
507 507 as good. Bisect will update your working directory to a revision
508 508 for testing (unless the -U/--noupdate option is specified). Once
509 509 you have performed tests, mark the working directory as good or
510 510 bad, and bisect will either update to another candidate changeset
511 511 or announce that it has found the bad revision.
512 512
513 513 As a shortcut, you can also use the revision argument to mark a
514 514 revision as good or bad without checking it out first.
515 515
516 516 If you supply a command, it will be used for automatic bisection.
517 517 Its exit status will be used to mark revisions as good or bad:
518 518 status 0 means good, 125 means to skip the revision, 127
519 519 (command not found) will abort the bisection, and any other
520 520 non-zero exit status means the revision is bad.
521 521
522 522 .. container:: verbose
523 523
524 524 Some examples:
525 525
526 526 - start a bisection with known bad revision 12, and good revision 34::
527 527
528 528 hg bisect --bad 34
529 529 hg bisect --good 12
530 530
531 531 - advance the current bisection by marking current revision as good or
532 532 bad::
533 533
534 534 hg bisect --good
535 535 hg bisect --bad
536 536
537 537 - mark the current revision, or a known revision, to be skipped (eg. if
538 538 that revision is not usable because of another issue)::
539 539
540 540 hg bisect --skip
541 541 hg bisect --skip 23
542 542
543 543 - forget the current bisection::
544 544
545 545 hg bisect --reset
546 546
547 547 - use 'make && make tests' to automatically find the first broken
548 548 revision::
549 549
550 550 hg bisect --reset
551 551 hg bisect --bad 34
552 552 hg bisect --good 12
553 553 hg bisect --command 'make && make tests'
554 554
555 555 - see all changesets whose states are already known in the current
556 556 bisection::
557 557
558 558 hg log -r "bisect(pruned)"
559 559
560 560 - see all changesets that took part in the current bisection::
561 561
562 562 hg log -r "bisect(range)"
563 563
564 564 - with the graphlog extension, you can even get a nice graph::
565 565
566 566 hg log --graph -r "bisect(range)"
567 567
568 568 See :hg:`help revsets` for more about the `bisect()` keyword.
569 569
570 570 Returns 0 on success.
571 571 """
572 572 def extendbisectrange(nodes, good):
573 573 # bisect is incomplete when it ends on a merge node and
574 574 # one of the parent was not checked.
575 575 parents = repo[nodes[0]].parents()
576 576 if len(parents) > 1:
577 577 side = good and state['bad'] or state['good']
578 578 num = len(set(i.node() for i in parents) & set(side))
579 579 if num == 1:
580 580 return parents[0].ancestor(parents[1])
581 581 return None
582 582
583 583 def print_result(nodes, good):
584 584 displayer = cmdutil.show_changeset(ui, repo, {})
585 585 if len(nodes) == 1:
586 586 # narrowed it down to a single revision
587 587 if good:
588 588 ui.write(_("The first good revision is:\n"))
589 589 else:
590 590 ui.write(_("The first bad revision is:\n"))
591 591 displayer.show(repo[nodes[0]])
592 592 extendnode = extendbisectrange(nodes, good)
593 593 if extendnode is not None:
594 594 ui.write(_('Not all ancestors of this changeset have been'
595 595 ' checked.\nUse bisect --extend to continue the '
596 596 'bisection from\nthe common ancestor, %s.\n')
597 597 % extendnode)
598 598 else:
599 599 # multiple possible revisions
600 600 if good:
601 601 ui.write(_("Due to skipped revisions, the first "
602 602 "good revision could be any of:\n"))
603 603 else:
604 604 ui.write(_("Due to skipped revisions, the first "
605 605 "bad revision could be any of:\n"))
606 606 for n in nodes:
607 607 displayer.show(repo[n])
608 608 displayer.close()
609 609
610 610 def check_state(state, interactive=True):
611 611 if not state['good'] or not state['bad']:
612 612 if (good or bad or skip or reset) and interactive:
613 613 return
614 614 if not state['good']:
615 615 raise util.Abort(_('cannot bisect (no known good revisions)'))
616 616 else:
617 617 raise util.Abort(_('cannot bisect (no known bad revisions)'))
618 618 return True
619 619
620 620 # backward compatibility
621 621 if rev in "good bad reset init".split():
622 622 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
623 623 cmd, rev, extra = rev, extra, None
624 624 if cmd == "good":
625 625 good = True
626 626 elif cmd == "bad":
627 627 bad = True
628 628 else:
629 629 reset = True
630 630 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
631 631 raise util.Abort(_('incompatible arguments'))
632 632
633 633 if reset:
634 634 p = repo.join("bisect.state")
635 635 if os.path.exists(p):
636 636 os.unlink(p)
637 637 return
638 638
639 639 state = hbisect.load_state(repo)
640 640
641 641 if command:
642 642 changesets = 1
643 643 try:
644 644 while changesets:
645 645 # update state
646 646 status = util.system(command, out=ui.fout)
647 647 if status == 125:
648 648 transition = "skip"
649 649 elif status == 0:
650 650 transition = "good"
651 651 # status < 0 means process was killed
652 652 elif status == 127:
653 653 raise util.Abort(_("failed to execute %s") % command)
654 654 elif status < 0:
655 655 raise util.Abort(_("%s killed") % command)
656 656 else:
657 657 transition = "bad"
658 658 ctx = scmutil.revsingle(repo, rev)
659 659 rev = None # clear for future iterations
660 660 state[transition].append(ctx.node())
661 661 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
662 662 check_state(state, interactive=False)
663 663 # bisect
664 664 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
665 665 # update to next check
666 666 cmdutil.bailifchanged(repo)
667 667 hg.clean(repo, nodes[0], show_stats=False)
668 668 finally:
669 669 hbisect.save_state(repo, state)
670 670 print_result(nodes, good)
671 671 return
672 672
673 673 # update state
674 674
675 675 if rev:
676 676 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
677 677 else:
678 678 nodes = [repo.lookup('.')]
679 679
680 680 if good or bad or skip:
681 681 if good:
682 682 state['good'] += nodes
683 683 elif bad:
684 684 state['bad'] += nodes
685 685 elif skip:
686 686 state['skip'] += nodes
687 687 hbisect.save_state(repo, state)
688 688
689 689 if not check_state(state):
690 690 return
691 691
692 692 # actually bisect
693 693 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
694 694 if extend:
695 695 if not changesets:
696 696 extendnode = extendbisectrange(nodes, good)
697 697 if extendnode is not None:
698 698 ui.write(_("Extending search to changeset %d:%s\n"
699 699 % (extendnode.rev(), extendnode)))
700 700 if noupdate:
701 701 return
702 702 cmdutil.bailifchanged(repo)
703 703 return hg.clean(repo, extendnode.node())
704 704 raise util.Abort(_("nothing to extend"))
705 705
706 706 if changesets == 0:
707 707 print_result(nodes, good)
708 708 else:
709 709 assert len(nodes) == 1 # only a single node can be tested next
710 710 node = nodes[0]
711 711 # compute the approximate number of remaining tests
712 712 tests, size = 0, 2
713 713 while size <= changesets:
714 714 tests, size = tests + 1, size * 2
715 715 rev = repo.changelog.rev(node)
716 716 ui.write(_("Testing changeset %d:%s "
717 717 "(%d changesets remaining, ~%d tests)\n")
718 718 % (rev, short(node), changesets, tests))
719 719 if not noupdate:
720 720 cmdutil.bailifchanged(repo)
721 721 return hg.clean(repo, node)
722 722
723 723 @command('bookmarks',
724 724 [('f', 'force', False, _('force')),
725 725 ('r', 'rev', '', _('revision'), _('REV')),
726 726 ('d', 'delete', False, _('delete a given bookmark')),
727 727 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
728 728 ('i', 'inactive', False, _('mark a bookmark inactive'))],
729 729 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
730 730 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
731 731 rename=None, inactive=False):
732 732 '''track a line of development with movable markers
733 733
734 734 Bookmarks are pointers to certain commits that move when committing.
735 735 Bookmarks are local. They can be renamed, copied and deleted. It is
736 736 possible to use :hg:`merge NAME` to merge from a given bookmark, and
737 737 :hg:`update NAME` to update to a given bookmark.
738 738
739 739 You can use :hg:`bookmark NAME` to set a bookmark on the working
740 740 directory's parent revision with the given name. If you specify
741 741 a revision using -r REV (where REV may be an existing bookmark),
742 742 the bookmark is assigned to that revision.
743 743
744 744 Bookmarks can be pushed and pulled between repositories (see :hg:`help
745 745 push` and :hg:`help pull`). This requires both the local and remote
746 746 repositories to support bookmarks. For versions prior to 1.8, this means
747 747 the bookmarks extension must be enabled.
748 748
749 749 With -i/--inactive, the new bookmark will not be made the active
750 750 bookmark. If -r/--rev is given, the new bookmark will not be made
751 751 active even if -i/--inactive is not given. If no NAME is given, the
752 752 current active bookmark will be marked inactive.
753 753 '''
754 754 hexfn = ui.debugflag and hex or short
755 755 marks = repo._bookmarks
756 756 cur = repo.changectx('.').node()
757 757
758 758 if delete:
759 759 if mark is None:
760 760 raise util.Abort(_("bookmark name required"))
761 761 if mark not in marks:
762 762 raise util.Abort(_("bookmark '%s' does not exist") % mark)
763 763 if mark == repo._bookmarkcurrent:
764 764 bookmarks.setcurrent(repo, None)
765 765 del marks[mark]
766 766 bookmarks.write(repo)
767 767 return
768 768
769 769 if rename:
770 770 if rename not in marks:
771 771 raise util.Abort(_("bookmark '%s' does not exist") % rename)
772 772 if mark in marks and not force:
773 773 raise util.Abort(_("bookmark '%s' already exists "
774 774 "(use -f to force)") % mark)
775 775 if mark is None:
776 776 raise util.Abort(_("new bookmark name required"))
777 777 marks[mark] = marks[rename]
778 778 if repo._bookmarkcurrent == rename and not inactive:
779 779 bookmarks.setcurrent(repo, mark)
780 780 del marks[rename]
781 781 bookmarks.write(repo)
782 782 return
783 783
784 784 if mark is not None:
785 785 if "\n" in mark:
786 786 raise util.Abort(_("bookmark name cannot contain newlines"))
787 787 mark = mark.strip()
788 788 if not mark:
789 789 raise util.Abort(_("bookmark names cannot consist entirely of "
790 790 "whitespace"))
791 791 if inactive and mark == repo._bookmarkcurrent:
792 792 bookmarks.setcurrent(repo, None)
793 793 return
794 794 if mark in marks and not force:
795 795 raise util.Abort(_("bookmark '%s' already exists "
796 796 "(use -f to force)") % mark)
797 797 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
798 798 and not force):
799 799 raise util.Abort(
800 800 _("a bookmark cannot have the name of an existing branch"))
801 801 if rev:
802 802 marks[mark] = repo.lookup(rev)
803 803 else:
804 804 marks[mark] = cur
805 805 if not inactive and cur == marks[mark]:
806 806 bookmarks.setcurrent(repo, mark)
807 807 bookmarks.write(repo)
808 808 return
809 809
810 810 if mark is None:
811 811 if rev:
812 812 raise util.Abort(_("bookmark name required"))
813 813 if len(marks) == 0:
814 814 ui.status(_("no bookmarks set\n"))
815 815 else:
816 816 for bmark, n in sorted(marks.iteritems()):
817 817 current = repo._bookmarkcurrent
818 818 if bmark == current and n == cur:
819 819 prefix, label = '*', 'bookmarks.current'
820 820 else:
821 821 prefix, label = ' ', ''
822 822
823 823 if ui.quiet:
824 824 ui.write("%s\n" % bmark, label=label)
825 825 else:
826 826 ui.write(" %s %-25s %d:%s\n" % (
827 827 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
828 828 label=label)
829 829 return
830 830
831 831 @command('branch',
832 832 [('f', 'force', None,
833 833 _('set branch name even if it shadows an existing branch')),
834 834 ('C', 'clean', None, _('reset branch name to parent branch name'))],
835 835 _('[-fC] [NAME]'))
836 836 def branch(ui, repo, label=None, **opts):
837 837 """set or show the current branch name
838 838
839 839 .. note::
840 840 Branch names are permanent and global. Use :hg:`bookmark` to create a
841 841 light-weight bookmark instead. See :hg:`help glossary` for more
842 842 information about named branches and bookmarks.
843 843
844 844 With no argument, show the current branch name. With one argument,
845 845 set the working directory branch name (the branch will not exist
846 846 in the repository until the next commit). Standard practice
847 847 recommends that primary development take place on the 'default'
848 848 branch.
849 849
850 850 Unless -f/--force is specified, branch will not let you set a
851 851 branch name that already exists, even if it's inactive.
852 852
853 853 Use -C/--clean to reset the working directory branch to that of
854 854 the parent of the working directory, negating a previous branch
855 855 change.
856 856
857 857 Use the command :hg:`update` to switch to an existing branch. Use
858 858 :hg:`commit --close-branch` to mark this branch as closed.
859 859
860 860 Returns 0 on success.
861 861 """
862 862
863 863 if opts.get('clean'):
864 864 label = repo[None].p1().branch()
865 865 repo.dirstate.setbranch(label)
866 866 ui.status(_('reset working directory to branch %s\n') % label)
867 867 elif label:
868 868 if not opts.get('force') and label in repo.branchtags():
869 869 if label not in [p.branch() for p in repo.parents()]:
870 870 raise util.Abort(_('a branch of the same name already exists'),
871 871 # i18n: "it" refers to an existing branch
872 872 hint=_("use 'hg update' to switch to it"))
873 873 repo.dirstate.setbranch(label)
874 874 ui.status(_('marked working directory as branch %s\n') % label)
875 875 ui.status(_('(branches are permanent and global, '
876 876 'did you want a bookmark?)\n'))
877 877 else:
878 878 ui.write("%s\n" % repo.dirstate.branch())
879 879
880 880 @command('branches',
881 881 [('a', 'active', False, _('show only branches that have unmerged heads')),
882 882 ('c', 'closed', False, _('show normal and closed branches'))],
883 883 _('[-ac]'))
884 884 def branches(ui, repo, active=False, closed=False):
885 885 """list repository named branches
886 886
887 887 List the repository's named branches, indicating which ones are
888 888 inactive. If -c/--closed is specified, also list branches which have
889 889 been marked closed (see :hg:`commit --close-branch`).
890 890
891 891 If -a/--active is specified, only show active branches. A branch
892 892 is considered active if it contains repository heads.
893 893
894 894 Use the command :hg:`update` to switch to an existing branch.
895 895
896 896 Returns 0.
897 897 """
898 898
899 899 hexfunc = ui.debugflag and hex or short
900 900 activebranches = [repo[n].branch() for n in repo.heads()]
901 901 def testactive(tag, node):
902 902 realhead = tag in activebranches
903 903 open = node in repo.branchheads(tag, closed=False)
904 904 return realhead and open
905 905 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
906 906 for tag, node in repo.branchtags().items()],
907 907 reverse=True)
908 908
909 909 for isactive, node, tag in branches:
910 910 if (not active) or isactive:
911 911 if ui.quiet:
912 912 ui.write("%s\n" % tag)
913 913 else:
914 914 hn = repo.lookup(node)
915 915 if isactive:
916 916 label = 'branches.active'
917 917 notice = ''
918 918 elif hn not in repo.branchheads(tag, closed=False):
919 919 if not closed:
920 920 continue
921 921 label = 'branches.closed'
922 922 notice = _(' (closed)')
923 923 else:
924 924 label = 'branches.inactive'
925 925 notice = _(' (inactive)')
926 926 if tag == repo.dirstate.branch():
927 927 label = 'branches.current'
928 928 rev = str(node).rjust(31 - encoding.colwidth(tag))
929 929 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
930 930 tag = ui.label(tag, label)
931 931 ui.write("%s %s%s\n" % (tag, rev, notice))
932 932
933 933 @command('bundle',
934 934 [('f', 'force', None, _('run even when the destination is unrelated')),
935 935 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
936 936 _('REV')),
937 937 ('b', 'branch', [], _('a specific branch you would like to bundle'),
938 938 _('BRANCH')),
939 939 ('', 'base', [],
940 940 _('a base changeset assumed to be available at the destination'),
941 941 _('REV')),
942 942 ('a', 'all', None, _('bundle all changesets in the repository')),
943 943 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
944 944 ] + remoteopts,
945 945 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
946 946 def bundle(ui, repo, fname, dest=None, **opts):
947 947 """create a changegroup file
948 948
949 949 Generate a compressed changegroup file collecting changesets not
950 950 known to be in another repository.
951 951
952 952 If you omit the destination repository, then hg assumes the
953 953 destination will have all the nodes you specify with --base
954 954 parameters. To create a bundle containing all changesets, use
955 955 -a/--all (or --base null).
956 956
957 957 You can change compression method with the -t/--type option.
958 958 The available compression methods are: none, bzip2, and
959 959 gzip (by default, bundles are compressed using bzip2).
960 960
961 961 The bundle file can then be transferred using conventional means
962 962 and applied to another repository with the unbundle or pull
963 963 command. This is useful when direct push and pull are not
964 964 available or when exporting an entire repository is undesirable.
965 965
966 966 Applying bundles preserves all changeset contents including
967 967 permissions, copy/rename information, and revision history.
968 968
969 969 Returns 0 on success, 1 if no changes found.
970 970 """
971 971 revs = None
972 972 if 'rev' in opts:
973 973 revs = scmutil.revrange(repo, opts['rev'])
974 974
975 975 if opts.get('all'):
976 976 base = ['null']
977 977 else:
978 978 base = scmutil.revrange(repo, opts.get('base'))
979 979 if base:
980 980 if dest:
981 981 raise util.Abort(_("--base is incompatible with specifying "
982 982 "a destination"))
983 983 common = [repo.lookup(rev) for rev in base]
984 984 heads = revs and map(repo.lookup, revs) or revs
985 985 cg = repo.getbundle('bundle', heads=heads, common=common)
986 986 outgoing = None
987 987 else:
988 988 dest = ui.expandpath(dest or 'default-push', dest or 'default')
989 989 dest, branches = hg.parseurl(dest, opts.get('branch'))
990 990 other = hg.peer(repo, opts, dest)
991 991 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
992 992 heads = revs and map(repo.lookup, revs) or revs
993 993 outgoing = discovery.findcommonoutgoing(repo, other,
994 994 onlyheads=heads,
995 995 force=opts.get('force'))
996 996 cg = repo.getlocalbundle('bundle', outgoing)
997 997 if not cg:
998 998 scmutil.nochangesfound(ui, outgoing and outgoing.excluded)
999 999 return 1
1000 1000
1001 1001 bundletype = opts.get('type', 'bzip2').lower()
1002 1002 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1003 1003 bundletype = btypes.get(bundletype)
1004 1004 if bundletype not in changegroup.bundletypes:
1005 1005 raise util.Abort(_('unknown bundle type specified with --type'))
1006 1006
1007 1007 changegroup.writebundle(cg, fname, bundletype)
1008 1008
1009 1009 @command('cat',
1010 1010 [('o', 'output', '',
1011 1011 _('print output to file with formatted name'), _('FORMAT')),
1012 1012 ('r', 'rev', '', _('print the given revision'), _('REV')),
1013 1013 ('', 'decode', None, _('apply any matching decode filter')),
1014 1014 ] + walkopts,
1015 1015 _('[OPTION]... FILE...'))
1016 1016 def cat(ui, repo, file1, *pats, **opts):
1017 1017 """output the current or given revision of files
1018 1018
1019 1019 Print the specified files as they were at the given revision. If
1020 1020 no revision is given, the parent of the working directory is used,
1021 1021 or tip if no revision is checked out.
1022 1022
1023 1023 Output may be to a file, in which case the name of the file is
1024 1024 given using a format string. The formatting rules are the same as
1025 1025 for the export command, with the following additions:
1026 1026
1027 1027 :``%s``: basename of file being printed
1028 1028 :``%d``: dirname of file being printed, or '.' if in repository root
1029 1029 :``%p``: root-relative path name of file being printed
1030 1030
1031 1031 Returns 0 on success.
1032 1032 """
1033 1033 ctx = scmutil.revsingle(repo, opts.get('rev'))
1034 1034 err = 1
1035 1035 m = scmutil.match(ctx, (file1,) + pats, opts)
1036 1036 for abs in ctx.walk(m):
1037 1037 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1038 1038 pathname=abs)
1039 1039 data = ctx[abs].data()
1040 1040 if opts.get('decode'):
1041 1041 data = repo.wwritedata(abs, data)
1042 1042 fp.write(data)
1043 1043 fp.close()
1044 1044 err = 0
1045 1045 return err
1046 1046
1047 1047 @command('^clone',
1048 1048 [('U', 'noupdate', None,
1049 1049 _('the clone will include an empty working copy (only a repository)')),
1050 1050 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1051 1051 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1052 1052 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1053 1053 ('', 'pull', None, _('use pull protocol to copy metadata')),
1054 1054 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1055 1055 ] + remoteopts,
1056 1056 _('[OPTION]... SOURCE [DEST]'))
1057 1057 def clone(ui, source, dest=None, **opts):
1058 1058 """make a copy of an existing repository
1059 1059
1060 1060 Create a copy of an existing repository in a new directory.
1061 1061
1062 1062 If no destination directory name is specified, it defaults to the
1063 1063 basename of the source.
1064 1064
1065 1065 The location of the source is added to the new repository's
1066 1066 ``.hg/hgrc`` file, as the default to be used for future pulls.
1067 1067
1068 1068 Only local paths and ``ssh://`` URLs are supported as
1069 1069 destinations. For ``ssh://`` destinations, no working directory or
1070 1070 ``.hg/hgrc`` will be created on the remote side.
1071 1071
1072 1072 To pull only a subset of changesets, specify one or more revisions
1073 1073 identifiers with -r/--rev or branches with -b/--branch. The
1074 1074 resulting clone will contain only the specified changesets and
1075 1075 their ancestors. These options (or 'clone src#rev dest') imply
1076 1076 --pull, even for local source repositories. Note that specifying a
1077 1077 tag will include the tagged changeset but not the changeset
1078 1078 containing the tag.
1079 1079
1080 1080 To check out a particular version, use -u/--update, or
1081 1081 -U/--noupdate to create a clone with no working directory.
1082 1082
1083 1083 .. container:: verbose
1084 1084
1085 1085 For efficiency, hardlinks are used for cloning whenever the
1086 1086 source and destination are on the same filesystem (note this
1087 1087 applies only to the repository data, not to the working
1088 1088 directory). Some filesystems, such as AFS, implement hardlinking
1089 1089 incorrectly, but do not report errors. In these cases, use the
1090 1090 --pull option to avoid hardlinking.
1091 1091
1092 1092 In some cases, you can clone repositories and the working
1093 1093 directory using full hardlinks with ::
1094 1094
1095 1095 $ cp -al REPO REPOCLONE
1096 1096
1097 1097 This is the fastest way to clone, but it is not always safe. The
1098 1098 operation is not atomic (making sure REPO is not modified during
1099 1099 the operation is up to you) and you have to make sure your
1100 1100 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1101 1101 so). Also, this is not compatible with certain extensions that
1102 1102 place their metadata under the .hg directory, such as mq.
1103 1103
1104 1104 Mercurial will update the working directory to the first applicable
1105 1105 revision from this list:
1106 1106
1107 1107 a) null if -U or the source repository has no changesets
1108 1108 b) if -u . and the source repository is local, the first parent of
1109 1109 the source repository's working directory
1110 1110 c) the changeset specified with -u (if a branch name, this means the
1111 1111 latest head of that branch)
1112 1112 d) the changeset specified with -r
1113 1113 e) the tipmost head specified with -b
1114 1114 f) the tipmost head specified with the url#branch source syntax
1115 1115 g) the tipmost head of the default branch
1116 1116 h) tip
1117 1117
1118 1118 Examples:
1119 1119
1120 1120 - clone a remote repository to a new directory named hg/::
1121 1121
1122 1122 hg clone http://selenic.com/hg
1123 1123
1124 1124 - create a lightweight local clone::
1125 1125
1126 1126 hg clone project/ project-feature/
1127 1127
1128 1128 - clone from an absolute path on an ssh server (note double-slash)::
1129 1129
1130 1130 hg clone ssh://user@server//home/projects/alpha/
1131 1131
1132 1132 - do a high-speed clone over a LAN while checking out a
1133 1133 specified version::
1134 1134
1135 1135 hg clone --uncompressed http://server/repo -u 1.5
1136 1136
1137 1137 - create a repository without changesets after a particular revision::
1138 1138
1139 1139 hg clone -r 04e544 experimental/ good/
1140 1140
1141 1141 - clone (and track) a particular named branch::
1142 1142
1143 1143 hg clone http://selenic.com/hg#stable
1144 1144
1145 1145 See :hg:`help urls` for details on specifying URLs.
1146 1146
1147 1147 Returns 0 on success.
1148 1148 """
1149 1149 if opts.get('noupdate') and opts.get('updaterev'):
1150 1150 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1151 1151
1152 1152 r = hg.clone(ui, opts, source, dest,
1153 1153 pull=opts.get('pull'),
1154 1154 stream=opts.get('uncompressed'),
1155 1155 rev=opts.get('rev'),
1156 1156 update=opts.get('updaterev') or not opts.get('noupdate'),
1157 1157 branch=opts.get('branch'))
1158 1158
1159 1159 return r is None
1160 1160
1161 1161 @command('^commit|ci',
1162 1162 [('A', 'addremove', None,
1163 1163 _('mark new/missing files as added/removed before committing')),
1164 1164 ('', 'close-branch', None,
1165 1165 _('mark a branch as closed, hiding it from the branch list')),
1166 1166 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1167 1167 _('[OPTION]... [FILE]...'))
1168 1168 def commit(ui, repo, *pats, **opts):
1169 1169 """commit the specified files or all outstanding changes
1170 1170
1171 1171 Commit changes to the given files into the repository. Unlike a
1172 1172 centralized SCM, this operation is a local operation. See
1173 1173 :hg:`push` for a way to actively distribute your changes.
1174 1174
1175 1175 If a list of files is omitted, all changes reported by :hg:`status`
1176 1176 will be committed.
1177 1177
1178 1178 If you are committing the result of a merge, do not provide any
1179 1179 filenames or -I/-X filters.
1180 1180
1181 1181 If no commit message is specified, Mercurial starts your
1182 1182 configured editor where you can enter a message. In case your
1183 1183 commit fails, you will find a backup of your message in
1184 1184 ``.hg/last-message.txt``.
1185 1185
1186 1186 See :hg:`help dates` for a list of formats valid for -d/--date.
1187 1187
1188 1188 Returns 0 on success, 1 if nothing changed.
1189 1189 """
1190 1190 if opts.get('subrepos'):
1191 1191 # Let --subrepos on the command line overide config setting.
1192 1192 ui.setconfig('ui', 'commitsubrepos', True)
1193 1193
1194 1194 extra = {}
1195 1195 if opts.get('close_branch'):
1196 1196 if repo['.'].node() not in repo.branchheads():
1197 1197 # The topo heads set is included in the branch heads set of the
1198 1198 # current branch, so it's sufficient to test branchheads
1199 1199 raise util.Abort(_('can only close branch heads'))
1200 1200 extra['close'] = 1
1201 1201 e = cmdutil.commiteditor
1202 1202 if opts.get('force_editor'):
1203 1203 e = cmdutil.commitforceeditor
1204 1204
1205 1205 def commitfunc(ui, repo, message, match, opts):
1206 1206 return repo.commit(message, opts.get('user'), opts.get('date'), match,
1207 1207 editor=e, extra=extra)
1208 1208
1209 1209 branch = repo[None].branch()
1210 1210 bheads = repo.branchheads(branch)
1211 1211
1212 1212 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1213 1213 if not node:
1214 1214 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1215 1215 if stat[3]:
1216 1216 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
1217 1217 % len(stat[3]))
1218 1218 else:
1219 1219 ui.status(_("nothing changed\n"))
1220 1220 return 1
1221 1221
1222 1222 ctx = repo[node]
1223 1223 parents = ctx.parents()
1224 1224
1225 1225 if (bheads and node not in bheads and not
1226 1226 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1227 1227 ui.status(_('created new head\n'))
1228 1228 # The message is not printed for initial roots. For the other
1229 1229 # changesets, it is printed in the following situations:
1230 1230 #
1231 1231 # Par column: for the 2 parents with ...
1232 1232 # N: null or no parent
1233 1233 # B: parent is on another named branch
1234 1234 # C: parent is a regular non head changeset
1235 1235 # H: parent was a branch head of the current branch
1236 1236 # Msg column: whether we print "created new head" message
1237 1237 # In the following, it is assumed that there already exists some
1238 1238 # initial branch heads of the current branch, otherwise nothing is
1239 1239 # printed anyway.
1240 1240 #
1241 1241 # Par Msg Comment
1242 1242 # NN y additional topo root
1243 1243 #
1244 1244 # BN y additional branch root
1245 1245 # CN y additional topo head
1246 1246 # HN n usual case
1247 1247 #
1248 1248 # BB y weird additional branch root
1249 1249 # CB y branch merge
1250 1250 # HB n merge with named branch
1251 1251 #
1252 1252 # CC y additional head from merge
1253 1253 # CH n merge with a head
1254 1254 #
1255 1255 # HH n head merge: head count decreases
1256 1256
1257 1257 if not opts.get('close_branch'):
1258 1258 for r in parents:
1259 1259 if r.extra().get('close') and r.branch() == branch:
1260 1260 ui.status(_('reopening closed branch head %d\n') % r)
1261 1261
1262 1262 if ui.debugflag:
1263 1263 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1264 1264 elif ui.verbose:
1265 1265 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1266 1266
1267 1267 @command('copy|cp',
1268 1268 [('A', 'after', None, _('record a copy that has already occurred')),
1269 1269 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1270 1270 ] + walkopts + dryrunopts,
1271 1271 _('[OPTION]... [SOURCE]... DEST'))
1272 1272 def copy(ui, repo, *pats, **opts):
1273 1273 """mark files as copied for the next commit
1274 1274
1275 1275 Mark dest as having copies of source files. If dest is a
1276 1276 directory, copies are put in that directory. If dest is a file,
1277 1277 the source must be a single file.
1278 1278
1279 1279 By default, this command copies the contents of files as they
1280 1280 exist in the working directory. If invoked with -A/--after, the
1281 1281 operation is recorded, but no copying is performed.
1282 1282
1283 1283 This command takes effect with the next commit. To undo a copy
1284 1284 before that, see :hg:`revert`.
1285 1285
1286 1286 Returns 0 on success, 1 if errors are encountered.
1287 1287 """
1288 1288 wlock = repo.wlock(False)
1289 1289 try:
1290 1290 return cmdutil.copy(ui, repo, pats, opts)
1291 1291 finally:
1292 1292 wlock.release()
1293 1293
1294 1294 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1295 1295 def debugancestor(ui, repo, *args):
1296 1296 """find the ancestor revision of two revisions in a given index"""
1297 1297 if len(args) == 3:
1298 1298 index, rev1, rev2 = args
1299 1299 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1300 1300 lookup = r.lookup
1301 1301 elif len(args) == 2:
1302 1302 if not repo:
1303 1303 raise util.Abort(_("there is no Mercurial repository here "
1304 1304 "(.hg not found)"))
1305 1305 rev1, rev2 = args
1306 1306 r = repo.changelog
1307 1307 lookup = repo.lookup
1308 1308 else:
1309 1309 raise util.Abort(_('either two or three arguments required'))
1310 1310 a = r.ancestor(lookup(rev1), lookup(rev2))
1311 1311 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1312 1312
1313 1313 @command('debugbuilddag',
1314 1314 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1315 1315 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1316 1316 ('n', 'new-file', None, _('add new file at each rev'))],
1317 1317 _('[OPTION]... [TEXT]'))
1318 1318 def debugbuilddag(ui, repo, text=None,
1319 1319 mergeable_file=False,
1320 1320 overwritten_file=False,
1321 1321 new_file=False):
1322 1322 """builds a repo with a given DAG from scratch in the current empty repo
1323 1323
1324 1324 The description of the DAG is read from stdin if not given on the
1325 1325 command line.
1326 1326
1327 1327 Elements:
1328 1328
1329 1329 - "+n" is a linear run of n nodes based on the current default parent
1330 1330 - "." is a single node based on the current default parent
1331 1331 - "$" resets the default parent to null (implied at the start);
1332 1332 otherwise the default parent is always the last node created
1333 1333 - "<p" sets the default parent to the backref p
1334 1334 - "*p" is a fork at parent p, which is a backref
1335 1335 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1336 1336 - "/p2" is a merge of the preceding node and p2
1337 1337 - ":tag" defines a local tag for the preceding node
1338 1338 - "@branch" sets the named branch for subsequent nodes
1339 1339 - "#...\\n" is a comment up to the end of the line
1340 1340
1341 1341 Whitespace between the above elements is ignored.
1342 1342
1343 1343 A backref is either
1344 1344
1345 1345 - a number n, which references the node curr-n, where curr is the current
1346 1346 node, or
1347 1347 - the name of a local tag you placed earlier using ":tag", or
1348 1348 - empty to denote the default parent.
1349 1349
1350 1350 All string valued-elements are either strictly alphanumeric, or must
1351 1351 be enclosed in double quotes ("..."), with "\\" as escape character.
1352 1352 """
1353 1353
1354 1354 if text is None:
1355 1355 ui.status(_("reading DAG from stdin\n"))
1356 1356 text = ui.fin.read()
1357 1357
1358 1358 cl = repo.changelog
1359 1359 if len(cl) > 0:
1360 1360 raise util.Abort(_('repository is not empty'))
1361 1361
1362 1362 # determine number of revs in DAG
1363 1363 total = 0
1364 1364 for type, data in dagparser.parsedag(text):
1365 1365 if type == 'n':
1366 1366 total += 1
1367 1367
1368 1368 if mergeable_file:
1369 1369 linesperrev = 2
1370 1370 # make a file with k lines per rev
1371 1371 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1372 1372 initialmergedlines.append("")
1373 1373
1374 1374 tags = []
1375 1375
1376 1376 lock = tr = None
1377 1377 try:
1378 1378 lock = repo.lock()
1379 1379 tr = repo.transaction("builddag")
1380 1380
1381 1381 at = -1
1382 1382 atbranch = 'default'
1383 1383 nodeids = []
1384 1384 id = 0
1385 1385 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1386 1386 for type, data in dagparser.parsedag(text):
1387 1387 if type == 'n':
1388 1388 ui.note('node %s\n' % str(data))
1389 1389 id, ps = data
1390 1390
1391 1391 files = []
1392 1392 fctxs = {}
1393 1393
1394 1394 p2 = None
1395 1395 if mergeable_file:
1396 1396 fn = "mf"
1397 1397 p1 = repo[ps[0]]
1398 1398 if len(ps) > 1:
1399 1399 p2 = repo[ps[1]]
1400 1400 pa = p1.ancestor(p2)
1401 1401 base, local, other = [x[fn].data() for x in pa, p1, p2]
1402 1402 m3 = simplemerge.Merge3Text(base, local, other)
1403 1403 ml = [l.strip() for l in m3.merge_lines()]
1404 1404 ml.append("")
1405 1405 elif at > 0:
1406 1406 ml = p1[fn].data().split("\n")
1407 1407 else:
1408 1408 ml = initialmergedlines
1409 1409 ml[id * linesperrev] += " r%i" % id
1410 1410 mergedtext = "\n".join(ml)
1411 1411 files.append(fn)
1412 1412 fctxs[fn] = context.memfilectx(fn, mergedtext)
1413 1413
1414 1414 if overwritten_file:
1415 1415 fn = "of"
1416 1416 files.append(fn)
1417 1417 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1418 1418
1419 1419 if new_file:
1420 1420 fn = "nf%i" % id
1421 1421 files.append(fn)
1422 1422 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1423 1423 if len(ps) > 1:
1424 1424 if not p2:
1425 1425 p2 = repo[ps[1]]
1426 1426 for fn in p2:
1427 1427 if fn.startswith("nf"):
1428 1428 files.append(fn)
1429 1429 fctxs[fn] = p2[fn]
1430 1430
1431 1431 def fctxfn(repo, cx, path):
1432 1432 return fctxs.get(path)
1433 1433
1434 1434 if len(ps) == 0 or ps[0] < 0:
1435 1435 pars = [None, None]
1436 1436 elif len(ps) == 1:
1437 1437 pars = [nodeids[ps[0]], None]
1438 1438 else:
1439 1439 pars = [nodeids[p] for p in ps]
1440 1440 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1441 1441 date=(id, 0),
1442 1442 user="debugbuilddag",
1443 1443 extra={'branch': atbranch})
1444 1444 nodeid = repo.commitctx(cx)
1445 1445 nodeids.append(nodeid)
1446 1446 at = id
1447 1447 elif type == 'l':
1448 1448 id, name = data
1449 1449 ui.note('tag %s\n' % name)
1450 1450 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1451 1451 elif type == 'a':
1452 1452 ui.note('branch %s\n' % data)
1453 1453 atbranch = data
1454 1454 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1455 1455 tr.close()
1456 1456
1457 1457 if tags:
1458 1458 repo.opener.write("localtags", "".join(tags))
1459 1459 finally:
1460 1460 ui.progress(_('building'), None)
1461 1461 release(tr, lock)
1462 1462
1463 1463 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1464 1464 def debugbundle(ui, bundlepath, all=None, **opts):
1465 1465 """lists the contents of a bundle"""
1466 1466 f = url.open(ui, bundlepath)
1467 1467 try:
1468 1468 gen = changegroup.readbundle(f, bundlepath)
1469 1469 if all:
1470 1470 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1471 1471
1472 1472 def showchunks(named):
1473 1473 ui.write("\n%s\n" % named)
1474 1474 chain = None
1475 1475 while True:
1476 1476 chunkdata = gen.deltachunk(chain)
1477 1477 if not chunkdata:
1478 1478 break
1479 1479 node = chunkdata['node']
1480 1480 p1 = chunkdata['p1']
1481 1481 p2 = chunkdata['p2']
1482 1482 cs = chunkdata['cs']
1483 1483 deltabase = chunkdata['deltabase']
1484 1484 delta = chunkdata['delta']
1485 1485 ui.write("%s %s %s %s %s %s\n" %
1486 1486 (hex(node), hex(p1), hex(p2),
1487 1487 hex(cs), hex(deltabase), len(delta)))
1488 1488 chain = node
1489 1489
1490 1490 chunkdata = gen.changelogheader()
1491 1491 showchunks("changelog")
1492 1492 chunkdata = gen.manifestheader()
1493 1493 showchunks("manifest")
1494 1494 while True:
1495 1495 chunkdata = gen.filelogheader()
1496 1496 if not chunkdata:
1497 1497 break
1498 1498 fname = chunkdata['filename']
1499 1499 showchunks(fname)
1500 1500 else:
1501 1501 chunkdata = gen.changelogheader()
1502 1502 chain = None
1503 1503 while True:
1504 1504 chunkdata = gen.deltachunk(chain)
1505 1505 if not chunkdata:
1506 1506 break
1507 1507 node = chunkdata['node']
1508 1508 ui.write("%s\n" % hex(node))
1509 1509 chain = node
1510 1510 finally:
1511 1511 f.close()
1512 1512
1513 1513 @command('debugcheckstate', [], '')
1514 1514 def debugcheckstate(ui, repo):
1515 1515 """validate the correctness of the current dirstate"""
1516 1516 parent1, parent2 = repo.dirstate.parents()
1517 1517 m1 = repo[parent1].manifest()
1518 1518 m2 = repo[parent2].manifest()
1519 1519 errors = 0
1520 1520 for f in repo.dirstate:
1521 1521 state = repo.dirstate[f]
1522 1522 if state in "nr" and f not in m1:
1523 1523 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1524 1524 errors += 1
1525 1525 if state in "a" and f in m1:
1526 1526 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1527 1527 errors += 1
1528 1528 if state in "m" and f not in m1 and f not in m2:
1529 1529 ui.warn(_("%s in state %s, but not in either manifest\n") %
1530 1530 (f, state))
1531 1531 errors += 1
1532 1532 for f in m1:
1533 1533 state = repo.dirstate[f]
1534 1534 if state not in "nrm":
1535 1535 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1536 1536 errors += 1
1537 1537 if errors:
1538 1538 error = _(".hg/dirstate inconsistent with current parent's manifest")
1539 1539 raise util.Abort(error)
1540 1540
1541 1541 @command('debugcommands', [], _('[COMMAND]'))
1542 1542 def debugcommands(ui, cmd='', *args):
1543 1543 """list all available commands and options"""
1544 1544 for cmd, vals in sorted(table.iteritems()):
1545 1545 cmd = cmd.split('|')[0].strip('^')
1546 1546 opts = ', '.join([i[1] for i in vals[1]])
1547 1547 ui.write('%s: %s\n' % (cmd, opts))
1548 1548
1549 1549 @command('debugcomplete',
1550 1550 [('o', 'options', None, _('show the command options'))],
1551 1551 _('[-o] CMD'))
1552 1552 def debugcomplete(ui, cmd='', **opts):
1553 1553 """returns the completion list associated with the given command"""
1554 1554
1555 1555 if opts.get('options'):
1556 1556 options = []
1557 1557 otables = [globalopts]
1558 1558 if cmd:
1559 1559 aliases, entry = cmdutil.findcmd(cmd, table, False)
1560 1560 otables.append(entry[1])
1561 1561 for t in otables:
1562 1562 for o in t:
1563 1563 if "(DEPRECATED)" in o[3]:
1564 1564 continue
1565 1565 if o[0]:
1566 1566 options.append('-%s' % o[0])
1567 1567 options.append('--%s' % o[1])
1568 1568 ui.write("%s\n" % "\n".join(options))
1569 1569 return
1570 1570
1571 1571 cmdlist = cmdutil.findpossible(cmd, table)
1572 1572 if ui.verbose:
1573 1573 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1574 1574 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1575 1575
1576 1576 @command('debugdag',
1577 1577 [('t', 'tags', None, _('use tags as labels')),
1578 1578 ('b', 'branches', None, _('annotate with branch names')),
1579 1579 ('', 'dots', None, _('use dots for runs')),
1580 1580 ('s', 'spaces', None, _('separate elements by spaces'))],
1581 1581 _('[OPTION]... [FILE [REV]...]'))
1582 1582 def debugdag(ui, repo, file_=None, *revs, **opts):
1583 1583 """format the changelog or an index DAG as a concise textual description
1584 1584
1585 1585 If you pass a revlog index, the revlog's DAG is emitted. If you list
1586 1586 revision numbers, they get labelled in the output as rN.
1587 1587
1588 1588 Otherwise, the changelog DAG of the current repo is emitted.
1589 1589 """
1590 1590 spaces = opts.get('spaces')
1591 1591 dots = opts.get('dots')
1592 1592 if file_:
1593 1593 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1594 1594 revs = set((int(r) for r in revs))
1595 1595 def events():
1596 1596 for r in rlog:
1597 1597 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1598 1598 if r in revs:
1599 1599 yield 'l', (r, "r%i" % r)
1600 1600 elif repo:
1601 1601 cl = repo.changelog
1602 1602 tags = opts.get('tags')
1603 1603 branches = opts.get('branches')
1604 1604 if tags:
1605 1605 labels = {}
1606 1606 for l, n in repo.tags().items():
1607 1607 labels.setdefault(cl.rev(n), []).append(l)
1608 1608 def events():
1609 1609 b = "default"
1610 1610 for r in cl:
1611 1611 if branches:
1612 1612 newb = cl.read(cl.node(r))[5]['branch']
1613 1613 if newb != b:
1614 1614 yield 'a', newb
1615 1615 b = newb
1616 1616 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1617 1617 if tags:
1618 1618 ls = labels.get(r)
1619 1619 if ls:
1620 1620 for l in ls:
1621 1621 yield 'l', (r, l)
1622 1622 else:
1623 1623 raise util.Abort(_('need repo for changelog dag'))
1624 1624
1625 1625 for line in dagparser.dagtextlines(events(),
1626 1626 addspaces=spaces,
1627 1627 wraplabels=True,
1628 1628 wrapannotations=True,
1629 1629 wrapnonlinear=dots,
1630 1630 usedots=dots,
1631 1631 maxlinewidth=70):
1632 1632 ui.write(line)
1633 1633 ui.write("\n")
1634 1634
1635 1635 @command('debugdata',
1636 1636 [('c', 'changelog', False, _('open changelog')),
1637 1637 ('m', 'manifest', False, _('open manifest'))],
1638 1638 _('-c|-m|FILE REV'))
1639 1639 def debugdata(ui, repo, file_, rev = None, **opts):
1640 1640 """dump the contents of a data file revision"""
1641 1641 if opts.get('changelog') or opts.get('manifest'):
1642 1642 file_, rev = None, file_
1643 1643 elif rev is None:
1644 1644 raise error.CommandError('debugdata', _('invalid arguments'))
1645 1645 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1646 1646 try:
1647 1647 ui.write(r.revision(r.lookup(rev)))
1648 1648 except KeyError:
1649 1649 raise util.Abort(_('invalid revision identifier %s') % rev)
1650 1650
1651 1651 @command('debugdate',
1652 1652 [('e', 'extended', None, _('try extended date formats'))],
1653 1653 _('[-e] DATE [RANGE]'))
1654 1654 def debugdate(ui, date, range=None, **opts):
1655 1655 """parse and display a date"""
1656 1656 if opts["extended"]:
1657 1657 d = util.parsedate(date, util.extendeddateformats)
1658 1658 else:
1659 1659 d = util.parsedate(date)
1660 1660 ui.write("internal: %s %s\n" % d)
1661 1661 ui.write("standard: %s\n" % util.datestr(d))
1662 1662 if range:
1663 1663 m = util.matchdate(range)
1664 1664 ui.write("match: %s\n" % m(d[0]))
1665 1665
1666 1666 @command('debugdiscovery',
1667 1667 [('', 'old', None, _('use old-style discovery')),
1668 1668 ('', 'nonheads', None,
1669 1669 _('use old-style discovery with non-heads included')),
1670 1670 ] + remoteopts,
1671 1671 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1672 1672 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1673 1673 """runs the changeset discovery protocol in isolation"""
1674 1674 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
1675 1675 remote = hg.peer(repo, opts, remoteurl)
1676 1676 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1677 1677
1678 1678 # make sure tests are repeatable
1679 1679 random.seed(12323)
1680 1680
1681 1681 def doit(localheads, remoteheads):
1682 1682 if opts.get('old'):
1683 1683 if localheads:
1684 1684 raise util.Abort('cannot use localheads with old style discovery')
1685 1685 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1686 1686 force=True)
1687 1687 common = set(common)
1688 1688 if not opts.get('nonheads'):
1689 1689 ui.write("unpruned common: %s\n" % " ".join([short(n)
1690 1690 for n in common]))
1691 1691 dag = dagutil.revlogdag(repo.changelog)
1692 1692 all = dag.ancestorset(dag.internalizeall(common))
1693 1693 common = dag.externalizeall(dag.headsetofconnecteds(all))
1694 1694 else:
1695 1695 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1696 1696 common = set(common)
1697 1697 rheads = set(hds)
1698 1698 lheads = set(repo.heads())
1699 1699 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1700 1700 if lheads <= common:
1701 1701 ui.write("local is subset\n")
1702 1702 elif rheads <= common:
1703 1703 ui.write("remote is subset\n")
1704 1704
1705 1705 serverlogs = opts.get('serverlog')
1706 1706 if serverlogs:
1707 1707 for filename in serverlogs:
1708 1708 logfile = open(filename, 'r')
1709 1709 try:
1710 1710 line = logfile.readline()
1711 1711 while line:
1712 1712 parts = line.strip().split(';')
1713 1713 op = parts[1]
1714 1714 if op == 'cg':
1715 1715 pass
1716 1716 elif op == 'cgss':
1717 1717 doit(parts[2].split(' '), parts[3].split(' '))
1718 1718 elif op == 'unb':
1719 1719 doit(parts[3].split(' '), parts[2].split(' '))
1720 1720 line = logfile.readline()
1721 1721 finally:
1722 1722 logfile.close()
1723 1723
1724 1724 else:
1725 1725 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1726 1726 opts.get('remote_head'))
1727 1727 localrevs = opts.get('local_head')
1728 1728 doit(localrevs, remoterevs)
1729 1729
1730 1730 @command('debugfileset', [], ('REVSPEC'))
1731 1731 def debugfileset(ui, repo, expr):
1732 1732 '''parse and apply a fileset specification'''
1733 1733 if ui.verbose:
1734 1734 tree = fileset.parse(expr)[0]
1735 1735 ui.note(tree, "\n")
1736 1736
1737 1737 for f in fileset.getfileset(repo[None], expr):
1738 1738 ui.write("%s\n" % f)
1739 1739
1740 1740 @command('debugfsinfo', [], _('[PATH]'))
1741 1741 def debugfsinfo(ui, path = "."):
1742 1742 """show information detected about current filesystem"""
1743 1743 util.writefile('.debugfsinfo', '')
1744 1744 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1745 1745 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1746 1746 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1747 1747 and 'yes' or 'no'))
1748 1748 os.unlink('.debugfsinfo')
1749 1749
1750 1750 @command('debuggetbundle',
1751 1751 [('H', 'head', [], _('id of head node'), _('ID')),
1752 1752 ('C', 'common', [], _('id of common node'), _('ID')),
1753 1753 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1754 1754 _('REPO FILE [-H|-C ID]...'))
1755 1755 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1756 1756 """retrieves a bundle from a repo
1757 1757
1758 1758 Every ID must be a full-length hex node id string. Saves the bundle to the
1759 1759 given file.
1760 1760 """
1761 1761 repo = hg.peer(ui, opts, repopath)
1762 1762 if not repo.capable('getbundle'):
1763 1763 raise util.Abort("getbundle() not supported by target repository")
1764 1764 args = {}
1765 1765 if common:
1766 1766 args['common'] = [bin(s) for s in common]
1767 1767 if head:
1768 1768 args['heads'] = [bin(s) for s in head]
1769 1769 bundle = repo.getbundle('debug', **args)
1770 1770
1771 1771 bundletype = opts.get('type', 'bzip2').lower()
1772 1772 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1773 1773 bundletype = btypes.get(bundletype)
1774 1774 if bundletype not in changegroup.bundletypes:
1775 1775 raise util.Abort(_('unknown bundle type specified with --type'))
1776 1776 changegroup.writebundle(bundle, bundlepath, bundletype)
1777 1777
1778 1778 @command('debugignore', [], '')
1779 1779 def debugignore(ui, repo, *values, **opts):
1780 1780 """display the combined ignore pattern"""
1781 1781 ignore = repo.dirstate._ignore
1782 1782 includepat = getattr(ignore, 'includepat', None)
1783 1783 if includepat is not None:
1784 1784 ui.write("%s\n" % includepat)
1785 1785 else:
1786 1786 raise util.Abort(_("no ignore patterns found"))
1787 1787
1788 1788 @command('debugindex',
1789 1789 [('c', 'changelog', False, _('open changelog')),
1790 1790 ('m', 'manifest', False, _('open manifest')),
1791 1791 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1792 1792 _('[-f FORMAT] -c|-m|FILE'))
1793 1793 def debugindex(ui, repo, file_ = None, **opts):
1794 1794 """dump the contents of an index file"""
1795 1795 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1796 1796 format = opts.get('format', 0)
1797 1797 if format not in (0, 1):
1798 1798 raise util.Abort(_("unknown format %d") % format)
1799 1799
1800 1800 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1801 1801 if generaldelta:
1802 1802 basehdr = ' delta'
1803 1803 else:
1804 1804 basehdr = ' base'
1805 1805
1806 1806 if format == 0:
1807 1807 ui.write(" rev offset length " + basehdr + " linkrev"
1808 1808 " nodeid p1 p2\n")
1809 1809 elif format == 1:
1810 1810 ui.write(" rev flag offset length"
1811 1811 " size " + basehdr + " link p1 p2 nodeid\n")
1812 1812
1813 1813 for i in r:
1814 1814 node = r.node(i)
1815 1815 if generaldelta:
1816 1816 base = r.deltaparent(i)
1817 1817 else:
1818 1818 base = r.chainbase(i)
1819 1819 if format == 0:
1820 1820 try:
1821 1821 pp = r.parents(node)
1822 1822 except:
1823 1823 pp = [nullid, nullid]
1824 1824 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1825 1825 i, r.start(i), r.length(i), base, r.linkrev(i),
1826 1826 short(node), short(pp[0]), short(pp[1])))
1827 1827 elif format == 1:
1828 1828 pr = r.parentrevs(i)
1829 1829 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1830 1830 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1831 1831 base, r.linkrev(i), pr[0], pr[1], short(node)))
1832 1832
1833 1833 @command('debugindexdot', [], _('FILE'))
1834 1834 def debugindexdot(ui, repo, file_):
1835 1835 """dump an index DAG as a graphviz dot file"""
1836 1836 r = None
1837 1837 if repo:
1838 1838 filelog = repo.file(file_)
1839 1839 if len(filelog):
1840 1840 r = filelog
1841 1841 if not r:
1842 1842 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1843 1843 ui.write("digraph G {\n")
1844 1844 for i in r:
1845 1845 node = r.node(i)
1846 1846 pp = r.parents(node)
1847 1847 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1848 1848 if pp[1] != nullid:
1849 1849 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1850 1850 ui.write("}\n")
1851 1851
1852 1852 @command('debuginstall', [], '')
1853 1853 def debuginstall(ui):
1854 1854 '''test Mercurial installation
1855 1855
1856 1856 Returns 0 on success.
1857 1857 '''
1858 1858
1859 1859 def writetemp(contents):
1860 1860 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1861 1861 f = os.fdopen(fd, "wb")
1862 1862 f.write(contents)
1863 1863 f.close()
1864 1864 return name
1865 1865
1866 1866 problems = 0
1867 1867
1868 1868 # encoding
1869 1869 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1870 1870 try:
1871 1871 encoding.fromlocal("test")
1872 1872 except util.Abort, inst:
1873 1873 ui.write(" %s\n" % inst)
1874 1874 ui.write(_(" (check that your locale is properly set)\n"))
1875 1875 problems += 1
1876 1876
1877 1877 # compiled modules
1878 1878 ui.status(_("Checking installed modules (%s)...\n")
1879 1879 % os.path.dirname(__file__))
1880 1880 try:
1881 1881 import bdiff, mpatch, base85, osutil
1882 1882 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1883 1883 except Exception, inst:
1884 1884 ui.write(" %s\n" % inst)
1885 1885 ui.write(_(" One or more extensions could not be found"))
1886 1886 ui.write(_(" (check that you compiled the extensions)\n"))
1887 1887 problems += 1
1888 1888
1889 1889 # templates
1890 1890 import templater
1891 1891 p = templater.templatepath()
1892 1892 ui.status(_("Checking templates (%s)...\n") % ' '.join(p))
1893 1893 try:
1894 1894 templater.templater(templater.templatepath("map-cmdline.default"))
1895 1895 except Exception, inst:
1896 1896 ui.write(" %s\n" % inst)
1897 1897 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1898 1898 problems += 1
1899 1899
1900 1900 # editor
1901 1901 ui.status(_("Checking commit editor...\n"))
1902 1902 editor = ui.geteditor()
1903 1903 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
1904 1904 if not cmdpath:
1905 1905 if editor == 'vi':
1906 1906 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1907 1907 ui.write(_(" (specify a commit editor in your configuration"
1908 1908 " file)\n"))
1909 1909 else:
1910 1910 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1911 1911 ui.write(_(" (specify a commit editor in your configuration"
1912 1912 " file)\n"))
1913 1913 problems += 1
1914 1914
1915 1915 # check username
1916 1916 ui.status(_("Checking username...\n"))
1917 1917 try:
1918 1918 ui.username()
1919 1919 except util.Abort, e:
1920 1920 ui.write(" %s\n" % e)
1921 1921 ui.write(_(" (specify a username in your configuration file)\n"))
1922 1922 problems += 1
1923 1923
1924 1924 if not problems:
1925 1925 ui.status(_("No problems detected\n"))
1926 1926 else:
1927 1927 ui.write(_("%s problems detected,"
1928 1928 " please check your install!\n") % problems)
1929 1929
1930 1930 return problems
1931 1931
1932 1932 @command('debugknown', [], _('REPO ID...'))
1933 1933 def debugknown(ui, repopath, *ids, **opts):
1934 1934 """test whether node ids are known to a repo
1935 1935
1936 1936 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
1937 1937 indicating unknown/known.
1938 1938 """
1939 1939 repo = hg.peer(ui, opts, repopath)
1940 1940 if not repo.capable('known'):
1941 1941 raise util.Abort("known() not supported by target repository")
1942 1942 flags = repo.known([bin(s) for s in ids])
1943 1943 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1944 1944
1945 1945 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
1946 1946 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1947 1947 '''access the pushkey key/value protocol
1948 1948
1949 1949 With two args, list the keys in the given namespace.
1950 1950
1951 1951 With five args, set a key to new if it currently is set to old.
1952 1952 Reports success or failure.
1953 1953 '''
1954 1954
1955 1955 target = hg.peer(ui, {}, repopath)
1956 1956 if keyinfo:
1957 1957 key, old, new = keyinfo
1958 1958 r = target.pushkey(namespace, key, old, new)
1959 1959 ui.status(str(r) + '\n')
1960 1960 return not r
1961 1961 else:
1962 1962 for k, v in target.listkeys(namespace).iteritems():
1963 1963 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1964 1964 v.encode('string-escape')))
1965 1965
1966 @command('debugpvec', [], _('A B'))
1967 def debugpvec(ui, repo, a, b=None):
1968 ca = scmutil.revsingle(repo, a)
1969 cb = scmutil.revsingle(repo, b)
1970 pa = pvec.ctxpvec(ca)
1971 pb = pvec.ctxpvec(cb)
1972 if pa == pb:
1973 rel = "="
1974 elif pa > pb:
1975 rel = ">"
1976 elif pa < pb:
1977 rel = "<"
1978 elif pa | pb:
1979 rel = "|"
1980 ui.write(_("a: %s\n") % pa)
1981 ui.write(_("b: %s\n") % pb)
1982 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
1983 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
1984 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
1985 pa.distance(pb), rel))
1986
1966 1987 @command('debugrebuildstate',
1967 1988 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
1968 1989 _('[-r REV] [REV]'))
1969 1990 def debugrebuildstate(ui, repo, rev="tip"):
1970 1991 """rebuild the dirstate as it would look like for the given revision"""
1971 1992 ctx = scmutil.revsingle(repo, rev)
1972 1993 wlock = repo.wlock()
1973 1994 try:
1974 1995 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1975 1996 finally:
1976 1997 wlock.release()
1977 1998
1978 1999 @command('debugrename',
1979 2000 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1980 2001 _('[-r REV] FILE'))
1981 2002 def debugrename(ui, repo, file1, *pats, **opts):
1982 2003 """dump rename information"""
1983 2004
1984 2005 ctx = scmutil.revsingle(repo, opts.get('rev'))
1985 2006 m = scmutil.match(ctx, (file1,) + pats, opts)
1986 2007 for abs in ctx.walk(m):
1987 2008 fctx = ctx[abs]
1988 2009 o = fctx.filelog().renamed(fctx.filenode())
1989 2010 rel = m.rel(abs)
1990 2011 if o:
1991 2012 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1992 2013 else:
1993 2014 ui.write(_("%s not renamed\n") % rel)
1994 2015
1995 2016 @command('debugrevlog',
1996 2017 [('c', 'changelog', False, _('open changelog')),
1997 2018 ('m', 'manifest', False, _('open manifest')),
1998 2019 ('d', 'dump', False, _('dump index data'))],
1999 2020 _('-c|-m|FILE'))
2000 2021 def debugrevlog(ui, repo, file_ = None, **opts):
2001 2022 """show data and statistics about a revlog"""
2002 2023 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2003 2024
2004 2025 if opts.get("dump"):
2005 2026 numrevs = len(r)
2006 2027 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2007 2028 " rawsize totalsize compression heads\n")
2008 2029 ts = 0
2009 2030 heads = set()
2010 2031 for rev in xrange(numrevs):
2011 2032 dbase = r.deltaparent(rev)
2012 2033 if dbase == -1:
2013 2034 dbase = rev
2014 2035 cbase = r.chainbase(rev)
2015 2036 p1, p2 = r.parentrevs(rev)
2016 2037 rs = r.rawsize(rev)
2017 2038 ts = ts + rs
2018 2039 heads -= set(r.parentrevs(rev))
2019 2040 heads.add(rev)
2020 2041 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2021 2042 (rev, p1, p2, r.start(rev), r.end(rev),
2022 2043 r.start(dbase), r.start(cbase),
2023 2044 r.start(p1), r.start(p2),
2024 2045 rs, ts, ts / r.end(rev), len(heads)))
2025 2046 return 0
2026 2047
2027 2048 v = r.version
2028 2049 format = v & 0xFFFF
2029 2050 flags = []
2030 2051 gdelta = False
2031 2052 if v & revlog.REVLOGNGINLINEDATA:
2032 2053 flags.append('inline')
2033 2054 if v & revlog.REVLOGGENERALDELTA:
2034 2055 gdelta = True
2035 2056 flags.append('generaldelta')
2036 2057 if not flags:
2037 2058 flags = ['(none)']
2038 2059
2039 2060 nummerges = 0
2040 2061 numfull = 0
2041 2062 numprev = 0
2042 2063 nump1 = 0
2043 2064 nump2 = 0
2044 2065 numother = 0
2045 2066 nump1prev = 0
2046 2067 nump2prev = 0
2047 2068 chainlengths = []
2048 2069
2049 2070 datasize = [None, 0, 0L]
2050 2071 fullsize = [None, 0, 0L]
2051 2072 deltasize = [None, 0, 0L]
2052 2073
2053 2074 def addsize(size, l):
2054 2075 if l[0] is None or size < l[0]:
2055 2076 l[0] = size
2056 2077 if size > l[1]:
2057 2078 l[1] = size
2058 2079 l[2] += size
2059 2080
2060 2081 numrevs = len(r)
2061 2082 for rev in xrange(numrevs):
2062 2083 p1, p2 = r.parentrevs(rev)
2063 2084 delta = r.deltaparent(rev)
2064 2085 if format > 0:
2065 2086 addsize(r.rawsize(rev), datasize)
2066 2087 if p2 != nullrev:
2067 2088 nummerges += 1
2068 2089 size = r.length(rev)
2069 2090 if delta == nullrev:
2070 2091 chainlengths.append(0)
2071 2092 numfull += 1
2072 2093 addsize(size, fullsize)
2073 2094 else:
2074 2095 chainlengths.append(chainlengths[delta] + 1)
2075 2096 addsize(size, deltasize)
2076 2097 if delta == rev - 1:
2077 2098 numprev += 1
2078 2099 if delta == p1:
2079 2100 nump1prev += 1
2080 2101 elif delta == p2:
2081 2102 nump2prev += 1
2082 2103 elif delta == p1:
2083 2104 nump1 += 1
2084 2105 elif delta == p2:
2085 2106 nump2 += 1
2086 2107 elif delta != nullrev:
2087 2108 numother += 1
2088 2109
2089 2110 numdeltas = numrevs - numfull
2090 2111 numoprev = numprev - nump1prev - nump2prev
2091 2112 totalrawsize = datasize[2]
2092 2113 datasize[2] /= numrevs
2093 2114 fulltotal = fullsize[2]
2094 2115 fullsize[2] /= numfull
2095 2116 deltatotal = deltasize[2]
2096 2117 deltasize[2] /= numrevs - numfull
2097 2118 totalsize = fulltotal + deltatotal
2098 2119 avgchainlen = sum(chainlengths) / numrevs
2099 2120 compratio = totalrawsize / totalsize
2100 2121
2101 2122 basedfmtstr = '%%%dd\n'
2102 2123 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2103 2124
2104 2125 def dfmtstr(max):
2105 2126 return basedfmtstr % len(str(max))
2106 2127 def pcfmtstr(max, padding=0):
2107 2128 return basepcfmtstr % (len(str(max)), ' ' * padding)
2108 2129
2109 2130 def pcfmt(value, total):
2110 2131 return (value, 100 * float(value) / total)
2111 2132
2112 2133 ui.write('format : %d\n' % format)
2113 2134 ui.write('flags : %s\n' % ', '.join(flags))
2114 2135
2115 2136 ui.write('\n')
2116 2137 fmt = pcfmtstr(totalsize)
2117 2138 fmt2 = dfmtstr(totalsize)
2118 2139 ui.write('revisions : ' + fmt2 % numrevs)
2119 2140 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2120 2141 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2121 2142 ui.write('revisions : ' + fmt2 % numrevs)
2122 2143 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2123 2144 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2124 2145 ui.write('revision size : ' + fmt2 % totalsize)
2125 2146 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2126 2147 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2127 2148
2128 2149 ui.write('\n')
2129 2150 fmt = dfmtstr(max(avgchainlen, compratio))
2130 2151 ui.write('avg chain length : ' + fmt % avgchainlen)
2131 2152 ui.write('compression ratio : ' + fmt % compratio)
2132 2153
2133 2154 if format > 0:
2134 2155 ui.write('\n')
2135 2156 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2136 2157 % tuple(datasize))
2137 2158 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2138 2159 % tuple(fullsize))
2139 2160 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2140 2161 % tuple(deltasize))
2141 2162
2142 2163 if numdeltas > 0:
2143 2164 ui.write('\n')
2144 2165 fmt = pcfmtstr(numdeltas)
2145 2166 fmt2 = pcfmtstr(numdeltas, 4)
2146 2167 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2147 2168 if numprev > 0:
2148 2169 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev))
2149 2170 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev))
2150 2171 ui.write(' other : ' + fmt2 % pcfmt(numoprev, numprev))
2151 2172 if gdelta:
2152 2173 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2153 2174 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2154 2175 ui.write('deltas against other : ' + fmt % pcfmt(numother, numdeltas))
2155 2176
2156 2177 @command('debugrevspec', [], ('REVSPEC'))
2157 2178 def debugrevspec(ui, repo, expr):
2158 2179 """parse and apply a revision specification
2159 2180
2160 2181 Use --verbose to print the parsed tree before and after aliases
2161 2182 expansion.
2162 2183 """
2163 2184 if ui.verbose:
2164 2185 tree = revset.parse(expr)[0]
2165 2186 ui.note(revset.prettyformat(tree), "\n")
2166 2187 newtree = revset.findaliases(ui, tree)
2167 2188 if newtree != tree:
2168 2189 ui.note(revset.prettyformat(newtree), "\n")
2169 2190 func = revset.match(ui, expr)
2170 2191 for c in func(repo, range(len(repo))):
2171 2192 ui.write("%s\n" % c)
2172 2193
2173 2194 @command('debugsetparents', [], _('REV1 [REV2]'))
2174 2195 def debugsetparents(ui, repo, rev1, rev2=None):
2175 2196 """manually set the parents of the current working directory
2176 2197
2177 2198 This is useful for writing repository conversion tools, but should
2178 2199 be used with care.
2179 2200
2180 2201 Returns 0 on success.
2181 2202 """
2182 2203
2183 2204 r1 = scmutil.revsingle(repo, rev1).node()
2184 2205 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2185 2206
2186 2207 wlock = repo.wlock()
2187 2208 try:
2188 2209 repo.dirstate.setparents(r1, r2)
2189 2210 finally:
2190 2211 wlock.release()
2191 2212
2192 2213 @command('debugstate',
2193 2214 [('', 'nodates', None, _('do not display the saved mtime')),
2194 2215 ('', 'datesort', None, _('sort by saved mtime'))],
2195 2216 _('[OPTION]...'))
2196 2217 def debugstate(ui, repo, nodates=None, datesort=None):
2197 2218 """show the contents of the current dirstate"""
2198 2219 timestr = ""
2199 2220 showdate = not nodates
2200 2221 if datesort:
2201 2222 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2202 2223 else:
2203 2224 keyfunc = None # sort by filename
2204 2225 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2205 2226 if showdate:
2206 2227 if ent[3] == -1:
2207 2228 # Pad or slice to locale representation
2208 2229 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2209 2230 time.localtime(0)))
2210 2231 timestr = 'unset'
2211 2232 timestr = (timestr[:locale_len] +
2212 2233 ' ' * (locale_len - len(timestr)))
2213 2234 else:
2214 2235 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2215 2236 time.localtime(ent[3]))
2216 2237 if ent[1] & 020000:
2217 2238 mode = 'lnk'
2218 2239 else:
2219 2240 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2220 2241 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2221 2242 for f in repo.dirstate.copies():
2222 2243 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2223 2244
2224 2245 @command('debugsub',
2225 2246 [('r', 'rev', '',
2226 2247 _('revision to check'), _('REV'))],
2227 2248 _('[-r REV] [REV]'))
2228 2249 def debugsub(ui, repo, rev=None):
2229 2250 ctx = scmutil.revsingle(repo, rev, None)
2230 2251 for k, v in sorted(ctx.substate.items()):
2231 2252 ui.write('path %s\n' % k)
2232 2253 ui.write(' source %s\n' % v[0])
2233 2254 ui.write(' revision %s\n' % v[1])
2234 2255
2235 2256 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2236 2257 def debugwalk(ui, repo, *pats, **opts):
2237 2258 """show how files match on given patterns"""
2238 2259 m = scmutil.match(repo[None], pats, opts)
2239 2260 items = list(repo.walk(m))
2240 2261 if not items:
2241 2262 return
2242 2263 fmt = 'f %%-%ds %%-%ds %%s' % (
2243 2264 max([len(abs) for abs in items]),
2244 2265 max([len(m.rel(abs)) for abs in items]))
2245 2266 for abs in items:
2246 2267 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2247 2268 ui.write("%s\n" % line.rstrip())
2248 2269
2249 2270 @command('debugwireargs',
2250 2271 [('', 'three', '', 'three'),
2251 2272 ('', 'four', '', 'four'),
2252 2273 ('', 'five', '', 'five'),
2253 2274 ] + remoteopts,
2254 2275 _('REPO [OPTIONS]... [ONE [TWO]]'))
2255 2276 def debugwireargs(ui, repopath, *vals, **opts):
2256 2277 repo = hg.peer(ui, opts, repopath)
2257 2278 for opt in remoteopts:
2258 2279 del opts[opt[1]]
2259 2280 args = {}
2260 2281 for k, v in opts.iteritems():
2261 2282 if v:
2262 2283 args[k] = v
2263 2284 # run twice to check that we don't mess up the stream for the next command
2264 2285 res1 = repo.debugwireargs(*vals, **args)
2265 2286 res2 = repo.debugwireargs(*vals, **args)
2266 2287 ui.write("%s\n" % res1)
2267 2288 if res1 != res2:
2268 2289 ui.warn("%s\n" % res2)
2269 2290
2270 2291 @command('^diff',
2271 2292 [('r', 'rev', [], _('revision'), _('REV')),
2272 2293 ('c', 'change', '', _('change made by revision'), _('REV'))
2273 2294 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2274 2295 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2275 2296 def diff(ui, repo, *pats, **opts):
2276 2297 """diff repository (or selected files)
2277 2298
2278 2299 Show differences between revisions for the specified files.
2279 2300
2280 2301 Differences between files are shown using the unified diff format.
2281 2302
2282 2303 .. note::
2283 2304 diff may generate unexpected results for merges, as it will
2284 2305 default to comparing against the working directory's first
2285 2306 parent changeset if no revisions are specified.
2286 2307
2287 2308 When two revision arguments are given, then changes are shown
2288 2309 between those revisions. If only one revision is specified then
2289 2310 that revision is compared to the working directory, and, when no
2290 2311 revisions are specified, the working directory files are compared
2291 2312 to its parent.
2292 2313
2293 2314 Alternatively you can specify -c/--change with a revision to see
2294 2315 the changes in that changeset relative to its first parent.
2295 2316
2296 2317 Without the -a/--text option, diff will avoid generating diffs of
2297 2318 files it detects as binary. With -a, diff will generate a diff
2298 2319 anyway, probably with undesirable results.
2299 2320
2300 2321 Use the -g/--git option to generate diffs in the git extended diff
2301 2322 format. For more information, read :hg:`help diffs`.
2302 2323
2303 2324 .. container:: verbose
2304 2325
2305 2326 Examples:
2306 2327
2307 2328 - compare a file in the current working directory to its parent::
2308 2329
2309 2330 hg diff foo.c
2310 2331
2311 2332 - compare two historical versions of a directory, with rename info::
2312 2333
2313 2334 hg diff --git -r 1.0:1.2 lib/
2314 2335
2315 2336 - get change stats relative to the last change on some date::
2316 2337
2317 2338 hg diff --stat -r "date('may 2')"
2318 2339
2319 2340 - diff all newly-added files that contain a keyword::
2320 2341
2321 2342 hg diff "set:added() and grep(GNU)"
2322 2343
2323 2344 - compare a revision and its parents::
2324 2345
2325 2346 hg diff -c 9353 # compare against first parent
2326 2347 hg diff -r 9353^:9353 # same using revset syntax
2327 2348 hg diff -r 9353^2:9353 # compare against the second parent
2328 2349
2329 2350 Returns 0 on success.
2330 2351 """
2331 2352
2332 2353 revs = opts.get('rev')
2333 2354 change = opts.get('change')
2334 2355 stat = opts.get('stat')
2335 2356 reverse = opts.get('reverse')
2336 2357
2337 2358 if revs and change:
2338 2359 msg = _('cannot specify --rev and --change at the same time')
2339 2360 raise util.Abort(msg)
2340 2361 elif change:
2341 2362 node2 = scmutil.revsingle(repo, change, None).node()
2342 2363 node1 = repo[node2].p1().node()
2343 2364 else:
2344 2365 node1, node2 = scmutil.revpair(repo, revs)
2345 2366
2346 2367 if reverse:
2347 2368 node1, node2 = node2, node1
2348 2369
2349 2370 diffopts = patch.diffopts(ui, opts)
2350 2371 m = scmutil.match(repo[node2], pats, opts)
2351 2372 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2352 2373 listsubrepos=opts.get('subrepos'))
2353 2374
2354 2375 @command('^export',
2355 2376 [('o', 'output', '',
2356 2377 _('print output to file with formatted name'), _('FORMAT')),
2357 2378 ('', 'switch-parent', None, _('diff against the second parent')),
2358 2379 ('r', 'rev', [], _('revisions to export'), _('REV')),
2359 2380 ] + diffopts,
2360 2381 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2361 2382 def export(ui, repo, *changesets, **opts):
2362 2383 """dump the header and diffs for one or more changesets
2363 2384
2364 2385 Print the changeset header and diffs for one or more revisions.
2365 2386
2366 2387 The information shown in the changeset header is: author, date,
2367 2388 branch name (if non-default), changeset hash, parent(s) and commit
2368 2389 comment.
2369 2390
2370 2391 .. note::
2371 2392 export may generate unexpected diff output for merge
2372 2393 changesets, as it will compare the merge changeset against its
2373 2394 first parent only.
2374 2395
2375 2396 Output may be to a file, in which case the name of the file is
2376 2397 given using a format string. The formatting rules are as follows:
2377 2398
2378 2399 :``%%``: literal "%" character
2379 2400 :``%H``: changeset hash (40 hexadecimal digits)
2380 2401 :``%N``: number of patches being generated
2381 2402 :``%R``: changeset revision number
2382 2403 :``%b``: basename of the exporting repository
2383 2404 :``%h``: short-form changeset hash (12 hexadecimal digits)
2384 2405 :``%m``: first line of the commit message (only alphanumeric characters)
2385 2406 :``%n``: zero-padded sequence number, starting at 1
2386 2407 :``%r``: zero-padded changeset revision number
2387 2408
2388 2409 Without the -a/--text option, export will avoid generating diffs
2389 2410 of files it detects as binary. With -a, export will generate a
2390 2411 diff anyway, probably with undesirable results.
2391 2412
2392 2413 Use the -g/--git option to generate diffs in the git extended diff
2393 2414 format. See :hg:`help diffs` for more information.
2394 2415
2395 2416 With the --switch-parent option, the diff will be against the
2396 2417 second parent. It can be useful to review a merge.
2397 2418
2398 2419 .. container:: verbose
2399 2420
2400 2421 Examples:
2401 2422
2402 2423 - use export and import to transplant a bugfix to the current
2403 2424 branch::
2404 2425
2405 2426 hg export -r 9353 | hg import -
2406 2427
2407 2428 - export all the changesets between two revisions to a file with
2408 2429 rename information::
2409 2430
2410 2431 hg export --git -r 123:150 > changes.txt
2411 2432
2412 2433 - split outgoing changes into a series of patches with
2413 2434 descriptive names::
2414 2435
2415 2436 hg export -r "outgoing()" -o "%n-%m.patch"
2416 2437
2417 2438 Returns 0 on success.
2418 2439 """
2419 2440 changesets += tuple(opts.get('rev', []))
2420 2441 if not changesets:
2421 2442 raise util.Abort(_("export requires at least one changeset"))
2422 2443 revs = scmutil.revrange(repo, changesets)
2423 2444 if len(revs) > 1:
2424 2445 ui.note(_('exporting patches:\n'))
2425 2446 else:
2426 2447 ui.note(_('exporting patch:\n'))
2427 2448 cmdutil.export(repo, revs, template=opts.get('output'),
2428 2449 switch_parent=opts.get('switch_parent'),
2429 2450 opts=patch.diffopts(ui, opts))
2430 2451
2431 2452 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2432 2453 def forget(ui, repo, *pats, **opts):
2433 2454 """forget the specified files on the next commit
2434 2455
2435 2456 Mark the specified files so they will no longer be tracked
2436 2457 after the next commit.
2437 2458
2438 2459 This only removes files from the current branch, not from the
2439 2460 entire project history, and it does not delete them from the
2440 2461 working directory.
2441 2462
2442 2463 To undo a forget before the next commit, see :hg:`add`.
2443 2464
2444 2465 .. container:: verbose
2445 2466
2446 2467 Examples:
2447 2468
2448 2469 - forget newly-added binary files::
2449 2470
2450 2471 hg forget "set:added() and binary()"
2451 2472
2452 2473 - forget files that would be excluded by .hgignore::
2453 2474
2454 2475 hg forget "set:hgignore()"
2455 2476
2456 2477 Returns 0 on success.
2457 2478 """
2458 2479
2459 2480 if not pats:
2460 2481 raise util.Abort(_('no files specified'))
2461 2482
2462 2483 m = scmutil.match(repo[None], pats, opts)
2463 2484 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2464 2485 return rejected and 1 or 0
2465 2486
2466 2487 @command(
2467 2488 'graft',
2468 2489 [('c', 'continue', False, _('resume interrupted graft')),
2469 2490 ('e', 'edit', False, _('invoke editor on commit messages')),
2470 2491 ('D', 'currentdate', False,
2471 2492 _('record the current date as commit date')),
2472 2493 ('U', 'currentuser', False,
2473 2494 _('record the current user as committer'), _('DATE'))]
2474 2495 + commitopts2 + mergetoolopts,
2475 2496 _('[OPTION]... REVISION...'))
2476 2497 def graft(ui, repo, *revs, **opts):
2477 2498 '''copy changes from other branches onto the current branch
2478 2499
2479 2500 This command uses Mercurial's merge logic to copy individual
2480 2501 changes from other branches without merging branches in the
2481 2502 history graph. This is sometimes known as 'backporting' or
2482 2503 'cherry-picking'. By default, graft will copy user, date, and
2483 2504 description from the source changesets.
2484 2505
2485 2506 Changesets that are ancestors of the current revision, that have
2486 2507 already been grafted, or that are merges will be skipped.
2487 2508
2488 2509 If a graft merge results in conflicts, the graft process is
2489 2510 interrupted so that the current merge can be manually resolved.
2490 2511 Once all conflicts are addressed, the graft process can be
2491 2512 continued with the -c/--continue option.
2492 2513
2493 2514 .. note::
2494 2515 The -c/--continue option does not reapply earlier options.
2495 2516
2496 2517 .. container:: verbose
2497 2518
2498 2519 Examples:
2499 2520
2500 2521 - copy a single change to the stable branch and edit its description::
2501 2522
2502 2523 hg update stable
2503 2524 hg graft --edit 9393
2504 2525
2505 2526 - graft a range of changesets with one exception, updating dates::
2506 2527
2507 2528 hg graft -D "2085::2093 and not 2091"
2508 2529
2509 2530 - continue a graft after resolving conflicts::
2510 2531
2511 2532 hg graft -c
2512 2533
2513 2534 - show the source of a grafted changeset::
2514 2535
2515 2536 hg log --debug -r tip
2516 2537
2517 2538 Returns 0 on successful completion.
2518 2539 '''
2519 2540
2520 2541 if not opts.get('user') and opts.get('currentuser'):
2521 2542 opts['user'] = ui.username()
2522 2543 if not opts.get('date') and opts.get('currentdate'):
2523 2544 opts['date'] = "%d %d" % util.makedate()
2524 2545
2525 2546 editor = None
2526 2547 if opts.get('edit'):
2527 2548 editor = cmdutil.commitforceeditor
2528 2549
2529 2550 cont = False
2530 2551 if opts['continue']:
2531 2552 cont = True
2532 2553 if revs:
2533 2554 raise util.Abort(_("can't specify --continue and revisions"))
2534 2555 # read in unfinished revisions
2535 2556 try:
2536 2557 nodes = repo.opener.read('graftstate').splitlines()
2537 2558 revs = [repo[node].rev() for node in nodes]
2538 2559 except IOError, inst:
2539 2560 if inst.errno != errno.ENOENT:
2540 2561 raise
2541 2562 raise util.Abort(_("no graft state found, can't continue"))
2542 2563 else:
2543 2564 cmdutil.bailifchanged(repo)
2544 2565 if not revs:
2545 2566 raise util.Abort(_('no revisions specified'))
2546 2567 revs = scmutil.revrange(repo, revs)
2547 2568
2548 2569 # check for merges
2549 2570 for rev in repo.revs('%ld and merge()', revs):
2550 2571 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2551 2572 revs.remove(rev)
2552 2573 if not revs:
2553 2574 return -1
2554 2575
2555 2576 # check for ancestors of dest branch
2556 2577 for rev in repo.revs('::. and %ld', revs):
2557 2578 ui.warn(_('skipping ancestor revision %s\n') % rev)
2558 2579 revs.remove(rev)
2559 2580 if not revs:
2560 2581 return -1
2561 2582
2562 2583 # analyze revs for earlier grafts
2563 2584 ids = {}
2564 2585 for ctx in repo.set("%ld", revs):
2565 2586 ids[ctx.hex()] = ctx.rev()
2566 2587 n = ctx.extra().get('source')
2567 2588 if n:
2568 2589 ids[n] = ctx.rev()
2569 2590
2570 2591 # check ancestors for earlier grafts
2571 2592 ui.debug('scanning for duplicate grafts\n')
2572 2593 for ctx in repo.set("::. - ::%ld", revs):
2573 2594 n = ctx.extra().get('source')
2574 2595 if n in ids:
2575 2596 r = repo[n].rev()
2576 2597 if r in revs:
2577 2598 ui.warn(_('skipping already grafted revision %s\n') % r)
2578 2599 revs.remove(r)
2579 2600 elif ids[n] in revs:
2580 2601 ui.warn(_('skipping already grafted revision %s '
2581 2602 '(same origin %d)\n') % (ids[n], r))
2582 2603 revs.remove(ids[n])
2583 2604 elif ctx.hex() in ids:
2584 2605 r = ids[ctx.hex()]
2585 2606 ui.warn(_('skipping already grafted revision %s '
2586 2607 '(was grafted from %d)\n') % (r, ctx.rev()))
2587 2608 revs.remove(r)
2588 2609 if not revs:
2589 2610 return -1
2590 2611
2591 2612 for pos, ctx in enumerate(repo.set("%ld", revs)):
2592 2613 current = repo['.']
2593 2614 ui.status(_('grafting revision %s\n') % ctx.rev())
2594 2615
2595 2616 # we don't merge the first commit when continuing
2596 2617 if not cont:
2597 2618 # perform the graft merge with p1(rev) as 'ancestor'
2598 2619 try:
2599 2620 # ui.forcemerge is an internal variable, do not document
2600 2621 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2601 2622 stats = mergemod.update(repo, ctx.node(), True, True, False,
2602 2623 ctx.p1().node())
2603 2624 finally:
2604 2625 ui.setconfig('ui', 'forcemerge', '')
2605 2626 # drop the second merge parent
2606 2627 repo.dirstate.setparents(current.node(), nullid)
2607 2628 repo.dirstate.write()
2608 2629 # fix up dirstate for copies and renames
2609 2630 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
2610 2631 # report any conflicts
2611 2632 if stats and stats[3] > 0:
2612 2633 # write out state for --continue
2613 2634 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2614 2635 repo.opener.write('graftstate', ''.join(nodelines))
2615 2636 raise util.Abort(
2616 2637 _("unresolved conflicts, can't continue"),
2617 2638 hint=_('use hg resolve and hg graft --continue'))
2618 2639 else:
2619 2640 cont = False
2620 2641
2621 2642 # commit
2622 2643 source = ctx.extra().get('source')
2623 2644 if not source:
2624 2645 source = ctx.hex()
2625 2646 extra = {'source': source}
2626 2647 user = ctx.user()
2627 2648 if opts.get('user'):
2628 2649 user = opts['user']
2629 2650 date = ctx.date()
2630 2651 if opts.get('date'):
2631 2652 date = opts['date']
2632 2653 repo.commit(text=ctx.description(), user=user,
2633 2654 date=date, extra=extra, editor=editor)
2634 2655
2635 2656 # remove state when we complete successfully
2636 2657 if os.path.exists(repo.join('graftstate')):
2637 2658 util.unlinkpath(repo.join('graftstate'))
2638 2659
2639 2660 return 0
2640 2661
2641 2662 @command('grep',
2642 2663 [('0', 'print0', None, _('end fields with NUL')),
2643 2664 ('', 'all', None, _('print all revisions that match')),
2644 2665 ('a', 'text', None, _('treat all files as text')),
2645 2666 ('f', 'follow', None,
2646 2667 _('follow changeset history,'
2647 2668 ' or file history across copies and renames')),
2648 2669 ('i', 'ignore-case', None, _('ignore case when matching')),
2649 2670 ('l', 'files-with-matches', None,
2650 2671 _('print only filenames and revisions that match')),
2651 2672 ('n', 'line-number', None, _('print matching line numbers')),
2652 2673 ('r', 'rev', [],
2653 2674 _('only search files changed within revision range'), _('REV')),
2654 2675 ('u', 'user', None, _('list the author (long with -v)')),
2655 2676 ('d', 'date', None, _('list the date (short with -q)')),
2656 2677 ] + walkopts,
2657 2678 _('[OPTION]... PATTERN [FILE]...'))
2658 2679 def grep(ui, repo, pattern, *pats, **opts):
2659 2680 """search for a pattern in specified files and revisions
2660 2681
2661 2682 Search revisions of files for a regular expression.
2662 2683
2663 2684 This command behaves differently than Unix grep. It only accepts
2664 2685 Python/Perl regexps. It searches repository history, not the
2665 2686 working directory. It always prints the revision number in which a
2666 2687 match appears.
2667 2688
2668 2689 By default, grep only prints output for the first revision of a
2669 2690 file in which it finds a match. To get it to print every revision
2670 2691 that contains a change in match status ("-" for a match that
2671 2692 becomes a non-match, or "+" for a non-match that becomes a match),
2672 2693 use the --all flag.
2673 2694
2674 2695 Returns 0 if a match is found, 1 otherwise.
2675 2696 """
2676 2697 reflags = re.M
2677 2698 if opts.get('ignore_case'):
2678 2699 reflags |= re.I
2679 2700 try:
2680 2701 regexp = re.compile(pattern, reflags)
2681 2702 except re.error, inst:
2682 2703 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2683 2704 return 1
2684 2705 sep, eol = ':', '\n'
2685 2706 if opts.get('print0'):
2686 2707 sep = eol = '\0'
2687 2708
2688 2709 getfile = util.lrucachefunc(repo.file)
2689 2710
2690 2711 def matchlines(body):
2691 2712 begin = 0
2692 2713 linenum = 0
2693 2714 while True:
2694 2715 match = regexp.search(body, begin)
2695 2716 if not match:
2696 2717 break
2697 2718 mstart, mend = match.span()
2698 2719 linenum += body.count('\n', begin, mstart) + 1
2699 2720 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2700 2721 begin = body.find('\n', mend) + 1 or len(body) + 1
2701 2722 lend = begin - 1
2702 2723 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2703 2724
2704 2725 class linestate(object):
2705 2726 def __init__(self, line, linenum, colstart, colend):
2706 2727 self.line = line
2707 2728 self.linenum = linenum
2708 2729 self.colstart = colstart
2709 2730 self.colend = colend
2710 2731
2711 2732 def __hash__(self):
2712 2733 return hash((self.linenum, self.line))
2713 2734
2714 2735 def __eq__(self, other):
2715 2736 return self.line == other.line
2716 2737
2717 2738 matches = {}
2718 2739 copies = {}
2719 2740 def grepbody(fn, rev, body):
2720 2741 matches[rev].setdefault(fn, [])
2721 2742 m = matches[rev][fn]
2722 2743 for lnum, cstart, cend, line in matchlines(body):
2723 2744 s = linestate(line, lnum, cstart, cend)
2724 2745 m.append(s)
2725 2746
2726 2747 def difflinestates(a, b):
2727 2748 sm = difflib.SequenceMatcher(None, a, b)
2728 2749 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2729 2750 if tag == 'insert':
2730 2751 for i in xrange(blo, bhi):
2731 2752 yield ('+', b[i])
2732 2753 elif tag == 'delete':
2733 2754 for i in xrange(alo, ahi):
2734 2755 yield ('-', a[i])
2735 2756 elif tag == 'replace':
2736 2757 for i in xrange(alo, ahi):
2737 2758 yield ('-', a[i])
2738 2759 for i in xrange(blo, bhi):
2739 2760 yield ('+', b[i])
2740 2761
2741 2762 def display(fn, ctx, pstates, states):
2742 2763 rev = ctx.rev()
2743 2764 datefunc = ui.quiet and util.shortdate or util.datestr
2744 2765 found = False
2745 2766 filerevmatches = {}
2746 2767 def binary():
2747 2768 flog = getfile(fn)
2748 2769 return util.binary(flog.read(ctx.filenode(fn)))
2749 2770
2750 2771 if opts.get('all'):
2751 2772 iter = difflinestates(pstates, states)
2752 2773 else:
2753 2774 iter = [('', l) for l in states]
2754 2775 for change, l in iter:
2755 2776 cols = [fn, str(rev)]
2756 2777 before, match, after = None, None, None
2757 2778 if opts.get('line_number'):
2758 2779 cols.append(str(l.linenum))
2759 2780 if opts.get('all'):
2760 2781 cols.append(change)
2761 2782 if opts.get('user'):
2762 2783 cols.append(ui.shortuser(ctx.user()))
2763 2784 if opts.get('date'):
2764 2785 cols.append(datefunc(ctx.date()))
2765 2786 if opts.get('files_with_matches'):
2766 2787 c = (fn, rev)
2767 2788 if c in filerevmatches:
2768 2789 continue
2769 2790 filerevmatches[c] = 1
2770 2791 else:
2771 2792 before = l.line[:l.colstart]
2772 2793 match = l.line[l.colstart:l.colend]
2773 2794 after = l.line[l.colend:]
2774 2795 ui.write(sep.join(cols))
2775 2796 if before is not None:
2776 2797 if not opts.get('text') and binary():
2777 2798 ui.write(sep + " Binary file matches")
2778 2799 else:
2779 2800 ui.write(sep + before)
2780 2801 ui.write(match, label='grep.match')
2781 2802 ui.write(after)
2782 2803 ui.write(eol)
2783 2804 found = True
2784 2805 return found
2785 2806
2786 2807 skip = {}
2787 2808 revfiles = {}
2788 2809 matchfn = scmutil.match(repo[None], pats, opts)
2789 2810 found = False
2790 2811 follow = opts.get('follow')
2791 2812
2792 2813 def prep(ctx, fns):
2793 2814 rev = ctx.rev()
2794 2815 pctx = ctx.p1()
2795 2816 parent = pctx.rev()
2796 2817 matches.setdefault(rev, {})
2797 2818 matches.setdefault(parent, {})
2798 2819 files = revfiles.setdefault(rev, [])
2799 2820 for fn in fns:
2800 2821 flog = getfile(fn)
2801 2822 try:
2802 2823 fnode = ctx.filenode(fn)
2803 2824 except error.LookupError:
2804 2825 continue
2805 2826
2806 2827 copied = flog.renamed(fnode)
2807 2828 copy = follow and copied and copied[0]
2808 2829 if copy:
2809 2830 copies.setdefault(rev, {})[fn] = copy
2810 2831 if fn in skip:
2811 2832 if copy:
2812 2833 skip[copy] = True
2813 2834 continue
2814 2835 files.append(fn)
2815 2836
2816 2837 if fn not in matches[rev]:
2817 2838 grepbody(fn, rev, flog.read(fnode))
2818 2839
2819 2840 pfn = copy or fn
2820 2841 if pfn not in matches[parent]:
2821 2842 try:
2822 2843 fnode = pctx.filenode(pfn)
2823 2844 grepbody(pfn, parent, flog.read(fnode))
2824 2845 except error.LookupError:
2825 2846 pass
2826 2847
2827 2848 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2828 2849 rev = ctx.rev()
2829 2850 parent = ctx.p1().rev()
2830 2851 for fn in sorted(revfiles.get(rev, [])):
2831 2852 states = matches[rev][fn]
2832 2853 copy = copies.get(rev, {}).get(fn)
2833 2854 if fn in skip:
2834 2855 if copy:
2835 2856 skip[copy] = True
2836 2857 continue
2837 2858 pstates = matches.get(parent, {}).get(copy or fn, [])
2838 2859 if pstates or states:
2839 2860 r = display(fn, ctx, pstates, states)
2840 2861 found = found or r
2841 2862 if r and not opts.get('all'):
2842 2863 skip[fn] = True
2843 2864 if copy:
2844 2865 skip[copy] = True
2845 2866 del matches[rev]
2846 2867 del revfiles[rev]
2847 2868
2848 2869 return not found
2849 2870
2850 2871 @command('heads',
2851 2872 [('r', 'rev', '',
2852 2873 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2853 2874 ('t', 'topo', False, _('show topological heads only')),
2854 2875 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2855 2876 ('c', 'closed', False, _('show normal and closed branch heads')),
2856 2877 ] + templateopts,
2857 2878 _('[-ac] [-r STARTREV] [REV]...'))
2858 2879 def heads(ui, repo, *branchrevs, **opts):
2859 2880 """show current repository heads or show branch heads
2860 2881
2861 2882 With no arguments, show all repository branch heads.
2862 2883
2863 2884 Repository "heads" are changesets with no child changesets. They are
2864 2885 where development generally takes place and are the usual targets
2865 2886 for update and merge operations. Branch heads are changesets that have
2866 2887 no child changeset on the same branch.
2867 2888
2868 2889 If one or more REVs are given, only branch heads on the branches
2869 2890 associated with the specified changesets are shown. This means
2870 2891 that you can use :hg:`heads foo` to see the heads on a branch
2871 2892 named ``foo``.
2872 2893
2873 2894 If -c/--closed is specified, also show branch heads marked closed
2874 2895 (see :hg:`commit --close-branch`).
2875 2896
2876 2897 If STARTREV is specified, only those heads that are descendants of
2877 2898 STARTREV will be displayed.
2878 2899
2879 2900 If -t/--topo is specified, named branch mechanics will be ignored and only
2880 2901 changesets without children will be shown.
2881 2902
2882 2903 Returns 0 if matching heads are found, 1 if not.
2883 2904 """
2884 2905
2885 2906 start = None
2886 2907 if 'rev' in opts:
2887 2908 start = scmutil.revsingle(repo, opts['rev'], None).node()
2888 2909
2889 2910 if opts.get('topo'):
2890 2911 heads = [repo[h] for h in repo.heads(start)]
2891 2912 else:
2892 2913 heads = []
2893 2914 for branch in repo.branchmap():
2894 2915 heads += repo.branchheads(branch, start, opts.get('closed'))
2895 2916 heads = [repo[h] for h in heads]
2896 2917
2897 2918 if branchrevs:
2898 2919 branches = set(repo[br].branch() for br in branchrevs)
2899 2920 heads = [h for h in heads if h.branch() in branches]
2900 2921
2901 2922 if opts.get('active') and branchrevs:
2902 2923 dagheads = repo.heads(start)
2903 2924 heads = [h for h in heads if h.node() in dagheads]
2904 2925
2905 2926 if branchrevs:
2906 2927 haveheads = set(h.branch() for h in heads)
2907 2928 if branches - haveheads:
2908 2929 headless = ', '.join(b for b in branches - haveheads)
2909 2930 msg = _('no open branch heads found on branches %s')
2910 2931 if opts.get('rev'):
2911 2932 msg += _(' (started at %s)') % opts['rev']
2912 2933 ui.warn((msg + '\n') % headless)
2913 2934
2914 2935 if not heads:
2915 2936 return 1
2916 2937
2917 2938 heads = sorted(heads, key=lambda x: -x.rev())
2918 2939 displayer = cmdutil.show_changeset(ui, repo, opts)
2919 2940 for ctx in heads:
2920 2941 displayer.show(ctx)
2921 2942 displayer.close()
2922 2943
2923 2944 @command('help',
2924 2945 [('e', 'extension', None, _('show only help for extensions')),
2925 2946 ('c', 'command', None, _('show only help for commands'))],
2926 2947 _('[-ec] [TOPIC]'))
2927 2948 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
2928 2949 """show help for a given topic or a help overview
2929 2950
2930 2951 With no arguments, print a list of commands with short help messages.
2931 2952
2932 2953 Given a topic, extension, or command name, print help for that
2933 2954 topic.
2934 2955
2935 2956 Returns 0 if successful.
2936 2957 """
2937 2958
2938 2959 textwidth = min(ui.termwidth(), 80) - 2
2939 2960
2940 2961 def optrst(options):
2941 2962 data = []
2942 2963 multioccur = False
2943 2964 for option in options:
2944 2965 if len(option) == 5:
2945 2966 shortopt, longopt, default, desc, optlabel = option
2946 2967 else:
2947 2968 shortopt, longopt, default, desc = option
2948 2969 optlabel = _("VALUE") # default label
2949 2970
2950 2971 if _("DEPRECATED") in desc and not ui.verbose:
2951 2972 continue
2952 2973
2953 2974 so = ''
2954 2975 if shortopt:
2955 2976 so = '-' + shortopt
2956 2977 lo = '--' + longopt
2957 2978 if default:
2958 2979 desc += _(" (default: %s)") % default
2959 2980
2960 2981 if isinstance(default, list):
2961 2982 lo += " %s [+]" % optlabel
2962 2983 multioccur = True
2963 2984 elif (default is not None) and not isinstance(default, bool):
2964 2985 lo += " %s" % optlabel
2965 2986
2966 2987 data.append((so, lo, desc))
2967 2988
2968 2989 rst = minirst.maketable(data, 1)
2969 2990
2970 2991 if multioccur:
2971 2992 rst += _("\n[+] marked option can be specified multiple times\n")
2972 2993
2973 2994 return rst
2974 2995
2975 2996 # list all option lists
2976 2997 def opttext(optlist, width):
2977 2998 rst = ''
2978 2999 if not optlist:
2979 3000 return ''
2980 3001
2981 3002 for title, options in optlist:
2982 3003 rst += '\n%s\n' % title
2983 3004 if options:
2984 3005 rst += "\n"
2985 3006 rst += optrst(options)
2986 3007 rst += '\n'
2987 3008
2988 3009 return '\n' + minirst.format(rst, width)
2989 3010
2990 3011 def addglobalopts(optlist, aliases):
2991 3012 if ui.quiet:
2992 3013 return []
2993 3014
2994 3015 if ui.verbose:
2995 3016 optlist.append((_("global options:"), globalopts))
2996 3017 if name == 'shortlist':
2997 3018 optlist.append((_('use "hg help" for the full list '
2998 3019 'of commands'), ()))
2999 3020 else:
3000 3021 if name == 'shortlist':
3001 3022 msg = _('use "hg help" for the full list of commands '
3002 3023 'or "hg -v" for details')
3003 3024 elif name and not full:
3004 3025 msg = _('use "hg help %s" to show the full help text') % name
3005 3026 elif aliases:
3006 3027 msg = _('use "hg -v help%s" to show builtin aliases and '
3007 3028 'global options') % (name and " " + name or "")
3008 3029 else:
3009 3030 msg = _('use "hg -v help %s" to show more info') % name
3010 3031 optlist.append((msg, ()))
3011 3032
3012 3033 def helpcmd(name):
3013 3034 try:
3014 3035 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3015 3036 except error.AmbiguousCommand, inst:
3016 3037 # py3k fix: except vars can't be used outside the scope of the
3017 3038 # except block, nor can be used inside a lambda. python issue4617
3018 3039 prefix = inst.args[0]
3019 3040 select = lambda c: c.lstrip('^').startswith(prefix)
3020 3041 helplist(select)
3021 3042 return
3022 3043
3023 3044 # check if it's an invalid alias and display its error if it is
3024 3045 if getattr(entry[0], 'badalias', False):
3025 3046 if not unknowncmd:
3026 3047 entry[0](ui)
3027 3048 return
3028 3049
3029 3050 rst = ""
3030 3051
3031 3052 # synopsis
3032 3053 if len(entry) > 2:
3033 3054 if entry[2].startswith('hg'):
3034 3055 rst += "%s\n" % entry[2]
3035 3056 else:
3036 3057 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3037 3058 else:
3038 3059 rst += 'hg %s\n' % aliases[0]
3039 3060
3040 3061 # aliases
3041 3062 if full and not ui.quiet and len(aliases) > 1:
3042 3063 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3043 3064
3044 3065 # description
3045 3066 doc = gettext(entry[0].__doc__)
3046 3067 if not doc:
3047 3068 doc = _("(no help text available)")
3048 3069 if util.safehasattr(entry[0], 'definition'): # aliased command
3049 3070 if entry[0].definition.startswith('!'): # shell alias
3050 3071 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3051 3072 else:
3052 3073 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3053 3074 if ui.quiet or not full:
3054 3075 doc = doc.splitlines()[0]
3055 3076 rst += "\n" + doc + "\n"
3056 3077
3057 3078 # check if this command shadows a non-trivial (multi-line)
3058 3079 # extension help text
3059 3080 try:
3060 3081 mod = extensions.find(name)
3061 3082 doc = gettext(mod.__doc__) or ''
3062 3083 if '\n' in doc.strip():
3063 3084 msg = _('use "hg help -e %s" to show help for '
3064 3085 'the %s extension') % (name, name)
3065 3086 rst += '\n%s\n' % msg
3066 3087 except KeyError:
3067 3088 pass
3068 3089
3069 3090 # options
3070 3091 if not ui.quiet and entry[1]:
3071 3092 rst += '\n'
3072 3093 rst += _("options:")
3073 3094 rst += '\n\n'
3074 3095 rst += optrst(entry[1])
3075 3096
3076 3097 if ui.verbose:
3077 3098 rst += '\n'
3078 3099 rst += _("global options:")
3079 3100 rst += '\n\n'
3080 3101 rst += optrst(globalopts)
3081 3102
3082 3103 keep = ui.verbose and ['verbose'] or []
3083 3104 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3084 3105 ui.write(formatted)
3085 3106
3086 3107 if not ui.verbose:
3087 3108 if not full:
3088 3109 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3089 3110 % name)
3090 3111 elif not ui.quiet:
3091 3112 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3092 3113
3093 3114
3094 3115 def helplist(select=None):
3095 3116 # list of commands
3096 3117 if name == "shortlist":
3097 3118 header = _('basic commands:\n\n')
3098 3119 else:
3099 3120 header = _('list of commands:\n\n')
3100 3121
3101 3122 h = {}
3102 3123 cmds = {}
3103 3124 for c, e in table.iteritems():
3104 3125 f = c.split("|", 1)[0]
3105 3126 if select and not select(f):
3106 3127 continue
3107 3128 if (not select and name != 'shortlist' and
3108 3129 e[0].__module__ != __name__):
3109 3130 continue
3110 3131 if name == "shortlist" and not f.startswith("^"):
3111 3132 continue
3112 3133 f = f.lstrip("^")
3113 3134 if not ui.debugflag and f.startswith("debug"):
3114 3135 continue
3115 3136 doc = e[0].__doc__
3116 3137 if doc and 'DEPRECATED' in doc and not ui.verbose:
3117 3138 continue
3118 3139 doc = gettext(doc)
3119 3140 if not doc:
3120 3141 doc = _("(no help text available)")
3121 3142 h[f] = doc.splitlines()[0].rstrip()
3122 3143 cmds[f] = c.lstrip("^")
3123 3144
3124 3145 if not h:
3125 3146 ui.status(_('no commands defined\n'))
3126 3147 return
3127 3148
3128 3149 ui.status(header)
3129 3150 fns = sorted(h)
3130 3151 m = max(map(len, fns))
3131 3152 for f in fns:
3132 3153 if ui.verbose:
3133 3154 commands = cmds[f].replace("|",", ")
3134 3155 ui.write(" %s:\n %s\n"%(commands, h[f]))
3135 3156 else:
3136 3157 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3137 3158 initindent=' %-*s ' % (m, f),
3138 3159 hangindent=' ' * (m + 4))))
3139 3160
3140 3161 if not name:
3141 3162 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3142 3163 if text:
3143 3164 ui.write("\n%s" % minirst.format(text, textwidth))
3144 3165
3145 3166 ui.write(_("\nadditional help topics:\n\n"))
3146 3167 topics = []
3147 3168 for names, header, doc in help.helptable:
3148 3169 topics.append((sorted(names, key=len, reverse=True)[0], header))
3149 3170 topics_len = max([len(s[0]) for s in topics])
3150 3171 for t, desc in topics:
3151 3172 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3152 3173
3153 3174 optlist = []
3154 3175 addglobalopts(optlist, True)
3155 3176 ui.write(opttext(optlist, textwidth))
3156 3177
3157 3178 def helptopic(name):
3158 3179 for names, header, doc in help.helptable:
3159 3180 if name in names:
3160 3181 break
3161 3182 else:
3162 3183 raise error.UnknownCommand(name)
3163 3184
3164 3185 # description
3165 3186 if not doc:
3166 3187 doc = _("(no help text available)")
3167 3188 if util.safehasattr(doc, '__call__'):
3168 3189 doc = doc()
3169 3190
3170 3191 ui.write("%s\n\n" % header)
3171 3192 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3172 3193 try:
3173 3194 cmdutil.findcmd(name, table)
3174 3195 ui.write(_('\nuse "hg help -c %s" to see help for '
3175 3196 'the %s command\n') % (name, name))
3176 3197 except error.UnknownCommand:
3177 3198 pass
3178 3199
3179 3200 def helpext(name):
3180 3201 try:
3181 3202 mod = extensions.find(name)
3182 3203 doc = gettext(mod.__doc__) or _('no help text available')
3183 3204 except KeyError:
3184 3205 mod = None
3185 3206 doc = extensions.disabledext(name)
3186 3207 if not doc:
3187 3208 raise error.UnknownCommand(name)
3188 3209
3189 3210 if '\n' not in doc:
3190 3211 head, tail = doc, ""
3191 3212 else:
3192 3213 head, tail = doc.split('\n', 1)
3193 3214 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3194 3215 if tail:
3195 3216 ui.write(minirst.format(tail, textwidth))
3196 3217 ui.status('\n')
3197 3218
3198 3219 if mod:
3199 3220 try:
3200 3221 ct = mod.cmdtable
3201 3222 except AttributeError:
3202 3223 ct = {}
3203 3224 modcmds = set([c.split('|', 1)[0] for c in ct])
3204 3225 helplist(modcmds.__contains__)
3205 3226 else:
3206 3227 ui.write(_('use "hg help extensions" for information on enabling '
3207 3228 'extensions\n'))
3208 3229
3209 3230 def helpextcmd(name):
3210 3231 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
3211 3232 doc = gettext(mod.__doc__).splitlines()[0]
3212 3233
3213 3234 msg = help.listexts(_("'%s' is provided by the following "
3214 3235 "extension:") % cmd, {ext: doc}, indent=4)
3215 3236 ui.write(minirst.format(msg, textwidth))
3216 3237 ui.write('\n')
3217 3238 ui.write(_('use "hg help extensions" for information on enabling '
3218 3239 'extensions\n'))
3219 3240
3220 3241 if name and name != 'shortlist':
3221 3242 i = None
3222 3243 if unknowncmd:
3223 3244 queries = (helpextcmd,)
3224 3245 elif opts.get('extension'):
3225 3246 queries = (helpext,)
3226 3247 elif opts.get('command'):
3227 3248 queries = (helpcmd,)
3228 3249 else:
3229 3250 queries = (helptopic, helpcmd, helpext, helpextcmd)
3230 3251 for f in queries:
3231 3252 try:
3232 3253 f(name)
3233 3254 i = None
3234 3255 break
3235 3256 except error.UnknownCommand, inst:
3236 3257 i = inst
3237 3258 if i:
3238 3259 raise i
3239 3260 else:
3240 3261 # program name
3241 3262 ui.status(_("Mercurial Distributed SCM\n"))
3242 3263 ui.status('\n')
3243 3264 helplist()
3244 3265
3245 3266
3246 3267 @command('identify|id',
3247 3268 [('r', 'rev', '',
3248 3269 _('identify the specified revision'), _('REV')),
3249 3270 ('n', 'num', None, _('show local revision number')),
3250 3271 ('i', 'id', None, _('show global revision id')),
3251 3272 ('b', 'branch', None, _('show branch')),
3252 3273 ('t', 'tags', None, _('show tags')),
3253 3274 ('B', 'bookmarks', None, _('show bookmarks')),
3254 3275 ] + remoteopts,
3255 3276 _('[-nibtB] [-r REV] [SOURCE]'))
3256 3277 def identify(ui, repo, source=None, rev=None,
3257 3278 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3258 3279 """identify the working copy or specified revision
3259 3280
3260 3281 Print a summary identifying the repository state at REV using one or
3261 3282 two parent hash identifiers, followed by a "+" if the working
3262 3283 directory has uncommitted changes, the branch name (if not default),
3263 3284 a list of tags, and a list of bookmarks.
3264 3285
3265 3286 When REV is not given, print a summary of the current state of the
3266 3287 repository.
3267 3288
3268 3289 Specifying a path to a repository root or Mercurial bundle will
3269 3290 cause lookup to operate on that repository/bundle.
3270 3291
3271 3292 .. container:: verbose
3272 3293
3273 3294 Examples:
3274 3295
3275 3296 - generate a build identifier for the working directory::
3276 3297
3277 3298 hg id --id > build-id.dat
3278 3299
3279 3300 - find the revision corresponding to a tag::
3280 3301
3281 3302 hg id -n -r 1.3
3282 3303
3283 3304 - check the most recent revision of a remote repository::
3284 3305
3285 3306 hg id -r tip http://selenic.com/hg/
3286 3307
3287 3308 Returns 0 if successful.
3288 3309 """
3289 3310
3290 3311 if not repo and not source:
3291 3312 raise util.Abort(_("there is no Mercurial repository here "
3292 3313 "(.hg not found)"))
3293 3314
3294 3315 hexfunc = ui.debugflag and hex or short
3295 3316 default = not (num or id or branch or tags or bookmarks)
3296 3317 output = []
3297 3318 revs = []
3298 3319
3299 3320 if source:
3300 3321 source, branches = hg.parseurl(ui.expandpath(source))
3301 3322 repo = hg.peer(ui, opts, source)
3302 3323 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3303 3324
3304 3325 if not repo.local():
3305 3326 if num or branch or tags:
3306 3327 raise util.Abort(
3307 3328 _("can't query remote revision number, branch, or tags"))
3308 3329 if not rev and revs:
3309 3330 rev = revs[0]
3310 3331 if not rev:
3311 3332 rev = "tip"
3312 3333
3313 3334 remoterev = repo.lookup(rev)
3314 3335 if default or id:
3315 3336 output = [hexfunc(remoterev)]
3316 3337
3317 3338 def getbms():
3318 3339 bms = []
3319 3340
3320 3341 if 'bookmarks' in repo.listkeys('namespaces'):
3321 3342 hexremoterev = hex(remoterev)
3322 3343 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3323 3344 if bmr == hexremoterev]
3324 3345
3325 3346 return bms
3326 3347
3327 3348 if bookmarks:
3328 3349 output.extend(getbms())
3329 3350 elif default and not ui.quiet:
3330 3351 # multiple bookmarks for a single parent separated by '/'
3331 3352 bm = '/'.join(getbms())
3332 3353 if bm:
3333 3354 output.append(bm)
3334 3355 else:
3335 3356 if not rev:
3336 3357 ctx = repo[None]
3337 3358 parents = ctx.parents()
3338 3359 changed = ""
3339 3360 if default or id or num:
3340 3361 changed = util.any(repo.status()) and "+" or ""
3341 3362 if default or id:
3342 3363 output = ["%s%s" %
3343 3364 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3344 3365 if num:
3345 3366 output.append("%s%s" %
3346 3367 ('+'.join([str(p.rev()) for p in parents]), changed))
3347 3368 else:
3348 3369 ctx = scmutil.revsingle(repo, rev)
3349 3370 if default or id:
3350 3371 output = [hexfunc(ctx.node())]
3351 3372 if num:
3352 3373 output.append(str(ctx.rev()))
3353 3374
3354 3375 if default and not ui.quiet:
3355 3376 b = ctx.branch()
3356 3377 if b != 'default':
3357 3378 output.append("(%s)" % b)
3358 3379
3359 3380 # multiple tags for a single parent separated by '/'
3360 3381 t = '/'.join(ctx.tags())
3361 3382 if t:
3362 3383 output.append(t)
3363 3384
3364 3385 # multiple bookmarks for a single parent separated by '/'
3365 3386 bm = '/'.join(ctx.bookmarks())
3366 3387 if bm:
3367 3388 output.append(bm)
3368 3389 else:
3369 3390 if branch:
3370 3391 output.append(ctx.branch())
3371 3392
3372 3393 if tags:
3373 3394 output.extend(ctx.tags())
3374 3395
3375 3396 if bookmarks:
3376 3397 output.extend(ctx.bookmarks())
3377 3398
3378 3399 ui.write("%s\n" % ' '.join(output))
3379 3400
3380 3401 @command('import|patch',
3381 3402 [('p', 'strip', 1,
3382 3403 _('directory strip option for patch. This has the same '
3383 3404 'meaning as the corresponding patch option'), _('NUM')),
3384 3405 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3385 3406 ('e', 'edit', False, _('invoke editor on commit messages')),
3386 3407 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3387 3408 ('', 'no-commit', None,
3388 3409 _("don't commit, just update the working directory")),
3389 3410 ('', 'bypass', None,
3390 3411 _("apply patch without touching the working directory")),
3391 3412 ('', 'exact', None,
3392 3413 _('apply patch to the nodes from which it was generated')),
3393 3414 ('', 'import-branch', None,
3394 3415 _('use any branch information in patch (implied by --exact)'))] +
3395 3416 commitopts + commitopts2 + similarityopts,
3396 3417 _('[OPTION]... PATCH...'))
3397 3418 def import_(ui, repo, patch1=None, *patches, **opts):
3398 3419 """import an ordered set of patches
3399 3420
3400 3421 Import a list of patches and commit them individually (unless
3401 3422 --no-commit is specified).
3402 3423
3403 3424 If there are outstanding changes in the working directory, import
3404 3425 will abort unless given the -f/--force flag.
3405 3426
3406 3427 You can import a patch straight from a mail message. Even patches
3407 3428 as attachments work (to use the body part, it must have type
3408 3429 text/plain or text/x-patch). From and Subject headers of email
3409 3430 message are used as default committer and commit message. All
3410 3431 text/plain body parts before first diff are added to commit
3411 3432 message.
3412 3433
3413 3434 If the imported patch was generated by :hg:`export`, user and
3414 3435 description from patch override values from message headers and
3415 3436 body. Values given on command line with -m/--message and -u/--user
3416 3437 override these.
3417 3438
3418 3439 If --exact is specified, import will set the working directory to
3419 3440 the parent of each patch before applying it, and will abort if the
3420 3441 resulting changeset has a different ID than the one recorded in
3421 3442 the patch. This may happen due to character set problems or other
3422 3443 deficiencies in the text patch format.
3423 3444
3424 3445 Use --bypass to apply and commit patches directly to the
3425 3446 repository, not touching the working directory. Without --exact,
3426 3447 patches will be applied on top of the working directory parent
3427 3448 revision.
3428 3449
3429 3450 With -s/--similarity, hg will attempt to discover renames and
3430 3451 copies in the patch in the same way as :hg:`addremove`.
3431 3452
3432 3453 To read a patch from standard input, use "-" as the patch name. If
3433 3454 a URL is specified, the patch will be downloaded from it.
3434 3455 See :hg:`help dates` for a list of formats valid for -d/--date.
3435 3456
3436 3457 .. container:: verbose
3437 3458
3438 3459 Examples:
3439 3460
3440 3461 - import a traditional patch from a website and detect renames::
3441 3462
3442 3463 hg import -s 80 http://example.com/bugfix.patch
3443 3464
3444 3465 - import a changeset from an hgweb server::
3445 3466
3446 3467 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3447 3468
3448 3469 - import all the patches in an Unix-style mbox::
3449 3470
3450 3471 hg import incoming-patches.mbox
3451 3472
3452 3473 - attempt to exactly restore an exported changeset (not always
3453 3474 possible)::
3454 3475
3455 3476 hg import --exact proposed-fix.patch
3456 3477
3457 3478 Returns 0 on success.
3458 3479 """
3459 3480
3460 3481 if not patch1:
3461 3482 raise util.Abort(_('need at least one patch to import'))
3462 3483
3463 3484 patches = (patch1,) + patches
3464 3485
3465 3486 date = opts.get('date')
3466 3487 if date:
3467 3488 opts['date'] = util.parsedate(date)
3468 3489
3469 3490 editor = cmdutil.commiteditor
3470 3491 if opts.get('edit'):
3471 3492 editor = cmdutil.commitforceeditor
3472 3493
3473 3494 update = not opts.get('bypass')
3474 3495 if not update and opts.get('no_commit'):
3475 3496 raise util.Abort(_('cannot use --no-commit with --bypass'))
3476 3497 try:
3477 3498 sim = float(opts.get('similarity') or 0)
3478 3499 except ValueError:
3479 3500 raise util.Abort(_('similarity must be a number'))
3480 3501 if sim < 0 or sim > 100:
3481 3502 raise util.Abort(_('similarity must be between 0 and 100'))
3482 3503 if sim and not update:
3483 3504 raise util.Abort(_('cannot use --similarity with --bypass'))
3484 3505
3485 3506 if (opts.get('exact') or not opts.get('force')) and update:
3486 3507 cmdutil.bailifchanged(repo)
3487 3508
3488 3509 base = opts["base"]
3489 3510 strip = opts["strip"]
3490 3511 wlock = lock = tr = None
3491 3512 msgs = []
3492 3513
3493 3514 def checkexact(repo, n, nodeid):
3494 3515 if opts.get('exact') and hex(n) != nodeid:
3495 3516 repo.rollback()
3496 3517 raise util.Abort(_('patch is damaged or loses information'))
3497 3518
3498 3519 def tryone(ui, hunk, parents):
3499 3520 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3500 3521 patch.extract(ui, hunk)
3501 3522
3502 3523 if not tmpname:
3503 3524 return (None, None)
3504 3525 msg = _('applied to working directory')
3505 3526
3506 3527 try:
3507 3528 cmdline_message = cmdutil.logmessage(ui, opts)
3508 3529 if cmdline_message:
3509 3530 # pickup the cmdline msg
3510 3531 message = cmdline_message
3511 3532 elif message:
3512 3533 # pickup the patch msg
3513 3534 message = message.strip()
3514 3535 else:
3515 3536 # launch the editor
3516 3537 message = None
3517 3538 ui.debug('message:\n%s\n' % message)
3518 3539
3519 3540 if len(parents) == 1:
3520 3541 parents.append(repo[nullid])
3521 3542 if opts.get('exact'):
3522 3543 if not nodeid or not p1:
3523 3544 raise util.Abort(_('not a Mercurial patch'))
3524 3545 p1 = repo[p1]
3525 3546 p2 = repo[p2 or nullid]
3526 3547 elif p2:
3527 3548 try:
3528 3549 p1 = repo[p1]
3529 3550 p2 = repo[p2]
3530 3551 # Without any options, consider p2 only if the
3531 3552 # patch is being applied on top of the recorded
3532 3553 # first parent.
3533 3554 if p1 != parents[0]:
3534 3555 p1 = parents[0]
3535 3556 p2 = repo[nullid]
3536 3557 except error.RepoError:
3537 3558 p1, p2 = parents
3538 3559 else:
3539 3560 p1, p2 = parents
3540 3561
3541 3562 n = None
3542 3563 if update:
3543 3564 if p1 != parents[0]:
3544 3565 hg.clean(repo, p1.node())
3545 3566 if p2 != parents[1]:
3546 3567 repo.dirstate.setparents(p1.node(), p2.node())
3547 3568
3548 3569 if opts.get('exact') or opts.get('import_branch'):
3549 3570 repo.dirstate.setbranch(branch or 'default')
3550 3571
3551 3572 files = set()
3552 3573 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3553 3574 eolmode=None, similarity=sim / 100.0)
3554 3575 files = list(files)
3555 3576 if opts.get('no_commit'):
3556 3577 if message:
3557 3578 msgs.append(message)
3558 3579 else:
3559 3580 if opts.get('exact') or p2:
3560 3581 # If you got here, you either use --force and know what
3561 3582 # you are doing or used --exact or a merge patch while
3562 3583 # being updated to its first parent.
3563 3584 m = None
3564 3585 else:
3565 3586 m = scmutil.matchfiles(repo, files or [])
3566 3587 n = repo.commit(message, opts.get('user') or user,
3567 3588 opts.get('date') or date, match=m,
3568 3589 editor=editor)
3569 3590 checkexact(repo, n, nodeid)
3570 3591 else:
3571 3592 if opts.get('exact') or opts.get('import_branch'):
3572 3593 branch = branch or 'default'
3573 3594 else:
3574 3595 branch = p1.branch()
3575 3596 store = patch.filestore()
3576 3597 try:
3577 3598 files = set()
3578 3599 try:
3579 3600 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3580 3601 files, eolmode=None)
3581 3602 except patch.PatchError, e:
3582 3603 raise util.Abort(str(e))
3583 3604 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3584 3605 message,
3585 3606 opts.get('user') or user,
3586 3607 opts.get('date') or date,
3587 3608 branch, files, store,
3588 3609 editor=cmdutil.commiteditor)
3589 3610 repo.savecommitmessage(memctx.description())
3590 3611 n = memctx.commit()
3591 3612 checkexact(repo, n, nodeid)
3592 3613 finally:
3593 3614 store.close()
3594 3615 if n:
3595 3616 # i18n: refers to a short changeset id
3596 3617 msg = _('created %s') % short(n)
3597 3618 return (msg, n)
3598 3619 finally:
3599 3620 os.unlink(tmpname)
3600 3621
3601 3622 try:
3602 3623 try:
3603 3624 wlock = repo.wlock()
3604 3625 lock = repo.lock()
3605 3626 tr = repo.transaction('import')
3606 3627 parents = repo.parents()
3607 3628 for patchurl in patches:
3608 3629 if patchurl == '-':
3609 3630 ui.status(_('applying patch from stdin\n'))
3610 3631 patchfile = ui.fin
3611 3632 patchurl = 'stdin' # for error message
3612 3633 else:
3613 3634 patchurl = os.path.join(base, patchurl)
3614 3635 ui.status(_('applying %s\n') % patchurl)
3615 3636 patchfile = url.open(ui, patchurl)
3616 3637
3617 3638 haspatch = False
3618 3639 for hunk in patch.split(patchfile):
3619 3640 (msg, node) = tryone(ui, hunk, parents)
3620 3641 if msg:
3621 3642 haspatch = True
3622 3643 ui.note(msg + '\n')
3623 3644 if update or opts.get('exact'):
3624 3645 parents = repo.parents()
3625 3646 else:
3626 3647 parents = [repo[node]]
3627 3648
3628 3649 if not haspatch:
3629 3650 raise util.Abort(_('%s: no diffs found') % patchurl)
3630 3651
3631 3652 tr.close()
3632 3653 if msgs:
3633 3654 repo.savecommitmessage('\n* * *\n'.join(msgs))
3634 3655 except:
3635 3656 # wlock.release() indirectly calls dirstate.write(): since
3636 3657 # we're crashing, we do not want to change the working dir
3637 3658 # parent after all, so make sure it writes nothing
3638 3659 repo.dirstate.invalidate()
3639 3660 raise
3640 3661 finally:
3641 3662 if tr:
3642 3663 tr.release()
3643 3664 release(lock, wlock)
3644 3665
3645 3666 @command('incoming|in',
3646 3667 [('f', 'force', None,
3647 3668 _('run even if remote repository is unrelated')),
3648 3669 ('n', 'newest-first', None, _('show newest record first')),
3649 3670 ('', 'bundle', '',
3650 3671 _('file to store the bundles into'), _('FILE')),
3651 3672 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3652 3673 ('B', 'bookmarks', False, _("compare bookmarks")),
3653 3674 ('b', 'branch', [],
3654 3675 _('a specific branch you would like to pull'), _('BRANCH')),
3655 3676 ] + logopts + remoteopts + subrepoopts,
3656 3677 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3657 3678 def incoming(ui, repo, source="default", **opts):
3658 3679 """show new changesets found in source
3659 3680
3660 3681 Show new changesets found in the specified path/URL or the default
3661 3682 pull location. These are the changesets that would have been pulled
3662 3683 if a pull at the time you issued this command.
3663 3684
3664 3685 For remote repository, using --bundle avoids downloading the
3665 3686 changesets twice if the incoming is followed by a pull.
3666 3687
3667 3688 See pull for valid source format details.
3668 3689
3669 3690 Returns 0 if there are incoming changes, 1 otherwise.
3670 3691 """
3671 3692 if opts.get('bundle') and opts.get('subrepos'):
3672 3693 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3673 3694
3674 3695 if opts.get('bookmarks'):
3675 3696 source, branches = hg.parseurl(ui.expandpath(source),
3676 3697 opts.get('branch'))
3677 3698 other = hg.peer(repo, opts, source)
3678 3699 if 'bookmarks' not in other.listkeys('namespaces'):
3679 3700 ui.warn(_("remote doesn't support bookmarks\n"))
3680 3701 return 0
3681 3702 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3682 3703 return bookmarks.diff(ui, repo, other)
3683 3704
3684 3705 repo._subtoppath = ui.expandpath(source)
3685 3706 try:
3686 3707 return hg.incoming(ui, repo, source, opts)
3687 3708 finally:
3688 3709 del repo._subtoppath
3689 3710
3690 3711
3691 3712 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3692 3713 def init(ui, dest=".", **opts):
3693 3714 """create a new repository in the given directory
3694 3715
3695 3716 Initialize a new repository in the given directory. If the given
3696 3717 directory does not exist, it will be created.
3697 3718
3698 3719 If no directory is given, the current directory is used.
3699 3720
3700 3721 It is possible to specify an ``ssh://`` URL as the destination.
3701 3722 See :hg:`help urls` for more information.
3702 3723
3703 3724 Returns 0 on success.
3704 3725 """
3705 3726 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3706 3727
3707 3728 @command('locate',
3708 3729 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3709 3730 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3710 3731 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3711 3732 ] + walkopts,
3712 3733 _('[OPTION]... [PATTERN]...'))
3713 3734 def locate(ui, repo, *pats, **opts):
3714 3735 """locate files matching specific patterns
3715 3736
3716 3737 Print files under Mercurial control in the working directory whose
3717 3738 names match the given patterns.
3718 3739
3719 3740 By default, this command searches all directories in the working
3720 3741 directory. To search just the current directory and its
3721 3742 subdirectories, use "--include .".
3722 3743
3723 3744 If no patterns are given to match, this command prints the names
3724 3745 of all files under Mercurial control in the working directory.
3725 3746
3726 3747 If you want to feed the output of this command into the "xargs"
3727 3748 command, use the -0 option to both this command and "xargs". This
3728 3749 will avoid the problem of "xargs" treating single filenames that
3729 3750 contain whitespace as multiple filenames.
3730 3751
3731 3752 Returns 0 if a match is found, 1 otherwise.
3732 3753 """
3733 3754 end = opts.get('print0') and '\0' or '\n'
3734 3755 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3735 3756
3736 3757 ret = 1
3737 3758 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3738 3759 m.bad = lambda x, y: False
3739 3760 for abs in repo[rev].walk(m):
3740 3761 if not rev and abs not in repo.dirstate:
3741 3762 continue
3742 3763 if opts.get('fullpath'):
3743 3764 ui.write(repo.wjoin(abs), end)
3744 3765 else:
3745 3766 ui.write(((pats and m.rel(abs)) or abs), end)
3746 3767 ret = 0
3747 3768
3748 3769 return ret
3749 3770
3750 3771 @command('^log|history',
3751 3772 [('f', 'follow', None,
3752 3773 _('follow changeset history, or file history across copies and renames')),
3753 3774 ('', 'follow-first', None,
3754 3775 _('only follow the first parent of merge changesets (DEPRECATED)')),
3755 3776 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3756 3777 ('C', 'copies', None, _('show copied files')),
3757 3778 ('k', 'keyword', [],
3758 3779 _('do case-insensitive search for a given text'), _('TEXT')),
3759 3780 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3760 3781 ('', 'removed', None, _('include revisions where files were removed')),
3761 3782 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3762 3783 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3763 3784 ('', 'only-branch', [],
3764 3785 _('show only changesets within the given named branch (DEPRECATED)'),
3765 3786 _('BRANCH')),
3766 3787 ('b', 'branch', [],
3767 3788 _('show changesets within the given named branch'), _('BRANCH')),
3768 3789 ('P', 'prune', [],
3769 3790 _('do not display revision or any of its ancestors'), _('REV')),
3770 3791 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3771 3792 ] + logopts + walkopts,
3772 3793 _('[OPTION]... [FILE]'))
3773 3794 def log(ui, repo, *pats, **opts):
3774 3795 """show revision history of entire repository or files
3775 3796
3776 3797 Print the revision history of the specified files or the entire
3777 3798 project.
3778 3799
3779 3800 If no revision range is specified, the default is ``tip:0`` unless
3780 3801 --follow is set, in which case the working directory parent is
3781 3802 used as the starting revision.
3782 3803
3783 3804 File history is shown without following rename or copy history of
3784 3805 files. Use -f/--follow with a filename to follow history across
3785 3806 renames and copies. --follow without a filename will only show
3786 3807 ancestors or descendants of the starting revision.
3787 3808
3788 3809 By default this command prints revision number and changeset id,
3789 3810 tags, non-trivial parents, user, date and time, and a summary for
3790 3811 each commit. When the -v/--verbose switch is used, the list of
3791 3812 changed files and full commit message are shown.
3792 3813
3793 3814 .. note::
3794 3815 log -p/--patch may generate unexpected diff output for merge
3795 3816 changesets, as it will only compare the merge changeset against
3796 3817 its first parent. Also, only files different from BOTH parents
3797 3818 will appear in files:.
3798 3819
3799 3820 .. note::
3800 3821 for performance reasons, log FILE may omit duplicate changes
3801 3822 made on branches and will not show deletions. To see all
3802 3823 changes including duplicates and deletions, use the --removed
3803 3824 switch.
3804 3825
3805 3826 .. container:: verbose
3806 3827
3807 3828 Some examples:
3808 3829
3809 3830 - changesets with full descriptions and file lists::
3810 3831
3811 3832 hg log -v
3812 3833
3813 3834 - changesets ancestral to the working directory::
3814 3835
3815 3836 hg log -f
3816 3837
3817 3838 - last 10 commits on the current branch::
3818 3839
3819 3840 hg log -l 10 -b .
3820 3841
3821 3842 - changesets showing all modifications of a file, including removals::
3822 3843
3823 3844 hg log --removed file.c
3824 3845
3825 3846 - all changesets that touch a directory, with diffs, excluding merges::
3826 3847
3827 3848 hg log -Mp lib/
3828 3849
3829 3850 - all revision numbers that match a keyword::
3830 3851
3831 3852 hg log -k bug --template "{rev}\\n"
3832 3853
3833 3854 - check if a given changeset is included is a tagged release::
3834 3855
3835 3856 hg log -r "a21ccf and ancestor(1.9)"
3836 3857
3837 3858 - find all changesets by some user in a date range::
3838 3859
3839 3860 hg log -k alice -d "may 2008 to jul 2008"
3840 3861
3841 3862 - summary of all changesets after the last tag::
3842 3863
3843 3864 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3844 3865
3845 3866 See :hg:`help dates` for a list of formats valid for -d/--date.
3846 3867
3847 3868 See :hg:`help revisions` and :hg:`help revsets` for more about
3848 3869 specifying revisions.
3849 3870
3850 3871 Returns 0 on success.
3851 3872 """
3852 3873
3853 3874 matchfn = scmutil.match(repo[None], pats, opts)
3854 3875 limit = cmdutil.loglimit(opts)
3855 3876 count = 0
3856 3877
3857 3878 getrenamed, endrev = None, None
3858 3879 if opts.get('copies'):
3859 3880 if opts.get('rev'):
3860 3881 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3861 3882 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3862 3883
3863 3884 df = False
3864 3885 if opts["date"]:
3865 3886 df = util.matchdate(opts["date"])
3866 3887
3867 3888 branches = opts.get('branch', []) + opts.get('only_branch', [])
3868 3889 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3869 3890
3870 3891 displayer = cmdutil.show_changeset(ui, repo, opts, True)
3871 3892 def prep(ctx, fns):
3872 3893 rev = ctx.rev()
3873 3894 parents = [p for p in repo.changelog.parentrevs(rev)
3874 3895 if p != nullrev]
3875 3896 if opts.get('no_merges') and len(parents) == 2:
3876 3897 return
3877 3898 if opts.get('only_merges') and len(parents) != 2:
3878 3899 return
3879 3900 if opts.get('branch') and ctx.branch() not in opts['branch']:
3880 3901 return
3881 3902 if not opts.get('hidden') and ctx.hidden():
3882 3903 return
3883 3904 if df and not df(ctx.date()[0]):
3884 3905 return
3885 3906
3886 3907 lower = encoding.lower
3887 3908 if opts.get('user'):
3888 3909 luser = lower(ctx.user())
3889 3910 for k in [lower(x) for x in opts['user']]:
3890 3911 if (k in luser):
3891 3912 break
3892 3913 else:
3893 3914 return
3894 3915 if opts.get('keyword'):
3895 3916 luser = lower(ctx.user())
3896 3917 ldesc = lower(ctx.description())
3897 3918 lfiles = lower(" ".join(ctx.files()))
3898 3919 for k in [lower(x) for x in opts['keyword']]:
3899 3920 if (k in luser or k in ldesc or k in lfiles):
3900 3921 break
3901 3922 else:
3902 3923 return
3903 3924
3904 3925 copies = None
3905 3926 if getrenamed is not None and rev:
3906 3927 copies = []
3907 3928 for fn in ctx.files():
3908 3929 rename = getrenamed(fn, rev)
3909 3930 if rename:
3910 3931 copies.append((fn, rename[0]))
3911 3932
3912 3933 revmatchfn = None
3913 3934 if opts.get('patch') or opts.get('stat'):
3914 3935 if opts.get('follow') or opts.get('follow_first'):
3915 3936 # note: this might be wrong when following through merges
3916 3937 revmatchfn = scmutil.match(repo[None], fns, default='path')
3917 3938 else:
3918 3939 revmatchfn = matchfn
3919 3940
3920 3941 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3921 3942
3922 3943 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3923 3944 if count == limit:
3924 3945 break
3925 3946 if displayer.flush(ctx.rev()):
3926 3947 count += 1
3927 3948 displayer.close()
3928 3949
3929 3950 @command('manifest',
3930 3951 [('r', 'rev', '', _('revision to display'), _('REV')),
3931 3952 ('', 'all', False, _("list files from all revisions"))],
3932 3953 _('[-r REV]'))
3933 3954 def manifest(ui, repo, node=None, rev=None, **opts):
3934 3955 """output the current or given revision of the project manifest
3935 3956
3936 3957 Print a list of version controlled files for the given revision.
3937 3958 If no revision is given, the first parent of the working directory
3938 3959 is used, or the null revision if no revision is checked out.
3939 3960
3940 3961 With -v, print file permissions, symlink and executable bits.
3941 3962 With --debug, print file revision hashes.
3942 3963
3943 3964 If option --all is specified, the list of all files from all revisions
3944 3965 is printed. This includes deleted and renamed files.
3945 3966
3946 3967 Returns 0 on success.
3947 3968 """
3948 3969 if opts.get('all'):
3949 3970 if rev or node:
3950 3971 raise util.Abort(_("can't specify a revision with --all"))
3951 3972
3952 3973 res = []
3953 3974 prefix = "data/"
3954 3975 suffix = ".i"
3955 3976 plen = len(prefix)
3956 3977 slen = len(suffix)
3957 3978 lock = repo.lock()
3958 3979 try:
3959 3980 for fn, b, size in repo.store.datafiles():
3960 3981 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3961 3982 res.append(fn[plen:-slen])
3962 3983 finally:
3963 3984 lock.release()
3964 3985 for f in sorted(res):
3965 3986 ui.write("%s\n" % f)
3966 3987 return
3967 3988
3968 3989 if rev and node:
3969 3990 raise util.Abort(_("please specify just one revision"))
3970 3991
3971 3992 if not node:
3972 3993 node = rev
3973 3994
3974 3995 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
3975 3996 ctx = scmutil.revsingle(repo, node)
3976 3997 for f in ctx:
3977 3998 if ui.debugflag:
3978 3999 ui.write("%40s " % hex(ctx.manifest()[f]))
3979 4000 if ui.verbose:
3980 4001 ui.write(decor[ctx.flags(f)])
3981 4002 ui.write("%s\n" % f)
3982 4003
3983 4004 @command('^merge',
3984 4005 [('f', 'force', None, _('force a merge with outstanding changes')),
3985 4006 ('r', 'rev', '', _('revision to merge'), _('REV')),
3986 4007 ('P', 'preview', None,
3987 4008 _('review revisions to merge (no merge is performed)'))
3988 4009 ] + mergetoolopts,
3989 4010 _('[-P] [-f] [[-r] REV]'))
3990 4011 def merge(ui, repo, node=None, **opts):
3991 4012 """merge working directory with another revision
3992 4013
3993 4014 The current working directory is updated with all changes made in
3994 4015 the requested revision since the last common predecessor revision.
3995 4016
3996 4017 Files that changed between either parent are marked as changed for
3997 4018 the next commit and a commit must be performed before any further
3998 4019 updates to the repository are allowed. The next commit will have
3999 4020 two parents.
4000 4021
4001 4022 ``--tool`` can be used to specify the merge tool used for file
4002 4023 merges. It overrides the HGMERGE environment variable and your
4003 4024 configuration files. See :hg:`help merge-tools` for options.
4004 4025
4005 4026 If no revision is specified, the working directory's parent is a
4006 4027 head revision, and the current branch contains exactly one other
4007 4028 head, the other head is merged with by default. Otherwise, an
4008 4029 explicit revision with which to merge with must be provided.
4009 4030
4010 4031 :hg:`resolve` must be used to resolve unresolved files.
4011 4032
4012 4033 To undo an uncommitted merge, use :hg:`update --clean .` which
4013 4034 will check out a clean copy of the original merge parent, losing
4014 4035 all changes.
4015 4036
4016 4037 Returns 0 on success, 1 if there are unresolved files.
4017 4038 """
4018 4039
4019 4040 if opts.get('rev') and node:
4020 4041 raise util.Abort(_("please specify just one revision"))
4021 4042 if not node:
4022 4043 node = opts.get('rev')
4023 4044
4024 4045 if not node:
4025 4046 branch = repo[None].branch()
4026 4047 bheads = repo.branchheads(branch)
4027 4048 if len(bheads) > 2:
4028 4049 raise util.Abort(_("branch '%s' has %d heads - "
4029 4050 "please merge with an explicit rev")
4030 4051 % (branch, len(bheads)),
4031 4052 hint=_("run 'hg heads .' to see heads"))
4032 4053
4033 4054 parent = repo.dirstate.p1()
4034 4055 if len(bheads) == 1:
4035 4056 if len(repo.heads()) > 1:
4036 4057 raise util.Abort(_("branch '%s' has one head - "
4037 4058 "please merge with an explicit rev")
4038 4059 % branch,
4039 4060 hint=_("run 'hg heads' to see all heads"))
4040 4061 msg, hint = _('nothing to merge'), None
4041 4062 if parent != repo.lookup(branch):
4042 4063 hint = _("use 'hg update' instead")
4043 4064 raise util.Abort(msg, hint=hint)
4044 4065
4045 4066 if parent not in bheads:
4046 4067 raise util.Abort(_('working directory not at a head revision'),
4047 4068 hint=_("use 'hg update' or merge with an "
4048 4069 "explicit revision"))
4049 4070 node = parent == bheads[0] and bheads[-1] or bheads[0]
4050 4071 else:
4051 4072 node = scmutil.revsingle(repo, node).node()
4052 4073
4053 4074 if opts.get('preview'):
4054 4075 # find nodes that are ancestors of p2 but not of p1
4055 4076 p1 = repo.lookup('.')
4056 4077 p2 = repo.lookup(node)
4057 4078 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4058 4079
4059 4080 displayer = cmdutil.show_changeset(ui, repo, opts)
4060 4081 for node in nodes:
4061 4082 displayer.show(repo[node])
4062 4083 displayer.close()
4063 4084 return 0
4064 4085
4065 4086 try:
4066 4087 # ui.forcemerge is an internal variable, do not document
4067 4088 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4068 4089 return hg.merge(repo, node, force=opts.get('force'))
4069 4090 finally:
4070 4091 ui.setconfig('ui', 'forcemerge', '')
4071 4092
4072 4093 @command('outgoing|out',
4073 4094 [('f', 'force', None, _('run even when the destination is unrelated')),
4074 4095 ('r', 'rev', [],
4075 4096 _('a changeset intended to be included in the destination'), _('REV')),
4076 4097 ('n', 'newest-first', None, _('show newest record first')),
4077 4098 ('B', 'bookmarks', False, _('compare bookmarks')),
4078 4099 ('b', 'branch', [], _('a specific branch you would like to push'),
4079 4100 _('BRANCH')),
4080 4101 ] + logopts + remoteopts + subrepoopts,
4081 4102 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4082 4103 def outgoing(ui, repo, dest=None, **opts):
4083 4104 """show changesets not found in the destination
4084 4105
4085 4106 Show changesets not found in the specified destination repository
4086 4107 or the default push location. These are the changesets that would
4087 4108 be pushed if a push was requested.
4088 4109
4089 4110 See pull for details of valid destination formats.
4090 4111
4091 4112 Returns 0 if there are outgoing changes, 1 otherwise.
4092 4113 """
4093 4114
4094 4115 if opts.get('bookmarks'):
4095 4116 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4096 4117 dest, branches = hg.parseurl(dest, opts.get('branch'))
4097 4118 other = hg.peer(repo, opts, dest)
4098 4119 if 'bookmarks' not in other.listkeys('namespaces'):
4099 4120 ui.warn(_("remote doesn't support bookmarks\n"))
4100 4121 return 0
4101 4122 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4102 4123 return bookmarks.diff(ui, other, repo)
4103 4124
4104 4125 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4105 4126 try:
4106 4127 return hg.outgoing(ui, repo, dest, opts)
4107 4128 finally:
4108 4129 del repo._subtoppath
4109 4130
4110 4131 @command('parents',
4111 4132 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4112 4133 ] + templateopts,
4113 4134 _('[-r REV] [FILE]'))
4114 4135 def parents(ui, repo, file_=None, **opts):
4115 4136 """show the parents of the working directory or revision
4116 4137
4117 4138 Print the working directory's parent revisions. If a revision is
4118 4139 given via -r/--rev, the parent of that revision will be printed.
4119 4140 If a file argument is given, the revision in which the file was
4120 4141 last changed (before the working directory revision or the
4121 4142 argument to --rev if given) is printed.
4122 4143
4123 4144 Returns 0 on success.
4124 4145 """
4125 4146
4126 4147 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4127 4148
4128 4149 if file_:
4129 4150 m = scmutil.match(ctx, (file_,), opts)
4130 4151 if m.anypats() or len(m.files()) != 1:
4131 4152 raise util.Abort(_('can only specify an explicit filename'))
4132 4153 file_ = m.files()[0]
4133 4154 filenodes = []
4134 4155 for cp in ctx.parents():
4135 4156 if not cp:
4136 4157 continue
4137 4158 try:
4138 4159 filenodes.append(cp.filenode(file_))
4139 4160 except error.LookupError:
4140 4161 pass
4141 4162 if not filenodes:
4142 4163 raise util.Abort(_("'%s' not found in manifest!") % file_)
4143 4164 fl = repo.file(file_)
4144 4165 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4145 4166 else:
4146 4167 p = [cp.node() for cp in ctx.parents()]
4147 4168
4148 4169 displayer = cmdutil.show_changeset(ui, repo, opts)
4149 4170 for n in p:
4150 4171 if n != nullid:
4151 4172 displayer.show(repo[n])
4152 4173 displayer.close()
4153 4174
4154 4175 @command('paths', [], _('[NAME]'))
4155 4176 def paths(ui, repo, search=None):
4156 4177 """show aliases for remote repositories
4157 4178
4158 4179 Show definition of symbolic path name NAME. If no name is given,
4159 4180 show definition of all available names.
4160 4181
4161 4182 Option -q/--quiet suppresses all output when searching for NAME
4162 4183 and shows only the path names when listing all definitions.
4163 4184
4164 4185 Path names are defined in the [paths] section of your
4165 4186 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4166 4187 repository, ``.hg/hgrc`` is used, too.
4167 4188
4168 4189 The path names ``default`` and ``default-push`` have a special
4169 4190 meaning. When performing a push or pull operation, they are used
4170 4191 as fallbacks if no location is specified on the command-line.
4171 4192 When ``default-push`` is set, it will be used for push and
4172 4193 ``default`` will be used for pull; otherwise ``default`` is used
4173 4194 as the fallback for both. When cloning a repository, the clone
4174 4195 source is written as ``default`` in ``.hg/hgrc``. Note that
4175 4196 ``default`` and ``default-push`` apply to all inbound (e.g.
4176 4197 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4177 4198 :hg:`bundle`) operations.
4178 4199
4179 4200 See :hg:`help urls` for more information.
4180 4201
4181 4202 Returns 0 on success.
4182 4203 """
4183 4204 if search:
4184 4205 for name, path in ui.configitems("paths"):
4185 4206 if name == search:
4186 4207 ui.status("%s\n" % util.hidepassword(path))
4187 4208 return
4188 4209 if not ui.quiet:
4189 4210 ui.warn(_("not found!\n"))
4190 4211 return 1
4191 4212 else:
4192 4213 for name, path in ui.configitems("paths"):
4193 4214 if ui.quiet:
4194 4215 ui.write("%s\n" % name)
4195 4216 else:
4196 4217 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4197 4218
4198 4219 @command('^phase',
4199 4220 [('p', 'public', False, _('set changeset phase to public')),
4200 4221 ('d', 'draft', False, _('set changeset phase to draft')),
4201 4222 ('s', 'secret', False, _('set changeset phase to secret')),
4202 4223 ('f', 'force', False, _('allow to move boundary backward')),
4203 4224 ('r', 'rev', [], _('target revision'), _('REV')),
4204 4225 ],
4205 4226 _('[-p|-d|-s] [-f] [-r] REV...'))
4206 4227 def phase(ui, repo, *revs, **opts):
4207 4228 """set or show the current phase name
4208 4229
4209 4230 With no argument, show the phase name of specified revisions.
4210 4231
4211 4232 With one of -p/--public, -d/--draft or -s/--secret, change the
4212 4233 phase value of the specified revisions.
4213 4234
4214 4235 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4215 4236 lower phase to an higher phase. Phases are ordered as follows::
4216 4237
4217 4238 public < draft < secret
4218 4239
4219 4240 Return 0 on success, 1 if no phases were changed or some could not
4220 4241 be changed.
4221 4242 """
4222 4243 # search for a unique phase argument
4223 4244 targetphase = None
4224 4245 for idx, name in enumerate(phases.phasenames):
4225 4246 if opts[name]:
4226 4247 if targetphase is not None:
4227 4248 raise util.Abort(_('only one phase can be specified'))
4228 4249 targetphase = idx
4229 4250
4230 4251 # look for specified revision
4231 4252 revs = list(revs)
4232 4253 revs.extend(opts['rev'])
4233 4254 if not revs:
4234 4255 raise util.Abort(_('no revisions specified'))
4235 4256
4236 4257 revs = scmutil.revrange(repo, revs)
4237 4258
4238 4259 lock = None
4239 4260 ret = 0
4240 4261 if targetphase is None:
4241 4262 # display
4242 4263 for r in revs:
4243 4264 ctx = repo[r]
4244 4265 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4245 4266 else:
4246 4267 lock = repo.lock()
4247 4268 try:
4248 4269 # set phase
4249 4270 nodes = [ctx.node() for ctx in repo.set('%ld', revs)]
4250 4271 if not nodes:
4251 4272 raise util.Abort(_('empty revision set'))
4252 4273 olddata = repo._phaserev[:]
4253 4274 phases.advanceboundary(repo, targetphase, nodes)
4254 4275 if opts['force']:
4255 4276 phases.retractboundary(repo, targetphase, nodes)
4256 4277 finally:
4257 4278 lock.release()
4258 4279 if olddata is not None:
4259 4280 changes = 0
4260 4281 newdata = repo._phaserev
4261 4282 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4262 4283 rejected = [n for n in nodes
4263 4284 if newdata[repo[n].rev()] < targetphase]
4264 4285 if rejected:
4265 4286 ui.warn(_('cannot move %i changesets to a more permissive '
4266 4287 'phase, use --force\n') % len(rejected))
4267 4288 ret = 1
4268 4289 if changes:
4269 4290 msg = _('phase changed for %i changesets\n') % changes
4270 4291 if ret:
4271 4292 ui.status(msg)
4272 4293 else:
4273 4294 ui.note(msg)
4274 4295 else:
4275 4296 ui.warn(_('no phases changed\n'))
4276 4297 ret = 1
4277 4298 return ret
4278 4299
4279 4300 def postincoming(ui, repo, modheads, optupdate, checkout):
4280 4301 if modheads == 0:
4281 4302 return
4282 4303 if optupdate:
4283 4304 movemarkfrom = repo['.'].node()
4284 4305 try:
4285 4306 ret = hg.update(repo, checkout)
4286 4307 except util.Abort, inst:
4287 4308 ui.warn(_("not updating: %s\n") % str(inst))
4288 4309 return 0
4289 4310 if not ret and not checkout:
4290 4311 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4291 4312 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4292 4313 return ret
4293 4314 if modheads > 1:
4294 4315 currentbranchheads = len(repo.branchheads())
4295 4316 if currentbranchheads == modheads:
4296 4317 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4297 4318 elif currentbranchheads > 1:
4298 4319 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4299 4320 else:
4300 4321 ui.status(_("(run 'hg heads' to see heads)\n"))
4301 4322 else:
4302 4323 ui.status(_("(run 'hg update' to get a working copy)\n"))
4303 4324
4304 4325 @command('^pull',
4305 4326 [('u', 'update', None,
4306 4327 _('update to new branch head if changesets were pulled')),
4307 4328 ('f', 'force', None, _('run even when remote repository is unrelated')),
4308 4329 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4309 4330 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4310 4331 ('b', 'branch', [], _('a specific branch you would like to pull'),
4311 4332 _('BRANCH')),
4312 4333 ] + remoteopts,
4313 4334 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4314 4335 def pull(ui, repo, source="default", **opts):
4315 4336 """pull changes from the specified source
4316 4337
4317 4338 Pull changes from a remote repository to a local one.
4318 4339
4319 4340 This finds all changes from the repository at the specified path
4320 4341 or URL and adds them to a local repository (the current one unless
4321 4342 -R is specified). By default, this does not update the copy of the
4322 4343 project in the working directory.
4323 4344
4324 4345 Use :hg:`incoming` if you want to see what would have been added
4325 4346 by a pull at the time you issued this command. If you then decide
4326 4347 to add those changes to the repository, you should use :hg:`pull
4327 4348 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4328 4349
4329 4350 If SOURCE is omitted, the 'default' path will be used.
4330 4351 See :hg:`help urls` for more information.
4331 4352
4332 4353 Returns 0 on success, 1 if an update had unresolved files.
4333 4354 """
4334 4355 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4335 4356 other = hg.peer(repo, opts, source)
4336 4357 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4337 4358 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4338 4359
4339 4360 if opts.get('bookmark'):
4340 4361 if not revs:
4341 4362 revs = []
4342 4363 rb = other.listkeys('bookmarks')
4343 4364 for b in opts['bookmark']:
4344 4365 if b not in rb:
4345 4366 raise util.Abort(_('remote bookmark %s not found!') % b)
4346 4367 revs.append(rb[b])
4347 4368
4348 4369 if revs:
4349 4370 try:
4350 4371 revs = [other.lookup(rev) for rev in revs]
4351 4372 except error.CapabilityError:
4352 4373 err = _("other repository doesn't support revision lookup, "
4353 4374 "so a rev cannot be specified.")
4354 4375 raise util.Abort(err)
4355 4376
4356 4377 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4357 4378 bookmarks.updatefromremote(ui, repo, other, source)
4358 4379 if checkout:
4359 4380 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4360 4381 repo._subtoppath = source
4361 4382 try:
4362 4383 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4363 4384
4364 4385 finally:
4365 4386 del repo._subtoppath
4366 4387
4367 4388 # update specified bookmarks
4368 4389 if opts.get('bookmark'):
4369 4390 for b in opts['bookmark']:
4370 4391 # explicit pull overrides local bookmark if any
4371 4392 ui.status(_("importing bookmark %s\n") % b)
4372 4393 repo._bookmarks[b] = repo[rb[b]].node()
4373 4394 bookmarks.write(repo)
4374 4395
4375 4396 return ret
4376 4397
4377 4398 @command('^push',
4378 4399 [('f', 'force', None, _('force push')),
4379 4400 ('r', 'rev', [],
4380 4401 _('a changeset intended to be included in the destination'),
4381 4402 _('REV')),
4382 4403 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4383 4404 ('b', 'branch', [],
4384 4405 _('a specific branch you would like to push'), _('BRANCH')),
4385 4406 ('', 'new-branch', False, _('allow pushing a new branch')),
4386 4407 ] + remoteopts,
4387 4408 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4388 4409 def push(ui, repo, dest=None, **opts):
4389 4410 """push changes to the specified destination
4390 4411
4391 4412 Push changesets from the local repository to the specified
4392 4413 destination.
4393 4414
4394 4415 This operation is symmetrical to pull: it is identical to a pull
4395 4416 in the destination repository from the current one.
4396 4417
4397 4418 By default, push will not allow creation of new heads at the
4398 4419 destination, since multiple heads would make it unclear which head
4399 4420 to use. In this situation, it is recommended to pull and merge
4400 4421 before pushing.
4401 4422
4402 4423 Use --new-branch if you want to allow push to create a new named
4403 4424 branch that is not present at the destination. This allows you to
4404 4425 only create a new branch without forcing other changes.
4405 4426
4406 4427 Use -f/--force to override the default behavior and push all
4407 4428 changesets on all branches.
4408 4429
4409 4430 If -r/--rev is used, the specified revision and all its ancestors
4410 4431 will be pushed to the remote repository.
4411 4432
4412 4433 Please see :hg:`help urls` for important details about ``ssh://``
4413 4434 URLs. If DESTINATION is omitted, a default path will be used.
4414 4435
4415 4436 Returns 0 if push was successful, 1 if nothing to push.
4416 4437 """
4417 4438
4418 4439 if opts.get('bookmark'):
4419 4440 for b in opts['bookmark']:
4420 4441 # translate -B options to -r so changesets get pushed
4421 4442 if b in repo._bookmarks:
4422 4443 opts.setdefault('rev', []).append(b)
4423 4444 else:
4424 4445 # if we try to push a deleted bookmark, translate it to null
4425 4446 # this lets simultaneous -r, -b options continue working
4426 4447 opts.setdefault('rev', []).append("null")
4427 4448
4428 4449 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4429 4450 dest, branches = hg.parseurl(dest, opts.get('branch'))
4430 4451 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4431 4452 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4432 4453 other = hg.peer(repo, opts, dest)
4433 4454 if revs:
4434 4455 revs = [repo.lookup(rev) for rev in revs]
4435 4456
4436 4457 repo._subtoppath = dest
4437 4458 try:
4438 4459 # push subrepos depth-first for coherent ordering
4439 4460 c = repo['']
4440 4461 subs = c.substate # only repos that are committed
4441 4462 for s in sorted(subs):
4442 4463 if c.sub(s).push(opts) == 0:
4443 4464 return False
4444 4465 finally:
4445 4466 del repo._subtoppath
4446 4467 result = repo.push(other, opts.get('force'), revs=revs,
4447 4468 newbranch=opts.get('new_branch'))
4448 4469
4449 4470 result = not result
4450 4471
4451 4472 if opts.get('bookmark'):
4452 4473 rb = other.listkeys('bookmarks')
4453 4474 for b in opts['bookmark']:
4454 4475 # explicit push overrides remote bookmark if any
4455 4476 if b in repo._bookmarks:
4456 4477 ui.status(_("exporting bookmark %s\n") % b)
4457 4478 new = repo[b].hex()
4458 4479 elif b in rb:
4459 4480 ui.status(_("deleting remote bookmark %s\n") % b)
4460 4481 new = '' # delete
4461 4482 else:
4462 4483 ui.warn(_('bookmark %s does not exist on the local '
4463 4484 'or remote repository!\n') % b)
4464 4485 return 2
4465 4486 old = rb.get(b, '')
4466 4487 r = other.pushkey('bookmarks', b, old, new)
4467 4488 if not r:
4468 4489 ui.warn(_('updating bookmark %s failed!\n') % b)
4469 4490 if not result:
4470 4491 result = 2
4471 4492
4472 4493 return result
4473 4494
4474 4495 @command('recover', [])
4475 4496 def recover(ui, repo):
4476 4497 """roll back an interrupted transaction
4477 4498
4478 4499 Recover from an interrupted commit or pull.
4479 4500
4480 4501 This command tries to fix the repository status after an
4481 4502 interrupted operation. It should only be necessary when Mercurial
4482 4503 suggests it.
4483 4504
4484 4505 Returns 0 if successful, 1 if nothing to recover or verify fails.
4485 4506 """
4486 4507 if repo.recover():
4487 4508 return hg.verify(repo)
4488 4509 return 1
4489 4510
4490 4511 @command('^remove|rm',
4491 4512 [('A', 'after', None, _('record delete for missing files')),
4492 4513 ('f', 'force', None,
4493 4514 _('remove (and delete) file even if added or modified')),
4494 4515 ] + walkopts,
4495 4516 _('[OPTION]... FILE...'))
4496 4517 def remove(ui, repo, *pats, **opts):
4497 4518 """remove the specified files on the next commit
4498 4519
4499 4520 Schedule the indicated files for removal from the current branch.
4500 4521
4501 4522 This command schedules the files to be removed at the next commit.
4502 4523 To undo a remove before that, see :hg:`revert`. To undo added
4503 4524 files, see :hg:`forget`.
4504 4525
4505 4526 .. container:: verbose
4506 4527
4507 4528 -A/--after can be used to remove only files that have already
4508 4529 been deleted, -f/--force can be used to force deletion, and -Af
4509 4530 can be used to remove files from the next revision without
4510 4531 deleting them from the working directory.
4511 4532
4512 4533 The following table details the behavior of remove for different
4513 4534 file states (columns) and option combinations (rows). The file
4514 4535 states are Added [A], Clean [C], Modified [M] and Missing [!]
4515 4536 (as reported by :hg:`status`). The actions are Warn, Remove
4516 4537 (from branch) and Delete (from disk):
4517 4538
4518 4539 ======= == == == ==
4519 4540 A C M !
4520 4541 ======= == == == ==
4521 4542 none W RD W R
4522 4543 -f R RD RD R
4523 4544 -A W W W R
4524 4545 -Af R R R R
4525 4546 ======= == == == ==
4526 4547
4527 4548 Note that remove never deletes files in Added [A] state from the
4528 4549 working directory, not even if option --force is specified.
4529 4550
4530 4551 Returns 0 on success, 1 if any warnings encountered.
4531 4552 """
4532 4553
4533 4554 ret = 0
4534 4555 after, force = opts.get('after'), opts.get('force')
4535 4556 if not pats and not after:
4536 4557 raise util.Abort(_('no files specified'))
4537 4558
4538 4559 m = scmutil.match(repo[None], pats, opts)
4539 4560 s = repo.status(match=m, clean=True)
4540 4561 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4541 4562
4542 4563 for f in m.files():
4543 4564 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4544 4565 if os.path.exists(m.rel(f)):
4545 4566 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4546 4567 ret = 1
4547 4568
4548 4569 if force:
4549 4570 list = modified + deleted + clean + added
4550 4571 elif after:
4551 4572 list = deleted
4552 4573 for f in modified + added + clean:
4553 4574 ui.warn(_('not removing %s: file still exists (use -f'
4554 4575 ' to force removal)\n') % m.rel(f))
4555 4576 ret = 1
4556 4577 else:
4557 4578 list = deleted + clean
4558 4579 for f in modified:
4559 4580 ui.warn(_('not removing %s: file is modified (use -f'
4560 4581 ' to force removal)\n') % m.rel(f))
4561 4582 ret = 1
4562 4583 for f in added:
4563 4584 ui.warn(_('not removing %s: file has been marked for add'
4564 4585 ' (use forget to undo)\n') % m.rel(f))
4565 4586 ret = 1
4566 4587
4567 4588 for f in sorted(list):
4568 4589 if ui.verbose or not m.exact(f):
4569 4590 ui.status(_('removing %s\n') % m.rel(f))
4570 4591
4571 4592 wlock = repo.wlock()
4572 4593 try:
4573 4594 if not after:
4574 4595 for f in list:
4575 4596 if f in added:
4576 4597 continue # we never unlink added files on remove
4577 4598 try:
4578 4599 util.unlinkpath(repo.wjoin(f))
4579 4600 except OSError, inst:
4580 4601 if inst.errno != errno.ENOENT:
4581 4602 raise
4582 4603 repo[None].forget(list)
4583 4604 finally:
4584 4605 wlock.release()
4585 4606
4586 4607 return ret
4587 4608
4588 4609 @command('rename|move|mv',
4589 4610 [('A', 'after', None, _('record a rename that has already occurred')),
4590 4611 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4591 4612 ] + walkopts + dryrunopts,
4592 4613 _('[OPTION]... SOURCE... DEST'))
4593 4614 def rename(ui, repo, *pats, **opts):
4594 4615 """rename files; equivalent of copy + remove
4595 4616
4596 4617 Mark dest as copies of sources; mark sources for deletion. If dest
4597 4618 is a directory, copies are put in that directory. If dest is a
4598 4619 file, there can only be one source.
4599 4620
4600 4621 By default, this command copies the contents of files as they
4601 4622 exist in the working directory. If invoked with -A/--after, the
4602 4623 operation is recorded, but no copying is performed.
4603 4624
4604 4625 This command takes effect at the next commit. To undo a rename
4605 4626 before that, see :hg:`revert`.
4606 4627
4607 4628 Returns 0 on success, 1 if errors are encountered.
4608 4629 """
4609 4630 wlock = repo.wlock(False)
4610 4631 try:
4611 4632 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4612 4633 finally:
4613 4634 wlock.release()
4614 4635
4615 4636 @command('resolve',
4616 4637 [('a', 'all', None, _('select all unresolved files')),
4617 4638 ('l', 'list', None, _('list state of files needing merge')),
4618 4639 ('m', 'mark', None, _('mark files as resolved')),
4619 4640 ('u', 'unmark', None, _('mark files as unresolved')),
4620 4641 ('n', 'no-status', None, _('hide status prefix'))]
4621 4642 + mergetoolopts + walkopts,
4622 4643 _('[OPTION]... [FILE]...'))
4623 4644 def resolve(ui, repo, *pats, **opts):
4624 4645 """redo merges or set/view the merge status of files
4625 4646
4626 4647 Merges with unresolved conflicts are often the result of
4627 4648 non-interactive merging using the ``internal:merge`` configuration
4628 4649 setting, or a command-line merge tool like ``diff3``. The resolve
4629 4650 command is used to manage the files involved in a merge, after
4630 4651 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4631 4652 working directory must have two parents). See :hg:`help
4632 4653 merge-tools` for information on configuring merge tools.
4633 4654
4634 4655 The resolve command can be used in the following ways:
4635 4656
4636 4657 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4637 4658 files, discarding any previous merge attempts. Re-merging is not
4638 4659 performed for files already marked as resolved. Use ``--all/-a``
4639 4660 to select all unresolved files. ``--tool`` can be used to specify
4640 4661 the merge tool used for the given files. It overrides the HGMERGE
4641 4662 environment variable and your configuration files. Previous file
4642 4663 contents are saved with a ``.orig`` suffix.
4643 4664
4644 4665 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4645 4666 (e.g. after having manually fixed-up the files). The default is
4646 4667 to mark all unresolved files.
4647 4668
4648 4669 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4649 4670 default is to mark all resolved files.
4650 4671
4651 4672 - :hg:`resolve -l`: list files which had or still have conflicts.
4652 4673 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4653 4674
4654 4675 Note that Mercurial will not let you commit files with unresolved
4655 4676 merge conflicts. You must use :hg:`resolve -m ...` before you can
4656 4677 commit after a conflicting merge.
4657 4678
4658 4679 Returns 0 on success, 1 if any files fail a resolve attempt.
4659 4680 """
4660 4681
4661 4682 all, mark, unmark, show, nostatus = \
4662 4683 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4663 4684
4664 4685 if (show and (mark or unmark)) or (mark and unmark):
4665 4686 raise util.Abort(_("too many options specified"))
4666 4687 if pats and all:
4667 4688 raise util.Abort(_("can't specify --all and patterns"))
4668 4689 if not (all or pats or show or mark or unmark):
4669 4690 raise util.Abort(_('no files or directories specified; '
4670 4691 'use --all to remerge all files'))
4671 4692
4672 4693 ms = mergemod.mergestate(repo)
4673 4694 m = scmutil.match(repo[None], pats, opts)
4674 4695 ret = 0
4675 4696
4676 4697 for f in ms:
4677 4698 if m(f):
4678 4699 if show:
4679 4700 if nostatus:
4680 4701 ui.write("%s\n" % f)
4681 4702 else:
4682 4703 ui.write("%s %s\n" % (ms[f].upper(), f),
4683 4704 label='resolve.' +
4684 4705 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4685 4706 elif mark:
4686 4707 ms.mark(f, "r")
4687 4708 elif unmark:
4688 4709 ms.mark(f, "u")
4689 4710 else:
4690 4711 wctx = repo[None]
4691 4712 mctx = wctx.parents()[-1]
4692 4713
4693 4714 # backup pre-resolve (merge uses .orig for its own purposes)
4694 4715 a = repo.wjoin(f)
4695 4716 util.copyfile(a, a + ".resolve")
4696 4717
4697 4718 try:
4698 4719 # resolve file
4699 4720 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4700 4721 if ms.resolve(f, wctx, mctx):
4701 4722 ret = 1
4702 4723 finally:
4703 4724 ui.setconfig('ui', 'forcemerge', '')
4704 4725
4705 4726 # replace filemerge's .orig file with our resolve file
4706 4727 util.rename(a + ".resolve", a + ".orig")
4707 4728
4708 4729 ms.commit()
4709 4730 return ret
4710 4731
4711 4732 @command('revert',
4712 4733 [('a', 'all', None, _('revert all changes when no arguments given')),
4713 4734 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4714 4735 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4715 4736 ('C', 'no-backup', None, _('do not save backup copies of files')),
4716 4737 ] + walkopts + dryrunopts,
4717 4738 _('[OPTION]... [-r REV] [NAME]...'))
4718 4739 def revert(ui, repo, *pats, **opts):
4719 4740 """restore files to their checkout state
4720 4741
4721 4742 .. note::
4722 4743 To check out earlier revisions, you should use :hg:`update REV`.
4723 4744 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4724 4745
4725 4746 With no revision specified, revert the specified files or directories
4726 4747 to the contents they had in the parent of the working directory.
4727 4748 This restores the contents of files to an unmodified
4728 4749 state and unschedules adds, removes, copies, and renames. If the
4729 4750 working directory has two parents, you must explicitly specify a
4730 4751 revision.
4731 4752
4732 4753 Using the -r/--rev or -d/--date options, revert the given files or
4733 4754 directories to their states as of a specific revision. Because
4734 4755 revert does not change the working directory parents, this will
4735 4756 cause these files to appear modified. This can be helpful to "back
4736 4757 out" some or all of an earlier change. See :hg:`backout` for a
4737 4758 related method.
4738 4759
4739 4760 Modified files are saved with a .orig suffix before reverting.
4740 4761 To disable these backups, use --no-backup.
4741 4762
4742 4763 See :hg:`help dates` for a list of formats valid for -d/--date.
4743 4764
4744 4765 Returns 0 on success.
4745 4766 """
4746 4767
4747 4768 if opts.get("date"):
4748 4769 if opts.get("rev"):
4749 4770 raise util.Abort(_("you can't specify a revision and a date"))
4750 4771 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4751 4772
4752 4773 parent, p2 = repo.dirstate.parents()
4753 4774 if not opts.get('rev') and p2 != nullid:
4754 4775 # revert after merge is a trap for new users (issue2915)
4755 4776 raise util.Abort(_('uncommitted merge with no revision specified'),
4756 4777 hint=_('use "hg update" or see "hg help revert"'))
4757 4778
4758 4779 ctx = scmutil.revsingle(repo, opts.get('rev'))
4759 4780 node = ctx.node()
4760 4781
4761 4782 if not pats and not opts.get('all'):
4762 4783 msg = _("no files or directories specified")
4763 4784 if p2 != nullid:
4764 4785 hint = _("uncommitted merge, use --all to discard all changes,"
4765 4786 " or 'hg update -C .' to abort the merge")
4766 4787 raise util.Abort(msg, hint=hint)
4767 4788 dirty = util.any(repo.status())
4768 4789 if node != parent:
4769 4790 if dirty:
4770 4791 hint = _("uncommitted changes, use --all to discard all"
4771 4792 " changes, or 'hg update %s' to update") % ctx.rev()
4772 4793 else:
4773 4794 hint = _("use --all to revert all files,"
4774 4795 " or 'hg update %s' to update") % ctx.rev()
4775 4796 elif dirty:
4776 4797 hint = _("uncommitted changes, use --all to discard all changes")
4777 4798 else:
4778 4799 hint = _("use --all to revert all files")
4779 4800 raise util.Abort(msg, hint=hint)
4780 4801
4781 4802 mf = ctx.manifest()
4782 4803 if node == parent:
4783 4804 pmf = mf
4784 4805 else:
4785 4806 pmf = None
4786 4807
4787 4808 # need all matching names in dirstate and manifest of target rev,
4788 4809 # so have to walk both. do not print errors if files exist in one
4789 4810 # but not other.
4790 4811
4791 4812 names = {}
4792 4813
4793 4814 wlock = repo.wlock()
4794 4815 try:
4795 4816 # walk dirstate.
4796 4817
4797 4818 m = scmutil.match(repo[None], pats, opts)
4798 4819 m.bad = lambda x, y: False
4799 4820 for abs in repo.walk(m):
4800 4821 names[abs] = m.rel(abs), m.exact(abs)
4801 4822
4802 4823 # walk target manifest.
4803 4824
4804 4825 def badfn(path, msg):
4805 4826 if path in names:
4806 4827 return
4807 4828 if path in repo[node].substate:
4808 4829 ui.warn("%s: %s\n" % (m.rel(path),
4809 4830 'reverting subrepos is unsupported'))
4810 4831 return
4811 4832 path_ = path + '/'
4812 4833 for f in names:
4813 4834 if f.startswith(path_):
4814 4835 return
4815 4836 ui.warn("%s: %s\n" % (m.rel(path), msg))
4816 4837
4817 4838 m = scmutil.match(repo[node], pats, opts)
4818 4839 m.bad = badfn
4819 4840 for abs in repo[node].walk(m):
4820 4841 if abs not in names:
4821 4842 names[abs] = m.rel(abs), m.exact(abs)
4822 4843
4823 4844 m = scmutil.matchfiles(repo, names)
4824 4845 changes = repo.status(match=m)[:4]
4825 4846 modified, added, removed, deleted = map(set, changes)
4826 4847
4827 4848 # if f is a rename, also revert the source
4828 4849 cwd = repo.getcwd()
4829 4850 for f in added:
4830 4851 src = repo.dirstate.copied(f)
4831 4852 if src and src not in names and repo.dirstate[src] == 'r':
4832 4853 removed.add(src)
4833 4854 names[src] = (repo.pathto(src, cwd), True)
4834 4855
4835 4856 def removeforget(abs):
4836 4857 if repo.dirstate[abs] == 'a':
4837 4858 return _('forgetting %s\n')
4838 4859 return _('removing %s\n')
4839 4860
4840 4861 revert = ([], _('reverting %s\n'))
4841 4862 add = ([], _('adding %s\n'))
4842 4863 remove = ([], removeforget)
4843 4864 undelete = ([], _('undeleting %s\n'))
4844 4865
4845 4866 disptable = (
4846 4867 # dispatch table:
4847 4868 # file state
4848 4869 # action if in target manifest
4849 4870 # action if not in target manifest
4850 4871 # make backup if in target manifest
4851 4872 # make backup if not in target manifest
4852 4873 (modified, revert, remove, True, True),
4853 4874 (added, revert, remove, True, False),
4854 4875 (removed, undelete, None, False, False),
4855 4876 (deleted, revert, remove, False, False),
4856 4877 )
4857 4878
4858 4879 for abs, (rel, exact) in sorted(names.items()):
4859 4880 mfentry = mf.get(abs)
4860 4881 target = repo.wjoin(abs)
4861 4882 def handle(xlist, dobackup):
4862 4883 xlist[0].append(abs)
4863 4884 if (dobackup and not opts.get('no_backup') and
4864 4885 os.path.lexists(target)):
4865 4886 bakname = "%s.orig" % rel
4866 4887 ui.note(_('saving current version of %s as %s\n') %
4867 4888 (rel, bakname))
4868 4889 if not opts.get('dry_run'):
4869 4890 util.rename(target, bakname)
4870 4891 if ui.verbose or not exact:
4871 4892 msg = xlist[1]
4872 4893 if not isinstance(msg, basestring):
4873 4894 msg = msg(abs)
4874 4895 ui.status(msg % rel)
4875 4896 for table, hitlist, misslist, backuphit, backupmiss in disptable:
4876 4897 if abs not in table:
4877 4898 continue
4878 4899 # file has changed in dirstate
4879 4900 if mfentry:
4880 4901 handle(hitlist, backuphit)
4881 4902 elif misslist is not None:
4882 4903 handle(misslist, backupmiss)
4883 4904 break
4884 4905 else:
4885 4906 if abs not in repo.dirstate:
4886 4907 if mfentry:
4887 4908 handle(add, True)
4888 4909 elif exact:
4889 4910 ui.warn(_('file not managed: %s\n') % rel)
4890 4911 continue
4891 4912 # file has not changed in dirstate
4892 4913 if node == parent:
4893 4914 if exact:
4894 4915 ui.warn(_('no changes needed to %s\n') % rel)
4895 4916 continue
4896 4917 if pmf is None:
4897 4918 # only need parent manifest in this unlikely case,
4898 4919 # so do not read by default
4899 4920 pmf = repo[parent].manifest()
4900 4921 if abs in pmf and mfentry:
4901 4922 # if version of file is same in parent and target
4902 4923 # manifests, do nothing
4903 4924 if (pmf[abs] != mfentry or
4904 4925 pmf.flags(abs) != mf.flags(abs)):
4905 4926 handle(revert, False)
4906 4927 else:
4907 4928 handle(remove, False)
4908 4929
4909 4930 if not opts.get('dry_run'):
4910 4931 def checkout(f):
4911 4932 fc = ctx[f]
4912 4933 repo.wwrite(f, fc.data(), fc.flags())
4913 4934
4914 4935 audit_path = scmutil.pathauditor(repo.root)
4915 4936 for f in remove[0]:
4916 4937 if repo.dirstate[f] == 'a':
4917 4938 repo.dirstate.drop(f)
4918 4939 continue
4919 4940 audit_path(f)
4920 4941 try:
4921 4942 util.unlinkpath(repo.wjoin(f))
4922 4943 except OSError:
4923 4944 pass
4924 4945 repo.dirstate.remove(f)
4925 4946
4926 4947 normal = None
4927 4948 if node == parent:
4928 4949 # We're reverting to our parent. If possible, we'd like status
4929 4950 # to report the file as clean. We have to use normallookup for
4930 4951 # merges to avoid losing information about merged/dirty files.
4931 4952 if p2 != nullid:
4932 4953 normal = repo.dirstate.normallookup
4933 4954 else:
4934 4955 normal = repo.dirstate.normal
4935 4956 for f in revert[0]:
4936 4957 checkout(f)
4937 4958 if normal:
4938 4959 normal(f)
4939 4960
4940 4961 for f in add[0]:
4941 4962 checkout(f)
4942 4963 repo.dirstate.add(f)
4943 4964
4944 4965 normal = repo.dirstate.normallookup
4945 4966 if node == parent and p2 == nullid:
4946 4967 normal = repo.dirstate.normal
4947 4968 for f in undelete[0]:
4948 4969 checkout(f)
4949 4970 normal(f)
4950 4971
4951 4972 finally:
4952 4973 wlock.release()
4953 4974
4954 4975 @command('rollback', dryrunopts +
4955 4976 [('f', 'force', False, _('ignore safety measures'))])
4956 4977 def rollback(ui, repo, **opts):
4957 4978 """roll back the last transaction (dangerous)
4958 4979
4959 4980 This command should be used with care. There is only one level of
4960 4981 rollback, and there is no way to undo a rollback. It will also
4961 4982 restore the dirstate at the time of the last transaction, losing
4962 4983 any dirstate changes since that time. This command does not alter
4963 4984 the working directory.
4964 4985
4965 4986 Transactions are used to encapsulate the effects of all commands
4966 4987 that create new changesets or propagate existing changesets into a
4967 4988 repository. For example, the following commands are transactional,
4968 4989 and their effects can be rolled back:
4969 4990
4970 4991 - commit
4971 4992 - import
4972 4993 - pull
4973 4994 - push (with this repository as the destination)
4974 4995 - unbundle
4975 4996
4976 4997 To avoid permanent data loss, rollback will refuse to rollback a
4977 4998 commit transaction if it isn't checked out. Use --force to
4978 4999 override this protection.
4979 5000
4980 5001 This command is not intended for use on public repositories. Once
4981 5002 changes are visible for pull by other users, rolling a transaction
4982 5003 back locally is ineffective (someone else may already have pulled
4983 5004 the changes). Furthermore, a race is possible with readers of the
4984 5005 repository; for example an in-progress pull from the repository
4985 5006 may fail if a rollback is performed.
4986 5007
4987 5008 Returns 0 on success, 1 if no rollback data is available.
4988 5009 """
4989 5010 return repo.rollback(dryrun=opts.get('dry_run'),
4990 5011 force=opts.get('force'))
4991 5012
4992 5013 @command('root', [])
4993 5014 def root(ui, repo):
4994 5015 """print the root (top) of the current working directory
4995 5016
4996 5017 Print the root directory of the current repository.
4997 5018
4998 5019 Returns 0 on success.
4999 5020 """
5000 5021 ui.write(repo.root + "\n")
5001 5022
5002 5023 @command('^serve',
5003 5024 [('A', 'accesslog', '', _('name of access log file to write to'),
5004 5025 _('FILE')),
5005 5026 ('d', 'daemon', None, _('run server in background')),
5006 5027 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5007 5028 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5008 5029 # use string type, then we can check if something was passed
5009 5030 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5010 5031 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5011 5032 _('ADDR')),
5012 5033 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5013 5034 _('PREFIX')),
5014 5035 ('n', 'name', '',
5015 5036 _('name to show in web pages (default: working directory)'), _('NAME')),
5016 5037 ('', 'web-conf', '',
5017 5038 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5018 5039 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5019 5040 _('FILE')),
5020 5041 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5021 5042 ('', 'stdio', None, _('for remote clients')),
5022 5043 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5023 5044 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5024 5045 ('', 'style', '', _('template style to use'), _('STYLE')),
5025 5046 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5026 5047 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5027 5048 _('[OPTION]...'))
5028 5049 def serve(ui, repo, **opts):
5029 5050 """start stand-alone webserver
5030 5051
5031 5052 Start a local HTTP repository browser and pull server. You can use
5032 5053 this for ad-hoc sharing and browsing of repositories. It is
5033 5054 recommended to use a real web server to serve a repository for
5034 5055 longer periods of time.
5035 5056
5036 5057 Please note that the server does not implement access control.
5037 5058 This means that, by default, anybody can read from the server and
5038 5059 nobody can write to it by default. Set the ``web.allow_push``
5039 5060 option to ``*`` to allow everybody to push to the server. You
5040 5061 should use a real web server if you need to authenticate users.
5041 5062
5042 5063 By default, the server logs accesses to stdout and errors to
5043 5064 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5044 5065 files.
5045 5066
5046 5067 To have the server choose a free port number to listen on, specify
5047 5068 a port number of 0; in this case, the server will print the port
5048 5069 number it uses.
5049 5070
5050 5071 Returns 0 on success.
5051 5072 """
5052 5073
5053 5074 if opts["stdio"] and opts["cmdserver"]:
5054 5075 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5055 5076
5056 5077 def checkrepo():
5057 5078 if repo is None:
5058 5079 raise error.RepoError(_("There is no Mercurial repository here"
5059 5080 " (.hg not found)"))
5060 5081
5061 5082 if opts["stdio"]:
5062 5083 checkrepo()
5063 5084 s = sshserver.sshserver(ui, repo)
5064 5085 s.serve_forever()
5065 5086
5066 5087 if opts["cmdserver"]:
5067 5088 checkrepo()
5068 5089 s = commandserver.server(ui, repo, opts["cmdserver"])
5069 5090 return s.serve()
5070 5091
5071 5092 # this way we can check if something was given in the command-line
5072 5093 if opts.get('port'):
5073 5094 opts['port'] = util.getport(opts.get('port'))
5074 5095
5075 5096 baseui = repo and repo.baseui or ui
5076 5097 optlist = ("name templates style address port prefix ipv6"
5077 5098 " accesslog errorlog certificate encoding")
5078 5099 for o in optlist.split():
5079 5100 val = opts.get(o, '')
5080 5101 if val in (None, ''): # should check against default options instead
5081 5102 continue
5082 5103 baseui.setconfig("web", o, val)
5083 5104 if repo and repo.ui != baseui:
5084 5105 repo.ui.setconfig("web", o, val)
5085 5106
5086 5107 o = opts.get('web_conf') or opts.get('webdir_conf')
5087 5108 if not o:
5088 5109 if not repo:
5089 5110 raise error.RepoError(_("There is no Mercurial repository"
5090 5111 " here (.hg not found)"))
5091 5112 o = repo.root
5092 5113
5093 5114 app = hgweb.hgweb(o, baseui=ui)
5094 5115
5095 5116 class service(object):
5096 5117 def init(self):
5097 5118 util.setsignalhandler()
5098 5119 self.httpd = hgweb.server.create_server(ui, app)
5099 5120
5100 5121 if opts['port'] and not ui.verbose:
5101 5122 return
5102 5123
5103 5124 if self.httpd.prefix:
5104 5125 prefix = self.httpd.prefix.strip('/') + '/'
5105 5126 else:
5106 5127 prefix = ''
5107 5128
5108 5129 port = ':%d' % self.httpd.port
5109 5130 if port == ':80':
5110 5131 port = ''
5111 5132
5112 5133 bindaddr = self.httpd.addr
5113 5134 if bindaddr == '0.0.0.0':
5114 5135 bindaddr = '*'
5115 5136 elif ':' in bindaddr: # IPv6
5116 5137 bindaddr = '[%s]' % bindaddr
5117 5138
5118 5139 fqaddr = self.httpd.fqaddr
5119 5140 if ':' in fqaddr:
5120 5141 fqaddr = '[%s]' % fqaddr
5121 5142 if opts['port']:
5122 5143 write = ui.status
5123 5144 else:
5124 5145 write = ui.write
5125 5146 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5126 5147 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5127 5148
5128 5149 def run(self):
5129 5150 self.httpd.serve_forever()
5130 5151
5131 5152 service = service()
5132 5153
5133 5154 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5134 5155
5135 5156 @command('showconfig|debugconfig',
5136 5157 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5137 5158 _('[-u] [NAME]...'))
5138 5159 def showconfig(ui, repo, *values, **opts):
5139 5160 """show combined config settings from all hgrc files
5140 5161
5141 5162 With no arguments, print names and values of all config items.
5142 5163
5143 5164 With one argument of the form section.name, print just the value
5144 5165 of that config item.
5145 5166
5146 5167 With multiple arguments, print names and values of all config
5147 5168 items with matching section names.
5148 5169
5149 5170 With --debug, the source (filename and line number) is printed
5150 5171 for each config item.
5151 5172
5152 5173 Returns 0 on success.
5153 5174 """
5154 5175
5155 5176 for f in scmutil.rcpath():
5156 5177 ui.debug('read config from: %s\n' % f)
5157 5178 untrusted = bool(opts.get('untrusted'))
5158 5179 if values:
5159 5180 sections = [v for v in values if '.' not in v]
5160 5181 items = [v for v in values if '.' in v]
5161 5182 if len(items) > 1 or items and sections:
5162 5183 raise util.Abort(_('only one config item permitted'))
5163 5184 for section, name, value in ui.walkconfig(untrusted=untrusted):
5164 5185 value = str(value).replace('\n', '\\n')
5165 5186 sectname = section + '.' + name
5166 5187 if values:
5167 5188 for v in values:
5168 5189 if v == section:
5169 5190 ui.debug('%s: ' %
5170 5191 ui.configsource(section, name, untrusted))
5171 5192 ui.write('%s=%s\n' % (sectname, value))
5172 5193 elif v == sectname:
5173 5194 ui.debug('%s: ' %
5174 5195 ui.configsource(section, name, untrusted))
5175 5196 ui.write(value, '\n')
5176 5197 else:
5177 5198 ui.debug('%s: ' %
5178 5199 ui.configsource(section, name, untrusted))
5179 5200 ui.write('%s=%s\n' % (sectname, value))
5180 5201
5181 5202 @command('^status|st',
5182 5203 [('A', 'all', None, _('show status of all files')),
5183 5204 ('m', 'modified', None, _('show only modified files')),
5184 5205 ('a', 'added', None, _('show only added files')),
5185 5206 ('r', 'removed', None, _('show only removed files')),
5186 5207 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5187 5208 ('c', 'clean', None, _('show only files without changes')),
5188 5209 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5189 5210 ('i', 'ignored', None, _('show only ignored files')),
5190 5211 ('n', 'no-status', None, _('hide status prefix')),
5191 5212 ('C', 'copies', None, _('show source of copied files')),
5192 5213 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5193 5214 ('', 'rev', [], _('show difference from revision'), _('REV')),
5194 5215 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5195 5216 ] + walkopts + subrepoopts,
5196 5217 _('[OPTION]... [FILE]...'))
5197 5218 def status(ui, repo, *pats, **opts):
5198 5219 """show changed files in the working directory
5199 5220
5200 5221 Show status of files in the repository. If names are given, only
5201 5222 files that match are shown. Files that are clean or ignored or
5202 5223 the source of a copy/move operation, are not listed unless
5203 5224 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5204 5225 Unless options described with "show only ..." are given, the
5205 5226 options -mardu are used.
5206 5227
5207 5228 Option -q/--quiet hides untracked (unknown and ignored) files
5208 5229 unless explicitly requested with -u/--unknown or -i/--ignored.
5209 5230
5210 5231 .. note::
5211 5232 status may appear to disagree with diff if permissions have
5212 5233 changed or a merge has occurred. The standard diff format does
5213 5234 not report permission changes and diff only reports changes
5214 5235 relative to one merge parent.
5215 5236
5216 5237 If one revision is given, it is used as the base revision.
5217 5238 If two revisions are given, the differences between them are
5218 5239 shown. The --change option can also be used as a shortcut to list
5219 5240 the changed files of a revision from its first parent.
5220 5241
5221 5242 The codes used to show the status of files are::
5222 5243
5223 5244 M = modified
5224 5245 A = added
5225 5246 R = removed
5226 5247 C = clean
5227 5248 ! = missing (deleted by non-hg command, but still tracked)
5228 5249 ? = not tracked
5229 5250 I = ignored
5230 5251 = origin of the previous file listed as A (added)
5231 5252
5232 5253 .. container:: verbose
5233 5254
5234 5255 Examples:
5235 5256
5236 5257 - show changes in the working directory relative to a
5237 5258 changeset::
5238 5259
5239 5260 hg status --rev 9353
5240 5261
5241 5262 - show all changes including copies in an existing changeset::
5242 5263
5243 5264 hg status --copies --change 9353
5244 5265
5245 5266 - get a NUL separated list of added files, suitable for xargs::
5246 5267
5247 5268 hg status -an0
5248 5269
5249 5270 Returns 0 on success.
5250 5271 """
5251 5272
5252 5273 revs = opts.get('rev')
5253 5274 change = opts.get('change')
5254 5275
5255 5276 if revs and change:
5256 5277 msg = _('cannot specify --rev and --change at the same time')
5257 5278 raise util.Abort(msg)
5258 5279 elif change:
5259 5280 node2 = scmutil.revsingle(repo, change, None).node()
5260 5281 node1 = repo[node2].p1().node()
5261 5282 else:
5262 5283 node1, node2 = scmutil.revpair(repo, revs)
5263 5284
5264 5285 cwd = (pats and repo.getcwd()) or ''
5265 5286 end = opts.get('print0') and '\0' or '\n'
5266 5287 copy = {}
5267 5288 states = 'modified added removed deleted unknown ignored clean'.split()
5268 5289 show = [k for k in states if opts.get(k)]
5269 5290 if opts.get('all'):
5270 5291 show += ui.quiet and (states[:4] + ['clean']) or states
5271 5292 if not show:
5272 5293 show = ui.quiet and states[:4] or states[:5]
5273 5294
5274 5295 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5275 5296 'ignored' in show, 'clean' in show, 'unknown' in show,
5276 5297 opts.get('subrepos'))
5277 5298 changestates = zip(states, 'MAR!?IC', stat)
5278 5299
5279 5300 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5280 5301 copy = copies.pathcopies(repo[node1], repo[node2])
5281 5302
5282 5303 fm = ui.formatter('status', opts)
5283 5304 format = '%s %s' + end
5284 5305 if opts.get('no_status'):
5285 5306 format = '%.0s%s' + end
5286 5307
5287 5308 for state, char, files in changestates:
5288 5309 if state in show:
5289 5310 label = 'status.' + state
5290 5311 for f in files:
5291 5312 fm.startitem()
5292 5313 fm.write("status path", format, char,
5293 5314 repo.pathto(f, cwd), label=label)
5294 5315 if f in copy:
5295 5316 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5296 5317 label='status.copied')
5297 5318 fm.end()
5298 5319
5299 5320 @command('^summary|sum',
5300 5321 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5301 5322 def summary(ui, repo, **opts):
5302 5323 """summarize working directory state
5303 5324
5304 5325 This generates a brief summary of the working directory state,
5305 5326 including parents, branch, commit status, and available updates.
5306 5327
5307 5328 With the --remote option, this will check the default paths for
5308 5329 incoming and outgoing changes. This can be time-consuming.
5309 5330
5310 5331 Returns 0 on success.
5311 5332 """
5312 5333
5313 5334 ctx = repo[None]
5314 5335 parents = ctx.parents()
5315 5336 pnode = parents[0].node()
5316 5337 marks = []
5317 5338
5318 5339 for p in parents:
5319 5340 # label with log.changeset (instead of log.parent) since this
5320 5341 # shows a working directory parent *changeset*:
5321 5342 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5322 5343 label='log.changeset')
5323 5344 ui.write(' '.join(p.tags()), label='log.tag')
5324 5345 if p.bookmarks():
5325 5346 marks.extend(p.bookmarks())
5326 5347 if p.rev() == -1:
5327 5348 if not len(repo):
5328 5349 ui.write(_(' (empty repository)'))
5329 5350 else:
5330 5351 ui.write(_(' (no revision checked out)'))
5331 5352 ui.write('\n')
5332 5353 if p.description():
5333 5354 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5334 5355 label='log.summary')
5335 5356
5336 5357 branch = ctx.branch()
5337 5358 bheads = repo.branchheads(branch)
5338 5359 m = _('branch: %s\n') % branch
5339 5360 if branch != 'default':
5340 5361 ui.write(m, label='log.branch')
5341 5362 else:
5342 5363 ui.status(m, label='log.branch')
5343 5364
5344 5365 if marks:
5345 5366 current = repo._bookmarkcurrent
5346 5367 ui.write(_('bookmarks:'), label='log.bookmark')
5347 5368 if current is not None:
5348 5369 try:
5349 5370 marks.remove(current)
5350 5371 ui.write(' *' + current, label='bookmarks.current')
5351 5372 except ValueError:
5352 5373 # current bookmark not in parent ctx marks
5353 5374 pass
5354 5375 for m in marks:
5355 5376 ui.write(' ' + m, label='log.bookmark')
5356 5377 ui.write('\n', label='log.bookmark')
5357 5378
5358 5379 st = list(repo.status(unknown=True))[:6]
5359 5380
5360 5381 c = repo.dirstate.copies()
5361 5382 copied, renamed = [], []
5362 5383 for d, s in c.iteritems():
5363 5384 if s in st[2]:
5364 5385 st[2].remove(s)
5365 5386 renamed.append(d)
5366 5387 else:
5367 5388 copied.append(d)
5368 5389 if d in st[1]:
5369 5390 st[1].remove(d)
5370 5391 st.insert(3, renamed)
5371 5392 st.insert(4, copied)
5372 5393
5373 5394 ms = mergemod.mergestate(repo)
5374 5395 st.append([f for f in ms if ms[f] == 'u'])
5375 5396
5376 5397 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5377 5398 st.append(subs)
5378 5399
5379 5400 labels = [ui.label(_('%d modified'), 'status.modified'),
5380 5401 ui.label(_('%d added'), 'status.added'),
5381 5402 ui.label(_('%d removed'), 'status.removed'),
5382 5403 ui.label(_('%d renamed'), 'status.copied'),
5383 5404 ui.label(_('%d copied'), 'status.copied'),
5384 5405 ui.label(_('%d deleted'), 'status.deleted'),
5385 5406 ui.label(_('%d unknown'), 'status.unknown'),
5386 5407 ui.label(_('%d ignored'), 'status.ignored'),
5387 5408 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5388 5409 ui.label(_('%d subrepos'), 'status.modified')]
5389 5410 t = []
5390 5411 for s, l in zip(st, labels):
5391 5412 if s:
5392 5413 t.append(l % len(s))
5393 5414
5394 5415 t = ', '.join(t)
5395 5416 cleanworkdir = False
5396 5417
5397 5418 if len(parents) > 1:
5398 5419 t += _(' (merge)')
5399 5420 elif branch != parents[0].branch():
5400 5421 t += _(' (new branch)')
5401 5422 elif (parents[0].extra().get('close') and
5402 5423 pnode in repo.branchheads(branch, closed=True)):
5403 5424 t += _(' (head closed)')
5404 5425 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5405 5426 t += _(' (clean)')
5406 5427 cleanworkdir = True
5407 5428 elif pnode not in bheads:
5408 5429 t += _(' (new branch head)')
5409 5430
5410 5431 if cleanworkdir:
5411 5432 ui.status(_('commit: %s\n') % t.strip())
5412 5433 else:
5413 5434 ui.write(_('commit: %s\n') % t.strip())
5414 5435
5415 5436 # all ancestors of branch heads - all ancestors of parent = new csets
5416 5437 new = [0] * len(repo)
5417 5438 cl = repo.changelog
5418 5439 for a in [cl.rev(n) for n in bheads]:
5419 5440 new[a] = 1
5420 5441 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5421 5442 new[a] = 1
5422 5443 for a in [p.rev() for p in parents]:
5423 5444 if a >= 0:
5424 5445 new[a] = 0
5425 5446 for a in cl.ancestors(*[p.rev() for p in parents]):
5426 5447 new[a] = 0
5427 5448 new = sum(new)
5428 5449
5429 5450 if new == 0:
5430 5451 ui.status(_('update: (current)\n'))
5431 5452 elif pnode not in bheads:
5432 5453 ui.write(_('update: %d new changesets (update)\n') % new)
5433 5454 else:
5434 5455 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5435 5456 (new, len(bheads)))
5436 5457
5437 5458 if opts.get('remote'):
5438 5459 t = []
5439 5460 source, branches = hg.parseurl(ui.expandpath('default'))
5440 5461 other = hg.peer(repo, {}, source)
5441 5462 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5442 5463 ui.debug('comparing with %s\n' % util.hidepassword(source))
5443 5464 repo.ui.pushbuffer()
5444 5465 commoninc = discovery.findcommonincoming(repo, other)
5445 5466 _common, incoming, _rheads = commoninc
5446 5467 repo.ui.popbuffer()
5447 5468 if incoming:
5448 5469 t.append(_('1 or more incoming'))
5449 5470
5450 5471 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5451 5472 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5452 5473 if source != dest:
5453 5474 other = hg.peer(repo, {}, dest)
5454 5475 commoninc = None
5455 5476 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5456 5477 repo.ui.pushbuffer()
5457 5478 outgoing = discovery.findcommonoutgoing(repo, other,
5458 5479 commoninc=commoninc)
5459 5480 repo.ui.popbuffer()
5460 5481 o = outgoing.missing
5461 5482 if o:
5462 5483 t.append(_('%d outgoing') % len(o))
5463 5484 if 'bookmarks' in other.listkeys('namespaces'):
5464 5485 lmarks = repo.listkeys('bookmarks')
5465 5486 rmarks = other.listkeys('bookmarks')
5466 5487 diff = set(rmarks) - set(lmarks)
5467 5488 if len(diff) > 0:
5468 5489 t.append(_('%d incoming bookmarks') % len(diff))
5469 5490 diff = set(lmarks) - set(rmarks)
5470 5491 if len(diff) > 0:
5471 5492 t.append(_('%d outgoing bookmarks') % len(diff))
5472 5493
5473 5494 if t:
5474 5495 ui.write(_('remote: %s\n') % (', '.join(t)))
5475 5496 else:
5476 5497 ui.status(_('remote: (synced)\n'))
5477 5498
5478 5499 @command('tag',
5479 5500 [('f', 'force', None, _('force tag')),
5480 5501 ('l', 'local', None, _('make the tag local')),
5481 5502 ('r', 'rev', '', _('revision to tag'), _('REV')),
5482 5503 ('', 'remove', None, _('remove a tag')),
5483 5504 # -l/--local is already there, commitopts cannot be used
5484 5505 ('e', 'edit', None, _('edit commit message')),
5485 5506 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5486 5507 ] + commitopts2,
5487 5508 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5488 5509 def tag(ui, repo, name1, *names, **opts):
5489 5510 """add one or more tags for the current or given revision
5490 5511
5491 5512 Name a particular revision using <name>.
5492 5513
5493 5514 Tags are used to name particular revisions of the repository and are
5494 5515 very useful to compare different revisions, to go back to significant
5495 5516 earlier versions or to mark branch points as releases, etc. Changing
5496 5517 an existing tag is normally disallowed; use -f/--force to override.
5497 5518
5498 5519 If no revision is given, the parent of the working directory is
5499 5520 used, or tip if no revision is checked out.
5500 5521
5501 5522 To facilitate version control, distribution, and merging of tags,
5502 5523 they are stored as a file named ".hgtags" which is managed similarly
5503 5524 to other project files and can be hand-edited if necessary. This
5504 5525 also means that tagging creates a new commit. The file
5505 5526 ".hg/localtags" is used for local tags (not shared among
5506 5527 repositories).
5507 5528
5508 5529 Tag commits are usually made at the head of a branch. If the parent
5509 5530 of the working directory is not a branch head, :hg:`tag` aborts; use
5510 5531 -f/--force to force the tag commit to be based on a non-head
5511 5532 changeset.
5512 5533
5513 5534 See :hg:`help dates` for a list of formats valid for -d/--date.
5514 5535
5515 5536 Since tag names have priority over branch names during revision
5516 5537 lookup, using an existing branch name as a tag name is discouraged.
5517 5538
5518 5539 Returns 0 on success.
5519 5540 """
5520 5541 wlock = lock = None
5521 5542 try:
5522 5543 wlock = repo.wlock()
5523 5544 lock = repo.lock()
5524 5545 rev_ = "."
5525 5546 names = [t.strip() for t in (name1,) + names]
5526 5547 if len(names) != len(set(names)):
5527 5548 raise util.Abort(_('tag names must be unique'))
5528 5549 for n in names:
5529 5550 if n in ['tip', '.', 'null']:
5530 5551 raise util.Abort(_("the name '%s' is reserved") % n)
5531 5552 if not n:
5532 5553 raise util.Abort(_('tag names cannot consist entirely of '
5533 5554 'whitespace'))
5534 5555 if opts.get('rev') and opts.get('remove'):
5535 5556 raise util.Abort(_("--rev and --remove are incompatible"))
5536 5557 if opts.get('rev'):
5537 5558 rev_ = opts['rev']
5538 5559 message = opts.get('message')
5539 5560 if opts.get('remove'):
5540 5561 expectedtype = opts.get('local') and 'local' or 'global'
5541 5562 for n in names:
5542 5563 if not repo.tagtype(n):
5543 5564 raise util.Abort(_("tag '%s' does not exist") % n)
5544 5565 if repo.tagtype(n) != expectedtype:
5545 5566 if expectedtype == 'global':
5546 5567 raise util.Abort(_("tag '%s' is not a global tag") % n)
5547 5568 else:
5548 5569 raise util.Abort(_("tag '%s' is not a local tag") % n)
5549 5570 rev_ = nullid
5550 5571 if not message:
5551 5572 # we don't translate commit messages
5552 5573 message = 'Removed tag %s' % ', '.join(names)
5553 5574 elif not opts.get('force'):
5554 5575 for n in names:
5555 5576 if n in repo.tags():
5556 5577 raise util.Abort(_("tag '%s' already exists "
5557 5578 "(use -f to force)") % n)
5558 5579 if not opts.get('local'):
5559 5580 p1, p2 = repo.dirstate.parents()
5560 5581 if p2 != nullid:
5561 5582 raise util.Abort(_('uncommitted merge'))
5562 5583 bheads = repo.branchheads()
5563 5584 if not opts.get('force') and bheads and p1 not in bheads:
5564 5585 raise util.Abort(_('not at a branch head (use -f to force)'))
5565 5586 r = scmutil.revsingle(repo, rev_).node()
5566 5587
5567 5588 if not message:
5568 5589 # we don't translate commit messages
5569 5590 message = ('Added tag %s for changeset %s' %
5570 5591 (', '.join(names), short(r)))
5571 5592
5572 5593 date = opts.get('date')
5573 5594 if date:
5574 5595 date = util.parsedate(date)
5575 5596
5576 5597 if opts.get('edit'):
5577 5598 message = ui.edit(message, ui.username())
5578 5599
5579 5600 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5580 5601 finally:
5581 5602 release(lock, wlock)
5582 5603
5583 5604 @command('tags', [], '')
5584 5605 def tags(ui, repo):
5585 5606 """list repository tags
5586 5607
5587 5608 This lists both regular and local tags. When the -v/--verbose
5588 5609 switch is used, a third column "local" is printed for local tags.
5589 5610
5590 5611 Returns 0 on success.
5591 5612 """
5592 5613
5593 5614 hexfunc = ui.debugflag and hex or short
5594 5615 tagtype = ""
5595 5616
5596 5617 for t, n in reversed(repo.tagslist()):
5597 5618 if ui.quiet:
5598 5619 ui.write("%s\n" % t, label='tags.normal')
5599 5620 continue
5600 5621
5601 5622 hn = hexfunc(n)
5602 5623 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5603 5624 rev = ui.label(r, 'log.changeset')
5604 5625 spaces = " " * (30 - encoding.colwidth(t))
5605 5626
5606 5627 tag = ui.label(t, 'tags.normal')
5607 5628 if ui.verbose:
5608 5629 if repo.tagtype(t) == 'local':
5609 5630 tagtype = " local"
5610 5631 tag = ui.label(t, 'tags.local')
5611 5632 else:
5612 5633 tagtype = ""
5613 5634 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5614 5635
5615 5636 @command('tip',
5616 5637 [('p', 'patch', None, _('show patch')),
5617 5638 ('g', 'git', None, _('use git extended diff format')),
5618 5639 ] + templateopts,
5619 5640 _('[-p] [-g]'))
5620 5641 def tip(ui, repo, **opts):
5621 5642 """show the tip revision
5622 5643
5623 5644 The tip revision (usually just called the tip) is the changeset
5624 5645 most recently added to the repository (and therefore the most
5625 5646 recently changed head).
5626 5647
5627 5648 If you have just made a commit, that commit will be the tip. If
5628 5649 you have just pulled changes from another repository, the tip of
5629 5650 that repository becomes the current tip. The "tip" tag is special
5630 5651 and cannot be renamed or assigned to a different changeset.
5631 5652
5632 5653 Returns 0 on success.
5633 5654 """
5634 5655 displayer = cmdutil.show_changeset(ui, repo, opts)
5635 5656 displayer.show(repo[len(repo) - 1])
5636 5657 displayer.close()
5637 5658
5638 5659 @command('unbundle',
5639 5660 [('u', 'update', None,
5640 5661 _('update to new branch head if changesets were unbundled'))],
5641 5662 _('[-u] FILE...'))
5642 5663 def unbundle(ui, repo, fname1, *fnames, **opts):
5643 5664 """apply one or more changegroup files
5644 5665
5645 5666 Apply one or more compressed changegroup files generated by the
5646 5667 bundle command.
5647 5668
5648 5669 Returns 0 on success, 1 if an update has unresolved files.
5649 5670 """
5650 5671 fnames = (fname1,) + fnames
5651 5672
5652 5673 lock = repo.lock()
5653 5674 wc = repo['.']
5654 5675 try:
5655 5676 for fname in fnames:
5656 5677 f = url.open(ui, fname)
5657 5678 gen = changegroup.readbundle(f, fname)
5658 5679 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5659 5680 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5660 5681 finally:
5661 5682 lock.release()
5662 5683 return postincoming(ui, repo, modheads, opts.get('update'), None)
5663 5684
5664 5685 @command('^update|up|checkout|co',
5665 5686 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5666 5687 ('c', 'check', None,
5667 5688 _('update across branches if no uncommitted changes')),
5668 5689 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5669 5690 ('r', 'rev', '', _('revision'), _('REV'))],
5670 5691 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5671 5692 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5672 5693 """update working directory (or switch revisions)
5673 5694
5674 5695 Update the repository's working directory to the specified
5675 5696 changeset. If no changeset is specified, update to the tip of the
5676 5697 current named branch and move the current bookmark (see :hg:`help
5677 5698 bookmarks`).
5678 5699
5679 5700 If the changeset is not a descendant of the working directory's
5680 5701 parent, the update is aborted. With the -c/--check option, the
5681 5702 working directory is checked for uncommitted changes; if none are
5682 5703 found, the working directory is updated to the specified
5683 5704 changeset.
5684 5705
5685 5706 Update sets the working directory's parent revison to the specified
5686 5707 changeset (see :hg:`help parents`).
5687 5708
5688 5709 The following rules apply when the working directory contains
5689 5710 uncommitted changes:
5690 5711
5691 5712 1. If neither -c/--check nor -C/--clean is specified, and if
5692 5713 the requested changeset is an ancestor or descendant of
5693 5714 the working directory's parent, the uncommitted changes
5694 5715 are merged into the requested changeset and the merged
5695 5716 result is left uncommitted. If the requested changeset is
5696 5717 not an ancestor or descendant (that is, it is on another
5697 5718 branch), the update is aborted and the uncommitted changes
5698 5719 are preserved.
5699 5720
5700 5721 2. With the -c/--check option, the update is aborted and the
5701 5722 uncommitted changes are preserved.
5702 5723
5703 5724 3. With the -C/--clean option, uncommitted changes are discarded and
5704 5725 the working directory is updated to the requested changeset.
5705 5726
5706 5727 Use null as the changeset to remove the working directory (like
5707 5728 :hg:`clone -U`).
5708 5729
5709 5730 If you want to revert just one file to an older revision, use
5710 5731 :hg:`revert [-r REV] NAME`.
5711 5732
5712 5733 See :hg:`help dates` for a list of formats valid for -d/--date.
5713 5734
5714 5735 Returns 0 on success, 1 if there are unresolved files.
5715 5736 """
5716 5737 if rev and node:
5717 5738 raise util.Abort(_("please specify just one revision"))
5718 5739
5719 5740 if rev is None or rev == '':
5720 5741 rev = node
5721 5742
5722 5743 # with no argument, we also move the current bookmark, if any
5723 5744 movemarkfrom = None
5724 5745 if rev is None or node == '':
5725 5746 movemarkfrom = repo['.'].node()
5726 5747
5727 5748 # if we defined a bookmark, we have to remember the original bookmark name
5728 5749 brev = rev
5729 5750 rev = scmutil.revsingle(repo, rev, rev).rev()
5730 5751
5731 5752 if check and clean:
5732 5753 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5733 5754
5734 5755 if date:
5735 5756 if rev is not None:
5736 5757 raise util.Abort(_("you can't specify a revision and a date"))
5737 5758 rev = cmdutil.finddate(ui, repo, date)
5738 5759
5739 5760 if check:
5740 5761 # we could use dirty() but we can ignore merge and branch trivia
5741 5762 c = repo[None]
5742 5763 if c.modified() or c.added() or c.removed():
5743 5764 raise util.Abort(_("uncommitted local changes"))
5744 5765 if not rev:
5745 5766 rev = repo[repo[None].branch()].rev()
5746 5767 mergemod._checkunknown(repo, repo[None], repo[rev])
5747 5768
5748 5769 if clean:
5749 5770 ret = hg.clean(repo, rev)
5750 5771 else:
5751 5772 ret = hg.update(repo, rev)
5752 5773
5753 5774 if not ret and movemarkfrom:
5754 5775 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5755 5776 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5756 5777 elif brev in repo._bookmarks:
5757 5778 bookmarks.setcurrent(repo, brev)
5758 5779 elif brev:
5759 5780 bookmarks.unsetcurrent(repo)
5760 5781
5761 5782 return ret
5762 5783
5763 5784 @command('verify', [])
5764 5785 def verify(ui, repo):
5765 5786 """verify the integrity of the repository
5766 5787
5767 5788 Verify the integrity of the current repository.
5768 5789
5769 5790 This will perform an extensive check of the repository's
5770 5791 integrity, validating the hashes and checksums of each entry in
5771 5792 the changelog, manifest, and tracked files, as well as the
5772 5793 integrity of their crosslinks and indices.
5773 5794
5774 5795 Returns 0 on success, 1 if errors are encountered.
5775 5796 """
5776 5797 return hg.verify(repo)
5777 5798
5778 5799 @command('version', [])
5779 5800 def version_(ui):
5780 5801 """output version and copyright information"""
5781 5802 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5782 5803 % util.version())
5783 5804 ui.status(_(
5784 5805 "(see http://mercurial.selenic.com for more information)\n"
5785 5806 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5786 5807 "This is free software; see the source for copying conditions. "
5787 5808 "There is NO\nwarranty; "
5788 5809 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5789 5810 ))
5790 5811
5791 5812 norepo = ("clone init version help debugcommands debugcomplete"
5792 5813 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5793 5814 " debugknown debuggetbundle debugbundle")
5794 5815 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5795 5816 " debugdata debugindex debugindexdot debugrevlog")
@@ -1,272 +1,274 b''
1 1 Show all commands except debug commands
2 2 $ hg debugcomplete
3 3 add
4 4 addremove
5 5 annotate
6 6 archive
7 7 backout
8 8 bisect
9 9 bookmarks
10 10 branch
11 11 branches
12 12 bundle
13 13 cat
14 14 clone
15 15 commit
16 16 copy
17 17 diff
18 18 export
19 19 forget
20 20 graft
21 21 grep
22 22 heads
23 23 help
24 24 identify
25 25 import
26 26 incoming
27 27 init
28 28 locate
29 29 log
30 30 manifest
31 31 merge
32 32 outgoing
33 33 parents
34 34 paths
35 35 phase
36 36 pull
37 37 push
38 38 recover
39 39 remove
40 40 rename
41 41 resolve
42 42 revert
43 43 rollback
44 44 root
45 45 serve
46 46 showconfig
47 47 status
48 48 summary
49 49 tag
50 50 tags
51 51 tip
52 52 unbundle
53 53 update
54 54 verify
55 55 version
56 56
57 57 Show all commands that start with "a"
58 58 $ hg debugcomplete a
59 59 add
60 60 addremove
61 61 annotate
62 62 archive
63 63
64 64 Do not show debug commands if there are other candidates
65 65 $ hg debugcomplete d
66 66 diff
67 67
68 68 Show debug commands if there are no other candidates
69 69 $ hg debugcomplete debug
70 70 debugancestor
71 71 debugbuilddag
72 72 debugbundle
73 73 debugcheckstate
74 74 debugcommands
75 75 debugcomplete
76 76 debugconfig
77 77 debugdag
78 78 debugdata
79 79 debugdate
80 80 debugdiscovery
81 81 debugfileset
82 82 debugfsinfo
83 83 debuggetbundle
84 84 debugignore
85 85 debugindex
86 86 debugindexdot
87 87 debuginstall
88 88 debugknown
89 89 debugpushkey
90 debugpvec
90 91 debugrebuildstate
91 92 debugrename
92 93 debugrevlog
93 94 debugrevspec
94 95 debugsetparents
95 96 debugstate
96 97 debugsub
97 98 debugwalk
98 99 debugwireargs
99 100
100 101 Do not show the alias of a debug command if there are other candidates
101 102 (this should hide rawcommit)
102 103 $ hg debugcomplete r
103 104 recover
104 105 remove
105 106 rename
106 107 resolve
107 108 revert
108 109 rollback
109 110 root
110 111 Show the alias of a debug command if there are no other candidates
111 112 $ hg debugcomplete rawc
112 113
113 114
114 115 Show the global options
115 116 $ hg debugcomplete --options | sort
116 117 --config
117 118 --cwd
118 119 --debug
119 120 --debugger
120 121 --encoding
121 122 --encodingmode
122 123 --help
123 124 --noninteractive
124 125 --profile
125 126 --quiet
126 127 --repository
127 128 --time
128 129 --traceback
129 130 --verbose
130 131 --version
131 132 -R
132 133 -h
133 134 -q
134 135 -v
135 136 -y
136 137
137 138 Show the options for the "serve" command
138 139 $ hg debugcomplete --options serve | sort
139 140 --accesslog
140 141 --address
141 142 --certificate
142 143 --cmdserver
143 144 --config
144 145 --cwd
145 146 --daemon
146 147 --daemon-pipefds
147 148 --debug
148 149 --debugger
149 150 --encoding
150 151 --encodingmode
151 152 --errorlog
152 153 --help
153 154 --ipv6
154 155 --name
155 156 --noninteractive
156 157 --pid-file
157 158 --port
158 159 --prefix
159 160 --profile
160 161 --quiet
161 162 --repository
162 163 --stdio
163 164 --style
164 165 --templates
165 166 --time
166 167 --traceback
167 168 --verbose
168 169 --version
169 170 --web-conf
170 171 -6
171 172 -A
172 173 -E
173 174 -R
174 175 -a
175 176 -d
176 177 -h
177 178 -n
178 179 -p
179 180 -q
180 181 -t
181 182 -v
182 183 -y
183 184
184 185 Show an error if we use --options with an ambiguous abbreviation
185 186 $ hg debugcomplete --options s
186 187 hg: command 's' is ambiguous:
187 188 serve showconfig status summary
188 189 [255]
189 190
190 191 Show all commands + options
191 192 $ hg debugcommands
192 193 add: include, exclude, subrepos, dry-run
193 194 annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, ignore-all-space, ignore-space-change, ignore-blank-lines, include, exclude
194 195 clone: noupdate, updaterev, rev, branch, pull, uncompressed, ssh, remotecmd, insecure
195 196 commit: addremove, close-branch, include, exclude, message, logfile, date, user, subrepos
196 197 diff: rev, change, text, git, nodates, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, unified, stat, include, exclude, subrepos
197 198 export: output, switch-parent, rev, text, git, nodates
198 199 forget: include, exclude
199 200 init: ssh, remotecmd, insecure
200 201 log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, hidden, patch, git, limit, no-merges, stat, style, template, include, exclude
201 202 merge: force, rev, preview, tool
202 203 phase: public, draft, secret, force, rev
203 204 pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
204 205 push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure
205 206 remove: after, force, include, exclude
206 207 serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate
207 208 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos
208 209 summary: remote
209 210 update: clean, check, date, rev
210 211 addremove: similarity, include, exclude, dry-run
211 212 archive: no-decode, prefix, rev, type, subrepos, include, exclude
212 213 backout: merge, parent, rev, tool, include, exclude, message, logfile, date, user
213 214 bisect: reset, good, bad, skip, extend, command, noupdate
214 215 bookmarks: force, rev, delete, rename, inactive
215 216 branch: force, clean
216 217 branches: active, closed
217 218 bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
218 219 cat: output, rev, decode, include, exclude
219 220 copy: after, force, include, exclude, dry-run
220 221 debugancestor:
221 222 debugbuilddag: mergeable-file, overwritten-file, new-file
222 223 debugbundle: all
223 224 debugcheckstate:
224 225 debugcommands:
225 226 debugcomplete: options
226 227 debugdag: tags, branches, dots, spaces
227 228 debugdata: changelog, manifest
228 229 debugdate: extended
229 230 debugdiscovery: old, nonheads, ssh, remotecmd, insecure
230 231 debugfileset:
231 232 debugfsinfo:
232 233 debuggetbundle: head, common, type
233 234 debugignore:
234 235 debugindex: changelog, manifest, format
235 236 debugindexdot:
236 237 debuginstall:
237 238 debugknown:
238 239 debugpushkey:
240 debugpvec:
239 241 debugrebuildstate: rev
240 242 debugrename: rev
241 243 debugrevlog: changelog, manifest, dump
242 244 debugrevspec:
243 245 debugsetparents:
244 246 debugstate: nodates, datesort
245 247 debugsub: rev
246 248 debugwalk: include, exclude
247 249 debugwireargs: three, four, five, ssh, remotecmd, insecure
248 250 graft: continue, edit, currentdate, currentuser, date, user, tool
249 251 grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, include, exclude
250 252 heads: rev, topo, active, closed, style, template
251 253 help: extension, command
252 254 identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure
253 255 import: strip, base, edit, force, no-commit, bypass, exact, import-branch, message, logfile, date, user, similarity
254 256 incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos
255 257 locate: rev, print0, fullpath, include, exclude
256 258 manifest: rev, all
257 259 outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos
258 260 parents: rev, style, template
259 261 paths:
260 262 recover:
261 263 rename: after, force, include, exclude, dry-run
262 264 resolve: all, list, mark, unmark, no-status, tool, include, exclude
263 265 revert: all, date, rev, no-backup, include, exclude, dry-run
264 266 rollback: dry-run, force
265 267 root:
266 268 showconfig: untrusted
267 269 tag: force, local, rev, remove, edit, message, date, user
268 270 tags:
269 271 tip: patch, git, style, template
270 272 unbundle: update
271 273 verify:
272 274 version:
General Comments 0
You need to be logged in to leave comments. Login now