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