Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/commands.py @ 220:3113a94c1bff
change dircache into dirstate
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
change dircache into dirstate
The dircache now tracks adds and removes directly
diffdir now makes a proper distinction between added and unknown files
Add a forget command to unadd files
Undo tries to fix up the state of just the files in the undone commit
Add and remove complain about files that are not in a proper state of
existence
manifest hash: ca0cd6abc5e119670acf11a54fefa2bc986eadf3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCn7TRywK+sNU5EO8RAhnSAKC2oHg1HJOCGsvpUYj4SBEq0HmuJQCgr5gl
jEBTs5AFD5IhF73YAgrcnkE=
=prQA
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 02 Jun 2005 17:39:29 -0800 |
parents | 8ff4532376a4 |
children | 2bfe525ef6ca |
rev | line source |
---|---|
214 | 1 import os, re, traceback, sys, signal |
209 | 2 from mercurial import fancyopts, ui, hg |
3 | |
4 class UnknownCommand(Exception): pass | |
5 | |
213 | 6 def filterfiles(list, files): |
7 l = [ x for x in list if x in files ] | |
8 | |
9 for f in files: | |
10 if f[-1] != os.sep: f += os.sep | |
11 l += [ x for x in list if x.startswith(f) ] | |
12 return l | |
13 | |
14 def relfilter(repo, args): | |
15 if os.getcwd() != repo.root: | |
16 p = os.getcwd()[len(repo.root) + 1: ] | |
17 return filterfiles(p, args) | |
18 return args | |
19 | |
209 | 20 def relpath(repo, args): |
21 if os.getcwd() != repo.root: | |
22 p = os.getcwd()[len(repo.root) + 1: ] | |
23 return [ os.path.join(p, x) for x in args ] | |
24 return args | |
25 | |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
26 def help(ui, cmd=None): |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
27 '''show help''' |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
28 if cmd: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
29 try: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
30 i = find(cmd) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
31 ui.write("%s\n\n" % i[2]) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
32 ui.write(i[0].__doc__, "\n") |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
33 except UnknownCommand: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
34 ui.warn("unknown command %s", cmd) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
35 sys.exit(0) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
36 |
209 | 37 ui.status("""\ |
38 hg commands: | |
39 | |
40 add [files...] add the given files in the next commit | |
41 addremove add all new files, delete all missing files | |
42 annotate [files...] show changeset number per file line | |
43 branch <path> create a branch of <path> in this directory | |
44 checkout [changeset] checkout the latest or given changeset | |
45 commit commit all changes to the repository | |
46 diff [files...] diff working directory (or selected files) | |
47 dump <file> [rev] dump the latest or given revision of a file | |
48 dumpmanifest [rev] dump the latest or given revision of the manifest | |
49 export <rev> dump the changeset header and diffs for a revision | |
50 history show changeset history | |
51 init create a new repository in this directory | |
52 log <file> show revision history of a single file | |
53 merge <path> merge changes from <path> into local repository | |
54 recover rollback an interrupted transaction | |
55 remove [files...] remove the given files in the next commit | |
56 serve export the repository via HTTP | |
57 status show new, missing, and changed files in working dir | |
58 tags show current changeset tags | |
59 undo undo the last transaction | |
60 """) | |
61 | |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
62 def init(ui): |
209 | 63 """create a repository""" |
64 hg.repository(ui, ".", create=1) | |
65 | |
213 | 66 def branch(ui, path): |
67 '''branch from a local repository''' | |
68 # this should eventually support remote repos | |
69 os.system("cp -al %s/.hg .hg" % path) | |
70 | |
219
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
71 def checkout(ui, repo, changeset=None): |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
72 '''checkout a given changeset or the current tip''' |
220 | 73 (c, a, d, u) = repo.diffdir(repo.root, repo.current) |
74 if c or a or d: | |
219
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
75 ui.warn("aborting (outstanding changes in working directory)\n") |
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
76 sys.exit(1) |
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
77 |
209 | 78 node = repo.changelog.tip() |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
79 if changeset: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
80 node = repo.lookup(changeset) |
209 | 81 repo.checkout(node) |
82 | |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
83 def annotate(u, repo, *args, **ops): |
209 | 84 def getnode(rev): |
85 return hg.short(repo.changelog.node(rev)) | |
86 | |
87 def getname(rev): | |
88 try: | |
89 return bcache[rev] | |
90 except KeyError: | |
91 cl = repo.changelog.read(repo.changelog.node(rev)) | |
92 name = cl[1] | |
93 f = name.find('@') | |
94 if f >= 0: | |
95 name = name[:f] | |
96 bcache[rev] = name | |
97 return name | |
98 | |
99 bcache = {} | |
100 opmap = [['user', getname], ['number', str], ['changeset', getnode]] | |
101 if not ops['user'] and not ops['changeset']: | |
102 ops['number'] = 1 | |
103 | |
104 args = relpath(repo, args) | |
105 node = repo.current | |
106 if ops['revision']: | |
107 node = repo.changelog.lookup(ops['revision']) | |
108 change = repo.changelog.read(node) | |
109 mmap = repo.manifest.read(change[0]) | |
110 maxuserlen = 0 | |
111 maxchangelen = 0 | |
112 for f in args: | |
113 lines = repo.file(f).annotate(mmap[f]) | |
114 pieces = [] | |
115 | |
116 for o, f in opmap: | |
117 if ops[o]: | |
118 l = [ f(n) for n,t in lines ] | |
119 m = max(map(len, l)) | |
120 pieces.append([ "%*s" % (m, x) for x in l]) | |
121 | |
122 for p,l in zip(zip(*pieces), lines): | |
123 u.write(" ".join(p) + ": " + l[1]) | |
124 | |
213 | 125 def status(ui, repo): |
126 '''show changed files in the working directory | |
127 | |
128 C = changed | |
129 A = added | |
130 R = removed | |
131 ? = not tracked''' | |
220 | 132 (c, a, d, u) = repo.diffdir(repo.root, repo.current) |
133 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) | |
213 | 134 |
135 for f in c: print "C", f | |
220 | 136 for f in a: print "A", f |
213 | 137 for f in d: print "R", f |
220 | 138 for f in u: print "?", f |
213 | 139 |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
140 def undo(ui, repo): |
210 | 141 repo.undo() |
142 | |
209 | 143 table = { |
144 "init": (init, [], 'hg init'), | |
213 | 145 "branch|clone": (branch, [], 'hg branch [path]'), |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
146 "help": (help, [], 'hg help [command]'), |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
147 "checkout|co": (checkout, [], 'hg checkout [changeset]'), |
209 | 148 "ann|annotate": (annotate, |
149 [('r', 'revision', '', 'revision'), | |
150 ('u', 'user', None, 'show user'), | |
151 ('n', 'number', None, 'show revision number'), | |
152 ('c', 'changeset', None, 'show changeset')], | |
153 'hg annotate [-u] [-c] [-n] [-r id] [files]'), | |
213 | 154 "status": (status, [], 'hg status'), |
210 | 155 "undo": (undo, [], 'hg undo'), |
209 | 156 } |
157 | |
158 norepo = "init branch help" | |
159 | |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
160 def find(cmd): |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
161 i = None |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
162 for e in table.keys(): |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
163 if re.match(e + "$", cmd): |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
164 return table[e] |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
165 |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
166 raise UnknownCommand(cmd) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
167 |
214 | 168 class SignalInterrupt(Exception): pass |
169 | |
170 def catchterm(*args): | |
171 raise SignalInterrupt | |
172 | |
209 | 173 def dispatch(args): |
174 options = {} | |
175 opts = [('v', 'verbose', None, 'verbose'), | |
176 ('d', 'debug', None, 'debug'), | |
177 ('q', 'quiet', None, 'quiet'), | |
178 ('y', 'noninteractive', None, 'run non-interactively'), | |
179 ] | |
180 | |
181 args = fancyopts.fancyopts(args, opts, options, | |
182 'hg [options] <command> [options] [files]') | |
183 | |
184 if not args: | |
185 cmd = "help" | |
186 else: | |
187 cmd, args = args[0], args[1:] | |
188 | |
189 u = ui.ui(options["verbose"], options["debug"], options["quiet"], | |
190 not options["noninteractive"]) | |
191 | |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
192 # deal with unfound commands later |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
193 i = find(cmd) |
209 | 194 |
214 | 195 signal.signal(signal.SIGTERM, catchterm) |
196 | |
209 | 197 cmdoptions = {} |
198 args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2]) | |
199 | |
200 if cmd not in norepo.split(): | |
201 repo = hg.repository(ui = u) | |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
202 d = lambda: i[0](u, repo, *args, **cmdoptions) |
209 | 203 else: |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
204 d = lambda: i[0](u, *args, **cmdoptions) |
209 | 205 |
206 try: | |
207 d() | |
214 | 208 except SignalInterrupt: |
209 u.warn("killed!\n") | |
209 | 210 except KeyboardInterrupt: |
211 u.warn("interrupted!\n") | |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
212 except TypeError, inst: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
213 # was this an argument error? |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
214 tb = traceback.extract_tb(sys.exc_info()[2]) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
215 if len(tb) > 2: # no |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
216 raise |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
217 u.warn("%s: invalid arguments\n" % i[0].__name__) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
218 u.warn("syntax: %s\n" % i[2]) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
219 sys.exit(-1) |