##// END OF EJS Templates
import: make help clearer. suggested by asak.
Vadim Gelfer -
r2515:a6700c22 default
parent child Browse files
Show More
@@ -1,3544 +1,3545 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms
6 6 # of the GNU General Public License, incorporated herein by reference.
7 7
8 8 from demandload import demandload
9 9 from node import *
10 10 from i18n import gettext as _
11 11 demandload(globals(), "os re sys signal shutil imp urllib pdb")
12 12 demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo")
13 13 demandload(globals(), "fnmatch mdiff random signal tempfile time")
14 14 demandload(globals(), "traceback errno socket version struct atexit sets bz2")
15 15 demandload(globals(), "archival cStringIO changegroup email.Parser")
16 16 demandload(globals(), "hgweb.server sshserver")
17 17
18 18 class UnknownCommand(Exception):
19 19 """Exception raised if command is not in the command table."""
20 20 class AmbiguousCommand(Exception):
21 21 """Exception raised if command shortcut matches more than one command."""
22 22
23 23 def bail_if_changed(repo):
24 24 modified, added, removed, deleted, unknown = repo.changes()
25 25 if modified or added or removed or deleted:
26 26 raise util.Abort(_("outstanding uncommitted changes"))
27 27
28 28 def filterfiles(filters, files):
29 29 l = [x for x in files if x in filters]
30 30
31 31 for t in filters:
32 32 if t and t[-1] != "/":
33 33 t += "/"
34 34 l += [x for x in files if x.startswith(t)]
35 35 return l
36 36
37 37 def relpath(repo, args):
38 38 cwd = repo.getcwd()
39 39 if cwd:
40 40 return [util.normpath(os.path.join(cwd, x)) for x in args]
41 41 return args
42 42
43 43 def matchpats(repo, pats=[], opts={}, head=''):
44 44 cwd = repo.getcwd()
45 45 if not pats and cwd:
46 46 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
47 47 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
48 48 cwd = ''
49 49 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
50 50 opts.get('exclude'), head)
51 51
52 52 def makewalk(repo, pats, opts, node=None, head='', badmatch=None):
53 53 files, matchfn, anypats = matchpats(repo, pats, opts, head)
54 54 exact = dict(zip(files, files))
55 55 def walk():
56 56 for src, fn in repo.walk(node=node, files=files, match=matchfn,
57 57 badmatch=badmatch):
58 58 yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact
59 59 return files, matchfn, walk()
60 60
61 61 def walk(repo, pats, opts, node=None, head='', badmatch=None):
62 62 files, matchfn, results = makewalk(repo, pats, opts, node, head, badmatch)
63 63 for r in results:
64 64 yield r
65 65
66 66 def walkchangerevs(ui, repo, pats, opts):
67 67 '''Iterate over files and the revs they changed in.
68 68
69 69 Callers most commonly need to iterate backwards over the history
70 70 it is interested in. Doing so has awful (quadratic-looking)
71 71 performance, so we use iterators in a "windowed" way.
72 72
73 73 We walk a window of revisions in the desired order. Within the
74 74 window, we first walk forwards to gather data, then in the desired
75 75 order (usually backwards) to display it.
76 76
77 77 This function returns an (iterator, getchange, matchfn) tuple. The
78 78 getchange function returns the changelog entry for a numeric
79 79 revision. The iterator yields 3-tuples. They will be of one of
80 80 the following forms:
81 81
82 82 "window", incrementing, lastrev: stepping through a window,
83 83 positive if walking forwards through revs, last rev in the
84 84 sequence iterated over - use to reset state for the current window
85 85
86 86 "add", rev, fns: out-of-order traversal of the given file names
87 87 fns, which changed during revision rev - use to gather data for
88 88 possible display
89 89
90 90 "iter", rev, None: in-order traversal of the revs earlier iterated
91 91 over with "add" - use to display data'''
92 92
93 93 def increasing_windows(start, end, windowsize=8, sizelimit=512):
94 94 if start < end:
95 95 while start < end:
96 96 yield start, min(windowsize, end-start)
97 97 start += windowsize
98 98 if windowsize < sizelimit:
99 99 windowsize *= 2
100 100 else:
101 101 while start > end:
102 102 yield start, min(windowsize, start-end-1)
103 103 start -= windowsize
104 104 if windowsize < sizelimit:
105 105 windowsize *= 2
106 106
107 107
108 108 files, matchfn, anypats = matchpats(repo, pats, opts)
109 109
110 110 if repo.changelog.count() == 0:
111 111 return [], False, matchfn
112 112
113 113 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
114 114 wanted = {}
115 115 slowpath = anypats
116 116 fncache = {}
117 117
118 118 chcache = {}
119 119 def getchange(rev):
120 120 ch = chcache.get(rev)
121 121 if ch is None:
122 122 chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
123 123 return ch
124 124
125 125 if not slowpath and not files:
126 126 # No files, no patterns. Display all revs.
127 127 wanted = dict(zip(revs, revs))
128 128 if not slowpath:
129 129 # Only files, no patterns. Check the history of each file.
130 130 def filerevgen(filelog):
131 131 for i, window in increasing_windows(filelog.count()-1, -1):
132 132 revs = []
133 133 for j in xrange(i - window, i + 1):
134 134 revs.append(filelog.linkrev(filelog.node(j)))
135 135 revs.reverse()
136 136 for rev in revs:
137 137 yield rev
138 138
139 139 minrev, maxrev = min(revs), max(revs)
140 140 for file_ in files:
141 141 filelog = repo.file(file_)
142 142 # A zero count may be a directory or deleted file, so
143 143 # try to find matching entries on the slow path.
144 144 if filelog.count() == 0:
145 145 slowpath = True
146 146 break
147 147 for rev in filerevgen(filelog):
148 148 if rev <= maxrev:
149 149 if rev < minrev:
150 150 break
151 151 fncache.setdefault(rev, [])
152 152 fncache[rev].append(file_)
153 153 wanted[rev] = 1
154 154 if slowpath:
155 155 # The slow path checks files modified in every changeset.
156 156 def changerevgen():
157 157 for i, window in increasing_windows(repo.changelog.count()-1, -1):
158 158 for j in xrange(i - window, i + 1):
159 159 yield j, getchange(j)[3]
160 160
161 161 for rev, changefiles in changerevgen():
162 162 matches = filter(matchfn, changefiles)
163 163 if matches:
164 164 fncache[rev] = matches
165 165 wanted[rev] = 1
166 166
167 167 def iterate():
168 168 for i, window in increasing_windows(0, len(revs)):
169 169 yield 'window', revs[0] < revs[-1], revs[-1]
170 170 nrevs = [rev for rev in revs[i:i+window]
171 171 if rev in wanted]
172 172 srevs = list(nrevs)
173 173 srevs.sort()
174 174 for rev in srevs:
175 175 fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
176 176 yield 'add', rev, fns
177 177 for rev in nrevs:
178 178 yield 'iter', rev, None
179 179 return iterate(), getchange, matchfn
180 180
181 181 revrangesep = ':'
182 182
183 183 def revfix(repo, val, defval):
184 184 '''turn user-level id of changeset into rev number.
185 185 user-level id can be tag, changeset, rev number, or negative rev
186 186 number relative to number of revs (-1 is tip, etc).'''
187 187 if not val:
188 188 return defval
189 189 try:
190 190 num = int(val)
191 191 if str(num) != val:
192 192 raise ValueError
193 193 if num < 0:
194 194 num += repo.changelog.count()
195 195 if num < 0:
196 196 num = 0
197 197 elif num >= repo.changelog.count():
198 198 raise ValueError
199 199 except ValueError:
200 200 try:
201 201 num = repo.changelog.rev(repo.lookup(val))
202 202 except KeyError:
203 203 raise util.Abort(_('invalid revision identifier %s'), val)
204 204 return num
205 205
206 206 def revpair(ui, repo, revs):
207 207 '''return pair of nodes, given list of revisions. second item can
208 208 be None, meaning use working dir.'''
209 209 if not revs:
210 210 return repo.dirstate.parents()[0], None
211 211 end = None
212 212 if len(revs) == 1:
213 213 start = revs[0]
214 214 if revrangesep in start:
215 215 start, end = start.split(revrangesep, 1)
216 216 start = revfix(repo, start, 0)
217 217 end = revfix(repo, end, repo.changelog.count() - 1)
218 218 else:
219 219 start = revfix(repo, start, None)
220 220 elif len(revs) == 2:
221 221 if revrangesep in revs[0] or revrangesep in revs[1]:
222 222 raise util.Abort(_('too many revisions specified'))
223 223 start = revfix(repo, revs[0], None)
224 224 end = revfix(repo, revs[1], None)
225 225 else:
226 226 raise util.Abort(_('too many revisions specified'))
227 227 if end is not None: end = repo.lookup(str(end))
228 228 return repo.lookup(str(start)), end
229 229
230 230 def revrange(ui, repo, revs):
231 231 """Yield revision as strings from a list of revision specifications."""
232 232 seen = {}
233 233 for spec in revs:
234 234 if spec.find(revrangesep) >= 0:
235 235 start, end = spec.split(revrangesep, 1)
236 236 start = revfix(repo, start, 0)
237 237 end = revfix(repo, end, repo.changelog.count() - 1)
238 238 step = start > end and -1 or 1
239 239 for rev in xrange(start, end+step, step):
240 240 if rev in seen:
241 241 continue
242 242 seen[rev] = 1
243 243 yield str(rev)
244 244 else:
245 245 rev = revfix(repo, spec, None)
246 246 if rev in seen:
247 247 continue
248 248 seen[rev] = 1
249 249 yield str(rev)
250 250
251 251 def make_filename(repo, r, pat, node=None,
252 252 total=None, seqno=None, revwidth=None, pathname=None):
253 253 node_expander = {
254 254 'H': lambda: hex(node),
255 255 'R': lambda: str(r.rev(node)),
256 256 'h': lambda: short(node),
257 257 }
258 258 expander = {
259 259 '%': lambda: '%',
260 260 'b': lambda: os.path.basename(repo.root),
261 261 }
262 262
263 263 try:
264 264 if node:
265 265 expander.update(node_expander)
266 266 if node and revwidth is not None:
267 267 expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
268 268 if total is not None:
269 269 expander['N'] = lambda: str(total)
270 270 if seqno is not None:
271 271 expander['n'] = lambda: str(seqno)
272 272 if total is not None and seqno is not None:
273 273 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
274 274 if pathname is not None:
275 275 expander['s'] = lambda: os.path.basename(pathname)
276 276 expander['d'] = lambda: os.path.dirname(pathname) or '.'
277 277 expander['p'] = lambda: pathname
278 278
279 279 newname = []
280 280 patlen = len(pat)
281 281 i = 0
282 282 while i < patlen:
283 283 c = pat[i]
284 284 if c == '%':
285 285 i += 1
286 286 c = pat[i]
287 287 c = expander[c]()
288 288 newname.append(c)
289 289 i += 1
290 290 return ''.join(newname)
291 291 except KeyError, inst:
292 292 raise util.Abort(_("invalid format spec '%%%s' in output file name"),
293 293 inst.args[0])
294 294
295 295 def make_file(repo, r, pat, node=None,
296 296 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
297 297 if not pat or pat == '-':
298 298 return 'w' in mode and sys.stdout or sys.stdin
299 299 if hasattr(pat, 'write') and 'w' in mode:
300 300 return pat
301 301 if hasattr(pat, 'read') and 'r' in mode:
302 302 return pat
303 303 return open(make_filename(repo, r, pat, node, total, seqno, revwidth,
304 304 pathname),
305 305 mode)
306 306
307 307 def write_bundle(cg, filename=None, compress=True):
308 308 """Write a bundle file and return its filename.
309 309
310 310 Existing files will not be overwritten.
311 311 If no filename is specified, a temporary file is created.
312 312 bz2 compression can be turned off.
313 313 The bundle file will be deleted in case of errors.
314 314 """
315 315 class nocompress(object):
316 316 def compress(self, x):
317 317 return x
318 318 def flush(self):
319 319 return ""
320 320
321 321 fh = None
322 322 cleanup = None
323 323 try:
324 324 if filename:
325 325 if os.path.exists(filename):
326 326 raise util.Abort(_("file '%s' already exists"), filename)
327 327 fh = open(filename, "wb")
328 328 else:
329 329 fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
330 330 fh = os.fdopen(fd, "wb")
331 331 cleanup = filename
332 332
333 333 if compress:
334 334 fh.write("HG10")
335 335 z = bz2.BZ2Compressor(9)
336 336 else:
337 337 fh.write("HG10UN")
338 338 z = nocompress()
339 339 # parse the changegroup data, otherwise we will block
340 340 # in case of sshrepo because we don't know the end of the stream
341 341
342 342 # an empty chunkiter is the end of the changegroup
343 343 empty = False
344 344 while not empty:
345 345 empty = True
346 346 for chunk in changegroup.chunkiter(cg):
347 347 empty = False
348 348 fh.write(z.compress(changegroup.genchunk(chunk)))
349 349 fh.write(z.compress(changegroup.closechunk()))
350 350 fh.write(z.flush())
351 351 cleanup = None
352 352 return filename
353 353 finally:
354 354 if fh is not None:
355 355 fh.close()
356 356 if cleanup is not None:
357 357 os.unlink(cleanup)
358 358
359 359 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
360 360 changes=None, text=False, opts={}):
361 361 if not node1:
362 362 node1 = repo.dirstate.parents()[0]
363 363 # reading the data for node1 early allows it to play nicely
364 364 # with repo.changes and the revlog cache.
365 365 change = repo.changelog.read(node1)
366 366 mmap = repo.manifest.read(change[0])
367 367 date1 = util.datestr(change[2])
368 368
369 369 if not changes:
370 370 changes = repo.changes(node1, node2, files, match=match)
371 371 modified, added, removed, deleted, unknown = changes
372 372 if files:
373 373 modified, added, removed = map(lambda x: filterfiles(files, x),
374 374 (modified, added, removed))
375 375
376 376 if not modified and not added and not removed:
377 377 return
378 378
379 379 if node2:
380 380 change = repo.changelog.read(node2)
381 381 mmap2 = repo.manifest.read(change[0])
382 382 _date2 = util.datestr(change[2])
383 383 def date2(f):
384 384 return _date2
385 385 def read(f):
386 386 return repo.file(f).read(mmap2[f])
387 387 else:
388 388 tz = util.makedate()[1]
389 389 _date2 = util.datestr()
390 390 def date2(f):
391 391 try:
392 392 return util.datestr((os.lstat(repo.wjoin(f)).st_mtime, tz))
393 393 except OSError, err:
394 394 if err.errno != errno.ENOENT: raise
395 395 return _date2
396 396 def read(f):
397 397 return repo.wread(f)
398 398
399 399 if ui.quiet:
400 400 r = None
401 401 else:
402 402 hexfunc = ui.verbose and hex or short
403 403 r = [hexfunc(node) for node in [node1, node2] if node]
404 404
405 405 diffopts = ui.diffopts()
406 406 showfunc = opts.get('show_function') or diffopts['showfunc']
407 407 ignorews = opts.get('ignore_all_space') or diffopts['ignorews']
408 408 for f in modified:
409 409 to = None
410 410 if f in mmap:
411 411 to = repo.file(f).read(mmap[f])
412 412 tn = read(f)
413 413 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
414 414 showfunc=showfunc, ignorews=ignorews))
415 415 for f in added:
416 416 to = None
417 417 tn = read(f)
418 418 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
419 419 showfunc=showfunc, ignorews=ignorews))
420 420 for f in removed:
421 421 to = repo.file(f).read(mmap[f])
422 422 tn = None
423 423 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
424 424 showfunc=showfunc, ignorews=ignorews))
425 425
426 426 def trimuser(ui, name, rev, revcache):
427 427 """trim the name of the user who committed a change"""
428 428 user = revcache.get(rev)
429 429 if user is None:
430 430 user = revcache[rev] = ui.shortuser(name)
431 431 return user
432 432
433 433 class changeset_printer(object):
434 434 '''show changeset information when templating not requested.'''
435 435
436 436 def __init__(self, ui, repo):
437 437 self.ui = ui
438 438 self.repo = repo
439 439
440 440 def show(self, rev=0, changenode=None, brinfo=None):
441 441 '''show a single changeset or file revision'''
442 442 log = self.repo.changelog
443 443 if changenode is None:
444 444 changenode = log.node(rev)
445 445 elif not rev:
446 446 rev = log.rev(changenode)
447 447
448 448 if self.ui.quiet:
449 449 self.ui.write("%d:%s\n" % (rev, short(changenode)))
450 450 return
451 451
452 452 changes = log.read(changenode)
453 453 date = util.datestr(changes[2])
454 454
455 455 parents = [(log.rev(p), self.ui.verbose and hex(p) or short(p))
456 456 for p in log.parents(changenode)
457 457 if self.ui.debugflag or p != nullid]
458 458 if (not self.ui.debugflag and len(parents) == 1 and
459 459 parents[0][0] == rev-1):
460 460 parents = []
461 461
462 462 if self.ui.verbose:
463 463 self.ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))
464 464 else:
465 465 self.ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))
466 466
467 467 for tag in self.repo.nodetags(changenode):
468 468 self.ui.status(_("tag: %s\n") % tag)
469 469 for parent in parents:
470 470 self.ui.write(_("parent: %d:%s\n") % parent)
471 471
472 472 if brinfo and changenode in brinfo:
473 473 br = brinfo[changenode]
474 474 self.ui.write(_("branch: %s\n") % " ".join(br))
475 475
476 476 self.ui.debug(_("manifest: %d:%s\n") %
477 477 (self.repo.manifest.rev(changes[0]), hex(changes[0])))
478 478 self.ui.status(_("user: %s\n") % changes[1])
479 479 self.ui.status(_("date: %s\n") % date)
480 480
481 481 if self.ui.debugflag:
482 482 files = self.repo.changes(log.parents(changenode)[0], changenode)
483 483 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
484 484 files):
485 485 if value:
486 486 self.ui.note("%-12s %s\n" % (key, " ".join(value)))
487 487 else:
488 488 self.ui.note(_("files: %s\n") % " ".join(changes[3]))
489 489
490 490 description = changes[4].strip()
491 491 if description:
492 492 if self.ui.verbose:
493 493 self.ui.status(_("description:\n"))
494 494 self.ui.status(description)
495 495 self.ui.status("\n\n")
496 496 else:
497 497 self.ui.status(_("summary: %s\n") %
498 498 description.splitlines()[0])
499 499 self.ui.status("\n")
500 500
501 501 def show_changeset(ui, repo, opts):
502 502 '''show one changeset. uses template or regular display. caller
503 503 can pass in 'style' and 'template' options in opts.'''
504 504
505 505 tmpl = opts.get('template')
506 506 if tmpl:
507 507 tmpl = templater.parsestring(tmpl, quoted=False)
508 508 else:
509 509 tmpl = ui.config('ui', 'logtemplate')
510 510 if tmpl: tmpl = templater.parsestring(tmpl)
511 511 mapfile = opts.get('style') or ui.config('ui', 'style')
512 512 if tmpl or mapfile:
513 513 if mapfile:
514 514 if not os.path.isfile(mapfile):
515 515 mapname = templater.templatepath('map-cmdline.' + mapfile)
516 516 if not mapname: mapname = templater.templatepath(mapfile)
517 517 if mapname: mapfile = mapname
518 518 try:
519 519 t = templater.changeset_templater(ui, repo, mapfile)
520 520 except SyntaxError, inst:
521 521 raise util.Abort(inst.args[0])
522 522 if tmpl: t.use_template(tmpl)
523 523 return t
524 524 return changeset_printer(ui, repo)
525 525
526 526 def show_version(ui):
527 527 """output version and copyright information"""
528 528 ui.write(_("Mercurial Distributed SCM (version %s)\n")
529 529 % version.get_version())
530 530 ui.status(_(
531 531 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
532 532 "This is free software; see the source for copying conditions. "
533 533 "There is NO\nwarranty; "
534 534 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
535 535 ))
536 536
537 537 def help_(ui, cmd=None, with_version=False):
538 538 """show help for a given command or all commands"""
539 539 option_lists = []
540 540 if cmd and cmd != 'shortlist':
541 541 if with_version:
542 542 show_version(ui)
543 543 ui.write('\n')
544 544 aliases, i = find(cmd)
545 545 # synopsis
546 546 ui.write("%s\n\n" % i[2])
547 547
548 548 # description
549 549 doc = i[0].__doc__
550 550 if not doc:
551 551 doc = _("(No help text available)")
552 552 if ui.quiet:
553 553 doc = doc.splitlines(0)[0]
554 554 ui.write("%s\n" % doc.rstrip())
555 555
556 556 if not ui.quiet:
557 557 # aliases
558 558 if len(aliases) > 1:
559 559 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
560 560
561 561 # options
562 562 if i[1]:
563 563 option_lists.append(("options", i[1]))
564 564
565 565 else:
566 566 # program name
567 567 if ui.verbose or with_version:
568 568 show_version(ui)
569 569 else:
570 570 ui.status(_("Mercurial Distributed SCM\n"))
571 571 ui.status('\n')
572 572
573 573 # list of commands
574 574 if cmd == "shortlist":
575 575 ui.status(_('basic commands (use "hg help" '
576 576 'for the full list or option "-v" for details):\n\n'))
577 577 elif ui.verbose:
578 578 ui.status(_('list of commands:\n\n'))
579 579 else:
580 580 ui.status(_('list of commands (use "hg help -v" '
581 581 'to show aliases and global options):\n\n'))
582 582
583 583 h = {}
584 584 cmds = {}
585 585 for c, e in table.items():
586 586 f = c.split("|")[0]
587 587 if cmd == "shortlist" and not f.startswith("^"):
588 588 continue
589 589 f = f.lstrip("^")
590 590 if not ui.debugflag and f.startswith("debug"):
591 591 continue
592 592 doc = e[0].__doc__
593 593 if not doc:
594 594 doc = _("(No help text available)")
595 595 h[f] = doc.splitlines(0)[0].rstrip()
596 596 cmds[f] = c.lstrip("^")
597 597
598 598 fns = h.keys()
599 599 fns.sort()
600 600 m = max(map(len, fns))
601 601 for f in fns:
602 602 if ui.verbose:
603 603 commands = cmds[f].replace("|",", ")
604 604 ui.write(" %s:\n %s\n"%(commands, h[f]))
605 605 else:
606 606 ui.write(' %-*s %s\n' % (m, f, h[f]))
607 607
608 608 # global options
609 609 if ui.verbose:
610 610 option_lists.append(("global options", globalopts))
611 611
612 612 # list all option lists
613 613 opt_output = []
614 614 for title, options in option_lists:
615 615 opt_output.append(("\n%s:\n" % title, None))
616 616 for shortopt, longopt, default, desc in options:
617 617 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
618 618 longopt and " --%s" % longopt),
619 619 "%s%s" % (desc,
620 620 default
621 621 and _(" (default: %s)") % default
622 622 or "")))
623 623
624 624 if opt_output:
625 625 opts_len = max([len(line[0]) for line in opt_output if line[1]])
626 626 for first, second in opt_output:
627 627 if second:
628 628 ui.write(" %-*s %s\n" % (opts_len, first, second))
629 629 else:
630 630 ui.write("%s\n" % first)
631 631
632 632 # Commands start here, listed alphabetically
633 633
634 634 def add(ui, repo, *pats, **opts):
635 635 """add the specified files on the next commit
636 636
637 637 Schedule files to be version controlled and added to the repository.
638 638
639 639 The files will be added to the repository at the next commit.
640 640
641 641 If no names are given, add all files in the repository.
642 642 """
643 643
644 644 names = []
645 645 for src, abs, rel, exact in walk(repo, pats, opts):
646 646 if exact:
647 647 if ui.verbose:
648 648 ui.status(_('adding %s\n') % rel)
649 649 names.append(abs)
650 650 elif repo.dirstate.state(abs) == '?':
651 651 ui.status(_('adding %s\n') % rel)
652 652 names.append(abs)
653 653 if not opts.get('dry_run'):
654 654 repo.add(names)
655 655
656 656 def addremove(ui, repo, *pats, **opts):
657 657 """add all new files, delete all missing files (DEPRECATED)
658 658
659 659 (DEPRECATED)
660 660 Add all new files and remove all missing files from the repository.
661 661
662 662 New files are ignored if they match any of the patterns in .hgignore. As
663 663 with add, these changes take effect at the next commit.
664 664
665 665 This command is now deprecated and will be removed in a future
666 666 release. Please use add and remove --after instead.
667 667 """
668 668 ui.warn(_('(the addremove command is deprecated; use add and remove '
669 669 '--after instead)\n'))
670 670 return addremove_lock(ui, repo, pats, opts)
671 671
672 672 def addremove_lock(ui, repo, pats, opts, wlock=None):
673 673 add, remove = [], []
674 674 for src, abs, rel, exact in walk(repo, pats, opts):
675 675 if src == 'f' and repo.dirstate.state(abs) == '?':
676 676 add.append(abs)
677 677 if ui.verbose or not exact:
678 678 ui.status(_('adding %s\n') % ((pats and rel) or abs))
679 679 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
680 680 remove.append(abs)
681 681 if ui.verbose or not exact:
682 682 ui.status(_('removing %s\n') % ((pats and rel) or abs))
683 683 if not opts.get('dry_run'):
684 684 repo.add(add, wlock=wlock)
685 685 repo.remove(remove, wlock=wlock)
686 686
687 687 def annotate(ui, repo, *pats, **opts):
688 688 """show changeset information per file line
689 689
690 690 List changes in files, showing the revision id responsible for each line
691 691
692 692 This command is useful to discover who did a change or when a change took
693 693 place.
694 694
695 695 Without the -a option, annotate will avoid processing files it
696 696 detects as binary. With -a, annotate will generate an annotation
697 697 anyway, probably with undesirable results.
698 698 """
699 699 def getnode(rev):
700 700 return short(repo.changelog.node(rev))
701 701
702 702 ucache = {}
703 703 def getname(rev):
704 704 cl = repo.changelog.read(repo.changelog.node(rev))
705 705 return trimuser(ui, cl[1], rev, ucache)
706 706
707 707 dcache = {}
708 708 def getdate(rev):
709 709 datestr = dcache.get(rev)
710 710 if datestr is None:
711 711 cl = repo.changelog.read(repo.changelog.node(rev))
712 712 datestr = dcache[rev] = util.datestr(cl[2])
713 713 return datestr
714 714
715 715 if not pats:
716 716 raise util.Abort(_('at least one file name or pattern required'))
717 717
718 718 opmap = [['user', getname], ['number', str], ['changeset', getnode],
719 719 ['date', getdate]]
720 720 if not opts['user'] and not opts['changeset'] and not opts['date']:
721 721 opts['number'] = 1
722 722
723 723 if opts['rev']:
724 724 node = repo.changelog.lookup(opts['rev'])
725 725 else:
726 726 node = repo.dirstate.parents()[0]
727 727 change = repo.changelog.read(node)
728 728 mmap = repo.manifest.read(change[0])
729 729
730 730 for src, abs, rel, exact in walk(repo, pats, opts, node=node):
731 731 f = repo.file(abs)
732 732 if not opts['text'] and util.binary(f.read(mmap[abs])):
733 733 ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
734 734 continue
735 735
736 736 lines = f.annotate(mmap[abs])
737 737 pieces = []
738 738
739 739 for o, f in opmap:
740 740 if opts[o]:
741 741 l = [f(n) for n, dummy in lines]
742 742 if l:
743 743 m = max(map(len, l))
744 744 pieces.append(["%*s" % (m, x) for x in l])
745 745
746 746 if pieces:
747 747 for p, l in zip(zip(*pieces), lines):
748 748 ui.write("%s: %s" % (" ".join(p), l[1]))
749 749
750 750 def archive(ui, repo, dest, **opts):
751 751 '''create unversioned archive of a repository revision
752 752
753 753 By default, the revision used is the parent of the working
754 754 directory; use "-r" to specify a different revision.
755 755
756 756 To specify the type of archive to create, use "-t". Valid
757 757 types are:
758 758
759 759 "files" (default): a directory full of files
760 760 "tar": tar archive, uncompressed
761 761 "tbz2": tar archive, compressed using bzip2
762 762 "tgz": tar archive, compressed using gzip
763 763 "uzip": zip archive, uncompressed
764 764 "zip": zip archive, compressed using deflate
765 765
766 766 The exact name of the destination archive or directory is given
767 767 using a format string; see "hg help export" for details.
768 768
769 769 Each member added to an archive file has a directory prefix
770 770 prepended. Use "-p" to specify a format string for the prefix.
771 771 The default is the basename of the archive, with suffixes removed.
772 772 '''
773 773
774 774 if opts['rev']:
775 775 node = repo.lookup(opts['rev'])
776 776 else:
777 777 node, p2 = repo.dirstate.parents()
778 778 if p2 != nullid:
779 779 raise util.Abort(_('uncommitted merge - please provide a '
780 780 'specific revision'))
781 781
782 782 dest = make_filename(repo, repo.changelog, dest, node)
783 783 if os.path.realpath(dest) == repo.root:
784 784 raise util.Abort(_('repository root cannot be destination'))
785 785 dummy, matchfn, dummy = matchpats(repo, [], opts)
786 786 kind = opts.get('type') or 'files'
787 787 prefix = opts['prefix']
788 788 if dest == '-':
789 789 if kind == 'files':
790 790 raise util.Abort(_('cannot archive plain files to stdout'))
791 791 dest = sys.stdout
792 792 if not prefix: prefix = os.path.basename(repo.root) + '-%h'
793 793 prefix = make_filename(repo, repo.changelog, prefix, node)
794 794 archival.archive(repo, dest, node, kind, not opts['no_decode'],
795 795 matchfn, prefix)
796 796
797 797 def backout(ui, repo, rev, **opts):
798 798 '''reverse effect of earlier changeset
799 799
800 800 Commit the backed out changes as a new changeset. The new
801 801 changeset is a child of the backed out changeset.
802 802
803 803 If you back out a changeset other than the tip, a new head is
804 804 created. This head is the parent of the working directory. If
805 805 you back out an old changeset, your working directory will appear
806 806 old after the backout. You should merge the backout changeset
807 807 with another head.
808 808
809 809 The --merge option remembers the parent of the working directory
810 810 before starting the backout, then merges the new head with that
811 811 changeset afterwards. This saves you from doing the merge by
812 812 hand. The result of this merge is not committed, as for a normal
813 813 merge.'''
814 814
815 815 bail_if_changed(repo)
816 816 op1, op2 = repo.dirstate.parents()
817 817 if op2 != nullid:
818 818 raise util.Abort(_('outstanding uncommitted merge'))
819 819 node = repo.lookup(rev)
820 820 parent, p2 = repo.changelog.parents(node)
821 821 if parent == nullid:
822 822 raise util.Abort(_('cannot back out a change with no parents'))
823 823 if p2 != nullid:
824 824 raise util.Abort(_('cannot back out a merge'))
825 825 repo.update(node, force=True, show_stats=False)
826 826 revert_opts = opts.copy()
827 827 revert_opts['rev'] = hex(parent)
828 828 revert(ui, repo, **revert_opts)
829 829 commit_opts = opts.copy()
830 830 commit_opts['addremove'] = False
831 831 if not commit_opts['message'] and not commit_opts['logfile']:
832 832 commit_opts['message'] = _("Backed out changeset %s") % (hex(node))
833 833 commit_opts['force_editor'] = True
834 834 commit(ui, repo, **commit_opts)
835 835 def nice(node):
836 836 return '%d:%s' % (repo.changelog.rev(node), short(node))
837 837 ui.status(_('changeset %s backs out changeset %s\n') %
838 838 (nice(repo.changelog.tip()), nice(node)))
839 839 if op1 != node:
840 840 if opts['merge']:
841 841 ui.status(_('merging with changeset %s\n') % nice(op1))
842 842 doupdate(ui, repo, hex(op1), **opts)
843 843 else:
844 844 ui.status(_('the backout changeset is a new head - '
845 845 'do not forget to merge\n'))
846 846 ui.status(_('(use "backout -m" if you want to auto-merge)\n'))
847 847
848 848 def bundle(ui, repo, fname, dest=None, **opts):
849 849 """create a changegroup file
850 850
851 851 Generate a compressed changegroup file collecting all changesets
852 852 not found in the other repository.
853 853
854 854 This file can then be transferred using conventional means and
855 855 applied to another repository with the unbundle command. This is
856 856 useful when native push and pull are not available or when
857 857 exporting an entire repository is undesirable. The standard file
858 858 extension is ".hg".
859 859
860 860 Unlike import/export, this exactly preserves all changeset
861 861 contents including permissions, rename data, and revision history.
862 862 """
863 863 dest = ui.expandpath(dest or 'default-push', dest or 'default')
864 864 other = hg.repository(ui, dest)
865 865 o = repo.findoutgoing(other, force=opts['force'])
866 866 cg = repo.changegroup(o, 'bundle')
867 867 write_bundle(cg, fname)
868 868
869 869 def cat(ui, repo, file1, *pats, **opts):
870 870 """output the latest or given revisions of files
871 871
872 872 Print the specified files as they were at the given revision.
873 873 If no revision is given then the tip is used.
874 874
875 875 Output may be to a file, in which case the name of the file is
876 876 given using a format string. The formatting rules are the same as
877 877 for the export command, with the following additions:
878 878
879 879 %s basename of file being printed
880 880 %d dirname of file being printed, or '.' if in repo root
881 881 %p root-relative path name of file being printed
882 882 """
883 883 mf = {}
884 884 rev = opts['rev']
885 885 if rev:
886 886 node = repo.lookup(rev)
887 887 else:
888 888 node = repo.changelog.tip()
889 889 change = repo.changelog.read(node)
890 890 mf = repo.manifest.read(change[0])
891 891 for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, node):
892 892 r = repo.file(abs)
893 893 n = mf[abs]
894 894 fp = make_file(repo, r, opts['output'], node=n, pathname=abs)
895 895 fp.write(r.read(n))
896 896
897 897 def clone(ui, source, dest=None, **opts):
898 898 """make a copy of an existing repository
899 899
900 900 Create a copy of an existing repository in a new directory.
901 901
902 902 If no destination directory name is specified, it defaults to the
903 903 basename of the source.
904 904
905 905 The location of the source is added to the new repository's
906 906 .hg/hgrc file, as the default to be used for future pulls.
907 907
908 908 For efficiency, hardlinks are used for cloning whenever the source
909 909 and destination are on the same filesystem. Some filesystems,
910 910 such as AFS, implement hardlinking incorrectly, but do not report
911 911 errors. In these cases, use the --pull option to avoid
912 912 hardlinking.
913 913
914 914 See pull for valid source format details.
915 915 """
916 916 if dest is None:
917 917 dest = os.path.basename(os.path.normpath(source))
918 918
919 919 if os.path.exists(dest):
920 920 raise util.Abort(_("destination '%s' already exists"), dest)
921 921
922 922 dest = os.path.realpath(dest)
923 923
924 924 class Dircleanup(object):
925 925 def __init__(self, dir_):
926 926 self.rmtree = shutil.rmtree
927 927 self.dir_ = dir_
928 928 os.mkdir(dir_)
929 929 def close(self):
930 930 self.dir_ = None
931 931 def __del__(self):
932 932 if self.dir_:
933 933 self.rmtree(self.dir_, True)
934 934
935 935 if opts['ssh']:
936 936 ui.setconfig("ui", "ssh", opts['ssh'])
937 937 if opts['remotecmd']:
938 938 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
939 939
940 940 source = ui.expandpath(source)
941 941
942 942 d = Dircleanup(dest)
943 943 abspath = source
944 944 other = hg.repository(ui, source)
945 945
946 946 copy = False
947 947 if other.dev() != -1:
948 948 abspath = os.path.abspath(source)
949 949 if not opts['pull'] and not opts['rev']:
950 950 copy = True
951 951
952 952 if copy:
953 953 try:
954 954 # we use a lock here because if we race with commit, we
955 955 # can end up with extra data in the cloned revlogs that's
956 956 # not pointed to by changesets, thus causing verify to
957 957 # fail
958 958 l1 = other.lock()
959 959 except lock.LockException:
960 960 copy = False
961 961
962 962 if copy:
963 963 # we lock here to avoid premature writing to the target
964 964 os.mkdir(os.path.join(dest, ".hg"))
965 965 l2 = lock.lock(os.path.join(dest, ".hg", "lock"))
966 966
967 967 files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
968 968 for f in files.split():
969 969 src = os.path.join(source, ".hg", f)
970 970 dst = os.path.join(dest, ".hg", f)
971 971 try:
972 972 util.copyfiles(src, dst)
973 973 except OSError, inst:
974 974 if inst.errno != errno.ENOENT:
975 975 raise
976 976
977 977 repo = hg.repository(ui, dest)
978 978
979 979 else:
980 980 revs = None
981 981 if opts['rev']:
982 982 if not other.local():
983 983 error = _("clone -r not supported yet for remote repositories.")
984 984 raise util.Abort(error)
985 985 else:
986 986 revs = [other.lookup(rev) for rev in opts['rev']]
987 987 repo = hg.repository(ui, dest, create=1)
988 988 repo.pull(other, heads = revs)
989 989
990 990 f = repo.opener("hgrc", "w", text=True)
991 991 f.write("[paths]\n")
992 992 f.write("default = %s\n" % abspath)
993 993 f.close()
994 994
995 995 if not opts['noupdate']:
996 996 doupdate(repo.ui, repo)
997 997
998 998 d.close()
999 999
1000 1000 def commit(ui, repo, *pats, **opts):
1001 1001 """commit the specified files or all outstanding changes
1002 1002
1003 1003 Commit changes to the given files into the repository.
1004 1004
1005 1005 If a list of files is omitted, all changes reported by "hg status"
1006 1006 will be committed.
1007 1007
1008 1008 If no commit message is specified, the editor configured in your hgrc
1009 1009 or in the EDITOR environment variable is started to enter a message.
1010 1010 """
1011 1011 message = opts['message']
1012 1012 logfile = opts['logfile']
1013 1013
1014 1014 if message and logfile:
1015 1015 raise util.Abort(_('options --message and --logfile are mutually '
1016 1016 'exclusive'))
1017 1017 if not message and logfile:
1018 1018 try:
1019 1019 if logfile == '-':
1020 1020 message = sys.stdin.read()
1021 1021 else:
1022 1022 message = open(logfile).read()
1023 1023 except IOError, inst:
1024 1024 raise util.Abort(_("can't read commit message '%s': %s") %
1025 1025 (logfile, inst.strerror))
1026 1026
1027 1027 if opts['addremove']:
1028 1028 addremove_lock(ui, repo, pats, opts)
1029 1029 fns, match, anypats = matchpats(repo, pats, opts)
1030 1030 if pats:
1031 1031 modified, added, removed, deleted, unknown = (
1032 1032 repo.changes(files=fns, match=match))
1033 1033 files = modified + added + removed
1034 1034 else:
1035 1035 files = []
1036 1036 try:
1037 1037 repo.commit(files, message, opts['user'], opts['date'], match,
1038 1038 force_editor=opts.get('force_editor'))
1039 1039 except ValueError, inst:
1040 1040 raise util.Abort(str(inst))
1041 1041
1042 1042 def docopy(ui, repo, pats, opts, wlock):
1043 1043 # called with the repo lock held
1044 1044 cwd = repo.getcwd()
1045 1045 errors = 0
1046 1046 copied = []
1047 1047 targets = {}
1048 1048
1049 1049 def okaytocopy(abs, rel, exact):
1050 1050 reasons = {'?': _('is not managed'),
1051 1051 'a': _('has been marked for add'),
1052 1052 'r': _('has been marked for remove')}
1053 1053 state = repo.dirstate.state(abs)
1054 1054 reason = reasons.get(state)
1055 1055 if reason:
1056 1056 if state == 'a':
1057 1057 origsrc = repo.dirstate.copied(abs)
1058 1058 if origsrc is not None:
1059 1059 return origsrc
1060 1060 if exact:
1061 1061 ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
1062 1062 else:
1063 1063 return abs
1064 1064
1065 1065 def copy(origsrc, abssrc, relsrc, target, exact):
1066 1066 abstarget = util.canonpath(repo.root, cwd, target)
1067 1067 reltarget = util.pathto(cwd, abstarget)
1068 1068 prevsrc = targets.get(abstarget)
1069 1069 if prevsrc is not None:
1070 1070 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
1071 1071 (reltarget, abssrc, prevsrc))
1072 1072 return
1073 1073 if (not opts['after'] and os.path.exists(reltarget) or
1074 1074 opts['after'] and repo.dirstate.state(abstarget) not in '?r'):
1075 1075 if not opts['force']:
1076 1076 ui.warn(_('%s: not overwriting - file exists\n') %
1077 1077 reltarget)
1078 1078 return
1079 1079 if not opts['after'] and not opts.get('dry_run'):
1080 1080 os.unlink(reltarget)
1081 1081 if opts['after']:
1082 1082 if not os.path.exists(reltarget):
1083 1083 return
1084 1084 else:
1085 1085 targetdir = os.path.dirname(reltarget) or '.'
1086 1086 if not os.path.isdir(targetdir) and not opts.get('dry_run'):
1087 1087 os.makedirs(targetdir)
1088 1088 try:
1089 1089 restore = repo.dirstate.state(abstarget) == 'r'
1090 1090 if restore and not opts.get('dry_run'):
1091 1091 repo.undelete([abstarget], wlock)
1092 1092 try:
1093 1093 if not opts.get('dry_run'):
1094 1094 shutil.copyfile(relsrc, reltarget)
1095 1095 shutil.copymode(relsrc, reltarget)
1096 1096 restore = False
1097 1097 finally:
1098 1098 if restore:
1099 1099 repo.remove([abstarget], wlock)
1100 1100 except shutil.Error, inst:
1101 1101 raise util.Abort(str(inst))
1102 1102 except IOError, inst:
1103 1103 if inst.errno == errno.ENOENT:
1104 1104 ui.warn(_('%s: deleted in working copy\n') % relsrc)
1105 1105 else:
1106 1106 ui.warn(_('%s: cannot copy - %s\n') %
1107 1107 (relsrc, inst.strerror))
1108 1108 errors += 1
1109 1109 return
1110 1110 if ui.verbose or not exact:
1111 1111 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
1112 1112 targets[abstarget] = abssrc
1113 1113 if abstarget != origsrc and not opts.get('dry_run'):
1114 1114 repo.copy(origsrc, abstarget, wlock)
1115 1115 copied.append((abssrc, relsrc, exact))
1116 1116
1117 1117 def targetpathfn(pat, dest, srcs):
1118 1118 if os.path.isdir(pat):
1119 1119 abspfx = util.canonpath(repo.root, cwd, pat)
1120 1120 if destdirexists:
1121 1121 striplen = len(os.path.split(abspfx)[0])
1122 1122 else:
1123 1123 striplen = len(abspfx)
1124 1124 if striplen:
1125 1125 striplen += len(os.sep)
1126 1126 res = lambda p: os.path.join(dest, p[striplen:])
1127 1127 elif destdirexists:
1128 1128 res = lambda p: os.path.join(dest, os.path.basename(p))
1129 1129 else:
1130 1130 res = lambda p: dest
1131 1131 return res
1132 1132
1133 1133 def targetpathafterfn(pat, dest, srcs):
1134 1134 if util.patkind(pat, None)[0]:
1135 1135 # a mercurial pattern
1136 1136 res = lambda p: os.path.join(dest, os.path.basename(p))
1137 1137 else:
1138 1138 abspfx = util.canonpath(repo.root, cwd, pat)
1139 1139 if len(abspfx) < len(srcs[0][0]):
1140 1140 # A directory. Either the target path contains the last
1141 1141 # component of the source path or it does not.
1142 1142 def evalpath(striplen):
1143 1143 score = 0
1144 1144 for s in srcs:
1145 1145 t = os.path.join(dest, s[0][striplen:])
1146 1146 if os.path.exists(t):
1147 1147 score += 1
1148 1148 return score
1149 1149
1150 1150 striplen = len(abspfx)
1151 1151 if striplen:
1152 1152 striplen += len(os.sep)
1153 1153 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1154 1154 score = evalpath(striplen)
1155 1155 striplen1 = len(os.path.split(abspfx)[0])
1156 1156 if striplen1:
1157 1157 striplen1 += len(os.sep)
1158 1158 if evalpath(striplen1) > score:
1159 1159 striplen = striplen1
1160 1160 res = lambda p: os.path.join(dest, p[striplen:])
1161 1161 else:
1162 1162 # a file
1163 1163 if destdirexists:
1164 1164 res = lambda p: os.path.join(dest, os.path.basename(p))
1165 1165 else:
1166 1166 res = lambda p: dest
1167 1167 return res
1168 1168
1169 1169
1170 1170 pats = list(pats)
1171 1171 if not pats:
1172 1172 raise util.Abort(_('no source or destination specified'))
1173 1173 if len(pats) == 1:
1174 1174 raise util.Abort(_('no destination specified'))
1175 1175 dest = pats.pop()
1176 1176 destdirexists = os.path.isdir(dest)
1177 1177 if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:
1178 1178 raise util.Abort(_('with multiple sources, destination must be an '
1179 1179 'existing directory'))
1180 1180 if opts['after']:
1181 1181 tfn = targetpathafterfn
1182 1182 else:
1183 1183 tfn = targetpathfn
1184 1184 copylist = []
1185 1185 for pat in pats:
1186 1186 srcs = []
1187 1187 for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):
1188 1188 origsrc = okaytocopy(abssrc, relsrc, exact)
1189 1189 if origsrc:
1190 1190 srcs.append((origsrc, abssrc, relsrc, exact))
1191 1191 if not srcs:
1192 1192 continue
1193 1193 copylist.append((tfn(pat, dest, srcs), srcs))
1194 1194 if not copylist:
1195 1195 raise util.Abort(_('no files to copy'))
1196 1196
1197 1197 for targetpath, srcs in copylist:
1198 1198 for origsrc, abssrc, relsrc, exact in srcs:
1199 1199 copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)
1200 1200
1201 1201 if errors:
1202 1202 ui.warn(_('(consider using --after)\n'))
1203 1203 return errors, copied
1204 1204
1205 1205 def copy(ui, repo, *pats, **opts):
1206 1206 """mark files as copied for the next commit
1207 1207
1208 1208 Mark dest as having copies of source files. If dest is a
1209 1209 directory, copies are put in that directory. If dest is a file,
1210 1210 there can only be one source.
1211 1211
1212 1212 By default, this command copies the contents of files as they
1213 1213 stand in the working directory. If invoked with --after, the
1214 1214 operation is recorded, but no copying is performed.
1215 1215
1216 1216 This command takes effect in the next commit.
1217 1217
1218 1218 NOTE: This command should be treated as experimental. While it
1219 1219 should properly record copied files, this information is not yet
1220 1220 fully used by merge, nor fully reported by log.
1221 1221 """
1222 1222 wlock = repo.wlock(0)
1223 1223 errs, copied = docopy(ui, repo, pats, opts, wlock)
1224 1224 return errs
1225 1225
1226 1226 def debugancestor(ui, index, rev1, rev2):
1227 1227 """find the ancestor revision of two revisions in a given index"""
1228 1228 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index, "", 0)
1229 1229 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
1230 1230 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1231 1231
1232 1232 def debugcomplete(ui, cmd='', **opts):
1233 1233 """returns the completion list associated with the given command"""
1234 1234
1235 1235 if opts['options']:
1236 1236 options = []
1237 1237 otables = [globalopts]
1238 1238 if cmd:
1239 1239 aliases, entry = find(cmd)
1240 1240 otables.append(entry[1])
1241 1241 for t in otables:
1242 1242 for o in t:
1243 1243 if o[0]:
1244 1244 options.append('-%s' % o[0])
1245 1245 options.append('--%s' % o[1])
1246 1246 ui.write("%s\n" % "\n".join(options))
1247 1247 return
1248 1248
1249 1249 clist = findpossible(cmd).keys()
1250 1250 clist.sort()
1251 1251 ui.write("%s\n" % "\n".join(clist))
1252 1252
1253 1253 def debugrebuildstate(ui, repo, rev=None):
1254 1254 """rebuild the dirstate as it would look like for the given revision"""
1255 1255 if not rev:
1256 1256 rev = repo.changelog.tip()
1257 1257 else:
1258 1258 rev = repo.lookup(rev)
1259 1259 change = repo.changelog.read(rev)
1260 1260 n = change[0]
1261 1261 files = repo.manifest.readflags(n)
1262 1262 wlock = repo.wlock()
1263 1263 repo.dirstate.rebuild(rev, files.iteritems())
1264 1264
1265 1265 def debugcheckstate(ui, repo):
1266 1266 """validate the correctness of the current dirstate"""
1267 1267 parent1, parent2 = repo.dirstate.parents()
1268 1268 repo.dirstate.read()
1269 1269 dc = repo.dirstate.map
1270 1270 keys = dc.keys()
1271 1271 keys.sort()
1272 1272 m1n = repo.changelog.read(parent1)[0]
1273 1273 m2n = repo.changelog.read(parent2)[0]
1274 1274 m1 = repo.manifest.read(m1n)
1275 1275 m2 = repo.manifest.read(m2n)
1276 1276 errors = 0
1277 1277 for f in dc:
1278 1278 state = repo.dirstate.state(f)
1279 1279 if state in "nr" and f not in m1:
1280 1280 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1281 1281 errors += 1
1282 1282 if state in "a" and f in m1:
1283 1283 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1284 1284 errors += 1
1285 1285 if state in "m" and f not in m1 and f not in m2:
1286 1286 ui.warn(_("%s in state %s, but not in either manifest\n") %
1287 1287 (f, state))
1288 1288 errors += 1
1289 1289 for f in m1:
1290 1290 state = repo.dirstate.state(f)
1291 1291 if state not in "nrm":
1292 1292 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1293 1293 errors += 1
1294 1294 if errors:
1295 1295 error = _(".hg/dirstate inconsistent with current parent's manifest")
1296 1296 raise util.Abort(error)
1297 1297
1298 1298 def debugconfig(ui, repo, *values):
1299 1299 """show combined config settings from all hgrc files
1300 1300
1301 1301 With no args, print names and values of all config items.
1302 1302
1303 1303 With one arg of the form section.name, print just the value of
1304 1304 that config item.
1305 1305
1306 1306 With multiple args, print names and values of all config items
1307 1307 with matching section names."""
1308 1308
1309 1309 if values:
1310 1310 if len([v for v in values if '.' in v]) > 1:
1311 1311 raise util.Abort(_('only one config item permitted'))
1312 1312 for section, name, value in ui.walkconfig():
1313 1313 sectname = section + '.' + name
1314 1314 if values:
1315 1315 for v in values:
1316 1316 if v == section:
1317 1317 ui.write('%s=%s\n' % (sectname, value))
1318 1318 elif v == sectname:
1319 1319 ui.write(value, '\n')
1320 1320 else:
1321 1321 ui.write('%s=%s\n' % (sectname, value))
1322 1322
1323 1323 def debugsetparents(ui, repo, rev1, rev2=None):
1324 1324 """manually set the parents of the current working directory
1325 1325
1326 1326 This is useful for writing repository conversion tools, but should
1327 1327 be used with care.
1328 1328 """
1329 1329
1330 1330 if not rev2:
1331 1331 rev2 = hex(nullid)
1332 1332
1333 1333 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
1334 1334
1335 1335 def debugstate(ui, repo):
1336 1336 """show the contents of the current dirstate"""
1337 1337 repo.dirstate.read()
1338 1338 dc = repo.dirstate.map
1339 1339 keys = dc.keys()
1340 1340 keys.sort()
1341 1341 for file_ in keys:
1342 1342 ui.write("%c %3o %10d %s %s\n"
1343 1343 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
1344 1344 time.strftime("%x %X",
1345 1345 time.localtime(dc[file_][3])), file_))
1346 1346 for f in repo.dirstate.copies:
1347 1347 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))
1348 1348
1349 1349 def debugdata(ui, file_, rev):
1350 1350 """dump the contents of an data file revision"""
1351 1351 r = revlog.revlog(util.opener(os.getcwd(), audit=False),
1352 1352 file_[:-2] + ".i", file_, 0)
1353 1353 try:
1354 1354 ui.write(r.revision(r.lookup(rev)))
1355 1355 except KeyError:
1356 1356 raise util.Abort(_('invalid revision identifier %s'), rev)
1357 1357
1358 1358 def debugindex(ui, file_):
1359 1359 """dump the contents of an index file"""
1360 1360 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1361 1361 ui.write(" rev offset length base linkrev" +
1362 1362 " nodeid p1 p2\n")
1363 1363 for i in range(r.count()):
1364 1364 node = r.node(i)
1365 1365 pp = r.parents(node)
1366 1366 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1367 1367 i, r.start(i), r.length(i), r.base(i), r.linkrev(node),
1368 1368 short(node), short(pp[0]), short(pp[1])))
1369 1369
1370 1370 def debugindexdot(ui, file_):
1371 1371 """dump an index DAG as a .dot file"""
1372 1372 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1373 1373 ui.write("digraph G {\n")
1374 1374 for i in range(r.count()):
1375 1375 node = r.node(i)
1376 1376 pp = r.parents(node)
1377 1377 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1378 1378 if pp[1] != nullid:
1379 1379 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1380 1380 ui.write("}\n")
1381 1381
1382 1382 def debugrename(ui, repo, file, rev=None):
1383 1383 """dump rename information"""
1384 1384 r = repo.file(relpath(repo, [file])[0])
1385 1385 if rev:
1386 1386 try:
1387 1387 # assume all revision numbers are for changesets
1388 1388 n = repo.lookup(rev)
1389 1389 change = repo.changelog.read(n)
1390 1390 m = repo.manifest.read(change[0])
1391 1391 n = m[relpath(repo, [file])[0]]
1392 1392 except (hg.RepoError, KeyError):
1393 1393 n = r.lookup(rev)
1394 1394 else:
1395 1395 n = r.tip()
1396 1396 m = r.renamed(n)
1397 1397 if m:
1398 1398 ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
1399 1399 else:
1400 1400 ui.write(_("not renamed\n"))
1401 1401
1402 1402 def debugwalk(ui, repo, *pats, **opts):
1403 1403 """show how files match on given patterns"""
1404 1404 items = list(walk(repo, pats, opts))
1405 1405 if not items:
1406 1406 return
1407 1407 fmt = '%%s %%-%ds %%-%ds %%s' % (
1408 1408 max([len(abs) for (src, abs, rel, exact) in items]),
1409 1409 max([len(rel) for (src, abs, rel, exact) in items]))
1410 1410 for src, abs, rel, exact in items:
1411 1411 line = fmt % (src, abs, rel, exact and 'exact' or '')
1412 1412 ui.write("%s\n" % line.rstrip())
1413 1413
1414 1414 def diff(ui, repo, *pats, **opts):
1415 1415 """diff repository (or selected files)
1416 1416
1417 1417 Show differences between revisions for the specified files.
1418 1418
1419 1419 Differences between files are shown using the unified diff format.
1420 1420
1421 1421 When two revision arguments are given, then changes are shown
1422 1422 between those revisions. If only one revision is specified then
1423 1423 that revision is compared to the working directory, and, when no
1424 1424 revisions are specified, the working directory files are compared
1425 1425 to its parent.
1426 1426
1427 1427 Without the -a option, diff will avoid generating diffs of files
1428 1428 it detects as binary. With -a, diff will generate a diff anyway,
1429 1429 probably with undesirable results.
1430 1430 """
1431 1431 node1, node2 = revpair(ui, repo, opts['rev'])
1432 1432
1433 1433 fns, matchfn, anypats = matchpats(repo, pats, opts)
1434 1434
1435 1435 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
1436 1436 text=opts['text'], opts=opts)
1437 1437
1438 1438 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
1439 1439 node = repo.lookup(changeset)
1440 1440 parents = [p for p in repo.changelog.parents(node) if p != nullid]
1441 1441 if opts['switch_parent']:
1442 1442 parents.reverse()
1443 1443 prev = (parents and parents[0]) or nullid
1444 1444 change = repo.changelog.read(node)
1445 1445
1446 1446 fp = make_file(repo, repo.changelog, opts['output'],
1447 1447 node=node, total=total, seqno=seqno,
1448 1448 revwidth=revwidth)
1449 1449 if fp != sys.stdout:
1450 1450 ui.note("%s\n" % fp.name)
1451 1451
1452 1452 fp.write("# HG changeset patch\n")
1453 1453 fp.write("# User %s\n" % change[1])
1454 1454 fp.write("# Date %d %d\n" % change[2])
1455 1455 fp.write("# Node ID %s\n" % hex(node))
1456 1456 fp.write("# Parent %s\n" % hex(prev))
1457 1457 if len(parents) > 1:
1458 1458 fp.write("# Parent %s\n" % hex(parents[1]))
1459 1459 fp.write(change[4].rstrip())
1460 1460 fp.write("\n\n")
1461 1461
1462 1462 dodiff(fp, ui, repo, prev, node, text=opts['text'])
1463 1463 if fp != sys.stdout:
1464 1464 fp.close()
1465 1465
1466 1466 def export(ui, repo, *changesets, **opts):
1467 1467 """dump the header and diffs for one or more changesets
1468 1468
1469 1469 Print the changeset header and diffs for one or more revisions.
1470 1470
1471 1471 The information shown in the changeset header is: author,
1472 1472 changeset hash, parent and commit comment.
1473 1473
1474 1474 Output may be to a file, in which case the name of the file is
1475 1475 given using a format string. The formatting rules are as follows:
1476 1476
1477 1477 %% literal "%" character
1478 1478 %H changeset hash (40 bytes of hexadecimal)
1479 1479 %N number of patches being generated
1480 1480 %R changeset revision number
1481 1481 %b basename of the exporting repository
1482 1482 %h short-form changeset hash (12 bytes of hexadecimal)
1483 1483 %n zero-padded sequence number, starting at 1
1484 1484 %r zero-padded changeset revision number
1485 1485
1486 1486 Without the -a option, export will avoid generating diffs of files
1487 1487 it detects as binary. With -a, export will generate a diff anyway,
1488 1488 probably with undesirable results.
1489 1489
1490 1490 With the --switch-parent option, the diff will be against the second
1491 1491 parent. It can be useful to review a merge.
1492 1492 """
1493 1493 if not changesets:
1494 1494 raise util.Abort(_("export requires at least one changeset"))
1495 1495 seqno = 0
1496 1496 revs = list(revrange(ui, repo, changesets))
1497 1497 total = len(revs)
1498 1498 revwidth = max(map(len, revs))
1499 1499 msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")
1500 1500 ui.note(msg)
1501 1501 for cset in revs:
1502 1502 seqno += 1
1503 1503 doexport(ui, repo, cset, seqno, total, revwidth, opts)
1504 1504
1505 1505 def forget(ui, repo, *pats, **opts):
1506 1506 """don't add the specified files on the next commit (DEPRECATED)
1507 1507
1508 1508 (DEPRECATED)
1509 1509 Undo an 'hg add' scheduled for the next commit.
1510 1510
1511 1511 This command is now deprecated and will be removed in a future
1512 1512 release. Please use revert instead.
1513 1513 """
1514 1514 ui.warn(_("(the forget command is deprecated; use revert instead)\n"))
1515 1515 forget = []
1516 1516 for src, abs, rel, exact in walk(repo, pats, opts):
1517 1517 if repo.dirstate.state(abs) == 'a':
1518 1518 forget.append(abs)
1519 1519 if ui.verbose or not exact:
1520 1520 ui.status(_('forgetting %s\n') % ((pats and rel) or abs))
1521 1521 repo.forget(forget)
1522 1522
1523 1523 def grep(ui, repo, pattern, *pats, **opts):
1524 1524 """search for a pattern in specified files and revisions
1525 1525
1526 1526 Search revisions of files for a regular expression.
1527 1527
1528 1528 This command behaves differently than Unix grep. It only accepts
1529 1529 Python/Perl regexps. It searches repository history, not the
1530 1530 working directory. It always prints the revision number in which
1531 1531 a match appears.
1532 1532
1533 1533 By default, grep only prints output for the first revision of a
1534 1534 file in which it finds a match. To get it to print every revision
1535 1535 that contains a change in match status ("-" for a match that
1536 1536 becomes a non-match, or "+" for a non-match that becomes a match),
1537 1537 use the --all flag.
1538 1538 """
1539 1539 reflags = 0
1540 1540 if opts['ignore_case']:
1541 1541 reflags |= re.I
1542 1542 regexp = re.compile(pattern, reflags)
1543 1543 sep, eol = ':', '\n'
1544 1544 if opts['print0']:
1545 1545 sep = eol = '\0'
1546 1546
1547 1547 fcache = {}
1548 1548 def getfile(fn):
1549 1549 if fn not in fcache:
1550 1550 fcache[fn] = repo.file(fn)
1551 1551 return fcache[fn]
1552 1552
1553 1553 def matchlines(body):
1554 1554 begin = 0
1555 1555 linenum = 0
1556 1556 while True:
1557 1557 match = regexp.search(body, begin)
1558 1558 if not match:
1559 1559 break
1560 1560 mstart, mend = match.span()
1561 1561 linenum += body.count('\n', begin, mstart) + 1
1562 1562 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1563 1563 lend = body.find('\n', mend)
1564 1564 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1565 1565 begin = lend + 1
1566 1566
1567 1567 class linestate(object):
1568 1568 def __init__(self, line, linenum, colstart, colend):
1569 1569 self.line = line
1570 1570 self.linenum = linenum
1571 1571 self.colstart = colstart
1572 1572 self.colend = colend
1573 1573 def __eq__(self, other):
1574 1574 return self.line == other.line
1575 1575 def __hash__(self):
1576 1576 return hash(self.line)
1577 1577
1578 1578 matches = {}
1579 1579 def grepbody(fn, rev, body):
1580 1580 matches[rev].setdefault(fn, {})
1581 1581 m = matches[rev][fn]
1582 1582 for lnum, cstart, cend, line in matchlines(body):
1583 1583 s = linestate(line, lnum, cstart, cend)
1584 1584 m[s] = s
1585 1585
1586 1586 # FIXME: prev isn't used, why ?
1587 1587 prev = {}
1588 1588 ucache = {}
1589 1589 def display(fn, rev, states, prevstates):
1590 1590 diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
1591 1591 diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
1592 1592 counts = {'-': 0, '+': 0}
1593 1593 filerevmatches = {}
1594 1594 for l in diff:
1595 1595 if incrementing or not opts['all']:
1596 1596 change = ((l in prevstates) and '-') or '+'
1597 1597 r = rev
1598 1598 else:
1599 1599 change = ((l in states) and '-') or '+'
1600 1600 r = prev[fn]
1601 1601 cols = [fn, str(rev)]
1602 1602 if opts['line_number']:
1603 1603 cols.append(str(l.linenum))
1604 1604 if opts['all']:
1605 1605 cols.append(change)
1606 1606 if opts['user']:
1607 1607 cols.append(trimuser(ui, getchange(rev)[1], rev,
1608 1608 ucache))
1609 1609 if opts['files_with_matches']:
1610 1610 c = (fn, rev)
1611 1611 if c in filerevmatches:
1612 1612 continue
1613 1613 filerevmatches[c] = 1
1614 1614 else:
1615 1615 cols.append(l.line)
1616 1616 ui.write(sep.join(cols), eol)
1617 1617 counts[change] += 1
1618 1618 return counts['+'], counts['-']
1619 1619
1620 1620 fstate = {}
1621 1621 skip = {}
1622 1622 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1623 1623 count = 0
1624 1624 incrementing = False
1625 1625 for st, rev, fns in changeiter:
1626 1626 if st == 'window':
1627 1627 incrementing = rev
1628 1628 matches.clear()
1629 1629 elif st == 'add':
1630 1630 change = repo.changelog.read(repo.lookup(str(rev)))
1631 1631 mf = repo.manifest.read(change[0])
1632 1632 matches[rev] = {}
1633 1633 for fn in fns:
1634 1634 if fn in skip:
1635 1635 continue
1636 1636 fstate.setdefault(fn, {})
1637 1637 try:
1638 1638 grepbody(fn, rev, getfile(fn).read(mf[fn]))
1639 1639 except KeyError:
1640 1640 pass
1641 1641 elif st == 'iter':
1642 1642 states = matches[rev].items()
1643 1643 states.sort()
1644 1644 for fn, m in states:
1645 1645 if fn in skip:
1646 1646 continue
1647 1647 if incrementing or not opts['all'] or fstate[fn]:
1648 1648 pos, neg = display(fn, rev, m, fstate[fn])
1649 1649 count += pos + neg
1650 1650 if pos and not opts['all']:
1651 1651 skip[fn] = True
1652 1652 fstate[fn] = m
1653 1653 prev[fn] = rev
1654 1654
1655 1655 if not incrementing:
1656 1656 fstate = fstate.items()
1657 1657 fstate.sort()
1658 1658 for fn, state in fstate:
1659 1659 if fn in skip:
1660 1660 continue
1661 1661 display(fn, rev, {}, state)
1662 1662 return (count == 0 and 1) or 0
1663 1663
1664 1664 def heads(ui, repo, **opts):
1665 1665 """show current repository heads
1666 1666
1667 1667 Show all repository head changesets.
1668 1668
1669 1669 Repository "heads" are changesets that don't have children
1670 1670 changesets. They are where development generally takes place and
1671 1671 are the usual targets for update and merge operations.
1672 1672 """
1673 1673 if opts['rev']:
1674 1674 heads = repo.heads(repo.lookup(opts['rev']))
1675 1675 else:
1676 1676 heads = repo.heads()
1677 1677 br = None
1678 1678 if opts['branches']:
1679 1679 br = repo.branchlookup(heads)
1680 1680 displayer = show_changeset(ui, repo, opts)
1681 1681 for n in heads:
1682 1682 displayer.show(changenode=n, brinfo=br)
1683 1683
1684 1684 def identify(ui, repo):
1685 1685 """print information about the working copy
1686 1686
1687 1687 Print a short summary of the current state of the repo.
1688 1688
1689 1689 This summary identifies the repository state using one or two parent
1690 1690 hash identifiers, followed by a "+" if there are uncommitted changes
1691 1691 in the working directory, followed by a list of tags for this revision.
1692 1692 """
1693 1693 parents = [p for p in repo.dirstate.parents() if p != nullid]
1694 1694 if not parents:
1695 1695 ui.write(_("unknown\n"))
1696 1696 return
1697 1697
1698 1698 hexfunc = ui.verbose and hex or short
1699 1699 modified, added, removed, deleted, unknown = repo.changes()
1700 1700 output = ["%s%s" %
1701 1701 ('+'.join([hexfunc(parent) for parent in parents]),
1702 1702 (modified or added or removed or deleted) and "+" or "")]
1703 1703
1704 1704 if not ui.quiet:
1705 1705 # multiple tags for a single parent separated by '/'
1706 1706 parenttags = ['/'.join(tags)
1707 1707 for tags in map(repo.nodetags, parents) if tags]
1708 1708 # tags for multiple parents separated by ' + '
1709 1709 if parenttags:
1710 1710 output.append(' + '.join(parenttags))
1711 1711
1712 1712 ui.write("%s\n" % ' '.join(output))
1713 1713
1714 1714 def import_(ui, repo, patch1, *patches, **opts):
1715 1715 """import an ordered set of patches
1716 1716
1717 1717 Import a list of patches and commit them individually.
1718 1718
1719 1719 If there are outstanding changes in the working directory, import
1720 1720 will abort unless given the -f flag.
1721 1721
1722 1722 You can import a patch straight from a mail message. Even patches
1723 1723 as attachments work (body part must be type text/plain or
1724 text/x-patch to be used). Sender and subject line of email
1725 message are used as default committer and commit message. Any
1726 text/plain body part before first diff is added to commit message.
1724 text/x-patch to be used). From and Subject headers of email
1725 message are used as default committer and commit message. All
1726 text/plain body parts before first diff are added to commit
1727 message.
1727 1728
1728 1729 If imported patch was generated by hg export, user and description
1729 1730 from patch override values from message headers and body. Values
1730 1731 given on command line with -m and -u override these.
1731 1732
1732 1733 To read a patch from standard input, use patch name "-".
1733 1734 """
1734 1735 patches = (patch1,) + patches
1735 1736
1736 1737 if not opts['force']:
1737 1738 bail_if_changed(repo)
1738 1739
1739 1740 d = opts["base"]
1740 1741 strip = opts["strip"]
1741 1742
1742 1743 mailre = re.compile(r'(?:From |[\w-]+:)')
1743 1744
1744 1745 # attempt to detect the start of a patch
1745 1746 # (this heuristic is borrowed from quilt)
1746 1747 diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' +
1747 1748 'retrieving revision [0-9]+(\.[0-9]+)*$|' +
1748 1749 '(---|\*\*\*)[ \t])', re.MULTILINE)
1749 1750
1750 1751 for patch in patches:
1751 1752 pf = os.path.join(d, patch)
1752 1753
1753 1754 message = None
1754 1755 user = None
1755 1756 date = None
1756 1757 hgpatch = False
1757 1758
1758 1759 p = email.Parser.Parser()
1759 1760 if pf == '-':
1760 1761 msg = p.parse(sys.stdin)
1761 1762 ui.status(_("applying patch from stdin\n"))
1762 1763 else:
1763 1764 msg = p.parse(file(pf))
1764 1765 ui.status(_("applying %s\n") % patch)
1765 1766
1766 1767 fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
1767 1768 tmpfp = os.fdopen(fd, 'w')
1768 1769 try:
1769 1770 message = msg['Subject']
1770 1771 if message:
1771 1772 message = message.replace('\n\t', ' ')
1772 1773 ui.debug('Subject: %s\n' % message)
1773 1774 user = msg['From']
1774 1775 if user:
1775 1776 ui.debug('From: %s\n' % user)
1776 1777 diffs_seen = 0
1777 1778 ok_types = ('text/plain', 'text/x-patch')
1778 1779 for part in msg.walk():
1779 1780 content_type = part.get_content_type()
1780 1781 ui.debug('Content-Type: %s\n' % content_type)
1781 1782 if content_type not in ok_types:
1782 1783 continue
1783 1784 payload = part.get_payload(decode=True)
1784 1785 m = diffre.search(payload)
1785 1786 if m:
1786 1787 ui.debug(_('found patch at byte %d\n') % m.start(0))
1787 1788 diffs_seen += 1
1788 1789 hgpatch = False
1789 1790 fp = cStringIO.StringIO()
1790 1791 if message:
1791 1792 fp.write(message)
1792 1793 fp.write('\n')
1793 1794 for line in payload[:m.start(0)].splitlines():
1794 1795 if line.startswith('# HG changeset patch'):
1795 1796 ui.debug(_('patch generated by hg export\n'))
1796 1797 hgpatch = True
1797 1798 # drop earlier commit message content
1798 1799 fp.seek(0)
1799 1800 fp.truncate()
1800 1801 elif hgpatch:
1801 1802 if line.startswith('# User '):
1802 1803 user = line[7:]
1803 1804 ui.debug('From: %s\n' % user)
1804 1805 elif line.startswith("# Date "):
1805 1806 date = line[7:]
1806 1807 if not line.startswith('# '):
1807 1808 fp.write(line)
1808 1809 fp.write('\n')
1809 1810 message = fp.getvalue()
1810 1811 if tmpfp:
1811 1812 tmpfp.write(payload)
1812 1813 if not payload.endswith('\n'):
1813 1814 tmpfp.write('\n')
1814 1815 elif not diffs_seen and message and content_type == 'text/plain':
1815 1816 message += '\n' + payload
1816 1817
1817 1818 if opts['message']:
1818 1819 # pickup the cmdline msg
1819 1820 message = opts['message']
1820 1821 elif message:
1821 1822 # pickup the patch msg
1822 1823 message = message.strip()
1823 1824 else:
1824 1825 # launch the editor
1825 1826 message = None
1826 1827 ui.debug(_('message:\n%s\n') % message)
1827 1828
1828 1829 tmpfp.close()
1829 1830 if not diffs_seen:
1830 1831 raise util.Abort(_('no diffs found'))
1831 1832
1832 1833 files = util.patch(strip, tmpname, ui)
1833 1834 if len(files) > 0:
1834 1835 addremove_lock(ui, repo, files, {})
1835 1836 repo.commit(files, message, user, date)
1836 1837 finally:
1837 1838 os.unlink(tmpname)
1838 1839
1839 1840 def incoming(ui, repo, source="default", **opts):
1840 1841 """show new changesets found in source
1841 1842
1842 1843 Show new changesets found in the specified path/URL or the default
1843 1844 pull location. These are the changesets that would be pulled if a pull
1844 1845 was requested.
1845 1846
1846 1847 For remote repository, using --bundle avoids downloading the changesets
1847 1848 twice if the incoming is followed by a pull.
1848 1849
1849 1850 See pull for valid source format details.
1850 1851 """
1851 1852 source = ui.expandpath(source)
1852 1853 if opts['ssh']:
1853 1854 ui.setconfig("ui", "ssh", opts['ssh'])
1854 1855 if opts['remotecmd']:
1855 1856 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
1856 1857
1857 1858 other = hg.repository(ui, source)
1858 1859 incoming = repo.findincoming(other, force=opts["force"])
1859 1860 if not incoming:
1860 1861 ui.status(_("no changes found\n"))
1861 1862 return
1862 1863
1863 1864 cleanup = None
1864 1865 try:
1865 1866 fname = opts["bundle"]
1866 1867 if fname or not other.local():
1867 1868 # create a bundle (uncompressed if other repo is not local)
1868 1869 cg = other.changegroup(incoming, "incoming")
1869 1870 fname = cleanup = write_bundle(cg, fname, compress=other.local())
1870 1871 # keep written bundle?
1871 1872 if opts["bundle"]:
1872 1873 cleanup = None
1873 1874 if not other.local():
1874 1875 # use the created uncompressed bundlerepo
1875 1876 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1876 1877
1877 1878 o = other.changelog.nodesbetween(incoming)[0]
1878 1879 if opts['newest_first']:
1879 1880 o.reverse()
1880 1881 displayer = show_changeset(ui, other, opts)
1881 1882 for n in o:
1882 1883 parents = [p for p in other.changelog.parents(n) if p != nullid]
1883 1884 if opts['no_merges'] and len(parents) == 2:
1884 1885 continue
1885 1886 displayer.show(changenode=n)
1886 1887 if opts['patch']:
1887 1888 prev = (parents and parents[0]) or nullid
1888 1889 dodiff(ui, ui, other, prev, n)
1889 1890 ui.write("\n")
1890 1891 finally:
1891 1892 if hasattr(other, 'close'):
1892 1893 other.close()
1893 1894 if cleanup:
1894 1895 os.unlink(cleanup)
1895 1896
1896 1897 def init(ui, dest="."):
1897 1898 """create a new repository in the given directory
1898 1899
1899 1900 Initialize a new repository in the given directory. If the given
1900 1901 directory does not exist, it is created.
1901 1902
1902 1903 If no directory is given, the current directory is used.
1903 1904 """
1904 1905 if not os.path.exists(dest):
1905 1906 os.mkdir(dest)
1906 1907 hg.repository(ui, dest, create=1)
1907 1908
1908 1909 def locate(ui, repo, *pats, **opts):
1909 1910 """locate files matching specific patterns
1910 1911
1911 1912 Print all files under Mercurial control whose names match the
1912 1913 given patterns.
1913 1914
1914 1915 This command searches the current directory and its
1915 1916 subdirectories. To search an entire repository, move to the root
1916 1917 of the repository.
1917 1918
1918 1919 If no patterns are given to match, this command prints all file
1919 1920 names.
1920 1921
1921 1922 If you want to feed the output of this command into the "xargs"
1922 1923 command, use the "-0" option to both this command and "xargs".
1923 1924 This will avoid the problem of "xargs" treating single filenames
1924 1925 that contain white space as multiple filenames.
1925 1926 """
1926 1927 end = opts['print0'] and '\0' or '\n'
1927 1928 rev = opts['rev']
1928 1929 if rev:
1929 1930 node = repo.lookup(rev)
1930 1931 else:
1931 1932 node = None
1932 1933
1933 1934 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
1934 1935 head='(?:.*/|)'):
1935 1936 if not node and repo.dirstate.state(abs) == '?':
1936 1937 continue
1937 1938 if opts['fullpath']:
1938 1939 ui.write(os.path.join(repo.root, abs), end)
1939 1940 else:
1940 1941 ui.write(((pats and rel) or abs), end)
1941 1942
1942 1943 def log(ui, repo, *pats, **opts):
1943 1944 """show revision history of entire repository or files
1944 1945
1945 1946 Print the revision history of the specified files or the entire project.
1946 1947
1947 1948 By default this command outputs: changeset id and hash, tags,
1948 1949 non-trivial parents, user, date and time, and a summary for each
1949 1950 commit. When the -v/--verbose switch is used, the list of changed
1950 1951 files and full commit message is shown.
1951 1952 """
1952 1953 class dui(object):
1953 1954 # Implement and delegate some ui protocol. Save hunks of
1954 1955 # output for later display in the desired order.
1955 1956 def __init__(self, ui):
1956 1957 self.ui = ui
1957 1958 self.hunk = {}
1958 1959 self.header = {}
1959 1960 def bump(self, rev):
1960 1961 self.rev = rev
1961 1962 self.hunk[rev] = []
1962 1963 self.header[rev] = []
1963 1964 def note(self, *args):
1964 1965 if self.verbose:
1965 1966 self.write(*args)
1966 1967 def status(self, *args):
1967 1968 if not self.quiet:
1968 1969 self.write(*args)
1969 1970 def write(self, *args):
1970 1971 self.hunk[self.rev].append(args)
1971 1972 def write_header(self, *args):
1972 1973 self.header[self.rev].append(args)
1973 1974 def debug(self, *args):
1974 1975 if self.debugflag:
1975 1976 self.write(*args)
1976 1977 def __getattr__(self, key):
1977 1978 return getattr(self.ui, key)
1978 1979
1979 1980 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1980 1981
1981 1982 if opts['limit']:
1982 1983 try:
1983 1984 limit = int(opts['limit'])
1984 1985 except ValueError:
1985 1986 raise util.Abort(_('limit must be a positive integer'))
1986 1987 if limit <= 0: raise util.Abort(_('limit must be positive'))
1987 1988 else:
1988 1989 limit = sys.maxint
1989 1990 count = 0
1990 1991
1991 1992 displayer = show_changeset(ui, repo, opts)
1992 1993 for st, rev, fns in changeiter:
1993 1994 if st == 'window':
1994 1995 du = dui(ui)
1995 1996 displayer.ui = du
1996 1997 elif st == 'add':
1997 1998 du.bump(rev)
1998 1999 changenode = repo.changelog.node(rev)
1999 2000 parents = [p for p in repo.changelog.parents(changenode)
2000 2001 if p != nullid]
2001 2002 if opts['no_merges'] and len(parents) == 2:
2002 2003 continue
2003 2004 if opts['only_merges'] and len(parents) != 2:
2004 2005 continue
2005 2006
2006 2007 if opts['keyword']:
2007 2008 changes = getchange(rev)
2008 2009 miss = 0
2009 2010 for k in [kw.lower() for kw in opts['keyword']]:
2010 2011 if not (k in changes[1].lower() or
2011 2012 k in changes[4].lower() or
2012 2013 k in " ".join(changes[3][:20]).lower()):
2013 2014 miss = 1
2014 2015 break
2015 2016 if miss:
2016 2017 continue
2017 2018
2018 2019 br = None
2019 2020 if opts['branches']:
2020 2021 br = repo.branchlookup([repo.changelog.node(rev)])
2021 2022
2022 2023 displayer.show(rev, brinfo=br)
2023 2024 if opts['patch']:
2024 2025 prev = (parents and parents[0]) or nullid
2025 2026 dodiff(du, du, repo, prev, changenode, match=matchfn)
2026 2027 du.write("\n\n")
2027 2028 elif st == 'iter':
2028 2029 if count == limit: break
2029 2030 if du.header[rev]:
2030 2031 for args in du.header[rev]:
2031 2032 ui.write_header(*args)
2032 2033 if du.hunk[rev]:
2033 2034 count += 1
2034 2035 for args in du.hunk[rev]:
2035 2036 ui.write(*args)
2036 2037
2037 2038 def manifest(ui, repo, rev=None):
2038 2039 """output the latest or given revision of the project manifest
2039 2040
2040 2041 Print a list of version controlled files for the given revision.
2041 2042
2042 2043 The manifest is the list of files being version controlled. If no revision
2043 2044 is given then the tip is used.
2044 2045 """
2045 2046 if rev:
2046 2047 try:
2047 2048 # assume all revision numbers are for changesets
2048 2049 n = repo.lookup(rev)
2049 2050 change = repo.changelog.read(n)
2050 2051 n = change[0]
2051 2052 except hg.RepoError:
2052 2053 n = repo.manifest.lookup(rev)
2053 2054 else:
2054 2055 n = repo.manifest.tip()
2055 2056 m = repo.manifest.read(n)
2056 2057 mf = repo.manifest.readflags(n)
2057 2058 files = m.keys()
2058 2059 files.sort()
2059 2060
2060 2061 for f in files:
2061 2062 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
2062 2063
2063 2064 def merge(ui, repo, node=None, **opts):
2064 2065 """Merge working directory with another revision
2065 2066
2066 2067 Merge the contents of the current working directory and the
2067 2068 requested revision. Files that changed between either parent are
2068 2069 marked as changed for the next commit and a commit must be
2069 2070 performed before any further updates are allowed.
2070 2071 """
2071 2072 return doupdate(ui, repo, node=node, merge=True, **opts)
2072 2073
2073 2074 def outgoing(ui, repo, dest=None, **opts):
2074 2075 """show changesets not found in destination
2075 2076
2076 2077 Show changesets not found in the specified destination repository or
2077 2078 the default push location. These are the changesets that would be pushed
2078 2079 if a push was requested.
2079 2080
2080 2081 See pull for valid destination format details.
2081 2082 """
2082 2083 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2083 2084 if opts['ssh']:
2084 2085 ui.setconfig("ui", "ssh", opts['ssh'])
2085 2086 if opts['remotecmd']:
2086 2087 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2087 2088
2088 2089 other = hg.repository(ui, dest)
2089 2090 o = repo.findoutgoing(other, force=opts['force'])
2090 2091 if not o:
2091 2092 ui.status(_("no changes found\n"))
2092 2093 return
2093 2094 o = repo.changelog.nodesbetween(o)[0]
2094 2095 if opts['newest_first']:
2095 2096 o.reverse()
2096 2097 displayer = show_changeset(ui, repo, opts)
2097 2098 for n in o:
2098 2099 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2099 2100 if opts['no_merges'] and len(parents) == 2:
2100 2101 continue
2101 2102 displayer.show(changenode=n)
2102 2103 if opts['patch']:
2103 2104 prev = (parents and parents[0]) or nullid
2104 2105 dodiff(ui, ui, repo, prev, n)
2105 2106 ui.write("\n")
2106 2107
2107 2108 def parents(ui, repo, rev=None, branches=None, **opts):
2108 2109 """show the parents of the working dir or revision
2109 2110
2110 2111 Print the working directory's parent revisions.
2111 2112 """
2112 2113 if rev:
2113 2114 p = repo.changelog.parents(repo.lookup(rev))
2114 2115 else:
2115 2116 p = repo.dirstate.parents()
2116 2117
2117 2118 br = None
2118 2119 if branches is not None:
2119 2120 br = repo.branchlookup(p)
2120 2121 displayer = show_changeset(ui, repo, opts)
2121 2122 for n in p:
2122 2123 if n != nullid:
2123 2124 displayer.show(changenode=n, brinfo=br)
2124 2125
2125 2126 def paths(ui, repo, search=None):
2126 2127 """show definition of symbolic path names
2127 2128
2128 2129 Show definition of symbolic path name NAME. If no name is given, show
2129 2130 definition of available names.
2130 2131
2131 2132 Path names are defined in the [paths] section of /etc/mercurial/hgrc
2132 2133 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
2133 2134 """
2134 2135 if search:
2135 2136 for name, path in ui.configitems("paths"):
2136 2137 if name == search:
2137 2138 ui.write("%s\n" % path)
2138 2139 return
2139 2140 ui.warn(_("not found!\n"))
2140 2141 return 1
2141 2142 else:
2142 2143 for name, path in ui.configitems("paths"):
2143 2144 ui.write("%s = %s\n" % (name, path))
2144 2145
2145 2146 def postincoming(ui, repo, modheads, optupdate):
2146 2147 if modheads == 0:
2147 2148 return
2148 2149 if optupdate:
2149 2150 if modheads == 1:
2150 2151 return doupdate(ui, repo)
2151 2152 else:
2152 2153 ui.status(_("not updating, since new heads added\n"))
2153 2154 if modheads > 1:
2154 2155 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2155 2156 else:
2156 2157 ui.status(_("(run 'hg update' to get a working copy)\n"))
2157 2158
2158 2159 def pull(ui, repo, source="default", **opts):
2159 2160 """pull changes from the specified source
2160 2161
2161 2162 Pull changes from a remote repository to a local one.
2162 2163
2163 2164 This finds all changes from the repository at the specified path
2164 2165 or URL and adds them to the local repository. By default, this
2165 2166 does not update the copy of the project in the working directory.
2166 2167
2167 2168 Valid URLs are of the form:
2168 2169
2169 2170 local/filesystem/path
2170 2171 http://[user@]host[:port][/path]
2171 2172 https://[user@]host[:port][/path]
2172 2173 ssh://[user@]host[:port][/path]
2173 2174
2174 2175 Some notes about using SSH with Mercurial:
2175 2176 - SSH requires an accessible shell account on the destination machine
2176 2177 and a copy of hg in the remote path or specified with as remotecmd.
2177 2178 - /path is relative to the remote user's home directory by default.
2178 2179 Use two slashes at the start of a path to specify an absolute path.
2179 2180 - Mercurial doesn't use its own compression via SSH; the right thing
2180 2181 to do is to configure it in your ~/.ssh/ssh_config, e.g.:
2181 2182 Host *.mylocalnetwork.example.com
2182 2183 Compression off
2183 2184 Host *
2184 2185 Compression on
2185 2186 Alternatively specify "ssh -C" as your ssh command in your hgrc or
2186 2187 with the --ssh command line option.
2187 2188 """
2188 2189 source = ui.expandpath(source)
2189 2190
2190 2191 if opts['ssh']:
2191 2192 ui.setconfig("ui", "ssh", opts['ssh'])
2192 2193 if opts['remotecmd']:
2193 2194 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2194 2195
2195 2196 other = hg.repository(ui, source)
2196 2197 ui.status(_('pulling from %s\n') % (source))
2197 2198 revs = None
2198 2199 if opts['rev'] and not other.local():
2199 2200 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
2200 2201 elif opts['rev']:
2201 2202 revs = [other.lookup(rev) for rev in opts['rev']]
2202 2203 modheads = repo.pull(other, heads=revs, force=opts['force'])
2203 2204 return postincoming(ui, repo, modheads, opts['update'])
2204 2205
2205 2206 def push(ui, repo, dest=None, **opts):
2206 2207 """push changes to the specified destination
2207 2208
2208 2209 Push changes from the local repository to the given destination.
2209 2210
2210 2211 This is the symmetrical operation for pull. It helps to move
2211 2212 changes from the current repository to a different one. If the
2212 2213 destination is local this is identical to a pull in that directory
2213 2214 from the current one.
2214 2215
2215 2216 By default, push will refuse to run if it detects the result would
2216 2217 increase the number of remote heads. This generally indicates the
2217 2218 the client has forgotten to sync and merge before pushing.
2218 2219
2219 2220 Valid URLs are of the form:
2220 2221
2221 2222 local/filesystem/path
2222 2223 ssh://[user@]host[:port][/path]
2223 2224
2224 2225 Look at the help text for the pull command for important details
2225 2226 about ssh:// URLs.
2226 2227 """
2227 2228 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2228 2229
2229 2230 if opts['ssh']:
2230 2231 ui.setconfig("ui", "ssh", opts['ssh'])
2231 2232 if opts['remotecmd']:
2232 2233 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2233 2234
2234 2235 other = hg.repository(ui, dest)
2235 2236 ui.status('pushing to %s\n' % (dest))
2236 2237 revs = None
2237 2238 if opts['rev']:
2238 2239 revs = [repo.lookup(rev) for rev in opts['rev']]
2239 2240 r = repo.push(other, opts['force'], revs=revs)
2240 2241 return r == 0
2241 2242
2242 2243 def rawcommit(ui, repo, *flist, **rc):
2243 2244 """raw commit interface (DEPRECATED)
2244 2245
2245 2246 (DEPRECATED)
2246 2247 Lowlevel commit, for use in helper scripts.
2247 2248
2248 2249 This command is not intended to be used by normal users, as it is
2249 2250 primarily useful for importing from other SCMs.
2250 2251
2251 2252 This command is now deprecated and will be removed in a future
2252 2253 release, please use debugsetparents and commit instead.
2253 2254 """
2254 2255
2255 2256 ui.warn(_("(the rawcommit command is deprecated)\n"))
2256 2257
2257 2258 message = rc['message']
2258 2259 if not message and rc['logfile']:
2259 2260 try:
2260 2261 message = open(rc['logfile']).read()
2261 2262 except IOError:
2262 2263 pass
2263 2264 if not message and not rc['logfile']:
2264 2265 raise util.Abort(_("missing commit message"))
2265 2266
2266 2267 files = relpath(repo, list(flist))
2267 2268 if rc['files']:
2268 2269 files += open(rc['files']).read().splitlines()
2269 2270
2270 2271 rc['parent'] = map(repo.lookup, rc['parent'])
2271 2272
2272 2273 try:
2273 2274 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
2274 2275 except ValueError, inst:
2275 2276 raise util.Abort(str(inst))
2276 2277
2277 2278 def recover(ui, repo):
2278 2279 """roll back an interrupted transaction
2279 2280
2280 2281 Recover from an interrupted commit or pull.
2281 2282
2282 2283 This command tries to fix the repository status after an interrupted
2283 2284 operation. It should only be necessary when Mercurial suggests it.
2284 2285 """
2285 2286 if repo.recover():
2286 2287 return repo.verify()
2287 2288 return 1
2288 2289
2289 2290 def remove(ui, repo, *pats, **opts):
2290 2291 """remove the specified files on the next commit
2291 2292
2292 2293 Schedule the indicated files for removal from the repository.
2293 2294
2294 2295 This command schedules the files to be removed at the next commit.
2295 2296 This only removes files from the current branch, not from the
2296 2297 entire project history. If the files still exist in the working
2297 2298 directory, they will be deleted from it. If invoked with --after,
2298 2299 files that have been manually deleted are marked as removed.
2299 2300
2300 2301 Modified files and added files are not removed by default. To
2301 2302 remove them, use the -f/--force option.
2302 2303 """
2303 2304 names = []
2304 2305 if not opts['after'] and not pats:
2305 2306 raise util.Abort(_('no files specified'))
2306 2307 files, matchfn, anypats = matchpats(repo, pats, opts)
2307 2308 exact = dict.fromkeys(files)
2308 2309 mardu = map(dict.fromkeys, repo.changes(files=files, match=matchfn))
2309 2310 modified, added, removed, deleted, unknown = mardu
2310 2311 remove, forget = [], []
2311 2312 for src, abs, rel, exact in walk(repo, pats, opts):
2312 2313 reason = None
2313 2314 if abs not in deleted and opts['after']:
2314 2315 reason = _('is still present')
2315 2316 elif abs in modified and not opts['force']:
2316 2317 reason = _('is modified (use -f to force removal)')
2317 2318 elif abs in added:
2318 2319 if opts['force']:
2319 2320 forget.append(abs)
2320 2321 continue
2321 2322 reason = _('has been marked for add (use -f to force removal)')
2322 2323 elif abs in unknown:
2323 2324 reason = _('is not managed')
2324 2325 elif abs in removed:
2325 2326 continue
2326 2327 if reason:
2327 2328 if exact:
2328 2329 ui.warn(_('not removing %s: file %s\n') % (rel, reason))
2329 2330 else:
2330 2331 if ui.verbose or not exact:
2331 2332 ui.status(_('removing %s\n') % rel)
2332 2333 remove.append(abs)
2333 2334 repo.forget(forget)
2334 2335 repo.remove(remove, unlink=not opts['after'])
2335 2336
2336 2337 def rename(ui, repo, *pats, **opts):
2337 2338 """rename files; equivalent of copy + remove
2338 2339
2339 2340 Mark dest as copies of sources; mark sources for deletion. If
2340 2341 dest is a directory, copies are put in that directory. If dest is
2341 2342 a file, there can only be one source.
2342 2343
2343 2344 By default, this command copies the contents of files as they
2344 2345 stand in the working directory. If invoked with --after, the
2345 2346 operation is recorded, but no copying is performed.
2346 2347
2347 2348 This command takes effect in the next commit.
2348 2349
2349 2350 NOTE: This command should be treated as experimental. While it
2350 2351 should properly record rename files, this information is not yet
2351 2352 fully used by merge, nor fully reported by log.
2352 2353 """
2353 2354 wlock = repo.wlock(0)
2354 2355 errs, copied = docopy(ui, repo, pats, opts, wlock)
2355 2356 names = []
2356 2357 for abs, rel, exact in copied:
2357 2358 if ui.verbose or not exact:
2358 2359 ui.status(_('removing %s\n') % rel)
2359 2360 names.append(abs)
2360 2361 if not opts.get('dry_run'):
2361 2362 repo.remove(names, True, wlock)
2362 2363 return errs
2363 2364
2364 2365 def revert(ui, repo, *pats, **opts):
2365 2366 """revert files or dirs to their states as of some revision
2366 2367
2367 2368 With no revision specified, revert the named files or directories
2368 2369 to the contents they had in the parent of the working directory.
2369 2370 This restores the contents of the affected files to an unmodified
2370 2371 state. If the working directory has two parents, you must
2371 2372 explicitly specify the revision to revert to.
2372 2373
2373 2374 Modified files are saved with a .orig suffix before reverting.
2374 2375 To disable these backups, use --no-backup.
2375 2376
2376 2377 Using the -r option, revert the given files or directories to
2377 2378 their contents as of a specific revision. This can be helpful to"roll
2378 2379 back" some or all of a change that should not have been committed.
2379 2380
2380 2381 Revert modifies the working directory. It does not commit any
2381 2382 changes, or change the parent of the working directory. If you
2382 2383 revert to a revision other than the parent of the working
2383 2384 directory, the reverted files will thus appear modified
2384 2385 afterwards.
2385 2386
2386 2387 If a file has been deleted, it is recreated. If the executable
2387 2388 mode of a file was changed, it is reset.
2388 2389
2389 2390 If names are given, all files matching the names are reverted.
2390 2391
2391 2392 If no arguments are given, all files in the repository are reverted.
2392 2393 """
2393 2394 parent, p2 = repo.dirstate.parents()
2394 2395 if opts['rev']:
2395 2396 node = repo.lookup(opts['rev'])
2396 2397 elif p2 != nullid:
2397 2398 raise util.Abort(_('working dir has two parents; '
2398 2399 'you must specify the revision to revert to'))
2399 2400 else:
2400 2401 node = parent
2401 2402 mf = repo.manifest.read(repo.changelog.read(node)[0])
2402 2403 if node == parent:
2403 2404 pmf = mf
2404 2405 else:
2405 2406 pmf = None
2406 2407
2407 2408 wlock = repo.wlock()
2408 2409
2409 2410 # need all matching names in dirstate and manifest of target rev,
2410 2411 # so have to walk both. do not print errors if files exist in one
2411 2412 # but not other.
2412 2413
2413 2414 names = {}
2414 2415 target_only = {}
2415 2416
2416 2417 # walk dirstate.
2417 2418
2418 2419 for src, abs, rel, exact in walk(repo, pats, opts, badmatch=mf.has_key):
2419 2420 names[abs] = (rel, exact)
2420 2421 if src == 'b':
2421 2422 target_only[abs] = True
2422 2423
2423 2424 # walk target manifest.
2424 2425
2425 2426 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
2426 2427 badmatch=names.has_key):
2427 2428 if abs in names: continue
2428 2429 names[abs] = (rel, exact)
2429 2430 target_only[abs] = True
2430 2431
2431 2432 changes = repo.changes(match=names.has_key, wlock=wlock)
2432 2433 modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
2433 2434
2434 2435 revert = ([], _('reverting %s\n'))
2435 2436 add = ([], _('adding %s\n'))
2436 2437 remove = ([], _('removing %s\n'))
2437 2438 forget = ([], _('forgetting %s\n'))
2438 2439 undelete = ([], _('undeleting %s\n'))
2439 2440 update = {}
2440 2441
2441 2442 disptable = (
2442 2443 # dispatch table:
2443 2444 # file state
2444 2445 # action if in target manifest
2445 2446 # action if not in target manifest
2446 2447 # make backup if in target manifest
2447 2448 # make backup if not in target manifest
2448 2449 (modified, revert, remove, True, True),
2449 2450 (added, revert, forget, True, False),
2450 2451 (removed, undelete, None, False, False),
2451 2452 (deleted, revert, remove, False, False),
2452 2453 (unknown, add, None, True, False),
2453 2454 (target_only, add, None, False, False),
2454 2455 )
2455 2456
2456 2457 entries = names.items()
2457 2458 entries.sort()
2458 2459
2459 2460 for abs, (rel, exact) in entries:
2460 2461 mfentry = mf.get(abs)
2461 2462 def handle(xlist, dobackup):
2462 2463 xlist[0].append(abs)
2463 2464 update[abs] = 1
2464 2465 if dobackup and not opts['no_backup'] and os.path.exists(rel):
2465 2466 bakname = "%s.orig" % rel
2466 2467 ui.note(_('saving current version of %s as %s\n') %
2467 2468 (rel, bakname))
2468 2469 if not opts.get('dry_run'):
2469 2470 shutil.copyfile(rel, bakname)
2470 2471 shutil.copymode(rel, bakname)
2471 2472 if ui.verbose or not exact:
2472 2473 ui.status(xlist[1] % rel)
2473 2474 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2474 2475 if abs not in table: continue
2475 2476 # file has changed in dirstate
2476 2477 if mfentry:
2477 2478 handle(hitlist, backuphit)
2478 2479 elif misslist is not None:
2479 2480 handle(misslist, backupmiss)
2480 2481 else:
2481 2482 if exact: ui.warn(_('file not managed: %s\n' % rel))
2482 2483 break
2483 2484 else:
2484 2485 # file has not changed in dirstate
2485 2486 if node == parent:
2486 2487 if exact: ui.warn(_('no changes needed to %s\n' % rel))
2487 2488 continue
2488 2489 if pmf is None:
2489 2490 # only need parent manifest in this unlikely case,
2490 2491 # so do not read by default
2491 2492 pmf = repo.manifest.read(repo.changelog.read(parent)[0])
2492 2493 if abs in pmf:
2493 2494 if mfentry:
2494 2495 # if version of file is same in parent and target
2495 2496 # manifests, do nothing
2496 2497 if pmf[abs] != mfentry:
2497 2498 handle(revert, False)
2498 2499 else:
2499 2500 handle(remove, False)
2500 2501
2501 2502 if not opts.get('dry_run'):
2502 2503 repo.dirstate.forget(forget[0])
2503 2504 r = repo.update(node, False, True, update.has_key, False, wlock=wlock,
2504 2505 show_stats=False)
2505 2506 repo.dirstate.update(add[0], 'a')
2506 2507 repo.dirstate.update(undelete[0], 'n')
2507 2508 repo.dirstate.update(remove[0], 'r')
2508 2509 return r
2509 2510
2510 2511 def rollback(ui, repo):
2511 2512 """roll back the last transaction in this repository
2512 2513
2513 2514 Roll back the last transaction in this repository, restoring the
2514 2515 project to its state prior to the transaction.
2515 2516
2516 2517 Transactions are used to encapsulate the effects of all commands
2517 2518 that create new changesets or propagate existing changesets into a
2518 2519 repository. For example, the following commands are transactional,
2519 2520 and their effects can be rolled back:
2520 2521
2521 2522 commit
2522 2523 import
2523 2524 pull
2524 2525 push (with this repository as destination)
2525 2526 unbundle
2526 2527
2527 2528 This command should be used with care. There is only one level of
2528 2529 rollback, and there is no way to undo a rollback.
2529 2530
2530 2531 This command is not intended for use on public repositories. Once
2531 2532 changes are visible for pull by other users, rolling a transaction
2532 2533 back locally is ineffective (someone else may already have pulled
2533 2534 the changes). Furthermore, a race is possible with readers of the
2534 2535 repository; for example an in-progress pull from the repository
2535 2536 may fail if a rollback is performed.
2536 2537 """
2537 2538 repo.rollback()
2538 2539
2539 2540 def root(ui, repo):
2540 2541 """print the root (top) of the current working dir
2541 2542
2542 2543 Print the root directory of the current repository.
2543 2544 """
2544 2545 ui.write(repo.root + "\n")
2545 2546
2546 2547 def serve(ui, repo, **opts):
2547 2548 """export the repository via HTTP
2548 2549
2549 2550 Start a local HTTP repository browser and pull server.
2550 2551
2551 2552 By default, the server logs accesses to stdout and errors to
2552 2553 stderr. Use the "-A" and "-E" options to log to files.
2553 2554 """
2554 2555
2555 2556 if opts["stdio"]:
2556 2557 if repo is None:
2557 2558 raise hg.RepoError(_('no repo found'))
2558 2559 s = sshserver.sshserver(ui, repo)
2559 2560 s.serve_forever()
2560 2561
2561 2562 optlist = ("name templates style address port ipv6"
2562 2563 " accesslog errorlog webdir_conf")
2563 2564 for o in optlist.split():
2564 2565 if opts[o]:
2565 2566 ui.setconfig("web", o, opts[o])
2566 2567
2567 2568 if repo is None and not ui.config("web", "webdir_conf"):
2568 2569 raise hg.RepoError(_('no repo found'))
2569 2570
2570 2571 if opts['daemon'] and not opts['daemon_pipefds']:
2571 2572 rfd, wfd = os.pipe()
2572 2573 args = sys.argv[:]
2573 2574 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
2574 2575 pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
2575 2576 args[0], args)
2576 2577 os.close(wfd)
2577 2578 os.read(rfd, 1)
2578 2579 os._exit(0)
2579 2580
2580 2581 try:
2581 2582 httpd = hgweb.server.create_server(ui, repo)
2582 2583 except socket.error, inst:
2583 2584 raise util.Abort(_('cannot start server: ') + inst.args[1])
2584 2585
2585 2586 if ui.verbose:
2586 2587 addr, port = httpd.socket.getsockname()
2587 2588 if addr == '0.0.0.0':
2588 2589 addr = socket.gethostname()
2589 2590 else:
2590 2591 try:
2591 2592 addr = socket.gethostbyaddr(addr)[0]
2592 2593 except socket.error:
2593 2594 pass
2594 2595 if port != 80:
2595 2596 ui.status(_('listening at http://%s:%d/\n') % (addr, port))
2596 2597 else:
2597 2598 ui.status(_('listening at http://%s/\n') % addr)
2598 2599
2599 2600 if opts['pid_file']:
2600 2601 fp = open(opts['pid_file'], 'w')
2601 2602 fp.write(str(os.getpid()))
2602 2603 fp.close()
2603 2604
2604 2605 if opts['daemon_pipefds']:
2605 2606 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
2606 2607 os.close(rfd)
2607 2608 os.write(wfd, 'y')
2608 2609 os.close(wfd)
2609 2610 sys.stdout.flush()
2610 2611 sys.stderr.flush()
2611 2612 fd = os.open(util.nulldev, os.O_RDWR)
2612 2613 if fd != 0: os.dup2(fd, 0)
2613 2614 if fd != 1: os.dup2(fd, 1)
2614 2615 if fd != 2: os.dup2(fd, 2)
2615 2616 if fd not in (0, 1, 2): os.close(fd)
2616 2617
2617 2618 httpd.serve_forever()
2618 2619
2619 2620 def status(ui, repo, *pats, **opts):
2620 2621 """show changed files in the working directory
2621 2622
2622 2623 Show changed files in the repository. If names are
2623 2624 given, only files that match are shown.
2624 2625
2625 2626 The codes used to show the status of files are:
2626 2627 M = modified
2627 2628 A = added
2628 2629 R = removed
2629 2630 ! = deleted, but still tracked
2630 2631 ? = not tracked
2631 2632 I = ignored (not shown by default)
2632 2633 """
2633 2634
2634 2635 show_ignored = opts['ignored'] and True or False
2635 2636 files, matchfn, anypats = matchpats(repo, pats, opts)
2636 2637 cwd = (pats and repo.getcwd()) or ''
2637 2638 modified, added, removed, deleted, unknown, ignored = [
2638 2639 [util.pathto(cwd, x) for x in n]
2639 2640 for n in repo.changes(files=files, match=matchfn,
2640 2641 show_ignored=show_ignored)]
2641 2642
2642 2643 changetypes = [('modified', 'M', modified),
2643 2644 ('added', 'A', added),
2644 2645 ('removed', 'R', removed),
2645 2646 ('deleted', '!', deleted),
2646 2647 ('unknown', '?', unknown),
2647 2648 ('ignored', 'I', ignored)]
2648 2649
2649 2650 end = opts['print0'] and '\0' or '\n'
2650 2651
2651 2652 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
2652 2653 or changetypes):
2653 2654 if opts['no_status']:
2654 2655 format = "%%s%s" % end
2655 2656 else:
2656 2657 format = "%s %%s%s" % (char, end)
2657 2658
2658 2659 for f in changes:
2659 2660 ui.write(format % f)
2660 2661
2661 2662 def tag(ui, repo, name, rev_=None, **opts):
2662 2663 """add a tag for the current tip or a given revision
2663 2664
2664 2665 Name a particular revision using <name>.
2665 2666
2666 2667 Tags are used to name particular revisions of the repository and are
2667 2668 very useful to compare different revision, to go back to significant
2668 2669 earlier versions or to mark branch points as releases, etc.
2669 2670
2670 2671 If no revision is given, the tip is used.
2671 2672
2672 2673 To facilitate version control, distribution, and merging of tags,
2673 2674 they are stored as a file named ".hgtags" which is managed
2674 2675 similarly to other project files and can be hand-edited if
2675 2676 necessary. The file '.hg/localtags' is used for local tags (not
2676 2677 shared among repositories).
2677 2678 """
2678 2679 if name == "tip":
2679 2680 raise util.Abort(_("the name 'tip' is reserved"))
2680 2681 if rev_ is not None:
2681 2682 ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
2682 2683 "please use 'hg tag [-r REV] NAME' instead\n"))
2683 2684 if opts['rev']:
2684 2685 raise util.Abort(_("use only one form to specify the revision"))
2685 2686 if opts['rev']:
2686 2687 rev_ = opts['rev']
2687 2688 if rev_:
2688 2689 r = hex(repo.lookup(rev_))
2689 2690 else:
2690 2691 r = hex(repo.changelog.tip())
2691 2692
2692 2693 disallowed = (revrangesep, '\r', '\n')
2693 2694 for c in disallowed:
2694 2695 if name.find(c) >= 0:
2695 2696 raise util.Abort(_("%s cannot be used in a tag name") % repr(c))
2696 2697
2697 2698 repo.hook('pretag', throw=True, node=r, tag=name,
2698 2699 local=int(not not opts['local']))
2699 2700
2700 2701 if opts['local']:
2701 2702 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
2702 2703 repo.hook('tag', node=r, tag=name, local=1)
2703 2704 return
2704 2705
2705 2706 for x in repo.changes():
2706 2707 if ".hgtags" in x:
2707 2708 raise util.Abort(_("working copy of .hgtags is changed "
2708 2709 "(please commit .hgtags manually)"))
2709 2710
2710 2711 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
2711 2712 if repo.dirstate.state(".hgtags") == '?':
2712 2713 repo.add([".hgtags"])
2713 2714
2714 2715 message = (opts['message'] or
2715 2716 _("Added tag %s for changeset %s") % (name, r))
2716 2717 try:
2717 2718 repo.commit([".hgtags"], message, opts['user'], opts['date'])
2718 2719 repo.hook('tag', node=r, tag=name, local=0)
2719 2720 except ValueError, inst:
2720 2721 raise util.Abort(str(inst))
2721 2722
2722 2723 def tags(ui, repo):
2723 2724 """list repository tags
2724 2725
2725 2726 List the repository tags.
2726 2727
2727 2728 This lists both regular and local tags.
2728 2729 """
2729 2730
2730 2731 l = repo.tagslist()
2731 2732 l.reverse()
2732 2733 for t, n in l:
2733 2734 try:
2734 2735 r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
2735 2736 except KeyError:
2736 2737 r = " ?:?"
2737 2738 if ui.quiet:
2738 2739 ui.write("%s\n" % t)
2739 2740 else:
2740 2741 ui.write("%-30s %s\n" % (t, r))
2741 2742
2742 2743 def tip(ui, repo, **opts):
2743 2744 """show the tip revision
2744 2745
2745 2746 Show the tip revision.
2746 2747 """
2747 2748 n = repo.changelog.tip()
2748 2749 br = None
2749 2750 if opts['branches']:
2750 2751 br = repo.branchlookup([n])
2751 2752 show_changeset(ui, repo, opts).show(changenode=n, brinfo=br)
2752 2753 if opts['patch']:
2753 2754 dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)
2754 2755
2755 2756 def unbundle(ui, repo, fname, **opts):
2756 2757 """apply a changegroup file
2757 2758
2758 2759 Apply a compressed changegroup file generated by the bundle
2759 2760 command.
2760 2761 """
2761 2762 f = urllib.urlopen(fname)
2762 2763
2763 2764 header = f.read(6)
2764 2765 if not header.startswith("HG"):
2765 2766 raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
2766 2767 elif not header.startswith("HG10"):
2767 2768 raise util.Abort(_("%s: unknown bundle version") % fname)
2768 2769 elif header == "HG10BZ":
2769 2770 def generator(f):
2770 2771 zd = bz2.BZ2Decompressor()
2771 2772 zd.decompress("BZ")
2772 2773 for chunk in f:
2773 2774 yield zd.decompress(chunk)
2774 2775 elif header == "HG10UN":
2775 2776 def generator(f):
2776 2777 for chunk in f:
2777 2778 yield chunk
2778 2779 else:
2779 2780 raise util.Abort(_("%s: unknown bundle compression type")
2780 2781 % fname)
2781 2782 gen = generator(util.filechunkiter(f, 4096))
2782 2783 modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle')
2783 2784 return postincoming(ui, repo, modheads, opts['update'])
2784 2785
2785 2786 def undo(ui, repo):
2786 2787 """undo the last commit or pull (DEPRECATED)
2787 2788
2788 2789 (DEPRECATED)
2789 2790 This command is now deprecated and will be removed in a future
2790 2791 release. Please use the rollback command instead. For usage
2791 2792 instructions, see the rollback command.
2792 2793 """
2793 2794 ui.warn(_('(the undo command is deprecated; use rollback instead)\n'))
2794 2795 repo.rollback()
2795 2796
2796 2797 def update(ui, repo, node=None, merge=False, clean=False, force=None,
2797 2798 branch=None, **opts):
2798 2799 """update or merge working directory
2799 2800
2800 2801 Update the working directory to the specified revision.
2801 2802
2802 2803 If there are no outstanding changes in the working directory and
2803 2804 there is a linear relationship between the current version and the
2804 2805 requested version, the result is the requested version.
2805 2806
2806 2807 To merge the working directory with another revision, use the
2807 2808 merge command.
2808 2809
2809 2810 By default, update will refuse to run if doing so would require
2810 2811 merging or discarding local changes.
2811 2812 """
2812 2813 if merge:
2813 2814 ui.warn(_('(the -m/--merge option is deprecated; '
2814 2815 'use the merge command instead)\n'))
2815 2816 return doupdate(ui, repo, node, merge, clean, force, branch, **opts)
2816 2817
2817 2818 def doupdate(ui, repo, node=None, merge=False, clean=False, force=None,
2818 2819 branch=None, **opts):
2819 2820 if branch:
2820 2821 br = repo.branchlookup(branch=branch)
2821 2822 found = []
2822 2823 for x in br:
2823 2824 if branch in br[x]:
2824 2825 found.append(x)
2825 2826 if len(found) > 1:
2826 2827 ui.warn(_("Found multiple heads for %s\n") % branch)
2827 2828 for x in found:
2828 2829 show_changeset(ui, repo, opts).show(changenode=x, brinfo=br)
2829 2830 return 1
2830 2831 if len(found) == 1:
2831 2832 node = found[0]
2832 2833 ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))
2833 2834 else:
2834 2835 ui.warn(_("branch %s not found\n") % (branch))
2835 2836 return 1
2836 2837 else:
2837 2838 node = node and repo.lookup(node) or repo.changelog.tip()
2838 2839 return repo.update(node, allow=merge, force=clean, forcemerge=force)
2839 2840
2840 2841 def verify(ui, repo):
2841 2842 """verify the integrity of the repository
2842 2843
2843 2844 Verify the integrity of the current repository.
2844 2845
2845 2846 This will perform an extensive check of the repository's
2846 2847 integrity, validating the hashes and checksums of each entry in
2847 2848 the changelog, manifest, and tracked files, as well as the
2848 2849 integrity of their crosslinks and indices.
2849 2850 """
2850 2851 return repo.verify()
2851 2852
2852 2853 # Command options and aliases are listed here, alphabetically
2853 2854
2854 2855 table = {
2855 2856 "^add":
2856 2857 (add,
2857 2858 [('I', 'include', [], _('include names matching the given patterns')),
2858 2859 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2859 2860 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2860 2861 _('hg add [OPTION]... [FILE]...')),
2861 2862 "debugaddremove|addremove":
2862 2863 (addremove,
2863 2864 [('I', 'include', [], _('include names matching the given patterns')),
2864 2865 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2865 2866 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2866 2867 _('hg addremove [OPTION]... [FILE]...')),
2867 2868 "^annotate":
2868 2869 (annotate,
2869 2870 [('r', 'rev', '', _('annotate the specified revision')),
2870 2871 ('a', 'text', None, _('treat all files as text')),
2871 2872 ('u', 'user', None, _('list the author')),
2872 2873 ('d', 'date', None, _('list the date')),
2873 2874 ('n', 'number', None, _('list the revision number (default)')),
2874 2875 ('c', 'changeset', None, _('list the changeset')),
2875 2876 ('I', 'include', [], _('include names matching the given patterns')),
2876 2877 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2877 2878 _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),
2878 2879 "archive":
2879 2880 (archive,
2880 2881 [('', 'no-decode', None, _('do not pass files through decoders')),
2881 2882 ('p', 'prefix', '', _('directory prefix for files in archive')),
2882 2883 ('r', 'rev', '', _('revision to distribute')),
2883 2884 ('t', 'type', '', _('type of distribution to create')),
2884 2885 ('I', 'include', [], _('include names matching the given patterns')),
2885 2886 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2886 2887 _('hg archive [OPTION]... DEST')),
2887 2888 "backout":
2888 2889 (backout,
2889 2890 [('', 'merge', None,
2890 2891 _('merge with old dirstate parent after backout')),
2891 2892 ('m', 'message', '', _('use <text> as commit message')),
2892 2893 ('l', 'logfile', '', _('read commit message from <file>')),
2893 2894 ('d', 'date', '', _('record datecode as commit date')),
2894 2895 ('u', 'user', '', _('record user as committer')),
2895 2896 ('I', 'include', [], _('include names matching the given patterns')),
2896 2897 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2897 2898 _('hg backout [OPTION]... REV')),
2898 2899 "bundle":
2899 2900 (bundle,
2900 2901 [('f', 'force', None,
2901 2902 _('run even when remote repository is unrelated'))],
2902 2903 _('hg bundle FILE DEST')),
2903 2904 "cat":
2904 2905 (cat,
2905 2906 [('o', 'output', '', _('print output to file with formatted name')),
2906 2907 ('r', 'rev', '', _('print the given revision')),
2907 2908 ('I', 'include', [], _('include names matching the given patterns')),
2908 2909 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2909 2910 _('hg cat [OPTION]... FILE...')),
2910 2911 "^clone":
2911 2912 (clone,
2912 2913 [('U', 'noupdate', None, _('do not update the new working directory')),
2913 2914 ('r', 'rev', [],
2914 2915 _('a changeset you would like to have after cloning')),
2915 2916 ('', 'pull', None, _('use pull protocol to copy metadata')),
2916 2917 ('e', 'ssh', '', _('specify ssh command to use')),
2917 2918 ('', 'remotecmd', '',
2918 2919 _('specify hg command to run on the remote side'))],
2919 2920 _('hg clone [OPTION]... SOURCE [DEST]')),
2920 2921 "^commit|ci":
2921 2922 (commit,
2922 2923 [('A', 'addremove', None,
2923 2924 _('mark new/missing files as added/removed before committing')),
2924 2925 ('m', 'message', '', _('use <text> as commit message')),
2925 2926 ('l', 'logfile', '', _('read the commit message from <file>')),
2926 2927 ('d', 'date', '', _('record datecode as commit date')),
2927 2928 ('u', 'user', '', _('record user as commiter')),
2928 2929 ('I', 'include', [], _('include names matching the given patterns')),
2929 2930 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2930 2931 _('hg commit [OPTION]... [FILE]...')),
2931 2932 "copy|cp":
2932 2933 (copy,
2933 2934 [('A', 'after', None, _('record a copy that has already occurred')),
2934 2935 ('f', 'force', None,
2935 2936 _('forcibly copy over an existing managed file')),
2936 2937 ('I', 'include', [], _('include names matching the given patterns')),
2937 2938 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2938 2939 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2939 2940 _('hg copy [OPTION]... [SOURCE]... DEST')),
2940 2941 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
2941 2942 "debugcomplete":
2942 2943 (debugcomplete,
2943 2944 [('o', 'options', None, _('show the command options'))],
2944 2945 _('debugcomplete [-o] CMD')),
2945 2946 "debugrebuildstate":
2946 2947 (debugrebuildstate,
2947 2948 [('r', 'rev', '', _('revision to rebuild to'))],
2948 2949 _('debugrebuildstate [-r REV] [REV]')),
2949 2950 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
2950 2951 "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')),
2951 2952 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
2952 2953 "debugstate": (debugstate, [], _('debugstate')),
2953 2954 "debugdata": (debugdata, [], _('debugdata FILE REV')),
2954 2955 "debugindex": (debugindex, [], _('debugindex FILE')),
2955 2956 "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),
2956 2957 "debugrename": (debugrename, [], _('debugrename FILE [REV]')),
2957 2958 "debugwalk":
2958 2959 (debugwalk,
2959 2960 [('I', 'include', [], _('include names matching the given patterns')),
2960 2961 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2961 2962 _('debugwalk [OPTION]... [FILE]...')),
2962 2963 "^diff":
2963 2964 (diff,
2964 2965 [('r', 'rev', [], _('revision')),
2965 2966 ('a', 'text', None, _('treat all files as text')),
2966 2967 ('p', 'show-function', None,
2967 2968 _('show which function each change is in')),
2968 2969 ('w', 'ignore-all-space', None,
2969 2970 _('ignore white space when comparing lines')),
2970 2971 ('I', 'include', [], _('include names matching the given patterns')),
2971 2972 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2972 2973 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
2973 2974 "^export":
2974 2975 (export,
2975 2976 [('o', 'output', '', _('print output to file with formatted name')),
2976 2977 ('a', 'text', None, _('treat all files as text')),
2977 2978 ('', 'switch-parent', None, _('diff against the second parent'))],
2978 2979 _('hg export [-a] [-o OUTFILESPEC] REV...')),
2979 2980 "debugforget|forget":
2980 2981 (forget,
2981 2982 [('I', 'include', [], _('include names matching the given patterns')),
2982 2983 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2983 2984 _('hg forget [OPTION]... FILE...')),
2984 2985 "grep":
2985 2986 (grep,
2986 2987 [('0', 'print0', None, _('end fields with NUL')),
2987 2988 ('', 'all', None, _('print all revisions that match')),
2988 2989 ('i', 'ignore-case', None, _('ignore case when matching')),
2989 2990 ('l', 'files-with-matches', None,
2990 2991 _('print only filenames and revs that match')),
2991 2992 ('n', 'line-number', None, _('print matching line numbers')),
2992 2993 ('r', 'rev', [], _('search in given revision range')),
2993 2994 ('u', 'user', None, _('print user who committed change')),
2994 2995 ('I', 'include', [], _('include names matching the given patterns')),
2995 2996 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2996 2997 _('hg grep [OPTION]... PATTERN [FILE]...')),
2997 2998 "heads":
2998 2999 (heads,
2999 3000 [('b', 'branches', None, _('show branches')),
3000 3001 ('', 'style', '', _('display using template map file')),
3001 3002 ('r', 'rev', '', _('show only heads which are descendants of rev')),
3002 3003 ('', 'template', '', _('display with template'))],
3003 3004 _('hg heads [-b] [-r <rev>]')),
3004 3005 "help": (help_, [], _('hg help [COMMAND]')),
3005 3006 "identify|id": (identify, [], _('hg identify')),
3006 3007 "import|patch":
3007 3008 (import_,
3008 3009 [('p', 'strip', 1,
3009 3010 _('directory strip option for patch. This has the same\n'
3010 3011 'meaning as the corresponding patch option')),
3011 3012 ('m', 'message', '', _('use <text> as commit message')),
3012 3013 ('b', 'base', '', _('base path')),
3013 3014 ('f', 'force', None,
3014 3015 _('skip check for outstanding uncommitted changes'))],
3015 3016 _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')),
3016 3017 "incoming|in": (incoming,
3017 3018 [('M', 'no-merges', None, _('do not show merges')),
3018 3019 ('f', 'force', None,
3019 3020 _('run even when remote repository is unrelated')),
3020 3021 ('', 'style', '', _('display using template map file')),
3021 3022 ('n', 'newest-first', None, _('show newest record first')),
3022 3023 ('', 'bundle', '', _('file to store the bundles into')),
3023 3024 ('p', 'patch', None, _('show patch')),
3024 3025 ('', 'template', '', _('display with template')),
3025 3026 ('e', 'ssh', '', _('specify ssh command to use')),
3026 3027 ('', 'remotecmd', '',
3027 3028 _('specify hg command to run on the remote side'))],
3028 3029 _('hg incoming [-p] [-n] [-M] [--bundle FILENAME] [SOURCE]')),
3029 3030 "^init": (init, [], _('hg init [DEST]')),
3030 3031 "locate":
3031 3032 (locate,
3032 3033 [('r', 'rev', '', _('search the repository as it stood at rev')),
3033 3034 ('0', 'print0', None,
3034 3035 _('end filenames with NUL, for use with xargs')),
3035 3036 ('f', 'fullpath', None,
3036 3037 _('print complete paths from the filesystem root')),
3037 3038 ('I', 'include', [], _('include names matching the given patterns')),
3038 3039 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3039 3040 _('hg locate [OPTION]... [PATTERN]...')),
3040 3041 "^log|history":
3041 3042 (log,
3042 3043 [('b', 'branches', None, _('show branches')),
3043 3044 ('k', 'keyword', [], _('search for a keyword')),
3044 3045 ('l', 'limit', '', _('limit number of changes displayed')),
3045 3046 ('r', 'rev', [], _('show the specified revision or range')),
3046 3047 ('M', 'no-merges', None, _('do not show merges')),
3047 3048 ('', 'style', '', _('display using template map file')),
3048 3049 ('m', 'only-merges', None, _('show only merges')),
3049 3050 ('p', 'patch', None, _('show patch')),
3050 3051 ('', 'template', '', _('display with template')),
3051 3052 ('I', 'include', [], _('include names matching the given patterns')),
3052 3053 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3053 3054 _('hg log [OPTION]... [FILE]')),
3054 3055 "manifest": (manifest, [], _('hg manifest [REV]')),
3055 3056 "merge":
3056 3057 (merge,
3057 3058 [('b', 'branch', '', _('merge with head of a specific branch')),
3058 3059 ('f', 'force', None, _('force a merge with outstanding changes'))],
3059 3060 _('hg merge [-b TAG] [-f] [REV]')),
3060 3061 "outgoing|out": (outgoing,
3061 3062 [('M', 'no-merges', None, _('do not show merges')),
3062 3063 ('f', 'force', None,
3063 3064 _('run even when remote repository is unrelated')),
3064 3065 ('p', 'patch', None, _('show patch')),
3065 3066 ('', 'style', '', _('display using template map file')),
3066 3067 ('n', 'newest-first', None, _('show newest record first')),
3067 3068 ('', 'template', '', _('display with template')),
3068 3069 ('e', 'ssh', '', _('specify ssh command to use')),
3069 3070 ('', 'remotecmd', '',
3070 3071 _('specify hg command to run on the remote side'))],
3071 3072 _('hg outgoing [-M] [-p] [-n] [DEST]')),
3072 3073 "^parents":
3073 3074 (parents,
3074 3075 [('b', 'branches', None, _('show branches')),
3075 3076 ('', 'style', '', _('display using template map file')),
3076 3077 ('', 'template', '', _('display with template'))],
3077 3078 _('hg parents [-b] [REV]')),
3078 3079 "paths": (paths, [], _('hg paths [NAME]')),
3079 3080 "^pull":
3080 3081 (pull,
3081 3082 [('u', 'update', None,
3082 3083 _('update the working directory to tip after pull')),
3083 3084 ('e', 'ssh', '', _('specify ssh command to use')),
3084 3085 ('f', 'force', None,
3085 3086 _('run even when remote repository is unrelated')),
3086 3087 ('r', 'rev', [], _('a specific revision you would like to pull')),
3087 3088 ('', 'remotecmd', '',
3088 3089 _('specify hg command to run on the remote side'))],
3089 3090 _('hg pull [-u] [-e FILE] [-r REV]... [--remotecmd FILE] [SOURCE]')),
3090 3091 "^push":
3091 3092 (push,
3092 3093 [('f', 'force', None, _('force push')),
3093 3094 ('e', 'ssh', '', _('specify ssh command to use')),
3094 3095 ('r', 'rev', [], _('a specific revision you would like to push')),
3095 3096 ('', 'remotecmd', '',
3096 3097 _('specify hg command to run on the remote side'))],
3097 3098 _('hg push [-f] [-e FILE] [-r REV]... [--remotecmd FILE] [DEST]')),
3098 3099 "debugrawcommit|rawcommit":
3099 3100 (rawcommit,
3100 3101 [('p', 'parent', [], _('parent')),
3101 3102 ('d', 'date', '', _('date code')),
3102 3103 ('u', 'user', '', _('user')),
3103 3104 ('F', 'files', '', _('file list')),
3104 3105 ('m', 'message', '', _('commit message')),
3105 3106 ('l', 'logfile', '', _('commit message file'))],
3106 3107 _('hg debugrawcommit [OPTION]... [FILE]...')),
3107 3108 "recover": (recover, [], _('hg recover')),
3108 3109 "^remove|rm":
3109 3110 (remove,
3110 3111 [('A', 'after', None, _('record remove that has already occurred')),
3111 3112 ('f', 'force', None, _('remove file even if modified')),
3112 3113 ('I', 'include', [], _('include names matching the given patterns')),
3113 3114 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3114 3115 _('hg remove [OPTION]... FILE...')),
3115 3116 "rename|mv":
3116 3117 (rename,
3117 3118 [('A', 'after', None, _('record a rename that has already occurred')),
3118 3119 ('f', 'force', None,
3119 3120 _('forcibly copy over an existing managed file')),
3120 3121 ('I', 'include', [], _('include names matching the given patterns')),
3121 3122 ('X', 'exclude', [], _('exclude names matching the given patterns')),
3122 3123 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
3123 3124 _('hg rename [OPTION]... SOURCE... DEST')),
3124 3125 "^revert":
3125 3126 (revert,
3126 3127 [('r', 'rev', '', _('revision to revert to')),
3127 3128 ('', 'no-backup', None, _('do not save backup copies of files')),
3128 3129 ('I', 'include', [], _('include names matching given patterns')),
3129 3130 ('X', 'exclude', [], _('exclude names matching given patterns')),
3130 3131 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
3131 3132 _('hg revert [-r REV] [NAME]...')),
3132 3133 "rollback": (rollback, [], _('hg rollback')),
3133 3134 "root": (root, [], _('hg root')),
3134 3135 "^serve":
3135 3136 (serve,
3136 3137 [('A', 'accesslog', '', _('name of access log file to write to')),
3137 3138 ('d', 'daemon', None, _('run server in background')),
3138 3139 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
3139 3140 ('E', 'errorlog', '', _('name of error log file to write to')),
3140 3141 ('p', 'port', 0, _('port to use (default: 8000)')),
3141 3142 ('a', 'address', '', _('address to use')),
3142 3143 ('n', 'name', '',
3143 3144 _('name to show in web pages (default: working dir)')),
3144 3145 ('', 'webdir-conf', '', _('name of the webdir config file'
3145 3146 ' (serve more than one repo)')),
3146 3147 ('', 'pid-file', '', _('name of file to write process ID to')),
3147 3148 ('', 'stdio', None, _('for remote clients')),
3148 3149 ('t', 'templates', '', _('web templates to use')),
3149 3150 ('', 'style', '', _('template style to use')),
3150 3151 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
3151 3152 _('hg serve [OPTION]...')),
3152 3153 "^status|st":
3153 3154 (status,
3154 3155 [('m', 'modified', None, _('show only modified files')),
3155 3156 ('a', 'added', None, _('show only added files')),
3156 3157 ('r', 'removed', None, _('show only removed files')),
3157 3158 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
3158 3159 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
3159 3160 ('i', 'ignored', None, _('show ignored files')),
3160 3161 ('n', 'no-status', None, _('hide status prefix')),
3161 3162 ('0', 'print0', None,
3162 3163 _('end filenames with NUL, for use with xargs')),
3163 3164 ('I', 'include', [], _('include names matching the given patterns')),
3164 3165 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3165 3166 _('hg status [OPTION]... [FILE]...')),
3166 3167 "tag":
3167 3168 (tag,
3168 3169 [('l', 'local', None, _('make the tag local')),
3169 3170 ('m', 'message', '', _('message for tag commit log entry')),
3170 3171 ('d', 'date', '', _('record datecode as commit date')),
3171 3172 ('u', 'user', '', _('record user as commiter')),
3172 3173 ('r', 'rev', '', _('revision to tag'))],
3173 3174 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),
3174 3175 "tags": (tags, [], _('hg tags')),
3175 3176 "tip":
3176 3177 (tip,
3177 3178 [('b', 'branches', None, _('show branches')),
3178 3179 ('', 'style', '', _('display using template map file')),
3179 3180 ('p', 'patch', None, _('show patch')),
3180 3181 ('', 'template', '', _('display with template'))],
3181 3182 _('hg tip [-b] [-p]')),
3182 3183 "unbundle":
3183 3184 (unbundle,
3184 3185 [('u', 'update', None,
3185 3186 _('update the working directory to tip after unbundle'))],
3186 3187 _('hg unbundle [-u] FILE')),
3187 3188 "debugundo|undo": (undo, [], _('hg undo')),
3188 3189 "^update|up|checkout|co":
3189 3190 (update,
3190 3191 [('b', 'branch', '', _('checkout the head of a specific branch')),
3191 3192 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
3192 3193 ('C', 'clean', None, _('overwrite locally modified files')),
3193 3194 ('f', 'force', None, _('force a merge with outstanding changes'))],
3194 3195 _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
3195 3196 "verify": (verify, [], _('hg verify')),
3196 3197 "version": (show_version, [], _('hg version')),
3197 3198 }
3198 3199
3199 3200 globalopts = [
3200 3201 ('R', 'repository', '',
3201 3202 _('repository root directory or symbolic path name')),
3202 3203 ('', 'cwd', '', _('change working directory')),
3203 3204 ('y', 'noninteractive', None,
3204 3205 _('do not prompt, assume \'yes\' for any required answers')),
3205 3206 ('q', 'quiet', None, _('suppress output')),
3206 3207 ('v', 'verbose', None, _('enable additional output')),
3207 3208 ('', 'config', [], _('set/override config option')),
3208 3209 ('', 'debug', None, _('enable debugging output')),
3209 3210 ('', 'debugger', None, _('start debugger')),
3210 3211 ('', 'lsprof', None, _('print improved command execution profile')),
3211 3212 ('', 'traceback', None, _('print traceback on exception')),
3212 3213 ('', 'time', None, _('time how long the command takes')),
3213 3214 ('', 'profile', None, _('print command execution profile')),
3214 3215 ('', 'version', None, _('output version information and exit')),
3215 3216 ('h', 'help', None, _('display help and exit')),
3216 3217 ]
3217 3218
3218 3219 norepo = ("clone init version help debugancestor debugcomplete debugdata"
3219 3220 " debugindex debugindexdot")
3220 3221 optionalrepo = ("paths serve debugconfig")
3221 3222
3222 3223 def findpossible(cmd):
3223 3224 """
3224 3225 Return cmd -> (aliases, command table entry)
3225 3226 for each matching command.
3226 3227 Return debug commands (or their aliases) only if no normal command matches.
3227 3228 """
3228 3229 choice = {}
3229 3230 debugchoice = {}
3230 3231 for e in table.keys():
3231 3232 aliases = e.lstrip("^").split("|")
3232 3233 found = None
3233 3234 if cmd in aliases:
3234 3235 found = cmd
3235 3236 else:
3236 3237 for a in aliases:
3237 3238 if a.startswith(cmd):
3238 3239 found = a
3239 3240 break
3240 3241 if found is not None:
3241 3242 if aliases[0].startswith("debug"):
3242 3243 debugchoice[found] = (aliases, table[e])
3243 3244 else:
3244 3245 choice[found] = (aliases, table[e])
3245 3246
3246 3247 if not choice and debugchoice:
3247 3248 choice = debugchoice
3248 3249
3249 3250 return choice
3250 3251
3251 3252 def find(cmd):
3252 3253 """Return (aliases, command table entry) for command string."""
3253 3254 choice = findpossible(cmd)
3254 3255
3255 3256 if choice.has_key(cmd):
3256 3257 return choice[cmd]
3257 3258
3258 3259 if len(choice) > 1:
3259 3260 clist = choice.keys()
3260 3261 clist.sort()
3261 3262 raise AmbiguousCommand(cmd, clist)
3262 3263
3263 3264 if choice:
3264 3265 return choice.values()[0]
3265 3266
3266 3267 raise UnknownCommand(cmd)
3267 3268
3268 3269 def catchterm(*args):
3269 3270 raise util.SignalInterrupt
3270 3271
3271 3272 def run():
3272 3273 sys.exit(dispatch(sys.argv[1:]))
3273 3274
3274 3275 class ParseError(Exception):
3275 3276 """Exception raised on errors in parsing the command line."""
3276 3277
3277 3278 def parse(ui, args):
3278 3279 options = {}
3279 3280 cmdoptions = {}
3280 3281
3281 3282 try:
3282 3283 args = fancyopts.fancyopts(args, globalopts, options)
3283 3284 except fancyopts.getopt.GetoptError, inst:
3284 3285 raise ParseError(None, inst)
3285 3286
3286 3287 if args:
3287 3288 cmd, args = args[0], args[1:]
3288 3289 aliases, i = find(cmd)
3289 3290 cmd = aliases[0]
3290 3291 defaults = ui.config("defaults", cmd)
3291 3292 if defaults:
3292 3293 args = defaults.split() + args
3293 3294 c = list(i[1])
3294 3295 else:
3295 3296 cmd = None
3296 3297 c = []
3297 3298
3298 3299 # combine global options into local
3299 3300 for o in globalopts:
3300 3301 c.append((o[0], o[1], options[o[1]], o[3]))
3301 3302
3302 3303 try:
3303 3304 args = fancyopts.fancyopts(args, c, cmdoptions)
3304 3305 except fancyopts.getopt.GetoptError, inst:
3305 3306 raise ParseError(cmd, inst)
3306 3307
3307 3308 # separate global options back out
3308 3309 for o in globalopts:
3309 3310 n = o[1]
3310 3311 options[n] = cmdoptions[n]
3311 3312 del cmdoptions[n]
3312 3313
3313 3314 return (cmd, cmd and i[0] or None, args, options, cmdoptions)
3314 3315
3315 3316 def dispatch(args):
3316 3317 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
3317 3318 num = getattr(signal, name, None)
3318 3319 if num: signal.signal(num, catchterm)
3319 3320
3320 3321 try:
3321 3322 u = ui.ui(traceback='--traceback' in sys.argv[1:])
3322 3323 except util.Abort, inst:
3323 3324 sys.stderr.write(_("abort: %s\n") % inst)
3324 3325 return -1
3325 3326
3326 3327 external = []
3327 3328 for x in u.extensions():
3328 3329 try:
3329 3330 if x[1]:
3330 3331 # the module will be loaded in sys.modules
3331 3332 # choose an unique name so that it doesn't
3332 3333 # conflicts with other modules
3333 3334 module_name = "hgext_%s" % x[0].replace('.', '_')
3334 3335 mod = imp.load_source(module_name, x[1])
3335 3336 else:
3336 3337 def importh(name):
3337 3338 mod = __import__(name)
3338 3339 components = name.split('.')
3339 3340 for comp in components[1:]:
3340 3341 mod = getattr(mod, comp)
3341 3342 return mod
3342 3343 try:
3343 3344 mod = importh("hgext." + x[0])
3344 3345 except ImportError:
3345 3346 mod = importh(x[0])
3346 3347 external.append(mod)
3347 3348 except (util.SignalInterrupt, KeyboardInterrupt):
3348 3349 raise
3349 3350 except Exception, inst:
3350 3351 u.warn(_("*** failed to import extension %s: %s\n") % (x[0], inst))
3351 3352 if u.print_exc():
3352 3353 return 1
3353 3354
3354 3355 for x in external:
3355 3356 uisetup = getattr(x, 'uisetup', None)
3356 3357 if uisetup:
3357 3358 uisetup(u)
3358 3359 cmdtable = getattr(x, 'cmdtable', {})
3359 3360 for t in cmdtable:
3360 3361 if t in table:
3361 3362 u.warn(_("module %s overrides %s\n") % (x.__name__, t))
3362 3363 table.update(cmdtable)
3363 3364
3364 3365 try:
3365 3366 cmd, func, args, options, cmdoptions = parse(u, args)
3366 3367 if options["time"]:
3367 3368 def get_times():
3368 3369 t = os.times()
3369 3370 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
3370 3371 t = (t[0], t[1], t[2], t[3], time.clock())
3371 3372 return t
3372 3373 s = get_times()
3373 3374 def print_time():
3374 3375 t = get_times()
3375 3376 u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
3376 3377 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
3377 3378 atexit.register(print_time)
3378 3379
3379 3380 u.updateopts(options["verbose"], options["debug"], options["quiet"],
3380 3381 not options["noninteractive"], options["traceback"],
3381 3382 options["config"])
3382 3383
3383 3384 # enter the debugger before command execution
3384 3385 if options['debugger']:
3385 3386 pdb.set_trace()
3386 3387
3387 3388 try:
3388 3389 if options['cwd']:
3389 3390 try:
3390 3391 os.chdir(options['cwd'])
3391 3392 except OSError, inst:
3392 3393 raise util.Abort('%s: %s' %
3393 3394 (options['cwd'], inst.strerror))
3394 3395
3395 3396 path = u.expandpath(options["repository"]) or ""
3396 3397 repo = path and hg.repository(u, path=path) or None
3397 3398
3398 3399 if options['help']:
3399 3400 return help_(u, cmd, options['version'])
3400 3401 elif options['version']:
3401 3402 return show_version(u)
3402 3403 elif not cmd:
3403 3404 return help_(u, 'shortlist')
3404 3405
3405 3406 if cmd not in norepo.split():
3406 3407 try:
3407 3408 if not repo:
3408 3409 repo = hg.repository(u, path=path)
3409 3410 u = repo.ui
3410 3411 for x in external:
3411 3412 if hasattr(x, 'reposetup'):
3412 3413 x.reposetup(u, repo)
3413 3414 except hg.RepoError:
3414 3415 if cmd not in optionalrepo.split():
3415 3416 raise
3416 3417 d = lambda: func(u, repo, *args, **cmdoptions)
3417 3418 else:
3418 3419 d = lambda: func(u, *args, **cmdoptions)
3419 3420
3420 3421 try:
3421 3422 if options['profile']:
3422 3423 import hotshot, hotshot.stats
3423 3424 prof = hotshot.Profile("hg.prof")
3424 3425 try:
3425 3426 try:
3426 3427 return prof.runcall(d)
3427 3428 except:
3428 3429 try:
3429 3430 u.warn(_('exception raised - generating '
3430 3431 'profile anyway\n'))
3431 3432 except:
3432 3433 pass
3433 3434 raise
3434 3435 finally:
3435 3436 prof.close()
3436 3437 stats = hotshot.stats.load("hg.prof")
3437 3438 stats.strip_dirs()
3438 3439 stats.sort_stats('time', 'calls')
3439 3440 stats.print_stats(40)
3440 3441 elif options['lsprof']:
3441 3442 try:
3442 3443 from mercurial import lsprof
3443 3444 except ImportError:
3444 3445 raise util.Abort(_(
3445 3446 'lsprof not available - install from '
3446 3447 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/'))
3447 3448 p = lsprof.Profiler()
3448 3449 p.enable(subcalls=True)
3449 3450 try:
3450 3451 return d()
3451 3452 finally:
3452 3453 p.disable()
3453 3454 stats = lsprof.Stats(p.getstats())
3454 3455 stats.sort()
3455 3456 stats.pprint(top=10, file=sys.stderr, climit=5)
3456 3457 else:
3457 3458 return d()
3458 3459 finally:
3459 3460 u.flush()
3460 3461 except:
3461 3462 # enter the debugger when we hit an exception
3462 3463 if options['debugger']:
3463 3464 pdb.post_mortem(sys.exc_info()[2])
3464 3465 u.print_exc()
3465 3466 raise
3466 3467 except ParseError, inst:
3467 3468 if inst.args[0]:
3468 3469 u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
3469 3470 help_(u, inst.args[0])
3470 3471 else:
3471 3472 u.warn(_("hg: %s\n") % inst.args[1])
3472 3473 help_(u, 'shortlist')
3473 3474 except AmbiguousCommand, inst:
3474 3475 u.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
3475 3476 (inst.args[0], " ".join(inst.args[1])))
3476 3477 except UnknownCommand, inst:
3477 3478 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
3478 3479 help_(u, 'shortlist')
3479 3480 except hg.RepoError, inst:
3480 3481 u.warn(_("abort: %s!\n") % inst)
3481 3482 except lock.LockHeld, inst:
3482 3483 if inst.errno == errno.ETIMEDOUT:
3483 3484 reason = _('timed out waiting for lock held by %s') % inst.locker
3484 3485 else:
3485 3486 reason = _('lock held by %s') % inst.locker
3486 3487 u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
3487 3488 except lock.LockUnavailable, inst:
3488 3489 u.warn(_("abort: could not lock %s: %s\n") %
3489 3490 (inst.desc or inst.filename, inst.strerror))
3490 3491 except revlog.RevlogError, inst:
3491 3492 u.warn(_("abort: "), inst, "!\n")
3492 3493 except util.SignalInterrupt:
3493 3494 u.warn(_("killed!\n"))
3494 3495 except KeyboardInterrupt:
3495 3496 try:
3496 3497 u.warn(_("interrupted!\n"))
3497 3498 except IOError, inst:
3498 3499 if inst.errno == errno.EPIPE:
3499 3500 if u.debugflag:
3500 3501 u.warn(_("\nbroken pipe\n"))
3501 3502 else:
3502 3503 raise
3503 3504 except IOError, inst:
3504 3505 if hasattr(inst, "code"):
3505 3506 u.warn(_("abort: %s\n") % inst)
3506 3507 elif hasattr(inst, "reason"):
3507 3508 u.warn(_("abort: error: %s\n") % inst.reason[1])
3508 3509 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
3509 3510 if u.debugflag:
3510 3511 u.warn(_("broken pipe\n"))
3511 3512 elif getattr(inst, "strerror", None):
3512 3513 if getattr(inst, "filename", None):
3513 3514 u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))
3514 3515 else:
3515 3516 u.warn(_("abort: %s\n") % inst.strerror)
3516 3517 else:
3517 3518 raise
3518 3519 except OSError, inst:
3519 3520 if hasattr(inst, "filename"):
3520 3521 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
3521 3522 else:
3522 3523 u.warn(_("abort: %s\n") % inst.strerror)
3523 3524 except util.Abort, inst:
3524 3525 u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
3525 3526 except TypeError, inst:
3526 3527 # was this an argument error?
3527 3528 tb = traceback.extract_tb(sys.exc_info()[2])
3528 3529 if len(tb) > 2: # no
3529 3530 raise
3530 3531 u.debug(inst, "\n")
3531 3532 u.warn(_("%s: invalid arguments\n") % cmd)
3532 3533 help_(u, cmd)
3533 3534 except SystemExit, inst:
3534 3535 # Commands shouldn't sys.exit directly, but give a return code.
3535 3536 # Just in case catch this and and pass exit code to caller.
3536 3537 return inst.code
3537 3538 except:
3538 3539 u.warn(_("** unknown exception encountered, details follow\n"))
3539 3540 u.warn(_("** report bug details to mercurial@selenic.com\n"))
3540 3541 u.warn(_("** Mercurial Distributed SCM (version %s)\n")
3541 3542 % version.get_version())
3542 3543 raise
3543 3544
3544 3545 return -1
General Comments 0
You need to be logged in to leave comments. Login now