hg/pyhgsh: hg annotate

annotate hg @ 87:b2b3fdbd79f4

Verify improvements: Check existence of parents of changesets and manifests Count errors Use ui for display Catch and count unpack exceptions Print error count and exit with non-zero status on error

author	mpm@selenic.com
date	Tue, 17 May 2005 12:23:53 -0800
parents	9fd5b35cfc45
children	d9913355961d

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
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	4 # v0.4f "jane dark"
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
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	20 from mercurial import hg, mdiff, fancyopts
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	21
18 2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	22 def help():
49 14bff5d8e526 Import comments from patches mpm@selenic.com parents: 46 diff changeset	23 print """\
18 2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	24 commands:
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	25
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	26 init create a new repository in this directory
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	27 branch <path> create a branch of <path> in this directory
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	28 merge <path> merge changes from <path> into local repository
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	29 checkout [changeset] checkout the latest or given changeset
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	30 status show new, missing, and changed files in working dir
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	31 add [files...] add the given files in the next commit
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	32 remove [files...] remove the given files in the next commit
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	33 addremove add all new files, delete all missing files
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	34 commit commit all changes to the repository
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	35 history show changeset history
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	36 log <file> show revision history of a single file
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	37 dump <file> [rev] dump the latest or given revision of a file
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	38 dumpmanifest [rev] dump the latest or given revision of the manifest
22 40b8c158c540 Document diff in help mpm@selenic.com parents: 21 diff changeset	39 diff [files...] diff working directory (or selected files)
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	40 tags show current changeset tags
81 17884f79d59d Add annotate and blame to the command list and README mpm@selenic.com parents: 80 diff changeset	41 annotate [files...] show changeset number per file line
17884f79d59d Add annotate and blame to the command list and README mpm@selenic.com parents: 80 diff changeset	42 blame [files...] show commit user per file line
18 2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	43 """
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	44
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	45 def filterfiles(list, files):
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	46 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	47
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	48 for f in files:
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	49 if f[-1] != os.sep: f += os.sep
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	50 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	51 return l
31 642058291e74 diffdir tidy in preparation for arg handling mpm@selenic.com parents: 29 diff changeset	52
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	53 def diff(files = None, node1 = None, node2 = None):
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	54 def date(c):
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	55 return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	56
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	57 if node2:
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	58 change = repo.changelog.read(node2)
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	59 mmap2 = repo.manifest.read(change[0])
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	60 (c, a, d) = repo.diffrevs(node1, node2)
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	61 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	62 date2 = date(change)
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	63 else:
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	64 date2 = time.asctime()
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	65 if not node1:
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	66 node1 = repo.current
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	67 (c, a, d) = repo.diffdir(repo.root, node1)
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	68 def read(f): return file(os.path.join(repo.root, f)).read()
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	69
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	70 change = repo.changelog.read(node1)
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	71 mmap = repo.manifest.read(change[0])
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	72 date1 = date(change)
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	73
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	74 if files:
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	75 (c, a, d) = map(lambda x: filterfiles(x, files), (c, a, d))
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	76
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	77 for f in c:
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	78 to = repo.file(f).read(mmap[f])
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	79 tn = read(f)
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	80 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	81 for f in a:
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	82 to = ""
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	83 tn = read(f)
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	84 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	85 for f in d:
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	86 to = repo.file(f).read(mmap[f])
8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	87 tn = ""
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	88 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	89
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	90 options = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	91 opts = [('v', 'verbose', None, 'verbose'),
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	92 ('d', 'debug', None, 'debug'),
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	93 ('q', 'quiet', None, 'quiet')]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	94
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	95 args = fancyopts.fancyopts(sys.argv[1:], opts, options,
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	96 'hg [options] <command> [command options] [files]')
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	97
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	98 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	99 cmd = args[0]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	100 args = args[1:]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	101 except:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	102 cmd = ""
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	103
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	104 ui = hg.ui(options["verbose"], options["debug"], options["quiet"])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	105
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	106 if cmd == "init":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	107 repo = hg.repository(ui, ".", create=1)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	108 sys.exit(0)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	109 elif cmd == "branch" or cmd == "clone":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	110 os.system("cp -al %s/.hg .hg" % args[0])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	111 sys.exit(0)
18 2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	112 elif cmd == "help":
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	113 help()
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	114 sys.exit(0)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	115 else:
18 2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	116 try:
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	117 repo = hg.repository(ui=ui)
74 401e18c95ad3 mpm@selenic.com parents: 70 diff changeset	118 except IOError:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	119 ui.warn("Unable to open repository\n")
18 2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	120 sys.exit(0)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	121
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	122 if cmd == "checkout" or cmd == "co":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	123 node = repo.changelog.tip()
39 adf70fffca9f Add lookup smarts everywhere mpm@selenic.com parents: 38 diff changeset	124 if args:
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	125 node = repo.lookup(args[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	126 repo.checkout(node)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	127
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	128 elif cmd == "add":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	129 repo.add(args)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	130
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	131 elif cmd == "remove" or cmd == "rm" or cmd == "del" or cmd == "delete":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	132 repo.remove(args)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	133
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	134 elif cmd == "commit" or cmd == "checkin" or cmd == "ci":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	135 if 1:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	136 if len(args) > 0:
31 642058291e74 diffdir tidy in preparation for arg handling mpm@selenic.com parents: 29 diff changeset	137 repo.commit(repo.current, args)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	138 else:
31 642058291e74 diffdir tidy in preparation for arg handling mpm@selenic.com parents: 29 diff changeset	139 repo.commit(repo.current)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	140
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	141 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	142 try:
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	143 import psyco
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	144 psyco.full()
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	145 except:
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	146 pass
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	147
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	148 ioptions = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	149 opts = [('p', 'strip', 1, 'path strip'),
50 0263ce8be574 Add -q option to import mpm@selenic.com parents: 49 diff changeset	150 ('b', 'base', "", 'base path'),
0263ce8be574 Add -q option to import mpm@selenic.com parents: 49 diff changeset	151 ('q', 'quiet', "", 'silence diff')
0263ce8be574 Add -q option to import mpm@selenic.com parents: 49 diff changeset	152 ]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	153
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	154 args = fancyopts.fancyopts(args, opts, ioptions,
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	155 'hg import [options] <patch names>')
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	156 d = ioptions["base"]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	157 strip = ioptions["strip"]
50 0263ce8be574 Add -q option to import mpm@selenic.com parents: 49 diff changeset	158 quiet = ioptions["quiet"] and "> /dev/null" or ""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	159
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	160 for patch in args:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	161 ui.status("applying %s\n" % patch)
49 14bff5d8e526 Import comments from patches mpm@selenic.com parents: 46 diff changeset	162 pf = os.path.join(d, patch)
14bff5d8e526 Import comments from patches mpm@selenic.com parents: 46 diff changeset	163
62 022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	164 text = ""
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	165 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	166 if l[:4] == "--- ": break
62 022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	167 text += l
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	168
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	169 f = os.popen("lsdiff --strip %d %s" % (strip, pf))
54 b24731008221 Fix lsdiff filtering mpm@selenic.com parents: 53 diff changeset	170 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	171 f.close()
69 ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	172
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	173 if files:
ab03c7a52cf2 Minor changes to import so that we can successfully import Ingo's mpm@selenic.com parents: 68 diff changeset	174 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	175 raise "patch failed!"
49 14bff5d8e526 Import comments from patches mpm@selenic.com parents: 46 diff changeset	176 repo.commit(repo.current, files, text)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	177
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	178 elif cmd == "status":
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	179 (c, a, d) = repo.diffdir(repo.root, repo.current)
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	180 for f in c: ui.status("C %s\n" % f)
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	181 for f in a: ui.status("? %s\n" % f)
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	182 for f in d: ui.status("R %s\n" % f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	183
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	184 elif cmd == "diff":
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	185 revs = []
31 642058291e74 diffdir tidy in preparation for arg handling mpm@selenic.com parents: 29 diff changeset	186
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	187 if args:
38 ed1d3e3ca8e0 Add improved rev lookup to diff and export mpm@selenic.com parents: 34 diff changeset	188 doptions = {}
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	189 opts = [('r', 'revision', [], 'revision')]
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	190 args = fancyopts.fancyopts(args, opts, doptions,
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	191 'hg diff [options] [files]')
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	192 revs = map(lambda x: repo.lookup(x), doptions['revision'])
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	193
98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	194 if len(revs) > 2:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	195 self.ui.warn("too many revisions to diff\n")
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	196 sys.exit(1)
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	197
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	198 if os.getcwd() != repo.root:
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	199 relpath = os.getcwd()[len(repo.root) + 1: ]
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	200 if not args: args = [ relpath ]
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	201 else: args = [ os.path.join(relpath, x) for x in args ]
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	202
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 62 diff changeset	203 diff(args, *revs)
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 31 diff changeset	204
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	205 elif cmd == "annotate":
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	206 aoptions = {}
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	207 opts = [('r', 'revision', '', 'revision')]
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	208 args = fancyopts.fancyopts(args, opts, aoptions,
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	209 'hg annotate [-r id] [files]')
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	210 if args:
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	211 node = repo.current
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	212 if aoptions['revision']:
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	213 node = repo.changelog.lookup(aoptions['revision'])
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	214 change = repo.changelog.read(node)
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	215 mmap = repo.manifest.read(change[0])
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	216 for f in args:
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	217 for n, l in repo.file(f).annotate(mmap[f]):
80 5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	218 sys.stdout.write("% 6s:%s"%(n, l))
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	219
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	220 elif cmd == "blame":
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	221 aoptions = {}
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	222 opts = [('r', 'revision', '', 'revision')]
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	223 args = fancyopts.fancyopts(args, opts, aoptions,
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	224 'hg blame [-r id] [files]')
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	225 if args:
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	226 bcache = {}
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	227 node = repo.current
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	228 if aoptions['revision']:
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	229 node = repo.changelog.lookup(aoptions['revision'])
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	230 change = repo.changelog.read(node)
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	231 mmap = repo.manifest.read(change[0])
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	232 for f in args:
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	233 for n, l in repo.file(f).annotate(mmap[f]):
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	234 try:
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	235 name = bcache[n]
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	236 except KeyError:
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	237 cl = repo.changelog.read(repo.changelog.node(n))
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	238 name = cl[1]
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	239 f = name.find('@')
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	240 if f >= 0:
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	241 name = name[:f]
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	242 bcache[n] = name
5b7a444c794a Fix field width for annotate mpm@selenic.com parents: 79 diff changeset	243 sys.stdout.write("% 10s:%s"%(name, l))
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 74 diff changeset	244
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	245 elif cmd == "export":
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	246 node = repo.lookup(args[0])
68 6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	247 prev, other = repo.changelog.parents(node)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	248 change = repo.changelog.read(node)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	249 print "# HG changeset patch"
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	250 print "# User %s" % change[1]
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	251 print "# Node ID %s" % hg.hex(node)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	252 print "# Parent %s" % hg.hex(prev)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	253 print
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	254 if other != hg.nullid:
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	255 print "# Parent %s" % hg.hex(other)
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	256 print change[4]
6fa994fe90fc Print changeset metadata for export mpm@selenic.com parents: 67 diff changeset	257
34 8708c75da2ac Add export command mpm@selenic.com parents: 33 diff changeset	258 diff(None, prev, node)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	259
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	260 elif cmd == "debugchangegroup":
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	261 newer = repo.newer(map(repo.lookup, args))
62 022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	262 for chunk in repo.changegroup(newer):
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	263 sys.stdout.write(chunk)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	264
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	265 elif cmd == "debugaddchangegroup":
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	266 data = sys.stdin.read()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	267 repo.addchangegroup(data)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 39 diff changeset	268
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	269 elif cmd == "addremove":
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 24 diff changeset	270 (c, a, d) = repo.diffdir(repo.root, repo.current)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	271 repo.add(a)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	272 repo.remove(d)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	273
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	274 elif cmd == "history":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	275 for i in range(repo.changelog.count()):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	276 n = repo.changelog.node(i)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	277 changes = repo.changelog.read(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	278 (p1, p2) = repo.changelog.parents(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	279 (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	280 (i1, i2) = map(repo.changelog.rev, (p1, p2))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	281 print "rev: %4d:%s" % (i, h)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	282 print "parents: %4d:%s" % (i1, h1)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	283 if i2: print " %4d:%s" % (i2, h2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	284 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	285 hg.hex(changes[0]))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	286 print "user:", changes[1]
21 54a57a5ebcb1 Show date in history mpm@selenic.com parents: 18 diff changeset	287 print "date:", time.asctime(
54a57a5ebcb1 Show date in history mpm@selenic.com parents: 18 diff changeset	288 time.localtime(float(changes[2].split(' ')[0])))
11 7f16aaeed62f Allow checkout by number or hash oxymoron@cinder.waste.org parents: 5 diff changeset	289 print "files:", " ".join(changes[3])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	290 print "description:"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	291 print changes[4]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	292
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	293 elif cmd == "log":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	294 if args:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	295 r = repo.file(args[0])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	296 for i in range(r.count()):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	297 n = r.node(i)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	298 (p1, p2) = r.parents(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	299 (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	300 (i1, i2) = map(r.rev, (p1, p2))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	301 cr = r.linkrev(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	302 cn = hg.hex(repo.changelog.node(cr))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	303 print "rev: %4d:%s" % (i, h)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	304 print "changeset: %4d:%s" % (cr, cn)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	305 print "parents: %4d:%s" % (i1, h1)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	306 if i2: print " %4d:%s" % (i2, h2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	307 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	308 print "missing filename"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	309
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	310 elif cmd == "dump":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	311 if args:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	312 r = repo.file(args[0])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	313 n = r.tip()
39 adf70fffca9f Add lookup smarts everywhere mpm@selenic.com parents: 38 diff changeset	314 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	315 sys.stdout.write(r.read(n))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	316 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	317 print "missing filename"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	318
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	319 elif cmd == "dumpmanifest":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	320 n = repo.manifest.tip()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	321 if len(args) > 0:
39 adf70fffca9f Add lookup smarts everywhere mpm@selenic.com parents: 38 diff changeset	322 n = repo.manifest.lookup(args[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	323 m = repo.manifest.read(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	324 files = m.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	325 files.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	326
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	327 for f in files:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	328 print hg.hex(m[f]), f
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	329
24 57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	330 elif cmd == "debughash":
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	331 f = repo.file(args[0])
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	332 print f.encodepath(args[0])
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	333
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	334 elif cmd == "debugindex":
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	335 r = hg.revlog(open, args[0], "")
70 ce080e8eccd7 Fix debugindex formatting for large repos mpm@selenic.com parents: 69 diff changeset	336 print " rev offset length base linkrev"+\
24 57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	337 " p1 p2 nodeid"
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	338 for i in range(r.count()):
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	339 e = r.index[i]
70 ce080e8eccd7 Fix debugindex formatting for large repos mpm@selenic.com parents: 69 diff changeset	340 print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % (
24 57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	341 i, e[0], e[1], e[2], e[3],
57a1eef79415 Add debughash and debugindex commands mpm@selenic.com parents: 23 diff changeset	342 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	343
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	344 elif cmd == "merge":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	345 if args:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	346 other = hg.repository(ui, args[0])
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 81 diff changeset	347 ui.status("requesting changegroup")
62 022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	348 cg = repo.getchangegroup(other)
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	349 repo.addchangegroup(cg)
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	350 else:
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	351 print "missing source repository"
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	352
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	353 elif cmd == "tags":
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	354 repo.lookup(0) # prime the cache
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	355 i = repo.tags.items()
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	356 i.sort()
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	357 for k, n in i:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	358 try:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	359 r = repo.changelog.rev(n)
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	360 except KeyError:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	361 r = "?"
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	362 print "%-30s %5d:%s" % (k, repo.changelog.rev(n), hg.hex(n))
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	363
62 022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	364 elif cmd == "debugoldmerge":
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	365 if args:
022d98aa0a2a Fix tabs mpm@selenic.com parents: 56 diff changeset	366 other = hg.repository(ui, args[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	367 repo.merge(other)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	368 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	369 print "missing source repository"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	370
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	371 elif cmd == "verify":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	372 filelinkrevs = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	373 filenodes = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	374 manifestchangeset = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	375 changesets = revisions = files = 0
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	376 errors = 0
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	377
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	378 ui.status("checking changesets\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	379 for i in range(repo.changelog.count()):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	380 changesets += 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	381 n = repo.changelog.node(i)
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	382 for p in repo.changelog.parents(n):
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	383 if p not in repo.changelog.nodemap:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	384 ui.warn("changeset %s has unknown parent %s\n" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	385 (hg.short(n), hg.short(p)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	386 errors += 1
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	387 try:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	388 changes = repo.changelog.read(n)
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	389 except Error, inst:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	390 ui.warn("unpacking changeset %s: %s\n" % (short(n), inst))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	391 errors += 1
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	392
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	393 manifestchangeset[changes[0]] = n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	394 for f in changes[3]:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	395 revisions += 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	396 filelinkrevs.setdefault(f, []).append(i)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	397
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	398 ui.status("checking manifests\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	399 for i in range(repo.manifest.count()):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	400 n = repo.manifest.node(i)
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	401 for p in repo.manifest.parents(n):
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	402 if p not in repo.manifest.nodemap:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	403 ui.warn("manifest %s has unknown parent %s\n" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	404 (hg.short(n), hg.short(p)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	405 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	406 ca = repo.changelog.node(repo.manifest.linkrev(n))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	407 cc = manifestchangeset[n]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	408 if ca != cc:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	409 ui.warn("manifest %s points to %s, not %s\n" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	410 (hg.hex(n), hg.hex(ca), hg.hex(cc)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	411 errors += 1
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	412
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	413 try:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	414 m = repo.manifest.read(n)
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	415 except Error, inst:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	416 ui.warn("unpacking manifest %s: %s\n" % (hg.short(n), inst))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	417 errors += 1
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	418
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	419 for f, fn in m.items():
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	420 filenodes.setdefault(f, {})[fn] = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	421
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	422 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	423 for f in filenodes:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	424 if f not in filelinkrevs:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	425 ui.warn("file %s in manifest but not in changesets\n" % f)
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	426 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	427
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	428 for f in filelinkrevs:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	429 if f not in filenodes:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	430 ui.warn("file %s in changeset but not in manifest" % f)
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	431 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	432
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	433 ui.status("checking files\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	434 for f in filenodes:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	435 files += 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	436 fl = repo.file(f)
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	437 nodes = { hg.nullid: 1 }
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	438 for i in range(fl.count()):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	439 n = fl.node(i)
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	440
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	441 if n not in filenodes[f]:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	442 ui.warn("%s:%s not in manifests\n" % (f, hg.short(n)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	443 errors += 1
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	444 else:
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	445 del filenodes[f][n]
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	446
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	447 flr = fl.linkrev(n)
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	448 if flr not in filelinkrevs[f]:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	449 ui.warn("%s:%s points to unexpected changeset rev %d\n"
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	450 % (f, hg.short(n), fl.linkrev(n)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	451 errors += 1
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	452 else:
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	453 filelinkrevs[f].remove(flr)
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	454
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	455 # verify contents
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	456 try:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	457 t = fl.read(n)
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	458 except Error, inst:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	459 ui.warn("unpacking file %s %s: %s\n" % (f, short(n), inst))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	460 errors += 1
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	461
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	462 # verify parents
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	463 (p1, p2) = fl.parents(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	464 if p1 not in nodes:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	465 ui.warn("file %s:%s unknown parent 1 %s" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	466 (f, hg.short(n), hg.short(p1)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	467 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	468 if p2 not in nodes:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	469 ui.warn("file %s:%s unknown parent 2 %s" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	470 (f, hg.short(n), hg.short(p1)))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	471 errors += 1
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	472 nodes[n] = 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	473
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	474 # cross-check
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	475 for flr in filelinkrevs[f]:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	476 ui.warn("changeset rev %d not in %s\n" % (flr, f))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	477 errors += 1
17 ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	478
ffe6a5ca1a89 Make hg verify do more thorough cross-checking. mpm@selenic.com parents: 16 diff changeset	479 for node in filenodes[f]:
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	480 ui.warn("node %s in manifests not in %s\n" % (hg.hex(n), f))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	481 errors += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	482
87 b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	483 ui.status("%d files, %d changesets, %d total revisions\n" %
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	484 (files, changesets, revisions))
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	485
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	486 if errors:
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	487 ui.warn("%d integrity errors encountered!\n")
b2b3fdbd79f4 Verify improvements: mpm@selenic.com parents: 83 diff changeset	488 sys.exit(1)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	489
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	490 else:
18 2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	491 print "unknown command\n"
2fd3e1e3783f Give a friendlier message when repo isn't found mpm@selenic.com parents: 17 diff changeset	492 help()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	493 sys.exit(1)

Mercurial > hg > pyhgsh

annotate hg @ 87:b2b3fdbd79f4