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