##// END OF EJS Templates
convert dict(zip(x,x)) to dict.fromkeys(x)
Matt Mackall -
r3531:730ca93e default
parent child Browse files
Show More
@@ -1,197 +1,197
1 1 # cmdutil.py - help for command processing in mercurial
2 2 #
3 3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms
6 6 # of the GNU General Public License, incorporated herein by reference.
7 7
8 8 from demandload import demandload
9 9 from node import *
10 10 from i18n import gettext as _
11 11 demandload(globals(), 'mdiff util')
12 12 demandload(globals(), 'os sys')
13 13
14 14 revrangesep = ':'
15 15
16 16 def revpair(ui, repo, revs):
17 17 '''return pair of nodes, given list of revisions. second item can
18 18 be None, meaning use working dir.'''
19 19
20 20 def revfix(repo, val, defval):
21 21 if not val and val != 0:
22 22 val = defval
23 23 return repo.lookup(val)
24 24
25 25 if not revs:
26 26 return repo.dirstate.parents()[0], None
27 27 end = None
28 28 if len(revs) == 1:
29 29 if revrangesep in revs[0]:
30 30 start, end = revs[0].split(revrangesep, 1)
31 31 start = revfix(repo, start, 0)
32 32 end = revfix(repo, end, repo.changelog.count() - 1)
33 33 else:
34 34 start = revfix(repo, revs[0], None)
35 35 elif len(revs) == 2:
36 36 if revrangesep in revs[0] or revrangesep in revs[1]:
37 37 raise util.Abort(_('too many revisions specified'))
38 38 start = revfix(repo, revs[0], None)
39 39 end = revfix(repo, revs[1], None)
40 40 else:
41 41 raise util.Abort(_('too many revisions specified'))
42 42 return start, end
43 43
44 44 def revrange(ui, repo, revs):
45 45 """Yield revision as strings from a list of revision specifications."""
46 46
47 47 def revfix(repo, val, defval):
48 48 if not val and val != 0:
49 49 return defval
50 50 return repo.changelog.rev(repo.lookup(val))
51 51
52 52 seen, l = {}, []
53 53 for spec in revs:
54 54 if revrangesep in spec:
55 55 start, end = spec.split(revrangesep, 1)
56 56 start = revfix(repo, start, 0)
57 57 end = revfix(repo, end, repo.changelog.count() - 1)
58 58 step = start > end and -1 or 1
59 59 for rev in xrange(start, end+step, step):
60 60 if rev in seen:
61 61 continue
62 62 seen[rev] = 1
63 63 l.append(rev)
64 64 else:
65 65 rev = revfix(repo, spec, None)
66 66 if rev in seen:
67 67 continue
68 68 seen[rev] = 1
69 69 l.append(rev)
70 70
71 71 return l
72 72
73 73 def make_filename(repo, pat, node,
74 74 total=None, seqno=None, revwidth=None, pathname=None):
75 75 node_expander = {
76 76 'H': lambda: hex(node),
77 77 'R': lambda: str(repo.changelog.rev(node)),
78 78 'h': lambda: short(node),
79 79 }
80 80 expander = {
81 81 '%': lambda: '%',
82 82 'b': lambda: os.path.basename(repo.root),
83 83 }
84 84
85 85 try:
86 86 if node:
87 87 expander.update(node_expander)
88 88 if node and revwidth is not None:
89 89 expander['r'] = (lambda:
90 90 str(repo.changelog.rev(node)).zfill(revwidth))
91 91 if total is not None:
92 92 expander['N'] = lambda: str(total)
93 93 if seqno is not None:
94 94 expander['n'] = lambda: str(seqno)
95 95 if total is not None and seqno is not None:
96 96 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
97 97 if pathname is not None:
98 98 expander['s'] = lambda: os.path.basename(pathname)
99 99 expander['d'] = lambda: os.path.dirname(pathname) or '.'
100 100 expander['p'] = lambda: pathname
101 101
102 102 newname = []
103 103 patlen = len(pat)
104 104 i = 0
105 105 while i < patlen:
106 106 c = pat[i]
107 107 if c == '%':
108 108 i += 1
109 109 c = pat[i]
110 110 c = expander[c]()
111 111 newname.append(c)
112 112 i += 1
113 113 return ''.join(newname)
114 114 except KeyError, inst:
115 115 raise util.Abort(_("invalid format spec '%%%s' in output file name") %
116 116 inst.args[0])
117 117
118 118 def make_file(repo, pat, node=None,
119 119 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
120 120 if not pat or pat == '-':
121 121 return 'w' in mode and sys.stdout or sys.stdin
122 122 if hasattr(pat, 'write') and 'w' in mode:
123 123 return pat
124 124 if hasattr(pat, 'read') and 'r' in mode:
125 125 return pat
126 126 return open(make_filename(repo, pat, node, total, seqno, revwidth,
127 127 pathname),
128 128 mode)
129 129
130 130 def matchpats(repo, pats=[], opts={}, head=''):
131 131 cwd = repo.getcwd()
132 132 if not pats and cwd:
133 133 opts['include'] = [os.path.join(cwd, i)
134 134 for i in opts.get('include', [])]
135 135 opts['exclude'] = [os.path.join(cwd, x)
136 136 for x in opts.get('exclude', [])]
137 137 cwd = ''
138 138 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
139 139 opts.get('exclude'), head)
140 140
141 141 def walk(repo, pats=[], opts={}, node=None, head='', badmatch=None):
142 142 files, matchfn, anypats = matchpats(repo, pats, opts, head)
143 exact = dict(zip(files, files))
143 exact = dict.fromkeys(files)
144 144 for src, fn in repo.walk(node=node, files=files, match=matchfn,
145 145 badmatch=badmatch):
146 146 yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact
147 147
148 148 def findrenames(repo, added=None, removed=None, threshold=0.5):
149 149 if added is None or removed is None:
150 150 added, removed = repo.status()[1:3]
151 151 changes = repo.changelog.read(repo.dirstate.parents()[0])
152 152 mf = repo.manifest.read(changes[0])
153 153 for a in added:
154 154 aa = repo.wread(a)
155 155 bestscore, bestname = None, None
156 156 for r in removed:
157 157 rr = repo.file(r).read(mf[r])
158 158 delta = mdiff.textdiff(aa, rr)
159 159 if len(delta) < len(aa):
160 160 myscore = 1.0 - (float(len(delta)) / len(aa))
161 161 if bestscore is None or myscore > bestscore:
162 162 bestscore, bestname = myscore, r
163 163 if bestname and bestscore >= threshold:
164 164 yield bestname, a, bestscore
165 165
166 166 def addremove(repo, pats=[], opts={}, wlock=None, dry_run=None,
167 167 similarity=None):
168 168 if dry_run is None:
169 169 dry_run = opts.get('dry_run')
170 170 if similarity is None:
171 171 similarity = float(opts.get('similarity') or 0)
172 172 add, remove = [], []
173 173 mapping = {}
174 174 for src, abs, rel, exact in walk(repo, pats, opts):
175 175 if src == 'f' and repo.dirstate.state(abs) == '?':
176 176 add.append(abs)
177 177 mapping[abs] = rel, exact
178 178 if repo.ui.verbose or not exact:
179 179 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
180 180 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
181 181 remove.append(abs)
182 182 mapping[abs] = rel, exact
183 183 if repo.ui.verbose or not exact:
184 184 repo.ui.status(_('removing %s\n') % ((pats and rel) or abs))
185 185 if not dry_run:
186 186 repo.add(add, wlock=wlock)
187 187 repo.remove(remove, wlock=wlock)
188 188 if similarity > 0:
189 189 for old, new, score in findrenames(repo, add, remove, similarity):
190 190 oldrel, oldexact = mapping[old]
191 191 newrel, newexact = mapping[new]
192 192 if repo.ui.verbose or not oldexact or not newexact:
193 193 repo.ui.status(_('recording removal of %s as rename to %s '
194 194 '(%d%% similar)\n') %
195 195 (oldrel, newrel, score * 100))
196 196 if not dry_run:
197 197 repo.copy(old, new, wlock=wlock)
@@ -1,3512 +1,3512
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms
6 6 # of the GNU General Public License, incorporated herein by reference.
7 7
8 8 from demandload import demandload
9 9 from node import *
10 10 from i18n import gettext as _
11 11 demandload(globals(), "os re sys signal shutil imp urllib pdb shlex")
12 12 demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo")
13 13 demandload(globals(), "fnmatch difflib patch random signal tempfile time")
14 14 demandload(globals(), "traceback errno socket version struct atexit sets bz2")
15 15 demandload(globals(), "archival cStringIO changegroup")
16 16 demandload(globals(), "cmdutil hgweb.server sshserver")
17 17
18 18 class UnknownCommand(Exception):
19 19 """Exception raised if command is not in the command table."""
20 20 class AmbiguousCommand(Exception):
21 21 """Exception raised if command shortcut matches more than one command."""
22 22
23 23 def bail_if_changed(repo):
24 24 modified, added, removed, deleted = repo.status()[:4]
25 25 if modified or added or removed or deleted:
26 26 raise util.Abort(_("outstanding uncommitted changes"))
27 27
28 28 def relpath(repo, args):
29 29 cwd = repo.getcwd()
30 30 if cwd:
31 31 return [util.normpath(os.path.join(cwd, x)) for x in args]
32 32 return args
33 33
34 34 def logmessage(opts):
35 35 """ get the log message according to -m and -l option """
36 36 message = opts['message']
37 37 logfile = opts['logfile']
38 38
39 39 if message and logfile:
40 40 raise util.Abort(_('options --message and --logfile are mutually '
41 41 'exclusive'))
42 42 if not message and logfile:
43 43 try:
44 44 if logfile == '-':
45 45 message = sys.stdin.read()
46 46 else:
47 47 message = open(logfile).read()
48 48 except IOError, inst:
49 49 raise util.Abort(_("can't read commit message '%s': %s") %
50 50 (logfile, inst.strerror))
51 51 return message
52 52
53 53 def walkchangerevs(ui, repo, pats, change, opts):
54 54 '''Iterate over files and the revs they changed in.
55 55
56 56 Callers most commonly need to iterate backwards over the history
57 57 it is interested in. Doing so has awful (quadratic-looking)
58 58 performance, so we use iterators in a "windowed" way.
59 59
60 60 We walk a window of revisions in the desired order. Within the
61 61 window, we first walk forwards to gather data, then in the desired
62 62 order (usually backwards) to display it.
63 63
64 64 This function returns an (iterator, matchfn) tuple. The iterator
65 65 yields 3-tuples. They will be of one of the following forms:
66 66
67 67 "window", incrementing, lastrev: stepping through a window,
68 68 positive if walking forwards through revs, last rev in the
69 69 sequence iterated over - use to reset state for the current window
70 70
71 71 "add", rev, fns: out-of-order traversal of the given file names
72 72 fns, which changed during revision rev - use to gather data for
73 73 possible display
74 74
75 75 "iter", rev, None: in-order traversal of the revs earlier iterated
76 76 over with "add" - use to display data'''
77 77
78 78 def increasing_windows(start, end, windowsize=8, sizelimit=512):
79 79 if start < end:
80 80 while start < end:
81 81 yield start, min(windowsize, end-start)
82 82 start += windowsize
83 83 if windowsize < sizelimit:
84 84 windowsize *= 2
85 85 else:
86 86 while start > end:
87 87 yield start, min(windowsize, start-end-1)
88 88 start -= windowsize
89 89 if windowsize < sizelimit:
90 90 windowsize *= 2
91 91
92 92 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
93 93 follow = opts.get('follow') or opts.get('follow_first')
94 94
95 95 if repo.changelog.count() == 0:
96 96 return [], matchfn
97 97
98 98 if follow:
99 99 defrange = '%s:0' % repo.changectx().rev()
100 100 else:
101 101 defrange = 'tip:0'
102 102 revs = cmdutil.revrange(ui, repo, opts['rev'] or [defrange])
103 103 wanted = {}
104 104 slowpath = anypats
105 105 fncache = {}
106 106
107 107 if not slowpath and not files:
108 108 # No files, no patterns. Display all revs.
109 wanted = dict(zip(revs, revs))
109 wanted = dict.fromkeys(revs)
110 110 copies = []
111 111 if not slowpath:
112 112 # Only files, no patterns. Check the history of each file.
113 113 def filerevgen(filelog, node):
114 114 cl_count = repo.changelog.count()
115 115 if node is None:
116 116 last = filelog.count() - 1
117 117 else:
118 118 last = filelog.rev(node)
119 119 for i, window in increasing_windows(last, -1):
120 120 revs = []
121 121 for j in xrange(i - window, i + 1):
122 122 n = filelog.node(j)
123 123 revs.append((filelog.linkrev(n),
124 124 follow and filelog.renamed(n)))
125 125 revs.reverse()
126 126 for rev in revs:
127 127 # only yield rev for which we have the changelog, it can
128 128 # happen while doing "hg log" during a pull or commit
129 129 if rev[0] < cl_count:
130 130 yield rev
131 131 def iterfiles():
132 132 for filename in files:
133 133 yield filename, None
134 134 for filename_node in copies:
135 135 yield filename_node
136 136 minrev, maxrev = min(revs), max(revs)
137 137 for file_, node in iterfiles():
138 138 filelog = repo.file(file_)
139 139 # A zero count may be a directory or deleted file, so
140 140 # try to find matching entries on the slow path.
141 141 if filelog.count() == 0:
142 142 slowpath = True
143 143 break
144 144 for rev, copied in filerevgen(filelog, node):
145 145 if rev <= maxrev:
146 146 if rev < minrev:
147 147 break
148 148 fncache.setdefault(rev, [])
149 149 fncache[rev].append(file_)
150 150 wanted[rev] = 1
151 151 if follow and copied:
152 152 copies.append(copied)
153 153 if slowpath:
154 154 if follow:
155 155 raise util.Abort(_('can only follow copies/renames for explicit '
156 156 'file names'))
157 157
158 158 # The slow path checks files modified in every changeset.
159 159 def changerevgen():
160 160 for i, window in increasing_windows(repo.changelog.count()-1, -1):
161 161 for j in xrange(i - window, i + 1):
162 162 yield j, change(j)[3]
163 163
164 164 for rev, changefiles in changerevgen():
165 165 matches = filter(matchfn, changefiles)
166 166 if matches:
167 167 fncache[rev] = matches
168 168 wanted[rev] = 1
169 169
170 170 class followfilter:
171 171 def __init__(self, onlyfirst=False):
172 172 self.startrev = -1
173 173 self.roots = []
174 174 self.onlyfirst = onlyfirst
175 175
176 176 def match(self, rev):
177 177 def realparents(rev):
178 178 if self.onlyfirst:
179 179 return repo.changelog.parentrevs(rev)[0:1]
180 180 else:
181 181 return filter(lambda x: x != -1, repo.changelog.parentrevs(rev))
182 182
183 183 if self.startrev == -1:
184 184 self.startrev = rev
185 185 return True
186 186
187 187 if rev > self.startrev:
188 188 # forward: all descendants
189 189 if not self.roots:
190 190 self.roots.append(self.startrev)
191 191 for parent in realparents(rev):
192 192 if parent in self.roots:
193 193 self.roots.append(rev)
194 194 return True
195 195 else:
196 196 # backwards: all parents
197 197 if not self.roots:
198 198 self.roots.extend(realparents(self.startrev))
199 199 if rev in self.roots:
200 200 self.roots.remove(rev)
201 201 self.roots.extend(realparents(rev))
202 202 return True
203 203
204 204 return False
205 205
206 206 # it might be worthwhile to do this in the iterator if the rev range
207 207 # is descending and the prune args are all within that range
208 208 for rev in opts.get('prune', ()):
209 209 rev = repo.changelog.rev(repo.lookup(rev))
210 210 ff = followfilter()
211 211 stop = min(revs[0], revs[-1])
212 212 for x in xrange(rev, stop-1, -1):
213 if ff.match(x) and wanted.has_key(x):
213 if ff.match(x) and x in wanted:
214 214 del wanted[x]
215 215
216 216 def iterate():
217 217 if follow and not files:
218 218 ff = followfilter(onlyfirst=opts.get('follow_first'))
219 219 def want(rev):
220 220 if ff.match(rev) and rev in wanted:
221 221 return True
222 222 return False
223 223 else:
224 224 def want(rev):
225 225 return rev in wanted
226 226
227 227 for i, window in increasing_windows(0, len(revs)):
228 228 yield 'window', revs[0] < revs[-1], revs[-1]
229 229 nrevs = [rev for rev in revs[i:i+window] if want(rev)]
230 230 srevs = list(nrevs)
231 231 srevs.sort()
232 232 for rev in srevs:
233 233 fns = fncache.get(rev) or filter(matchfn, change(rev)[3])
234 234 yield 'add', rev, fns
235 235 for rev in nrevs:
236 236 yield 'iter', rev, None
237 237 return iterate(), matchfn
238 238
239 239 def write_bundle(cg, filename=None, compress=True):
240 240 """Write a bundle file and return its filename.
241 241
242 242 Existing files will not be overwritten.
243 243 If no filename is specified, a temporary file is created.
244 244 bz2 compression can be turned off.
245 245 The bundle file will be deleted in case of errors.
246 246 """
247 247 class nocompress(object):
248 248 def compress(self, x):
249 249 return x
250 250 def flush(self):
251 251 return ""
252 252
253 253 fh = None
254 254 cleanup = None
255 255 try:
256 256 if filename:
257 257 if os.path.exists(filename):
258 258 raise util.Abort(_("file '%s' already exists") % filename)
259 259 fh = open(filename, "wb")
260 260 else:
261 261 fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
262 262 fh = os.fdopen(fd, "wb")
263 263 cleanup = filename
264 264
265 265 if compress:
266 266 fh.write("HG10")
267 267 z = bz2.BZ2Compressor(9)
268 268 else:
269 269 fh.write("HG10UN")
270 270 z = nocompress()
271 271 # parse the changegroup data, otherwise we will block
272 272 # in case of sshrepo because we don't know the end of the stream
273 273
274 274 # an empty chunkiter is the end of the changegroup
275 275 empty = False
276 276 while not empty:
277 277 empty = True
278 278 for chunk in changegroup.chunkiter(cg):
279 279 empty = False
280 280 fh.write(z.compress(changegroup.genchunk(chunk)))
281 281 fh.write(z.compress(changegroup.closechunk()))
282 282 fh.write(z.flush())
283 283 cleanup = None
284 284 return filename
285 285 finally:
286 286 if fh is not None:
287 287 fh.close()
288 288 if cleanup is not None:
289 289 os.unlink(cleanup)
290 290
291 291 class changeset_printer(object):
292 292 '''show changeset information when templating not requested.'''
293 293
294 294 def __init__(self, ui, repo):
295 295 self.ui = ui
296 296 self.repo = repo
297 297
298 298 def show(self, rev=0, changenode=None, brinfo=None, copies=None):
299 299 '''show a single changeset or file revision'''
300 300 log = self.repo.changelog
301 301 if changenode is None:
302 302 changenode = log.node(rev)
303 303 elif not rev:
304 304 rev = log.rev(changenode)
305 305
306 306 if self.ui.quiet:
307 307 self.ui.write("%d:%s\n" % (rev, short(changenode)))
308 308 return
309 309
310 310 changes = log.read(changenode)
311 311 date = util.datestr(changes[2])
312 312 extra = changes[5]
313 313 branch = extra.get("branch")
314 314
315 315 hexfunc = self.ui.debugflag and hex or short
316 316
317 317 parents = [(log.rev(p), hexfunc(p)) for p in log.parents(changenode)
318 318 if self.ui.debugflag or p != nullid]
319 319 if (not self.ui.debugflag and len(parents) == 1 and
320 320 parents[0][0] == rev-1):
321 321 parents = []
322 322
323 323 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
324 324
325 325 if branch:
326 326 self.ui.status(_("branch: %s\n") % branch)
327 327 for tag in self.repo.nodetags(changenode):
328 328 self.ui.status(_("tag: %s\n") % tag)
329 329 for parent in parents:
330 330 self.ui.write(_("parent: %d:%s\n") % parent)
331 331
332 332 if brinfo and changenode in brinfo:
333 333 br = brinfo[changenode]
334 334 self.ui.write(_("branch: %s\n") % " ".join(br))
335 335
336 336 self.ui.debug(_("manifest: %d:%s\n") %
337 337 (self.repo.manifest.rev(changes[0]), hex(changes[0])))
338 338 self.ui.status(_("user: %s\n") % changes[1])
339 339 self.ui.status(_("date: %s\n") % date)
340 340
341 341 if self.ui.debugflag:
342 342 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
343 343 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
344 344 files):
345 345 if value:
346 346 self.ui.note("%-12s %s\n" % (key, " ".join(value)))
347 347 elif changes[3]:
348 348 self.ui.note(_("files: %s\n") % " ".join(changes[3]))
349 349 if copies:
350 350 copies = ['%s (%s)' % c for c in copies]
351 351 self.ui.note(_("copies: %s\n") % ' '.join(copies))
352 352
353 353 if extra and self.ui.debugflag:
354 354 extraitems = extra.items()
355 355 extraitems.sort()
356 356 for key, value in extraitems:
357 357 self.ui.debug(_("extra: %s=%s\n")
358 358 % (key, value.encode('string_escape')))
359 359
360 360 description = changes[4].strip()
361 361 if description:
362 362 if self.ui.verbose:
363 363 self.ui.status(_("description:\n"))
364 364 self.ui.status(description)
365 365 self.ui.status("\n\n")
366 366 else:
367 367 self.ui.status(_("summary: %s\n") %
368 368 description.splitlines()[0])
369 369 self.ui.status("\n")
370 370
371 371 def show_changeset(ui, repo, opts):
372 372 """show one changeset using template or regular display.
373 373
374 374 Display format will be the first non-empty hit of:
375 375 1. option 'template'
376 376 2. option 'style'
377 377 3. [ui] setting 'logtemplate'
378 378 4. [ui] setting 'style'
379 379 If all of these values are either the unset or the empty string,
380 380 regular display via changeset_printer() is done.
381 381 """
382 382 # options
383 383 tmpl = opts.get('template')
384 384 mapfile = None
385 385 if tmpl:
386 386 tmpl = templater.parsestring(tmpl, quoted=False)
387 387 else:
388 388 mapfile = opts.get('style')
389 389 # ui settings
390 390 if not mapfile:
391 391 tmpl = ui.config('ui', 'logtemplate')
392 392 if tmpl:
393 393 tmpl = templater.parsestring(tmpl)
394 394 else:
395 395 mapfile = ui.config('ui', 'style')
396 396
397 397 if tmpl or mapfile:
398 398 if mapfile:
399 399 if not os.path.split(mapfile)[0]:
400 400 mapname = (templater.templatepath('map-cmdline.' + mapfile)
401 401 or templater.templatepath(mapfile))
402 402 if mapname: mapfile = mapname
403 403 try:
404 404 t = templater.changeset_templater(ui, repo, mapfile)
405 405 except SyntaxError, inst:
406 406 raise util.Abort(inst.args[0])
407 407 if tmpl: t.use_template(tmpl)
408 408 return t
409 409 return changeset_printer(ui, repo)
410 410
411 411 def setremoteconfig(ui, opts):
412 412 "copy remote options to ui tree"
413 413 if opts.get('ssh'):
414 414 ui.setconfig("ui", "ssh", opts['ssh'])
415 415 if opts.get('remotecmd'):
416 416 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
417 417
418 418 def show_version(ui):
419 419 """output version and copyright information"""
420 420 ui.write(_("Mercurial Distributed SCM (version %s)\n")
421 421 % version.get_version())
422 422 ui.status(_(
423 423 "\nCopyright (C) 2005, 2006 Matt Mackall <mpm@selenic.com>\n"
424 424 "This is free software; see the source for copying conditions. "
425 425 "There is NO\nwarranty; "
426 426 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
427 427 ))
428 428
429 429 def help_(ui, name=None, with_version=False):
430 430 """show help for a command, extension, or list of commands
431 431
432 432 With no arguments, print a list of commands and short help.
433 433
434 434 Given a command name, print help for that command.
435 435
436 436 Given an extension name, print help for that extension, and the
437 437 commands it provides."""
438 438 option_lists = []
439 439
440 440 def helpcmd(name):
441 441 if with_version:
442 442 show_version(ui)
443 443 ui.write('\n')
444 444 aliases, i = findcmd(ui, name)
445 445 # synopsis
446 446 ui.write("%s\n\n" % i[2])
447 447
448 448 # description
449 449 doc = i[0].__doc__
450 450 if not doc:
451 451 doc = _("(No help text available)")
452 452 if ui.quiet:
453 453 doc = doc.splitlines(0)[0]
454 454 ui.write("%s\n" % doc.rstrip())
455 455
456 456 if not ui.quiet:
457 457 # aliases
458 458 if len(aliases) > 1:
459 459 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
460 460
461 461 # options
462 462 if i[1]:
463 463 option_lists.append(("options", i[1]))
464 464
465 465 def helplist(select=None):
466 466 h = {}
467 467 cmds = {}
468 468 for c, e in table.items():
469 469 f = c.split("|", 1)[0]
470 470 if select and not select(f):
471 471 continue
472 472 if name == "shortlist" and not f.startswith("^"):
473 473 continue
474 474 f = f.lstrip("^")
475 475 if not ui.debugflag and f.startswith("debug"):
476 476 continue
477 477 doc = e[0].__doc__
478 478 if not doc:
479 479 doc = _("(No help text available)")
480 480 h[f] = doc.splitlines(0)[0].rstrip()
481 481 cmds[f] = c.lstrip("^")
482 482
483 483 fns = h.keys()
484 484 fns.sort()
485 485 m = max(map(len, fns))
486 486 for f in fns:
487 487 if ui.verbose:
488 488 commands = cmds[f].replace("|",", ")
489 489 ui.write(" %s:\n %s\n"%(commands, h[f]))
490 490 else:
491 491 ui.write(' %-*s %s\n' % (m, f, h[f]))
492 492
493 493 def helpext(name):
494 494 try:
495 495 mod = findext(name)
496 496 except KeyError:
497 497 raise UnknownCommand(name)
498 498
499 499 doc = (mod.__doc__ or _('No help text available')).splitlines(0)
500 500 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
501 501 for d in doc[1:]:
502 502 ui.write(d, '\n')
503 503
504 504 ui.status('\n')
505 505 if ui.verbose:
506 506 ui.status(_('list of commands:\n\n'))
507 507 else:
508 508 ui.status(_('list of commands (use "hg help -v %s" '
509 509 'to show aliases and global options):\n\n') % name)
510 510
511 511 modcmds = dict.fromkeys([c.split('|', 1)[0] for c in mod.cmdtable])
512 512 helplist(modcmds.has_key)
513 513
514 514 if name and name != 'shortlist':
515 515 try:
516 516 helpcmd(name)
517 517 except UnknownCommand:
518 518 helpext(name)
519 519
520 520 else:
521 521 # program name
522 522 if ui.verbose or with_version:
523 523 show_version(ui)
524 524 else:
525 525 ui.status(_("Mercurial Distributed SCM\n"))
526 526 ui.status('\n')
527 527
528 528 # list of commands
529 529 if name == "shortlist":
530 530 ui.status(_('basic commands (use "hg help" '
531 531 'for the full list or option "-v" for details):\n\n'))
532 532 elif ui.verbose:
533 533 ui.status(_('list of commands:\n\n'))
534 534 else:
535 535 ui.status(_('list of commands (use "hg help -v" '
536 536 'to show aliases and global options):\n\n'))
537 537
538 538 helplist()
539 539
540 540 # global options
541 541 if ui.verbose:
542 542 option_lists.append(("global options", globalopts))
543 543
544 544 # list all option lists
545 545 opt_output = []
546 546 for title, options in option_lists:
547 547 opt_output.append(("\n%s:\n" % title, None))
548 548 for shortopt, longopt, default, desc in options:
549 549 if "DEPRECATED" in desc and not ui.verbose: continue
550 550 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
551 551 longopt and " --%s" % longopt),
552 552 "%s%s" % (desc,
553 553 default
554 554 and _(" (default: %s)") % default
555 555 or "")))
556 556
557 557 if opt_output:
558 558 opts_len = max([len(line[0]) for line in opt_output if line[1]])
559 559 for first, second in opt_output:
560 560 if second:
561 561 ui.write(" %-*s %s\n" % (opts_len, first, second))
562 562 else:
563 563 ui.write("%s\n" % first)
564 564
565 565 # Commands start here, listed alphabetically
566 566
567 567 def add(ui, repo, *pats, **opts):
568 568 """add the specified files on the next commit
569 569
570 570 Schedule files to be version controlled and added to the repository.
571 571
572 572 The files will be added to the repository at the next commit.
573 573
574 574 If no names are given, add all files in the repository.
575 575 """
576 576
577 577 names = []
578 578 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts):
579 579 if exact:
580 580 if ui.verbose:
581 581 ui.status(_('adding %s\n') % rel)
582 582 names.append(abs)
583 583 elif repo.dirstate.state(abs) == '?':
584 584 ui.status(_('adding %s\n') % rel)
585 585 names.append(abs)
586 586 if not opts.get('dry_run'):
587 587 repo.add(names)
588 588
589 589 def addremove(ui, repo, *pats, **opts):
590 590 """add all new files, delete all missing files
591 591
592 592 Add all new files and remove all missing files from the repository.
593 593
594 594 New files are ignored if they match any of the patterns in .hgignore. As
595 595 with add, these changes take effect at the next commit.
596 596
597 597 Use the -s option to detect renamed files. With a parameter > 0,
598 598 this compares every removed file with every added file and records
599 599 those similar enough as renames. This option takes a percentage
600 600 between 0 (disabled) and 100 (files must be identical) as its
601 601 parameter. Detecting renamed files this way can be expensive.
602 602 """
603 603 sim = float(opts.get('similarity') or 0)
604 604 if sim < 0 or sim > 100:
605 605 raise util.Abort(_('similarity must be between 0 and 100'))
606 606 return cmdutil.addremove(repo, pats, opts, similarity=sim/100.)
607 607
608 608 def annotate(ui, repo, *pats, **opts):
609 609 """show changeset information per file line
610 610
611 611 List changes in files, showing the revision id responsible for each line
612 612
613 613 This command is useful to discover who did a change or when a change took
614 614 place.
615 615
616 616 Without the -a option, annotate will avoid processing files it
617 617 detects as binary. With -a, annotate will generate an annotation
618 618 anyway, probably with undesirable results.
619 619 """
620 620 getdate = util.cachefunc(lambda x: util.datestr(x.date()))
621 621
622 622 if not pats:
623 623 raise util.Abort(_('at least one file name or pattern required'))
624 624
625 625 opmap = [['user', lambda x: ui.shortuser(x.user())],
626 626 ['number', lambda x: str(x.rev())],
627 627 ['changeset', lambda x: short(x.node())],
628 628 ['date', getdate], ['follow', lambda x: x.path()]]
629 629 if (not opts['user'] and not opts['changeset'] and not opts['date']
630 630 and not opts['follow']):
631 631 opts['number'] = 1
632 632
633 633 ctx = repo.changectx(opts['rev'])
634 634
635 635 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
636 636 node=ctx.node()):
637 637 fctx = ctx.filectx(abs)
638 638 if not opts['text'] and util.binary(fctx.data()):
639 639 ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
640 640 continue
641 641
642 642 lines = fctx.annotate(follow=opts.get('follow'))
643 643 pieces = []
644 644
645 645 for o, f in opmap:
646 646 if opts[o]:
647 647 l = [f(n) for n, dummy in lines]
648 648 if l:
649 649 m = max(map(len, l))
650 650 pieces.append(["%*s" % (m, x) for x in l])
651 651
652 652 if pieces:
653 653 for p, l in zip(zip(*pieces), lines):
654 654 ui.write("%s: %s" % (" ".join(p), l[1]))
655 655
656 656 def archive(ui, repo, dest, **opts):
657 657 '''create unversioned archive of a repository revision
658 658
659 659 By default, the revision used is the parent of the working
660 660 directory; use "-r" to specify a different revision.
661 661
662 662 To specify the type of archive to create, use "-t". Valid
663 663 types are:
664 664
665 665 "files" (default): a directory full of files
666 666 "tar": tar archive, uncompressed
667 667 "tbz2": tar archive, compressed using bzip2
668 668 "tgz": tar archive, compressed using gzip
669 669 "uzip": zip archive, uncompressed
670 670 "zip": zip archive, compressed using deflate
671 671
672 672 The exact name of the destination archive or directory is given
673 673 using a format string; see "hg help export" for details.
674 674
675 675 Each member added to an archive file has a directory prefix
676 676 prepended. Use "-p" to specify a format string for the prefix.
677 677 The default is the basename of the archive, with suffixes removed.
678 678 '''
679 679
680 680 node = repo.changectx(opts['rev']).node()
681 681 dest = cmdutil.make_filename(repo, dest, node)
682 682 if os.path.realpath(dest) == repo.root:
683 683 raise util.Abort(_('repository root cannot be destination'))
684 684 dummy, matchfn, dummy = cmdutil.matchpats(repo, [], opts)
685 685 kind = opts.get('type') or 'files'
686 686 prefix = opts['prefix']
687 687 if dest == '-':
688 688 if kind == 'files':
689 689 raise util.Abort(_('cannot archive plain files to stdout'))
690 690 dest = sys.stdout
691 691 if not prefix: prefix = os.path.basename(repo.root) + '-%h'
692 692 prefix = cmdutil.make_filename(repo, prefix, node)
693 693 archival.archive(repo, dest, node, kind, not opts['no_decode'],
694 694 matchfn, prefix)
695 695
696 696 def backout(ui, repo, rev, **opts):
697 697 '''reverse effect of earlier changeset
698 698
699 699 Commit the backed out changes as a new changeset. The new
700 700 changeset is a child of the backed out changeset.
701 701
702 702 If you back out a changeset other than the tip, a new head is
703 703 created. This head is the parent of the working directory. If
704 704 you back out an old changeset, your working directory will appear
705 705 old after the backout. You should merge the backout changeset
706 706 with another head.
707 707
708 708 The --merge option remembers the parent of the working directory
709 709 before starting the backout, then merges the new head with that
710 710 changeset afterwards. This saves you from doing the merge by
711 711 hand. The result of this merge is not committed, as for a normal
712 712 merge.'''
713 713
714 714 bail_if_changed(repo)
715 715 op1, op2 = repo.dirstate.parents()
716 716 if op2 != nullid:
717 717 raise util.Abort(_('outstanding uncommitted merge'))
718 718 node = repo.lookup(rev)
719 719 p1, p2 = repo.changelog.parents(node)
720 720 if p1 == nullid:
721 721 raise util.Abort(_('cannot back out a change with no parents'))
722 722 if p2 != nullid:
723 723 if not opts['parent']:
724 724 raise util.Abort(_('cannot back out a merge changeset without '
725 725 '--parent'))
726 726 p = repo.lookup(opts['parent'])
727 727 if p not in (p1, p2):
728 728 raise util.Abort(_('%s is not a parent of %s' %
729 729 (short(p), short(node))))
730 730 parent = p
731 731 else:
732 732 if opts['parent']:
733 733 raise util.Abort(_('cannot use --parent on non-merge changeset'))
734 734 parent = p1
735 735 hg.clean(repo, node, show_stats=False)
736 736 revert_opts = opts.copy()
737 737 revert_opts['all'] = True
738 738 revert_opts['rev'] = hex(parent)
739 739 revert(ui, repo, **revert_opts)
740 740 commit_opts = opts.copy()
741 741 commit_opts['addremove'] = False
742 742 if not commit_opts['message'] and not commit_opts['logfile']:
743 743 commit_opts['message'] = _("Backed out changeset %s") % (hex(node))
744 744 commit_opts['force_editor'] = True
745 745 commit(ui, repo, **commit_opts)
746 746 def nice(node):
747 747 return '%d:%s' % (repo.changelog.rev(node), short(node))
748 748 ui.status(_('changeset %s backs out changeset %s\n') %
749 749 (nice(repo.changelog.tip()), nice(node)))
750 750 if op1 != node:
751 751 if opts['merge']:
752 752 ui.status(_('merging with changeset %s\n') % nice(op1))
753 753 n = _lookup(repo, hex(op1))
754 754 hg.merge(repo, n)
755 755 else:
756 756 ui.status(_('the backout changeset is a new head - '
757 757 'do not forget to merge\n'))
758 758 ui.status(_('(use "backout --merge" '
759 759 'if you want to auto-merge)\n'))
760 760
761 761 def branch(ui, repo, label=None):
762 762 """set or show the current branch name
763 763
764 764 With <name>, set the current branch name. Otherwise, show the
765 765 current branch name.
766 766 """
767 767
768 768 if label is not None:
769 769 repo.opener("branch", "w").write(label)
770 770 else:
771 771 b = repo.workingctx().branch()
772 772 if b:
773 773 ui.write("%s\n" % b)
774 774
775 775 def branches(ui, repo):
776 776 """list repository named branches
777 777
778 778 List the repository's named branches.
779 779 """
780 780 b = repo.branchtags()
781 781 l = [(-repo.changelog.rev(n), n, t) for t,n in b.items()]
782 782 l.sort()
783 783 for r, n, t in l:
784 784 hexfunc = ui.debugflag and hex or short
785 785 if ui.quiet:
786 786 ui.write("%s\n" % t)
787 787 else:
788 788 ui.write("%-30s %s:%s\n" % (t, -r, hexfunc(n)))
789 789
790 790 def bundle(ui, repo, fname, dest=None, **opts):
791 791 """create a changegroup file
792 792
793 793 Generate a compressed changegroup file collecting changesets not
794 794 found in the other repository.
795 795
796 796 If no destination repository is specified the destination is assumed
797 797 to have all the nodes specified by one or more --base parameters.
798 798
799 799 The bundle file can then be transferred using conventional means and
800 800 applied to another repository with the unbundle or pull command.
801 801 This is useful when direct push and pull are not available or when
802 802 exporting an entire repository is undesirable.
803 803
804 804 Applying bundles preserves all changeset contents including
805 805 permissions, copy/rename information, and revision history.
806 806 """
807 807 revs = opts.get('rev') or None
808 808 if revs:
809 809 revs = [repo.lookup(rev) for rev in revs]
810 810 base = opts.get('base')
811 811 if base:
812 812 if dest:
813 813 raise util.Abort(_("--base is incompatible with specifiying "
814 814 "a destination"))
815 815 base = [repo.lookup(rev) for rev in base]
816 816 # create the right base
817 817 # XXX: nodesbetween / changegroup* should be "fixed" instead
818 818 o = []
819 819 has_set = sets.Set(base)
820 820 for n in base:
821 821 has_set.update(repo.changelog.reachable(n))
822 822 if revs:
823 823 visit = list(revs)
824 824 else:
825 825 visit = repo.changelog.heads()
826 826 seen = sets.Set(visit)
827 827 while visit:
828 828 n = visit.pop(0)
829 829 parents = [p for p in repo.changelog.parents(n)
830 830 if p != nullid and p not in has_set]
831 831 if len(parents) == 0:
832 832 o.insert(0, n)
833 833 else:
834 834 for p in parents:
835 835 if p not in seen:
836 836 seen.add(p)
837 837 visit.append(p)
838 838 else:
839 839 setremoteconfig(ui, opts)
840 840 dest = ui.expandpath(dest or 'default-push', dest or 'default')
841 841 other = hg.repository(ui, dest)
842 842 o = repo.findoutgoing(other, force=opts['force'])
843 843
844 844 if revs:
845 845 cg = repo.changegroupsubset(o, revs, 'bundle')
846 846 else:
847 847 cg = repo.changegroup(o, 'bundle')
848 848 write_bundle(cg, fname)
849 849
850 850 def cat(ui, repo, file1, *pats, **opts):
851 851 """output the latest or given revisions of files
852 852
853 853 Print the specified files as they were at the given revision.
854 854 If no revision is given then working dir parent is used, or tip
855 855 if no revision is checked out.
856 856
857 857 Output may be to a file, in which case the name of the file is
858 858 given using a format string. The formatting rules are the same as
859 859 for the export command, with the following additions:
860 860
861 861 %s basename of file being printed
862 862 %d dirname of file being printed, or '.' if in repo root
863 863 %p root-relative path name of file being printed
864 864 """
865 865 ctx = repo.changectx(opts['rev'])
866 866 for src, abs, rel, exact in cmdutil.walk(repo, (file1,) + pats, opts,
867 867 ctx.node()):
868 868 fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs)
869 869 fp.write(ctx.filectx(abs).data())
870 870
871 871 def clone(ui, source, dest=None, **opts):
872 872 """make a copy of an existing repository
873 873
874 874 Create a copy of an existing repository in a new directory.
875 875
876 876 If no destination directory name is specified, it defaults to the
877 877 basename of the source.
878 878
879 879 The location of the source is added to the new repository's
880 880 .hg/hgrc file, as the default to be used for future pulls.
881 881
882 882 For efficiency, hardlinks are used for cloning whenever the source
883 883 and destination are on the same filesystem (note this applies only
884 884 to the repository data, not to the checked out files). Some
885 885 filesystems, such as AFS, implement hardlinking incorrectly, but
886 886 do not report errors. In these cases, use the --pull option to
887 887 avoid hardlinking.
888 888
889 889 You can safely clone repositories and checked out files using full
890 890 hardlinks with
891 891
892 892 $ cp -al REPO REPOCLONE
893 893
894 894 which is the fastest way to clone. However, the operation is not
895 895 atomic (making sure REPO is not modified during the operation is
896 896 up to you) and you have to make sure your editor breaks hardlinks
897 897 (Emacs and most Linux Kernel tools do so).
898 898
899 899 If you use the -r option to clone up to a specific revision, no
900 900 subsequent revisions will be present in the cloned repository.
901 901 This option implies --pull, even on local repositories.
902 902
903 903 See pull for valid source format details.
904 904
905 905 It is possible to specify an ssh:// URL as the destination, but no
906 906 .hg/hgrc will be created on the remote side. Look at the help text
907 907 for the pull command for important details about ssh:// URLs.
908 908 """
909 909 setremoteconfig(ui, opts)
910 910 hg.clone(ui, ui.expandpath(source), dest,
911 911 pull=opts['pull'],
912 912 stream=opts['uncompressed'],
913 913 rev=opts['rev'],
914 914 update=not opts['noupdate'])
915 915
916 916 def commit(ui, repo, *pats, **opts):
917 917 """commit the specified files or all outstanding changes
918 918
919 919 Commit changes to the given files into the repository.
920 920
921 921 If a list of files is omitted, all changes reported by "hg status"
922 922 will be committed.
923 923
924 924 If no commit message is specified, the editor configured in your hgrc
925 925 or in the EDITOR environment variable is started to enter a message.
926 926 """
927 927 message = logmessage(opts)
928 928
929 929 if opts['addremove']:
930 930 cmdutil.addremove(repo, pats, opts)
931 931 fns, match, anypats = cmdutil.matchpats(repo, pats, opts)
932 932 if pats:
933 933 modified, added, removed = repo.status(files=fns, match=match)[:3]
934 934 files = modified + added + removed
935 935 else:
936 936 files = []
937 937 try:
938 938 repo.commit(files, message, opts['user'], opts['date'], match,
939 939 force_editor=opts.get('force_editor'))
940 940 except ValueError, inst:
941 941 raise util.Abort(str(inst))
942 942
943 943 def docopy(ui, repo, pats, opts, wlock):
944 944 # called with the repo lock held
945 945 cwd = repo.getcwd()
946 946 errors = 0
947 947 copied = []
948 948 targets = {}
949 949
950 950 def okaytocopy(abs, rel, exact):
951 951 reasons = {'?': _('is not managed'),
952 952 'a': _('has been marked for add'),
953 953 'r': _('has been marked for remove')}
954 954 state = repo.dirstate.state(abs)
955 955 reason = reasons.get(state)
956 956 if reason:
957 957 if state == 'a':
958 958 origsrc = repo.dirstate.copied(abs)
959 959 if origsrc is not None:
960 960 return origsrc
961 961 if exact:
962 962 ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
963 963 else:
964 964 return abs
965 965
966 966 def copy(origsrc, abssrc, relsrc, target, exact):
967 967 abstarget = util.canonpath(repo.root, cwd, target)
968 968 reltarget = util.pathto(cwd, abstarget)
969 969 prevsrc = targets.get(abstarget)
970 970 if prevsrc is not None:
971 971 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
972 972 (reltarget, abssrc, prevsrc))
973 973 return
974 974 if (not opts['after'] and os.path.exists(reltarget) or
975 975 opts['after'] and repo.dirstate.state(abstarget) not in '?r'):
976 976 if not opts['force']:
977 977 ui.warn(_('%s: not overwriting - file exists\n') %
978 978 reltarget)
979 979 return
980 980 if not opts['after'] and not opts.get('dry_run'):
981 981 os.unlink(reltarget)
982 982 if opts['after']:
983 983 if not os.path.exists(reltarget):
984 984 return
985 985 else:
986 986 targetdir = os.path.dirname(reltarget) or '.'
987 987 if not os.path.isdir(targetdir) and not opts.get('dry_run'):
988 988 os.makedirs(targetdir)
989 989 try:
990 990 restore = repo.dirstate.state(abstarget) == 'r'
991 991 if restore and not opts.get('dry_run'):
992 992 repo.undelete([abstarget], wlock)
993 993 try:
994 994 if not opts.get('dry_run'):
995 995 shutil.copyfile(relsrc, reltarget)
996 996 shutil.copymode(relsrc, reltarget)
997 997 restore = False
998 998 finally:
999 999 if restore:
1000 1000 repo.remove([abstarget], wlock)
1001 1001 except shutil.Error, inst:
1002 1002 raise util.Abort(str(inst))
1003 1003 except IOError, inst:
1004 1004 if inst.errno == errno.ENOENT:
1005 1005 ui.warn(_('%s: deleted in working copy\n') % relsrc)
1006 1006 else:
1007 1007 ui.warn(_('%s: cannot copy - %s\n') %
1008 1008 (relsrc, inst.strerror))
1009 1009 errors += 1
1010 1010 return
1011 1011 if ui.verbose or not exact:
1012 1012 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
1013 1013 targets[abstarget] = abssrc
1014 1014 if abstarget != origsrc and not opts.get('dry_run'):
1015 1015 repo.copy(origsrc, abstarget, wlock)
1016 1016 copied.append((abssrc, relsrc, exact))
1017 1017
1018 1018 def targetpathfn(pat, dest, srcs):
1019 1019 if os.path.isdir(pat):
1020 1020 abspfx = util.canonpath(repo.root, cwd, pat)
1021 1021 if destdirexists:
1022 1022 striplen = len(os.path.split(abspfx)[0])
1023 1023 else:
1024 1024 striplen = len(abspfx)
1025 1025 if striplen:
1026 1026 striplen += len(os.sep)
1027 1027 res = lambda p: os.path.join(dest, p[striplen:])
1028 1028 elif destdirexists:
1029 1029 res = lambda p: os.path.join(dest, os.path.basename(p))
1030 1030 else:
1031 1031 res = lambda p: dest
1032 1032 return res
1033 1033
1034 1034 def targetpathafterfn(pat, dest, srcs):
1035 1035 if util.patkind(pat, None)[0]:
1036 1036 # a mercurial pattern
1037 1037 res = lambda p: os.path.join(dest, os.path.basename(p))
1038 1038 else:
1039 1039 abspfx = util.canonpath(repo.root, cwd, pat)
1040 1040 if len(abspfx) < len(srcs[0][0]):
1041 1041 # A directory. Either the target path contains the last
1042 1042 # component of the source path or it does not.
1043 1043 def evalpath(striplen):
1044 1044 score = 0
1045 1045 for s in srcs:
1046 1046 t = os.path.join(dest, s[0][striplen:])
1047 1047 if os.path.exists(t):
1048 1048 score += 1
1049 1049 return score
1050 1050
1051 1051 striplen = len(abspfx)
1052 1052 if striplen:
1053 1053 striplen += len(os.sep)
1054 1054 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1055 1055 score = evalpath(striplen)
1056 1056 striplen1 = len(os.path.split(abspfx)[0])
1057 1057 if striplen1:
1058 1058 striplen1 += len(os.sep)
1059 1059 if evalpath(striplen1) > score:
1060 1060 striplen = striplen1
1061 1061 res = lambda p: os.path.join(dest, p[striplen:])
1062 1062 else:
1063 1063 # a file
1064 1064 if destdirexists:
1065 1065 res = lambda p: os.path.join(dest, os.path.basename(p))
1066 1066 else:
1067 1067 res = lambda p: dest
1068 1068 return res
1069 1069
1070 1070
1071 1071 pats = list(pats)
1072 1072 if not pats:
1073 1073 raise util.Abort(_('no source or destination specified'))
1074 1074 if len(pats) == 1:
1075 1075 raise util.Abort(_('no destination specified'))
1076 1076 dest = pats.pop()
1077 1077 destdirexists = os.path.isdir(dest)
1078 1078 if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:
1079 1079 raise util.Abort(_('with multiple sources, destination must be an '
1080 1080 'existing directory'))
1081 1081 if opts['after']:
1082 1082 tfn = targetpathafterfn
1083 1083 else:
1084 1084 tfn = targetpathfn
1085 1085 copylist = []
1086 1086 for pat in pats:
1087 1087 srcs = []
1088 1088 for tag, abssrc, relsrc, exact in cmdutil.walk(repo, [pat], opts):
1089 1089 origsrc = okaytocopy(abssrc, relsrc, exact)
1090 1090 if origsrc:
1091 1091 srcs.append((origsrc, abssrc, relsrc, exact))
1092 1092 if not srcs:
1093 1093 continue
1094 1094 copylist.append((tfn(pat, dest, srcs), srcs))
1095 1095 if not copylist:
1096 1096 raise util.Abort(_('no files to copy'))
1097 1097
1098 1098 for targetpath, srcs in copylist:
1099 1099 for origsrc, abssrc, relsrc, exact in srcs:
1100 1100 copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)
1101 1101
1102 1102 if errors:
1103 1103 ui.warn(_('(consider using --after)\n'))
1104 1104 return errors, copied
1105 1105
1106 1106 def copy(ui, repo, *pats, **opts):
1107 1107 """mark files as copied for the next commit
1108 1108
1109 1109 Mark dest as having copies of source files. If dest is a
1110 1110 directory, copies are put in that directory. If dest is a file,
1111 1111 there can only be one source.
1112 1112
1113 1113 By default, this command copies the contents of files as they
1114 1114 stand in the working directory. If invoked with --after, the
1115 1115 operation is recorded, but no copying is performed.
1116 1116
1117 1117 This command takes effect in the next commit.
1118 1118
1119 1119 NOTE: This command should be treated as experimental. While it
1120 1120 should properly record copied files, this information is not yet
1121 1121 fully used by merge, nor fully reported by log.
1122 1122 """
1123 1123 wlock = repo.wlock(0)
1124 1124 errs, copied = docopy(ui, repo, pats, opts, wlock)
1125 1125 return errs
1126 1126
1127 1127 def debugancestor(ui, index, rev1, rev2):
1128 1128 """find the ancestor revision of two revisions in a given index"""
1129 1129 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index, "", 0)
1130 1130 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
1131 1131 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1132 1132
1133 1133 def debugcomplete(ui, cmd='', **opts):
1134 1134 """returns the completion list associated with the given command"""
1135 1135
1136 1136 if opts['options']:
1137 1137 options = []
1138 1138 otables = [globalopts]
1139 1139 if cmd:
1140 1140 aliases, entry = findcmd(ui, cmd)
1141 1141 otables.append(entry[1])
1142 1142 for t in otables:
1143 1143 for o in t:
1144 1144 if o[0]:
1145 1145 options.append('-%s' % o[0])
1146 1146 options.append('--%s' % o[1])
1147 1147 ui.write("%s\n" % "\n".join(options))
1148 1148 return
1149 1149
1150 1150 clist = findpossible(ui, cmd).keys()
1151 1151 clist.sort()
1152 1152 ui.write("%s\n" % "\n".join(clist))
1153 1153
1154 1154 def debugrebuildstate(ui, repo, rev=None):
1155 1155 """rebuild the dirstate as it would look like for the given revision"""
1156 1156 if not rev:
1157 1157 rev = repo.changelog.tip()
1158 1158 else:
1159 1159 rev = repo.lookup(rev)
1160 1160 change = repo.changelog.read(rev)
1161 1161 n = change[0]
1162 1162 files = repo.manifest.read(n)
1163 1163 wlock = repo.wlock()
1164 1164 repo.dirstate.rebuild(rev, files)
1165 1165
1166 1166 def debugcheckstate(ui, repo):
1167 1167 """validate the correctness of the current dirstate"""
1168 1168 parent1, parent2 = repo.dirstate.parents()
1169 1169 repo.dirstate.read()
1170 1170 dc = repo.dirstate.map
1171 1171 keys = dc.keys()
1172 1172 keys.sort()
1173 1173 m1n = repo.changelog.read(parent1)[0]
1174 1174 m2n = repo.changelog.read(parent2)[0]
1175 1175 m1 = repo.manifest.read(m1n)
1176 1176 m2 = repo.manifest.read(m2n)
1177 1177 errors = 0
1178 1178 for f in dc:
1179 1179 state = repo.dirstate.state(f)
1180 1180 if state in "nr" and f not in m1:
1181 1181 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1182 1182 errors += 1
1183 1183 if state in "a" and f in m1:
1184 1184 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1185 1185 errors += 1
1186 1186 if state in "m" and f not in m1 and f not in m2:
1187 1187 ui.warn(_("%s in state %s, but not in either manifest\n") %
1188 1188 (f, state))
1189 1189 errors += 1
1190 1190 for f in m1:
1191 1191 state = repo.dirstate.state(f)
1192 1192 if state not in "nrm":
1193 1193 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1194 1194 errors += 1
1195 1195 if errors:
1196 1196 error = _(".hg/dirstate inconsistent with current parent's manifest")
1197 1197 raise util.Abort(error)
1198 1198
1199 1199 def showconfig(ui, repo, *values):
1200 1200 """show combined config settings from all hgrc files
1201 1201
1202 1202 With no args, print names and values of all config items.
1203 1203
1204 1204 With one arg of the form section.name, print just the value of
1205 1205 that config item.
1206 1206
1207 1207 With multiple args, print names and values of all config items
1208 1208 with matching section names."""
1209 1209
1210 1210 if values:
1211 1211 if len([v for v in values if '.' in v]) > 1:
1212 1212 raise util.Abort(_('only one config item permitted'))
1213 1213 for section, name, value in ui.walkconfig():
1214 1214 sectname = section + '.' + name
1215 1215 if values:
1216 1216 for v in values:
1217 1217 if v == section:
1218 1218 ui.write('%s=%s\n' % (sectname, value))
1219 1219 elif v == sectname:
1220 1220 ui.write(value, '\n')
1221 1221 else:
1222 1222 ui.write('%s=%s\n' % (sectname, value))
1223 1223
1224 1224 def debugsetparents(ui, repo, rev1, rev2=None):
1225 1225 """manually set the parents of the current working directory
1226 1226
1227 1227 This is useful for writing repository conversion tools, but should
1228 1228 be used with care.
1229 1229 """
1230 1230
1231 1231 if not rev2:
1232 1232 rev2 = hex(nullid)
1233 1233
1234 1234 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
1235 1235
1236 1236 def debugstate(ui, repo):
1237 1237 """show the contents of the current dirstate"""
1238 1238 repo.dirstate.read()
1239 1239 dc = repo.dirstate.map
1240 1240 keys = dc.keys()
1241 1241 keys.sort()
1242 1242 for file_ in keys:
1243 1243 ui.write("%c %3o %10d %s %s\n"
1244 1244 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
1245 1245 time.strftime("%x %X",
1246 1246 time.localtime(dc[file_][3])), file_))
1247 1247 for f in repo.dirstate.copies():
1248 1248 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
1249 1249
1250 1250 def debugdata(ui, file_, rev):
1251 1251 """dump the contents of an data file revision"""
1252 1252 r = revlog.revlog(util.opener(os.getcwd(), audit=False),
1253 1253 file_[:-2] + ".i", file_, 0)
1254 1254 try:
1255 1255 ui.write(r.revision(r.lookup(rev)))
1256 1256 except KeyError:
1257 1257 raise util.Abort(_('invalid revision identifier %s') % rev)
1258 1258
1259 1259 def debugindex(ui, file_):
1260 1260 """dump the contents of an index file"""
1261 1261 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1262 1262 ui.write(" rev offset length base linkrev" +
1263 1263 " nodeid p1 p2\n")
1264 1264 for i in xrange(r.count()):
1265 1265 node = r.node(i)
1266 1266 pp = r.parents(node)
1267 1267 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1268 1268 i, r.start(i), r.length(i), r.base(i), r.linkrev(node),
1269 1269 short(node), short(pp[0]), short(pp[1])))
1270 1270
1271 1271 def debugindexdot(ui, file_):
1272 1272 """dump an index DAG as a .dot file"""
1273 1273 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1274 1274 ui.write("digraph G {\n")
1275 1275 for i in xrange(r.count()):
1276 1276 node = r.node(i)
1277 1277 pp = r.parents(node)
1278 1278 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1279 1279 if pp[1] != nullid:
1280 1280 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1281 1281 ui.write("}\n")
1282 1282
1283 1283 def debugrename(ui, repo, file, rev=None):
1284 1284 """dump rename information"""
1285 1285 r = repo.file(relpath(repo, [file])[0])
1286 1286 if rev:
1287 1287 try:
1288 1288 # assume all revision numbers are for changesets
1289 1289 n = repo.lookup(rev)
1290 1290 change = repo.changelog.read(n)
1291 1291 m = repo.manifest.read(change[0])
1292 1292 n = m[relpath(repo, [file])[0]]
1293 1293 except (hg.RepoError, KeyError):
1294 1294 n = r.lookup(rev)
1295 1295 else:
1296 1296 n = r.tip()
1297 1297 m = r.renamed(n)
1298 1298 if m:
1299 1299 ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
1300 1300 else:
1301 1301 ui.write(_("not renamed\n"))
1302 1302
1303 1303 def debugwalk(ui, repo, *pats, **opts):
1304 1304 """show how files match on given patterns"""
1305 1305 items = list(cmdutil.walk(repo, pats, opts))
1306 1306 if not items:
1307 1307 return
1308 1308 fmt = '%%s %%-%ds %%-%ds %%s' % (
1309 1309 max([len(abs) for (src, abs, rel, exact) in items]),
1310 1310 max([len(rel) for (src, abs, rel, exact) in items]))
1311 1311 for src, abs, rel, exact in items:
1312 1312 line = fmt % (src, abs, rel, exact and 'exact' or '')
1313 1313 ui.write("%s\n" % line.rstrip())
1314 1314
1315 1315 def diff(ui, repo, *pats, **opts):
1316 1316 """diff repository (or selected files)
1317 1317
1318 1318 Show differences between revisions for the specified files.
1319 1319
1320 1320 Differences between files are shown using the unified diff format.
1321 1321
1322 1322 When two revision arguments are given, then changes are shown
1323 1323 between those revisions. If only one revision is specified then
1324 1324 that revision is compared to the working directory, and, when no
1325 1325 revisions are specified, the working directory files are compared
1326 1326 to its parent.
1327 1327
1328 1328 Without the -a option, diff will avoid generating diffs of files
1329 1329 it detects as binary. With -a, diff will generate a diff anyway,
1330 1330 probably with undesirable results.
1331 1331 """
1332 1332 node1, node2 = cmdutil.revpair(ui, repo, opts['rev'])
1333 1333
1334 1334 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
1335 1335
1336 1336 patch.diff(repo, node1, node2, fns, match=matchfn,
1337 1337 opts=patch.diffopts(ui, opts))
1338 1338
1339 1339 def export(ui, repo, *changesets, **opts):
1340 1340 """dump the header and diffs for one or more changesets
1341 1341
1342 1342 Print the changeset header and diffs for one or more revisions.
1343 1343
1344 1344 The information shown in the changeset header is: author,
1345 1345 changeset hash, parent and commit comment.
1346 1346
1347 1347 Output may be to a file, in which case the name of the file is
1348 1348 given using a format string. The formatting rules are as follows:
1349 1349
1350 1350 %% literal "%" character
1351 1351 %H changeset hash (40 bytes of hexadecimal)
1352 1352 %N number of patches being generated
1353 1353 %R changeset revision number
1354 1354 %b basename of the exporting repository
1355 1355 %h short-form changeset hash (12 bytes of hexadecimal)
1356 1356 %n zero-padded sequence number, starting at 1
1357 1357 %r zero-padded changeset revision number
1358 1358
1359 1359 Without the -a option, export will avoid generating diffs of files
1360 1360 it detects as binary. With -a, export will generate a diff anyway,
1361 1361 probably with undesirable results.
1362 1362
1363 1363 With the --switch-parent option, the diff will be against the second
1364 1364 parent. It can be useful to review a merge.
1365 1365 """
1366 1366 if not changesets:
1367 1367 raise util.Abort(_("export requires at least one changeset"))
1368 1368 revs = cmdutil.revrange(ui, repo, changesets)
1369 1369 if len(revs) > 1:
1370 1370 ui.note(_('exporting patches:\n'))
1371 1371 else:
1372 1372 ui.note(_('exporting patch:\n'))
1373 1373 patch.export(repo, map(repo.lookup, revs), template=opts['output'],
1374 1374 switch_parent=opts['switch_parent'],
1375 1375 opts=patch.diffopts(ui, opts))
1376 1376
1377 1377 def grep(ui, repo, pattern, *pats, **opts):
1378 1378 """search for a pattern in specified files and revisions
1379 1379
1380 1380 Search revisions of files for a regular expression.
1381 1381
1382 1382 This command behaves differently than Unix grep. It only accepts
1383 1383 Python/Perl regexps. It searches repository history, not the
1384 1384 working directory. It always prints the revision number in which
1385 1385 a match appears.
1386 1386
1387 1387 By default, grep only prints output for the first revision of a
1388 1388 file in which it finds a match. To get it to print every revision
1389 1389 that contains a change in match status ("-" for a match that
1390 1390 becomes a non-match, or "+" for a non-match that becomes a match),
1391 1391 use the --all flag.
1392 1392 """
1393 1393 reflags = 0
1394 1394 if opts['ignore_case']:
1395 1395 reflags |= re.I
1396 1396 regexp = re.compile(pattern, reflags)
1397 1397 sep, eol = ':', '\n'
1398 1398 if opts['print0']:
1399 1399 sep = eol = '\0'
1400 1400
1401 1401 fcache = {}
1402 1402 def getfile(fn):
1403 1403 if fn not in fcache:
1404 1404 fcache[fn] = repo.file(fn)
1405 1405 return fcache[fn]
1406 1406
1407 1407 def matchlines(body):
1408 1408 begin = 0
1409 1409 linenum = 0
1410 1410 while True:
1411 1411 match = regexp.search(body, begin)
1412 1412 if not match:
1413 1413 break
1414 1414 mstart, mend = match.span()
1415 1415 linenum += body.count('\n', begin, mstart) + 1
1416 1416 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1417 1417 lend = body.find('\n', mend)
1418 1418 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1419 1419 begin = lend + 1
1420 1420
1421 1421 class linestate(object):
1422 1422 def __init__(self, line, linenum, colstart, colend):
1423 1423 self.line = line
1424 1424 self.linenum = linenum
1425 1425 self.colstart = colstart
1426 1426 self.colend = colend
1427 1427
1428 1428 def __eq__(self, other):
1429 1429 return self.line == other.line
1430 1430
1431 1431 matches = {}
1432 1432 copies = {}
1433 1433 def grepbody(fn, rev, body):
1434 1434 matches[rev].setdefault(fn, [])
1435 1435 m = matches[rev][fn]
1436 1436 for lnum, cstart, cend, line in matchlines(body):
1437 1437 s = linestate(line, lnum, cstart, cend)
1438 1438 m.append(s)
1439 1439
1440 1440 def difflinestates(a, b):
1441 1441 sm = difflib.SequenceMatcher(None, a, b)
1442 1442 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1443 1443 if tag == 'insert':
1444 1444 for i in xrange(blo, bhi):
1445 1445 yield ('+', b[i])
1446 1446 elif tag == 'delete':
1447 1447 for i in xrange(alo, ahi):
1448 1448 yield ('-', a[i])
1449 1449 elif tag == 'replace':
1450 1450 for i in xrange(alo, ahi):
1451 1451 yield ('-', a[i])
1452 1452 for i in xrange(blo, bhi):
1453 1453 yield ('+', b[i])
1454 1454
1455 1455 prev = {}
1456 1456 def display(fn, rev, states, prevstates):
1457 1457 counts = {'-': 0, '+': 0}
1458 1458 filerevmatches = {}
1459 1459 if incrementing or not opts['all']:
1460 1460 a, b, r = prevstates, states, rev
1461 1461 else:
1462 1462 a, b, r = states, prevstates, prev.get(fn, -1)
1463 1463 for change, l in difflinestates(a, b):
1464 1464 cols = [fn, str(r)]
1465 1465 if opts['line_number']:
1466 1466 cols.append(str(l.linenum))
1467 1467 if opts['all']:
1468 1468 cols.append(change)
1469 1469 if opts['user']:
1470 1470 cols.append(ui.shortuser(getchange(r)[1]))
1471 1471 if opts['files_with_matches']:
1472 1472 c = (fn, r)
1473 1473 if c in filerevmatches:
1474 1474 continue
1475 1475 filerevmatches[c] = 1
1476 1476 else:
1477 1477 cols.append(l.line)
1478 1478 ui.write(sep.join(cols), eol)
1479 1479 counts[change] += 1
1480 1480 return counts['+'], counts['-']
1481 1481
1482 1482 fstate = {}
1483 1483 skip = {}
1484 1484 getchange = util.cachefunc(lambda r:repo.changectx(r).changeset())
1485 1485 changeiter, matchfn = walkchangerevs(ui, repo, pats, getchange, opts)
1486 1486 count = 0
1487 1487 incrementing = False
1488 1488 follow = opts.get('follow')
1489 1489 for st, rev, fns in changeiter:
1490 1490 if st == 'window':
1491 1491 incrementing = rev
1492 1492 matches.clear()
1493 1493 elif st == 'add':
1494 1494 mf = repo.changectx(rev).manifest()
1495 1495 matches[rev] = {}
1496 1496 for fn in fns:
1497 1497 if fn in skip:
1498 1498 continue
1499 1499 fstate.setdefault(fn, {})
1500 1500 try:
1501 1501 grepbody(fn, rev, getfile(fn).read(mf[fn]))
1502 1502 if follow:
1503 1503 copied = getfile(fn).renamed(mf[fn])
1504 1504 if copied:
1505 1505 copies.setdefault(rev, {})[fn] = copied[0]
1506 1506 except KeyError:
1507 1507 pass
1508 1508 elif st == 'iter':
1509 1509 states = matches[rev].items()
1510 1510 states.sort()
1511 1511 for fn, m in states:
1512 1512 copy = copies.get(rev, {}).get(fn)
1513 1513 if fn in skip:
1514 1514 if copy:
1515 1515 skip[copy] = True
1516 1516 continue
1517 1517 if incrementing or not opts['all'] or fstate[fn]:
1518 1518 pos, neg = display(fn, rev, m, fstate[fn])
1519 1519 count += pos + neg
1520 1520 if pos and not opts['all']:
1521 1521 skip[fn] = True
1522 1522 if copy:
1523 1523 skip[copy] = True
1524 1524 fstate[fn] = m
1525 1525 if copy:
1526 1526 fstate[copy] = m
1527 1527 prev[fn] = rev
1528 1528
1529 1529 if not incrementing:
1530 1530 fstate = fstate.items()
1531 1531 fstate.sort()
1532 1532 for fn, state in fstate:
1533 1533 if fn in skip:
1534 1534 continue
1535 1535 if fn not in copies.get(prev[fn], {}):
1536 1536 display(fn, rev, {}, state)
1537 1537 return (count == 0 and 1) or 0
1538 1538
1539 1539 def heads(ui, repo, **opts):
1540 1540 """show current repository heads
1541 1541
1542 1542 Show all repository head changesets.
1543 1543
1544 1544 Repository "heads" are changesets that don't have children
1545 1545 changesets. They are where development generally takes place and
1546 1546 are the usual targets for update and merge operations.
1547 1547 """
1548 1548 if opts['rev']:
1549 1549 heads = repo.heads(repo.lookup(opts['rev']))
1550 1550 else:
1551 1551 heads = repo.heads()
1552 1552 br = None
1553 1553 if opts['branches']:
1554 1554 ui.warn(_("the --branches option is deprecated, "
1555 1555 "please use 'hg branches' instead\n"))
1556 1556 br = repo.branchlookup(heads)
1557 1557 displayer = show_changeset(ui, repo, opts)
1558 1558 for n in heads:
1559 1559 displayer.show(changenode=n, brinfo=br)
1560 1560
1561 1561 def identify(ui, repo):
1562 1562 """print information about the working copy
1563 1563
1564 1564 Print a short summary of the current state of the repo.
1565 1565
1566 1566 This summary identifies the repository state using one or two parent
1567 1567 hash identifiers, followed by a "+" if there are uncommitted changes
1568 1568 in the working directory, followed by a list of tags for this revision.
1569 1569 """
1570 1570 parents = [p for p in repo.dirstate.parents() if p != nullid]
1571 1571 if not parents:
1572 1572 ui.write(_("unknown\n"))
1573 1573 return
1574 1574
1575 1575 hexfunc = ui.debugflag and hex or short
1576 1576 modified, added, removed, deleted = repo.status()[:4]
1577 1577 output = ["%s%s" %
1578 1578 ('+'.join([hexfunc(parent) for parent in parents]),
1579 1579 (modified or added or removed or deleted) and "+" or "")]
1580 1580
1581 1581 if not ui.quiet:
1582 1582
1583 1583 branch = repo.workingctx().branch()
1584 1584 if branch:
1585 1585 output.append("(%s)" % branch)
1586 1586
1587 1587 # multiple tags for a single parent separated by '/'
1588 1588 parenttags = ['/'.join(tags)
1589 1589 for tags in map(repo.nodetags, parents) if tags]
1590 1590 # tags for multiple parents separated by ' + '
1591 1591 if parenttags:
1592 1592 output.append(' + '.join(parenttags))
1593 1593
1594 1594 ui.write("%s\n" % ' '.join(output))
1595 1595
1596 1596 def import_(ui, repo, patch1, *patches, **opts):
1597 1597 """import an ordered set of patches
1598 1598
1599 1599 Import a list of patches and commit them individually.
1600 1600
1601 1601 If there are outstanding changes in the working directory, import
1602 1602 will abort unless given the -f flag.
1603 1603
1604 1604 You can import a patch straight from a mail message. Even patches
1605 1605 as attachments work (body part must be type text/plain or
1606 1606 text/x-patch to be used). From and Subject headers of email
1607 1607 message are used as default committer and commit message. All
1608 1608 text/plain body parts before first diff are added to commit
1609 1609 message.
1610 1610
1611 1611 If imported patch was generated by hg export, user and description
1612 1612 from patch override values from message headers and body. Values
1613 1613 given on command line with -m and -u override these.
1614 1614
1615 1615 To read a patch from standard input, use patch name "-".
1616 1616 """
1617 1617 patches = (patch1,) + patches
1618 1618
1619 1619 if not opts['force']:
1620 1620 bail_if_changed(repo)
1621 1621
1622 1622 d = opts["base"]
1623 1623 strip = opts["strip"]
1624 1624
1625 1625 wlock = repo.wlock()
1626 1626 lock = repo.lock()
1627 1627
1628 1628 for p in patches:
1629 1629 pf = os.path.join(d, p)
1630 1630
1631 1631 if pf == '-':
1632 1632 ui.status(_("applying patch from stdin\n"))
1633 1633 tmpname, message, user, date = patch.extract(ui, sys.stdin)
1634 1634 else:
1635 1635 ui.status(_("applying %s\n") % p)
1636 1636 tmpname, message, user, date = patch.extract(ui, file(pf))
1637 1637
1638 1638 if tmpname is None:
1639 1639 raise util.Abort(_('no diffs found'))
1640 1640
1641 1641 try:
1642 1642 if opts['message']:
1643 1643 # pickup the cmdline msg
1644 1644 message = opts['message']
1645 1645 elif message:
1646 1646 # pickup the patch msg
1647 1647 message = message.strip()
1648 1648 else:
1649 1649 # launch the editor
1650 1650 message = None
1651 1651 ui.debug(_('message:\n%s\n') % message)
1652 1652
1653 1653 files = {}
1654 1654 try:
1655 1655 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
1656 1656 files=files)
1657 1657 finally:
1658 1658 files = patch.updatedir(ui, repo, files, wlock=wlock)
1659 1659 repo.commit(files, message, user, date, wlock=wlock, lock=lock)
1660 1660 finally:
1661 1661 os.unlink(tmpname)
1662 1662
1663 1663 def incoming(ui, repo, source="default", **opts):
1664 1664 """show new changesets found in source
1665 1665
1666 1666 Show new changesets found in the specified path/URL or the default
1667 1667 pull location. These are the changesets that would be pulled if a pull
1668 1668 was requested.
1669 1669
1670 1670 For remote repository, using --bundle avoids downloading the changesets
1671 1671 twice if the incoming is followed by a pull.
1672 1672
1673 1673 See pull for valid source format details.
1674 1674 """
1675 1675 source = ui.expandpath(source)
1676 1676 setremoteconfig(ui, opts)
1677 1677
1678 1678 other = hg.repository(ui, source)
1679 1679 incoming = repo.findincoming(other, force=opts["force"])
1680 1680 if not incoming:
1681 1681 ui.status(_("no changes found\n"))
1682 1682 return
1683 1683
1684 1684 cleanup = None
1685 1685 try:
1686 1686 fname = opts["bundle"]
1687 1687 if fname or not other.local():
1688 1688 # create a bundle (uncompressed if other repo is not local)
1689 1689 cg = other.changegroup(incoming, "incoming")
1690 1690 fname = cleanup = write_bundle(cg, fname, compress=other.local())
1691 1691 # keep written bundle?
1692 1692 if opts["bundle"]:
1693 1693 cleanup = None
1694 1694 if not other.local():
1695 1695 # use the created uncompressed bundlerepo
1696 1696 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1697 1697
1698 1698 revs = None
1699 1699 if opts['rev']:
1700 1700 revs = [other.lookup(rev) for rev in opts['rev']]
1701 1701 o = other.changelog.nodesbetween(incoming, revs)[0]
1702 1702 if opts['newest_first']:
1703 1703 o.reverse()
1704 1704 displayer = show_changeset(ui, other, opts)
1705 1705 for n in o:
1706 1706 parents = [p for p in other.changelog.parents(n) if p != nullid]
1707 1707 if opts['no_merges'] and len(parents) == 2:
1708 1708 continue
1709 1709 displayer.show(changenode=n)
1710 1710 if opts['patch']:
1711 1711 prev = (parents and parents[0]) or nullid
1712 1712 patch.diff(other, prev, n, fp=repo.ui)
1713 1713 ui.write("\n")
1714 1714 finally:
1715 1715 if hasattr(other, 'close'):
1716 1716 other.close()
1717 1717 if cleanup:
1718 1718 os.unlink(cleanup)
1719 1719
1720 1720 def init(ui, dest=".", **opts):
1721 1721 """create a new repository in the given directory
1722 1722
1723 1723 Initialize a new repository in the given directory. If the given
1724 1724 directory does not exist, it is created.
1725 1725
1726 1726 If no directory is given, the current directory is used.
1727 1727
1728 1728 It is possible to specify an ssh:// URL as the destination.
1729 1729 Look at the help text for the pull command for important details
1730 1730 about ssh:// URLs.
1731 1731 """
1732 1732 setremoteconfig(ui, opts)
1733 1733 hg.repository(ui, dest, create=1)
1734 1734
1735 1735 def locate(ui, repo, *pats, **opts):
1736 1736 """locate files matching specific patterns
1737 1737
1738 1738 Print all files under Mercurial control whose names match the
1739 1739 given patterns.
1740 1740
1741 1741 This command searches the current directory and its
1742 1742 subdirectories. To search an entire repository, move to the root
1743 1743 of the repository.
1744 1744
1745 1745 If no patterns are given to match, this command prints all file
1746 1746 names.
1747 1747
1748 1748 If you want to feed the output of this command into the "xargs"
1749 1749 command, use the "-0" option to both this command and "xargs".
1750 1750 This will avoid the problem of "xargs" treating single filenames
1751 1751 that contain white space as multiple filenames.
1752 1752 """
1753 1753 end = opts['print0'] and '\0' or '\n'
1754 1754 rev = opts['rev']
1755 1755 if rev:
1756 1756 node = repo.lookup(rev)
1757 1757 else:
1758 1758 node = None
1759 1759
1760 1760 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
1761 1761 head='(?:.*/|)'):
1762 1762 if not node and repo.dirstate.state(abs) == '?':
1763 1763 continue
1764 1764 if opts['fullpath']:
1765 1765 ui.write(os.path.join(repo.root, abs), end)
1766 1766 else:
1767 1767 ui.write(((pats and rel) or abs), end)
1768 1768
1769 1769 def log(ui, repo, *pats, **opts):
1770 1770 """show revision history of entire repository or files
1771 1771
1772 1772 Print the revision history of the specified files or the entire
1773 1773 project.
1774 1774
1775 1775 File history is shown without following rename or copy history of
1776 1776 files. Use -f/--follow with a file name to follow history across
1777 1777 renames and copies. --follow without a file name will only show
1778 1778 ancestors or descendants of the starting revision. --follow-first
1779 1779 only follows the first parent of merge revisions.
1780 1780
1781 1781 If no revision range is specified, the default is tip:0 unless
1782 1782 --follow is set, in which case the working directory parent is
1783 1783 used as the starting revision.
1784 1784
1785 1785 By default this command outputs: changeset id and hash, tags,
1786 1786 non-trivial parents, user, date and time, and a summary for each
1787 1787 commit. When the -v/--verbose switch is used, the list of changed
1788 1788 files and full commit message is shown.
1789 1789 """
1790 1790 class dui(object):
1791 1791 # Implement and delegate some ui protocol. Save hunks of
1792 1792 # output for later display in the desired order.
1793 1793 def __init__(self, ui):
1794 1794 self.ui = ui
1795 1795 self.hunk = {}
1796 1796 self.header = {}
1797 1797 def bump(self, rev):
1798 1798 self.rev = rev
1799 1799 self.hunk[rev] = []
1800 1800 self.header[rev] = []
1801 1801 def note(self, *args):
1802 1802 if self.verbose:
1803 1803 self.write(*args)
1804 1804 def status(self, *args):
1805 1805 if not self.quiet:
1806 1806 self.write(*args)
1807 1807 def write(self, *args):
1808 1808 self.hunk[self.rev].append(args)
1809 1809 def write_header(self, *args):
1810 1810 self.header[self.rev].append(args)
1811 1811 def debug(self, *args):
1812 1812 if self.debugflag:
1813 1813 self.write(*args)
1814 1814 def __getattr__(self, key):
1815 1815 return getattr(self.ui, key)
1816 1816
1817 1817 getchange = util.cachefunc(lambda r:repo.changectx(r).changeset())
1818 1818 changeiter, matchfn = walkchangerevs(ui, repo, pats, getchange, opts)
1819 1819
1820 1820 if opts['branches']:
1821 1821 ui.warn(_("the --branches option is deprecated, "
1822 1822 "please use 'hg branches' instead\n"))
1823 1823
1824 1824 if opts['limit']:
1825 1825 try:
1826 1826 limit = int(opts['limit'])
1827 1827 except ValueError:
1828 1828 raise util.Abort(_('limit must be a positive integer'))
1829 1829 if limit <= 0: raise util.Abort(_('limit must be positive'))
1830 1830 else:
1831 1831 limit = sys.maxint
1832 1832 count = 0
1833 1833
1834 1834 if opts['copies'] and opts['rev']:
1835 1835 endrev = max(cmdutil.revrange(ui, repo, opts['rev'])) + 1
1836 1836 else:
1837 1837 endrev = repo.changelog.count()
1838 1838 rcache = {}
1839 1839 ncache = {}
1840 1840 dcache = []
1841 1841 def getrenamed(fn, rev, man):
1842 1842 '''looks up all renames for a file (up to endrev) the first
1843 1843 time the file is given. It indexes on the changerev and only
1844 1844 parses the manifest if linkrev != changerev.
1845 1845 Returns rename info for fn at changerev rev.'''
1846 1846 if fn not in rcache:
1847 1847 rcache[fn] = {}
1848 1848 ncache[fn] = {}
1849 1849 fl = repo.file(fn)
1850 1850 for i in xrange(fl.count()):
1851 1851 node = fl.node(i)
1852 1852 lr = fl.linkrev(node)
1853 1853 renamed = fl.renamed(node)
1854 1854 rcache[fn][lr] = renamed
1855 1855 if renamed:
1856 1856 ncache[fn][node] = renamed
1857 1857 if lr >= endrev:
1858 1858 break
1859 1859 if rev in rcache[fn]:
1860 1860 return rcache[fn][rev]
1861 1861 mr = repo.manifest.rev(man)
1862 1862 if repo.manifest.parentrevs(mr) != (mr - 1, -1):
1863 1863 return ncache[fn].get(repo.manifest.find(man, fn)[0])
1864 1864 if not dcache or dcache[0] != man:
1865 1865 dcache[:] = [man, repo.manifest.readdelta(man)]
1866 1866 if fn in dcache[1]:
1867 1867 return ncache[fn].get(dcache[1][fn])
1868 1868 return None
1869 1869
1870 1870 displayer = show_changeset(ui, repo, opts)
1871 1871 for st, rev, fns in changeiter:
1872 1872 if st == 'window':
1873 1873 du = dui(ui)
1874 1874 displayer.ui = du
1875 1875 elif st == 'add':
1876 1876 du.bump(rev)
1877 1877 changenode = repo.changelog.node(rev)
1878 1878 parents = [p for p in repo.changelog.parents(changenode)
1879 1879 if p != nullid]
1880 1880 if opts['no_merges'] and len(parents) == 2:
1881 1881 continue
1882 1882 if opts['only_merges'] and len(parents) != 2:
1883 1883 continue
1884 1884
1885 1885 if opts['keyword']:
1886 1886 changes = getchange(rev)
1887 1887 miss = 0
1888 1888 for k in [kw.lower() for kw in opts['keyword']]:
1889 1889 if not (k in changes[1].lower() or
1890 1890 k in changes[4].lower() or
1891 1891 k in " ".join(changes[3][:20]).lower()):
1892 1892 miss = 1
1893 1893 break
1894 1894 if miss:
1895 1895 continue
1896 1896
1897 1897 br = None
1898 1898 if opts['branches']:
1899 1899 br = repo.branchlookup([repo.changelog.node(rev)])
1900 1900
1901 1901 copies = []
1902 1902 if opts.get('copies') and rev:
1903 1903 mf = getchange(rev)[0]
1904 1904 for fn in getchange(rev)[3]:
1905 1905 rename = getrenamed(fn, rev, mf)
1906 1906 if rename:
1907 1907 copies.append((fn, rename[0]))
1908 1908 displayer.show(rev, brinfo=br, copies=copies)
1909 1909 if opts['patch']:
1910 1910 prev = (parents and parents[0]) or nullid
1911 1911 patch.diff(repo, prev, changenode, match=matchfn, fp=du)
1912 1912 du.write("\n\n")
1913 1913 elif st == 'iter':
1914 1914 if count == limit: break
1915 1915 if du.header[rev]:
1916 1916 for args in du.header[rev]:
1917 1917 ui.write_header(*args)
1918 1918 if du.hunk[rev]:
1919 1919 count += 1
1920 1920 for args in du.hunk[rev]:
1921 1921 ui.write(*args)
1922 1922
1923 1923 def manifest(ui, repo, rev=None):
1924 1924 """output the latest or given revision of the project manifest
1925 1925
1926 1926 Print a list of version controlled files for the given revision.
1927 1927
1928 1928 The manifest is the list of files being version controlled. If no revision
1929 1929 is given then the tip is used.
1930 1930 """
1931 1931 if rev:
1932 1932 try:
1933 1933 # assume all revision numbers are for changesets
1934 1934 n = repo.lookup(rev)
1935 1935 change = repo.changelog.read(n)
1936 1936 n = change[0]
1937 1937 except hg.RepoError:
1938 1938 n = repo.manifest.lookup(rev)
1939 1939 else:
1940 1940 n = repo.manifest.tip()
1941 1941 m = repo.manifest.read(n)
1942 1942 files = m.keys()
1943 1943 files.sort()
1944 1944
1945 1945 for f in files:
1946 1946 ui.write("%40s %3s %s\n" % (hex(m[f]),
1947 1947 m.execf(f) and "755" or "644", f))
1948 1948
1949 1949 def merge(ui, repo, node=None, force=None, branch=None):
1950 1950 """Merge working directory with another revision
1951 1951
1952 1952 Merge the contents of the current working directory and the
1953 1953 requested revision. Files that changed between either parent are
1954 1954 marked as changed for the next commit and a commit must be
1955 1955 performed before any further updates are allowed.
1956 1956
1957 1957 If no revision is specified, the working directory's parent is a
1958 1958 head revision, and the repository contains exactly one other head,
1959 1959 the other head is merged with by default. Otherwise, an explicit
1960 1960 revision to merge with must be provided.
1961 1961 """
1962 1962
1963 1963 if node or branch:
1964 1964 node = _lookup(repo, node, branch)
1965 1965 else:
1966 1966 heads = repo.heads()
1967 1967 if len(heads) > 2:
1968 1968 raise util.Abort(_('repo has %d heads - '
1969 1969 'please merge with an explicit rev') %
1970 1970 len(heads))
1971 1971 if len(heads) == 1:
1972 1972 raise util.Abort(_('there is nothing to merge - '
1973 1973 'use "hg update" instead'))
1974 1974 parent = repo.dirstate.parents()[0]
1975 1975 if parent not in heads:
1976 1976 raise util.Abort(_('working dir not at a head rev - '
1977 1977 'use "hg update" or merge with an explicit rev'))
1978 1978 node = parent == heads[0] and heads[-1] or heads[0]
1979 1979 return hg.merge(repo, node, force=force)
1980 1980
1981 1981 def outgoing(ui, repo, dest=None, **opts):
1982 1982 """show changesets not found in destination
1983 1983
1984 1984 Show changesets not found in the specified destination repository or
1985 1985 the default push location. These are the changesets that would be pushed
1986 1986 if a push was requested.
1987 1987
1988 1988 See pull for valid destination format details.
1989 1989 """
1990 1990 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1991 1991 setremoteconfig(ui, opts)
1992 1992 revs = None
1993 1993 if opts['rev']:
1994 1994 revs = [repo.lookup(rev) for rev in opts['rev']]
1995 1995
1996 1996 other = hg.repository(ui, dest)
1997 1997 o = repo.findoutgoing(other, force=opts['force'])
1998 1998 if not o:
1999 1999 ui.status(_("no changes found\n"))
2000 2000 return
2001 2001 o = repo.changelog.nodesbetween(o, revs)[0]
2002 2002 if opts['newest_first']:
2003 2003 o.reverse()
2004 2004 displayer = show_changeset(ui, repo, opts)
2005 2005 for n in o:
2006 2006 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2007 2007 if opts['no_merges'] and len(parents) == 2:
2008 2008 continue
2009 2009 displayer.show(changenode=n)
2010 2010 if opts['patch']:
2011 2011 prev = (parents and parents[0]) or nullid
2012 2012 patch.diff(repo, prev, n)
2013 2013 ui.write("\n")
2014 2014
2015 2015 def parents(ui, repo, file_=None, rev=None, branches=None, **opts):
2016 2016 """show the parents of the working dir or revision
2017 2017
2018 2018 Print the working directory's parent revisions.
2019 2019 """
2020 2020 # legacy
2021 2021 if file_ and not rev:
2022 2022 try:
2023 2023 rev = repo.lookup(file_)
2024 2024 file_ = None
2025 2025 except hg.RepoError:
2026 2026 pass
2027 2027 else:
2028 2028 ui.warn(_("'hg parent REV' is deprecated, "
2029 2029 "please use 'hg parents -r REV instead\n"))
2030 2030
2031 2031 if rev:
2032 2032 if file_:
2033 2033 ctx = repo.filectx(file_, changeid=rev)
2034 2034 else:
2035 2035 ctx = repo.changectx(rev)
2036 2036 p = [cp.node() for cp in ctx.parents()]
2037 2037 else:
2038 2038 p = repo.dirstate.parents()
2039 2039
2040 2040 br = None
2041 2041 if branches is not None:
2042 2042 ui.warn(_("the --branches option is deprecated, "
2043 2043 "please use 'hg branches' instead\n"))
2044 2044 br = repo.branchlookup(p)
2045 2045 displayer = show_changeset(ui, repo, opts)
2046 2046 for n in p:
2047 2047 if n != nullid:
2048 2048 displayer.show(changenode=n, brinfo=br)
2049 2049
2050 2050 def paths(ui, repo, search=None):
2051 2051 """show definition of symbolic path names
2052 2052
2053 2053 Show definition of symbolic path name NAME. If no name is given, show
2054 2054 definition of available names.
2055 2055
2056 2056 Path names are defined in the [paths] section of /etc/mercurial/hgrc
2057 2057 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
2058 2058 """
2059 2059 if search:
2060 2060 for name, path in ui.configitems("paths"):
2061 2061 if name == search:
2062 2062 ui.write("%s\n" % path)
2063 2063 return
2064 2064 ui.warn(_("not found!\n"))
2065 2065 return 1
2066 2066 else:
2067 2067 for name, path in ui.configitems("paths"):
2068 2068 ui.write("%s = %s\n" % (name, path))
2069 2069
2070 2070 def postincoming(ui, repo, modheads, optupdate):
2071 2071 if modheads == 0:
2072 2072 return
2073 2073 if optupdate:
2074 2074 if modheads == 1:
2075 2075 return hg.update(repo, repo.changelog.tip()) # update
2076 2076 else:
2077 2077 ui.status(_("not updating, since new heads added\n"))
2078 2078 if modheads > 1:
2079 2079 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2080 2080 else:
2081 2081 ui.status(_("(run 'hg update' to get a working copy)\n"))
2082 2082
2083 2083 def pull(ui, repo, source="default", **opts):
2084 2084 """pull changes from the specified source
2085 2085
2086 2086 Pull changes from a remote repository to a local one.
2087 2087
2088 2088 This finds all changes from the repository at the specified path
2089 2089 or URL and adds them to the local repository. By default, this
2090 2090 does not update the copy of the project in the working directory.
2091 2091
2092 2092 Valid URLs are of the form:
2093 2093
2094 2094 local/filesystem/path
2095 2095 http://[user@]host[:port]/[path]
2096 2096 https://[user@]host[:port]/[path]
2097 2097 ssh://[user@]host[:port]/[path]
2098 2098
2099 2099 Some notes about using SSH with Mercurial:
2100 2100 - SSH requires an accessible shell account on the destination machine
2101 2101 and a copy of hg in the remote path or specified with as remotecmd.
2102 2102 - path is relative to the remote user's home directory by default.
2103 2103 Use an extra slash at the start of a path to specify an absolute path:
2104 2104 ssh://example.com//tmp/repository
2105 2105 - Mercurial doesn't use its own compression via SSH; the right thing
2106 2106 to do is to configure it in your ~/.ssh/config, e.g.:
2107 2107 Host *.mylocalnetwork.example.com
2108 2108 Compression no
2109 2109 Host *
2110 2110 Compression yes
2111 2111 Alternatively specify "ssh -C" as your ssh command in your hgrc or
2112 2112 with the --ssh command line option.
2113 2113 """
2114 2114 source = ui.expandpath(source)
2115 2115 setremoteconfig(ui, opts)
2116 2116
2117 2117 other = hg.repository(ui, source)
2118 2118 ui.status(_('pulling from %s\n') % (source))
2119 2119 revs = None
2120 2120 if opts['rev']:
2121 2121 if 'lookup' in other.capabilities:
2122 2122 revs = [other.lookup(rev) for rev in opts['rev']]
2123 2123 else:
2124 2124 error = _("Other repository doesn't support revision lookup, so a rev cannot be specified.")
2125 2125 raise util.Abort(error)
2126 2126 modheads = repo.pull(other, heads=revs, force=opts['force'])
2127 2127 return postincoming(ui, repo, modheads, opts['update'])
2128 2128
2129 2129 def push(ui, repo, dest=None, **opts):
2130 2130 """push changes to the specified destination
2131 2131
2132 2132 Push changes from the local repository to the given destination.
2133 2133
2134 2134 This is the symmetrical operation for pull. It helps to move
2135 2135 changes from the current repository to a different one. If the
2136 2136 destination is local this is identical to a pull in that directory
2137 2137 from the current one.
2138 2138
2139 2139 By default, push will refuse to run if it detects the result would
2140 2140 increase the number of remote heads. This generally indicates the
2141 2141 the client has forgotten to sync and merge before pushing.
2142 2142
2143 2143 Valid URLs are of the form:
2144 2144
2145 2145 local/filesystem/path
2146 2146 ssh://[user@]host[:port]/[path]
2147 2147
2148 2148 Look at the help text for the pull command for important details
2149 2149 about ssh:// URLs.
2150 2150
2151 2151 Pushing to http:// and https:// URLs is possible, too, if this
2152 2152 feature is enabled on the remote Mercurial server.
2153 2153 """
2154 2154 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2155 2155 setremoteconfig(ui, opts)
2156 2156
2157 2157 other = hg.repository(ui, dest)
2158 2158 ui.status('pushing to %s\n' % (dest))
2159 2159 revs = None
2160 2160 if opts['rev']:
2161 2161 revs = [repo.lookup(rev) for rev in opts['rev']]
2162 2162 r = repo.push(other, opts['force'], revs=revs)
2163 2163 return r == 0
2164 2164
2165 2165 def rawcommit(ui, repo, *flist, **rc):
2166 2166 """raw commit interface (DEPRECATED)
2167 2167
2168 2168 (DEPRECATED)
2169 2169 Lowlevel commit, for use in helper scripts.
2170 2170
2171 2171 This command is not intended to be used by normal users, as it is
2172 2172 primarily useful for importing from other SCMs.
2173 2173
2174 2174 This command is now deprecated and will be removed in a future
2175 2175 release, please use debugsetparents and commit instead.
2176 2176 """
2177 2177
2178 2178 ui.warn(_("(the rawcommit command is deprecated)\n"))
2179 2179
2180 2180 message = rc['message']
2181 2181 if not message and rc['logfile']:
2182 2182 try:
2183 2183 message = open(rc['logfile']).read()
2184 2184 except IOError:
2185 2185 pass
2186 2186 if not message and not rc['logfile']:
2187 2187 raise util.Abort(_("missing commit message"))
2188 2188
2189 2189 files = relpath(repo, list(flist))
2190 2190 if rc['files']:
2191 2191 files += open(rc['files']).read().splitlines()
2192 2192
2193 2193 rc['parent'] = map(repo.lookup, rc['parent'])
2194 2194
2195 2195 try:
2196 2196 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
2197 2197 except ValueError, inst:
2198 2198 raise util.Abort(str(inst))
2199 2199
2200 2200 def recover(ui, repo):
2201 2201 """roll back an interrupted transaction
2202 2202
2203 2203 Recover from an interrupted commit or pull.
2204 2204
2205 2205 This command tries to fix the repository status after an interrupted
2206 2206 operation. It should only be necessary when Mercurial suggests it.
2207 2207 """
2208 2208 if repo.recover():
2209 2209 return hg.verify(repo)
2210 2210 return 1
2211 2211
2212 2212 def remove(ui, repo, *pats, **opts):
2213 2213 """remove the specified files on the next commit
2214 2214
2215 2215 Schedule the indicated files for removal from the repository.
2216 2216
2217 2217 This command schedules the files to be removed at the next commit.
2218 2218 This only removes files from the current branch, not from the
2219 2219 entire project history. If the files still exist in the working
2220 2220 directory, they will be deleted from it. If invoked with --after,
2221 2221 files that have been manually deleted are marked as removed.
2222 2222
2223 2223 Modified files and added files are not removed by default. To
2224 2224 remove them, use the -f/--force option.
2225 2225 """
2226 2226 names = []
2227 2227 if not opts['after'] and not pats:
2228 2228 raise util.Abort(_('no files specified'))
2229 2229 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
2230 2230 exact = dict.fromkeys(files)
2231 2231 mardu = map(dict.fromkeys, repo.status(files=files, match=matchfn))[:5]
2232 2232 modified, added, removed, deleted, unknown = mardu
2233 2233 remove, forget = [], []
2234 2234 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts):
2235 2235 reason = None
2236 2236 if abs not in deleted and opts['after']:
2237 2237 reason = _('is still present')
2238 2238 elif abs in modified and not opts['force']:
2239 2239 reason = _('is modified (use -f to force removal)')
2240 2240 elif abs in added:
2241 2241 if opts['force']:
2242 2242 forget.append(abs)
2243 2243 continue
2244 2244 reason = _('has been marked for add (use -f to force removal)')
2245 2245 elif abs in unknown:
2246 2246 reason = _('is not managed')
2247 2247 elif abs in removed:
2248 2248 continue
2249 2249 if reason:
2250 2250 if exact:
2251 2251 ui.warn(_('not removing %s: file %s\n') % (rel, reason))
2252 2252 else:
2253 2253 if ui.verbose or not exact:
2254 2254 ui.status(_('removing %s\n') % rel)
2255 2255 remove.append(abs)
2256 2256 repo.forget(forget)
2257 2257 repo.remove(remove, unlink=not opts['after'])
2258 2258
2259 2259 def rename(ui, repo, *pats, **opts):
2260 2260 """rename files; equivalent of copy + remove
2261 2261
2262 2262 Mark dest as copies of sources; mark sources for deletion. If
2263 2263 dest is a directory, copies are put in that directory. If dest is
2264 2264 a file, there can only be one source.
2265 2265
2266 2266 By default, this command copies the contents of files as they
2267 2267 stand in the working directory. If invoked with --after, the
2268 2268 operation is recorded, but no copying is performed.
2269 2269
2270 2270 This command takes effect in the next commit.
2271 2271
2272 2272 NOTE: This command should be treated as experimental. While it
2273 2273 should properly record rename files, this information is not yet
2274 2274 fully used by merge, nor fully reported by log.
2275 2275 """
2276 2276 wlock = repo.wlock(0)
2277 2277 errs, copied = docopy(ui, repo, pats, opts, wlock)
2278 2278 names = []
2279 2279 for abs, rel, exact in copied:
2280 2280 if ui.verbose or not exact:
2281 2281 ui.status(_('removing %s\n') % rel)
2282 2282 names.append(abs)
2283 2283 if not opts.get('dry_run'):
2284 2284 repo.remove(names, True, wlock)
2285 2285 return errs
2286 2286
2287 2287 def revert(ui, repo, *pats, **opts):
2288 2288 """revert files or dirs to their states as of some revision
2289 2289
2290 2290 With no revision specified, revert the named files or directories
2291 2291 to the contents they had in the parent of the working directory.
2292 2292 This restores the contents of the affected files to an unmodified
2293 2293 state. If the working directory has two parents, you must
2294 2294 explicitly specify the revision to revert to.
2295 2295
2296 2296 Modified files are saved with a .orig suffix before reverting.
2297 2297 To disable these backups, use --no-backup.
2298 2298
2299 2299 Using the -r option, revert the given files or directories to their
2300 2300 contents as of a specific revision. This can be helpful to "roll
2301 2301 back" some or all of a change that should not have been committed.
2302 2302
2303 2303 Revert modifies the working directory. It does not commit any
2304 2304 changes, or change the parent of the working directory. If you
2305 2305 revert to a revision other than the parent of the working
2306 2306 directory, the reverted files will thus appear modified
2307 2307 afterwards.
2308 2308
2309 2309 If a file has been deleted, it is recreated. If the executable
2310 2310 mode of a file was changed, it is reset.
2311 2311
2312 2312 If names are given, all files matching the names are reverted.
2313 2313
2314 2314 If no arguments are given, no files are reverted.
2315 2315 """
2316 2316
2317 2317 if not pats and not opts['all']:
2318 2318 raise util.Abort(_('no files or directories specified; '
2319 2319 'use --all to revert the whole repo'))
2320 2320
2321 2321 parent, p2 = repo.dirstate.parents()
2322 2322 if not opts['rev'] and p2 != nullid:
2323 2323 raise util.Abort(_('uncommitted merge - please provide a '
2324 2324 'specific revision'))
2325 2325 node = repo.changectx(opts['rev']).node()
2326 2326 mf = repo.manifest.read(repo.changelog.read(node)[0])
2327 2327 if node == parent:
2328 2328 pmf = mf
2329 2329 else:
2330 2330 pmf = None
2331 2331
2332 2332 wlock = repo.wlock()
2333 2333
2334 2334 # need all matching names in dirstate and manifest of target rev,
2335 2335 # so have to walk both. do not print errors if files exist in one
2336 2336 # but not other.
2337 2337
2338 2338 names = {}
2339 2339 target_only = {}
2340 2340
2341 2341 # walk dirstate.
2342 2342
2343 2343 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
2344 2344 badmatch=mf.has_key):
2345 2345 names[abs] = (rel, exact)
2346 2346 if src == 'b':
2347 2347 target_only[abs] = True
2348 2348
2349 2349 # walk target manifest.
2350 2350
2351 2351 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
2352 2352 badmatch=names.has_key):
2353 2353 if abs in names: continue
2354 2354 names[abs] = (rel, exact)
2355 2355 target_only[abs] = True
2356 2356
2357 2357 changes = repo.status(match=names.has_key, wlock=wlock)[:5]
2358 2358 modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
2359 2359
2360 2360 revert = ([], _('reverting %s\n'))
2361 2361 add = ([], _('adding %s\n'))
2362 2362 remove = ([], _('removing %s\n'))
2363 2363 forget = ([], _('forgetting %s\n'))
2364 2364 undelete = ([], _('undeleting %s\n'))
2365 2365 update = {}
2366 2366
2367 2367 disptable = (
2368 2368 # dispatch table:
2369 2369 # file state
2370 2370 # action if in target manifest
2371 2371 # action if not in target manifest
2372 2372 # make backup if in target manifest
2373 2373 # make backup if not in target manifest
2374 2374 (modified, revert, remove, True, True),
2375 2375 (added, revert, forget, True, False),
2376 2376 (removed, undelete, None, False, False),
2377 2377 (deleted, revert, remove, False, False),
2378 2378 (unknown, add, None, True, False),
2379 2379 (target_only, add, None, False, False),
2380 2380 )
2381 2381
2382 2382 entries = names.items()
2383 2383 entries.sort()
2384 2384
2385 2385 for abs, (rel, exact) in entries:
2386 2386 mfentry = mf.get(abs)
2387 2387 def handle(xlist, dobackup):
2388 2388 xlist[0].append(abs)
2389 2389 update[abs] = 1
2390 2390 if dobackup and not opts['no_backup'] and os.path.exists(rel):
2391 2391 bakname = "%s.orig" % rel
2392 2392 ui.note(_('saving current version of %s as %s\n') %
2393 2393 (rel, bakname))
2394 2394 if not opts.get('dry_run'):
2395 2395 shutil.copyfile(rel, bakname)
2396 2396 shutil.copymode(rel, bakname)
2397 2397 if ui.verbose or not exact:
2398 2398 ui.status(xlist[1] % rel)
2399 2399 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2400 2400 if abs not in table: continue
2401 2401 # file has changed in dirstate
2402 2402 if mfentry:
2403 2403 handle(hitlist, backuphit)
2404 2404 elif misslist is not None:
2405 2405 handle(misslist, backupmiss)
2406 2406 else:
2407 2407 if exact: ui.warn(_('file not managed: %s\n' % rel))
2408 2408 break
2409 2409 else:
2410 2410 # file has not changed in dirstate
2411 2411 if node == parent:
2412 2412 if exact: ui.warn(_('no changes needed to %s\n' % rel))
2413 2413 continue
2414 2414 if pmf is None:
2415 2415 # only need parent manifest in this unlikely case,
2416 2416 # so do not read by default
2417 2417 pmf = repo.manifest.read(repo.changelog.read(parent)[0])
2418 2418 if abs in pmf:
2419 2419 if mfentry:
2420 2420 # if version of file is same in parent and target
2421 2421 # manifests, do nothing
2422 2422 if pmf[abs] != mfentry:
2423 2423 handle(revert, False)
2424 2424 else:
2425 2425 handle(remove, False)
2426 2426
2427 2427 if not opts.get('dry_run'):
2428 2428 repo.dirstate.forget(forget[0])
2429 2429 r = hg.revert(repo, node, update.has_key, wlock)
2430 2430 repo.dirstate.update(add[0], 'a')
2431 2431 repo.dirstate.update(undelete[0], 'n')
2432 2432 repo.dirstate.update(remove[0], 'r')
2433 2433 return r
2434 2434
2435 2435 def rollback(ui, repo):
2436 2436 """roll back the last transaction in this repository
2437 2437
2438 2438 Roll back the last transaction in this repository, restoring the
2439 2439 project to its state prior to the transaction.
2440 2440
2441 2441 Transactions are used to encapsulate the effects of all commands
2442 2442 that create new changesets or propagate existing changesets into a
2443 2443 repository. For example, the following commands are transactional,
2444 2444 and their effects can be rolled back:
2445 2445
2446 2446 commit
2447 2447 import
2448 2448 pull
2449 2449 push (with this repository as destination)
2450 2450 unbundle
2451 2451
2452 2452 This command should be used with care. There is only one level of
2453 2453 rollback, and there is no way to undo a rollback.
2454 2454
2455 2455 This command is not intended for use on public repositories. Once
2456 2456 changes are visible for pull by other users, rolling a transaction
2457 2457 back locally is ineffective (someone else may already have pulled
2458 2458 the changes). Furthermore, a race is possible with readers of the
2459 2459 repository; for example an in-progress pull from the repository
2460 2460 may fail if a rollback is performed.
2461 2461 """
2462 2462 repo.rollback()
2463 2463
2464 2464 def root(ui, repo):
2465 2465 """print the root (top) of the current working dir
2466 2466
2467 2467 Print the root directory of the current repository.
2468 2468 """
2469 2469 ui.write(repo.root + "\n")
2470 2470
2471 2471 def serve(ui, repo, **opts):
2472 2472 """export the repository via HTTP
2473 2473
2474 2474 Start a local HTTP repository browser and pull server.
2475 2475
2476 2476 By default, the server logs accesses to stdout and errors to
2477 2477 stderr. Use the "-A" and "-E" options to log to files.
2478 2478 """
2479 2479
2480 2480 if opts["stdio"]:
2481 2481 if repo is None:
2482 2482 raise hg.RepoError(_("There is no Mercurial repository here"
2483 2483 " (.hg not found)"))
2484 2484 s = sshserver.sshserver(ui, repo)
2485 2485 s.serve_forever()
2486 2486
2487 2487 optlist = ("name templates style address port ipv6"
2488 2488 " accesslog errorlog webdir_conf")
2489 2489 for o in optlist.split():
2490 2490 if opts[o]:
2491 2491 ui.setconfig("web", o, str(opts[o]))
2492 2492
2493 2493 if repo is None and not ui.config("web", "webdir_conf"):
2494 2494 raise hg.RepoError(_("There is no Mercurial repository here"
2495 2495 " (.hg not found)"))
2496 2496
2497 2497 if opts['daemon'] and not opts['daemon_pipefds']:
2498 2498 rfd, wfd = os.pipe()
2499 2499 args = sys.argv[:]
2500 2500 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
2501 2501 pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
2502 2502 args[0], args)
2503 2503 os.close(wfd)
2504 2504 os.read(rfd, 1)
2505 2505 os._exit(0)
2506 2506
2507 2507 try:
2508 2508 httpd = hgweb.server.create_server(ui, repo)
2509 2509 except socket.error, inst:
2510 2510 raise util.Abort(_('cannot start server: %s') % inst.args[1])
2511 2511
2512 2512 if ui.verbose:
2513 2513 addr, port = httpd.socket.getsockname()
2514 2514 if addr == '0.0.0.0':
2515 2515 addr = socket.gethostname()
2516 2516 else:
2517 2517 try:
2518 2518 addr = socket.gethostbyaddr(addr)[0]
2519 2519 except socket.error:
2520 2520 pass
2521 2521 if port != 80:
2522 2522 ui.status(_('listening at http://%s:%d/\n') % (addr, port))
2523 2523 else:
2524 2524 ui.status(_('listening at http://%s/\n') % addr)
2525 2525
2526 2526 if opts['pid_file']:
2527 2527 fp = open(opts['pid_file'], 'w')
2528 2528 fp.write(str(os.getpid()) + '\n')
2529 2529 fp.close()
2530 2530
2531 2531 if opts['daemon_pipefds']:
2532 2532 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
2533 2533 os.close(rfd)
2534 2534 os.write(wfd, 'y')
2535 2535 os.close(wfd)
2536 2536 sys.stdout.flush()
2537 2537 sys.stderr.flush()
2538 2538 fd = os.open(util.nulldev, os.O_RDWR)
2539 2539 if fd != 0: os.dup2(fd, 0)
2540 2540 if fd != 1: os.dup2(fd, 1)
2541 2541 if fd != 2: os.dup2(fd, 2)
2542 2542 if fd not in (0, 1, 2): os.close(fd)
2543 2543
2544 2544 httpd.serve_forever()
2545 2545
2546 2546 def status(ui, repo, *pats, **opts):
2547 2547 """show changed files in the working directory
2548 2548
2549 2549 Show status of files in the repository. If names are given, only
2550 2550 files that match are shown. Files that are clean or ignored, are
2551 2551 not listed unless -c (clean), -i (ignored) or -A is given.
2552 2552
2553 2553 If one revision is given, it is used as the base revision.
2554 2554 If two revisions are given, the difference between them is shown.
2555 2555
2556 2556 The codes used to show the status of files are:
2557 2557 M = modified
2558 2558 A = added
2559 2559 R = removed
2560 2560 C = clean
2561 2561 ! = deleted, but still tracked
2562 2562 ? = not tracked
2563 2563 I = ignored (not shown by default)
2564 2564 = the previous added file was copied from here
2565 2565 """
2566 2566
2567 2567 all = opts['all']
2568 2568 node1, node2 = cmdutil.revpair(ui, repo, opts.get('rev'))
2569 2569
2570 2570 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
2571 2571 cwd = (pats and repo.getcwd()) or ''
2572 2572 modified, added, removed, deleted, unknown, ignored, clean = [
2573 2573 [util.pathto(cwd, x) for x in n]
2574 2574 for n in repo.status(node1=node1, node2=node2, files=files,
2575 2575 match=matchfn,
2576 2576 list_ignored=all or opts['ignored'],
2577 2577 list_clean=all or opts['clean'])]
2578 2578
2579 2579 changetypes = (('modified', 'M', modified),
2580 2580 ('added', 'A', added),
2581 2581 ('removed', 'R', removed),
2582 2582 ('deleted', '!', deleted),
2583 2583 ('unknown', '?', unknown),
2584 2584 ('ignored', 'I', ignored))
2585 2585
2586 2586 explicit_changetypes = changetypes + (('clean', 'C', clean),)
2587 2587
2588 2588 end = opts['print0'] and '\0' or '\n'
2589 2589
2590 2590 for opt, char, changes in ([ct for ct in explicit_changetypes
2591 2591 if all or opts[ct[0]]]
2592 2592 or changetypes):
2593 2593 if opts['no_status']:
2594 2594 format = "%%s%s" % end
2595 2595 else:
2596 2596 format = "%s %%s%s" % (char, end)
2597 2597
2598 2598 for f in changes:
2599 2599 ui.write(format % f)
2600 2600 if ((all or opts.get('copies')) and not opts.get('no_status')):
2601 2601 copied = repo.dirstate.copied(f)
2602 2602 if copied:
2603 2603 ui.write(' %s%s' % (copied, end))
2604 2604
2605 2605 def tag(ui, repo, name, rev_=None, **opts):
2606 2606 """add a tag for the current tip or a given revision
2607 2607
2608 2608 Name a particular revision using <name>.
2609 2609
2610 2610 Tags are used to name particular revisions of the repository and are
2611 2611 very useful to compare different revision, to go back to significant
2612 2612 earlier versions or to mark branch points as releases, etc.
2613 2613
2614 2614 If no revision is given, the parent of the working directory is used.
2615 2615
2616 2616 To facilitate version control, distribution, and merging of tags,
2617 2617 they are stored as a file named ".hgtags" which is managed
2618 2618 similarly to other project files and can be hand-edited if
2619 2619 necessary. The file '.hg/localtags' is used for local tags (not
2620 2620 shared among repositories).
2621 2621 """
2622 2622 if name in ['tip', '.']:
2623 2623 raise util.Abort(_("the name '%s' is reserved") % name)
2624 2624 if rev_ is not None:
2625 2625 ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
2626 2626 "please use 'hg tag [-r REV] NAME' instead\n"))
2627 2627 if opts['rev']:
2628 2628 raise util.Abort(_("use only one form to specify the revision"))
2629 2629 if opts['rev']:
2630 2630 rev_ = opts['rev']
2631 2631 if not rev_ and repo.dirstate.parents()[1] != nullid:
2632 2632 raise util.Abort(_('uncommitted merge - please provide a '
2633 2633 'specific revision'))
2634 2634 r = repo.changectx(rev_).node()
2635 2635
2636 2636 message = opts['message']
2637 2637 if not message:
2638 2638 message = _('Added tag %s for changeset %s') % (name, short(r))
2639 2639
2640 2640 repo.tag(name, r, message, opts['local'], opts['user'], opts['date'])
2641 2641
2642 2642 def tags(ui, repo):
2643 2643 """list repository tags
2644 2644
2645 2645 List the repository tags.
2646 2646
2647 2647 This lists both regular and local tags.
2648 2648 """
2649 2649
2650 2650 l = repo.tagslist()
2651 2651 l.reverse()
2652 2652 hexfunc = ui.debugflag and hex or short
2653 2653 for t, n in l:
2654 2654 try:
2655 2655 r = "%5d:%s" % (repo.changelog.rev(n), hexfunc(n))
2656 2656 except KeyError:
2657 2657 r = " ?:?"
2658 2658 if ui.quiet:
2659 2659 ui.write("%s\n" % t)
2660 2660 else:
2661 2661 ui.write("%-30s %s\n" % (t, r))
2662 2662
2663 2663 def tip(ui, repo, **opts):
2664 2664 """show the tip revision
2665 2665
2666 2666 Show the tip revision.
2667 2667 """
2668 2668 n = repo.changelog.tip()
2669 2669 br = None
2670 2670 if opts['branches']:
2671 2671 ui.warn(_("the --branches option is deprecated, "
2672 2672 "please use 'hg branches' instead\n"))
2673 2673 br = repo.branchlookup([n])
2674 2674 show_changeset(ui, repo, opts).show(changenode=n, brinfo=br)
2675 2675 if opts['patch']:
2676 2676 patch.diff(repo, repo.changelog.parents(n)[0], n)
2677 2677
2678 2678 def unbundle(ui, repo, fname, **opts):
2679 2679 """apply a changegroup file
2680 2680
2681 2681 Apply a compressed changegroup file generated by the bundle
2682 2682 command.
2683 2683 """
2684 2684 f = urllib.urlopen(fname)
2685 2685
2686 2686 header = f.read(6)
2687 2687 if not header.startswith("HG"):
2688 2688 raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
2689 2689 elif not header.startswith("HG10"):
2690 2690 raise util.Abort(_("%s: unknown bundle version") % fname)
2691 2691 elif header == "HG10BZ":
2692 2692 def generator(f):
2693 2693 zd = bz2.BZ2Decompressor()
2694 2694 zd.decompress("BZ")
2695 2695 for chunk in f:
2696 2696 yield zd.decompress(chunk)
2697 2697 elif header == "HG10UN":
2698 2698 def generator(f):
2699 2699 for chunk in f:
2700 2700 yield chunk
2701 2701 else:
2702 2702 raise util.Abort(_("%s: unknown bundle compression type")
2703 2703 % fname)
2704 2704 gen = generator(util.filechunkiter(f, 4096))
2705 2705 modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle',
2706 2706 'bundle:' + fname)
2707 2707 return postincoming(ui, repo, modheads, opts['update'])
2708 2708
2709 2709 def update(ui, repo, node=None, merge=False, clean=False, force=None,
2710 2710 branch=None):
2711 2711 """update or merge working directory
2712 2712
2713 2713 Update the working directory to the specified revision.
2714 2714
2715 2715 If there are no outstanding changes in the working directory and
2716 2716 there is a linear relationship between the current version and the
2717 2717 requested version, the result is the requested version.
2718 2718
2719 2719 To merge the working directory with another revision, use the
2720 2720 merge command.
2721 2721
2722 2722 By default, update will refuse to run if doing so would require
2723 2723 merging or discarding local changes.
2724 2724 """
2725 2725 node = _lookup(repo, node, branch)
2726 2726 if clean:
2727 2727 return hg.clean(repo, node)
2728 2728 else:
2729 2729 return hg.update(repo, node)
2730 2730
2731 2731 def _lookup(repo, node, branch=None):
2732 2732 if branch:
2733 2733 repo.ui.warn(_("the --branch option is deprecated, "
2734 2734 "please use 'hg branch' instead\n"))
2735 2735 br = repo.branchlookup(branch=branch)
2736 2736 found = []
2737 2737 for x in br:
2738 2738 if branch in br[x]:
2739 2739 found.append(x)
2740 2740 if len(found) > 1:
2741 2741 repo.ui.warn(_("Found multiple heads for %s\n") % branch)
2742 2742 for x in found:
2743 2743 show_changeset(ui, repo, {}).show(changenode=x, brinfo=br)
2744 2744 raise util.Abort("")
2745 2745 if len(found) == 1:
2746 2746 node = found[0]
2747 2747 repo.ui.warn(_("Using head %s for branch %s\n")
2748 2748 % (short(node), branch))
2749 2749 else:
2750 2750 raise util.Abort(_("branch %s not found") % branch)
2751 2751 else:
2752 2752 node = node and repo.lookup(node) or repo.changelog.tip()
2753 2753 return node
2754 2754
2755 2755 def verify(ui, repo):
2756 2756 """verify the integrity of the repository
2757 2757
2758 2758 Verify the integrity of the current repository.
2759 2759
2760 2760 This will perform an extensive check of the repository's
2761 2761 integrity, validating the hashes and checksums of each entry in
2762 2762 the changelog, manifest, and tracked files, as well as the
2763 2763 integrity of their crosslinks and indices.
2764 2764 """
2765 2765 return hg.verify(repo)
2766 2766
2767 2767 # Command options and aliases are listed here, alphabetically
2768 2768
2769 2769 globalopts = [
2770 2770 ('R', 'repository', '',
2771 2771 _('repository root directory or symbolic path name')),
2772 2772 ('', 'cwd', '', _('change working directory')),
2773 2773 ('y', 'noninteractive', None,
2774 2774 _('do not prompt, assume \'yes\' for any required answers')),
2775 2775 ('q', 'quiet', None, _('suppress output')),
2776 2776 ('v', 'verbose', None, _('enable additional output')),
2777 2777 ('', 'config', [], _('set/override config option')),
2778 2778 ('', 'debug', None, _('enable debugging output')),
2779 2779 ('', 'debugger', None, _('start debugger')),
2780 2780 ('', 'lsprof', None, _('print improved command execution profile')),
2781 2781 ('', 'traceback', None, _('print traceback on exception')),
2782 2782 ('', 'time', None, _('time how long the command takes')),
2783 2783 ('', 'profile', None, _('print command execution profile')),
2784 2784 ('', 'version', None, _('output version information and exit')),
2785 2785 ('h', 'help', None, _('display help and exit')),
2786 2786 ]
2787 2787
2788 2788 dryrunopts = [('n', 'dry-run', None,
2789 2789 _('do not perform actions, just print output'))]
2790 2790
2791 2791 remoteopts = [
2792 2792 ('e', 'ssh', '', _('specify ssh command to use')),
2793 2793 ('', 'remotecmd', '', _('specify hg command to run on the remote side')),
2794 2794 ]
2795 2795
2796 2796 walkopts = [
2797 2797 ('I', 'include', [], _('include names matching the given patterns')),
2798 2798 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2799 2799 ]
2800 2800
2801 2801 table = {
2802 2802 "^add":
2803 2803 (add,
2804 2804 walkopts + dryrunopts,
2805 2805 _('hg add [OPTION]... [FILE]...')),
2806 2806 "addremove":
2807 2807 (addremove,
2808 2808 [('s', 'similarity', '',
2809 2809 _('guess renamed files by similarity (0<=s<=100)')),
2810 2810 ] + walkopts + dryrunopts,
2811 2811 _('hg addremove [OPTION]... [FILE]...')),
2812 2812 "^annotate":
2813 2813 (annotate,
2814 2814 [('r', 'rev', '', _('annotate the specified revision')),
2815 2815 ('f', 'follow', None, _('follow file copies and renames')),
2816 2816 ('a', 'text', None, _('treat all files as text')),
2817 2817 ('u', 'user', None, _('list the author')),
2818 2818 ('d', 'date', None, _('list the date')),
2819 2819 ('n', 'number', None, _('list the revision number (default)')),
2820 2820 ('c', 'changeset', None, _('list the changeset')),
2821 2821 ] + walkopts,
2822 2822 _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),
2823 2823 "archive":
2824 2824 (archive,
2825 2825 [('', 'no-decode', None, _('do not pass files through decoders')),
2826 2826 ('p', 'prefix', '', _('directory prefix for files in archive')),
2827 2827 ('r', 'rev', '', _('revision to distribute')),
2828 2828 ('t', 'type', '', _('type of distribution to create')),
2829 2829 ] + walkopts,
2830 2830 _('hg archive [OPTION]... DEST')),
2831 2831 "backout":
2832 2832 (backout,
2833 2833 [('', 'merge', None,
2834 2834 _('merge with old dirstate parent after backout')),
2835 2835 ('m', 'message', '', _('use <text> as commit message')),
2836 2836 ('l', 'logfile', '', _('read commit message from <file>')),
2837 2837 ('d', 'date', '', _('record datecode as commit date')),
2838 2838 ('', 'parent', '', _('parent to choose when backing out merge')),
2839 2839 ('u', 'user', '', _('record user as committer')),
2840 2840 ] + walkopts,
2841 2841 _('hg backout [OPTION]... REV')),
2842 2842 "branch": (branch, [], _('hg branch [NAME]')),
2843 2843 "branches": (branches, [], _('hg branches')),
2844 2844 "bundle":
2845 2845 (bundle,
2846 2846 [('f', 'force', None,
2847 2847 _('run even when remote repository is unrelated')),
2848 2848 ('r', 'rev', [],
2849 2849 _('a changeset you would like to bundle')),
2850 2850 ('', 'base', [],
2851 2851 _('a base changeset to specify instead of a destination')),
2852 2852 ] + remoteopts,
2853 2853 _('hg bundle [--base REV]... [--rev REV]... FILE [DEST]')),
2854 2854 "cat":
2855 2855 (cat,
2856 2856 [('o', 'output', '', _('print output to file with formatted name')),
2857 2857 ('r', 'rev', '', _('print the given revision')),
2858 2858 ] + walkopts,
2859 2859 _('hg cat [OPTION]... FILE...')),
2860 2860 "^clone":
2861 2861 (clone,
2862 2862 [('U', 'noupdate', None, _('do not update the new working directory')),
2863 2863 ('r', 'rev', [],
2864 2864 _('a changeset you would like to have after cloning')),
2865 2865 ('', 'pull', None, _('use pull protocol to copy metadata')),
2866 2866 ('', 'uncompressed', None,
2867 2867 _('use uncompressed transfer (fast over LAN)')),
2868 2868 ] + remoteopts,
2869 2869 _('hg clone [OPTION]... SOURCE [DEST]')),
2870 2870 "^commit|ci":
2871 2871 (commit,
2872 2872 [('A', 'addremove', None,
2873 2873 _('mark new/missing files as added/removed before committing')),
2874 2874 ('m', 'message', '', _('use <text> as commit message')),
2875 2875 ('l', 'logfile', '', _('read the commit message from <file>')),
2876 2876 ('d', 'date', '', _('record datecode as commit date')),
2877 2877 ('u', 'user', '', _('record user as commiter')),
2878 2878 ] + walkopts,
2879 2879 _('hg commit [OPTION]... [FILE]...')),
2880 2880 "copy|cp":
2881 2881 (copy,
2882 2882 [('A', 'after', None, _('record a copy that has already occurred')),
2883 2883 ('f', 'force', None,
2884 2884 _('forcibly copy over an existing managed file')),
2885 2885 ] + walkopts + dryrunopts,
2886 2886 _('hg copy [OPTION]... [SOURCE]... DEST')),
2887 2887 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
2888 2888 "debugcomplete":
2889 2889 (debugcomplete,
2890 2890 [('o', 'options', None, _('show the command options'))],
2891 2891 _('debugcomplete [-o] CMD')),
2892 2892 "debugrebuildstate":
2893 2893 (debugrebuildstate,
2894 2894 [('r', 'rev', '', _('revision to rebuild to'))],
2895 2895 _('debugrebuildstate [-r REV] [REV]')),
2896 2896 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
2897 2897 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
2898 2898 "debugstate": (debugstate, [], _('debugstate')),
2899 2899 "debugdata": (debugdata, [], _('debugdata FILE REV')),
2900 2900 "debugindex": (debugindex, [], _('debugindex FILE')),
2901 2901 "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),
2902 2902 "debugrename": (debugrename, [], _('debugrename FILE [REV]')),
2903 2903 "debugwalk":
2904 2904 (debugwalk, walkopts, _('debugwalk [OPTION]... [FILE]...')),
2905 2905 "^diff":
2906 2906 (diff,
2907 2907 [('r', 'rev', [], _('revision')),
2908 2908 ('a', 'text', None, _('treat all files as text')),
2909 2909 ('p', 'show-function', None,
2910 2910 _('show which function each change is in')),
2911 2911 ('g', 'git', None, _('use git extended diff format')),
2912 2912 ('', 'nodates', None, _("don't include dates in diff headers")),
2913 2913 ('w', 'ignore-all-space', None,
2914 2914 _('ignore white space when comparing lines')),
2915 2915 ('b', 'ignore-space-change', None,
2916 2916 _('ignore changes in the amount of white space')),
2917 2917 ('B', 'ignore-blank-lines', None,
2918 2918 _('ignore changes whose lines are all blank')),
2919 2919 ] + walkopts,
2920 2920 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
2921 2921 "^export":
2922 2922 (export,
2923 2923 [('o', 'output', '', _('print output to file with formatted name')),
2924 2924 ('a', 'text', None, _('treat all files as text')),
2925 2925 ('g', 'git', None, _('use git extended diff format')),
2926 2926 ('', 'nodates', None, _("don't include dates in diff headers")),
2927 2927 ('', 'switch-parent', None, _('diff against the second parent'))],
2928 2928 _('hg export [-a] [-o OUTFILESPEC] REV...')),
2929 2929 "grep":
2930 2930 (grep,
2931 2931 [('0', 'print0', None, _('end fields with NUL')),
2932 2932 ('', 'all', None, _('print all revisions that match')),
2933 2933 ('f', 'follow', None,
2934 2934 _('follow changeset history, or file history across copies and renames')),
2935 2935 ('i', 'ignore-case', None, _('ignore case when matching')),
2936 2936 ('l', 'files-with-matches', None,
2937 2937 _('print only filenames and revs that match')),
2938 2938 ('n', 'line-number', None, _('print matching line numbers')),
2939 2939 ('r', 'rev', [], _('search in given revision range')),
2940 2940 ('u', 'user', None, _('print user who committed change')),
2941 2941 ] + walkopts,
2942 2942 _('hg grep [OPTION]... PATTERN [FILE]...')),
2943 2943 "heads":
2944 2944 (heads,
2945 2945 [('b', 'branches', None, _('show branches (DEPRECATED)')),
2946 2946 ('', 'style', '', _('display using template map file')),
2947 2947 ('r', 'rev', '', _('show only heads which are descendants of rev')),
2948 2948 ('', 'template', '', _('display with template'))],
2949 2949 _('hg heads [-r REV]')),
2950 2950 "help": (help_, [], _('hg help [COMMAND]')),
2951 2951 "identify|id": (identify, [], _('hg identify')),
2952 2952 "import|patch":
2953 2953 (import_,
2954 2954 [('p', 'strip', 1,
2955 2955 _('directory strip option for patch. This has the same\n'
2956 2956 'meaning as the corresponding patch option')),
2957 2957 ('m', 'message', '', _('use <text> as commit message')),
2958 2958 ('b', 'base', '', _('base path (DEPRECATED)')),
2959 2959 ('f', 'force', None,
2960 2960 _('skip check for outstanding uncommitted changes'))],
2961 2961 _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')),
2962 2962 "incoming|in": (incoming,
2963 2963 [('M', 'no-merges', None, _('do not show merges')),
2964 2964 ('f', 'force', None,
2965 2965 _('run even when remote repository is unrelated')),
2966 2966 ('', 'style', '', _('display using template map file')),
2967 2967 ('n', 'newest-first', None, _('show newest record first')),
2968 2968 ('', 'bundle', '', _('file to store the bundles into')),
2969 2969 ('p', 'patch', None, _('show patch')),
2970 2970 ('r', 'rev', [], _('a specific revision up to which you would like to pull')),
2971 2971 ('', 'template', '', _('display with template')),
2972 2972 ] + remoteopts,
2973 2973 _('hg incoming [-p] [-n] [-M] [-r REV]...'
2974 2974 ' [--bundle FILENAME] [SOURCE]')),
2975 2975 "^init":
2976 2976 (init, remoteopts, _('hg init [-e FILE] [--remotecmd FILE] [DEST]')),
2977 2977 "locate":
2978 2978 (locate,
2979 2979 [('r', 'rev', '', _('search the repository as it stood at rev')),
2980 2980 ('0', 'print0', None,
2981 2981 _('end filenames with NUL, for use with xargs')),
2982 2982 ('f', 'fullpath', None,
2983 2983 _('print complete paths from the filesystem root')),
2984 2984 ] + walkopts,
2985 2985 _('hg locate [OPTION]... [PATTERN]...')),
2986 2986 "^log|history":
2987 2987 (log,
2988 2988 [('b', 'branches', None, _('show branches (DEPRECATED)')),
2989 2989 ('f', 'follow', None,
2990 2990 _('follow changeset history, or file history across copies and renames')),
2991 2991 ('', 'follow-first', None,
2992 2992 _('only follow the first parent of merge changesets')),
2993 2993 ('C', 'copies', None, _('show copied files')),
2994 2994 ('k', 'keyword', [], _('search for a keyword')),
2995 2995 ('l', 'limit', '', _('limit number of changes displayed')),
2996 2996 ('r', 'rev', [], _('show the specified revision or range')),
2997 2997 ('M', 'no-merges', None, _('do not show merges')),
2998 2998 ('', 'style', '', _('display using template map file')),
2999 2999 ('m', 'only-merges', None, _('show only merges')),
3000 3000 ('p', 'patch', None, _('show patch')),
3001 3001 ('P', 'prune', [], _('do not display revision or any of its ancestors')),
3002 3002 ('', 'template', '', _('display with template')),
3003 3003 ] + walkopts,
3004 3004 _('hg log [OPTION]... [FILE]')),
3005 3005 "manifest": (manifest, [], _('hg manifest [REV]')),
3006 3006 "merge":
3007 3007 (merge,
3008 3008 [('b', 'branch', '', _('merge with head of a specific branch (DEPRECATED)')),
3009 3009 ('f', 'force', None, _('force a merge with outstanding changes'))],
3010 3010 _('hg merge [-f] [REV]')),
3011 3011 "outgoing|out": (outgoing,
3012 3012 [('M', 'no-merges', None, _('do not show merges')),
3013 3013 ('f', 'force', None,
3014 3014 _('run even when remote repository is unrelated')),
3015 3015 ('p', 'patch', None, _('show patch')),
3016 3016 ('', 'style', '', _('display using template map file')),
3017 3017 ('r', 'rev', [], _('a specific revision you would like to push')),
3018 3018 ('n', 'newest-first', None, _('show newest record first')),
3019 3019 ('', 'template', '', _('display with template')),
3020 3020 ] + remoteopts,
3021 3021 _('hg outgoing [-M] [-p] [-n] [-r REV]... [DEST]')),
3022 3022 "^parents":
3023 3023 (parents,
3024 3024 [('b', 'branches', None, _('show branches (DEPRECATED)')),
3025 3025 ('r', 'rev', '', _('show parents from the specified rev')),
3026 3026 ('', 'style', '', _('display using template map file')),
3027 3027 ('', 'template', '', _('display with template'))],
3028 3028 _('hg parents [-r REV] [FILE]')),
3029 3029 "paths": (paths, [], _('hg paths [NAME]')),
3030 3030 "^pull":
3031 3031 (pull,
3032 3032 [('u', 'update', None,
3033 3033 _('update to new tip if changesets were pulled')),
3034 3034 ('f', 'force', None,
3035 3035 _('run even when remote repository is unrelated')),
3036 3036 ('r', 'rev', [], _('a specific revision up to which you would like to pull')),
3037 3037 ] + remoteopts,
3038 3038 _('hg pull [-u] [-r REV]... [-e FILE] [--remotecmd FILE] [SOURCE]')),
3039 3039 "^push":
3040 3040 (push,
3041 3041 [('f', 'force', None, _('force push')),
3042 3042 ('r', 'rev', [], _('a specific revision you would like to push')),
3043 3043 ] + remoteopts,
3044 3044 _('hg push [-f] [-r REV]... [-e FILE] [--remotecmd FILE] [DEST]')),
3045 3045 "debugrawcommit|rawcommit":
3046 3046 (rawcommit,
3047 3047 [('p', 'parent', [], _('parent')),
3048 3048 ('d', 'date', '', _('date code')),
3049 3049 ('u', 'user', '', _('user')),
3050 3050 ('F', 'files', '', _('file list')),
3051 3051 ('m', 'message', '', _('commit message')),
3052 3052 ('l', 'logfile', '', _('commit message file'))],
3053 3053 _('hg debugrawcommit [OPTION]... [FILE]...')),
3054 3054 "recover": (recover, [], _('hg recover')),
3055 3055 "^remove|rm":
3056 3056 (remove,
3057 3057 [('A', 'after', None, _('record remove that has already occurred')),
3058 3058 ('f', 'force', None, _('remove file even if modified')),
3059 3059 ] + walkopts,
3060 3060 _('hg remove [OPTION]... FILE...')),
3061 3061 "rename|mv":
3062 3062 (rename,
3063 3063 [('A', 'after', None, _('record a rename that has already occurred')),
3064 3064 ('f', 'force', None,
3065 3065 _('forcibly copy over an existing managed file')),
3066 3066 ] + walkopts + dryrunopts,
3067 3067 _('hg rename [OPTION]... SOURCE... DEST')),
3068 3068 "^revert":
3069 3069 (revert,
3070 3070 [('a', 'all', None, _('revert all changes when no arguments given')),
3071 3071 ('r', 'rev', '', _('revision to revert to')),
3072 3072 ('', 'no-backup', None, _('do not save backup copies of files')),
3073 3073 ] + walkopts + dryrunopts,
3074 3074 _('hg revert [-r REV] [NAME]...')),
3075 3075 "rollback": (rollback, [], _('hg rollback')),
3076 3076 "root": (root, [], _('hg root')),
3077 3077 "showconfig|debugconfig": (showconfig, [], _('showconfig [NAME]...')),
3078 3078 "^serve":
3079 3079 (serve,
3080 3080 [('A', 'accesslog', '', _('name of access log file to write to')),
3081 3081 ('d', 'daemon', None, _('run server in background')),
3082 3082 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
3083 3083 ('E', 'errorlog', '', _('name of error log file to write to')),
3084 3084 ('p', 'port', 0, _('port to use (default: 8000)')),
3085 3085 ('a', 'address', '', _('address to use')),
3086 3086 ('n', 'name', '',
3087 3087 _('name to show in web pages (default: working dir)')),
3088 3088 ('', 'webdir-conf', '', _('name of the webdir config file'
3089 3089 ' (serve more than one repo)')),
3090 3090 ('', 'pid-file', '', _('name of file to write process ID to')),
3091 3091 ('', 'stdio', None, _('for remote clients')),
3092 3092 ('t', 'templates', '', _('web templates to use')),
3093 3093 ('', 'style', '', _('template style to use')),
3094 3094 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
3095 3095 _('hg serve [OPTION]...')),
3096 3096 "^status|st":
3097 3097 (status,
3098 3098 [('A', 'all', None, _('show status of all files')),
3099 3099 ('m', 'modified', None, _('show only modified files')),
3100 3100 ('a', 'added', None, _('show only added files')),
3101 3101 ('r', 'removed', None, _('show only removed files')),
3102 3102 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
3103 3103 ('c', 'clean', None, _('show only files without changes')),
3104 3104 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
3105 3105 ('i', 'ignored', None, _('show ignored files')),
3106 3106 ('n', 'no-status', None, _('hide status prefix')),
3107 3107 ('C', 'copies', None, _('show source of copied files')),
3108 3108 ('0', 'print0', None,
3109 3109 _('end filenames with NUL, for use with xargs')),
3110 3110 ('', 'rev', [], _('show difference from revision')),
3111 3111 ] + walkopts,
3112 3112 _('hg status [OPTION]... [FILE]...')),
3113 3113 "tag":
3114 3114 (tag,
3115 3115 [('l', 'local', None, _('make the tag local')),
3116 3116 ('m', 'message', '', _('message for tag commit log entry')),
3117 3117 ('d', 'date', '', _('record datecode as commit date')),
3118 3118 ('u', 'user', '', _('record user as commiter')),
3119 3119 ('r', 'rev', '', _('revision to tag'))],
3120 3120 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),
3121 3121 "tags": (tags, [], _('hg tags')),
3122 3122 "tip":
3123 3123 (tip,
3124 3124 [('b', 'branches', None, _('show branches (DEPRECATED)')),
3125 3125 ('', 'style', '', _('display using template map file')),
3126 3126 ('p', 'patch', None, _('show patch')),
3127 3127 ('', 'template', '', _('display with template'))],
3128 3128 _('hg tip [-p]')),
3129 3129 "unbundle":
3130 3130 (unbundle,
3131 3131 [('u', 'update', None,
3132 3132 _('update to new tip if changesets were unbundled'))],
3133 3133 _('hg unbundle [-u] FILE')),
3134 3134 "^update|up|checkout|co":
3135 3135 (update,
3136 3136 [('b', 'branch', '',
3137 3137 _('checkout the head of a specific branch (DEPRECATED)')),
3138 3138 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
3139 3139 ('C', 'clean', None, _('overwrite locally modified files')),
3140 3140 ('f', 'force', None, _('force a merge with outstanding changes'))],
3141 3141 _('hg update [-C] [-f] [REV]')),
3142 3142 "verify": (verify, [], _('hg verify')),
3143 3143 "version": (show_version, [], _('hg version')),
3144 3144 }
3145 3145
3146 3146 norepo = ("clone init version help debugancestor debugcomplete debugdata"
3147 3147 " debugindex debugindexdot")
3148 3148 optionalrepo = ("paths serve showconfig")
3149 3149
3150 3150 def findpossible(ui, cmd):
3151 3151 """
3152 3152 Return cmd -> (aliases, command table entry)
3153 3153 for each matching command.
3154 3154 Return debug commands (or their aliases) only if no normal command matches.
3155 3155 """
3156 3156 choice = {}
3157 3157 debugchoice = {}
3158 3158 for e in table.keys():
3159 3159 aliases = e.lstrip("^").split("|")
3160 3160 found = None
3161 3161 if cmd in aliases:
3162 3162 found = cmd
3163 3163 elif not ui.config("ui", "strict"):
3164 3164 for a in aliases:
3165 3165 if a.startswith(cmd):
3166 3166 found = a
3167 3167 break
3168 3168 if found is not None:
3169 3169 if aliases[0].startswith("debug") or found.startswith("debug"):
3170 3170 debugchoice[found] = (aliases, table[e])
3171 3171 else:
3172 3172 choice[found] = (aliases, table[e])
3173 3173
3174 3174 if not choice and debugchoice:
3175 3175 choice = debugchoice
3176 3176
3177 3177 return choice
3178 3178
3179 3179 def findcmd(ui, cmd):
3180 3180 """Return (aliases, command table entry) for command string."""
3181 3181 choice = findpossible(ui, cmd)
3182 3182
3183 3183 if choice.has_key(cmd):
3184 3184 return choice[cmd]
3185 3185
3186 3186 if len(choice) > 1:
3187 3187 clist = choice.keys()
3188 3188 clist.sort()
3189 3189 raise AmbiguousCommand(cmd, clist)
3190 3190
3191 3191 if choice:
3192 3192 return choice.values()[0]
3193 3193
3194 3194 raise UnknownCommand(cmd)
3195 3195
3196 3196 def catchterm(*args):
3197 3197 raise util.SignalInterrupt
3198 3198
3199 3199 def run():
3200 3200 sys.exit(dispatch(sys.argv[1:]))
3201 3201
3202 3202 class ParseError(Exception):
3203 3203 """Exception raised on errors in parsing the command line."""
3204 3204
3205 3205 def parse(ui, args):
3206 3206 options = {}
3207 3207 cmdoptions = {}
3208 3208
3209 3209 try:
3210 3210 args = fancyopts.fancyopts(args, globalopts, options)
3211 3211 except fancyopts.getopt.GetoptError, inst:
3212 3212 raise ParseError(None, inst)
3213 3213
3214 3214 if args:
3215 3215 cmd, args = args[0], args[1:]
3216 3216 aliases, i = findcmd(ui, cmd)
3217 3217 cmd = aliases[0]
3218 3218 defaults = ui.config("defaults", cmd)
3219 3219 if defaults:
3220 3220 args = shlex.split(defaults) + args
3221 3221 c = list(i[1])
3222 3222 else:
3223 3223 cmd = None
3224 3224 c = []
3225 3225
3226 3226 # combine global options into local
3227 3227 for o in globalopts:
3228 3228 c.append((o[0], o[1], options[o[1]], o[3]))
3229 3229
3230 3230 try:
3231 3231 args = fancyopts.fancyopts(args, c, cmdoptions)
3232 3232 except fancyopts.getopt.GetoptError, inst:
3233 3233 raise ParseError(cmd, inst)
3234 3234
3235 3235 # separate global options back out
3236 3236 for o in globalopts:
3237 3237 n = o[1]
3238 3238 options[n] = cmdoptions[n]
3239 3239 del cmdoptions[n]
3240 3240
3241 3241 return (cmd, cmd and i[0] or None, args, options, cmdoptions)
3242 3242
3243 3243 external = {}
3244 3244
3245 3245 def findext(name):
3246 3246 '''return module with given extension name'''
3247 3247 try:
3248 3248 return sys.modules[external[name]]
3249 3249 except KeyError:
3250 3250 for k, v in external.iteritems():
3251 3251 if k.endswith('.' + name) or k.endswith('/' + name) or v == name:
3252 3252 return sys.modules[v]
3253 3253 raise KeyError(name)
3254 3254
3255 3255 def load_extensions(ui):
3256 3256 added = []
3257 3257 for ext_name, load_from_name in ui.extensions():
3258 3258 if ext_name in external:
3259 3259 continue
3260 3260 try:
3261 3261 if load_from_name:
3262 3262 # the module will be loaded in sys.modules
3263 3263 # choose an unique name so that it doesn't
3264 3264 # conflicts with other modules
3265 3265 module_name = "hgext_%s" % ext_name.replace('.', '_')
3266 3266 mod = imp.load_source(module_name, load_from_name)
3267 3267 else:
3268 3268 def importh(name):
3269 3269 mod = __import__(name)
3270 3270 components = name.split('.')
3271 3271 for comp in components[1:]:
3272 3272 mod = getattr(mod, comp)
3273 3273 return mod
3274 3274 try:
3275 3275 mod = importh("hgext.%s" % ext_name)
3276 3276 except ImportError:
3277 3277 mod = importh(ext_name)
3278 3278 external[ext_name] = mod.__name__
3279 3279 added.append((mod, ext_name))
3280 3280 except (util.SignalInterrupt, KeyboardInterrupt):
3281 3281 raise
3282 3282 except Exception, inst:
3283 3283 ui.warn(_("*** failed to import extension %s: %s\n") %
3284 3284 (ext_name, inst))
3285 3285 if ui.print_exc():
3286 3286 return 1
3287 3287
3288 3288 for mod, name in added:
3289 3289 uisetup = getattr(mod, 'uisetup', None)
3290 3290 if uisetup:
3291 3291 uisetup(ui)
3292 3292 cmdtable = getattr(mod, 'cmdtable', {})
3293 3293 for t in cmdtable:
3294 3294 if t in table:
3295 3295 ui.warn(_("module %s overrides %s\n") % (name, t))
3296 3296 table.update(cmdtable)
3297 3297
3298 3298 def parseconfig(config):
3299 3299 """parse the --config options from the command line"""
3300 3300 parsed = []
3301 3301 for cfg in config:
3302 3302 try:
3303 3303 name, value = cfg.split('=', 1)
3304 3304 section, name = name.split('.', 1)
3305 3305 if not section or not name:
3306 3306 raise IndexError
3307 3307 parsed.append((section, name, value))
3308 3308 except (IndexError, ValueError):
3309 3309 raise util.Abort(_('malformed --config option: %s') % cfg)
3310 3310 return parsed
3311 3311
3312 3312 def dispatch(args):
3313 3313 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
3314 3314 num = getattr(signal, name, None)
3315 3315 if num: signal.signal(num, catchterm)
3316 3316
3317 3317 try:
3318 3318 u = ui.ui(traceback='--traceback' in sys.argv[1:])
3319 3319 except util.Abort, inst:
3320 3320 sys.stderr.write(_("abort: %s\n") % inst)
3321 3321 return -1
3322 3322
3323 3323 load_extensions(u)
3324 3324 u.addreadhook(load_extensions)
3325 3325
3326 3326 try:
3327 3327 cmd, func, args, options, cmdoptions = parse(u, args)
3328 3328 if options["time"]:
3329 3329 def get_times():
3330 3330 t = os.times()
3331 3331 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
3332 3332 t = (t[0], t[1], t[2], t[3], time.clock())
3333 3333 return t
3334 3334 s = get_times()
3335 3335 def print_time():
3336 3336 t = get_times()
3337 3337 u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
3338 3338 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
3339 3339 atexit.register(print_time)
3340 3340
3341 3341 # enter the debugger before command execution
3342 3342 if options['debugger']:
3343 3343 pdb.set_trace()
3344 3344
3345 3345 try:
3346 3346 if options['cwd']:
3347 3347 try:
3348 3348 os.chdir(options['cwd'])
3349 3349 except OSError, inst:
3350 3350 raise util.Abort('%s: %s' %
3351 3351 (options['cwd'], inst.strerror))
3352 3352
3353 3353 u.updateopts(options["verbose"], options["debug"], options["quiet"],
3354 3354 not options["noninteractive"], options["traceback"],
3355 3355 parseconfig(options["config"]))
3356 3356
3357 3357 path = u.expandpath(options["repository"]) or ""
3358 3358 repo = path and hg.repository(u, path=path) or None
3359 3359 if repo and not repo.local():
3360 3360 raise util.Abort(_("repository '%s' is not local") % path)
3361 3361
3362 3362 if options['help']:
3363 3363 return help_(u, cmd, options['version'])
3364 3364 elif options['version']:
3365 3365 return show_version(u)
3366 3366 elif not cmd:
3367 3367 return help_(u, 'shortlist')
3368 3368
3369 3369 if cmd not in norepo.split():
3370 3370 try:
3371 3371 if not repo:
3372 3372 repo = hg.repository(u, path=path)
3373 3373 u = repo.ui
3374 3374 for name in external.itervalues():
3375 3375 mod = sys.modules[name]
3376 3376 if hasattr(mod, 'reposetup'):
3377 3377 mod.reposetup(u, repo)
3378 3378 hg.repo_setup_hooks.append(mod.reposetup)
3379 3379 except hg.RepoError:
3380 3380 if cmd not in optionalrepo.split():
3381 3381 raise
3382 3382 d = lambda: func(u, repo, *args, **cmdoptions)
3383 3383 else:
3384 3384 d = lambda: func(u, *args, **cmdoptions)
3385 3385
3386 3386 try:
3387 3387 if options['profile']:
3388 3388 import hotshot, hotshot.stats
3389 3389 prof = hotshot.Profile("hg.prof")
3390 3390 try:
3391 3391 try:
3392 3392 return prof.runcall(d)
3393 3393 except:
3394 3394 try:
3395 3395 u.warn(_('exception raised - generating '
3396 3396 'profile anyway\n'))
3397 3397 except:
3398 3398 pass
3399 3399 raise
3400 3400 finally:
3401 3401 prof.close()
3402 3402 stats = hotshot.stats.load("hg.prof")
3403 3403 stats.strip_dirs()
3404 3404 stats.sort_stats('time', 'calls')
3405 3405 stats.print_stats(40)
3406 3406 elif options['lsprof']:
3407 3407 try:
3408 3408 from mercurial import lsprof
3409 3409 except ImportError:
3410 3410 raise util.Abort(_(
3411 3411 'lsprof not available - install from '
3412 3412 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/'))
3413 3413 p = lsprof.Profiler()
3414 3414 p.enable(subcalls=True)
3415 3415 try:
3416 3416 return d()
3417 3417 finally:
3418 3418 p.disable()
3419 3419 stats = lsprof.Stats(p.getstats())
3420 3420 stats.sort()
3421 3421 stats.pprint(top=10, file=sys.stderr, climit=5)
3422 3422 else:
3423 3423 return d()
3424 3424 finally:
3425 3425 u.flush()
3426 3426 except:
3427 3427 # enter the debugger when we hit an exception
3428 3428 if options['debugger']:
3429 3429 pdb.post_mortem(sys.exc_info()[2])
3430 3430 u.print_exc()
3431 3431 raise
3432 3432 except ParseError, inst:
3433 3433 if inst.args[0]:
3434 3434 u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
3435 3435 help_(u, inst.args[0])
3436 3436 else:
3437 3437 u.warn(_("hg: %s\n") % inst.args[1])
3438 3438 help_(u, 'shortlist')
3439 3439 except AmbiguousCommand, inst:
3440 3440 u.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
3441 3441 (inst.args[0], " ".join(inst.args[1])))
3442 3442 except UnknownCommand, inst:
3443 3443 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
3444 3444 help_(u, 'shortlist')
3445 3445 except hg.RepoError, inst:
3446 3446 u.warn(_("abort: %s!\n") % inst)
3447 3447 except lock.LockHeld, inst:
3448 3448 if inst.errno == errno.ETIMEDOUT:
3449 3449 reason = _('timed out waiting for lock held by %s') % inst.locker
3450 3450 else:
3451 3451 reason = _('lock held by %s') % inst.locker
3452 3452 u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
3453 3453 except lock.LockUnavailable, inst:
3454 3454 u.warn(_("abort: could not lock %s: %s\n") %
3455 3455 (inst.desc or inst.filename, inst.strerror))
3456 3456 except revlog.RevlogError, inst:
3457 3457 u.warn(_("abort: %s!\n") % inst)
3458 3458 except util.SignalInterrupt:
3459 3459 u.warn(_("killed!\n"))
3460 3460 except KeyboardInterrupt:
3461 3461 try:
3462 3462 u.warn(_("interrupted!\n"))
3463 3463 except IOError, inst:
3464 3464 if inst.errno == errno.EPIPE:
3465 3465 if u.debugflag:
3466 3466 u.warn(_("\nbroken pipe\n"))
3467 3467 else:
3468 3468 raise
3469 3469 except IOError, inst:
3470 3470 if hasattr(inst, "code"):
3471 3471 u.warn(_("abort: %s\n") % inst)
3472 3472 elif hasattr(inst, "reason"):
3473 3473 u.warn(_("abort: error: %s\n") % inst.reason[1])
3474 3474 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
3475 3475 if u.debugflag:
3476 3476 u.warn(_("broken pipe\n"))
3477 3477 elif getattr(inst, "strerror", None):
3478 3478 if getattr(inst, "filename", None):
3479 3479 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
3480 3480 else:
3481 3481 u.warn(_("abort: %s\n") % inst.strerror)
3482 3482 else:
3483 3483 raise
3484 3484 except OSError, inst:
3485 3485 if getattr(inst, "filename", None):
3486 3486 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
3487 3487 else:
3488 3488 u.warn(_("abort: %s\n") % inst.strerror)
3489 3489 except util.Abort, inst:
3490 3490 u.warn(_("abort: %s\n") % inst)
3491 3491 except TypeError, inst:
3492 3492 # was this an argument error?
3493 3493 tb = traceback.extract_tb(sys.exc_info()[2])
3494 3494 if len(tb) > 2: # no
3495 3495 raise
3496 3496 u.debug(inst, "\n")
3497 3497 u.warn(_("%s: invalid arguments\n") % cmd)
3498 3498 help_(u, cmd)
3499 3499 except SystemExit, inst:
3500 3500 # Commands shouldn't sys.exit directly, but give a return code.
3501 3501 # Just in case catch this and and pass exit code to caller.
3502 3502 return inst.code
3503 3503 except:
3504 3504 u.warn(_("** unknown exception encountered, details follow\n"))
3505 3505 u.warn(_("** report bug details to "
3506 3506 "http://www.selenic.com/mercurial/bts\n"))
3507 3507 u.warn(_("** or mercurial@selenic.com\n"))
3508 3508 u.warn(_("** Mercurial Distributed SCM (version %s)\n")
3509 3509 % version.get_version())
3510 3510 raise
3511 3511
3512 3512 return -1
General Comments 0
You need to be logged in to leave comments. Login now