mercurial-scm/hg: mercurial/commands.py annotate

annotate mercurial/commands.py @ 546:c8ae964109c1

Add an empty line after description in verbose mode of show_changeset. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add an empty line after description in verbose mode of show_changeset. This makes it a little bit easier to see where a new changeset starts. manifest hash: dd0dc3a135ca2fabed03b86116863c93a451670d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxOVgW7P1GVgWeRoRAjtdAJ9B/ECd/Rhws2Bd+IcwRyqcYEN0ugCfbug2 Uhy2yUhV+mlrqFkoNBkcOmM= =ttyp -----END PGP SIGNATURE-----

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Fri, 01 Jul 2005 07:40:32 +0100
parents	eda4c32c167a
children	4fc63e22b1fe

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]))))
493 30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	126 if ui.debugflag:
490 df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	127 files = repo.diffrevs(changelog.parents(changenode)[0], changenode)
df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	128 for key, value in zip(["files:", "files+:", "files-:"], files):
df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	129 if value:
df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	130 ui.note("%-12s %s\n" % (key, " ".join(value)))
493 30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	131 else:
30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	132 ui.note("files: %s\n" % " ".join(changes[3]))
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	133 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	134 if description:
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	135 if ui.verbose:
27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	136 ui.status("description:\n")
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	137 ui.status(description)
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 542 diff changeset	138 ui.status("\n\n")
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	139 else:
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	140 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	141 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	142
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	143 def show_version(ui):
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	144 """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	145 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	146 ui.status(
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	147 "\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	148 "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	149 "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	150 "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	151 )
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	152
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	153 def help(ui, cmd=None):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	154 '''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	155 if cmd:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	156 try:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	157 i = find(cmd)
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	158 ui.write("%s\n\n" % i[2])
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	159
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	160 if i[1]:
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	161 for s, l, d, c in i[1]:
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	162 opt=' '
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	163 if s: opt = opt + '-' + s + ' '
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	164 if l: opt = opt + '--' + l + ' '
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	165 if d: opt = opt + '(' + str(d) + ')'
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	166 ui.write(opt, "\n")
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	167 if c: ui.write(' %s\n' % c)
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	168 ui.write("\n")
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	169
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	170 ui.write(i[0].__doc__, "\n")
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	171 except UnknownCommand:
268 1634a7ea6748 unknown command fixups mpm@selenic.com parents: 266 diff changeset	172 ui.warn("hg: unknown command %s\n" % cmd)
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	173 sys.exit(0)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	174 else:
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	175 if not ui.quiet:
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	176 show_version(ui)
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	177 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	178 ui.write('hg commands:\n\n')
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	179
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	180 h = {}
479 7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	181 for c, e in table.items():
7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	182 f = c.split("\|")[0]
7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	183 if f.startswith("debug"):
7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	184 continue
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	185 d = ""
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	186 if e[0].__doc__:
0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	187 d = e[0].__doc__.splitlines(0)[0].rstrip()
0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	188 h[f] = d
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	189
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	190 fns = h.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	191 fns.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	192 m = max(map(len, fns))
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	193 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	194 ui.write(' %-*s %s\n' % (m, f, h[f]))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	195
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	196 # Commands start here, listed alphabetically
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	197
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	198 def add(ui, repo, file, *files):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	199 '''add the specified files on the next commit'''
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	200 repo.add(relpath(repo, (file,) + files))
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	201
353 dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	202 def addremove(ui, repo, *files):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	203 """add all new files, delete all missing files"""
353 dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	204 if files:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	205 files = relpath(repo, files)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	206 d = []
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	207 u = []
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	208 for f in files:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	209 p = repo.wjoin(f)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	210 s = repo.dirstate.state(f)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	211 isfile = os.path.isfile(p)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	212 if s != 'r' and not isfile:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	213 d.append(f)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	214 elif s not in 'nmai' and isfile:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	215 u.append(f)
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	216 else:
dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	217 (c, a, d, u) = repo.diffdir(repo.root)
259 45c293b71341 fix addremove mpm@selenic.com parents: 257 diff changeset	218 repo.add(u)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	219 repo.remove(d)
219 8ff4532376a4 hg checkout: refuse to checkout if there are outstanding changes mpm@selenic.com parents: 214 diff changeset	220
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	221 def annotate(u, repo, file, files, *ops):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	222 """show changeset information per file line"""
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	223 def getnode(rev):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	224 return hg.short(repo.changelog.node(rev))
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	225
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	226 def getname(rev):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	227 try:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	228 return bcache[rev]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	229 except KeyError:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	230 cl = repo.changelog.read(repo.changelog.node(rev))
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	231 name = cl[1]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	232 f = name.find('@')
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	233 if f >= 0:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	234 name = name[:f]
534 ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate mpm@selenic.com parents: 532 diff changeset	235 f = name.find('<')
ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate mpm@selenic.com parents: 532 diff changeset	236 if f >= 0:
ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate mpm@selenic.com parents: 532 diff changeset	237 name = name[f+1:]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	238 bcache[rev] = name
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	239 return name
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	240
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	241 bcache = {}
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	242 opmap = [['user', getname], ['number', str], ['changeset', getnode]]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	243 if not ops['user'] and not ops['changeset']:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	244 ops['number'] = 1
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	245
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 221 diff changeset	246 node = repo.dirstate.parents()[0]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	247 if ops['revision']:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	248 node = repo.changelog.lookup(ops['revision'])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	249 change = repo.changelog.read(node)
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	250 mmap = repo.manifest.read(change[0])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	251 for f in relpath(repo, (file,) + files):
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	252 lines = repo.file(f).annotate(mmap[f])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	253 pieces = []
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	254
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	255 for o, f in opmap:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	256 if ops[o]:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	257 l = [ f(n) for n,t in lines ]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	258 m = max(map(len, l))
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	259 pieces.append([ "%*s" % (m, x) for x in l])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	260
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	261 for p,l in zip(zip(*pieces), lines):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	262 u.write(" ".join(p) + ": " + l[1])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	263
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	264 def cat(ui, repo, file, rev = []):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	265 """output the latest or given revision of a file"""
281 574420507d8c hg cat: relative file support mpm@selenic.com parents: 276 diff changeset	266 r = repo.file(relpath(repo, [file])[0])
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	267 n = r.tip()
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	268 if rev: n = r.lookup(rev)
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	269 sys.stdout.write(r.read(n))
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	270
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	271 def clone(ui, source, dest = None, **opts):
c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	272 """make a copy of an existing repository"""
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 505 diff changeset	273 source = ui.expandpath(source)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	274
c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	275 if dest is None:
528 648386fabf9c Fix clone bug wth trailing slash mpm@selenic.com parents: 527 diff changeset	276 dest = os.path.basename(os.path.normpath(source))
532 2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	277
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	278 if os.path.exists(dest):
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	279 ui.warn("abort: destination '%s' already exists\n" % dest)
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	280 return 1
523 003df62ae39f [PATCH] Force "hg clone" to always create a new directory mpm@selenic.com parents: 522 diff changeset	281
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	282 class dircleanup:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	283 def __init__(self, dir):
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	284 self.dir = dir
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	285 os.mkdir(dir)
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	286 def close(self):
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	287 self.dir = None
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	288 def __del__(self):
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	289 if self.dir:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	290 import shutil
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	291 shutil.rmtree(self.dir, True)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	292
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	293 d = dircleanup(dest)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	294
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	295 link = 0
542 eda4c32c167a Merge with upstream Thomas Arendsen Hein <thomas@intevation.de> parents: 541 535 diff changeset	296 if not (source.startswith("http://") or
eda4c32c167a Merge with upstream Thomas Arendsen Hein <thomas@intevation.de> parents: 541 535 diff changeset	297 source.startswith("hg://") or
eda4c32c167a Merge with upstream Thomas Arendsen Hein <thomas@intevation.de> parents: 541 535 diff changeset	298 source.startswith("old-http://")):
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	299 d1 = os.stat(dest).st_dev
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	300 d2 = os.stat(source).st_dev
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	301 if d1 == d2: link = 1
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	302
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	303 if link:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	304 ui.note("copying by hardlink\n")
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	305 util.system("cp -al '%s'/.hg '%s'/.hg" % (source, dest))
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	306 try:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	307 os.remove(os.path.join(dest, ".hg", "dirstate"))
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	308 except: pass
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	309
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	310 repo = hg.repository(ui, dest)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	311
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	312 else:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	313 repo = hg.repository(ui, dest, create=1)
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	314 other = hg.repository(ui, source)
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	315 fetch = repo.findincoming(other)
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	316 if fetch:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	317 cg = other.changegroup(fetch)
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	318 repo.addchangegroup(cg)
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	319
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	320 f = repo.opener("hgrc", "w")
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	321 f.write("[paths]\n")
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	322 f.write("default = %s\n" % source)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	323
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	324 if not opts['noupdate']:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	325 update(ui, repo)
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	326
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	327 d.close()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	328
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	329 def commit(ui, repo, files, *opts):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	330 """commit the specified files or all outstanding changes"""
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	331 text = opts['text']
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	332 if not text and opts['logfile']:
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	333 try: text = open(opts['logfile']).read()
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	334 except IOError: pass
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	335
354 e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	336 if opts['addremove']:
e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	337 addremove(ui, repo, *files)
317 b18ce742566a hg commit: user and date options mpm@selenic.com parents: 312 diff changeset	338 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	339
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	340 def copy(ui, repo, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	341 """mark a file as copied or renamed for the next commit"""
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	342 return repo.copy(*relpath(repo, (source, dest)))
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	343
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	344 def debugcheckdirstate(ui, repo):
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	345 parent1, parent2 = repo.dirstate.parents()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	346 dc = repo.dirstate.dup()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	347 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	348 keys.sort()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	349 m1n = repo.changelog.read(parent1)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	350 m2n = repo.changelog.read(parent2)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	351 m1 = repo.manifest.read(m1n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	352 m2 = repo.manifest.read(m2n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	353 errors = 0
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	354 for f in dc:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	355 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	356 if state in "nr" and f not in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	357 print "%s in state %s, but not listed in manifest1" % (f, state)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	358 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	359 if state in "a" and f in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	360 print "%s in state %s, but also listed in manifest1" % (f, state)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	361 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	362 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	363 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	364 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	365 for f in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	366 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	367 if state not in "nrm":
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	368 print "%s in manifest1, but listed as state %s" % (f, state)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	369 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	370 if errors:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	371 print ".hg/dirstate inconsistent with current parent's manifest, aborting"
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	372 sys.exit(1)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	373
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	374 def debugdumpdirstate(ui, repo):
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	375 dc = repo.dirstate.dup()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	376 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	377 keys.sort()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	378 for file in keys:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	379 print "%s => %c" % (file, dc[file][0])
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	380
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	381 def debugindex(ui, file):
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 404 diff changeset	382 r = hg.revlog(hg.opener(""), file, "")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	383 print " rev offset length base linkrev"+\
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	384 " p1 p2 nodeid"
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	385 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	386 e = r.index[i]
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	387 print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % (
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	388 i, e[0], e[1], e[2], e[3],
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	389 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	390
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	391 def debugindexdot(ui, file):
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 404 diff changeset	392 r = hg.revlog(hg.opener(""), file, "")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	393 print "digraph G {"
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	394 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	395 e = r.index[i]
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	396 print "\t%d -> %d" % (r.rev(e[4]), i)
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	397 if e[5] != hg.nullid:
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	398 print "\t%d -> %d" % (r.rev(e[5]), i)
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	399 print "}"
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	400
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	401 def diff(ui, repo, files, *opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	402 """diff working directory (or selected files)"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	403 revs = []
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	404 if opts['rev']:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	405 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	406
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	407 if len(revs) > 2:
480 430a10669928 Fixed call to ui.warn() Thomas Arendsen Hein <thomas@intevation.de> parents: 479 diff changeset	408 ui.warn("too many revisions to diff\n")
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	409 sys.exit(1)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	410
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	411 if files:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	412 files = relpath(repo, files)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	413 else:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	414 files = relpath(repo, [""])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	415
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	416 dodiff(ui, repo, os.getcwd(), files, *revs)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	417
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	418 def export(ui, repo, changeset):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	419 """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	420 node = repo.lookup(changeset)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	421 prev, other = repo.changelog.parents(node)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	422 change = repo.changelog.read(node)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	423 print "# HG changeset patch"
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	424 print "# User %s" % change[1]
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	425 print "# Node ID %s" % hg.hex(node)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	426 print "# Parent %s" % hg.hex(prev)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	427 print
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	428 if other != hg.nullid:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	429 print "# Parent %s" % hg.hex(other)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	430 print change[4].rstrip()
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	431 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	432
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	433 dodiff(ui, repo, "", None, prev, node)
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	434
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	435 def forget(ui, repo, file, *files):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	436 """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	437 repo.forget(relpath(repo, (file,) + files))
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	438
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	439 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	440 """show current repository heads"""
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	441 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	442 show_changeset(ui, repo, changenode=n)
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	443
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	444 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	445 """print information about the working copy"""
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	446 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	447 if not parents:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	448 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	449 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	450
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	451 hexfunc = ui.verbose and hg.hex or hg.short
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	452 (c, a, d, u) = repo.diffdir(repo.root)
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	453 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	454 (c or a or d) and "+" or "")]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	455
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	456 if not ui.quiet:
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	457 # multiple tags for a single parent separated by '/'
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	458 parenttags = ['/'.join(tags)
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	459 for tags in map(repo.nodetags, parents) if tags]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	460 # tags for multiple parents separated by ' + '
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	461 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	462
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	463 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	464
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	465 def import_(ui, repo, patch1, patches, *opts):
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	466 """import an ordered set of patches"""
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	467 try:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	468 import psyco
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	469 psyco.full()
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	470 except:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	471 pass
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	472
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	473 patches = (patch1,) + patches
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	474
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	475 d = opts["base"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	476 strip = opts["strip"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	477
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	478 for patch in patches:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	479 ui.status("applying %s\n" % patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	480 pf = os.path.join(d, patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	481
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	482 text = ""
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	483 for l in file(pf):
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	484 if l[:4] == "--- ": break
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	485 text += l
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	486
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	487 # make sure text isn't empty
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	488 if not text: text = "imported patch %s\n" % patch
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	489
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	490 f = os.popen("patch -p%d < %s" % (strip, pf))
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	491 files = []
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	492 for l in f.read().splitlines():
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	493 l.rstrip('\r\n');
481 2705d20f77c9 hg import checking for quiet mode didn't work. Fixed using the ui module. Thomas Arendsen Hein <thomas@intevation.de> parents: 480 diff changeset	494 ui.status("%s\n" % l)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	495 if l[:14] == 'patching file ':
443 470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	496 pf = l[14:]
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	497 if pf not in files:
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	498 files.append(pf)
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	499 patcherr = f.close()
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	500 if patcherr:
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	501 sys.stderr.write("patch failed")
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	502 sys.exit(1)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	503
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	504 if len(files) > 0:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	505 addremove(ui, repo, *files)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	506 repo.commit(files, text)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	507
496 6ce95a04999d [PATCH] simplify init mpm@selenic.com parents: 495 diff changeset	508 def init(ui, source=None):
6ce95a04999d [PATCH] simplify init mpm@selenic.com parents: 495 diff changeset	509 """create a new repository in the current directory"""
290 07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	510
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	511 if source:
496 6ce95a04999d [PATCH] simplify init mpm@selenic.com parents: 495 diff changeset	512 ui.warn("no longer supported: use \"hg clone\" instead\n")
6ce95a04999d [PATCH] simplify init mpm@selenic.com parents: 495 diff changeset	513 sys.exit(1)
6ce95a04999d [PATCH] simplify init mpm@selenic.com parents: 495 diff changeset	514 repo = hg.repository(ui, ".", create=1)
338 1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	515
509 98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	516 def log(ui, repo, f = None):
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	517 """show the revision history of the repository or a single file"""
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	518 if f:
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	519 f = relpath(repo, [f])[0]
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	520 r = repo.file(f)
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	521 for i in range(r.count() - 1, -1, -1):
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	522 show_changeset(ui, repo, filelog=r, rev=i)
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	523 else:
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	524 for i in range(repo.changelog.count() - 1, -1, -1):
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	525 show_changeset(ui, repo, rev=i)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	526
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	527 def manifest(ui, repo, rev = []):
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	528 """output the latest or given revision of the project manifest"""
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	529 n = repo.manifest.tip()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	530 if rev:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	531 n = repo.manifest.lookup(rev)
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	532 m = repo.manifest.read(n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	533 mf = repo.manifest.readflags(n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	534 files = m.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	535 files.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	536
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	537 for f in files:
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	538 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	539
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	540 def parents(ui, repo, node = None):
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	541 '''show the parents of the current working dir'''
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	542 if node:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	543 p = repo.changelog.parents(repo.lookup(hg.bin(node)))
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	544 else:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	545 p = repo.dirstate.parents()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	546
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	547 for n in p:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	548 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	549 show_changeset(ui, repo, changenode=n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	550
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	551 def pull(ui, repo, source="default", **opts):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	552 """pull changes from the specified source"""
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 505 diff changeset	553 source = ui.expandpath(source)
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	554
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	555 ui.status('pulling from %s\n' % (source))
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	556
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	557 other = hg.repository(ui, source)
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	558 fetch = repo.findincoming(other)
522 2f1de824798a Fix empty pull bug that appeared this morning mpm@selenic.com parents: 518 diff changeset	559 if not fetch:
2f1de824798a Fix empty pull bug that appeared this morning mpm@selenic.com parents: 518 diff changeset	560 ui.status("no changes found\n")
2f1de824798a Fix empty pull bug that appeared this morning mpm@selenic.com parents: 518 diff changeset	561 return
2f1de824798a Fix empty pull bug that appeared this morning mpm@selenic.com parents: 518 diff changeset	562
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	563 cg = other.changegroup(fetch)
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	564 r = repo.addchangegroup(cg)
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	565 if cg and not r:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	566 if opts['update']:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	567 return update(ui, repo)
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	568 else:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	569 ui.status("(run 'hg update' to get a working copy)\n")
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	570
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	571 return r
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	572
371 6e3436082697 hg push: "default-push" default target path mpm@selenic.com parents: 367 diff changeset	573 def push(ui, repo, dest="default-push"):
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	574 """push changes to the specified destination"""
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 505 diff changeset	575 dest = ui.expandpath(dest)
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	576
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	577 if not dest.startswith("ssh://"):
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	578 ui.warn("abort: can only push to ssh:// destinations currently\n")
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	579 return 1
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	580
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	581 m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', dest)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	582 if not m:
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	583 ui.warn("abort: couldn't parse destination %s\n" % dest)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	584 return 1
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	585
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	586 user, host, port, path = map(m.group, (2, 3, 5, 7))
526 55af04e26bad show connect message on push mpm@selenic.com parents: 525 diff changeset	587 uhost = user and ("%s@%s" % (user, host)) or host
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	588 port = port and (" -p %s") % port or ""
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	589 path = path or ""
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	590
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	591 sport = random.randrange(30000, 60000)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	592 cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'"
526 55af04e26bad show connect message on push mpm@selenic.com parents: 525 diff changeset	593 cmd = cmd % (uhost, port, sport+1, sport, path, sport+1)
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	594
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	595 child = os.fork()
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	596 if not child:
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	597 sys.stdout = file("/dev/null", "w")
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	598 sys.stderr = sys.stdout
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	599 hgweb.server(repo.root, "pull", "", "localhost", sport)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	600 else:
526 55af04e26bad show connect message on push mpm@selenic.com parents: 525 diff changeset	601 ui.status("connecting to %s\n" % host)
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	602 r = os.system(cmd)
9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	603 os.kill(child, signal.SIGTERM)
320 292e10b5831a hg push: propagate return code mpm@selenic.com parents: 319 diff changeset	604 return r
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	605
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	606 def rawcommit(ui, repo, flist, *rc):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	607 "raw commit interface"
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	608
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	609 text = rc['text']
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	610 if not text and rc['logfile']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	611 try: text = open(rc['logfile']).read()
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	612 except IOError: pass
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	613 if not text and not rc['logfile']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	614 print "missing commit text"
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	615 return 1
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	616
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	617 files = relpath(repo, list(flist))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	618 if rc['files']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	619 files += open(rc['files']).read().splitlines()
452 a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	620
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	621 rc['parent'] = map(repo.lookup, rc['parent'])
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	622
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	623 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	624
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	625 def recover(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	626 """roll back an interrupted transaction"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	627 repo.recover()
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	628
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	629 def remove(ui, repo, file, *files):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	630 """remove the specified files on the next commit"""
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	631 repo.remove(relpath(repo, (file,) + files))
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	632
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	633 def root(ui, repo):
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	634 """print the root (top) of the current working dir"""
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	635 ui.write(repo.root + "\n")
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	636
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	637 def serve(ui, repo, **opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	638 """export the repository via HTTP"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	639 hgweb.server(repo.root, opts["name"], opts["templates"],
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	640 opts["address"], opts["port"])
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	641
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	642 def status(ui, repo):
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	643 '''show changed files in the working directory
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	644
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	645 C = changed
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	646 A = added
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	647 R = removed
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	648 ? = not tracked'''
312 09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	649
09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	650 (c, a, d, u) = repo.diffdir(os.getcwd())
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 219 diff changeset	651 (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	652
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	653 for f in c: print "C", f
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 219 diff changeset	654 for f in a: print "A", f
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	655 for f in d: print "R", f
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 219 diff changeset	656 for f in u: print "?", f
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	657
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	658 def tag(ui, repo, name, rev = None, **opts):
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	659 """add a tag for the current tip or a given revision"""
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	660
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	661 if name == "tip":
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	662 ui.warn("abort: 'tip' is a reserved name!\n")
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	663 return -1
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	664
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	665 (c, a, d, u) = repo.diffdir(repo.root)
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	666 for x in (c, a, d, u):
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	667 if ".hgtags" in x:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	668 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	669 ui.status("(please commit .hgtags manually)\n")
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	670 return -1
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	671
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	672 if rev:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	673 r = hg.hex(repo.lookup(rev))
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	674 else:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	675 r = hg.hex(repo.changelog.tip())
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	676
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	677 add = 0
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	678 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	679 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	680 if add: repo.add([".hgtags"])
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	681
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	682 if not opts['text']:
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	683 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	684
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	685 repo.commit([".hgtags"], opts['text'], opts['user'], opts['date'])
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	686
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	687 def tags(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	688 """list repository tags"""
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	689
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	690 l = repo.tagslist()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	691 l.reverse()
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	692 for t, n in l:
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	693 try:
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	694 r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	695 except KeyError:
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	696 r = " ?:?"
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	697 ui.write("%-30s %s\n" % (t, r))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	698
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	699 def tip(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	700 """show the tip revision"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	701 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	702 show_changeset(ui, repo, changenode=n)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	703
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	704 def undo(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	705 """undo the last transaction"""
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	706 repo.undo()
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	707
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	708 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	709 '''update or merge working directory
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	710
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	711 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	712 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	713 requested version, the result is the requested version.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	714
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	715 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	716 current working directory and the requested version. Files that
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	717 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	718 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	719 are allowed.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	720 '''
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	721 node = node and repo.lookup(node) or repo.changelog.tip()
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	722 return repo.update(node, allow=merge, force=clean)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	723
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	724 def verify(ui, repo):
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	725 """verify the integrity of the repository"""
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	726 return repo.verify()
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	727
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	728 # Command options and aliases are listed here, alphabetically
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	729
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	730 table = {
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	731 "add": (add, [], "hg add [files]"),
353 dda243bb34b3 hg addremove: take optional files list mpm@selenic.com parents: 350 diff changeset	732 "addremove": (addremove, [], "hg addremove [files]"),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	733 "annotate": (annotate,
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	734 [('r', 'revision', '', 'revision'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	735 ('u', 'user', None, 'show user'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	736 ('n', 'number', None, 'show revision number'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	737 ('c', 'changeset', None, 'show changeset')],
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	738 'hg annotate [-u] [-c] [-n] [-r id] [files]'),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	739 "cat": (cat, [], 'hg cat <file> [rev]'),
505 dc1f735dfaac [PATCH] Fix "no-update" option to clone mpm@selenic.com parents: 503 diff changeset	740 "clone": (clone, [('U', 'noupdate', None, 'skip update after cloning')],
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	741 'hg clone [options] <source> [dest]'),
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	742 "commit\|ci": (commit,
266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	743 [('t', 'text', "", 'commit text'),
354 e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	744 ('A', 'addremove', None, 'run add/remove during commit'),
317 b18ce742566a hg commit: user and date options mpm@selenic.com parents: 312 diff changeset	745 ('l', 'logfile', "", 'commit text file'),
b18ce742566a hg commit: user and date options mpm@selenic.com parents: 312 diff changeset	746 ('d', 'date', "", 'data'),
b18ce742566a hg commit: user and date options mpm@selenic.com parents: 312 diff changeset	747 ('u', 'user', "", 'user')],
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	748 'hg commit [files]'),
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	749 "copy": (copy, [], 'hg copy <source> <dest>'),
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	750 "debugcheckdirstate": (debugcheckdirstate, [], 'debugcheckdirstate'),
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	751 "debugdumpdirstate": (debugdumpdirstate, [], 'debugdumpdirstate'),
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	752 "debugindex": (debugindex, [], 'debugindex <file>'),
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	753 "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	754 "diff": (diff, [('r', 'rev', [], 'revision')],
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	755 'hg diff [-r A] [-r B] [files]'),
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	756 "export": (export, [], "hg export <changeset>"),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	757 "forget": (forget, [], "hg forget [files]"),
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	758 "heads": (heads, [], 'hg heads'),
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	759 "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	760 "identify\|id": (identify, [], 'hg identify'),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	761 "import\|patch": (import_,
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	762 [('p', 'strip', 1, 'path strip'),
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	763 ('b', 'base', "", 'base path')],
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	764 "hg import [options] <patches>"),
496 6ce95a04999d [PATCH] simplify init mpm@selenic.com parents: 495 diff changeset	765 "init": (init, [], 'hg init'),
509 98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	766 "log\|history": (log, [], 'hg log [file]'),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	767 "manifest": (manifest, [], 'hg manifest [rev]'),
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 221 diff changeset	768 "parents": (parents, [], 'hg parents [node]'),
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	769 "pull": (pull,
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	770 [('u', 'update', None, 'update working directory')],
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	771 'hg pull [options] [source]'),
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	772 "push": (push, [], 'hg push <destination>'),
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	773 "rawcommit": (rawcommit,
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	774 [('p', 'parent', [], 'parent'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	775 ('d', 'date', "", 'data'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	776 ('u', 'user', "", 'user'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	777 ('F', 'files', "", 'file list'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	778 ('t', 'text', "", 'commit text'),
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	779 ('l', 'logfile', "", 'commit text file')],
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	780 'hg rawcommit [options] [files]'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	781 "recover": (recover, [], "hg recover"),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	782 "remove\|rm": (remove, [], "hg remove [files]"),
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	783 "root": (root, [], "hg root"),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	784 "serve": (serve, [('p', 'port', 8000, 'listen port'),
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	785 ('a', 'address', '', 'interface address'),
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	786 ('n', 'name', os.getcwd(), 'repository name'),
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	787 ('t', 'templates', "", 'template map')],
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	788 "hg serve [options]"),
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	789 "status": (status, [], 'hg status'),
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	790 "tag": (tag, [('t', 'text', "", 'commit text'),
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	791 ('d', 'date', "", 'date'),
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	792 ('u', 'user', "", 'user')],
af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	793 'hg tag [options] <name> [rev]'),
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	794 "tags": (tags, [], 'hg tags'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	795 "tip": (tip, [], 'hg tip'),
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	796 "undo": (undo, [], 'hg undo'),
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	797 "update\|up\|checkout\|co":
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	798 (update,
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	799 [('m', 'merge', None, 'allow merging of conflicts'),
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	800 ('C', 'clean', None, 'overwrite locally modified files')],
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	801 'hg update [options] [node]'),
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	802 "verify": (verify, [], 'hg verify'),
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	803 "version": (show_version, [], 'hg version'),
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	804 }
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	805
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	806 norepo = "clone init version help debugindex debugindexdot"
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	807
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	808 def find(cmd):
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	809 for e in table.keys():
335 74b9332faece Fix misrecognition of commands mpm@selenic.com parents: 333 diff changeset	810 if re.match("(%s)$" % e, cmd):
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	811 return table[e]
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	812
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	813 raise UnknownCommand(cmd)
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	814
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	815 class SignalInterrupt(Exception): pass
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	816
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	817 def catchterm(*args):
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	818 raise SignalInterrupt
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	819
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	820 def run():
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	821 sys.exit(dispatch(sys.argv[1:]))
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	822
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	823 def dispatch(args):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	824 options = {}
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	825 opts = [('v', 'verbose', None, 'verbose'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	826 ('d', 'debug', None, 'debug'),
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	827 ('q', 'quiet', None, 'quiet'),
309 61414da06fe5 add easy profiling support mpm@selenic.com parents: 306 diff changeset	828 ('p', 'profile', None, 'profile'),
517 9b884be92af2 Add --repository option mpm@selenic.com parents: 516 diff changeset	829 ('R', 'repository', "", 'repository root directory'),
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	830 ('', 'traceback', None, 'print traceback on exception'),
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	831 ('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	832 ('', 'version', None, 'output version information and exit'),
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	833 ]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	834
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	835 args = fancyopts.fancyopts(args, opts, options,
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	836 'hg [options] <command> [options] [files]')
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	837
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	838 if not args:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	839 cmd = "help"
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	840 else:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	841 cmd, args = args[0], args[1:]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	842
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	843 u = ui.ui(options["verbose"], options["debug"], options["quiet"],
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	844 not options["noninteractive"])
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	845
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	846 if options["version"]:
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	847 show_version(u)
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	848 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	849
252 5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	850 try:
5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	851 i = find(cmd)
5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	852 except UnknownCommand:
268 1634a7ea6748 unknown command fixups mpm@selenic.com parents: 266 diff changeset	853 u.warn("hg: unknown command '%s'\n" % cmd)
252 5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	854 help(u)
5eda6c542978 Handle unknown commands nicely mpm@selenic.com parents: 250 diff changeset	855 sys.exit(1)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	856
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	857 signal.signal(signal.SIGTERM, catchterm)
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	858
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	859 cmdoptions = {}
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	860 try:
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	861 args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2])
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	862 except fancyopts.getopt.GetoptError, inst:
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	863 u.warn("hg %s: %s\n" % (cmd, inst))
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	864 help(u, cmd)
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	865 sys.exit(-1)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	866
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	867 try:
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	868 try:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	869 if cmd not in norepo.split():
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	870 path = options["repository"] or ""
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	871 repo = hg.repository(ui=u, path=path)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	872 d = lambda: i[0](u, repo, args, *cmdoptions)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	873 else:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	874 d = lambda: i[0](u, args, *cmdoptions)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	875
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	876 if options['profile']:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	877 import hotshot, hotshot.stats
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	878 prof = hotshot.Profile("hg.prof")
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	879 r = prof.runcall(d)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	880 prof.close()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	881 stats = hotshot.stats.load("hg.prof")
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	882 stats.strip_dirs()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	883 stats.sort_stats('time', 'calls')
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	884 stats.print_stats(40)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	885 return r
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	886 else:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	887 return d()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	888 except:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	889 if options['traceback']:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	890 traceback.print_exc()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	891 raise
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 506 diff changeset	892 except util.CommandError, inst:
42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 506 diff changeset	893 u.warn("abort: %s\n" % inst.args)
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	894 except hg.RepoError, inst:
81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	895 u.warn("abort: ", inst, "!\n")
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	896 except SignalInterrupt:
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	897 u.warn("killed!\n")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	898 except KeyboardInterrupt:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	899 u.warn("interrupted!\n")
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	900 except IOError, inst:
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	901 if hasattr(inst, "code"):
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	902 u.warn("abort: %s\n" % inst)
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	903 elif hasattr(inst, "reason"):
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	904 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	905 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	906 u.warn("broken pipe\n")
45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	907 else:
45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	908 raise
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	909 except TypeError, inst:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	910 # was this an argument error?
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	911 tb = traceback.extract_tb(sys.exc_info()[2])
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	912 if len(tb) > 2: # no
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	913 raise
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	914 u.debug(inst, "\n")
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	915 u.warn("%s: invalid arguments\n" % i[0].__name__)
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	916 help(u, cmd)
11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	917
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	918 sys.exit(-1)
c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	919

Mercurial > public > mercurial-scm > hg

annotate mercurial/commands.py @ 546:c8ae964109c1