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