hg/pyhgsh: mercurial/commands.py annotate

annotate mercurial/commands.py @ 460:6409d9a0df43

add dirstate debugging commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add dirstate debugging commands As I've played with various different merges and more recently rawcommit, I've found the following patch to be very very helpful in figuring out whether the dirstate is being left in a consistent or inconsistent state with respect to the current manifest. I attempted to deduce the invariants that were assumed by the current code, and then check it in this code. I may or may not have captured the design intent in this check; if not, I'd be very happy to hear more clearly what was intended, so that I can write tests to that expectation. Anyway, here's the patch. Not sure if it's a good idea to commit it to the mainline, or just leave it as a debugging aid. I attempted to package it so that it doesn't interfere with normal usage. Michael Fetterman (tweaked by mpm: remove -d magic) manifest hash: 869f5b5f954dc0f46ba27322359e811d5e21d71c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvP77ywK+sNU5EO8RArmtAKCCVuI2slANzWZ26P5edtH/ixdwNwCfZLWl 5P+V+C92II3usO4YW2MULKY= =/Pv4 -----END PGP SIGNATURE-----

author	mpm@selenic.com
date	Fri, 24 Jun 2005 22:51:39 -0800
parents	a1e91c24dab5
children	9ae0034f2772

rev	line source
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	1 # commands.py - command processing for mercurial
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	2 #
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	4 #
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	5 # This software may be used and distributed according to the terms
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	7
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 259 diff changeset	8 import os, re, sys, signal
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: 417 diff changeset	9 import fancyopts, ui, hg, util
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 259 diff changeset	10 from demandload import *
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	11 demandload(globals(), "mdiff time hgweb traceback random signal errno version")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	12
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	13 class UnknownCommand(Exception): pass
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	14
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	15 def filterfiles(filters, files):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	16 l = [ x for x in files if x in filters ]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	17
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	18 for t in filters:
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: 417 diff changeset	19 if t and t[-1] != "/": t += "/"
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	20 l += [ x for x in files if x.startswith(t) ]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	21 return l
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	22
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	23 def relfilter(repo, files):
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	24 if os.getcwd() != repo.root:
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	25 p = os.getcwd()[len(repo.root) + 1: ]
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: 417 diff changeset	26 return filterfiles([util.pconvert(p)], files)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	27 return files
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	28
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	29 def relpath(repo, args):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	30 if os.getcwd() != repo.root:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	31 p = os.getcwd()[len(repo.root) + 1: ]
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: 417 diff changeset	32 return [ util.pconvert(os.path.normpath(os.path.join(p, x))) for x in args ]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	33 return args
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	34
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	35 def dodiff(ui, repo, path, files = None, node1 = None, node2 = None):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	36 def date(c):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	37 return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	38
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	39 if node2:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	40 change = repo.changelog.read(node2)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	41 mmap2 = repo.manifest.read(change[0])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	42 (c, a, d) = repo.diffrevs(node1, node2)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	43 def read(f): return repo.file(f).read(mmap2[f])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	44 date2 = date(change)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	45 else:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	46 date2 = time.asctime()
312 09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	47 (c, a, d, u) = repo.diffdir(path, node1)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	48 if not node1:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	49 node1 = repo.dirstate.parents()[0]
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 404 diff changeset	50 def read(f): return repo.wfile(f).read()
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	51
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	52 if ui.quiet:
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	53 r = None
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	54 else:
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	55 hexfunc = ui.verbose and hg.hex or hg.short
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	56 r = [hexfunc(node) for node in [node1, node2] if node]
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	57
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	58 change = repo.changelog.read(node1)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	59 mmap = repo.manifest.read(change[0])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	60 date1 = date(change)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	61
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	62 if files:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	63 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	64
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	65 for f in c:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	66 to = None
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	67 if f in mmap:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	68 to = repo.file(f).read(mmap[f])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	69 tn = read(f)
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	70 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	71 for f in a:
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 262 diff changeset	72 to = None
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	73 tn = read(f)
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	74 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	75 for f in d:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	76 to = repo.file(f).read(mmap[f])
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 262 diff changeset	77 tn = None
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	78 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r))
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	79
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	80 def show_changeset(ui, repo, rev=0, changenode=None, filelog=None):
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	81 """show a single changeset or file revision"""
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	82 changelog = repo.changelog
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	83 if filelog:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	84 log = filelog
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	85 filerev = rev
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	86 node = filenode = filelog.node(filerev)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	87 changerev = filelog.linkrev(filenode)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	88 changenode = changenode or changelog.node(changerev)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	89 else:
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	90 log = changelog
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	91 changerev = rev
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	92 if changenode is None:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	93 changenode = changelog.node(changerev)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	94 elif not changerev:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	95 rev = changerev = changelog.rev(changenode)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	96 node = changenode
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	97
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	98 if ui.quiet:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	99 ui.write("%d:%s\n" % (rev, hg.hex(node)))
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	100 return
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	101
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	102 changes = changelog.read(changenode)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	103
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	104 parents = [(log.rev(parent), hg.hex(parent))
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	105 for parent in log.parents(node)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	106 if ui.debugflag or parent != hg.nullid]
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	107 if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	108 parents = []
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	109
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	110 if filelog:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	111 ui.write("revision: %d:%s\n" % (filerev, hg.hex(filenode)))
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	112 for parent in parents:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	113 ui.write("parent: %d:%s\n" % parent)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	114 ui.status("changeset: %d:%s\n" % (changerev, hg.hex(changenode)))
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	115 else:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	116 ui.write("changeset: %d:%s\n" % (changerev, hg.hex(changenode)))
387 c07c6fb2f0a8 Show tags in hg history etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 386 diff changeset	117 for tag in repo.nodetags(changenode):
c07c6fb2f0a8 Show tags in hg history etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 386 diff changeset	118 ui.status("tag: %s\n" % tag)
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	119 for parent in parents:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	120 ui.write("parent: %d:%s\n" % parent)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	121 ui.note("manifest: %d:%s\n" % (repo.manifest.rev(changes[0]),
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	122 hg.hex(changes[0])))
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	123 ui.status("user: %s\n" % changes[1])
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	124 ui.status("date: %s\n" % time.asctime(
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	125 time.localtime(float(changes[2].split(' ')[0]))))
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	126 ui.note("files: %s\n" % " ".join(changes[3]))
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	127 description = changes[4].strip()
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	128 if description:
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	129 if ui.verbose:
27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	130 ui.status("description:\n")
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	131 ui.status(description)
365 f94d3632a323 One too many newlines in verbose output showed up in regression mpm@selenic.com parents: 363 diff changeset	132 ui.status("\n")
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	133 else:
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	134 ui.status("summary: %s\n" % description.splitlines()[0])
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	135 ui.status("\n")
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	136
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	137 def show_version(ui):
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	138 """output version and copyright information"""
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	139 ui.write("Mercurial version %s\n" % version.get_version())
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	140 ui.status(
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	141 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	142 "This is free software; see the source for copying conditions. "
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	143 "There is NO\nwarranty; "
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	144 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	145 )
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	146
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	147 def help(ui, cmd=None):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	148 '''show help for a given command or all commands'''
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	149 if cmd:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	150 try:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	151 i = find(cmd)
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	152 ui.write("%s\n\n" % i[2])
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	153
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	154 if i[1]:
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	155 for s, l, d, c in i[1]:
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	156 opt=' '
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	157 if s: opt = opt + '-' + s + ' '
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	158 if l: opt = opt + '--' + l + ' '
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	159 if d: opt = opt + '(' + str(d) + ')'
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	160 ui.write(opt, "\n")
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	161 if c: ui.write(' %s\n' % c)
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	162 ui.write("\n")
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	163
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	164 ui.write(i[0].__doc__, "\n")
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	165 except UnknownCommand:
268 1634a7ea6748 unknown command fixups mpm@selenic.com parents: 266 diff changeset	166 ui.warn("hg: unknown command %s\n" % cmd)
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	167 sys.exit(0)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	168 else:
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	169 if not ui.quiet:
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	170 show_version(ui)
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	171 ui.write('\n')
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	172 ui.write('hg commands:\n\n')
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	173
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	174 h = {}
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	175 for e in table.values():
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	176 f = e[0]
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	177 if f.__name__.startswith("debug"): continue
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	178 d = ""
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	179 if f.__doc__:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	180 d = f.__doc__.splitlines(0)[0].rstrip()
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	181 h[f.__name__.rstrip("_")] = d
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	182
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	183 fns = h.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	184 fns.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	185 m = max(map(len, fns))
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	186 for f in fns:
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	187 ui.write(' %-*s %s\n' % (m, f, h[f]))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	188
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	189 # Commands start here, listed alphabetically
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	190
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	191 def add(ui, repo, file, *files):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	192 '''add the specified files on the next commit'''
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	193 repo.add(relpath(repo, (file,) + files))
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	194
353 dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	195 def addremove(ui, repo, *files):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	196 """add all new files, delete all missing files"""
353 dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	197 if files:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	198 files = relpath(repo, files)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	199 d = []
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	200 u = []
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	201 for f in files:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	202 p = repo.wjoin(f)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	203 s = repo.dirstate.state(f)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	204 isfile = os.path.isfile(p)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	205 if s != 'r' and not isfile:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	206 d.append(f)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	207 elif s not in 'nmai' and isfile:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	208 u.append(f)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	209 else:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	210 (c, a, d, u) = repo.diffdir(repo.root)
259 45c293b71341 fix addremove mpm@selenic.com parents: 257 diff changeset	211 repo.add(u)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	212 repo.remove(d)
219 8ff4532376a4 hg checkout: refuse to checkout if there are outstanding changes mpm@selenic.com parents: 214 diff changeset	213
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	214 def annotate(u, repo, file, files, *ops):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	215 """show changeset information per file line"""
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	216 def getnode(rev):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	217 return hg.short(repo.changelog.node(rev))
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	218
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	219 def getname(rev):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	220 try:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	221 return bcache[rev]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	222 except KeyError:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	223 cl = repo.changelog.read(repo.changelog.node(rev))
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	224 name = cl[1]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	225 f = name.find('@')
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	226 if f >= 0:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	227 name = name[:f]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	228 bcache[rev] = name
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	229 return name
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	230
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	231 bcache = {}
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	232 opmap = [['user', getname], ['number', str], ['changeset', getnode]]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	233 if not ops['user'] and not ops['changeset']:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	234 ops['number'] = 1
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	235
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 221 diff changeset	236 node = repo.dirstate.parents()[0]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	237 if ops['revision']:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	238 node = repo.changelog.lookup(ops['revision'])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	239 change = repo.changelog.read(node)
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	240 mmap = repo.manifest.read(change[0])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	241 maxuserlen = 0
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	242 maxchangelen = 0
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	243 for f in relpath(repo, (file,) + files):
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	244 lines = repo.file(f).annotate(mmap[f])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	245 pieces = []
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	246
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	247 for o, f in opmap:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	248 if ops[o]:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	249 l = [ f(n) for n,t in lines ]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	250 m = max(map(len, l))
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	251 pieces.append([ "%*s" % (m, x) for x in l])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	252
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	253 for p,l in zip(zip(*pieces), lines):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	254 u.write(" ".join(p) + ": " + l[1])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	255
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	256 def cat(ui, repo, file, rev = []):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	257 """output the latest or given revision of a file"""
281 574420507d8c hg cat: relative file support mpm@selenic.com parents: 276 diff changeset	258 r = repo.file(relpath(repo, [file])[0])
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	259 n = r.tip()
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	260 if rev: n = r.lookup(rev)
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	261 sys.stdout.write(r.read(n))
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	262
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	263 def commit(ui, repo, files, *opts):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	264 """commit the specified files or all outstanding changes"""
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	265 text = opts['text']
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	266 if not text and opts['logfile']:
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	267 try: text = open(opts['logfile']).read()
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	268 except IOError: pass
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	269
354 e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	270 if opts['addremove']:
e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	271 addremove(ui, repo, *files)
317 b18ce742566a hg commit: user and date options mpm@selenic.com parents: 312 diff changeset	272 repo.commit(relpath(repo, files), text, opts['user'], opts['date'])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	273
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	274 def copy(ui, repo, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	275 """mark a file as copied or renamed for the next commit"""
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	276 return repo.copy(*relpath(repo, (source, dest)))
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	277
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	278 def debugcheckdirstate(ui, repo):
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	279 parent1, parent2 = repo.dirstate.parents()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	280 dc = repo.dirstate.dup()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	281 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	282 keys.sort()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	283 m1n = repo.changelog.read(parent1)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	284 m2n = repo.changelog.read(parent2)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	285 m1 = repo.manifest.read(m1n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	286 m2 = repo.manifest.read(m2n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	287 errors = 0
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	288 for f in dc:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	289 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	290 if state in "nr" and f not in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	291 print "%s in state %s, but not listed in manifest1" % (f, state)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	292 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	293 if state in "a" and f in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	294 print "%s in state %s, but also listed in manifest1" % (f, state)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	295 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	296 if state in "m" and f not in m1 and f not in m2:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	297 print "%s in state %s, but not listed in either manifest" % (f, state)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	298 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	299 for f in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	300 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	301 if state not in "nrm":
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	302 print "%s in manifest1, but listed as state %s" % (f, state)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	303 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	304 if errors:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	305 print ".hg/dirstate inconsistent with current parent's manifest, aborting"
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	306 sys.exit(1)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	307
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	308 def debugdumpdirstate(ui, repo):
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	309 dc = repo.dirstate.dup()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	310 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	311 keys.sort()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	312 for file in keys:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	313 print "%s => %c" % (file, dc[file][0])
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	314
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	315 def debugindex(ui, file):
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 404 diff changeset	316 r = hg.revlog(hg.opener(""), file, "")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	317 print " rev offset length base linkrev"+\
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	318 " p1 p2 nodeid"
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	319 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	320 e = r.index[i]
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	321 print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % (
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	322 i, e[0], e[1], e[2], e[3],
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	323 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5]))
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	324
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	325 def debugindexdot(ui, file):
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 404 diff changeset	326 r = hg.revlog(hg.opener(""), file, "")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	327 print "digraph G {"
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	328 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	329 e = r.index[i]
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	330 print "\t%d -> %d" % (r.rev(e[4]), i)
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	331 if e[5] != hg.nullid:
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	332 print "\t%d -> %d" % (r.rev(e[5]), i)
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	333 print "}"
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	334
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	335 def diff(ui, repo, files, *opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	336 """diff working directory (or selected files)"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	337 revs = []
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	338 if opts['rev']:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	339 revs = map(lambda x: repo.lookup(x), opts['rev'])
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	340
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	341 if len(revs) > 2:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	342 self.ui.warn("too many revisions to diff\n")
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	343 sys.exit(1)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	344
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	345 if files:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	346 files = relpath(repo, files)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	347 else:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	348 files = relpath(repo, [""])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	349
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	350 dodiff(ui, repo, os.getcwd(), files, *revs)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	351
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	352 def export(ui, repo, changeset):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	353 """dump the changeset header and diffs for a revision"""
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	354 node = repo.lookup(changeset)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	355 prev, other = repo.changelog.parents(node)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	356 change = repo.changelog.read(node)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	357 print "# HG changeset patch"
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	358 print "# User %s" % change[1]
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	359 print "# Node ID %s" % hg.hex(node)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	360 print "# Parent %s" % hg.hex(prev)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	361 print
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	362 if other != hg.nullid:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	363 print "# Parent %s" % hg.hex(other)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	364 print change[4].rstrip()
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	365 print
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	366
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	367 dodiff(ui, repo, "", None, prev, node)
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	368
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	369 def forget(ui, repo, file, *files):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	370 """don't add the specified files on the next commit"""
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	371 repo.forget(relpath(repo, (file,) + files))
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	372
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	373 def heads(ui, repo):
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	374 """show current repository heads"""
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	375 for n in repo.changelog.heads():
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	376 show_changeset(ui, repo, changenode=n)
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	377
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	378 def history(ui, repo):
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	379 """show the changelog history"""
270 5a80ed2158c8 Reverse order of hg log and hg history lists mpm@selenic.com parents: 268 diff changeset	380 for i in range(repo.changelog.count() - 1, -1, -1):
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	381 show_changeset(ui, repo, rev=i)
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	382
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	383 def identify(ui, repo):
a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	384 """print information about the working copy"""
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	385 parents = [p for p in repo.dirstate.parents() if p != hg.nullid]
340 97a897d32dfc Handle the case where the current working copy is not based on a checkout. Thomas Arendsen Hein <thomas@intevation.de> parents: 339 diff changeset	386 if not parents:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	387 ui.write("unknown\n")
340 97a897d32dfc Handle the case where the current working copy is not based on a checkout. Thomas Arendsen Hein <thomas@intevation.de> parents: 339 diff changeset	388 return
97a897d32dfc Handle the case where the current working copy is not based on a checkout. Thomas Arendsen Hein <thomas@intevation.de> parents: 339 diff changeset	389
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	390 hexfunc = ui.verbose and hg.hex or hg.short
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	391 (c, a, d, u) = repo.diffdir(repo.root)
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	392 output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	393 (c or a or d) and "+" or "")]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	394
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	395 if not ui.quiet:
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	396 # multiple tags for a single parent separated by '/'
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	397 parenttags = ['/'.join(tags)
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	398 for tags in map(repo.nodetags, parents) if tags]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	399 # tags for multiple parents separated by ' + '
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	400 output.append(' + '.join(parenttags))
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	401
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	402 ui.write("%s\n" % ' '.join(output))
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	403
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	404 def import_(ui, repo, patch1, patches, *opts):
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	405 """import an ordered set of patches"""
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	406 try:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	407 import psyco
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	408 psyco.full()
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	409 except:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	410 pass
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	411
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	412 patches = (patch1,) + patches
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	413
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	414 d = opts["base"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	415 strip = opts["strip"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	416 quiet = ui.quiet and "> /dev/null" or ""
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	417
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	418 for patch in patches:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	419 ui.status("applying %s\n" % patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	420 pf = os.path.join(d, patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	421
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	422 text = ""
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	423 for l in file(pf):
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	424 if l[:4] == "--- ": break
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	425 text += l
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	426
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	427 # make sure text isn't empty
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	428 if not text: text = "imported patch %s\n" % patch
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	429
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	430 f = os.popen("patch -p%d < %s" % (strip, pf))
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	431 files = []
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	432 for l in f.read().splitlines():
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	433 l.rstrip('\r\n');
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	434 if not quiet:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	435 print l
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	436 if l[:14] == 'patching file ':
443 470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	437 pf = l[14:]
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	438 if pf not in files:
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	439 files.append(pf)
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	440 patcherr = f.close()
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	441 if patcherr:
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	442 sys.stderr.write("patch failed")
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	443 sys.exit(1)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	444
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	445 if len(files) > 0:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	446 addremove(ui, repo, *files)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	447 repo.commit(files, text)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	448
393 e3f564643888 hg init: add -u flag to update mpm@selenic.com parents: 390 diff changeset	449 def init(ui, source=None, **opts):
290 07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	450 """create a new repository or copy an existing one"""
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	451
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	452 if source:
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	453 paths = {}
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	454 for name, path in ui.configitems("paths"):
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	455 paths[name] = path
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	456
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	457 if source in paths: source = paths[source]
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	458
290 07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	459 link = 0
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	460 if not source.startswith("http://"):
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	461 d1 = os.stat(os.getcwd()).st_dev
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	462 d2 = os.stat(source).st_dev
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	463 if d1 == d2: link = 1
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	464
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	465 if link:
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	466 ui.debug("copying by hardlink\n")
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	467 os.system("cp -al %s/.hg .hg" % source)
300 d3400605d246 hg init: when hardlinking, remove dirstate mpm@selenic.com parents: 295 diff changeset	468 try:
d3400605d246 hg init: when hardlinking, remove dirstate mpm@selenic.com parents: 295 diff changeset	469 os.remove(".hg/dirstate")
d3400605d246 hg init: when hardlinking, remove dirstate mpm@selenic.com parents: 295 diff changeset	470 except: pass
338 1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	471
1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	472 repo = hg.repository(ui, ".")
1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	473
290 07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	474 else:
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	475 repo = hg.repository(ui, ".", create=1)
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	476 other = hg.repository(ui, source)
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	477 cg = repo.getchangegroup(other)
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	478 repo.addchangegroup(cg)
390 50aea13227a2 create .hg/hgrc with [paths] default entry only if source was given on hg init. Thomas Arendsen Hein <thomas@intevation.de> parents: 387 diff changeset	479
50aea13227a2 create .hg/hgrc with [paths] default entry only if source was given on hg init. Thomas Arendsen Hein <thomas@intevation.de> parents: 387 diff changeset	480 f = repo.opener("hgrc", "w")
50aea13227a2 create .hg/hgrc with [paths] default entry only if source was given on hg init. Thomas Arendsen Hein <thomas@intevation.de> parents: 387 diff changeset	481 f.write("[paths]\n")
50aea13227a2 create .hg/hgrc with [paths] default entry only if source was given on hg init. Thomas Arendsen Hein <thomas@intevation.de> parents: 387 diff changeset	482 f.write("default = %s\n" % source)
393 e3f564643888 hg init: add -u flag to update mpm@selenic.com parents: 390 diff changeset	483
e3f564643888 hg init: add -u flag to update mpm@selenic.com parents: 390 diff changeset	484 if opts['update']:
e3f564643888 hg init: add -u flag to update mpm@selenic.com parents: 390 diff changeset	485 update(ui, repo)
290 07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	486 else:
338 1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	487 repo = hg.repository(ui, ".", create=1)
1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	488
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	489 def log(ui, repo, f):
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	490 """show the revision history of a single file"""
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	491 f = relpath(repo, [f])[0]
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	492
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	493 r = repo.file(f)
270 5a80ed2158c8 Reverse order of hg log and hg history lists mpm@selenic.com parents: 268 diff changeset	494 for i in range(r.count() - 1, -1, -1):
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	495 show_changeset(ui, repo, filelog=r, rev=i)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	496
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	497 def manifest(ui, repo, rev = []):
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	498 """output the latest or given revision of the project manifest"""
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	499 n = repo.manifest.tip()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	500 if rev:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	501 n = repo.manifest.lookup(rev)
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	502 m = repo.manifest.read(n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	503 mf = repo.manifest.readflags(n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	504 files = m.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	505 files.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	506
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	507 for f in files:
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	508 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	509
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	510 def parents(ui, repo, node = None):
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	511 '''show the parents of the current working dir'''
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	512 if node:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	513 p = repo.changelog.parents(repo.lookup(hg.bin(node)))
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	514 else:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	515 p = repo.dirstate.parents()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	516
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	517 for n in p:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	518 if n != hg.nullid:
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	519 show_changeset(ui, repo, changenode=n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	520
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	521 def pull(ui, repo, source="default", **opts):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	522 """pull changes from the specified source"""
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	523 paths = {}
286 bd9d1e93f8d6 hg pull: ditch .hgpaths for new .hgrc mpm@selenic.com parents: 281 diff changeset	524 for name, path in ui.configitems("paths"):
290 07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	525 paths[name] = path
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	526
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	527 if source in paths:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	528 source = paths[source]
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	529
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	530 ui.status('pulling from %s\n' % (source))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	531
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	532 other = hg.repository(ui, source)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	533 cg = repo.getchangegroup(other)
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	534 r = repo.addchangegroup(cg)
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	535 if cg and not r:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	536 if opts['update']:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	537 return update(ui, repo)
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	538 else:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	539 ui.status("(run 'hg update' to get a working copy)\n")
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	540
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	541 return r
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	542
371 6e3436082697 hg push: "default-push" default target path mpm@selenic.com parents: 367 diff changeset	543 def push(ui, repo, dest="default-push"):
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	544 """push changes to the specified destination"""
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	545 paths = {}
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	546 for name, path in ui.configitems("paths"):
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	547 paths[name] = path
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	548
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	549 if dest in paths: dest = paths[dest]
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	550
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	551 if not dest.startswith("ssh://"):
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	552 ui.warn("abort: can only push to ssh:// destinations currently\n")
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	553 return 1
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	554
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	555 m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', dest)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	556 if not m:
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	557 ui.warn("abort: couldn't parse destination %s\n" % dest)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	558 return 1
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	559
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	560 user, host, port, path = map(m.group, (2, 3, 5, 7))
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	561 host = user and ("%s@%s" % (user, host)) or host
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	562 port = port and (" -p %s") % port or ""
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	563 path = path or ""
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	564
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	565 sport = random.randrange(30000, 60000)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	566 cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'"
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	567 cmd = cmd % (host, port, sport+1, sport, path, sport+1)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	568
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	569 child = os.fork()
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	570 if not child:
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	571 sys.stdout = file("/dev/null", "w")
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	572 sys.stderr = sys.stdout
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	573 hgweb.server(repo.root, "pull", "", "localhost", sport)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	574 else:
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	575 r = os.system(cmd)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	576 os.kill(child, signal.SIGTERM)
320 292e10b5831a hg push: propagate return code mpm@selenic.com parents: 319 diff changeset	577 return r
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	578
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	579 def rawcommit(ui, repo, flist, *rc):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	580 "raw commit interface"
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	581
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	582 text = rc['text']
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	583 if not text and rc['logfile']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	584 try: text = open(rc['logfile']).read()
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	585 except IOError: pass
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	586 if not text and not rc['logfile']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	587 print "missing commit text"
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	588 return 1
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	589
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	590 files = relpath(repo, list(flist))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	591 if rc['files']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	592 files += open(rc['files']).read().splitlines()
452 a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	593
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	594 rc['parent'] = map(repo.lookup, rc['parent'])
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	595
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	596 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	597
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	598 def recover(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	599 """roll back an interrupted transaction"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	600 repo.recover()
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	601
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	602 def remove(ui, repo, file, *files):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	603 """remove the specified files on the next commit"""
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	604 repo.remove(relpath(repo, (file,) + files))
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	605
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	606 def serve(ui, repo, **opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	607 """export the repository via HTTP"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	608 hgweb.server(repo.root, opts["name"], opts["templates"],
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	609 opts["address"], opts["port"])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	610
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	611 def status(ui, repo):
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	612 '''show changed files in the working directory
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	613
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	614 C = changed
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	615 A = added
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	616 R = removed
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	617 ? = not tracked'''
312 09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	618
09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	619 (c, a, d, u) = repo.diffdir(os.getcwd())
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 219 diff changeset	620 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u))
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	621
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	622 for f in c: print "C", f
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 219 diff changeset	623 for f in a: print "A", f
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	624 for f in d: print "R", f
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 219 diff changeset	625 for f in u: print "?", f
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	626
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	627 def tag(ui, repo, name, rev = None, **opts):
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	628 """add a tag for the current tip or a given revision"""
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	629
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	630 if name == "tip":
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	631 ui.warn("abort: 'tip' is a reserved name!\n")
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	632 return -1
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	633
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	634 (c, a, d, u) = repo.diffdir(repo.root)
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	635 for x in (c, a, d, u):
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	636 if ".hgtags" in x:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	637 ui.warn("abort: working copy of .hgtags is changed!\n")
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	638 ui.status("(please commit .hgtags manually)\n")
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	639 return -1
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	640
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	641 if rev:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	642 r = hg.hex(repo.lookup(rev))
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	643 else:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	644 r = hg.hex(repo.changelog.tip())
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	645
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	646 add = 0
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	647 if not os.path.exists(repo.wjoin(".hgtags")): add = 1
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	648 repo.wfile(".hgtags", "a").write("%s %s\n" % (r, name))
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	649 if add: repo.add([".hgtags"])
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	650
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	651 if not opts['text']:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	652 opts['text'] = "Added tag %s for changeset %s" % (name, r)
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	653
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	654 repo.commit([".hgtags"], opts['text'], opts['user'], opts['date'])
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	655
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	656 def tags(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	657 """list repository tags"""
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	658
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	659 l = repo.tagslist()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	660 l.reverse()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	661 for t,n in l:
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	662 try:
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	663 r = repo.changelog.rev(n)
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	664 except KeyError:
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	665 r = "?"
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	666 print "%-30s %5d:%s" % (t, repo.changelog.rev(n), hg.hex(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	667
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	668 def tip(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	669 """show the tip revision"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	670 n = repo.changelog.tip()
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	671 show_changeset(ui, repo, changenode=n)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	672
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	673 def undo(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	674 """undo the last transaction"""
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	675 repo.undo()
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	676
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	677 def update(ui, repo, node=None, merge=False, clean=False):
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	678 '''update or merge working directory
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	679
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	680 If there are no outstanding changes in the working directory and
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	681 there is a linear relationship between the current version and the
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	682 requested version, the result is the requested version.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	683
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	684 Otherwise the result is a merge between the contents of the
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	685 current working directory and the requested version. Files that
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	686 changed between either parent are marked as changed for the next
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	687 commit and a commit must be performed before any further updates
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	688 are allowed.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	689 '''
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	690 node = node and repo.lookup(node) or repo.changelog.tip()
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	691 return repo.update(node, allow=merge, force=clean)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	692
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	693 def verify(ui, repo):
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	694 """verify the integrity of the repository"""
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	695 return repo.verify()
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	696
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	697 # Command options and aliases are listed here, alphabetically
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	698
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	699 table = {
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	700 "add": (add, [], "hg add [files]"),
353 dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	701 "addremove": (addremove, [], "hg addremove [files]"),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	702 "annotate": (annotate,
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	703 [('r', 'revision', '', 'revision'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	704 ('u', 'user', None, 'show user'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	705 ('n', 'number', None, 'show revision number'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	706 ('c', 'changeset', None, 'show changeset')],
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	707 'hg annotate [-u] [-c] [-n] [-r id] [files]'),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	708 "cat": (cat, [], 'hg cat <file> [rev]'),
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	709 "commit\|ci": (commit,
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	710 [('t', 'text', "", 'commit text'),
354 e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	711 ('A', 'addremove', None, 'run add/remove during commit'),
317 b18ce742566a hg commit: user and date options mpm@selenic.com parents: 312 diff changeset	712 ('l', 'logfile', "", 'commit text file'),
b18ce742566a hg commit: user and date options mpm@selenic.com parents: 312 diff changeset	713 ('d', 'date', "", 'data'),
b18ce742566a hg commit: user and date options mpm@selenic.com parents: 312 diff changeset	714 ('u', 'user', "", 'user')],
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	715 'hg commit [files]'),
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	716 "copy": (copy, [], 'hg copy <source> <dest>'),
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	717 "debugcheckdirstate": (debugcheckdirstate, [], 'debugcheckdirstate'),
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	718 "debugdumpdirstate": (debugdumpdirstate, [], 'debugdumpdirstate'),
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	719 "debugindex": (debugindex, [], 'debugindex <file>'),
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	720 "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	721 "diff": (diff, [('r', 'rev', [], 'revision')],
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	722 'hg diff [-r A] [-r B] [files]'),
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	723 "export": (export, [], "hg export <changeset>"),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	724 "forget": (forget, [], "hg forget [files]"),
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	725 "heads": (heads, [], 'hg heads'),
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	726 "history": (history, [], 'hg history'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	727 "help": (help, [], 'hg help [command]'),
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	728 "identify\|id": (identify, [], 'hg identify'),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	729 "import\|patch": (import_,
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	730 [('p', 'strip', 1, 'path strip'),
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	731 ('b', 'base', "", 'base path')],
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	732 "hg import [options] <patches>"),
393 e3f564643888 hg init: add -u flag to update mpm@selenic.com parents: 390 diff changeset	733 "init": (init, [('u', 'update', None, 'update after init')],
e3f564643888 hg init: add -u flag to update mpm@selenic.com parents: 390 diff changeset	734 'hg init [options] [url]'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	735 "log": (log, [], 'hg log <file>'),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	736 "manifest": (manifest, [], 'hg manifest [rev]'),
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 221 diff changeset	737 "parents": (parents, [], 'hg parents [node]'),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	738 "pull": (pull,
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	739 [('u', 'update', None, 'update working directory')],
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	740 'hg pull [options] [source]'),
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	741 "push": (push, [], 'hg push <destination>'),
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	742 "rawcommit": (rawcommit,
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	743 [('p', 'parent', [], 'parent'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	744 ('d', 'date', "", 'data'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	745 ('u', 'user', "", 'user'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	746 ('F', 'files', "", 'file list'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	747 ('t', 'text', "", 'commit text'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	748 ('l', 'logfile', "", 'commit text file')],
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	749 'hg rawcommit [options] [files]'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	750 "recover": (recover, [], "hg recover"),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	751 "remove\|rm": (remove, [], "hg remove [files]"),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	752 "serve": (serve, [('p', 'port', 8000, 'listen port'),
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	753 ('a', 'address', '', 'interface address'),
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	754 ('n', 'name', os.getcwd(), 'repository name'),
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	755 ('t', 'templates', "", 'template map')],
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	756 "hg serve [options]"),
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	757 "status": (status, [], 'hg status'),
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	758 "tag": (tag, [('t', 'text', "", 'commit text'),
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	759 ('d', 'date', "", 'date'),
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	760 ('u', 'user', "", 'user')],
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	761 'hg tag [options] <name> [rev]'),
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	762 "tags": (tags, [], 'hg tags'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	763 "tip": (tip, [], 'hg tip'),
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	764 "undo": (undo, [], 'hg undo'),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	765 "update\|up\|checkout\|co":
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	766 (update,
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	767 [('m', 'merge', None, 'allow merging of conflicts'),
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	768 ('C', 'clean', None, 'overwrite locally modified files')],
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	769 'hg update [options] [node]'),
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	770 "verify": (verify, [], 'hg verify'),
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	771 }
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	772
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	773 norepo = "init version help debugindex debugindexdot"
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	774
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	775 def find(cmd):
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	776 i = None
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	777 for e in table.keys():
335 74b9332faece Fix misrecognition of commands mpm@selenic.com parents: 333 diff changeset	778 if re.match("(%s)$" % e, cmd):
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	779 return table[e]
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	780
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	781 raise UnknownCommand(cmd)
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	782
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	783 class SignalInterrupt(Exception): pass
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	784
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	785 def catchterm(*args):
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	786 raise SignalInterrupt
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	787
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	788 def run():
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	789 sys.exit(dispatch(sys.argv[1:]))
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	790
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	791 def dispatch(args):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	792 options = {}
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	793 opts = [('v', 'verbose', None, 'verbose'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	794 ('d', 'debug', None, 'debug'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	795 ('q', 'quiet', None, 'quiet'),
309 61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	796 ('p', 'profile', None, 'profile'),
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	797 ('y', 'noninteractive', None, 'run non-interactively'),
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	798 ('', 'version', None, 'output version information and exit'),
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	799 ]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	800
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	801 args = fancyopts.fancyopts(args, opts, options,
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	802 'hg [options] <command> [options] [files]')
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	803
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	804 if not args:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	805 cmd = "help"
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	806 else:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	807 cmd, args = args[0], args[1:]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	808
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	809 u = ui.ui(options["verbose"], options["debug"], options["quiet"],
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	810 not options["noninteractive"])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	811
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	812 if options["version"]:
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	813 show_version(u)
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	814 sys.exit(0)
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	815
252 5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	816 try:
5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	817 i = find(cmd)
5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	818 except UnknownCommand:
268 1634a7ea6748 unknown command fixups mpm@selenic.com parents: 266 diff changeset	819 u.warn("hg: unknown command '%s'\n" % cmd)
252 5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	820 help(u)
5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	821 sys.exit(1)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	822
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	823 signal.signal(signal.SIGTERM, catchterm)
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	824
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	825 cmdoptions = {}
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	826 try:
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	827 args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2])
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	828 except fancyopts.getopt.GetoptError, inst:
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	829 u.warn("hg %s: %s\n" % (cmd, inst))
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	830 help(u, cmd)
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	831 sys.exit(-1)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	832
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	833 if cmd not in norepo.split():
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	834 repo = hg.repository(ui = u)
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	835 d = lambda: i[0](u, repo, args, *cmdoptions)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	836 else:
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	837 d = lambda: i[0](u, args, *cmdoptions)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	838
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	839 try:
309 61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	840 if options['profile']:
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	841 import hotshot, hotshot.stats
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	842 prof = hotshot.Profile("hg.prof")
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	843 r = prof.runcall(d)
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	844 prof.close()
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	845 stats = hotshot.stats.load("hg.prof")
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	846 stats.strip_dirs()
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	847 stats.sort_stats('time', 'calls')
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	848 stats.print_stats(40)
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	849 return r
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	850 else:
61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	851 return d()
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	852 except SignalInterrupt:
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	853 u.warn("killed!\n")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	854 except KeyboardInterrupt:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	855 u.warn("interrupted!\n")
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	856 except IOError, inst:
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	857 if hasattr(inst, "code"):
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	858 u.warn("abort: %s\n" % inst)
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	859 elif hasattr(inst, "reason"):
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	860 u.warn("abort: error %d: %s\n" % (inst.reason[0], inst.reason[1]))
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	861 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	862 u.warn("broken pipe\n")
45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	863 else:
45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	864 raise
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	865 except TypeError, inst:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	866 # was this an argument error?
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	867 tb = traceback.extract_tb(sys.exc_info()[2])
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	868 if len(tb) > 2: # no
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	869 raise
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	870 u.debug(inst, "\n")
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	871 u.warn("%s: invalid arguments\n" % i[0].__name__)
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	872 help(u, cmd)
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	873 sys.exit(-1)
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	874

Mercurial > hg > pyhgsh

annotate mercurial/commands.py @ 460:6409d9a0df43