hg/gitweb: hg annotate

annotate hg @ 245:fef0f8e041aa

big heap of command clean-up work -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 big heap of command clean-up work Migrate add, forget, remove, commit, diff, addremove, tip, log, recover, and serve. Fix up filterfiles, relfilter, and relpath to be a bit more bulletproof Alphabetize functions and the command table Make everything in commands.py relative-path aware manifest hash: f0856031a7be4e49289677b467f29bcf24ebce4a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCof6gywK+sNU5EO8RAoW1AJsHu8vchPSjls7wVbvsq/UKlGhqtgCgtnnl xSBxyf/TEVWjHIk3uTa8WSE= =YPMl -----END PGP SIGNATURE-----

author	mpm@selenic.com
date	Sat, 04 Jun 2005 11:18:56 -0800
parents	afe895fcc0d0
children	96cde50a746f

rev	line source
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1 #!/usr/bin/env python
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	3 # mercurial - a minimal scalable distributed SCM
193 0a28dfe59f8f Bump the version number to 0.5b for the protocol change mpm@selenic.com parents: 192 diff changeset	4 # v0.5b "katje"
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	5 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	6 # Copyright 2005 Matt Mackall <mpm@selenic.com>
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	8 # This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	9 # of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	10
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	11 # the psyco compiler makes commits a bit faster
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	12 # and makes changegroup merge about 20 times slower!
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	13 # try:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	14 # import psyco
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	15 # psyco.full()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	16 # except:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	17 # pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	18
23 018fb8d9ea8d Import time for hg history command mpm@selenic.com parents: 22 diff changeset	19 import sys, os, time
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: 207 diff changeset	20 from mercurial import hg, mdiff, fancyopts, ui, commands
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	21
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	22 def filterfiles(list, files):
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	23 l = [ x for x in list if x in files ]
31 642058291e74 diffdir tidy in preparation for arg handling mpm@selenic.com parents: 29 diff changeset	24
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	25 for f in files:
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	26 if f[-1] != os.sep: f += os.sep
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	27 l += [ x for x in list if x.startswith(f) ]
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	28 return l
31 642058291e74 diffdir tidy in preparation for arg handling mpm@selenic.com parents: 29 diff changeset	29
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	30 def diff(files = None, node1 = None, node2 = None):
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	31 def date(c):
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	32 return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	33
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	34 if node2:
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	35 change = repo.changelog.read(node2)
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	36 mmap2 = repo.manifest.read(change[0])
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	37 (c, a, d) = repo.diffrevs(node1, node2)
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	38 def read(f): return repo.file(f).read(mmap2[f])
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	39 date2 = date(change)
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	40 else:
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	41 date2 = time.asctime()
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	42 if not node1:
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 226 diff changeset	43 node1 = repo.dirstate.parents()[0]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 219 diff changeset	44 (c, a, d, u) = repo.diffdir(repo.root, node1)
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	45 def read(f): return file(os.path.join(repo.root, f)).read()
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	46
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	47 change = repo.changelog.read(node1)
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	48 mmap = repo.manifest.read(change[0])
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	49 date1 = date(change)
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	50
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	51 if files:
129 1db9207def07 Fix diff and export not showing added files mpm@selenic.com parents: 124 diff changeset	52 c, a, d = map(lambda x: filterfiles(x, files), (c, a, d))
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	53
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	54 for f in c:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 219 diff changeset	55 to = repo.file(f).read(mmap[f])
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	56 tn = read(f)
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	57 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
129 1db9207def07 Fix diff and export not showing added files mpm@selenic.com parents: 124 diff changeset	58 for f in a:
1db9207def07 Fix diff and export not showing added files mpm@selenic.com parents: 124 diff changeset	59 to = ""
1db9207def07 Fix diff and export not showing added files mpm@selenic.com parents: 124 diff changeset	60 tn = read(f)
1db9207def07 Fix diff and export not showing added files mpm@selenic.com parents: 124 diff changeset	61 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	62 for f in d:
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	63 to = repo.file(f).read(mmap[f])
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	64 tn = ""
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	65 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	66
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: 207 diff changeset	67
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: 207 diff changeset	68 try:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: 207 diff changeset	69 sys.exit(commands.dispatch(sys.argv[1:]))
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: 207 diff changeset	70 except commands.UnknownCommand:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: 207 diff changeset	71 # fall through
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: 207 diff changeset	72 pass
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: 207 diff changeset	73
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	74 options = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	75 opts = [('v', 'verbose', None, 'verbose'),
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	76 ('d', 'debug', None, 'debug'),
107 707a7481a861 Make prompting go mpm@selenic.com parents: 106 diff changeset	77 ('q', 'quiet', None, 'quiet'),
707a7481a861 Make prompting go mpm@selenic.com parents: 106 diff changeset	78 ('y', 'noninteractive', None, 'run non-interactively'),
707a7481a861 Make prompting go mpm@selenic.com parents: 106 diff changeset	79 ]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	80
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	81 args = fancyopts.fancyopts(sys.argv[1:], opts, options,
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	82 'hg [options] <command> [command options] [files]')
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	83
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	84 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	85 cmd = args[0]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	86 args = args[1:]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	87 except:
206 3295b6b508de hg: don't complain about missing repo with no args mpm@selenic.com parents: 203 diff changeset	88 cmd = "help"
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	89
207 ec327cf0d3a9 Move ui class to its own module mpm@selenic.com parents: 206 diff changeset	90 ui = ui.ui(options["verbose"], options["debug"], options["quiet"],
107 707a7481a861 Make prompting go mpm@selenic.com parents: 106 diff changeset	91 not options["noninteractive"])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	92
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 210 diff changeset	93 try:
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 210 diff changeset	94 repo = hg.repository(ui=ui)
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 210 diff changeset	95 except IOError:
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 210 diff changeset	96 ui.warn("Unable to open repository\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	97 sys.exit(0)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	98
103 33500fe7d56c adding subdir support for log and status commands jake@edge2.net parents: 70 diff changeset	99 relpath = None
33500fe7d56c adding subdir support for log and status commands jake@edge2.net parents: 70 diff changeset	100 if os.getcwd() != repo.root:
33500fe7d56c adding subdir support for log and status commands jake@edge2.net parents: 70 diff changeset	101 relpath = os.getcwd()[len(repo.root) + 1: ]
33500fe7d56c adding subdir support for log and status commands jake@edge2.net parents: 70 diff changeset	102
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	103 elif cmd == "rawcommit":
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	104 "raw commit interface"
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	105 rc = {}
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	106 opts = [('p', 'parent', [], 'parent'),
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	107 ('d', 'date', "", 'data'),
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	108 ('u', 'user', "", 'user'),
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	109 ('F', 'files', "", 'file list'),
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	110 ('t', 'text', "", 'commit text'),
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	111 ('l', 'logfile', "", 'commit text file')
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	112 ]
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	113 args = fancyopts.fancyopts(args, opts, rc,
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	114 "hg rawcommit [options] files")
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	115 text = rc['text']
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	116 if not text and rc['logfile']:
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	117 try: text = open(rc['logfile']).read()
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	118 except IOError: pass
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	119 if not text and not rc['logfile']:
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	120 print "missing commit text"
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	121 sys.exit(0)
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	122 if rc['files']:
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	123 files = open(rc['files']).read().splitlines()
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	124 else:
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	125 files = args
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	126
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	127 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	128
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 198 diff changeset	129
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	130 elif cmd == "import" or cmd == "patch":
69 ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	131 try:
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	132 import psyco
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	133 psyco.full()
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	134 except:
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	135 pass
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	136
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	137 ioptions = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	138 opts = [('p', 'strip', 1, 'path strip'),
50 0263ce8be574 Add -q option to import mpm@selenic.com parents: 49 diff changeset	139 ('b', 'base', "", 'base path'),
0263ce8be574 Add -q option to import mpm@selenic.com parents: 49 diff changeset	140 ('q', 'quiet', "", 'silence diff')
0263ce8be574 Add -q option to import mpm@selenic.com parents: 49 diff changeset	141 ]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	142
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	143 args = fancyopts.fancyopts(args, opts, ioptions,
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	144 'hg import [options] <patch names>')
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	145 d = ioptions["base"]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	146 strip = ioptions["strip"]
50 0263ce8be574 Add -q option to import mpm@selenic.com parents: 49 diff changeset	147 quiet = ioptions["quiet"] and "> /dev/null" or ""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	148
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	149 for patch in args:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	150 ui.status("applying %s\n" % patch)
49 14bff5d8e526 Import comments from patches mpm@selenic.com parents: 46 diff changeset	151 pf = os.path.join(d, patch)
14bff5d8e526 Import comments from patches mpm@selenic.com parents: 46 diff changeset	152
62 022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	153 text = ""
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	154 for l in file(pf):
69 ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	155 if l[:4] == "--- ": break
62 022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	156 text += l
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	157
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	158 f = os.popen("lsdiff --strip %d %s" % (strip, pf))
54 b24731008221 Fix lsdiff filtering mpm@selenic.com parents: 53 diff changeset	159 files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines()))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	160 f.close()
69 ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	161
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	162 if files:
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	163 if os.system("patch -p%d < %s %s" % (strip, pf, quiet)):
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	164 raise "patch failed!"
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 226 diff changeset	165 repo.commit(files, text)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	166
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	167 elif cmd == "export":
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	168 node = repo.lookup(args[0])
68 6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	169 prev, other = repo.changelog.parents(node)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	170 change = repo.changelog.read(node)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	171 print "# HG changeset patch"
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	172 print "# User %s" % change[1]
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	173 print "# Node ID %s" % hg.hex(node)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	174 print "# Parent %s" % hg.hex(prev)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	175 print
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	176 if other != hg.nullid:
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	177 print "# Parent %s" % hg.hex(other)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	178 print change[4]
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	179
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	180 diff(None, prev, node)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	181
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	182 elif cmd == "debugchangegroup":
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	183 newer = repo.newer(map(repo.lookup, args))
62 022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	184 for chunk in repo.changegroup(newer):
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	185 sys.stdout.write(chunk)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	186
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	187 elif cmd == "debugaddchangegroup":
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	188 data = sys.stdin.read()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	189 repo.addchangegroup(data)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	190
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	191 elif cmd == "history":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	192 for i in range(repo.changelog.count()):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	193 n = repo.changelog.node(i)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	194 changes = repo.changelog.read(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	195 (p1, p2) = repo.changelog.parents(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	196 (h, h1, h2) = map(hg.hex, (n, p1, p2))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	197 (i1, i2) = map(repo.changelog.rev, (p1, p2))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	198 print "rev: %4d:%s" % (i, h)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	199 print "parents: %4d:%s" % (i1, h1)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	200 if i2: print " %4d:%s" % (i2, h2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	201 print "manifest: %4d:%s" % (repo.manifest.rev(changes[0]),
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	202 hg.hex(changes[0]))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	203 print "user:", changes[1]
21 54a57a5ebcb1 Show date in history mpm@selenic.com parents: 18 diff changeset	204 print "date:", time.asctime(
54a57a5ebcb1 Show date in history mpm@selenic.com parents: 18 diff changeset	205 time.localtime(float(changes[2].split(' ')[0])))
123 b93cc016eec9 hg history: don't print file list without -v switch mpm@selenic.com parents: 122 diff changeset	206 if ui.verbose: print "files:", " ".join(changes[3])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	207 print "description:"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	208 print changes[4]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	209
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	210 elif cmd == "dump":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	211 if args:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	212 r = repo.file(args[0])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	213 n = r.tip()
39 adf70fffca9f Add lookup smarts everywhere mpm@selenic.com parents: 38 diff changeset	214 if len(args) > 1: n = r.lookup(args[1])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	215 sys.stdout.write(r.read(n))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	216 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	217 print "missing filename"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	218
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	219 elif cmd == "dumpmanifest":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	220 n = repo.manifest.tip()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	221 if len(args) > 0:
39 adf70fffca9f Add lookup smarts everywhere mpm@selenic.com parents: 38 diff changeset	222 n = repo.manifest.lookup(args[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	223 m = repo.manifest.read(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	224 files = m.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	225 files.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	226
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	227 for f in files:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	228 print hg.hex(m[f]), f
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	229
24 57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	230 elif cmd == "debugindex":
91 1c212bbb38d5 hack so that debugindex takes filenames mpm@selenic.com parents: 89 diff changeset	231 if ".hg" not in args[0]:
1c212bbb38d5 hack so that debugindex takes filenames mpm@selenic.com parents: 89 diff changeset	232 args[0] = ".hg/data/" + repo.file(args[0]).encodepath(args[0]) + "i"
1c212bbb38d5 hack so that debugindex takes filenames mpm@selenic.com parents: 89 diff changeset	233
24 57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	234 r = hg.revlog(open, args[0], "")
70 ce080e8eccd7 Fix debugindex formatting for large repos mpm@selenic.com parents: 69 diff changeset	235 print " rev offset length base linkrev"+\
24 57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	236 " p1 p2 nodeid"
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	237 for i in range(r.count()):
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	238 e = r.index[i]
70 ce080e8eccd7 Fix debugindex formatting for large repos mpm@selenic.com parents: 69 diff changeset	239 print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % (
24 57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	240 i, e[0], e[1], e[2], e[3],
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	241 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5]))
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	242
92 e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	243 elif cmd == "debugindexdot":
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	244 if ".hg" not in args[0]:
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	245 args[0] = ".hg/data/" + repo.file(args[0]).encodepath(args[0]) + "i"
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	246
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	247 r = hg.revlog(open, args[0], "")
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	248 print "digraph G {"
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	249 for i in range(r.count()):
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	250 e = r.index[i]
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	251 print "\t%d -> %d" % (r.rev(e[4]), i)
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	252 if e[5] != hg.nullid:
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	253 print "\t%d -> %d" % (r.rev(e[5]), i)
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	254 print "}"
e6fc7ff52246 Add debugindexdot to generate graphviz dot files from indexes mpm@selenic.com parents: 91 diff changeset	255
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	256 elif cmd == "merge":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	257 if args:
175 0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	258 paths = {}
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	259 try:
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	260 pf = os.path.join(os.environ["HOME"], ".hgpaths")
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	261 for l in file(pf):
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	262 name, path = l.split()
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	263 paths[name] = path
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	264 except:
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	265 pass
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	266
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	267 if args[0] in paths: args[0] = paths[args[0]]
0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	268
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	269 other = hg.repository(ui, args[0])
62 022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	270 cg = repo.getchangegroup(other)
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	271 repo.addchangegroup(cg)
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	272 else:
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	273 print "missing source repository"
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	274
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	275 elif cmd == "tags":
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	276 repo.lookup(0) # prime the cache
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	277 i = repo.tags.items()
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	278 i.sort()
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	279 for k, n in i:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	280 try:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	281 r = repo.changelog.rev(n)
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	282 except KeyError:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	283 r = "?"
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	284 print "%-30s %5d:%s" % (k, repo.changelog.rev(n), hg.hex(n))
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	285
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	286 elif cmd == "verify":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	287 filelinkrevs = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	288 filenodes = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	289 manifestchangeset = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	290 changesets = revisions = files = 0
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	291 errors = 0
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	292
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	293 ui.status("checking changesets\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	294 for i in range(repo.changelog.count()):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	295 changesets += 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	296 n = repo.changelog.node(i)
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	297 for p in repo.changelog.parents(n):
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	298 if p not in repo.changelog.nodemap:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	299 ui.warn("changeset %s has unknown parent %s\n" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	300 (hg.short(n), hg.short(p)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	301 errors += 1
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	302 try:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	303 changes = repo.changelog.read(n)
145 fbce9fc531d2 Minor fixes to verify mpm@selenic.com parents: 142 diff changeset	304 except Exception, inst:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	305 ui.warn("unpacking changeset %s: %s\n" % (short(n), inst))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	306 errors += 1
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	307
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	308 manifestchangeset[changes[0]] = n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	309 for f in changes[3]:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	310 filelinkrevs.setdefault(f, []).append(i)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	311
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	312 ui.status("checking manifests\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	313 for i in range(repo.manifest.count()):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	314 n = repo.manifest.node(i)
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	315 for p in repo.manifest.parents(n):
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	316 if p not in repo.manifest.nodemap:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	317 ui.warn("manifest %s has unknown parent %s\n" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	318 (hg.short(n), hg.short(p)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	319 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	320 ca = repo.changelog.node(repo.manifest.linkrev(n))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	321 cc = manifestchangeset[n]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	322 if ca != cc:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	323 ui.warn("manifest %s points to %s, not %s\n" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	324 (hg.hex(n), hg.hex(ca), hg.hex(cc)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	325 errors += 1
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	326
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	327 try:
121 66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	328 delta = mdiff.patchtext(repo.manifest.delta(n))
66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	329 except KeyboardInterrupt:
66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	330 print "aborted"
66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	331 sys.exit(0)
93 0b0efe409d79 Fix two bugs in verify mpm@selenic.com parents: 92 diff changeset	332 except Exception, inst:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	333 ui.warn("unpacking manifest %s: %s\n" % (hg.short(n), inst))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	334 errors += 1
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 130 diff changeset	335
121 66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	336 ff = [ l.split('\0') for l in delta.splitlines() ]
66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	337 for f, fn in ff:
66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	338 filenodes.setdefault(f, {})[hg.bin(fn)] = 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	339
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	340 ui.status("crosschecking files in changesets and manifests\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	341 for f in filenodes:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	342 if f not in filelinkrevs:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	343 ui.warn("file %s in manifest but not in changesets\n" % f)
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	344 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	345
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	346 for f in filelinkrevs:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	347 if f not in filenodes:
121 66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	348 ui.warn("file %s in changeset but not in manifest\n" % f)
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	349 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	350
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	351 ui.status("checking files\n")
121 66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	352 ff = filenodes.keys()
66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	353 ff.sort()
66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	354 for f in ff:
66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	355 if f == "/dev/null": continue
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	356 files += 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	357 fl = repo.file(f)
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	358 nodes = { hg.nullid: 1 }
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	359 for i in range(fl.count()):
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 220 diff changeset	360 revisions += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	361 n = fl.node(i)
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	362
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	363 if n not in filenodes[f]:
121 66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	364 ui.warn("%s: %d:%s not in manifests\n" % (f, i, hg.short(n)))
66fb61d9d97d Use revlog.delta and mdiff.patchtext to massively speed up processing mpm@selenic.com parents: 107 diff changeset	365 print len(filenodes[f].keys()), fl.count(), f
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	366 errors += 1
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	367 else:
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	368 del filenodes[f][n]
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	369
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	370 flr = fl.linkrev(n)
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	371 if flr not in filelinkrevs[f]:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	372 ui.warn("%s:%s points to unexpected changeset rev %d\n"
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	373 % (f, hg.short(n), fl.linkrev(n)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	374 errors += 1
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	375 else:
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	376 filelinkrevs[f].remove(flr)
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	377
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	378 # verify contents
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	379 try:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	380 t = fl.read(n)
145 fbce9fc531d2 Minor fixes to verify mpm@selenic.com parents: 142 diff changeset	381 except Exception, inst:
fbce9fc531d2 Minor fixes to verify mpm@selenic.com parents: 142 diff changeset	382 ui.warn("unpacking file %s %s: %s\n" % (f, hg.short(n), inst))
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	383 errors += 1
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	384
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	385 # verify parents
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	386 (p1, p2) = fl.parents(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	387 if p1 not in nodes:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	388 ui.warn("file %s:%s unknown parent 1 %s" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	389 (f, hg.short(n), hg.short(p1)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	390 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	391 if p2 not in nodes:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	392 ui.warn("file %s:%s unknown parent 2 %s" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	393 (f, hg.short(n), hg.short(p1)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	394 errors += 1
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	395 nodes[n] = 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	396
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	397 # cross-check
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	398 for node in filenodes[f]:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	399 ui.warn("node %s in manifests not in %s\n" % (hg.hex(n), f))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	400 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	401
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	402 ui.status("%d files, %d changesets, %d total revisions\n" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	403 (files, changesets, revisions))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	404
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	405 if errors:
93 0b0efe409d79 Fix two bugs in verify mpm@selenic.com parents: 92 diff changeset	406 ui.warn("%d integrity errors encountered!\n" % errors)
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	407 sys.exit(1)
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 155 diff changeset	408
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	409 else:
175 0eb6e2c9800d hg: remove some debug commands, improve help messages, add .hgpaths file mpm@selenic.com parents: 174 diff changeset	410 if cmd: ui.warn("unknown command\n\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	411 sys.exit(1)

Mercurial > hg > gitweb

annotate hg @ 245:fef0f8e041aa