##// END OF EJS Templates
Use more note admonitions in help texts
Christian Ebert -
r12390:aff4afdc default
parent child Browse files
Show More
@@ -1,578 +1,579 b''
1 1 # keyword.py - $Keyword$ expansion for Mercurial
2 2 #
3 3 # Copyright 2007-2010 Christian Ebert <blacktrash@gmx.net>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7 #
8 8 # $Id$
9 9 #
10 10 # Keyword expansion hack against the grain of a DSCM
11 11 #
12 12 # There are many good reasons why this is not needed in a distributed
13 13 # SCM, still it may be useful in very small projects based on single
14 14 # files (like LaTeX packages), that are mostly addressed to an
15 15 # audience not running a version control system.
16 16 #
17 17 # For in-depth discussion refer to
18 18 # <http://mercurial.selenic.com/wiki/KeywordPlan>.
19 19 #
20 20 # Keyword expansion is based on Mercurial's changeset template mappings.
21 21 #
22 22 # Binary files are not touched.
23 23 #
24 24 # Files to act upon/ignore are specified in the [keyword] section.
25 25 # Customized keyword template mappings in the [keywordmaps] section.
26 26 #
27 27 # Run "hg help keyword" and "hg kwdemo" to get info on configuration.
28 28
29 29 '''expand keywords in tracked files
30 30
31 31 This extension expands RCS/CVS-like or self-customized $Keywords$ in
32 32 tracked text files selected by your configuration.
33 33
34 34 Keywords are only expanded in local repositories and not stored in the
35 35 change history. The mechanism can be regarded as a convenience for the
36 36 current user or for archive distribution.
37 37
38 38 Keywords expand to the changeset data pertaining to the latest change
39 39 relative to the working directory parent of each file.
40 40
41 41 Configuration is done in the [keyword], [keywordset] and [keywordmaps]
42 42 sections of hgrc files.
43 43
44 44 Example::
45 45
46 46 [keyword]
47 47 # expand keywords in every python file except those matching "x*"
48 48 **.py =
49 49 x* = ignore
50 50
51 51 [keywordset]
52 52 # prefer svn- over cvs-like default keywordmaps
53 53 svn = True
54 54
55 NOTE: the more specific you are in your filename patterns the less you
55 .. note::
56 The more specific you are in your filename patterns the less you
56 57 lose speed in huge repositories.
57 58
58 59 For [keywordmaps] template mapping and expansion demonstration and
59 60 control run :hg:`kwdemo`. See :hg:`help templates` for a list of
60 61 available templates and filters.
61 62
62 63 Three additional date template filters are provided::
63 64
64 65 utcdate "2006/09/18 15:13:13"
65 66 svnutcdate "2006-09-18 15:13:13Z"
66 67 svnisodate "2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)"
67 68
68 69 The default template mappings (view with :hg:`kwdemo -d`) can be
69 70 replaced with customized keywords and templates. Again, run
70 71 :hg:`kwdemo` to control the results of your config changes.
71 72
72 73 Before changing/disabling active keywords, run :hg:`kwshrink` to avoid
73 74 the risk of inadvertently storing expanded keywords in the change
74 75 history.
75 76
76 77 To force expansion after enabling it, or a configuration change, run
77 78 :hg:`kwexpand`.
78 79
79 80 Expansions spanning more than one line and incremental expansions,
80 81 like CVS' $Log$, are not supported. A keyword template map "Log =
81 82 {desc}" expands to the first line of the changeset description.
82 83 '''
83 84
84 85 from mercurial import commands, cmdutil, dispatch, filelog, revlog, extensions
85 86 from mercurial import patch, localrepo, templater, templatefilters, util, match
86 87 from mercurial.hgweb import webcommands
87 88 from mercurial.i18n import _
88 89 import re, shutil, tempfile
89 90
90 91 commands.optionalrepo += ' kwdemo'
91 92
92 93 # hg commands that do not act on keywords
93 94 nokwcommands = ('add addremove annotate bundle copy export grep incoming init'
94 95 ' log outgoing push rename rollback tip verify'
95 96 ' convert email glog')
96 97
97 98 # hg commands that trigger expansion only when writing to working dir,
98 99 # not when reading filelog, and unexpand when reading from working dir
99 100 restricted = 'merge record qrecord resolve transplant'
100 101
101 102 # commands using dorecord
102 103 recordcommands = 'record qrecord'
103 104 # names of extensions using dorecord
104 105 recordextensions = 'record'
105 106
106 107 # date like in cvs' $Date
107 108 utcdate = lambda x: util.datestr((x[0], 0), '%Y/%m/%d %H:%M:%S')
108 109 # date like in svn's $Date
109 110 svnisodate = lambda x: util.datestr(x, '%Y-%m-%d %H:%M:%S %1%2 (%a, %d %b %Y)')
110 111 # date like in svn's $Id
111 112 svnutcdate = lambda x: util.datestr((x[0], 0), '%Y-%m-%d %H:%M:%SZ')
112 113
113 114 # make keyword tools accessible
114 115 kwtools = {'templater': None, 'hgcmd': ''}
115 116
116 117
117 118 def _defaultkwmaps(ui):
118 119 '''Returns default keywordmaps according to keywordset configuration.'''
119 120 templates = {
120 121 'Revision': '{node|short}',
121 122 'Author': '{author|user}',
122 123 }
123 124 kwsets = ({
124 125 'Date': '{date|utcdate}',
125 126 'RCSfile': '{file|basename},v',
126 127 'RCSFile': '{file|basename},v', # kept for backwards compatibility
127 128 # with hg-keyword
128 129 'Source': '{root}/{file},v',
129 130 'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}',
130 131 'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',
131 132 }, {
132 133 'Date': '{date|svnisodate}',
133 134 'Id': '{file|basename},v {node|short} {date|svnutcdate} {author|user}',
134 135 'LastChangedRevision': '{node|short}',
135 136 'LastChangedBy': '{author|user}',
136 137 'LastChangedDate': '{date|svnisodate}',
137 138 })
138 139 templates.update(kwsets[ui.configbool('keywordset', 'svn')])
139 140 return templates
140 141
141 142 class kwtemplater(object):
142 143 '''
143 144 Sets up keyword templates, corresponding keyword regex, and
144 145 provides keyword substitution functions.
145 146 '''
146 147
147 148 def __init__(self, ui, repo, inc, exc):
148 149 self.ui = ui
149 150 self.repo = repo
150 151 self.match = match.match(repo.root, '', [], inc, exc)
151 152 self.restrict = kwtools['hgcmd'] in restricted.split()
152 153 self.record = kwtools['hgcmd'] in recordcommands.split()
153 154
154 155 kwmaps = self.ui.configitems('keywordmaps')
155 156 if kwmaps: # override default templates
156 157 self.templates = dict((k, templater.parsestring(v, False))
157 158 for k, v in kwmaps)
158 159 else:
159 160 self.templates = _defaultkwmaps(self.ui)
160 161 escaped = map(re.escape, self.templates.keys())
161 162 kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped)
162 163 self.re_kw = re.compile(kwpat)
163 164
164 165 templatefilters.filters.update({'utcdate': utcdate,
165 166 'svnisodate': svnisodate,
166 167 'svnutcdate': svnutcdate})
167 168
168 169 def substitute(self, data, path, ctx, subfunc):
169 170 '''Replaces keywords in data with expanded template.'''
170 171 def kwsub(mobj):
171 172 kw = mobj.group(1)
172 173 ct = cmdutil.changeset_templater(self.ui, self.repo,
173 174 False, None, '', False)
174 175 ct.use_template(self.templates[kw])
175 176 self.ui.pushbuffer()
176 177 ct.show(ctx, root=self.repo.root, file=path)
177 178 ekw = templatefilters.firstline(self.ui.popbuffer())
178 179 return '$%s: %s $' % (kw, ekw)
179 180 return subfunc(kwsub, data)
180 181
181 182 def expand(self, path, node, data):
182 183 '''Returns data with keywords expanded.'''
183 184 if not self.restrict and self.match(path) and not util.binary(data):
184 185 ctx = self.repo.filectx(path, fileid=node).changectx()
185 186 return self.substitute(data, path, ctx, self.re_kw.sub)
186 187 return data
187 188
188 189 def iskwfile(self, path, flagfunc):
189 190 '''Returns true if path matches [keyword] pattern
190 191 and is not a symbolic link.
191 192 Caveat: localrepository._link fails on Windows.'''
192 193 return self.match(path) and not 'l' in flagfunc(path)
193 194
194 195 def overwrite(self, ctx, candidates, iswctx, expand):
195 196 '''Overwrites selected files expanding/shrinking keywords.'''
196 197 if self.record:
197 198 candidates = [f for f in ctx.files() if f in ctx]
198 199 candidates = [f for f in candidates if self.iskwfile(f, ctx.flags)]
199 200 if candidates:
200 201 self.restrict = True # do not expand when reading
201 202 mf = ctx.manifest()
202 203 msg = (expand and _('overwriting %s expanding keywords\n')
203 204 or _('overwriting %s shrinking keywords\n'))
204 205 for f in candidates:
205 206 if not self.record:
206 207 data = self.repo.file(f).read(mf[f])
207 208 else:
208 209 data = self.repo.wread(f)
209 210 if util.binary(data):
210 211 continue
211 212 if expand:
212 213 if iswctx:
213 214 ctx = self.repo.filectx(f, fileid=mf[f]).changectx()
214 215 data, found = self.substitute(data, f, ctx,
215 216 self.re_kw.subn)
216 217 else:
217 218 found = self.re_kw.search(data)
218 219 if found:
219 220 self.ui.note(msg % f)
220 221 self.repo.wwrite(f, data, mf.flags(f))
221 222 if iswctx:
222 223 self.repo.dirstate.normal(f)
223 224 elif self.record:
224 225 self.repo.dirstate.normallookup(f)
225 226 self.restrict = False
226 227
227 228 def shrinktext(self, text):
228 229 '''Unconditionally removes all keyword substitutions from text.'''
229 230 return self.re_kw.sub(r'$\1$', text)
230 231
231 232 def shrink(self, fname, text):
232 233 '''Returns text with all keyword substitutions removed.'''
233 234 if self.match(fname) and not util.binary(text):
234 235 return self.shrinktext(text)
235 236 return text
236 237
237 238 def shrinklines(self, fname, lines):
238 239 '''Returns lines with keyword substitutions removed.'''
239 240 if self.match(fname):
240 241 text = ''.join(lines)
241 242 if not util.binary(text):
242 243 return self.shrinktext(text).splitlines(True)
243 244 return lines
244 245
245 246 def wread(self, fname, data):
246 247 '''If in restricted mode returns data read from wdir with
247 248 keyword substitutions removed.'''
248 249 return self.restrict and self.shrink(fname, data) or data
249 250
250 251 class kwfilelog(filelog.filelog):
251 252 '''
252 253 Subclass of filelog to hook into its read, add, cmp methods.
253 254 Keywords are "stored" unexpanded, and processed on reading.
254 255 '''
255 256 def __init__(self, opener, kwt, path):
256 257 super(kwfilelog, self).__init__(opener, path)
257 258 self.kwt = kwt
258 259 self.path = path
259 260
260 261 def read(self, node):
261 262 '''Expands keywords when reading filelog.'''
262 263 data = super(kwfilelog, self).read(node)
263 264 return self.kwt.expand(self.path, node, data)
264 265
265 266 def add(self, text, meta, tr, link, p1=None, p2=None):
266 267 '''Removes keyword substitutions when adding to filelog.'''
267 268 text = self.kwt.shrink(self.path, text)
268 269 return super(kwfilelog, self).add(text, meta, tr, link, p1, p2)
269 270
270 271 def cmp(self, node, text):
271 272 '''Removes keyword substitutions for comparison.'''
272 273 text = self.kwt.shrink(self.path, text)
273 274 if self.renamed(node):
274 275 t2 = super(kwfilelog, self).read(node)
275 276 return t2 != text
276 277 return revlog.revlog.cmp(self, node, text)
277 278
278 279 def _status(ui, repo, kwt, *pats, **opts):
279 280 '''Bails out if [keyword] configuration is not active.
280 281 Returns status of working directory.'''
281 282 if kwt:
282 283 return repo.status(match=cmdutil.match(repo, pats, opts), clean=True,
283 284 unknown=opts.get('unknown') or opts.get('all'))
284 285 if ui.configitems('keyword'):
285 286 raise util.Abort(_('[keyword] patterns cannot match'))
286 287 raise util.Abort(_('no [keyword] patterns configured'))
287 288
288 289 def _kwfwrite(ui, repo, expand, *pats, **opts):
289 290 '''Selects files and passes them to kwtemplater.overwrite.'''
290 291 wctx = repo[None]
291 292 if len(wctx.parents()) > 1:
292 293 raise util.Abort(_('outstanding uncommitted merge'))
293 294 kwt = kwtools['templater']
294 295 wlock = repo.wlock()
295 296 try:
296 297 status = _status(ui, repo, kwt, *pats, **opts)
297 298 modified, added, removed, deleted, unknown, ignored, clean = status
298 299 if modified or added or removed or deleted:
299 300 raise util.Abort(_('outstanding uncommitted changes'))
300 301 kwt.overwrite(wctx, clean, True, expand)
301 302 finally:
302 303 wlock.release()
303 304
304 305 def demo(ui, repo, *args, **opts):
305 306 '''print [keywordmaps] configuration and an expansion example
306 307
307 308 Show current, custom, or default keyword template maps and their
308 309 expansions.
309 310
310 311 Extend the current configuration by specifying maps as arguments
311 312 and using -f/--rcfile to source an external hgrc file.
312 313
313 314 Use -d/--default to disable current configuration.
314 315
315 316 See :hg:`help templates` for information on templates and filters.
316 317 '''
317 318 def demoitems(section, items):
318 319 ui.write('[%s]\n' % section)
319 320 for k, v in sorted(items):
320 321 ui.write('%s = %s\n' % (k, v))
321 322
322 323 fn = 'demo.txt'
323 324 tmpdir = tempfile.mkdtemp('', 'kwdemo.')
324 325 ui.note(_('creating temporary repository at %s\n') % tmpdir)
325 326 repo = localrepo.localrepository(ui, tmpdir, True)
326 327 ui.setconfig('keyword', fn, '')
327 328
328 329 uikwmaps = ui.configitems('keywordmaps')
329 330 if args or opts.get('rcfile'):
330 331 ui.status(_('\n\tconfiguration using custom keyword template maps\n'))
331 332 if uikwmaps:
332 333 ui.status(_('\textending current template maps\n'))
333 334 if opts.get('default') or not uikwmaps:
334 335 ui.status(_('\toverriding default template maps\n'))
335 336 if opts.get('rcfile'):
336 337 ui.readconfig(opts.get('rcfile'))
337 338 if args:
338 339 # simulate hgrc parsing
339 340 rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
340 341 fp = repo.opener('hgrc', 'w')
341 342 fp.writelines(rcmaps)
342 343 fp.close()
343 344 ui.readconfig(repo.join('hgrc'))
344 345 kwmaps = dict(ui.configitems('keywordmaps'))
345 346 elif opts.get('default'):
346 347 ui.status(_('\n\tconfiguration using default keyword template maps\n'))
347 348 kwmaps = _defaultkwmaps(ui)
348 349 if uikwmaps:
349 350 ui.status(_('\tdisabling current template maps\n'))
350 351 for k, v in kwmaps.iteritems():
351 352 ui.setconfig('keywordmaps', k, v)
352 353 else:
353 354 ui.status(_('\n\tconfiguration using current keyword template maps\n'))
354 355 kwmaps = dict(uikwmaps) or _defaultkwmaps(ui)
355 356
356 357 uisetup(ui)
357 358 reposetup(ui, repo)
358 359 ui.write('[extensions]\nkeyword =\n')
359 360 demoitems('keyword', ui.configitems('keyword'))
360 361 demoitems('keywordmaps', kwmaps.iteritems())
361 362 keywords = '$' + '$\n$'.join(sorted(kwmaps.keys())) + '$\n'
362 363 repo.wopener(fn, 'w').write(keywords)
363 364 repo[None].add([fn])
364 365 ui.note(_('\nkeywords written to %s:\n') % fn)
365 366 ui.note(keywords)
366 367 repo.dirstate.setbranch('demobranch')
367 368 for name, cmd in ui.configitems('hooks'):
368 369 if name.split('.', 1)[0].find('commit') > -1:
369 370 repo.ui.setconfig('hooks', name, '')
370 371 msg = _('hg keyword configuration and expansion example')
371 372 ui.note("hg ci -m '%s'\n" % msg)
372 373 repo.commit(text=msg)
373 374 ui.status(_('\n\tkeywords expanded\n'))
374 375 ui.write(repo.wread(fn))
375 376 shutil.rmtree(tmpdir, ignore_errors=True)
376 377
377 378 def expand(ui, repo, *pats, **opts):
378 379 '''expand keywords in the working directory
379 380
380 381 Run after (re)enabling keyword expansion.
381 382
382 383 kwexpand refuses to run if given files contain local changes.
383 384 '''
384 385 # 3rd argument sets expansion to True
385 386 _kwfwrite(ui, repo, True, *pats, **opts)
386 387
387 388 def files(ui, repo, *pats, **opts):
388 389 '''show files configured for keyword expansion
389 390
390 391 List which files in the working directory are matched by the
391 392 [keyword] configuration patterns.
392 393
393 394 Useful to prevent inadvertent keyword expansion and to speed up
394 395 execution by including only files that are actual candidates for
395 396 expansion.
396 397
397 398 See :hg:`help keyword` on how to construct patterns both for
398 399 inclusion and exclusion of files.
399 400
400 401 With -A/--all and -v/--verbose the codes used to show the status
401 402 of files are::
402 403
403 404 K = keyword expansion candidate
404 405 k = keyword expansion candidate (not tracked)
405 406 I = ignored
406 407 i = ignored (not tracked)
407 408 '''
408 409 kwt = kwtools['templater']
409 410 status = _status(ui, repo, kwt, *pats, **opts)
410 411 cwd = pats and repo.getcwd() or ''
411 412 modified, added, removed, deleted, unknown, ignored, clean = status
412 413 files = []
413 414 if not opts.get('unknown') or opts.get('all'):
414 415 files = sorted(modified + added + clean)
415 416 wctx = repo[None]
416 417 kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)]
417 418 kwunknown = [f for f in unknown if kwt.iskwfile(f, wctx.flags)]
418 419 if not opts.get('ignore') or opts.get('all'):
419 420 showfiles = kwfiles, kwunknown
420 421 else:
421 422 showfiles = [], []
422 423 if opts.get('all') or opts.get('ignore'):
423 424 showfiles += ([f for f in files if f not in kwfiles],
424 425 [f for f in unknown if f not in kwunknown])
425 426 for char, filenames in zip('KkIi', showfiles):
426 427 fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
427 428 for f in filenames:
428 429 ui.write(fmt % repo.pathto(f, cwd))
429 430
430 431 def shrink(ui, repo, *pats, **opts):
431 432 '''revert expanded keywords in the working directory
432 433
433 434 Run before changing/disabling active keywords or if you experience
434 435 problems with :hg:`import` or :hg:`merge`.
435 436
436 437 kwshrink refuses to run if given files contain local changes.
437 438 '''
438 439 # 3rd argument sets expansion to False
439 440 _kwfwrite(ui, repo, False, *pats, **opts)
440 441
441 442
442 443 def uisetup(ui):
443 444 ''' Monkeypatches dispatch._parse to retrieve user command.'''
444 445
445 446 def kwdispatch_parse(orig, ui, args):
446 447 '''Monkeypatch dispatch._parse to obtain running hg command.'''
447 448 cmd, func, args, options, cmdoptions = orig(ui, args)
448 449 kwtools['hgcmd'] = cmd
449 450 return cmd, func, args, options, cmdoptions
450 451
451 452 extensions.wrapfunction(dispatch, '_parse', kwdispatch_parse)
452 453
453 454 def reposetup(ui, repo):
454 455 '''Sets up repo as kwrepo for keyword substitution.
455 456 Overrides file method to return kwfilelog instead of filelog
456 457 if file matches user configuration.
457 458 Wraps commit to overwrite configured files with updated
458 459 keyword substitutions.
459 460 Monkeypatches patch and webcommands.'''
460 461
461 462 try:
462 463 if (not repo.local() or kwtools['hgcmd'] in nokwcommands.split()
463 464 or '.hg' in util.splitpath(repo.root)
464 465 or repo._url.startswith('bundle:')):
465 466 return
466 467 except AttributeError:
467 468 pass
468 469
469 470 inc, exc = [], ['.hg*']
470 471 for pat, opt in ui.configitems('keyword'):
471 472 if opt != 'ignore':
472 473 inc.append(pat)
473 474 else:
474 475 exc.append(pat)
475 476 if not inc:
476 477 return
477 478
478 479 kwtools['templater'] = kwt = kwtemplater(ui, repo, inc, exc)
479 480
480 481 class kwrepo(repo.__class__):
481 482 def file(self, f):
482 483 if f[0] == '/':
483 484 f = f[1:]
484 485 return kwfilelog(self.sopener, kwt, f)
485 486
486 487 def wread(self, filename):
487 488 data = super(kwrepo, self).wread(filename)
488 489 return kwt.wread(filename, data)
489 490
490 491 def commit(self, *args, **opts):
491 492 # use custom commitctx for user commands
492 493 # other extensions can still wrap repo.commitctx directly
493 494 self.commitctx = self.kwcommitctx
494 495 try:
495 496 return super(kwrepo, self).commit(*args, **opts)
496 497 finally:
497 498 del self.commitctx
498 499
499 500 def kwcommitctx(self, ctx, error=False):
500 501 n = super(kwrepo, self).commitctx(ctx, error)
501 502 # no lock needed, only called from repo.commit() which already locks
502 503 if not kwt.record:
503 504 kwt.overwrite(self[n], sorted(ctx.added() + ctx.modified()),
504 505 False, True)
505 506 return n
506 507
507 508 # monkeypatches
508 509 def kwpatchfile_init(orig, self, ui, fname, opener,
509 510 missing=False, eolmode=None):
510 511 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
511 512 rejects or conflicts due to expanded keywords in working dir.'''
512 513 orig(self, ui, fname, opener, missing, eolmode)
513 514 # shrink keywords read from working dir
514 515 self.lines = kwt.shrinklines(self.fname, self.lines)
515 516
516 517 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None,
517 518 opts=None, prefix=''):
518 519 '''Monkeypatch patch.diff to avoid expansion except when
519 520 comparing against working dir.'''
520 521 if node2 is not None:
521 522 kwt.match = util.never
522 523 elif node1 is not None and node1 != repo['.'].node():
523 524 kwt.restrict = True
524 525 return orig(repo, node1, node2, match, changes, opts, prefix)
525 526
526 527 def kwweb_skip(orig, web, req, tmpl):
527 528 '''Wraps webcommands.x turning off keyword expansion.'''
528 529 kwt.match = util.never
529 530 return orig(web, req, tmpl)
530 531
531 532 def kw_dorecord(orig, ui, repo, commitfunc, *pats, **opts):
532 533 '''Wraps record.dorecord expanding keywords after recording.'''
533 534 wlock = repo.wlock()
534 535 try:
535 536 # record returns 0 even when nothing has changed
536 537 # therefore compare nodes before and after
537 538 ctx = repo['.']
538 539 ret = orig(ui, repo, commitfunc, *pats, **opts)
539 540 recordctx = repo['.']
540 541 if ctx != recordctx:
541 542 kwt.overwrite(recordctx, None, False, True)
542 543 return ret
543 544 finally:
544 545 wlock.release()
545 546
546 547 repo.__class__ = kwrepo
547 548
548 549 extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init)
549 550 if not kwt.restrict:
550 551 extensions.wrapfunction(patch, 'diff', kw_diff)
551 552 for c in 'annotate changeset rev filediff diff'.split():
552 553 extensions.wrapfunction(webcommands, c, kwweb_skip)
553 554 for name in recordextensions.split():
554 555 try:
555 556 record = extensions.find(name)
556 557 extensions.wrapfunction(record, 'dorecord', kw_dorecord)
557 558 except KeyError:
558 559 pass
559 560
560 561 cmdtable = {
561 562 'kwdemo':
562 563 (demo,
563 564 [('d', 'default', None, _('show default keyword template maps')),
564 565 ('f', 'rcfile', '',
565 566 _('read maps from rcfile'), _('FILE'))],
566 567 _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')),
567 568 'kwexpand': (expand, commands.walkopts,
568 569 _('hg kwexpand [OPTION]... [FILE]...')),
569 570 'kwfiles':
570 571 (files,
571 572 [('A', 'all', None, _('show keyword status flags of all files')),
572 573 ('i', 'ignore', None, _('show files excluded from expansion')),
573 574 ('u', 'unknown', None, _('only show unknown (not tracked) files')),
574 575 ] + commands.walkopts,
575 576 _('hg kwfiles [OPTION]... [FILE]...')),
576 577 'kwshrink': (shrink, commands.walkopts,
577 578 _('hg kwshrink [OPTION]... [FILE]...')),
578 579 }
@@ -1,4448 +1,4453 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from node import hex, nullid, nullrev, short
9 9 from lock import release
10 10 from i18n import _, gettext
11 11 import os, re, sys, difflib, time, tempfile
12 12 import hg, util, revlog, extensions, copies, error
13 13 import patch, help, mdiff, url, encoding, templatekw, discovery
14 14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
15 15 import merge as mergemod
16 16 import minirst, revset
17 17 import dagparser
18 18
19 19 # Commands start here, listed alphabetically
20 20
21 21 def add(ui, repo, *pats, **opts):
22 22 """add the specified files on the next commit
23 23
24 24 Schedule files to be version controlled and added to the
25 25 repository.
26 26
27 27 The files will be added to the repository at the next commit. To
28 28 undo an add before that, see :hg:`forget`.
29 29
30 30 If no names are given, add all files to the repository.
31 31
32 32 .. container:: verbose
33 33
34 34 An example showing how new (unknown) files are added
35 35 automatically by :hg:`add`::
36 36
37 37 $ ls
38 38 foo.c
39 39 $ hg status
40 40 ? foo.c
41 41 $ hg add
42 42 adding foo.c
43 43 $ hg status
44 44 A foo.c
45 45
46 46 Returns 0 if all files are successfully added.
47 47 """
48 48
49 49 m = cmdutil.match(repo, pats, opts)
50 50 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
51 51 opts.get('subrepos'), prefix="")
52 52 return rejected and 1 or 0
53 53
54 54 def addremove(ui, repo, *pats, **opts):
55 55 """add all new files, delete all missing files
56 56
57 57 Add all new files and remove all missing files from the
58 58 repository.
59 59
60 60 New files are ignored if they match any of the patterns in
61 61 .hgignore. As with add, these changes take effect at the next
62 62 commit.
63 63
64 64 Use the -s/--similarity option to detect renamed files. With a
65 65 parameter greater than 0, this compares every removed file with
66 66 every added file and records those similar enough as renames. This
67 67 option takes a percentage between 0 (disabled) and 100 (files must
68 68 be identical) as its parameter. Detecting renamed files this way
69 69 can be expensive. After using this option, :hg:`status -C` can be
70 70 used to check which files were identified as moved or renamed.
71 71
72 72 Returns 0 if all files are successfully added.
73 73 """
74 74 try:
75 75 sim = float(opts.get('similarity') or 100)
76 76 except ValueError:
77 77 raise util.Abort(_('similarity must be a number'))
78 78 if sim < 0 or sim > 100:
79 79 raise util.Abort(_('similarity must be between 0 and 100'))
80 80 return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
81 81
82 82 def annotate(ui, repo, *pats, **opts):
83 83 """show changeset information by line for each file
84 84
85 85 List changes in files, showing the revision id responsible for
86 86 each line
87 87
88 88 This command is useful for discovering when a change was made and
89 89 by whom.
90 90
91 91 Without the -a/--text option, annotate will avoid processing files
92 92 it detects as binary. With -a, annotate will annotate the file
93 93 anyway, although the results will probably be neither useful
94 94 nor desirable.
95 95
96 96 Returns 0 on success.
97 97 """
98 98 if opts.get('follow'):
99 99 # --follow is deprecated and now just an alias for -f/--file
100 100 # to mimic the behavior of Mercurial before version 1.5
101 101 opts['file'] = 1
102 102
103 103 datefunc = ui.quiet and util.shortdate or util.datestr
104 104 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
105 105
106 106 if not pats:
107 107 raise util.Abort(_('at least one filename or pattern is required'))
108 108
109 109 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
110 110 ('number', lambda x: str(x[0].rev())),
111 111 ('changeset', lambda x: short(x[0].node())),
112 112 ('date', getdate),
113 113 ('file', lambda x: x[0].path()),
114 114 ]
115 115
116 116 if (not opts.get('user') and not opts.get('changeset')
117 117 and not opts.get('date') and not opts.get('file')):
118 118 opts['number'] = 1
119 119
120 120 linenumber = opts.get('line_number') is not None
121 121 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
122 122 raise util.Abort(_('at least one of -n/-c is required for -l'))
123 123
124 124 funcmap = [func for op, func in opmap if opts.get(op)]
125 125 if linenumber:
126 126 lastfunc = funcmap[-1]
127 127 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
128 128
129 129 ctx = repo[opts.get('rev')]
130 130 m = cmdutil.match(repo, pats, opts)
131 131 follow = not opts.get('no_follow')
132 132 for abs in ctx.walk(m):
133 133 fctx = ctx[abs]
134 134 if not opts.get('text') and util.binary(fctx.data()):
135 135 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
136 136 continue
137 137
138 138 lines = fctx.annotate(follow=follow, linenumber=linenumber)
139 139 pieces = []
140 140
141 141 for f in funcmap:
142 142 l = [f(n) for n, dummy in lines]
143 143 if l:
144 144 sized = [(x, encoding.colwidth(x)) for x in l]
145 145 ml = max([w for x, w in sized])
146 146 pieces.append(["%s%s" % (' ' * (ml - w), x) for x, w in sized])
147 147
148 148 if pieces:
149 149 for p, l in zip(zip(*pieces), lines):
150 150 ui.write("%s: %s" % (" ".join(p), l[1]))
151 151
152 152 def archive(ui, repo, dest, **opts):
153 153 '''create an unversioned archive of a repository revision
154 154
155 155 By default, the revision used is the parent of the working
156 156 directory; use -r/--rev to specify a different revision.
157 157
158 158 The archive type is automatically detected based on file
159 159 extension (or override using -t/--type).
160 160
161 161 Valid types are:
162 162
163 163 :``files``: a directory full of files (default)
164 164 :``tar``: tar archive, uncompressed
165 165 :``tbz2``: tar archive, compressed using bzip2
166 166 :``tgz``: tar archive, compressed using gzip
167 167 :``uzip``: zip archive, uncompressed
168 168 :``zip``: zip archive, compressed using deflate
169 169
170 170 The exact name of the destination archive or directory is given
171 171 using a format string; see :hg:`help export` for details.
172 172
173 173 Each member added to an archive file has a directory prefix
174 174 prepended. Use -p/--prefix to specify a format string for the
175 175 prefix. The default is the basename of the archive, with suffixes
176 176 removed.
177 177
178 178 Returns 0 on success.
179 179 '''
180 180
181 181 ctx = repo[opts.get('rev')]
182 182 if not ctx:
183 183 raise util.Abort(_('no working directory: please specify a revision'))
184 184 node = ctx.node()
185 185 dest = cmdutil.make_filename(repo, dest, node)
186 186 if os.path.realpath(dest) == repo.root:
187 187 raise util.Abort(_('repository root cannot be destination'))
188 188
189 189 kind = opts.get('type') or archival.guesskind(dest) or 'files'
190 190 prefix = opts.get('prefix')
191 191
192 192 if dest == '-':
193 193 if kind == 'files':
194 194 raise util.Abort(_('cannot archive plain files to stdout'))
195 195 dest = sys.stdout
196 196 if not prefix:
197 197 prefix = os.path.basename(repo.root) + '-%h'
198 198
199 199 prefix = cmdutil.make_filename(repo, prefix, node)
200 200 matchfn = cmdutil.match(repo, [], opts)
201 201 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
202 202 matchfn, prefix, subrepos=opts.get('subrepos'))
203 203
204 204 def backout(ui, repo, node=None, rev=None, **opts):
205 205 '''reverse effect of earlier changeset
206 206
207 207 Commit the backed out changes as a new changeset. The new
208 208 changeset is a child of the backed out changeset.
209 209
210 210 If you backout a changeset other than the tip, a new head is
211 211 created. This head will be the new tip and you should merge this
212 212 backout changeset with another head.
213 213
214 214 The --merge option remembers the parent of the working directory
215 215 before starting the backout, then merges the new head with that
216 216 changeset afterwards. This saves you from doing the merge by hand.
217 217 The result of this merge is not committed, as with a normal merge.
218 218
219 219 See :hg:`help dates` for a list of formats valid for -d/--date.
220 220
221 221 Returns 0 on success.
222 222 '''
223 223 if rev and node:
224 224 raise util.Abort(_("please specify just one revision"))
225 225
226 226 if not rev:
227 227 rev = node
228 228
229 229 if not rev:
230 230 raise util.Abort(_("please specify a revision to backout"))
231 231
232 232 date = opts.get('date')
233 233 if date:
234 234 opts['date'] = util.parsedate(date)
235 235
236 236 cmdutil.bail_if_changed(repo)
237 237 node = repo.lookup(rev)
238 238
239 239 op1, op2 = repo.dirstate.parents()
240 240 a = repo.changelog.ancestor(op1, node)
241 241 if a != node:
242 242 raise util.Abort(_('cannot backout change on a different branch'))
243 243
244 244 p1, p2 = repo.changelog.parents(node)
245 245 if p1 == nullid:
246 246 raise util.Abort(_('cannot backout a change with no parents'))
247 247 if p2 != nullid:
248 248 if not opts.get('parent'):
249 249 raise util.Abort(_('cannot backout a merge changeset without '
250 250 '--parent'))
251 251 p = repo.lookup(opts['parent'])
252 252 if p not in (p1, p2):
253 253 raise util.Abort(_('%s is not a parent of %s') %
254 254 (short(p), short(node)))
255 255 parent = p
256 256 else:
257 257 if opts.get('parent'):
258 258 raise util.Abort(_('cannot use --parent on non-merge changeset'))
259 259 parent = p1
260 260
261 261 # the backout should appear on the same branch
262 262 branch = repo.dirstate.branch()
263 263 hg.clean(repo, node, show_stats=False)
264 264 repo.dirstate.setbranch(branch)
265 265 revert_opts = opts.copy()
266 266 revert_opts['date'] = None
267 267 revert_opts['all'] = True
268 268 revert_opts['rev'] = hex(parent)
269 269 revert_opts['no_backup'] = None
270 270 revert(ui, repo, **revert_opts)
271 271 commit_opts = opts.copy()
272 272 commit_opts['addremove'] = False
273 273 if not commit_opts['message'] and not commit_opts['logfile']:
274 274 # we don't translate commit messages
275 275 commit_opts['message'] = "Backed out changeset %s" % short(node)
276 276 commit_opts['force_editor'] = True
277 277 commit(ui, repo, **commit_opts)
278 278 def nice(node):
279 279 return '%d:%s' % (repo.changelog.rev(node), short(node))
280 280 ui.status(_('changeset %s backs out changeset %s\n') %
281 281 (nice(repo.changelog.tip()), nice(node)))
282 282 if op1 != node:
283 283 hg.clean(repo, op1, show_stats=False)
284 284 if opts.get('merge'):
285 285 ui.status(_('merging with changeset %s\n')
286 286 % nice(repo.changelog.tip()))
287 287 hg.merge(repo, hex(repo.changelog.tip()))
288 288 else:
289 289 ui.status(_('the backout changeset is a new head - '
290 290 'do not forget to merge\n'))
291 291 ui.status(_('(use "backout --merge" '
292 292 'if you want to auto-merge)\n'))
293 293
294 294 def bisect(ui, repo, rev=None, extra=None, command=None,
295 295 reset=None, good=None, bad=None, skip=None, noupdate=None):
296 296 """subdivision search of changesets
297 297
298 298 This command helps to find changesets which introduce problems. To
299 299 use, mark the earliest changeset you know exhibits the problem as
300 300 bad, then mark the latest changeset which is free from the problem
301 301 as good. Bisect will update your working directory to a revision
302 302 for testing (unless the -U/--noupdate option is specified). Once
303 303 you have performed tests, mark the working directory as good or
304 304 bad, and bisect will either update to another candidate changeset
305 305 or announce that it has found the bad revision.
306 306
307 307 As a shortcut, you can also use the revision argument to mark a
308 308 revision as good or bad without checking it out first.
309 309
310 310 If you supply a command, it will be used for automatic bisection.
311 311 Its exit status will be used to mark revisions as good or bad:
312 312 status 0 means good, 125 means to skip the revision, 127
313 313 (command not found) will abort the bisection, and any other
314 314 non-zero exit status means the revision is bad.
315 315
316 316 Returns 0 on success.
317 317 """
318 318 def print_result(nodes, good):
319 319 displayer = cmdutil.show_changeset(ui, repo, {})
320 320 if len(nodes) == 1:
321 321 # narrowed it down to a single revision
322 322 if good:
323 323 ui.write(_("The first good revision is:\n"))
324 324 else:
325 325 ui.write(_("The first bad revision is:\n"))
326 326 displayer.show(repo[nodes[0]])
327 327 parents = repo[nodes[0]].parents()
328 328 if len(parents) > 1:
329 329 side = good and state['bad'] or state['good']
330 330 num = len(set(i.node() for i in parents) & set(side))
331 331 if num == 1:
332 332 common = parents[0].ancestor(parents[1])
333 333 ui.write(_('Not all ancestors of this changeset have been'
334 334 ' checked.\nTo check the other ancestors, start'
335 335 ' from the common ancestor, %s.\n' % common))
336 336 else:
337 337 # multiple possible revisions
338 338 if good:
339 339 ui.write(_("Due to skipped revisions, the first "
340 340 "good revision could be any of:\n"))
341 341 else:
342 342 ui.write(_("Due to skipped revisions, the first "
343 343 "bad revision could be any of:\n"))
344 344 for n in nodes:
345 345 displayer.show(repo[n])
346 346 displayer.close()
347 347
348 348 def check_state(state, interactive=True):
349 349 if not state['good'] or not state['bad']:
350 350 if (good or bad or skip or reset) and interactive:
351 351 return
352 352 if not state['good']:
353 353 raise util.Abort(_('cannot bisect (no known good revisions)'))
354 354 else:
355 355 raise util.Abort(_('cannot bisect (no known bad revisions)'))
356 356 return True
357 357
358 358 # backward compatibility
359 359 if rev in "good bad reset init".split():
360 360 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
361 361 cmd, rev, extra = rev, extra, None
362 362 if cmd == "good":
363 363 good = True
364 364 elif cmd == "bad":
365 365 bad = True
366 366 else:
367 367 reset = True
368 368 elif extra or good + bad + skip + reset + bool(command) > 1:
369 369 raise util.Abort(_('incompatible arguments'))
370 370
371 371 if reset:
372 372 p = repo.join("bisect.state")
373 373 if os.path.exists(p):
374 374 os.unlink(p)
375 375 return
376 376
377 377 state = hbisect.load_state(repo)
378 378
379 379 if command:
380 380 changesets = 1
381 381 try:
382 382 while changesets:
383 383 # update state
384 384 status = util.system(command)
385 385 if status == 125:
386 386 transition = "skip"
387 387 elif status == 0:
388 388 transition = "good"
389 389 # status < 0 means process was killed
390 390 elif status == 127:
391 391 raise util.Abort(_("failed to execute %s") % command)
392 392 elif status < 0:
393 393 raise util.Abort(_("%s killed") % command)
394 394 else:
395 395 transition = "bad"
396 396 ctx = repo[rev or '.']
397 397 state[transition].append(ctx.node())
398 398 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
399 399 check_state(state, interactive=False)
400 400 # bisect
401 401 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
402 402 # update to next check
403 403 cmdutil.bail_if_changed(repo)
404 404 hg.clean(repo, nodes[0], show_stats=False)
405 405 finally:
406 406 hbisect.save_state(repo, state)
407 407 print_result(nodes, good)
408 408 return
409 409
410 410 # update state
411 411
412 412 if rev:
413 413 nodes = [repo.lookup(i) for i in cmdutil.revrange(repo, [rev])]
414 414 else:
415 415 nodes = [repo.lookup('.')]
416 416
417 417 if good or bad or skip:
418 418 if good:
419 419 state['good'] += nodes
420 420 elif bad:
421 421 state['bad'] += nodes
422 422 elif skip:
423 423 state['skip'] += nodes
424 424 hbisect.save_state(repo, state)
425 425
426 426 if not check_state(state):
427 427 return
428 428
429 429 # actually bisect
430 430 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
431 431 if changesets == 0:
432 432 print_result(nodes, good)
433 433 else:
434 434 assert len(nodes) == 1 # only a single node can be tested next
435 435 node = nodes[0]
436 436 # compute the approximate number of remaining tests
437 437 tests, size = 0, 2
438 438 while size <= changesets:
439 439 tests, size = tests + 1, size * 2
440 440 rev = repo.changelog.rev(node)
441 441 ui.write(_("Testing changeset %d:%s "
442 442 "(%d changesets remaining, ~%d tests)\n")
443 443 % (rev, short(node), changesets, tests))
444 444 if not noupdate:
445 445 cmdutil.bail_if_changed(repo)
446 446 return hg.clean(repo, node)
447 447
448 448 def branch(ui, repo, label=None, **opts):
449 449 """set or show the current branch name
450 450
451 451 With no argument, show the current branch name. With one argument,
452 452 set the working directory branch name (the branch will not exist
453 453 in the repository until the next commit). Standard practice
454 454 recommends that primary development take place on the 'default'
455 455 branch.
456 456
457 457 Unless -f/--force is specified, branch will not let you set a
458 458 branch name that already exists, even if it's inactive.
459 459
460 460 Use -C/--clean to reset the working directory branch to that of
461 461 the parent of the working directory, negating a previous branch
462 462 change.
463 463
464 464 Use the command :hg:`update` to switch to an existing branch. Use
465 465 :hg:`commit --close-branch` to mark this branch as closed.
466 466
467 467 Returns 0 on success.
468 468 """
469 469
470 470 if opts.get('clean'):
471 471 label = repo[None].parents()[0].branch()
472 472 repo.dirstate.setbranch(label)
473 473 ui.status(_('reset working directory to branch %s\n') % label)
474 474 elif label:
475 475 utflabel = encoding.fromlocal(label)
476 476 if not opts.get('force') and utflabel in repo.branchtags():
477 477 if label not in [p.branch() for p in repo.parents()]:
478 478 raise util.Abort(_('a branch of the same name already exists'
479 479 " (use 'hg update' to switch to it)"))
480 480 repo.dirstate.setbranch(utflabel)
481 481 ui.status(_('marked working directory as branch %s\n') % label)
482 482 else:
483 483 ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
484 484
485 485 def branches(ui, repo, active=False, closed=False):
486 486 """list repository named branches
487 487
488 488 List the repository's named branches, indicating which ones are
489 489 inactive. If -c/--closed is specified, also list branches which have
490 490 been marked closed (see :hg:`commit --close-branch`).
491 491
492 492 If -a/--active is specified, only show active branches. A branch
493 493 is considered active if it contains repository heads.
494 494
495 495 Use the command :hg:`update` to switch to an existing branch.
496 496
497 497 Returns 0.
498 498 """
499 499
500 500 hexfunc = ui.debugflag and hex or short
501 501 activebranches = [repo[n].branch() for n in repo.heads()]
502 502 def testactive(tag, node):
503 503 realhead = tag in activebranches
504 504 open = node in repo.branchheads(tag, closed=False)
505 505 return realhead and open
506 506 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
507 507 for tag, node in repo.branchtags().items()],
508 508 reverse=True)
509 509
510 510 for isactive, node, tag in branches:
511 511 if (not active) or isactive:
512 512 encodedtag = encoding.tolocal(tag)
513 513 if ui.quiet:
514 514 ui.write("%s\n" % encodedtag)
515 515 else:
516 516 hn = repo.lookup(node)
517 517 if isactive:
518 518 label = 'branches.active'
519 519 notice = ''
520 520 elif hn not in repo.branchheads(tag, closed=False):
521 521 if not closed:
522 522 continue
523 523 label = 'branches.closed'
524 524 notice = _(' (closed)')
525 525 else:
526 526 label = 'branches.inactive'
527 527 notice = _(' (inactive)')
528 528 if tag == repo.dirstate.branch():
529 529 label = 'branches.current'
530 530 rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
531 531 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
532 532 encodedtag = ui.label(encodedtag, label)
533 533 ui.write("%s %s%s\n" % (encodedtag, rev, notice))
534 534
535 535 def bundle(ui, repo, fname, dest=None, **opts):
536 536 """create a changegroup file
537 537
538 538 Generate a compressed changegroup file collecting changesets not
539 539 known to be in another repository.
540 540
541 541 If you omit the destination repository, then hg assumes the
542 542 destination will have all the nodes you specify with --base
543 543 parameters. To create a bundle containing all changesets, use
544 544 -a/--all (or --base null).
545 545
546 546 You can change compression method with the -t/--type option.
547 547 The available compression methods are: none, bzip2, and
548 548 gzip (by default, bundles are compressed using bzip2).
549 549
550 550 The bundle file can then be transferred using conventional means
551 551 and applied to another repository with the unbundle or pull
552 552 command. This is useful when direct push and pull are not
553 553 available or when exporting an entire repository is undesirable.
554 554
555 555 Applying bundles preserves all changeset contents including
556 556 permissions, copy/rename information, and revision history.
557 557
558 558 Returns 0 on success, 1 if no changes found.
559 559 """
560 560 revs = opts.get('rev') or None
561 561 if opts.get('all'):
562 562 base = ['null']
563 563 else:
564 564 base = opts.get('base')
565 565 if base:
566 566 if dest:
567 567 raise util.Abort(_("--base is incompatible with specifying "
568 568 "a destination"))
569 569 base = [repo.lookup(rev) for rev in base]
570 570 # create the right base
571 571 # XXX: nodesbetween / changegroup* should be "fixed" instead
572 572 o = []
573 573 has = set((nullid,))
574 574 for n in base:
575 575 has.update(repo.changelog.reachable(n))
576 576 if revs:
577 577 revs = [repo.lookup(rev) for rev in revs]
578 578 visit = revs[:]
579 579 has.difference_update(visit)
580 580 else:
581 581 visit = repo.changelog.heads()
582 582 seen = {}
583 583 while visit:
584 584 n = visit.pop(0)
585 585 parents = [p for p in repo.changelog.parents(n) if p not in has]
586 586 if len(parents) == 0:
587 587 if n not in has:
588 588 o.append(n)
589 589 else:
590 590 for p in parents:
591 591 if p not in seen:
592 592 seen[p] = 1
593 593 visit.append(p)
594 594 else:
595 595 dest = ui.expandpath(dest or 'default-push', dest or 'default')
596 596 dest, branches = hg.parseurl(dest, opts.get('branch'))
597 597 other = hg.repository(hg.remoteui(repo, opts), dest)
598 598 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
599 599 if revs:
600 600 revs = [repo.lookup(rev) for rev in revs]
601 601 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
602 602
603 603 if not o:
604 604 ui.status(_("no changes found\n"))
605 605 return 1
606 606
607 607 if revs:
608 608 cg = repo.changegroupsubset(o, revs, 'bundle')
609 609 else:
610 610 cg = repo.changegroup(o, 'bundle')
611 611
612 612 bundletype = opts.get('type', 'bzip2').lower()
613 613 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
614 614 bundletype = btypes.get(bundletype)
615 615 if bundletype not in changegroup.bundletypes:
616 616 raise util.Abort(_('unknown bundle type specified with --type'))
617 617
618 618 changegroup.writebundle(cg, fname, bundletype)
619 619
620 620 def cat(ui, repo, file1, *pats, **opts):
621 621 """output the current or given revision of files
622 622
623 623 Print the specified files as they were at the given revision. If
624 624 no revision is given, the parent of the working directory is used,
625 625 or tip if no revision is checked out.
626 626
627 627 Output may be to a file, in which case the name of the file is
628 628 given using a format string. The formatting rules are the same as
629 629 for the export command, with the following additions:
630 630
631 631 :``%s``: basename of file being printed
632 632 :``%d``: dirname of file being printed, or '.' if in repository root
633 633 :``%p``: root-relative path name of file being printed
634 634
635 635 Returns 0 on success.
636 636 """
637 637 ctx = repo[opts.get('rev')]
638 638 err = 1
639 639 m = cmdutil.match(repo, (file1,) + pats, opts)
640 640 for abs in ctx.walk(m):
641 641 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
642 642 data = ctx[abs].data()
643 643 if opts.get('decode'):
644 644 data = repo.wwritedata(abs, data)
645 645 fp.write(data)
646 646 err = 0
647 647 return err
648 648
649 649 def clone(ui, source, dest=None, **opts):
650 650 """make a copy of an existing repository
651 651
652 652 Create a copy of an existing repository in a new directory.
653 653
654 654 If no destination directory name is specified, it defaults to the
655 655 basename of the source.
656 656
657 657 The location of the source is added to the new repository's
658 658 .hg/hgrc file, as the default to be used for future pulls.
659 659
660 660 See :hg:`help urls` for valid source format details.
661 661
662 662 It is possible to specify an ``ssh://`` URL as the destination, but no
663 663 .hg/hgrc and working directory will be created on the remote side.
664 664 Please see :hg:`help urls` for important details about ``ssh://`` URLs.
665 665
666 666 A set of changesets (tags, or branch names) to pull may be specified
667 667 by listing each changeset (tag, or branch name) with -r/--rev.
668 668 If -r/--rev is used, the cloned repository will contain only a subset
669 669 of the changesets of the source repository. Only the set of changesets
670 670 defined by all -r/--rev options (including all their ancestors)
671 671 will be pulled into the destination repository.
672 672 No subsequent changesets (including subsequent tags) will be present
673 673 in the destination.
674 674
675 675 Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
676 676 local source repositories.
677 677
678 678 For efficiency, hardlinks are used for cloning whenever the source
679 679 and destination are on the same filesystem (note this applies only
680 680 to the repository data, not to the working directory). Some
681 681 filesystems, such as AFS, implement hardlinking incorrectly, but
682 682 do not report errors. In these cases, use the --pull option to
683 683 avoid hardlinking.
684 684
685 685 In some cases, you can clone repositories and the working directory
686 686 using full hardlinks with ::
687 687
688 688 $ cp -al REPO REPOCLONE
689 689
690 690 This is the fastest way to clone, but it is not always safe. The
691 691 operation is not atomic (making sure REPO is not modified during
692 692 the operation is up to you) and you have to make sure your editor
693 693 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
694 694 this is not compatible with certain extensions that place their
695 695 metadata under the .hg directory, such as mq.
696 696
697 697 Mercurial will update the working directory to the first applicable
698 698 revision from this list:
699 699
700 700 a) null if -U or the source repository has no changesets
701 701 b) if -u . and the source repository is local, the first parent of
702 702 the source repository's working directory
703 703 c) the changeset specified with -u (if a branch name, this means the
704 704 latest head of that branch)
705 705 d) the changeset specified with -r
706 706 e) the tipmost head specified with -b
707 707 f) the tipmost head specified with the url#branch source syntax
708 708 g) the tipmost head of the default branch
709 709 h) tip
710 710
711 711 Returns 0 on success.
712 712 """
713 713 if opts.get('noupdate') and opts.get('updaterev'):
714 714 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
715 715
716 716 r = hg.clone(hg.remoteui(ui, opts), source, dest,
717 717 pull=opts.get('pull'),
718 718 stream=opts.get('uncompressed'),
719 719 rev=opts.get('rev'),
720 720 update=opts.get('updaterev') or not opts.get('noupdate'),
721 721 branch=opts.get('branch'))
722 722
723 723 return r is None
724 724
725 725 def commit(ui, repo, *pats, **opts):
726 726 """commit the specified files or all outstanding changes
727 727
728 728 Commit changes to the given files into the repository. Unlike a
729 729 centralized RCS, this operation is a local operation. See
730 730 :hg:`push` for a way to actively distribute your changes.
731 731
732 732 If a list of files is omitted, all changes reported by :hg:`status`
733 733 will be committed.
734 734
735 735 If you are committing the result of a merge, do not provide any
736 736 filenames or -I/-X filters.
737 737
738 738 If no commit message is specified, Mercurial starts your
739 739 configured editor where you can enter a message. In case your
740 740 commit fails, you will find a backup of your message in
741 741 ``.hg/last-message.txt``.
742 742
743 743 See :hg:`help dates` for a list of formats valid for -d/--date.
744 744
745 745 Returns 0 on success, 1 if nothing changed.
746 746 """
747 747 extra = {}
748 748 if opts.get('close_branch'):
749 749 if repo['.'].node() not in repo.branchheads():
750 750 # The topo heads set is included in the branch heads set of the
751 751 # current branch, so it's sufficient to test branchheads
752 752 raise util.Abort(_('can only close branch heads'))
753 753 extra['close'] = 1
754 754 e = cmdutil.commiteditor
755 755 if opts.get('force_editor'):
756 756 e = cmdutil.commitforceeditor
757 757
758 758 def commitfunc(ui, repo, message, match, opts):
759 759 return repo.commit(message, opts.get('user'), opts.get('date'), match,
760 760 editor=e, extra=extra)
761 761
762 762 branch = repo[None].branch()
763 763 bheads = repo.branchheads(branch)
764 764
765 765 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
766 766 if not node:
767 767 ui.status(_("nothing changed\n"))
768 768 return 1
769 769
770 770 ctx = repo[node]
771 771 parents = ctx.parents()
772 772
773 773 if bheads and not [x for x in parents
774 774 if x.node() in bheads and x.branch() == branch]:
775 775 ui.status(_('created new head\n'))
776 776 # The message is not printed for initial roots. For the other
777 777 # changesets, it is printed in the following situations:
778 778 #
779 779 # Par column: for the 2 parents with ...
780 780 # N: null or no parent
781 781 # B: parent is on another named branch
782 782 # C: parent is a regular non head changeset
783 783 # H: parent was a branch head of the current branch
784 784 # Msg column: whether we print "created new head" message
785 785 # In the following, it is assumed that there already exists some
786 786 # initial branch heads of the current branch, otherwise nothing is
787 787 # printed anyway.
788 788 #
789 789 # Par Msg Comment
790 790 # NN y additional topo root
791 791 #
792 792 # BN y additional branch root
793 793 # CN y additional topo head
794 794 # HN n usual case
795 795 #
796 796 # BB y weird additional branch root
797 797 # CB y branch merge
798 798 # HB n merge with named branch
799 799 #
800 800 # CC y additional head from merge
801 801 # CH n merge with a head
802 802 #
803 803 # HH n head merge: head count decreases
804 804
805 805 if not opts.get('close_branch'):
806 806 for r in parents:
807 807 if r.extra().get('close') and r.branch() == branch:
808 808 ui.status(_('reopening closed branch head %d\n') % r)
809 809
810 810 if ui.debugflag:
811 811 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
812 812 elif ui.verbose:
813 813 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
814 814
815 815 def copy(ui, repo, *pats, **opts):
816 816 """mark files as copied for the next commit
817 817
818 818 Mark dest as having copies of source files. If dest is a
819 819 directory, copies are put in that directory. If dest is a file,
820 820 the source must be a single file.
821 821
822 822 By default, this command copies the contents of files as they
823 823 exist in the working directory. If invoked with -A/--after, the
824 824 operation is recorded, but no copying is performed.
825 825
826 826 This command takes effect with the next commit. To undo a copy
827 827 before that, see :hg:`revert`.
828 828
829 829 Returns 0 on success, 1 if errors are encountered.
830 830 """
831 831 wlock = repo.wlock(False)
832 832 try:
833 833 return cmdutil.copy(ui, repo, pats, opts)
834 834 finally:
835 835 wlock.release()
836 836
837 837 def debugancestor(ui, repo, *args):
838 838 """find the ancestor revision of two revisions in a given index"""
839 839 if len(args) == 3:
840 840 index, rev1, rev2 = args
841 841 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
842 842 lookup = r.lookup
843 843 elif len(args) == 2:
844 844 if not repo:
845 845 raise util.Abort(_("there is no Mercurial repository here "
846 846 "(.hg not found)"))
847 847 rev1, rev2 = args
848 848 r = repo.changelog
849 849 lookup = repo.lookup
850 850 else:
851 851 raise util.Abort(_('either two or three arguments required'))
852 852 a = r.ancestor(lookup(rev1), lookup(rev2))
853 853 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
854 854
855 855 def debugbuilddag(ui, repo, text,
856 856 mergeable_file=False,
857 857 appended_file=False,
858 858 overwritten_file=False,
859 859 new_file=False):
860 860 """builds a repo with a given dag from scratch in the current empty repo
861 861
862 862 Elements:
863 863
864 864 - "+n" is a linear run of n nodes based on the current default parent
865 865 - "." is a single node based on the current default parent
866 866 - "$" resets the default parent to null (implied at the start);
867 867 otherwise the default parent is always the last node created
868 868 - "<p" sets the default parent to the backref p
869 869 - "*p" is a fork at parent p, which is a backref
870 870 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
871 871 - "/p2" is a merge of the preceding node and p2
872 872 - ":tag" defines a local tag for the preceding node
873 873 - "@branch" sets the named branch for subsequent nodes
874 874 - "!command" runs the command using your shell
875 875 - "!!my command\\n" is like "!", but to the end of the line
876 876 - "#...\\n" is a comment up to the end of the line
877 877
878 878 Whitespace between the above elements is ignored.
879 879
880 880 A backref is either
881 881
882 882 - a number n, which references the node curr-n, where curr is the current
883 883 node, or
884 884 - the name of a local tag you placed earlier using ":tag", or
885 885 - empty to denote the default parent.
886 886
887 887 All string valued-elements are either strictly alphanumeric, or must
888 888 be enclosed in double quotes ("..."), with "\\" as escape character.
889 889
890 890 Note that the --overwritten-file and --appended-file options imply the
891 891 use of "HGMERGE=internal:local" during DAG buildup.
892 892 """
893 893
894 894 if not (mergeable_file or appended_file or overwritten_file or new_file):
895 895 raise util.Abort(_('need at least one of -m, -a, -o, -n'))
896 896
897 897 if len(repo.changelog) > 0:
898 898 raise util.Abort(_('repository is not empty'))
899 899
900 900 if overwritten_file or appended_file:
901 901 # we don't want to fail in merges during buildup
902 902 os.environ['HGMERGE'] = 'internal:local'
903 903
904 904 def writefile(fname, text, fmode="wb"):
905 905 f = open(fname, fmode)
906 906 try:
907 907 f.write(text)
908 908 finally:
909 909 f.close()
910 910
911 911 if mergeable_file:
912 912 linesperrev = 2
913 913 # determine number of revs in DAG
914 914 n = 0
915 915 for type, data in dagparser.parsedag(text):
916 916 if type == 'n':
917 917 n += 1
918 918 # make a file with k lines per rev
919 919 writefile("mf", "\n".join(str(i) for i in xrange(0, n * linesperrev))
920 920 + "\n")
921 921
922 922 at = -1
923 923 atbranch = 'default'
924 924 for type, data in dagparser.parsedag(text):
925 925 if type == 'n':
926 926 ui.status('node %s\n' % str(data))
927 927 id, ps = data
928 928 p1 = ps[0]
929 929 if p1 != at:
930 930 update(ui, repo, node=p1, clean=True)
931 931 at = p1
932 932 if repo.dirstate.branch() != atbranch:
933 933 branch(ui, repo, atbranch, force=True)
934 934 if len(ps) > 1:
935 935 p2 = ps[1]
936 936 merge(ui, repo, node=p2)
937 937
938 938 if mergeable_file:
939 939 f = open("mf", "rb+")
940 940 try:
941 941 lines = f.read().split("\n")
942 942 lines[id * linesperrev] += " r%i" % id
943 943 f.seek(0)
944 944 f.write("\n".join(lines))
945 945 finally:
946 946 f.close()
947 947
948 948 if appended_file:
949 949 writefile("af", "r%i\n" % id, "ab")
950 950
951 951 if overwritten_file:
952 952 writefile("of", "r%i\n" % id)
953 953
954 954 if new_file:
955 955 writefile("nf%i" % id, "r%i\n" % id)
956 956
957 957 commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0))
958 958 at = id
959 959 elif type == 'l':
960 960 id, name = data
961 961 ui.status('tag %s\n' % name)
962 962 tag(ui, repo, name, local=True)
963 963 elif type == 'a':
964 964 ui.status('branch %s\n' % data)
965 965 atbranch = data
966 966 elif type in 'cC':
967 967 r = util.system(data, cwd=repo.root)
968 968 if r:
969 969 desc, r = util.explain_exit(r)
970 970 raise util.Abort(_('%s command %s') % (data, desc))
971 971
972 972 def debugcommands(ui, cmd='', *args):
973 973 """list all available commands and options"""
974 974 for cmd, vals in sorted(table.iteritems()):
975 975 cmd = cmd.split('|')[0].strip('^')
976 976 opts = ', '.join([i[1] for i in vals[1]])
977 977 ui.write('%s: %s\n' % (cmd, opts))
978 978
979 979 def debugcomplete(ui, cmd='', **opts):
980 980 """returns the completion list associated with the given command"""
981 981
982 982 if opts.get('options'):
983 983 options = []
984 984 otables = [globalopts]
985 985 if cmd:
986 986 aliases, entry = cmdutil.findcmd(cmd, table, False)
987 987 otables.append(entry[1])
988 988 for t in otables:
989 989 for o in t:
990 990 if "(DEPRECATED)" in o[3]:
991 991 continue
992 992 if o[0]:
993 993 options.append('-%s' % o[0])
994 994 options.append('--%s' % o[1])
995 995 ui.write("%s\n" % "\n".join(options))
996 996 return
997 997
998 998 cmdlist = cmdutil.findpossible(cmd, table)
999 999 if ui.verbose:
1000 1000 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1001 1001 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1002 1002
1003 1003 def debugfsinfo(ui, path = "."):
1004 1004 """show information detected about current filesystem"""
1005 1005 open('.debugfsinfo', 'w').write('')
1006 1006 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1007 1007 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1008 1008 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1009 1009 and 'yes' or 'no'))
1010 1010 os.unlink('.debugfsinfo')
1011 1011
1012 1012 def debugrebuildstate(ui, repo, rev="tip"):
1013 1013 """rebuild the dirstate as it would look like for the given revision"""
1014 1014 ctx = repo[rev]
1015 1015 wlock = repo.wlock()
1016 1016 try:
1017 1017 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1018 1018 finally:
1019 1019 wlock.release()
1020 1020
1021 1021 def debugcheckstate(ui, repo):
1022 1022 """validate the correctness of the current dirstate"""
1023 1023 parent1, parent2 = repo.dirstate.parents()
1024 1024 m1 = repo[parent1].manifest()
1025 1025 m2 = repo[parent2].manifest()
1026 1026 errors = 0
1027 1027 for f in repo.dirstate:
1028 1028 state = repo.dirstate[f]
1029 1029 if state in "nr" and f not in m1:
1030 1030 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1031 1031 errors += 1
1032 1032 if state in "a" and f in m1:
1033 1033 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1034 1034 errors += 1
1035 1035 if state in "m" and f not in m1 and f not in m2:
1036 1036 ui.warn(_("%s in state %s, but not in either manifest\n") %
1037 1037 (f, state))
1038 1038 errors += 1
1039 1039 for f in m1:
1040 1040 state = repo.dirstate[f]
1041 1041 if state not in "nrm":
1042 1042 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1043 1043 errors += 1
1044 1044 if errors:
1045 1045 error = _(".hg/dirstate inconsistent with current parent's manifest")
1046 1046 raise util.Abort(error)
1047 1047
1048 1048 def showconfig(ui, repo, *values, **opts):
1049 1049 """show combined config settings from all hgrc files
1050 1050
1051 1051 With no arguments, print names and values of all config items.
1052 1052
1053 1053 With one argument of the form section.name, print just the value
1054 1054 of that config item.
1055 1055
1056 1056 With multiple arguments, print names and values of all config
1057 1057 items with matching section names.
1058 1058
1059 1059 With --debug, the source (filename and line number) is printed
1060 1060 for each config item.
1061 1061
1062 1062 Returns 0 on success.
1063 1063 """
1064 1064
1065 1065 for f in util.rcpath():
1066 1066 ui.debug(_('read config from: %s\n') % f)
1067 1067 untrusted = bool(opts.get('untrusted'))
1068 1068 if values:
1069 1069 if len([v for v in values if '.' in v]) > 1:
1070 1070 raise util.Abort(_('only one config item permitted'))
1071 1071 for section, name, value in ui.walkconfig(untrusted=untrusted):
1072 1072 sectname = section + '.' + name
1073 1073 if values:
1074 1074 for v in values:
1075 1075 if v == section:
1076 1076 ui.debug('%s: ' %
1077 1077 ui.configsource(section, name, untrusted))
1078 1078 ui.write('%s=%s\n' % (sectname, value))
1079 1079 elif v == sectname:
1080 1080 ui.debug('%s: ' %
1081 1081 ui.configsource(section, name, untrusted))
1082 1082 ui.write(value, '\n')
1083 1083 else:
1084 1084 ui.debug('%s: ' %
1085 1085 ui.configsource(section, name, untrusted))
1086 1086 ui.write('%s=%s\n' % (sectname, value))
1087 1087
1088 1088 def debugpushkey(ui, repopath, namespace, *keyinfo):
1089 1089 '''access the pushkey key/value protocol
1090 1090
1091 1091 With two args, list the keys in the given namespace.
1092 1092
1093 1093 With five args, set a key to new if it currently is set to old.
1094 1094 Reports success or failure.
1095 1095 '''
1096 1096
1097 1097 target = hg.repository(ui, repopath)
1098 1098 if keyinfo:
1099 1099 key, old, new = keyinfo
1100 1100 r = target.pushkey(namespace, key, old, new)
1101 1101 ui.status(str(r) + '\n')
1102 1102 return not(r)
1103 1103 else:
1104 1104 for k, v in target.listkeys(namespace).iteritems():
1105 1105 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1106 1106 v.encode('string-escape')))
1107 1107
1108 1108 def debugrevspec(ui, repo, expr):
1109 1109 '''parse and apply a revision specification'''
1110 1110 if ui.verbose:
1111 1111 tree = revset.parse(expr)
1112 1112 ui.note(tree, "\n")
1113 1113 func = revset.match(expr)
1114 1114 for c in func(repo, range(len(repo))):
1115 1115 ui.write("%s\n" % c)
1116 1116
1117 1117 def debugsetparents(ui, repo, rev1, rev2=None):
1118 1118 """manually set the parents of the current working directory
1119 1119
1120 1120 This is useful for writing repository conversion tools, but should
1121 1121 be used with care.
1122 1122
1123 1123 Returns 0 on success.
1124 1124 """
1125 1125
1126 1126 if not rev2:
1127 1127 rev2 = hex(nullid)
1128 1128
1129 1129 wlock = repo.wlock()
1130 1130 try:
1131 1131 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
1132 1132 finally:
1133 1133 wlock.release()
1134 1134
1135 1135 def debugstate(ui, repo, nodates=None):
1136 1136 """show the contents of the current dirstate"""
1137 1137 timestr = ""
1138 1138 showdate = not nodates
1139 1139 for file_, ent in sorted(repo.dirstate._map.iteritems()):
1140 1140 if showdate:
1141 1141 if ent[3] == -1:
1142 1142 # Pad or slice to locale representation
1143 1143 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
1144 1144 time.localtime(0)))
1145 1145 timestr = 'unset'
1146 1146 timestr = (timestr[:locale_len] +
1147 1147 ' ' * (locale_len - len(timestr)))
1148 1148 else:
1149 1149 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
1150 1150 time.localtime(ent[3]))
1151 1151 if ent[1] & 020000:
1152 1152 mode = 'lnk'
1153 1153 else:
1154 1154 mode = '%3o' % (ent[1] & 0777)
1155 1155 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
1156 1156 for f in repo.dirstate.copies():
1157 1157 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
1158 1158
1159 1159 def debugsub(ui, repo, rev=None):
1160 1160 if rev == '':
1161 1161 rev = None
1162 1162 for k, v in sorted(repo[rev].substate.items()):
1163 1163 ui.write('path %s\n' % k)
1164 1164 ui.write(' source %s\n' % v[0])
1165 1165 ui.write(' revision %s\n' % v[1])
1166 1166
1167 1167 def debugdag(ui, repo, file_=None, *revs, **opts):
1168 1168 """format the changelog or an index DAG as a concise textual description
1169 1169
1170 1170 If you pass a revlog index, the revlog's DAG is emitted. If you list
1171 1171 revision numbers, they get labelled in the output as rN.
1172 1172
1173 1173 Otherwise, the changelog DAG of the current repo is emitted.
1174 1174 """
1175 1175 spaces = opts.get('spaces')
1176 1176 dots = opts.get('dots')
1177 1177 if file_:
1178 1178 rlog = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1179 1179 revs = set((int(r) for r in revs))
1180 1180 def events():
1181 1181 for r in rlog:
1182 1182 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1183 1183 if r in revs:
1184 1184 yield 'l', (r, "r%i" % r)
1185 1185 elif repo:
1186 1186 cl = repo.changelog
1187 1187 tags = opts.get('tags')
1188 1188 branches = opts.get('branches')
1189 1189 if tags:
1190 1190 labels = {}
1191 1191 for l, n in repo.tags().items():
1192 1192 labels.setdefault(cl.rev(n), []).append(l)
1193 1193 def events():
1194 1194 b = "default"
1195 1195 for r in cl:
1196 1196 if branches:
1197 1197 newb = cl.read(cl.node(r))[5]['branch']
1198 1198 if newb != b:
1199 1199 yield 'a', newb
1200 1200 b = newb
1201 1201 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1202 1202 if tags:
1203 1203 ls = labels.get(r)
1204 1204 if ls:
1205 1205 for l in ls:
1206 1206 yield 'l', (r, l)
1207 1207 else:
1208 1208 raise util.Abort(_('need repo for changelog dag'))
1209 1209
1210 1210 for line in dagparser.dagtextlines(events(),
1211 1211 addspaces=spaces,
1212 1212 wraplabels=True,
1213 1213 wrapannotations=True,
1214 1214 wrapnonlinear=dots,
1215 1215 usedots=dots,
1216 1216 maxlinewidth=70):
1217 1217 ui.write(line)
1218 1218 ui.write("\n")
1219 1219
1220 1220 def debugdata(ui, repo, file_, rev):
1221 1221 """dump the contents of a data file revision"""
1222 1222 r = None
1223 1223 if repo:
1224 1224 filelog = repo.file(file_)
1225 1225 if len(filelog):
1226 1226 r = filelog
1227 1227 if not r:
1228 1228 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
1229 1229 try:
1230 1230 ui.write(r.revision(r.lookup(rev)))
1231 1231 except KeyError:
1232 1232 raise util.Abort(_('invalid revision identifier %s') % rev)
1233 1233
1234 1234 def debugdate(ui, date, range=None, **opts):
1235 1235 """parse and display a date"""
1236 1236 if opts["extended"]:
1237 1237 d = util.parsedate(date, util.extendeddateformats)
1238 1238 else:
1239 1239 d = util.parsedate(date)
1240 1240 ui.write("internal: %s %s\n" % d)
1241 1241 ui.write("standard: %s\n" % util.datestr(d))
1242 1242 if range:
1243 1243 m = util.matchdate(range)
1244 1244 ui.write("match: %s\n" % m(d[0]))
1245 1245
1246 1246 def debugindex(ui, repo, file_):
1247 1247 """dump the contents of an index file"""
1248 1248 r = None
1249 1249 if repo:
1250 1250 filelog = repo.file(file_)
1251 1251 if len(filelog):
1252 1252 r = filelog
1253 1253 if not r:
1254 1254 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1255 1255 ui.write(" rev offset length base linkrev"
1256 1256 " nodeid p1 p2\n")
1257 1257 for i in r:
1258 1258 node = r.node(i)
1259 1259 try:
1260 1260 pp = r.parents(node)
1261 1261 except:
1262 1262 pp = [nullid, nullid]
1263 1263 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1264 1264 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
1265 1265 short(node), short(pp[0]), short(pp[1])))
1266 1266
1267 1267 def debugindexdot(ui, repo, file_):
1268 1268 """dump an index DAG as a graphviz dot file"""
1269 1269 r = None
1270 1270 if repo:
1271 1271 filelog = repo.file(file_)
1272 1272 if len(filelog):
1273 1273 r = filelog
1274 1274 if not r:
1275 1275 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1276 1276 ui.write("digraph G {\n")
1277 1277 for i in r:
1278 1278 node = r.node(i)
1279 1279 pp = r.parents(node)
1280 1280 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1281 1281 if pp[1] != nullid:
1282 1282 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1283 1283 ui.write("}\n")
1284 1284
1285 1285 def debuginstall(ui):
1286 1286 '''test Mercurial installation
1287 1287
1288 1288 Returns 0 on success.
1289 1289 '''
1290 1290
1291 1291 def writetemp(contents):
1292 1292 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1293 1293 f = os.fdopen(fd, "wb")
1294 1294 f.write(contents)
1295 1295 f.close()
1296 1296 return name
1297 1297
1298 1298 problems = 0
1299 1299
1300 1300 # encoding
1301 1301 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1302 1302 try:
1303 1303 encoding.fromlocal("test")
1304 1304 except util.Abort, inst:
1305 1305 ui.write(" %s\n" % inst)
1306 1306 ui.write(_(" (check that your locale is properly set)\n"))
1307 1307 problems += 1
1308 1308
1309 1309 # compiled modules
1310 1310 ui.status(_("Checking installed modules (%s)...\n")
1311 1311 % os.path.dirname(__file__))
1312 1312 try:
1313 1313 import bdiff, mpatch, base85, osutil
1314 1314 except Exception, inst:
1315 1315 ui.write(" %s\n" % inst)
1316 1316 ui.write(_(" One or more extensions could not be found"))
1317 1317 ui.write(_(" (check that you compiled the extensions)\n"))
1318 1318 problems += 1
1319 1319
1320 1320 # templates
1321 1321 ui.status(_("Checking templates...\n"))
1322 1322 try:
1323 1323 import templater
1324 1324 templater.templater(templater.templatepath("map-cmdline.default"))
1325 1325 except Exception, inst:
1326 1326 ui.write(" %s\n" % inst)
1327 1327 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1328 1328 problems += 1
1329 1329
1330 1330 # patch
1331 1331 ui.status(_("Checking patch...\n"))
1332 1332 patchproblems = 0
1333 1333 a = "1\n2\n3\n4\n"
1334 1334 b = "1\n2\n3\ninsert\n4\n"
1335 1335 fa = writetemp(a)
1336 1336 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
1337 1337 os.path.basename(fa))
1338 1338 fd = writetemp(d)
1339 1339
1340 1340 files = {}
1341 1341 try:
1342 1342 patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
1343 1343 except util.Abort, e:
1344 1344 ui.write(_(" patch call failed:\n"))
1345 1345 ui.write(" " + str(e) + "\n")
1346 1346 patchproblems += 1
1347 1347 else:
1348 1348 if list(files) != [os.path.basename(fa)]:
1349 1349 ui.write(_(" unexpected patch output!\n"))
1350 1350 patchproblems += 1
1351 1351 a = open(fa).read()
1352 1352 if a != b:
1353 1353 ui.write(_(" patch test failed!\n"))
1354 1354 patchproblems += 1
1355 1355
1356 1356 if patchproblems:
1357 1357 if ui.config('ui', 'patch'):
1358 1358 ui.write(_(" (Current patch tool may be incompatible with patch,"
1359 1359 " or misconfigured. Please check your configuration"
1360 1360 " file)\n"))
1361 1361 else:
1362 1362 ui.write(_(" Internal patcher failure, please report this error"
1363 1363 " to http://mercurial.selenic.com/bts/\n"))
1364 1364 problems += patchproblems
1365 1365
1366 1366 os.unlink(fa)
1367 1367 os.unlink(fd)
1368 1368
1369 1369 # editor
1370 1370 ui.status(_("Checking commit editor...\n"))
1371 1371 editor = ui.geteditor()
1372 1372 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
1373 1373 if not cmdpath:
1374 1374 if editor == 'vi':
1375 1375 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1376 1376 ui.write(_(" (specify a commit editor in your configuration"
1377 1377 " file)\n"))
1378 1378 else:
1379 1379 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1380 1380 ui.write(_(" (specify a commit editor in your configuration"
1381 1381 " file)\n"))
1382 1382 problems += 1
1383 1383
1384 1384 # check username
1385 1385 ui.status(_("Checking username...\n"))
1386 1386 try:
1387 1387 ui.username()
1388 1388 except util.Abort, e:
1389 1389 ui.write(" %s\n" % e)
1390 1390 ui.write(_(" (specify a username in your configuration file)\n"))
1391 1391 problems += 1
1392 1392
1393 1393 if not problems:
1394 1394 ui.status(_("No problems detected\n"))
1395 1395 else:
1396 1396 ui.write(_("%s problems detected,"
1397 1397 " please check your install!\n") % problems)
1398 1398
1399 1399 return problems
1400 1400
1401 1401 def debugrename(ui, repo, file1, *pats, **opts):
1402 1402 """dump rename information"""
1403 1403
1404 1404 ctx = repo[opts.get('rev')]
1405 1405 m = cmdutil.match(repo, (file1,) + pats, opts)
1406 1406 for abs in ctx.walk(m):
1407 1407 fctx = ctx[abs]
1408 1408 o = fctx.filelog().renamed(fctx.filenode())
1409 1409 rel = m.rel(abs)
1410 1410 if o:
1411 1411 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1412 1412 else:
1413 1413 ui.write(_("%s not renamed\n") % rel)
1414 1414
1415 1415 def debugwalk(ui, repo, *pats, **opts):
1416 1416 """show how files match on given patterns"""
1417 1417 m = cmdutil.match(repo, pats, opts)
1418 1418 items = list(repo.walk(m))
1419 1419 if not items:
1420 1420 return
1421 1421 fmt = 'f %%-%ds %%-%ds %%s' % (
1422 1422 max([len(abs) for abs in items]),
1423 1423 max([len(m.rel(abs)) for abs in items]))
1424 1424 for abs in items:
1425 1425 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
1426 1426 ui.write("%s\n" % line.rstrip())
1427 1427
1428 1428 def diff(ui, repo, *pats, **opts):
1429 1429 """diff repository (or selected files)
1430 1430
1431 1431 Show differences between revisions for the specified files.
1432 1432
1433 1433 Differences between files are shown using the unified diff format.
1434 1434
1435 1435 .. note::
1436 1436 diff may generate unexpected results for merges, as it will
1437 1437 default to comparing against the working directory's first
1438 1438 parent changeset if no revisions are specified.
1439 1439
1440 1440 When two revision arguments are given, then changes are shown
1441 1441 between those revisions. If only one revision is specified then
1442 1442 that revision is compared to the working directory, and, when no
1443 1443 revisions are specified, the working directory files are compared
1444 1444 to its parent.
1445 1445
1446 1446 Alternatively you can specify -c/--change with a revision to see
1447 1447 the changes in that changeset relative to its first parent.
1448 1448
1449 1449 Without the -a/--text option, diff will avoid generating diffs of
1450 1450 files it detects as binary. With -a, diff will generate a diff
1451 1451 anyway, probably with undesirable results.
1452 1452
1453 1453 Use the -g/--git option to generate diffs in the git extended diff
1454 1454 format. For more information, read :hg:`help diffs`.
1455 1455
1456 1456 Returns 0 on success.
1457 1457 """
1458 1458
1459 1459 revs = opts.get('rev')
1460 1460 change = opts.get('change')
1461 1461 stat = opts.get('stat')
1462 1462 reverse = opts.get('reverse')
1463 1463
1464 1464 if revs and change:
1465 1465 msg = _('cannot specify --rev and --change at the same time')
1466 1466 raise util.Abort(msg)
1467 1467 elif change:
1468 1468 node2 = repo.lookup(change)
1469 1469 node1 = repo[node2].parents()[0].node()
1470 1470 else:
1471 1471 node1, node2 = cmdutil.revpair(repo, revs)
1472 1472
1473 1473 if reverse:
1474 1474 node1, node2 = node2, node1
1475 1475
1476 1476 diffopts = patch.diffopts(ui, opts)
1477 1477 m = cmdutil.match(repo, pats, opts)
1478 1478 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1479 1479 listsubrepos=opts.get('subrepos'))
1480 1480
1481 1481 def export(ui, repo, *changesets, **opts):
1482 1482 """dump the header and diffs for one or more changesets
1483 1483
1484 1484 Print the changeset header and diffs for one or more revisions.
1485 1485
1486 1486 The information shown in the changeset header is: author, date,
1487 1487 branch name (if non-default), changeset hash, parent(s) and commit
1488 1488 comment.
1489 1489
1490 NOTE: export may generate unexpected diff output for merge
1490 .. note::
1491 export may generate unexpected diff output for merge
1491 1492 changesets, as it will compare the merge changeset against its
1492 1493 first parent only.
1493 1494
1494 1495 Output may be to a file, in which case the name of the file is
1495 1496 given using a format string. The formatting rules are as follows:
1496 1497
1497 1498 :``%%``: literal "%" character
1498 1499 :``%H``: changeset hash (40 hexadecimal digits)
1499 1500 :``%N``: number of patches being generated
1500 1501 :``%R``: changeset revision number
1501 1502 :``%b``: basename of the exporting repository
1502 1503 :``%h``: short-form changeset hash (12 hexadecimal digits)
1503 1504 :``%n``: zero-padded sequence number, starting at 1
1504 1505 :``%r``: zero-padded changeset revision number
1505 1506
1506 1507 Without the -a/--text option, export will avoid generating diffs
1507 1508 of files it detects as binary. With -a, export will generate a
1508 1509 diff anyway, probably with undesirable results.
1509 1510
1510 1511 Use the -g/--git option to generate diffs in the git extended diff
1511 1512 format. See :hg:`help diffs` for more information.
1512 1513
1513 1514 With the --switch-parent option, the diff will be against the
1514 1515 second parent. It can be useful to review a merge.
1515 1516
1516 1517 Returns 0 on success.
1517 1518 """
1518 1519 changesets += tuple(opts.get('rev', []))
1519 1520 if not changesets:
1520 1521 raise util.Abort(_("export requires at least one changeset"))
1521 1522 revs = cmdutil.revrange(repo, changesets)
1522 1523 if len(revs) > 1:
1523 1524 ui.note(_('exporting patches:\n'))
1524 1525 else:
1525 1526 ui.note(_('exporting patch:\n'))
1526 1527 cmdutil.export(repo, revs, template=opts.get('output'),
1527 1528 switch_parent=opts.get('switch_parent'),
1528 1529 opts=patch.diffopts(ui, opts))
1529 1530
1530 1531 def forget(ui, repo, *pats, **opts):
1531 1532 """forget the specified files on the next commit
1532 1533
1533 1534 Mark the specified files so they will no longer be tracked
1534 1535 after the next commit.
1535 1536
1536 1537 This only removes files from the current branch, not from the
1537 1538 entire project history, and it does not delete them from the
1538 1539 working directory.
1539 1540
1540 1541 To undo a forget before the next commit, see :hg:`add`.
1541 1542
1542 1543 Returns 0 on success.
1543 1544 """
1544 1545
1545 1546 if not pats:
1546 1547 raise util.Abort(_('no files specified'))
1547 1548
1548 1549 m = cmdutil.match(repo, pats, opts)
1549 1550 s = repo.status(match=m, clean=True)
1550 1551 forget = sorted(s[0] + s[1] + s[3] + s[6])
1551 1552 errs = 0
1552 1553
1553 1554 for f in m.files():
1554 1555 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
1555 1556 ui.warn(_('not removing %s: file is already untracked\n')
1556 1557 % m.rel(f))
1557 1558 errs = 1
1558 1559
1559 1560 for f in forget:
1560 1561 if ui.verbose or not m.exact(f):
1561 1562 ui.status(_('removing %s\n') % m.rel(f))
1562 1563
1563 1564 repo[None].remove(forget, unlink=False)
1564 1565 return errs
1565 1566
1566 1567 def grep(ui, repo, pattern, *pats, **opts):
1567 1568 """search for a pattern in specified files and revisions
1568 1569
1569 1570 Search revisions of files for a regular expression.
1570 1571
1571 1572 This command behaves differently than Unix grep. It only accepts
1572 1573 Python/Perl regexps. It searches repository history, not the
1573 1574 working directory. It always prints the revision number in which a
1574 1575 match appears.
1575 1576
1576 1577 By default, grep only prints output for the first revision of a
1577 1578 file in which it finds a match. To get it to print every revision
1578 1579 that contains a change in match status ("-" for a match that
1579 1580 becomes a non-match, or "+" for a non-match that becomes a match),
1580 1581 use the --all flag.
1581 1582
1582 1583 Returns 0 if a match is found, 1 otherwise.
1583 1584 """
1584 1585 reflags = 0
1585 1586 if opts.get('ignore_case'):
1586 1587 reflags |= re.I
1587 1588 try:
1588 1589 regexp = re.compile(pattern, reflags)
1589 1590 except re.error, inst:
1590 1591 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1591 1592 return 1
1592 1593 sep, eol = ':', '\n'
1593 1594 if opts.get('print0'):
1594 1595 sep = eol = '\0'
1595 1596
1596 1597 getfile = util.lrucachefunc(repo.file)
1597 1598
1598 1599 def matchlines(body):
1599 1600 begin = 0
1600 1601 linenum = 0
1601 1602 while True:
1602 1603 match = regexp.search(body, begin)
1603 1604 if not match:
1604 1605 break
1605 1606 mstart, mend = match.span()
1606 1607 linenum += body.count('\n', begin, mstart) + 1
1607 1608 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1608 1609 begin = body.find('\n', mend) + 1 or len(body)
1609 1610 lend = begin - 1
1610 1611 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1611 1612
1612 1613 class linestate(object):
1613 1614 def __init__(self, line, linenum, colstart, colend):
1614 1615 self.line = line
1615 1616 self.linenum = linenum
1616 1617 self.colstart = colstart
1617 1618 self.colend = colend
1618 1619
1619 1620 def __hash__(self):
1620 1621 return hash((self.linenum, self.line))
1621 1622
1622 1623 def __eq__(self, other):
1623 1624 return self.line == other.line
1624 1625
1625 1626 matches = {}
1626 1627 copies = {}
1627 1628 def grepbody(fn, rev, body):
1628 1629 matches[rev].setdefault(fn, [])
1629 1630 m = matches[rev][fn]
1630 1631 for lnum, cstart, cend, line in matchlines(body):
1631 1632 s = linestate(line, lnum, cstart, cend)
1632 1633 m.append(s)
1633 1634
1634 1635 def difflinestates(a, b):
1635 1636 sm = difflib.SequenceMatcher(None, a, b)
1636 1637 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1637 1638 if tag == 'insert':
1638 1639 for i in xrange(blo, bhi):
1639 1640 yield ('+', b[i])
1640 1641 elif tag == 'delete':
1641 1642 for i in xrange(alo, ahi):
1642 1643 yield ('-', a[i])
1643 1644 elif tag == 'replace':
1644 1645 for i in xrange(alo, ahi):
1645 1646 yield ('-', a[i])
1646 1647 for i in xrange(blo, bhi):
1647 1648 yield ('+', b[i])
1648 1649
1649 1650 def display(fn, ctx, pstates, states):
1650 1651 rev = ctx.rev()
1651 1652 datefunc = ui.quiet and util.shortdate or util.datestr
1652 1653 found = False
1653 1654 filerevmatches = {}
1654 1655 if opts.get('all'):
1655 1656 iter = difflinestates(pstates, states)
1656 1657 else:
1657 1658 iter = [('', l) for l in states]
1658 1659 for change, l in iter:
1659 1660 cols = [fn, str(rev)]
1660 1661 before, match, after = None, None, None
1661 1662 if opts.get('line_number'):
1662 1663 cols.append(str(l.linenum))
1663 1664 if opts.get('all'):
1664 1665 cols.append(change)
1665 1666 if opts.get('user'):
1666 1667 cols.append(ui.shortuser(ctx.user()))
1667 1668 if opts.get('date'):
1668 1669 cols.append(datefunc(ctx.date()))
1669 1670 if opts.get('files_with_matches'):
1670 1671 c = (fn, rev)
1671 1672 if c in filerevmatches:
1672 1673 continue
1673 1674 filerevmatches[c] = 1
1674 1675 else:
1675 1676 before = l.line[:l.colstart]
1676 1677 match = l.line[l.colstart:l.colend]
1677 1678 after = l.line[l.colend:]
1678 1679 ui.write(sep.join(cols))
1679 1680 if before is not None:
1680 1681 ui.write(sep + before)
1681 1682 ui.write(match, label='grep.match')
1682 1683 ui.write(after)
1683 1684 ui.write(eol)
1684 1685 found = True
1685 1686 return found
1686 1687
1687 1688 skip = {}
1688 1689 revfiles = {}
1689 1690 matchfn = cmdutil.match(repo, pats, opts)
1690 1691 found = False
1691 1692 follow = opts.get('follow')
1692 1693
1693 1694 def prep(ctx, fns):
1694 1695 rev = ctx.rev()
1695 1696 pctx = ctx.parents()[0]
1696 1697 parent = pctx.rev()
1697 1698 matches.setdefault(rev, {})
1698 1699 matches.setdefault(parent, {})
1699 1700 files = revfiles.setdefault(rev, [])
1700 1701 for fn in fns:
1701 1702 flog = getfile(fn)
1702 1703 try:
1703 1704 fnode = ctx.filenode(fn)
1704 1705 except error.LookupError:
1705 1706 continue
1706 1707
1707 1708 copied = flog.renamed(fnode)
1708 1709 copy = follow and copied and copied[0]
1709 1710 if copy:
1710 1711 copies.setdefault(rev, {})[fn] = copy
1711 1712 if fn in skip:
1712 1713 if copy:
1713 1714 skip[copy] = True
1714 1715 continue
1715 1716 files.append(fn)
1716 1717
1717 1718 if fn not in matches[rev]:
1718 1719 grepbody(fn, rev, flog.read(fnode))
1719 1720
1720 1721 pfn = copy or fn
1721 1722 if pfn not in matches[parent]:
1722 1723 try:
1723 1724 fnode = pctx.filenode(pfn)
1724 1725 grepbody(pfn, parent, flog.read(fnode))
1725 1726 except error.LookupError:
1726 1727 pass
1727 1728
1728 1729 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
1729 1730 rev = ctx.rev()
1730 1731 parent = ctx.parents()[0].rev()
1731 1732 for fn in sorted(revfiles.get(rev, [])):
1732 1733 states = matches[rev][fn]
1733 1734 copy = copies.get(rev, {}).get(fn)
1734 1735 if fn in skip:
1735 1736 if copy:
1736 1737 skip[copy] = True
1737 1738 continue
1738 1739 pstates = matches.get(parent, {}).get(copy or fn, [])
1739 1740 if pstates or states:
1740 1741 r = display(fn, ctx, pstates, states)
1741 1742 found = found or r
1742 1743 if r and not opts.get('all'):
1743 1744 skip[fn] = True
1744 1745 if copy:
1745 1746 skip[copy] = True
1746 1747 del matches[rev]
1747 1748 del revfiles[rev]
1748 1749
1749 1750 return not found
1750 1751
1751 1752 def heads(ui, repo, *branchrevs, **opts):
1752 1753 """show current repository heads or show branch heads
1753 1754
1754 1755 With no arguments, show all repository branch heads.
1755 1756
1756 1757 Repository "heads" are changesets with no child changesets. They are
1757 1758 where development generally takes place and are the usual targets
1758 1759 for update and merge operations. Branch heads are changesets that have
1759 1760 no child changeset on the same branch.
1760 1761
1761 1762 If one or more REVs are given, only branch heads on the branches
1762 1763 associated with the specified changesets are shown.
1763 1764
1764 1765 If -c/--closed is specified, also show branch heads marked closed
1765 1766 (see :hg:`commit --close-branch`).
1766 1767
1767 1768 If STARTREV is specified, only those heads that are descendants of
1768 1769 STARTREV will be displayed.
1769 1770
1770 1771 If -t/--topo is specified, named branch mechanics will be ignored and only
1771 1772 changesets without children will be shown.
1772 1773
1773 1774 Returns 0 if matching heads are found, 1 if not.
1774 1775 """
1775 1776
1776 1777 if opts.get('rev'):
1777 1778 start = repo.lookup(opts['rev'])
1778 1779 else:
1779 1780 start = None
1780 1781
1781 1782 if opts.get('topo'):
1782 1783 heads = [repo[h] for h in repo.heads(start)]
1783 1784 else:
1784 1785 heads = []
1785 1786 for b, ls in repo.branchmap().iteritems():
1786 1787 if start is None:
1787 1788 heads += [repo[h] for h in ls]
1788 1789 continue
1789 1790 startrev = repo.changelog.rev(start)
1790 1791 descendants = set(repo.changelog.descendants(startrev))
1791 1792 descendants.add(startrev)
1792 1793 rev = repo.changelog.rev
1793 1794 heads += [repo[h] for h in ls if rev(h) in descendants]
1794 1795
1795 1796 if branchrevs:
1796 1797 decode, encode = encoding.fromlocal, encoding.tolocal
1797 1798 branches = set(repo[decode(br)].branch() for br in branchrevs)
1798 1799 heads = [h for h in heads if h.branch() in branches]
1799 1800
1800 1801 if not opts.get('closed'):
1801 1802 heads = [h for h in heads if not h.extra().get('close')]
1802 1803
1803 1804 if opts.get('active') and branchrevs:
1804 1805 dagheads = repo.heads(start)
1805 1806 heads = [h for h in heads if h.node() in dagheads]
1806 1807
1807 1808 if branchrevs:
1808 1809 haveheads = set(h.branch() for h in heads)
1809 1810 if branches - haveheads:
1810 1811 headless = ', '.join(encode(b) for b in branches - haveheads)
1811 1812 msg = _('no open branch heads found on branches %s')
1812 1813 if opts.get('rev'):
1813 1814 msg += _(' (started at %s)' % opts['rev'])
1814 1815 ui.warn((msg + '\n') % headless)
1815 1816
1816 1817 if not heads:
1817 1818 return 1
1818 1819
1819 1820 heads = sorted(heads, key=lambda x: -x.rev())
1820 1821 displayer = cmdutil.show_changeset(ui, repo, opts)
1821 1822 for ctx in heads:
1822 1823 displayer.show(ctx)
1823 1824 displayer.close()
1824 1825
1825 1826 def help_(ui, name=None, with_version=False, unknowncmd=False):
1826 1827 """show help for a given topic or a help overview
1827 1828
1828 1829 With no arguments, print a list of commands with short help messages.
1829 1830
1830 1831 Given a topic, extension, or command name, print help for that
1831 1832 topic.
1832 1833
1833 1834 Returns 0 if successful.
1834 1835 """
1835 1836 option_lists = []
1836 1837 textwidth = util.termwidth() - 2
1837 1838
1838 1839 def addglobalopts(aliases):
1839 1840 if ui.verbose:
1840 1841 option_lists.append((_("global options:"), globalopts))
1841 1842 if name == 'shortlist':
1842 1843 option_lists.append((_('use "hg help" for the full list '
1843 1844 'of commands'), ()))
1844 1845 else:
1845 1846 if name == 'shortlist':
1846 1847 msg = _('use "hg help" for the full list of commands '
1847 1848 'or "hg -v" for details')
1848 1849 elif aliases:
1849 1850 msg = _('use "hg -v help%s" to show aliases and '
1850 1851 'global options') % (name and " " + name or "")
1851 1852 else:
1852 1853 msg = _('use "hg -v help %s" to show global options') % name
1853 1854 option_lists.append((msg, ()))
1854 1855
1855 1856 def helpcmd(name):
1856 1857 if with_version:
1857 1858 version_(ui)
1858 1859 ui.write('\n')
1859 1860
1860 1861 try:
1861 1862 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
1862 1863 except error.AmbiguousCommand, inst:
1863 1864 # py3k fix: except vars can't be used outside the scope of the
1864 1865 # except block, nor can be used inside a lambda. python issue4617
1865 1866 prefix = inst.args[0]
1866 1867 select = lambda c: c.lstrip('^').startswith(prefix)
1867 1868 helplist(_('list of commands:\n\n'), select)
1868 1869 return
1869 1870
1870 1871 # check if it's an invalid alias and display its error if it is
1871 1872 if getattr(entry[0], 'badalias', False):
1872 1873 if not unknowncmd:
1873 1874 entry[0](ui)
1874 1875 return
1875 1876
1876 1877 # synopsis
1877 1878 if len(entry) > 2:
1878 1879 if entry[2].startswith('hg'):
1879 1880 ui.write("%s\n" % entry[2])
1880 1881 else:
1881 1882 ui.write('hg %s %s\n' % (aliases[0], entry[2]))
1882 1883 else:
1883 1884 ui.write('hg %s\n' % aliases[0])
1884 1885
1885 1886 # aliases
1886 1887 if not ui.quiet and len(aliases) > 1:
1887 1888 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
1888 1889
1889 1890 # description
1890 1891 doc = gettext(entry[0].__doc__)
1891 1892 if not doc:
1892 1893 doc = _("(no help text available)")
1893 1894 if hasattr(entry[0], 'definition'): # aliased command
1894 1895 if entry[0].definition.startswith('!'): # shell alias
1895 1896 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
1896 1897 else:
1897 1898 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
1898 1899 if ui.quiet:
1899 1900 doc = doc.splitlines()[0]
1900 1901 keep = ui.verbose and ['verbose'] or []
1901 1902 formatted, pruned = minirst.format(doc, textwidth, keep=keep)
1902 1903 ui.write("\n%s\n" % formatted)
1903 1904 if pruned:
1904 1905 ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
1905 1906
1906 1907 if not ui.quiet:
1907 1908 # options
1908 1909 if entry[1]:
1909 1910 option_lists.append((_("options:\n"), entry[1]))
1910 1911
1911 1912 addglobalopts(False)
1912 1913
1913 1914 def helplist(header, select=None):
1914 1915 h = {}
1915 1916 cmds = {}
1916 1917 for c, e in table.iteritems():
1917 1918 f = c.split("|", 1)[0]
1918 1919 if select and not select(f):
1919 1920 continue
1920 1921 if (not select and name != 'shortlist' and
1921 1922 e[0].__module__ != __name__):
1922 1923 continue
1923 1924 if name == "shortlist" and not f.startswith("^"):
1924 1925 continue
1925 1926 f = f.lstrip("^")
1926 1927 if not ui.debugflag and f.startswith("debug"):
1927 1928 continue
1928 1929 doc = e[0].__doc__
1929 1930 if doc and 'DEPRECATED' in doc and not ui.verbose:
1930 1931 continue
1931 1932 doc = gettext(doc)
1932 1933 if not doc:
1933 1934 doc = _("(no help text available)")
1934 1935 h[f] = doc.splitlines()[0].rstrip()
1935 1936 cmds[f] = c.lstrip("^")
1936 1937
1937 1938 if not h:
1938 1939 ui.status(_('no commands defined\n'))
1939 1940 return
1940 1941
1941 1942 ui.status(header)
1942 1943 fns = sorted(h)
1943 1944 m = max(map(len, fns))
1944 1945 for f in fns:
1945 1946 if ui.verbose:
1946 1947 commands = cmds[f].replace("|",", ")
1947 1948 ui.write(" %s:\n %s\n"%(commands, h[f]))
1948 1949 else:
1949 1950 ui.write('%s\n' % (util.wrap(h[f],
1950 1951 initindent=' %-*s ' % (m, f),
1951 1952 hangindent=' ' * (m + 4))))
1952 1953
1953 1954 if not ui.quiet:
1954 1955 addglobalopts(True)
1955 1956
1956 1957 def helptopic(name):
1957 1958 for names, header, doc in help.helptable:
1958 1959 if name in names:
1959 1960 break
1960 1961 else:
1961 1962 raise error.UnknownCommand(name)
1962 1963
1963 1964 # description
1964 1965 if not doc:
1965 1966 doc = _("(no help text available)")
1966 1967 if hasattr(doc, '__call__'):
1967 1968 doc = doc()
1968 1969
1969 1970 ui.write("%s\n\n" % header)
1970 1971 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
1971 1972
1972 1973 def helpext(name):
1973 1974 try:
1974 1975 mod = extensions.find(name)
1975 1976 doc = gettext(mod.__doc__) or _('no help text available')
1976 1977 except KeyError:
1977 1978 mod = None
1978 1979 doc = extensions.disabledext(name)
1979 1980 if not doc:
1980 1981 raise error.UnknownCommand(name)
1981 1982
1982 1983 if '\n' not in doc:
1983 1984 head, tail = doc, ""
1984 1985 else:
1985 1986 head, tail = doc.split('\n', 1)
1986 1987 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
1987 1988 if tail:
1988 1989 ui.write(minirst.format(tail, textwidth))
1989 1990 ui.status('\n\n')
1990 1991
1991 1992 if mod:
1992 1993 try:
1993 1994 ct = mod.cmdtable
1994 1995 except AttributeError:
1995 1996 ct = {}
1996 1997 modcmds = set([c.split('|', 1)[0] for c in ct])
1997 1998 helplist(_('list of commands:\n\n'), modcmds.__contains__)
1998 1999 else:
1999 2000 ui.write(_('use "hg help extensions" for information on enabling '
2000 2001 'extensions\n'))
2001 2002
2002 2003 def helpextcmd(name):
2003 2004 cmd, ext, mod = extensions.disabledcmd(name, ui.config('ui', 'strict'))
2004 2005 doc = gettext(mod.__doc__).splitlines()[0]
2005 2006
2006 2007 msg = help.listexts(_("'%s' is provided by the following "
2007 2008 "extension:") % cmd, {ext: doc}, len(ext),
2008 2009 indent=4)
2009 2010 ui.write(minirst.format(msg, textwidth))
2010 2011 ui.write('\n\n')
2011 2012 ui.write(_('use "hg help extensions" for information on enabling '
2012 2013 'extensions\n'))
2013 2014
2014 2015 if name and name != 'shortlist':
2015 2016 i = None
2016 2017 if unknowncmd:
2017 2018 queries = (helpextcmd,)
2018 2019 else:
2019 2020 queries = (helptopic, helpcmd, helpext, helpextcmd)
2020 2021 for f in queries:
2021 2022 try:
2022 2023 f(name)
2023 2024 i = None
2024 2025 break
2025 2026 except error.UnknownCommand, inst:
2026 2027 i = inst
2027 2028 if i:
2028 2029 raise i
2029 2030
2030 2031 else:
2031 2032 # program name
2032 2033 if ui.verbose or with_version:
2033 2034 version_(ui)
2034 2035 else:
2035 2036 ui.status(_("Mercurial Distributed SCM\n"))
2036 2037 ui.status('\n')
2037 2038
2038 2039 # list of commands
2039 2040 if name == "shortlist":
2040 2041 header = _('basic commands:\n\n')
2041 2042 else:
2042 2043 header = _('list of commands:\n\n')
2043 2044
2044 2045 helplist(header)
2045 2046 if name != 'shortlist':
2046 2047 exts, maxlength = extensions.enabled()
2047 2048 text = help.listexts(_('enabled extensions:'), exts, maxlength)
2048 2049 if text:
2049 2050 ui.write("\n%s\n" % minirst.format(text, textwidth))
2050 2051
2051 2052 # list all option lists
2052 2053 opt_output = []
2053 2054 multioccur = False
2054 2055 for title, options in option_lists:
2055 2056 opt_output.append(("\n%s" % title, None))
2056 2057 for option in options:
2057 2058 if len(option) == 5:
2058 2059 shortopt, longopt, default, desc, optlabel = option
2059 2060 else:
2060 2061 shortopt, longopt, default, desc = option
2061 2062 optlabel = _("VALUE") # default label
2062 2063
2063 2064 if _("DEPRECATED") in desc and not ui.verbose:
2064 2065 continue
2065 2066 if isinstance(default, list):
2066 2067 numqualifier = " %s [+]" % optlabel
2067 2068 multioccur = True
2068 2069 elif (default is not None) and not isinstance(default, bool):
2069 2070 numqualifier = " %s" % optlabel
2070 2071 else:
2071 2072 numqualifier = ""
2072 2073 opt_output.append(("%2s%s" %
2073 2074 (shortopt and "-%s" % shortopt,
2074 2075 longopt and " --%s%s" %
2075 2076 (longopt, numqualifier)),
2076 2077 "%s%s" % (desc,
2077 2078 default
2078 2079 and _(" (default: %s)") % default
2079 2080 or "")))
2080 2081 if multioccur:
2081 2082 msg = _("\n[+] marked option can be specified multiple times")
2082 2083 if ui.verbose and name != 'shortlist':
2083 2084 opt_output.append((msg, None))
2084 2085 else:
2085 2086 opt_output.insert(-1, (msg, None))
2086 2087
2087 2088 if not name:
2088 2089 ui.write(_("\nadditional help topics:\n\n"))
2089 2090 topics = []
2090 2091 for names, header, doc in help.helptable:
2091 2092 topics.append((sorted(names, key=len, reverse=True)[0], header))
2092 2093 topics_len = max([len(s[0]) for s in topics])
2093 2094 for t, desc in topics:
2094 2095 ui.write(" %-*s %s\n" % (topics_len, t, desc))
2095 2096
2096 2097 if opt_output:
2097 2098 colwidth = encoding.colwidth
2098 2099 # normalize: (opt or message, desc or None, width of opt)
2099 2100 entries = [desc and (opt, desc, colwidth(opt)) or (opt, None, 0)
2100 2101 for opt, desc in opt_output]
2101 2102 hanging = max([e[2] for e in entries])
2102 2103 for opt, desc, width in entries:
2103 2104 if desc:
2104 2105 initindent = ' %s%s ' % (opt, ' ' * (hanging - width))
2105 2106 hangindent = ' ' * (hanging + 3)
2106 2107 ui.write('%s\n' % (util.wrap(desc,
2107 2108 initindent=initindent,
2108 2109 hangindent=hangindent)))
2109 2110 else:
2110 2111 ui.write("%s\n" % opt)
2111 2112
2112 2113 def identify(ui, repo, source=None,
2113 2114 rev=None, num=None, id=None, branch=None, tags=None):
2114 2115 """identify the working copy or specified revision
2115 2116
2116 2117 With no revision, print a summary of the current state of the
2117 2118 repository.
2118 2119
2119 2120 Specifying a path to a repository root or Mercurial bundle will
2120 2121 cause lookup to operate on that repository/bundle.
2121 2122
2122 2123 This summary identifies the repository state using one or two
2123 2124 parent hash identifiers, followed by a "+" if there are
2124 2125 uncommitted changes in the working directory, a list of tags for
2125 2126 this revision and a branch name for non-default branches.
2126 2127
2127 2128 Returns 0 if successful.
2128 2129 """
2129 2130
2130 2131 if not repo and not source:
2131 2132 raise util.Abort(_("there is no Mercurial repository here "
2132 2133 "(.hg not found)"))
2133 2134
2134 2135 hexfunc = ui.debugflag and hex or short
2135 2136 default = not (num or id or branch or tags)
2136 2137 output = []
2137 2138
2138 2139 revs = []
2139 2140 if source:
2140 2141 source, branches = hg.parseurl(ui.expandpath(source))
2141 2142 repo = hg.repository(ui, source)
2142 2143 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
2143 2144
2144 2145 if not repo.local():
2145 2146 if not rev and revs:
2146 2147 rev = revs[0]
2147 2148 if not rev:
2148 2149 rev = "tip"
2149 2150 if num or branch or tags:
2150 2151 raise util.Abort(
2151 2152 "can't query remote revision number, branch, or tags")
2152 2153 output = [hexfunc(repo.lookup(rev))]
2153 2154 elif not rev:
2154 2155 ctx = repo[None]
2155 2156 parents = ctx.parents()
2156 2157 changed = False
2157 2158 if default or id or num:
2158 2159 changed = util.any(repo.status())
2159 2160 if default or id:
2160 2161 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
2161 2162 (changed) and "+" or "")]
2162 2163 if num:
2163 2164 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
2164 2165 (changed) and "+" or ""))
2165 2166 else:
2166 2167 ctx = repo[rev]
2167 2168 if default or id:
2168 2169 output = [hexfunc(ctx.node())]
2169 2170 if num:
2170 2171 output.append(str(ctx.rev()))
2171 2172
2172 2173 if repo.local() and default and not ui.quiet:
2173 2174 b = encoding.tolocal(ctx.branch())
2174 2175 if b != 'default':
2175 2176 output.append("(%s)" % b)
2176 2177
2177 2178 # multiple tags for a single parent separated by '/'
2178 2179 t = "/".join(ctx.tags())
2179 2180 if t:
2180 2181 output.append(t)
2181 2182
2182 2183 if branch:
2183 2184 output.append(encoding.tolocal(ctx.branch()))
2184 2185
2185 2186 if tags:
2186 2187 output.extend(ctx.tags())
2187 2188
2188 2189 ui.write("%s\n" % ' '.join(output))
2189 2190
2190 2191 def import_(ui, repo, patch1, *patches, **opts):
2191 2192 """import an ordered set of patches
2192 2193
2193 2194 Import a list of patches and commit them individually (unless
2194 2195 --no-commit is specified).
2195 2196
2196 2197 If there are outstanding changes in the working directory, import
2197 2198 will abort unless given the -f/--force flag.
2198 2199
2199 2200 You can import a patch straight from a mail message. Even patches
2200 2201 as attachments work (to use the body part, it must have type
2201 2202 text/plain or text/x-patch). From and Subject headers of email
2202 2203 message are used as default committer and commit message. All
2203 2204 text/plain body parts before first diff are added to commit
2204 2205 message.
2205 2206
2206 2207 If the imported patch was generated by :hg:`export`, user and
2207 2208 description from patch override values from message headers and
2208 2209 body. Values given on command line with -m/--message and -u/--user
2209 2210 override these.
2210 2211
2211 2212 If --exact is specified, import will set the working directory to
2212 2213 the parent of each patch before applying it, and will abort if the
2213 2214 resulting changeset has a different ID than the one recorded in
2214 2215 the patch. This may happen due to character set problems or other
2215 2216 deficiencies in the text patch format.
2216 2217
2217 2218 With -s/--similarity, hg will attempt to discover renames and
2218 2219 copies in the patch in the same way as 'addremove'.
2219 2220
2220 2221 To read a patch from standard input, use "-" as the patch name. If
2221 2222 a URL is specified, the patch will be downloaded from it.
2222 2223 See :hg:`help dates` for a list of formats valid for -d/--date.
2223 2224
2224 2225 Returns 0 on success.
2225 2226 """
2226 2227 patches = (patch1,) + patches
2227 2228
2228 2229 date = opts.get('date')
2229 2230 if date:
2230 2231 opts['date'] = util.parsedate(date)
2231 2232
2232 2233 try:
2233 2234 sim = float(opts.get('similarity') or 0)
2234 2235 except ValueError:
2235 2236 raise util.Abort(_('similarity must be a number'))
2236 2237 if sim < 0 or sim > 100:
2237 2238 raise util.Abort(_('similarity must be between 0 and 100'))
2238 2239
2239 2240 if opts.get('exact') or not opts.get('force'):
2240 2241 cmdutil.bail_if_changed(repo)
2241 2242
2242 2243 d = opts["base"]
2243 2244 strip = opts["strip"]
2244 2245 wlock = lock = None
2245 2246
2246 2247 def tryone(ui, hunk):
2247 2248 tmpname, message, user, date, branch, nodeid, p1, p2 = \
2248 2249 patch.extract(ui, hunk)
2249 2250
2250 2251 if not tmpname:
2251 2252 return None
2252 2253 commitid = _('to working directory')
2253 2254
2254 2255 try:
2255 2256 cmdline_message = cmdutil.logmessage(opts)
2256 2257 if cmdline_message:
2257 2258 # pickup the cmdline msg
2258 2259 message = cmdline_message
2259 2260 elif message:
2260 2261 # pickup the patch msg
2261 2262 message = message.strip()
2262 2263 else:
2263 2264 # launch the editor
2264 2265 message = None
2265 2266 ui.debug('message:\n%s\n' % message)
2266 2267
2267 2268 wp = repo.parents()
2268 2269 if opts.get('exact'):
2269 2270 if not nodeid or not p1:
2270 2271 raise util.Abort(_('not a Mercurial patch'))
2271 2272 p1 = repo.lookup(p1)
2272 2273 p2 = repo.lookup(p2 or hex(nullid))
2273 2274
2274 2275 if p1 != wp[0].node():
2275 2276 hg.clean(repo, p1)
2276 2277 repo.dirstate.setparents(p1, p2)
2277 2278 elif p2:
2278 2279 try:
2279 2280 p1 = repo.lookup(p1)
2280 2281 p2 = repo.lookup(p2)
2281 2282 if p1 == wp[0].node():
2282 2283 repo.dirstate.setparents(p1, p2)
2283 2284 except error.RepoError:
2284 2285 pass
2285 2286 if opts.get('exact') or opts.get('import_branch'):
2286 2287 repo.dirstate.setbranch(branch or 'default')
2287 2288
2288 2289 files = {}
2289 2290 try:
2290 2291 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
2291 2292 files=files, eolmode=None)
2292 2293 finally:
2293 2294 files = cmdutil.updatedir(ui, repo, files,
2294 2295 similarity=sim / 100.0)
2295 2296 if not opts.get('no_commit'):
2296 2297 if opts.get('exact'):
2297 2298 m = None
2298 2299 else:
2299 2300 m = cmdutil.matchfiles(repo, files or [])
2300 2301 n = repo.commit(message, opts.get('user') or user,
2301 2302 opts.get('date') or date, match=m,
2302 2303 editor=cmdutil.commiteditor)
2303 2304 if opts.get('exact'):
2304 2305 if hex(n) != nodeid:
2305 2306 repo.rollback()
2306 2307 raise util.Abort(_('patch is damaged'
2307 2308 ' or loses information'))
2308 2309 # Force a dirstate write so that the next transaction
2309 2310 # backups an up-do-date file.
2310 2311 repo.dirstate.write()
2311 2312 if n:
2312 2313 commitid = short(n)
2313 2314
2314 2315 return commitid
2315 2316 finally:
2316 2317 os.unlink(tmpname)
2317 2318
2318 2319 try:
2319 2320 wlock = repo.wlock()
2320 2321 lock = repo.lock()
2321 2322 lastcommit = None
2322 2323 for p in patches:
2323 2324 pf = os.path.join(d, p)
2324 2325
2325 2326 if pf == '-':
2326 2327 ui.status(_("applying patch from stdin\n"))
2327 2328 pf = sys.stdin
2328 2329 else:
2329 2330 ui.status(_("applying %s\n") % p)
2330 2331 pf = url.open(ui, pf)
2331 2332
2332 2333 haspatch = False
2333 2334 for hunk in patch.split(pf):
2334 2335 commitid = tryone(ui, hunk)
2335 2336 if commitid:
2336 2337 haspatch = True
2337 2338 if lastcommit:
2338 2339 ui.status(_('applied %s\n') % lastcommit)
2339 2340 lastcommit = commitid
2340 2341
2341 2342 if not haspatch:
2342 2343 raise util.Abort(_('no diffs found'))
2343 2344
2344 2345 finally:
2345 2346 release(lock, wlock)
2346 2347
2347 2348 def incoming(ui, repo, source="default", **opts):
2348 2349 """show new changesets found in source
2349 2350
2350 2351 Show new changesets found in the specified path/URL or the default
2351 2352 pull location. These are the changesets that would have been pulled
2352 2353 if a pull at the time you issued this command.
2353 2354
2354 2355 For remote repository, using --bundle avoids downloading the
2355 2356 changesets twice if the incoming is followed by a pull.
2356 2357
2357 2358 See pull for valid source format details.
2358 2359
2359 2360 Returns 0 if there are incoming changes, 1 otherwise.
2360 2361 """
2361 2362 if opts.get('bundle') and opts.get('subrepos'):
2362 2363 raise util.Abort(_('cannot combine --bundle and --subrepos'))
2363 2364
2364 2365 ret = hg.incoming(ui, repo, source, opts)
2365 2366 if opts.get('subrepos'):
2366 2367 ctx = repo[None]
2367 2368 for subpath in sorted(ctx.substate):
2368 2369 sub = ctx.sub(subpath)
2369 2370 ret = min(ret, sub.incoming(ui, source, opts))
2370 2371 return ret
2371 2372
2372 2373 def init(ui, dest=".", **opts):
2373 2374 """create a new repository in the given directory
2374 2375
2375 2376 Initialize a new repository in the given directory. If the given
2376 2377 directory does not exist, it will be created.
2377 2378
2378 2379 If no directory is given, the current directory is used.
2379 2380
2380 2381 It is possible to specify an ``ssh://`` URL as the destination.
2381 2382 See :hg:`help urls` for more information.
2382 2383
2383 2384 Returns 0 on success.
2384 2385 """
2385 2386 hg.repository(hg.remoteui(ui, opts), dest, create=1)
2386 2387
2387 2388 def locate(ui, repo, *pats, **opts):
2388 2389 """locate files matching specific patterns
2389 2390
2390 2391 Print files under Mercurial control in the working directory whose
2391 2392 names match the given patterns.
2392 2393
2393 2394 By default, this command searches all directories in the working
2394 2395 directory. To search just the current directory and its
2395 2396 subdirectories, use "--include .".
2396 2397
2397 2398 If no patterns are given to match, this command prints the names
2398 2399 of all files under Mercurial control in the working directory.
2399 2400
2400 2401 If you want to feed the output of this command into the "xargs"
2401 2402 command, use the -0 option to both this command and "xargs". This
2402 2403 will avoid the problem of "xargs" treating single filenames that
2403 2404 contain whitespace as multiple filenames.
2404 2405
2405 2406 Returns 0 if a match is found, 1 otherwise.
2406 2407 """
2407 2408 end = opts.get('print0') and '\0' or '\n'
2408 2409 rev = opts.get('rev') or None
2409 2410
2410 2411 ret = 1
2411 2412 m = cmdutil.match(repo, pats, opts, default='relglob')
2412 2413 m.bad = lambda x, y: False
2413 2414 for abs in repo[rev].walk(m):
2414 2415 if not rev and abs not in repo.dirstate:
2415 2416 continue
2416 2417 if opts.get('fullpath'):
2417 2418 ui.write(repo.wjoin(abs), end)
2418 2419 else:
2419 2420 ui.write(((pats and m.rel(abs)) or abs), end)
2420 2421 ret = 0
2421 2422
2422 2423 return ret
2423 2424
2424 2425 def log(ui, repo, *pats, **opts):
2425 2426 """show revision history of entire repository or files
2426 2427
2427 2428 Print the revision history of the specified files or the entire
2428 2429 project.
2429 2430
2430 2431 File history is shown without following rename or copy history of
2431 2432 files. Use -f/--follow with a filename to follow history across
2432 2433 renames and copies. --follow without a filename will only show
2433 2434 ancestors or descendants of the starting revision. --follow-first
2434 2435 only follows the first parent of merge revisions.
2435 2436
2436 2437 If no revision range is specified, the default is tip:0 unless
2437 2438 --follow is set, in which case the working directory parent is
2438 2439 used as the starting revision. You can specify a revision set for
2439 2440 log, see :hg:`help revsets` for more information.
2440 2441
2441 2442 See :hg:`help dates` for a list of formats valid for -d/--date.
2442 2443
2443 2444 By default this command prints revision number and changeset id,
2444 2445 tags, non-trivial parents, user, date and time, and a summary for
2445 2446 each commit. When the -v/--verbose switch is used, the list of
2446 2447 changed files and full commit message are shown.
2447 2448
2448 NOTE: log -p/--patch may generate unexpected diff output for merge
2449 .. note::
2450 log -p/--patch may generate unexpected diff output for merge
2449 2451 changesets, as it will only compare the merge changeset against
2450 2452 its first parent. Also, only files different from BOTH parents
2451 2453 will appear in files:.
2452 2454
2453 2455 Returns 0 on success.
2454 2456 """
2455 2457
2456 2458 matchfn = cmdutil.match(repo, pats, opts)
2457 2459 limit = cmdutil.loglimit(opts)
2458 2460 count = 0
2459 2461
2460 2462 endrev = None
2461 2463 if opts.get('copies') and opts.get('rev'):
2462 2464 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
2463 2465
2464 2466 df = False
2465 2467 if opts["date"]:
2466 2468 df = util.matchdate(opts["date"])
2467 2469
2468 2470 branches = opts.get('branch', []) + opts.get('only_branch', [])
2469 2471 opts['branch'] = [repo.lookupbranch(b) for b in branches]
2470 2472
2471 2473 displayer = cmdutil.show_changeset(ui, repo, opts, True)
2472 2474 def prep(ctx, fns):
2473 2475 rev = ctx.rev()
2474 2476 parents = [p for p in repo.changelog.parentrevs(rev)
2475 2477 if p != nullrev]
2476 2478 if opts.get('no_merges') and len(parents) == 2:
2477 2479 return
2478 2480 if opts.get('only_merges') and len(parents) != 2:
2479 2481 return
2480 2482 if opts.get('branch') and ctx.branch() not in opts['branch']:
2481 2483 return
2482 2484 if df and not df(ctx.date()[0]):
2483 2485 return
2484 2486 if opts['user'] and not [k for k in opts['user'] if k in ctx.user()]:
2485 2487 return
2486 2488 if opts.get('keyword'):
2487 2489 for k in [kw.lower() for kw in opts['keyword']]:
2488 2490 if (k in ctx.user().lower() or
2489 2491 k in ctx.description().lower() or
2490 2492 k in " ".join(ctx.files()).lower()):
2491 2493 break
2492 2494 else:
2493 2495 return
2494 2496
2495 2497 copies = None
2496 2498 if opts.get('copies') and rev:
2497 2499 copies = []
2498 2500 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2499 2501 for fn in ctx.files():
2500 2502 rename = getrenamed(fn, rev)
2501 2503 if rename:
2502 2504 copies.append((fn, rename[0]))
2503 2505
2504 2506 revmatchfn = None
2505 2507 if opts.get('patch') or opts.get('stat'):
2506 2508 if opts.get('follow') or opts.get('follow_first'):
2507 2509 # note: this might be wrong when following through merges
2508 2510 revmatchfn = cmdutil.match(repo, fns, default='path')
2509 2511 else:
2510 2512 revmatchfn = matchfn
2511 2513
2512 2514 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
2513 2515
2514 2516 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2515 2517 if count == limit:
2516 2518 break
2517 2519 if displayer.flush(ctx.rev()):
2518 2520 count += 1
2519 2521 displayer.close()
2520 2522
2521 2523 def manifest(ui, repo, node=None, rev=None):
2522 2524 """output the current or given revision of the project manifest
2523 2525
2524 2526 Print a list of version controlled files for the given revision.
2525 2527 If no revision is given, the first parent of the working directory
2526 2528 is used, or the null revision if no revision is checked out.
2527 2529
2528 2530 With -v, print file permissions, symlink and executable bits.
2529 2531 With --debug, print file revision hashes.
2530 2532
2531 2533 Returns 0 on success.
2532 2534 """
2533 2535
2534 2536 if rev and node:
2535 2537 raise util.Abort(_("please specify just one revision"))
2536 2538
2537 2539 if not node:
2538 2540 node = rev
2539 2541
2540 2542 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
2541 2543 ctx = repo[node]
2542 2544 for f in ctx:
2543 2545 if ui.debugflag:
2544 2546 ui.write("%40s " % hex(ctx.manifest()[f]))
2545 2547 if ui.verbose:
2546 2548 ui.write(decor[ctx.flags(f)])
2547 2549 ui.write("%s\n" % f)
2548 2550
2549 2551 def merge(ui, repo, node=None, **opts):
2550 2552 """merge working directory with another revision
2551 2553
2552 2554 The current working directory is updated with all changes made in
2553 2555 the requested revision since the last common predecessor revision.
2554 2556
2555 2557 Files that changed between either parent are marked as changed for
2556 2558 the next commit and a commit must be performed before any further
2557 2559 updates to the repository are allowed. The next commit will have
2558 2560 two parents.
2559 2561
2560 2562 If no revision is specified, the working directory's parent is a
2561 2563 head revision, and the current branch contains exactly one other
2562 2564 head, the other head is merged with by default. Otherwise, an
2563 2565 explicit revision with which to merge with must be provided.
2564 2566
2565 2567 To undo an uncommitted merge, use :hg:`update --clean .` which
2566 2568 will check out a clean copy of the original merge parent, losing
2567 2569 all changes.
2568 2570
2569 2571 Returns 0 on success, 1 if there are unresolved files.
2570 2572 """
2571 2573
2572 2574 if opts.get('rev') and node:
2573 2575 raise util.Abort(_("please specify just one revision"))
2574 2576 if not node:
2575 2577 node = opts.get('rev')
2576 2578
2577 2579 if not node:
2578 2580 branch = repo.changectx(None).branch()
2579 2581 bheads = repo.branchheads(branch)
2580 2582 if len(bheads) > 2:
2581 2583 raise util.Abort(_(
2582 2584 'branch \'%s\' has %d heads - '
2583 2585 'please merge with an explicit rev\n'
2584 2586 '(run \'hg heads .\' to see heads)')
2585 2587 % (branch, len(bheads)))
2586 2588
2587 2589 parent = repo.dirstate.parents()[0]
2588 2590 if len(bheads) == 1:
2589 2591 if len(repo.heads()) > 1:
2590 2592 raise util.Abort(_(
2591 2593 'branch \'%s\' has one head - '
2592 2594 'please merge with an explicit rev\n'
2593 2595 '(run \'hg heads\' to see all heads)')
2594 2596 % branch)
2595 2597 msg = _('there is nothing to merge')
2596 2598 if parent != repo.lookup(repo[None].branch()):
2597 2599 msg = _('%s - use "hg update" instead') % msg
2598 2600 raise util.Abort(msg)
2599 2601
2600 2602 if parent not in bheads:
2601 2603 raise util.Abort(_('working dir not at a head rev - '
2602 2604 'use "hg update" or merge with an explicit rev'))
2603 2605 node = parent == bheads[0] and bheads[-1] or bheads[0]
2604 2606
2605 2607 if opts.get('preview'):
2606 2608 # find nodes that are ancestors of p2 but not of p1
2607 2609 p1 = repo.lookup('.')
2608 2610 p2 = repo.lookup(node)
2609 2611 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
2610 2612
2611 2613 displayer = cmdutil.show_changeset(ui, repo, opts)
2612 2614 for node in nodes:
2613 2615 displayer.show(repo[node])
2614 2616 displayer.close()
2615 2617 return 0
2616 2618
2617 2619 return hg.merge(repo, node, force=opts.get('force'))
2618 2620
2619 2621 def outgoing(ui, repo, dest=None, **opts):
2620 2622 """show changesets not found in the destination
2621 2623
2622 2624 Show changesets not found in the specified destination repository
2623 2625 or the default push location. These are the changesets that would
2624 2626 be pushed if a push was requested.
2625 2627
2626 2628 See pull for details of valid destination formats.
2627 2629
2628 2630 Returns 0 if there are outgoing changes, 1 otherwise.
2629 2631 """
2630 2632 ret = hg.outgoing(ui, repo, dest, opts)
2631 2633 if opts.get('subrepos'):
2632 2634 ctx = repo[None]
2633 2635 for subpath in sorted(ctx.substate):
2634 2636 sub = ctx.sub(subpath)
2635 2637 ret = min(ret, sub.outgoing(ui, dest, opts))
2636 2638 return ret
2637 2639
2638 2640 def parents(ui, repo, file_=None, **opts):
2639 2641 """show the parents of the working directory or revision
2640 2642
2641 2643 Print the working directory's parent revisions. If a revision is
2642 2644 given via -r/--rev, the parent of that revision will be printed.
2643 2645 If a file argument is given, the revision in which the file was
2644 2646 last changed (before the working directory revision or the
2645 2647 argument to --rev if given) is printed.
2646 2648
2647 2649 Returns 0 on success.
2648 2650 """
2649 2651 rev = opts.get('rev')
2650 2652 if rev:
2651 2653 ctx = repo[rev]
2652 2654 else:
2653 2655 ctx = repo[None]
2654 2656
2655 2657 if file_:
2656 2658 m = cmdutil.match(repo, (file_,), opts)
2657 2659 if m.anypats() or len(m.files()) != 1:
2658 2660 raise util.Abort(_('can only specify an explicit filename'))
2659 2661 file_ = m.files()[0]
2660 2662 filenodes = []
2661 2663 for cp in ctx.parents():
2662 2664 if not cp:
2663 2665 continue
2664 2666 try:
2665 2667 filenodes.append(cp.filenode(file_))
2666 2668 except error.LookupError:
2667 2669 pass
2668 2670 if not filenodes:
2669 2671 raise util.Abort(_("'%s' not found in manifest!") % file_)
2670 2672 fl = repo.file(file_)
2671 2673 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2672 2674 else:
2673 2675 p = [cp.node() for cp in ctx.parents()]
2674 2676
2675 2677 displayer = cmdutil.show_changeset(ui, repo, opts)
2676 2678 for n in p:
2677 2679 if n != nullid:
2678 2680 displayer.show(repo[n])
2679 2681 displayer.close()
2680 2682
2681 2683 def paths(ui, repo, search=None):
2682 2684 """show aliases for remote repositories
2683 2685
2684 2686 Show definition of symbolic path name NAME. If no name is given,
2685 2687 show definition of all available names.
2686 2688
2687 2689 Path names are defined in the [paths] section of your
2688 2690 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
2689 2691 repository, ``.hg/hgrc`` is used, too.
2690 2692
2691 2693 The path names ``default`` and ``default-push`` have a special
2692 2694 meaning. When performing a push or pull operation, they are used
2693 2695 as fallbacks if no location is specified on the command-line.
2694 2696 When ``default-push`` is set, it will be used for push and
2695 2697 ``default`` will be used for pull; otherwise ``default`` is used
2696 2698 as the fallback for both. When cloning a repository, the clone
2697 2699 source is written as ``default`` in ``.hg/hgrc``. Note that
2698 2700 ``default`` and ``default-push`` apply to all inbound (e.g.
2699 2701 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
2700 2702 :hg:`bundle`) operations.
2701 2703
2702 2704 See :hg:`help urls` for more information.
2703 2705
2704 2706 Returns 0 on success.
2705 2707 """
2706 2708 if search:
2707 2709 for name, path in ui.configitems("paths"):
2708 2710 if name == search:
2709 2711 ui.write("%s\n" % url.hidepassword(path))
2710 2712 return
2711 2713 ui.warn(_("not found!\n"))
2712 2714 return 1
2713 2715 else:
2714 2716 for name, path in ui.configitems("paths"):
2715 2717 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
2716 2718
2717 2719 def postincoming(ui, repo, modheads, optupdate, checkout):
2718 2720 if modheads == 0:
2719 2721 return
2720 2722 if optupdate:
2721 2723 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
2722 2724 return hg.update(repo, checkout)
2723 2725 else:
2724 2726 ui.status(_("not updating, since new heads added\n"))
2725 2727 if modheads > 1:
2726 2728 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2727 2729 else:
2728 2730 ui.status(_("(run 'hg update' to get a working copy)\n"))
2729 2731
2730 2732 def pull(ui, repo, source="default", **opts):
2731 2733 """pull changes from the specified source
2732 2734
2733 2735 Pull changes from a remote repository to a local one.
2734 2736
2735 2737 This finds all changes from the repository at the specified path
2736 2738 or URL and adds them to a local repository (the current one unless
2737 2739 -R is specified). By default, this does not update the copy of the
2738 2740 project in the working directory.
2739 2741
2740 2742 Use :hg:`incoming` if you want to see what would have been added
2741 2743 by a pull at the time you issued this command. If you then decide
2742 2744 to add those changes to the repository, you should use :hg:`pull
2743 2745 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
2744 2746
2745 2747 If SOURCE is omitted, the 'default' path will be used.
2746 2748 See :hg:`help urls` for more information.
2747 2749
2748 2750 Returns 0 on success, 1 if an update had unresolved files.
2749 2751 """
2750 2752 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
2751 2753 other = hg.repository(hg.remoteui(repo, opts), source)
2752 2754 ui.status(_('pulling from %s\n') % url.hidepassword(source))
2753 2755 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2754 2756 if revs:
2755 2757 try:
2756 2758 revs = [other.lookup(rev) for rev in revs]
2757 2759 except error.CapabilityError:
2758 2760 err = _("other repository doesn't support revision lookup, "
2759 2761 "so a rev cannot be specified.")
2760 2762 raise util.Abort(err)
2761 2763
2762 2764 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
2763 2765 if checkout:
2764 2766 checkout = str(repo.changelog.rev(other.lookup(checkout)))
2765 2767 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
2766 2768
2767 2769 def push(ui, repo, dest=None, **opts):
2768 2770 """push changes to the specified destination
2769 2771
2770 2772 Push changesets from the local repository to the specified
2771 2773 destination.
2772 2774
2773 2775 This operation is symmetrical to pull: it is identical to a pull
2774 2776 in the destination repository from the current one.
2775 2777
2776 2778 By default, push will not allow creation of new heads at the
2777 2779 destination, since multiple heads would make it unclear which head
2778 2780 to use. In this situation, it is recommended to pull and merge
2779 2781 before pushing.
2780 2782
2781 2783 Use --new-branch if you want to allow push to create a new named
2782 2784 branch that is not present at the destination. This allows you to
2783 2785 only create a new branch without forcing other changes.
2784 2786
2785 2787 Use -f/--force to override the default behavior and push all
2786 2788 changesets on all branches.
2787 2789
2788 2790 If -r/--rev is used, the specified revision and all its ancestors
2789 2791 will be pushed to the remote repository.
2790 2792
2791 2793 Please see :hg:`help urls` for important details about ``ssh://``
2792 2794 URLs. If DESTINATION is omitted, a default path will be used.
2793 2795
2794 2796 Returns 0 if push was successful, 1 if nothing to push.
2795 2797 """
2796 2798 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2797 2799 dest, branches = hg.parseurl(dest, opts.get('branch'))
2798 2800 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
2799 2801 other = hg.repository(hg.remoteui(repo, opts), dest)
2800 2802 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
2801 2803 if revs:
2802 2804 revs = [repo.lookup(rev) for rev in revs]
2803 2805
2804 2806 # push subrepos depth-first for coherent ordering
2805 2807 c = repo['']
2806 2808 subs = c.substate # only repos that are committed
2807 2809 for s in sorted(subs):
2808 2810 if not c.sub(s).push(opts.get('force')):
2809 2811 return False
2810 2812
2811 2813 r = repo.push(other, opts.get('force'), revs=revs,
2812 2814 newbranch=opts.get('new_branch'))
2813 2815 return r == 0
2814 2816
2815 2817 def recover(ui, repo):
2816 2818 """roll back an interrupted transaction
2817 2819
2818 2820 Recover from an interrupted commit or pull.
2819 2821
2820 2822 This command tries to fix the repository status after an
2821 2823 interrupted operation. It should only be necessary when Mercurial
2822 2824 suggests it.
2823 2825
2824 2826 Returns 0 if successful, 1 if nothing to recover or verify fails.
2825 2827 """
2826 2828 if repo.recover():
2827 2829 return hg.verify(repo)
2828 2830 return 1
2829 2831
2830 2832 def remove(ui, repo, *pats, **opts):
2831 2833 """remove the specified files on the next commit
2832 2834
2833 2835 Schedule the indicated files for removal from the repository.
2834 2836
2835 2837 This only removes files from the current branch, not from the
2836 2838 entire project history. -A/--after can be used to remove only
2837 2839 files that have already been deleted, -f/--force can be used to
2838 2840 force deletion, and -Af can be used to remove files from the next
2839 2841 revision without deleting them from the working directory.
2840 2842
2841 2843 The following table details the behavior of remove for different
2842 2844 file states (columns) and option combinations (rows). The file
2843 2845 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
2844 2846 reported by :hg:`status`). The actions are Warn, Remove (from
2845 2847 branch) and Delete (from disk)::
2846 2848
2847 2849 A C M !
2848 2850 none W RD W R
2849 2851 -f R RD RD R
2850 2852 -A W W W R
2851 2853 -Af R R R R
2852 2854
2853 2855 This command schedules the files to be removed at the next commit.
2854 2856 To undo a remove before that, see :hg:`revert`.
2855 2857
2856 2858 Returns 0 on success, 1 if any warnings encountered.
2857 2859 """
2858 2860
2859 2861 ret = 0
2860 2862 after, force = opts.get('after'), opts.get('force')
2861 2863 if not pats and not after:
2862 2864 raise util.Abort(_('no files specified'))
2863 2865
2864 2866 m = cmdutil.match(repo, pats, opts)
2865 2867 s = repo.status(match=m, clean=True)
2866 2868 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2867 2869
2868 2870 for f in m.files():
2869 2871 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2870 2872 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
2871 2873 ret = 1
2872 2874
2873 2875 if force:
2874 2876 remove, forget = modified + deleted + clean, added
2875 2877 elif after:
2876 2878 remove, forget = deleted, []
2877 2879 for f in modified + added + clean:
2878 2880 ui.warn(_('not removing %s: file still exists (use -f'
2879 2881 ' to force removal)\n') % m.rel(f))
2880 2882 ret = 1
2881 2883 else:
2882 2884 remove, forget = deleted + clean, []
2883 2885 for f in modified:
2884 2886 ui.warn(_('not removing %s: file is modified (use -f'
2885 2887 ' to force removal)\n') % m.rel(f))
2886 2888 ret = 1
2887 2889 for f in added:
2888 2890 ui.warn(_('not removing %s: file has been marked for add (use -f'
2889 2891 ' to force removal)\n') % m.rel(f))
2890 2892 ret = 1
2891 2893
2892 2894 for f in sorted(remove + forget):
2893 2895 if ui.verbose or not m.exact(f):
2894 2896 ui.status(_('removing %s\n') % m.rel(f))
2895 2897
2896 2898 repo[None].forget(forget)
2897 2899 repo[None].remove(remove, unlink=not after)
2898 2900 return ret
2899 2901
2900 2902 def rename(ui, repo, *pats, **opts):
2901 2903 """rename files; equivalent of copy + remove
2902 2904
2903 2905 Mark dest as copies of sources; mark sources for deletion. If dest
2904 2906 is a directory, copies are put in that directory. If dest is a
2905 2907 file, there can only be one source.
2906 2908
2907 2909 By default, this command copies the contents of files as they
2908 2910 exist in the working directory. If invoked with -A/--after, the
2909 2911 operation is recorded, but no copying is performed.
2910 2912
2911 2913 This command takes effect at the next commit. To undo a rename
2912 2914 before that, see :hg:`revert`.
2913 2915
2914 2916 Returns 0 on success, 1 if errors are encountered.
2915 2917 """
2916 2918 wlock = repo.wlock(False)
2917 2919 try:
2918 2920 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2919 2921 finally:
2920 2922 wlock.release()
2921 2923
2922 2924 def resolve(ui, repo, *pats, **opts):
2923 2925 """redo merges or set/view the merge status of files
2924 2926
2925 2927 Merges with unresolved conflicts are often the result of
2926 2928 non-interactive merging using the ``internal:merge`` configuration
2927 2929 setting, or a command-line merge tool like ``diff3``. The resolve
2928 2930 command is used to manage the files involved in a merge, after
2929 2931 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
2930 2932 working directory must have two parents).
2931 2933
2932 2934 The resolve command can be used in the following ways:
2933 2935
2934 2936 - :hg:`resolve FILE...`: attempt to re-merge the specified files,
2935 2937 discarding any previous merge attempts. Re-merging is not
2936 2938 performed for files already marked as resolved. Use ``--all/-a``
2937 2939 to selects all unresolved files.
2938 2940
2939 2941 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
2940 2942 (e.g. after having manually fixed-up the files). The default is
2941 2943 to mark all unresolved files.
2942 2944
2943 2945 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
2944 2946 default is to mark all resolved files.
2945 2947
2946 2948 - :hg:`resolve -l`: list files which had or still have conflicts.
2947 2949 In the printed list, ``U`` = unresolved and ``R`` = resolved.
2948 2950
2949 2951 Note that Mercurial will not let you commit files with unresolved
2950 2952 merge conflicts. You must use :hg:`resolve -m ...` before you can
2951 2953 commit after a conflicting merge.
2952 2954
2953 2955 Returns 0 on success, 1 if any files fail a resolve attempt.
2954 2956 """
2955 2957
2956 2958 all, mark, unmark, show, nostatus = \
2957 2959 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
2958 2960
2959 2961 if (show and (mark or unmark)) or (mark and unmark):
2960 2962 raise util.Abort(_("too many options specified"))
2961 2963 if pats and all:
2962 2964 raise util.Abort(_("can't specify --all and patterns"))
2963 2965 if not (all or pats or show or mark or unmark):
2964 2966 raise util.Abort(_('no files or directories specified; '
2965 2967 'use --all to remerge all files'))
2966 2968
2967 2969 ms = mergemod.mergestate(repo)
2968 2970 m = cmdutil.match(repo, pats, opts)
2969 2971 ret = 0
2970 2972
2971 2973 for f in ms:
2972 2974 if m(f):
2973 2975 if show:
2974 2976 if nostatus:
2975 2977 ui.write("%s\n" % f)
2976 2978 else:
2977 2979 ui.write("%s %s\n" % (ms[f].upper(), f),
2978 2980 label='resolve.' +
2979 2981 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
2980 2982 elif mark:
2981 2983 ms.mark(f, "r")
2982 2984 elif unmark:
2983 2985 ms.mark(f, "u")
2984 2986 else:
2985 2987 wctx = repo[None]
2986 2988 mctx = wctx.parents()[-1]
2987 2989
2988 2990 # backup pre-resolve (merge uses .orig for its own purposes)
2989 2991 a = repo.wjoin(f)
2990 2992 util.copyfile(a, a + ".resolve")
2991 2993
2992 2994 # resolve file
2993 2995 if ms.resolve(f, wctx, mctx):
2994 2996 ret = 1
2995 2997
2996 2998 # replace filemerge's .orig file with our resolve file
2997 2999 util.rename(a + ".resolve", a + ".orig")
2998 3000
2999 3001 ms.commit()
3000 3002 return ret
3001 3003
3002 3004 def revert(ui, repo, *pats, **opts):
3003 3005 """restore individual files or directories to an earlier state
3004 3006
3005 NOTE: This command is most likely not what you are looking for. revert
3006 will partially overwrite content in the working directory without changing
3007 the working directory parents. Use :hg:`update -r rev` to check out earlier
3008 revisions, or :hg:`update --clean .` to undo a merge which has added
3009 another parent.
3007 .. note::
3008 This command is most likely not what you are looking for.
3009 revert will partially overwrite content in the working
3010 directory without changing the working directory parents. Use
3011 :hg:`update -r rev` to check out earlier revisions, or
3012 :hg:`update --clean .` to undo a merge which has added another
3013 parent.
3010 3014
3011 3015 With no revision specified, revert the named files or directories
3012 3016 to the contents they had in the parent of the working directory.
3013 3017 This restores the contents of the affected files to an unmodified
3014 3018 state and unschedules adds, removes, copies, and renames. If the
3015 3019 working directory has two parents, you must explicitly specify a
3016 3020 revision.
3017 3021
3018 3022 Using the -r/--rev option, revert the given files or directories
3019 3023 to their contents as of a specific revision. This can be helpful
3020 3024 to "roll back" some or all of an earlier change. See :hg:`help
3021 3025 dates` for a list of formats valid for -d/--date.
3022 3026
3023 3027 Revert modifies the working directory. It does not commit any
3024 3028 changes, or change the parent of the working directory. If you
3025 3029 revert to a revision other than the parent of the working
3026 3030 directory, the reverted files will thus appear modified
3027 3031 afterwards.
3028 3032
3029 3033 If a file has been deleted, it is restored. If the executable mode
3030 3034 of a file was changed, it is reset.
3031 3035
3032 3036 If names are given, all files matching the names are reverted.
3033 3037 If no arguments are given, no files are reverted.
3034 3038
3035 3039 Modified files are saved with a .orig suffix before reverting.
3036 3040 To disable these backups, use --no-backup.
3037 3041
3038 3042 Returns 0 on success.
3039 3043 """
3040 3044
3041 3045 if opts.get("date"):
3042 3046 if opts.get("rev"):
3043 3047 raise util.Abort(_("you can't specify a revision and a date"))
3044 3048 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
3045 3049
3046 3050 if not pats and not opts.get('all'):
3047 3051 raise util.Abort(_('no files or directories specified; '
3048 3052 'use --all to revert the whole repo'))
3049 3053
3050 3054 parent, p2 = repo.dirstate.parents()
3051 3055 if not opts.get('rev') and p2 != nullid:
3052 3056 raise util.Abort(_('uncommitted merge - please provide a '
3053 3057 'specific revision'))
3054 3058 ctx = repo[opts.get('rev')]
3055 3059 node = ctx.node()
3056 3060 mf = ctx.manifest()
3057 3061 if node == parent:
3058 3062 pmf = mf
3059 3063 else:
3060 3064 pmf = None
3061 3065
3062 3066 # need all matching names in dirstate and manifest of target rev,
3063 3067 # so have to walk both. do not print errors if files exist in one
3064 3068 # but not other.
3065 3069
3066 3070 names = {}
3067 3071
3068 3072 wlock = repo.wlock()
3069 3073 try:
3070 3074 # walk dirstate.
3071 3075
3072 3076 m = cmdutil.match(repo, pats, opts)
3073 3077 m.bad = lambda x, y: False
3074 3078 for abs in repo.walk(m):
3075 3079 names[abs] = m.rel(abs), m.exact(abs)
3076 3080
3077 3081 # walk target manifest.
3078 3082
3079 3083 def badfn(path, msg):
3080 3084 if path in names:
3081 3085 return
3082 3086 path_ = path + '/'
3083 3087 for f in names:
3084 3088 if f.startswith(path_):
3085 3089 return
3086 3090 ui.warn("%s: %s\n" % (m.rel(path), msg))
3087 3091
3088 3092 m = cmdutil.match(repo, pats, opts)
3089 3093 m.bad = badfn
3090 3094 for abs in repo[node].walk(m):
3091 3095 if abs not in names:
3092 3096 names[abs] = m.rel(abs), m.exact(abs)
3093 3097
3094 3098 m = cmdutil.matchfiles(repo, names)
3095 3099 changes = repo.status(match=m)[:4]
3096 3100 modified, added, removed, deleted = map(set, changes)
3097 3101
3098 3102 # if f is a rename, also revert the source
3099 3103 cwd = repo.getcwd()
3100 3104 for f in added:
3101 3105 src = repo.dirstate.copied(f)
3102 3106 if src and src not in names and repo.dirstate[src] == 'r':
3103 3107 removed.add(src)
3104 3108 names[src] = (repo.pathto(src, cwd), True)
3105 3109
3106 3110 def removeforget(abs):
3107 3111 if repo.dirstate[abs] == 'a':
3108 3112 return _('forgetting %s\n')
3109 3113 return _('removing %s\n')
3110 3114
3111 3115 revert = ([], _('reverting %s\n'))
3112 3116 add = ([], _('adding %s\n'))
3113 3117 remove = ([], removeforget)
3114 3118 undelete = ([], _('undeleting %s\n'))
3115 3119
3116 3120 disptable = (
3117 3121 # dispatch table:
3118 3122 # file state
3119 3123 # action if in target manifest
3120 3124 # action if not in target manifest
3121 3125 # make backup if in target manifest
3122 3126 # make backup if not in target manifest
3123 3127 (modified, revert, remove, True, True),
3124 3128 (added, revert, remove, True, False),
3125 3129 (removed, undelete, None, False, False),
3126 3130 (deleted, revert, remove, False, False),
3127 3131 )
3128 3132
3129 3133 for abs, (rel, exact) in sorted(names.items()):
3130 3134 mfentry = mf.get(abs)
3131 3135 target = repo.wjoin(abs)
3132 3136 def handle(xlist, dobackup):
3133 3137 xlist[0].append(abs)
3134 3138 if (dobackup and not opts.get('no_backup') and
3135 3139 os.path.lexists(target)):
3136 3140 bakname = "%s.orig" % rel
3137 3141 ui.note(_('saving current version of %s as %s\n') %
3138 3142 (rel, bakname))
3139 3143 if not opts.get('dry_run'):
3140 3144 util.rename(target, bakname)
3141 3145 if ui.verbose or not exact:
3142 3146 msg = xlist[1]
3143 3147 if not isinstance(msg, basestring):
3144 3148 msg = msg(abs)
3145 3149 ui.status(msg % rel)
3146 3150 for table, hitlist, misslist, backuphit, backupmiss in disptable:
3147 3151 if abs not in table:
3148 3152 continue
3149 3153 # file has changed in dirstate
3150 3154 if mfentry:
3151 3155 handle(hitlist, backuphit)
3152 3156 elif misslist is not None:
3153 3157 handle(misslist, backupmiss)
3154 3158 break
3155 3159 else:
3156 3160 if abs not in repo.dirstate:
3157 3161 if mfentry:
3158 3162 handle(add, True)
3159 3163 elif exact:
3160 3164 ui.warn(_('file not managed: %s\n') % rel)
3161 3165 continue
3162 3166 # file has not changed in dirstate
3163 3167 if node == parent:
3164 3168 if exact:
3165 3169 ui.warn(_('no changes needed to %s\n') % rel)
3166 3170 continue
3167 3171 if pmf is None:
3168 3172 # only need parent manifest in this unlikely case,
3169 3173 # so do not read by default
3170 3174 pmf = repo[parent].manifest()
3171 3175 if abs in pmf:
3172 3176 if mfentry:
3173 3177 # if version of file is same in parent and target
3174 3178 # manifests, do nothing
3175 3179 if (pmf[abs] != mfentry or
3176 3180 pmf.flags(abs) != mf.flags(abs)):
3177 3181 handle(revert, False)
3178 3182 else:
3179 3183 handle(remove, False)
3180 3184
3181 3185 if not opts.get('dry_run'):
3182 3186 def checkout(f):
3183 3187 fc = ctx[f]
3184 3188 repo.wwrite(f, fc.data(), fc.flags())
3185 3189
3186 3190 audit_path = util.path_auditor(repo.root)
3187 3191 for f in remove[0]:
3188 3192 if repo.dirstate[f] == 'a':
3189 3193 repo.dirstate.forget(f)
3190 3194 continue
3191 3195 audit_path(f)
3192 3196 try:
3193 3197 util.unlink(repo.wjoin(f))
3194 3198 except OSError:
3195 3199 pass
3196 3200 repo.dirstate.remove(f)
3197 3201
3198 3202 normal = None
3199 3203 if node == parent:
3200 3204 # We're reverting to our parent. If possible, we'd like status
3201 3205 # to report the file as clean. We have to use normallookup for
3202 3206 # merges to avoid losing information about merged/dirty files.
3203 3207 if p2 != nullid:
3204 3208 normal = repo.dirstate.normallookup
3205 3209 else:
3206 3210 normal = repo.dirstate.normal
3207 3211 for f in revert[0]:
3208 3212 checkout(f)
3209 3213 if normal:
3210 3214 normal(f)
3211 3215
3212 3216 for f in add[0]:
3213 3217 checkout(f)
3214 3218 repo.dirstate.add(f)
3215 3219
3216 3220 normal = repo.dirstate.normallookup
3217 3221 if node == parent and p2 == nullid:
3218 3222 normal = repo.dirstate.normal
3219 3223 for f in undelete[0]:
3220 3224 checkout(f)
3221 3225 normal(f)
3222 3226
3223 3227 finally:
3224 3228 wlock.release()
3225 3229
3226 3230 def rollback(ui, repo, **opts):
3227 3231 """roll back the last transaction (dangerous)
3228 3232
3229 3233 This command should be used with care. There is only one level of
3230 3234 rollback, and there is no way to undo a rollback. It will also
3231 3235 restore the dirstate at the time of the last transaction, losing
3232 3236 any dirstate changes since that time. This command does not alter
3233 3237 the working directory.
3234 3238
3235 3239 Transactions are used to encapsulate the effects of all commands
3236 3240 that create new changesets or propagate existing changesets into a
3237 3241 repository. For example, the following commands are transactional,
3238 3242 and their effects can be rolled back:
3239 3243
3240 3244 - commit
3241 3245 - import
3242 3246 - pull
3243 3247 - push (with this repository as the destination)
3244 3248 - unbundle
3245 3249
3246 3250 This command is not intended for use on public repositories. Once
3247 3251 changes are visible for pull by other users, rolling a transaction
3248 3252 back locally is ineffective (someone else may already have pulled
3249 3253 the changes). Furthermore, a race is possible with readers of the
3250 3254 repository; for example an in-progress pull from the repository
3251 3255 may fail if a rollback is performed.
3252 3256
3253 3257 Returns 0 on success, 1 if no rollback data is available.
3254 3258 """
3255 3259 return repo.rollback(opts.get('dry_run'))
3256 3260
3257 3261 def root(ui, repo):
3258 3262 """print the root (top) of the current working directory
3259 3263
3260 3264 Print the root directory of the current repository.
3261 3265
3262 3266 Returns 0 on success.
3263 3267 """
3264 3268 ui.write(repo.root + "\n")
3265 3269
3266 3270 def serve(ui, repo, **opts):
3267 3271 """start stand-alone webserver
3268 3272
3269 3273 Start a local HTTP repository browser and pull server. You can use
3270 3274 this for ad-hoc sharing and browing of repositories. It is
3271 3275 recommended to use a real web server to serve a repository for
3272 3276 longer periods of time.
3273 3277
3274 3278 Please note that the server does not implement access control.
3275 3279 This means that, by default, anybody can read from the server and
3276 3280 nobody can write to it by default. Set the ``web.allow_push``
3277 3281 option to ``*`` to allow everybody to push to the server. You
3278 3282 should use a real web server if you need to authenticate users.
3279 3283
3280 3284 By default, the server logs accesses to stdout and errors to
3281 3285 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
3282 3286 files.
3283 3287
3284 3288 To have the server choose a free port number to listen on, specify
3285 3289 a port number of 0; in this case, the server will print the port
3286 3290 number it uses.
3287 3291
3288 3292 Returns 0 on success.
3289 3293 """
3290 3294
3291 3295 if opts["stdio"]:
3292 3296 if repo is None:
3293 3297 raise error.RepoError(_("There is no Mercurial repository here"
3294 3298 " (.hg not found)"))
3295 3299 s = sshserver.sshserver(ui, repo)
3296 3300 s.serve_forever()
3297 3301
3298 3302 # this way we can check if something was given in the command-line
3299 3303 if opts.get('port'):
3300 3304 opts['port'] = util.getport(opts.get('port'))
3301 3305
3302 3306 baseui = repo and repo.baseui or ui
3303 3307 optlist = ("name templates style address port prefix ipv6"
3304 3308 " accesslog errorlog certificate encoding")
3305 3309 for o in optlist.split():
3306 3310 val = opts.get(o, '')
3307 3311 if val in (None, ''): # should check against default options instead
3308 3312 continue
3309 3313 baseui.setconfig("web", o, val)
3310 3314 if repo and repo.ui != baseui:
3311 3315 repo.ui.setconfig("web", o, val)
3312 3316
3313 3317 o = opts.get('web_conf') or opts.get('webdir_conf')
3314 3318 if not o:
3315 3319 if not repo:
3316 3320 raise error.RepoError(_("There is no Mercurial repository"
3317 3321 " here (.hg not found)"))
3318 3322 o = repo.root
3319 3323
3320 3324 app = hgweb.hgweb(o, baseui=ui)
3321 3325
3322 3326 class service(object):
3323 3327 def init(self):
3324 3328 util.set_signal_handler()
3325 3329 self.httpd = hgweb.server.create_server(ui, app)
3326 3330
3327 3331 if opts['port'] and not ui.verbose:
3328 3332 return
3329 3333
3330 3334 if self.httpd.prefix:
3331 3335 prefix = self.httpd.prefix.strip('/') + '/'
3332 3336 else:
3333 3337 prefix = ''
3334 3338
3335 3339 port = ':%d' % self.httpd.port
3336 3340 if port == ':80':
3337 3341 port = ''
3338 3342
3339 3343 bindaddr = self.httpd.addr
3340 3344 if bindaddr == '0.0.0.0':
3341 3345 bindaddr = '*'
3342 3346 elif ':' in bindaddr: # IPv6
3343 3347 bindaddr = '[%s]' % bindaddr
3344 3348
3345 3349 fqaddr = self.httpd.fqaddr
3346 3350 if ':' in fqaddr:
3347 3351 fqaddr = '[%s]' % fqaddr
3348 3352 if opts['port']:
3349 3353 write = ui.status
3350 3354 else:
3351 3355 write = ui.write
3352 3356 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
3353 3357 (fqaddr, port, prefix, bindaddr, self.httpd.port))
3354 3358
3355 3359 def run(self):
3356 3360 self.httpd.serve_forever()
3357 3361
3358 3362 service = service()
3359 3363
3360 3364 cmdutil.service(opts, initfn=service.init, runfn=service.run)
3361 3365
3362 3366 def status(ui, repo, *pats, **opts):
3363 3367 """show changed files in the working directory
3364 3368
3365 3369 Show status of files in the repository. If names are given, only
3366 3370 files that match are shown. Files that are clean or ignored or
3367 3371 the source of a copy/move operation, are not listed unless
3368 3372 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
3369 3373 Unless options described with "show only ..." are given, the
3370 3374 options -mardu are used.
3371 3375
3372 3376 Option -q/--quiet hides untracked (unknown and ignored) files
3373 3377 unless explicitly requested with -u/--unknown or -i/--ignored.
3374 3378
3375 NOTE: status may appear to disagree with diff if permissions have
3376 changed or a merge has occurred. The standard diff format does not
3377 report permission changes and diff only reports changes relative
3378 to one merge parent.
3379 .. note::
3380 status may appear to disagree with diff if permissions have
3381 changed or a merge has occurred. The standard diff format does
3382 not report permission changes and diff only reports changes
3383 relative to one merge parent.
3379 3384
3380 3385 If one revision is given, it is used as the base revision.
3381 3386 If two revisions are given, the differences between them are
3382 3387 shown. The --change option can also be used as a shortcut to list
3383 3388 the changed files of a revision from its first parent.
3384 3389
3385 3390 The codes used to show the status of files are::
3386 3391
3387 3392 M = modified
3388 3393 A = added
3389 3394 R = removed
3390 3395 C = clean
3391 3396 ! = missing (deleted by non-hg command, but still tracked)
3392 3397 ? = not tracked
3393 3398 I = ignored
3394 3399 = origin of the previous file listed as A (added)
3395 3400
3396 3401 Returns 0 on success.
3397 3402 """
3398 3403
3399 3404 revs = opts.get('rev')
3400 3405 change = opts.get('change')
3401 3406
3402 3407 if revs and change:
3403 3408 msg = _('cannot specify --rev and --change at the same time')
3404 3409 raise util.Abort(msg)
3405 3410 elif change:
3406 3411 node2 = repo.lookup(change)
3407 3412 node1 = repo[node2].parents()[0].node()
3408 3413 else:
3409 3414 node1, node2 = cmdutil.revpair(repo, revs)
3410 3415
3411 3416 cwd = (pats and repo.getcwd()) or ''
3412 3417 end = opts.get('print0') and '\0' or '\n'
3413 3418 copy = {}
3414 3419 states = 'modified added removed deleted unknown ignored clean'.split()
3415 3420 show = [k for k in states if opts.get(k)]
3416 3421 if opts.get('all'):
3417 3422 show += ui.quiet and (states[:4] + ['clean']) or states
3418 3423 if not show:
3419 3424 show = ui.quiet and states[:4] or states[:5]
3420 3425
3421 3426 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
3422 3427 'ignored' in show, 'clean' in show, 'unknown' in show,
3423 3428 opts.get('subrepos'))
3424 3429 changestates = zip(states, 'MAR!?IC', stat)
3425 3430
3426 3431 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
3427 3432 ctxn = repo[nullid]
3428 3433 ctx1 = repo[node1]
3429 3434 ctx2 = repo[node2]
3430 3435 added = stat[1]
3431 3436 if node2 is None:
3432 3437 added = stat[0] + stat[1] # merged?
3433 3438
3434 3439 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
3435 3440 if k in added:
3436 3441 copy[k] = v
3437 3442 elif v in added:
3438 3443 copy[v] = k
3439 3444
3440 3445 for state, char, files in changestates:
3441 3446 if state in show:
3442 3447 format = "%s %%s%s" % (char, end)
3443 3448 if opts.get('no_status'):
3444 3449 format = "%%s%s" % end
3445 3450
3446 3451 for f in files:
3447 3452 ui.write(format % repo.pathto(f, cwd),
3448 3453 label='status.' + state)
3449 3454 if f in copy:
3450 3455 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
3451 3456 label='status.copied')
3452 3457
3453 3458 def summary(ui, repo, **opts):
3454 3459 """summarize working directory state
3455 3460
3456 3461 This generates a brief summary of the working directory state,
3457 3462 including parents, branch, commit status, and available updates.
3458 3463
3459 3464 With the --remote option, this will check the default paths for
3460 3465 incoming and outgoing changes. This can be time-consuming.
3461 3466
3462 3467 Returns 0 on success.
3463 3468 """
3464 3469
3465 3470 ctx = repo[None]
3466 3471 parents = ctx.parents()
3467 3472 pnode = parents[0].node()
3468 3473
3469 3474 for p in parents:
3470 3475 # label with log.changeset (instead of log.parent) since this
3471 3476 # shows a working directory parent *changeset*:
3472 3477 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
3473 3478 label='log.changeset')
3474 3479 ui.write(' '.join(p.tags()), label='log.tag')
3475 3480 if p.rev() == -1:
3476 3481 if not len(repo):
3477 3482 ui.write(_(' (empty repository)'))
3478 3483 else:
3479 3484 ui.write(_(' (no revision checked out)'))
3480 3485 ui.write('\n')
3481 3486 if p.description():
3482 3487 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
3483 3488 label='log.summary')
3484 3489
3485 3490 branch = ctx.branch()
3486 3491 bheads = repo.branchheads(branch)
3487 3492 m = _('branch: %s\n') % branch
3488 3493 if branch != 'default':
3489 3494 ui.write(m, label='log.branch')
3490 3495 else:
3491 3496 ui.status(m, label='log.branch')
3492 3497
3493 3498 st = list(repo.status(unknown=True))[:6]
3494 3499
3495 3500 c = repo.dirstate.copies()
3496 3501 copied, renamed = [], []
3497 3502 for d, s in c.iteritems():
3498 3503 if s in st[2]:
3499 3504 st[2].remove(s)
3500 3505 renamed.append(d)
3501 3506 else:
3502 3507 copied.append(d)
3503 3508 if d in st[1]:
3504 3509 st[1].remove(d)
3505 3510 st.insert(3, renamed)
3506 3511 st.insert(4, copied)
3507 3512
3508 3513 ms = mergemod.mergestate(repo)
3509 3514 st.append([f for f in ms if ms[f] == 'u'])
3510 3515
3511 3516 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
3512 3517 st.append(subs)
3513 3518
3514 3519 labels = [ui.label(_('%d modified'), 'status.modified'),
3515 3520 ui.label(_('%d added'), 'status.added'),
3516 3521 ui.label(_('%d removed'), 'status.removed'),
3517 3522 ui.label(_('%d renamed'), 'status.copied'),
3518 3523 ui.label(_('%d copied'), 'status.copied'),
3519 3524 ui.label(_('%d deleted'), 'status.deleted'),
3520 3525 ui.label(_('%d unknown'), 'status.unknown'),
3521 3526 ui.label(_('%d ignored'), 'status.ignored'),
3522 3527 ui.label(_('%d unresolved'), 'resolve.unresolved'),
3523 3528 ui.label(_('%d subrepos'), 'status.modified')]
3524 3529 t = []
3525 3530 for s, l in zip(st, labels):
3526 3531 if s:
3527 3532 t.append(l % len(s))
3528 3533
3529 3534 t = ', '.join(t)
3530 3535 cleanworkdir = False
3531 3536
3532 3537 if len(parents) > 1:
3533 3538 t += _(' (merge)')
3534 3539 elif branch != parents[0].branch():
3535 3540 t += _(' (new branch)')
3536 3541 elif (parents[0].extra().get('close') and
3537 3542 pnode in repo.branchheads(branch, closed=True)):
3538 3543 t += _(' (head closed)')
3539 3544 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
3540 3545 t += _(' (clean)')
3541 3546 cleanworkdir = True
3542 3547 elif pnode not in bheads:
3543 3548 t += _(' (new branch head)')
3544 3549
3545 3550 if cleanworkdir:
3546 3551 ui.status(_('commit: %s\n') % t.strip())
3547 3552 else:
3548 3553 ui.write(_('commit: %s\n') % t.strip())
3549 3554
3550 3555 # all ancestors of branch heads - all ancestors of parent = new csets
3551 3556 new = [0] * len(repo)
3552 3557 cl = repo.changelog
3553 3558 for a in [cl.rev(n) for n in bheads]:
3554 3559 new[a] = 1
3555 3560 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
3556 3561 new[a] = 1
3557 3562 for a in [p.rev() for p in parents]:
3558 3563 if a >= 0:
3559 3564 new[a] = 0
3560 3565 for a in cl.ancestors(*[p.rev() for p in parents]):
3561 3566 new[a] = 0
3562 3567 new = sum(new)
3563 3568
3564 3569 if new == 0:
3565 3570 ui.status(_('update: (current)\n'))
3566 3571 elif pnode not in bheads:
3567 3572 ui.write(_('update: %d new changesets (update)\n') % new)
3568 3573 else:
3569 3574 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
3570 3575 (new, len(bheads)))
3571 3576
3572 3577 if opts.get('remote'):
3573 3578 t = []
3574 3579 source, branches = hg.parseurl(ui.expandpath('default'))
3575 3580 other = hg.repository(hg.remoteui(repo, {}), source)
3576 3581 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3577 3582 ui.debug('comparing with %s\n' % url.hidepassword(source))
3578 3583 repo.ui.pushbuffer()
3579 3584 common, incoming, rheads = discovery.findcommonincoming(repo, other)
3580 3585 repo.ui.popbuffer()
3581 3586 if incoming:
3582 3587 t.append(_('1 or more incoming'))
3583 3588
3584 3589 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
3585 3590 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3586 3591 other = hg.repository(hg.remoteui(repo, {}), dest)
3587 3592 ui.debug('comparing with %s\n' % url.hidepassword(dest))
3588 3593 repo.ui.pushbuffer()
3589 3594 o = discovery.findoutgoing(repo, other)
3590 3595 repo.ui.popbuffer()
3591 3596 o = repo.changelog.nodesbetween(o, None)[0]
3592 3597 if o:
3593 3598 t.append(_('%d outgoing') % len(o))
3594 3599
3595 3600 if t:
3596 3601 ui.write(_('remote: %s\n') % (', '.join(t)))
3597 3602 else:
3598 3603 ui.status(_('remote: (synced)\n'))
3599 3604
3600 3605 def tag(ui, repo, name1, *names, **opts):
3601 3606 """add one or more tags for the current or given revision
3602 3607
3603 3608 Name a particular revision using <name>.
3604 3609
3605 3610 Tags are used to name particular revisions of the repository and are
3606 3611 very useful to compare different revisions, to go back to significant
3607 3612 earlier versions or to mark branch points as releases, etc.
3608 3613
3609 3614 If no revision is given, the parent of the working directory is
3610 3615 used, or tip if no revision is checked out.
3611 3616
3612 3617 To facilitate version control, distribution, and merging of tags,
3613 3618 they are stored as a file named ".hgtags" which is managed
3614 3619 similarly to other project files and can be hand-edited if
3615 3620 necessary. The file '.hg/localtags' is used for local tags (not
3616 3621 shared among repositories).
3617 3622
3618 3623 See :hg:`help dates` for a list of formats valid for -d/--date.
3619 3624
3620 3625 Since tag names have priority over branch names during revision
3621 3626 lookup, using an existing branch name as a tag name is discouraged.
3622 3627
3623 3628 Returns 0 on success.
3624 3629 """
3625 3630
3626 3631 rev_ = "."
3627 3632 names = [t.strip() for t in (name1,) + names]
3628 3633 if len(names) != len(set(names)):
3629 3634 raise util.Abort(_('tag names must be unique'))
3630 3635 for n in names:
3631 3636 if n in ['tip', '.', 'null']:
3632 3637 raise util.Abort(_('the name \'%s\' is reserved') % n)
3633 3638 if not n:
3634 3639 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
3635 3640 if opts.get('rev') and opts.get('remove'):
3636 3641 raise util.Abort(_("--rev and --remove are incompatible"))
3637 3642 if opts.get('rev'):
3638 3643 rev_ = opts['rev']
3639 3644 message = opts.get('message')
3640 3645 if opts.get('remove'):
3641 3646 expectedtype = opts.get('local') and 'local' or 'global'
3642 3647 for n in names:
3643 3648 if not repo.tagtype(n):
3644 3649 raise util.Abort(_('tag \'%s\' does not exist') % n)
3645 3650 if repo.tagtype(n) != expectedtype:
3646 3651 if expectedtype == 'global':
3647 3652 raise util.Abort(_('tag \'%s\' is not a global tag') % n)
3648 3653 else:
3649 3654 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
3650 3655 rev_ = nullid
3651 3656 if not message:
3652 3657 # we don't translate commit messages
3653 3658 message = 'Removed tag %s' % ', '.join(names)
3654 3659 elif not opts.get('force'):
3655 3660 for n in names:
3656 3661 if n in repo.tags():
3657 3662 raise util.Abort(_('tag \'%s\' already exists '
3658 3663 '(use -f to force)') % n)
3659 3664 if not rev_ and repo.dirstate.parents()[1] != nullid:
3660 3665 raise util.Abort(_('uncommitted merge - please provide a '
3661 3666 'specific revision'))
3662 3667 r = repo[rev_].node()
3663 3668
3664 3669 if not message:
3665 3670 # we don't translate commit messages
3666 3671 message = ('Added tag %s for changeset %s' %
3667 3672 (', '.join(names), short(r)))
3668 3673
3669 3674 date = opts.get('date')
3670 3675 if date:
3671 3676 date = util.parsedate(date)
3672 3677
3673 3678 if opts.get('edit'):
3674 3679 message = ui.edit(message, ui.username())
3675 3680
3676 3681 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
3677 3682
3678 3683 def tags(ui, repo):
3679 3684 """list repository tags
3680 3685
3681 3686 This lists both regular and local tags. When the -v/--verbose
3682 3687 switch is used, a third column "local" is printed for local tags.
3683 3688
3684 3689 Returns 0 on success.
3685 3690 """
3686 3691
3687 3692 hexfunc = ui.debugflag and hex or short
3688 3693 tagtype = ""
3689 3694
3690 3695 for t, n in reversed(repo.tagslist()):
3691 3696 if ui.quiet:
3692 3697 ui.write("%s\n" % t)
3693 3698 continue
3694 3699
3695 3700 try:
3696 3701 hn = hexfunc(n)
3697 3702 r = "%5d:%s" % (repo.changelog.rev(n), hn)
3698 3703 except error.LookupError:
3699 3704 r = " ?:%s" % hn
3700 3705 else:
3701 3706 spaces = " " * (30 - encoding.colwidth(t))
3702 3707 if ui.verbose:
3703 3708 if repo.tagtype(t) == 'local':
3704 3709 tagtype = " local"
3705 3710 else:
3706 3711 tagtype = ""
3707 3712 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
3708 3713
3709 3714 def tip(ui, repo, **opts):
3710 3715 """show the tip revision
3711 3716
3712 3717 The tip revision (usually just called the tip) is the changeset
3713 3718 most recently added to the repository (and therefore the most
3714 3719 recently changed head).
3715 3720
3716 3721 If you have just made a commit, that commit will be the tip. If
3717 3722 you have just pulled changes from another repository, the tip of
3718 3723 that repository becomes the current tip. The "tip" tag is special
3719 3724 and cannot be renamed or assigned to a different changeset.
3720 3725
3721 3726 Returns 0 on success.
3722 3727 """
3723 3728 displayer = cmdutil.show_changeset(ui, repo, opts)
3724 3729 displayer.show(repo[len(repo) - 1])
3725 3730 displayer.close()
3726 3731
3727 3732 def unbundle(ui, repo, fname1, *fnames, **opts):
3728 3733 """apply one or more changegroup files
3729 3734
3730 3735 Apply one or more compressed changegroup files generated by the
3731 3736 bundle command.
3732 3737
3733 3738 Returns 0 on success, 1 if an update has unresolved files.
3734 3739 """
3735 3740 fnames = (fname1,) + fnames
3736 3741
3737 3742 lock = repo.lock()
3738 3743 try:
3739 3744 for fname in fnames:
3740 3745 f = url.open(ui, fname)
3741 3746 gen = changegroup.readbundle(f, fname)
3742 3747 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
3743 3748 lock=lock)
3744 3749 finally:
3745 3750 lock.release()
3746 3751
3747 3752 return postincoming(ui, repo, modheads, opts.get('update'), None)
3748 3753
3749 3754 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
3750 3755 """update working directory (or switch revisions)
3751 3756
3752 3757 Update the repository's working directory to the specified
3753 3758 changeset.
3754 3759
3755 3760 If no changeset is specified, attempt to update to the tip of the
3756 3761 current branch. If this changeset is a descendant of the working
3757 3762 directory's parent, update to it, otherwise abort.
3758 3763
3759 3764 The following rules apply when the working directory contains
3760 3765 uncommitted changes:
3761 3766
3762 3767 1. If neither -c/--check nor -C/--clean is specified, and if
3763 3768 the requested changeset is an ancestor or descendant of
3764 3769 the working directory's parent, the uncommitted changes
3765 3770 are merged into the requested changeset and the merged
3766 3771 result is left uncommitted. If the requested changeset is
3767 3772 not an ancestor or descendant (that is, it is on another
3768 3773 branch), the update is aborted and the uncommitted changes
3769 3774 are preserved.
3770 3775
3771 3776 2. With the -c/--check option, the update is aborted and the
3772 3777 uncommitted changes are preserved.
3773 3778
3774 3779 3. With the -C/--clean option, uncommitted changes are discarded and
3775 3780 the working directory is updated to the requested changeset.
3776 3781
3777 3782 Use null as the changeset to remove the working directory (like
3778 3783 :hg:`clone -U`).
3779 3784
3780 3785 If you want to update just one file to an older changeset, use :hg:`revert`.
3781 3786
3782 3787 See :hg:`help dates` for a list of formats valid for -d/--date.
3783 3788
3784 3789 Returns 0 on success, 1 if there are unresolved files.
3785 3790 """
3786 3791 if rev and node:
3787 3792 raise util.Abort(_("please specify just one revision"))
3788 3793
3789 3794 if not rev:
3790 3795 rev = node
3791 3796
3792 3797 if check and clean:
3793 3798 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
3794 3799
3795 3800 if check:
3796 3801 # we could use dirty() but we can ignore merge and branch trivia
3797 3802 c = repo[None]
3798 3803 if c.modified() or c.added() or c.removed():
3799 3804 raise util.Abort(_("uncommitted local changes"))
3800 3805
3801 3806 if date:
3802 3807 if rev:
3803 3808 raise util.Abort(_("you can't specify a revision and a date"))
3804 3809 rev = cmdutil.finddate(ui, repo, date)
3805 3810
3806 3811 if clean or check:
3807 3812 return hg.clean(repo, rev)
3808 3813 else:
3809 3814 return hg.update(repo, rev)
3810 3815
3811 3816 def verify(ui, repo):
3812 3817 """verify the integrity of the repository
3813 3818
3814 3819 Verify the integrity of the current repository.
3815 3820
3816 3821 This will perform an extensive check of the repository's
3817 3822 integrity, validating the hashes and checksums of each entry in
3818 3823 the changelog, manifest, and tracked files, as well as the
3819 3824 integrity of their crosslinks and indices.
3820 3825
3821 3826 Returns 0 on success, 1 if errors are encountered.
3822 3827 """
3823 3828 return hg.verify(repo)
3824 3829
3825 3830 def version_(ui):
3826 3831 """output version and copyright information"""
3827 3832 ui.write(_("Mercurial Distributed SCM (version %s)\n")
3828 3833 % util.version())
3829 3834 ui.status(_(
3830 3835 "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
3831 3836 "This is free software; see the source for copying conditions. "
3832 3837 "There is NO\nwarranty; "
3833 3838 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
3834 3839 ))
3835 3840
3836 3841 # Command options and aliases are listed here, alphabetically
3837 3842
3838 3843 globalopts = [
3839 3844 ('R', 'repository', '',
3840 3845 _('repository root directory or name of overlay bundle file'),
3841 3846 _('REPO')),
3842 3847 ('', 'cwd', '',
3843 3848 _('change working directory'), _('DIR')),
3844 3849 ('y', 'noninteractive', None,
3845 3850 _('do not prompt, assume \'yes\' for any required answers')),
3846 3851 ('q', 'quiet', None, _('suppress output')),
3847 3852 ('v', 'verbose', None, _('enable additional output')),
3848 3853 ('', 'config', [],
3849 3854 _('set/override config option (use \'section.name=value\')'),
3850 3855 _('CONFIG')),
3851 3856 ('', 'debug', None, _('enable debugging output')),
3852 3857 ('', 'debugger', None, _('start debugger')),
3853 3858 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
3854 3859 _('ENCODE')),
3855 3860 ('', 'encodingmode', encoding.encodingmode,
3856 3861 _('set the charset encoding mode'), _('MODE')),
3857 3862 ('', 'traceback', None, _('always print a traceback on exception')),
3858 3863 ('', 'time', None, _('time how long the command takes')),
3859 3864 ('', 'profile', None, _('print command execution profile')),
3860 3865 ('', 'version', None, _('output version information and exit')),
3861 3866 ('h', 'help', None, _('display help and exit')),
3862 3867 ]
3863 3868
3864 3869 dryrunopts = [('n', 'dry-run', None,
3865 3870 _('do not perform actions, just print output'))]
3866 3871
3867 3872 remoteopts = [
3868 3873 ('e', 'ssh', '',
3869 3874 _('specify ssh command to use'), _('CMD')),
3870 3875 ('', 'remotecmd', '',
3871 3876 _('specify hg command to run on the remote side'), _('CMD')),
3872 3877 ]
3873 3878
3874 3879 walkopts = [
3875 3880 ('I', 'include', [],
3876 3881 _('include names matching the given patterns'), _('PATTERN')),
3877 3882 ('X', 'exclude', [],
3878 3883 _('exclude names matching the given patterns'), _('PATTERN')),
3879 3884 ]
3880 3885
3881 3886 commitopts = [
3882 3887 ('m', 'message', '',
3883 3888 _('use text as commit message'), _('TEXT')),
3884 3889 ('l', 'logfile', '',
3885 3890 _('read commit message from file'), _('FILE')),
3886 3891 ]
3887 3892
3888 3893 commitopts2 = [
3889 3894 ('d', 'date', '',
3890 3895 _('record datecode as commit date'), _('DATE')),
3891 3896 ('u', 'user', '',
3892 3897 _('record the specified user as committer'), _('USER')),
3893 3898 ]
3894 3899
3895 3900 templateopts = [
3896 3901 ('', 'style', '',
3897 3902 _('display using template map file'), _('STYLE')),
3898 3903 ('', 'template', '',
3899 3904 _('display with template'), _('TEMPLATE')),
3900 3905 ]
3901 3906
3902 3907 logopts = [
3903 3908 ('p', 'patch', None, _('show patch')),
3904 3909 ('g', 'git', None, _('use git extended diff format')),
3905 3910 ('l', 'limit', '',
3906 3911 _('limit number of changes displayed'), _('NUM')),
3907 3912 ('M', 'no-merges', None, _('do not show merges')),
3908 3913 ('', 'stat', None, _('output diffstat-style summary of changes')),
3909 3914 ] + templateopts
3910 3915
3911 3916 diffopts = [
3912 3917 ('a', 'text', None, _('treat all files as text')),
3913 3918 ('g', 'git', None, _('use git extended diff format')),
3914 3919 ('', 'nodates', None, _('omit dates from diff headers'))
3915 3920 ]
3916 3921
3917 3922 diffopts2 = [
3918 3923 ('p', 'show-function', None, _('show which function each change is in')),
3919 3924 ('', 'reverse', None, _('produce a diff that undoes the changes')),
3920 3925 ('w', 'ignore-all-space', None,
3921 3926 _('ignore white space when comparing lines')),
3922 3927 ('b', 'ignore-space-change', None,
3923 3928 _('ignore changes in the amount of white space')),
3924 3929 ('B', 'ignore-blank-lines', None,
3925 3930 _('ignore changes whose lines are all blank')),
3926 3931 ('U', 'unified', '',
3927 3932 _('number of lines of context to show'), _('NUM')),
3928 3933 ('', 'stat', None, _('output diffstat-style summary of changes')),
3929 3934 ]
3930 3935
3931 3936 similarityopts = [
3932 3937 ('s', 'similarity', '',
3933 3938 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
3934 3939 ]
3935 3940
3936 3941 subrepoopts = [
3937 3942 ('S', 'subrepos', None,
3938 3943 _('recurse into subrepositories'))
3939 3944 ]
3940 3945
3941 3946 table = {
3942 3947 "^add": (add, walkopts + subrepoopts + dryrunopts,
3943 3948 _('[OPTION]... [FILE]...')),
3944 3949 "addremove":
3945 3950 (addremove, similarityopts + walkopts + dryrunopts,
3946 3951 _('[OPTION]... [FILE]...')),
3947 3952 "^annotate|blame":
3948 3953 (annotate,
3949 3954 [('r', 'rev', '',
3950 3955 _('annotate the specified revision'), _('REV')),
3951 3956 ('', 'follow', None,
3952 3957 _('follow copies/renames and list the filename (DEPRECATED)')),
3953 3958 ('', 'no-follow', None, _("don't follow copies and renames")),
3954 3959 ('a', 'text', None, _('treat all files as text')),
3955 3960 ('u', 'user', None, _('list the author (long with -v)')),
3956 3961 ('f', 'file', None, _('list the filename')),
3957 3962 ('d', 'date', None, _('list the date (short with -q)')),
3958 3963 ('n', 'number', None, _('list the revision number (default)')),
3959 3964 ('c', 'changeset', None, _('list the changeset')),
3960 3965 ('l', 'line-number', None,
3961 3966 _('show line number at the first appearance'))
3962 3967 ] + walkopts,
3963 3968 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
3964 3969 "archive":
3965 3970 (archive,
3966 3971 [('', 'no-decode', None, _('do not pass files through decoders')),
3967 3972 ('p', 'prefix', '',
3968 3973 _('directory prefix for files in archive'), _('PREFIX')),
3969 3974 ('r', 'rev', '',
3970 3975 _('revision to distribute'), _('REV')),
3971 3976 ('t', 'type', '',
3972 3977 _('type of distribution to create'), _('TYPE')),
3973 3978 ] + subrepoopts + walkopts,
3974 3979 _('[OPTION]... DEST')),
3975 3980 "backout":
3976 3981 (backout,
3977 3982 [('', 'merge', None,
3978 3983 _('merge with old dirstate parent after backout')),
3979 3984 ('', 'parent', '',
3980 3985 _('parent to choose when backing out merge'), _('REV')),
3981 3986 ('r', 'rev', '',
3982 3987 _('revision to backout'), _('REV')),
3983 3988 ] + walkopts + commitopts + commitopts2,
3984 3989 _('[OPTION]... [-r] REV')),
3985 3990 "bisect":
3986 3991 (bisect,
3987 3992 [('r', 'reset', False, _('reset bisect state')),
3988 3993 ('g', 'good', False, _('mark changeset good')),
3989 3994 ('b', 'bad', False, _('mark changeset bad')),
3990 3995 ('s', 'skip', False, _('skip testing changeset')),
3991 3996 ('c', 'command', '',
3992 3997 _('use command to check changeset state'), _('CMD')),
3993 3998 ('U', 'noupdate', False, _('do not update to target'))],
3994 3999 _("[-gbsr] [-U] [-c CMD] [REV]")),
3995 4000 "branch":
3996 4001 (branch,
3997 4002 [('f', 'force', None,
3998 4003 _('set branch name even if it shadows an existing branch')),
3999 4004 ('C', 'clean', None, _('reset branch name to parent branch name'))],
4000 4005 _('[-fC] [NAME]')),
4001 4006 "branches":
4002 4007 (branches,
4003 4008 [('a', 'active', False,
4004 4009 _('show only branches that have unmerged heads')),
4005 4010 ('c', 'closed', False,
4006 4011 _('show normal and closed branches'))],
4007 4012 _('[-ac]')),
4008 4013 "bundle":
4009 4014 (bundle,
4010 4015 [('f', 'force', None,
4011 4016 _('run even when the destination is unrelated')),
4012 4017 ('r', 'rev', [],
4013 4018 _('a changeset intended to be added to the destination'),
4014 4019 _('REV')),
4015 4020 ('b', 'branch', [],
4016 4021 _('a specific branch you would like to bundle'),
4017 4022 _('BRANCH')),
4018 4023 ('', 'base', [],
4019 4024 _('a base changeset assumed to be available at the destination'),
4020 4025 _('REV')),
4021 4026 ('a', 'all', None, _('bundle all changesets in the repository')),
4022 4027 ('t', 'type', 'bzip2',
4023 4028 _('bundle compression type to use'), _('TYPE')),
4024 4029 ] + remoteopts,
4025 4030 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
4026 4031 "cat":
4027 4032 (cat,
4028 4033 [('o', 'output', '',
4029 4034 _('print output to file with formatted name'), _('FORMAT')),
4030 4035 ('r', 'rev', '',
4031 4036 _('print the given revision'), _('REV')),
4032 4037 ('', 'decode', None, _('apply any matching decode filter')),
4033 4038 ] + walkopts,
4034 4039 _('[OPTION]... FILE...')),
4035 4040 "^clone":
4036 4041 (clone,
4037 4042 [('U', 'noupdate', None,
4038 4043 _('the clone will include an empty working copy (only a repository)')),
4039 4044 ('u', 'updaterev', '',
4040 4045 _('revision, tag or branch to check out'), _('REV')),
4041 4046 ('r', 'rev', [],
4042 4047 _('include the specified changeset'), _('REV')),
4043 4048 ('b', 'branch', [],
4044 4049 _('clone only the specified branch'), _('BRANCH')),
4045 4050 ('', 'pull', None, _('use pull protocol to copy metadata')),
4046 4051 ('', 'uncompressed', None,
4047 4052 _('use uncompressed transfer (fast over LAN)')),
4048 4053 ] + remoteopts,
4049 4054 _('[OPTION]... SOURCE [DEST]')),
4050 4055 "^commit|ci":
4051 4056 (commit,
4052 4057 [('A', 'addremove', None,
4053 4058 _('mark new/missing files as added/removed before committing')),
4054 4059 ('', 'close-branch', None,
4055 4060 _('mark a branch as closed, hiding it from the branch list')),
4056 4061 ] + walkopts + commitopts + commitopts2,
4057 4062 _('[OPTION]... [FILE]...')),
4058 4063 "copy|cp":
4059 4064 (copy,
4060 4065 [('A', 'after', None, _('record a copy that has already occurred')),
4061 4066 ('f', 'force', None,
4062 4067 _('forcibly copy over an existing managed file')),
4063 4068 ] + walkopts + dryrunopts,
4064 4069 _('[OPTION]... [SOURCE]... DEST')),
4065 4070 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
4066 4071 "debugbuilddag":
4067 4072 (debugbuilddag,
4068 4073 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
4069 4074 ('a', 'appended-file', None, _('add single file all revs append to')),
4070 4075 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
4071 4076 ('n', 'new-file', None, _('add new file at each rev')),
4072 4077 ],
4073 4078 _('[OPTION]... TEXT')),
4074 4079 "debugcheckstate": (debugcheckstate, [], ''),
4075 4080 "debugcommands": (debugcommands, [], _('[COMMAND]')),
4076 4081 "debugcomplete":
4077 4082 (debugcomplete,
4078 4083 [('o', 'options', None, _('show the command options'))],
4079 4084 _('[-o] CMD')),
4080 4085 "debugdag":
4081 4086 (debugdag,
4082 4087 [('t', 'tags', None, _('use tags as labels')),
4083 4088 ('b', 'branches', None, _('annotate with branch names')),
4084 4089 ('', 'dots', None, _('use dots for runs')),
4085 4090 ('s', 'spaces', None, _('separate elements by spaces')),
4086 4091 ],
4087 4092 _('[OPTION]... [FILE [REV]...]')),
4088 4093 "debugdate":
4089 4094 (debugdate,
4090 4095 [('e', 'extended', None, _('try extended date formats'))],
4091 4096 _('[-e] DATE [RANGE]')),
4092 4097 "debugdata": (debugdata, [], _('FILE REV')),
4093 4098 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
4094 4099 "debugindex": (debugindex, [], _('FILE')),
4095 4100 "debugindexdot": (debugindexdot, [], _('FILE')),
4096 4101 "debuginstall": (debuginstall, [], ''),
4097 4102 "debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
4098 4103 "debugrebuildstate":
4099 4104 (debugrebuildstate,
4100 4105 [('r', 'rev', '',
4101 4106 _('revision to rebuild to'), _('REV'))],
4102 4107 _('[-r REV] [REV]')),
4103 4108 "debugrename":
4104 4109 (debugrename,
4105 4110 [('r', 'rev', '',
4106 4111 _('revision to debug'), _('REV'))],
4107 4112 _('[-r REV] FILE')),
4108 4113 "debugrevspec":
4109 4114 (debugrevspec, [], ('REVSPEC')),
4110 4115 "debugsetparents":
4111 4116 (debugsetparents, [], _('REV1 [REV2]')),
4112 4117 "debugstate":
4113 4118 (debugstate,
4114 4119 [('', 'nodates', None, _('do not display the saved mtime'))],
4115 4120 _('[OPTION]...')),
4116 4121 "debugsub":
4117 4122 (debugsub,
4118 4123 [('r', 'rev', '',
4119 4124 _('revision to check'), _('REV'))],
4120 4125 _('[-r REV] [REV]')),
4121 4126 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
4122 4127 "^diff":
4123 4128 (diff,
4124 4129 [('r', 'rev', [],
4125 4130 _('revision'), _('REV')),
4126 4131 ('c', 'change', '',
4127 4132 _('change made by revision'), _('REV'))
4128 4133 ] + diffopts + diffopts2 + walkopts + subrepoopts,
4129 4134 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
4130 4135 "^export":
4131 4136 (export,
4132 4137 [('o', 'output', '',
4133 4138 _('print output to file with formatted name'), _('FORMAT')),
4134 4139 ('', 'switch-parent', None, _('diff against the second parent')),
4135 4140 ('r', 'rev', [],
4136 4141 _('revisions to export'), _('REV')),
4137 4142 ] + diffopts,
4138 4143 _('[OPTION]... [-o OUTFILESPEC] REV...')),
4139 4144 "^forget":
4140 4145 (forget,
4141 4146 [] + walkopts,
4142 4147 _('[OPTION]... FILE...')),
4143 4148 "grep":
4144 4149 (grep,
4145 4150 [('0', 'print0', None, _('end fields with NUL')),
4146 4151 ('', 'all', None, _('print all revisions that match')),
4147 4152 ('f', 'follow', None,
4148 4153 _('follow changeset history,'
4149 4154 ' or file history across copies and renames')),
4150 4155 ('i', 'ignore-case', None, _('ignore case when matching')),
4151 4156 ('l', 'files-with-matches', None,
4152 4157 _('print only filenames and revisions that match')),
4153 4158 ('n', 'line-number', None, _('print matching line numbers')),
4154 4159 ('r', 'rev', [],
4155 4160 _('only search files changed within revision range'), _('REV')),
4156 4161 ('u', 'user', None, _('list the author (long with -v)')),
4157 4162 ('d', 'date', None, _('list the date (short with -q)')),
4158 4163 ] + walkopts,
4159 4164 _('[OPTION]... PATTERN [FILE]...')),
4160 4165 "heads":
4161 4166 (heads,
4162 4167 [('r', 'rev', '',
4163 4168 _('show only heads which are descendants of REV'), _('REV')),
4164 4169 ('t', 'topo', False, _('show topological heads only')),
4165 4170 ('a', 'active', False,
4166 4171 _('show active branchheads only (DEPRECATED)')),
4167 4172 ('c', 'closed', False,
4168 4173 _('show normal and closed branch heads')),
4169 4174 ] + templateopts,
4170 4175 _('[-ac] [-r REV] [REV]...')),
4171 4176 "help": (help_, [], _('[TOPIC]')),
4172 4177 "identify|id":
4173 4178 (identify,
4174 4179 [('r', 'rev', '',
4175 4180 _('identify the specified revision'), _('REV')),
4176 4181 ('n', 'num', None, _('show local revision number')),
4177 4182 ('i', 'id', None, _('show global revision id')),
4178 4183 ('b', 'branch', None, _('show branch')),
4179 4184 ('t', 'tags', None, _('show tags'))],
4180 4185 _('[-nibt] [-r REV] [SOURCE]')),
4181 4186 "import|patch":
4182 4187 (import_,
4183 4188 [('p', 'strip', 1,
4184 4189 _('directory strip option for patch. This has the same '
4185 4190 'meaning as the corresponding patch option'),
4186 4191 _('NUM')),
4187 4192 ('b', 'base', '',
4188 4193 _('base path'), _('PATH')),
4189 4194 ('f', 'force', None,
4190 4195 _('skip check for outstanding uncommitted changes')),
4191 4196 ('', 'no-commit', None,
4192 4197 _("don't commit, just update the working directory")),
4193 4198 ('', 'exact', None,
4194 4199 _('apply patch to the nodes from which it was generated')),
4195 4200 ('', 'import-branch', None,
4196 4201 _('use any branch information in patch (implied by --exact)'))] +
4197 4202 commitopts + commitopts2 + similarityopts,
4198 4203 _('[OPTION]... PATCH...')),
4199 4204 "incoming|in":
4200 4205 (incoming,
4201 4206 [('f', 'force', None,
4202 4207 _('run even if remote repository is unrelated')),
4203 4208 ('n', 'newest-first', None, _('show newest record first')),
4204 4209 ('', 'bundle', '',
4205 4210 _('file to store the bundles into'), _('FILE')),
4206 4211 ('r', 'rev', [],
4207 4212 _('a remote changeset intended to be added'), _('REV')),
4208 4213 ('b', 'branch', [],
4209 4214 _('a specific branch you would like to pull'), _('BRANCH')),
4210 4215 ] + logopts + remoteopts + subrepoopts,
4211 4216 _('[-p] [-n] [-M] [-f] [-r REV]...'
4212 4217 ' [--bundle FILENAME] [SOURCE]')),
4213 4218 "^init":
4214 4219 (init,
4215 4220 remoteopts,
4216 4221 _('[-e CMD] [--remotecmd CMD] [DEST]')),
4217 4222 "locate":
4218 4223 (locate,
4219 4224 [('r', 'rev', '',
4220 4225 _('search the repository as it is in REV'), _('REV')),
4221 4226 ('0', 'print0', None,
4222 4227 _('end filenames with NUL, for use with xargs')),
4223 4228 ('f', 'fullpath', None,
4224 4229 _('print complete paths from the filesystem root')),
4225 4230 ] + walkopts,
4226 4231 _('[OPTION]... [PATTERN]...')),
4227 4232 "^log|history":
4228 4233 (log,
4229 4234 [('f', 'follow', None,
4230 4235 _('follow changeset history,'
4231 4236 ' or file history across copies and renames')),
4232 4237 ('', 'follow-first', None,
4233 4238 _('only follow the first parent of merge changesets')),
4234 4239 ('d', 'date', '',
4235 4240 _('show revisions matching date spec'), _('DATE')),
4236 4241 ('C', 'copies', None, _('show copied files')),
4237 4242 ('k', 'keyword', [],
4238 4243 _('do case-insensitive search for a given text'), _('TEXT')),
4239 4244 ('r', 'rev', [],
4240 4245 _('show the specified revision or range'), _('REV')),
4241 4246 ('', 'removed', None, _('include revisions where files were removed')),
4242 4247 ('m', 'only-merges', None, _('show only merges')),
4243 4248 ('u', 'user', [],
4244 4249 _('revisions committed by user'), _('USER')),
4245 4250 ('', 'only-branch', [],
4246 4251 _('show only changesets within the given named branch (DEPRECATED)'),
4247 4252 _('BRANCH')),
4248 4253 ('b', 'branch', [],
4249 4254 _('show changesets within the given named branch'), _('BRANCH')),
4250 4255 ('P', 'prune', [],
4251 4256 _('do not display revision or any of its ancestors'), _('REV')),
4252 4257 ] + logopts + walkopts,
4253 4258 _('[OPTION]... [FILE]')),
4254 4259 "manifest":
4255 4260 (manifest,
4256 4261 [('r', 'rev', '',
4257 4262 _('revision to display'), _('REV'))],
4258 4263 _('[-r REV]')),
4259 4264 "^merge":
4260 4265 (merge,
4261 4266 [('f', 'force', None, _('force a merge with outstanding changes')),
4262 4267 ('r', 'rev', '',
4263 4268 _('revision to merge'), _('REV')),
4264 4269 ('P', 'preview', None,
4265 4270 _('review revisions to merge (no merge is performed)'))],
4266 4271 _('[-P] [-f] [[-r] REV]')),
4267 4272 "outgoing|out":
4268 4273 (outgoing,
4269 4274 [('f', 'force', None,
4270 4275 _('run even when the destination is unrelated')),
4271 4276 ('r', 'rev', [],
4272 4277 _('a changeset intended to be included in the destination'),
4273 4278 _('REV')),
4274 4279 ('n', 'newest-first', None, _('show newest record first')),
4275 4280 ('b', 'branch', [],
4276 4281 _('a specific branch you would like to push'), _('BRANCH')),
4277 4282 ] + logopts + remoteopts + subrepoopts,
4278 4283 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
4279 4284 "parents":
4280 4285 (parents,
4281 4286 [('r', 'rev', '',
4282 4287 _('show parents of the specified revision'), _('REV')),
4283 4288 ] + templateopts,
4284 4289 _('[-r REV] [FILE]')),
4285 4290 "paths": (paths, [], _('[NAME]')),
4286 4291 "^pull":
4287 4292 (pull,
4288 4293 [('u', 'update', None,
4289 4294 _('update to new branch head if changesets were pulled')),
4290 4295 ('f', 'force', None,
4291 4296 _('run even when remote repository is unrelated')),
4292 4297 ('r', 'rev', [],
4293 4298 _('a remote changeset intended to be added'), _('REV')),
4294 4299 ('b', 'branch', [],
4295 4300 _('a specific branch you would like to pull'), _('BRANCH')),
4296 4301 ] + remoteopts,
4297 4302 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
4298 4303 "^push":
4299 4304 (push,
4300 4305 [('f', 'force', None, _('force push')),
4301 4306 ('r', 'rev', [],
4302 4307 _('a changeset intended to be included in the destination'),
4303 4308 _('REV')),
4304 4309 ('b', 'branch', [],
4305 4310 _('a specific branch you would like to push'), _('BRANCH')),
4306 4311 ('', 'new-branch', False, _('allow pushing a new branch')),
4307 4312 ] + remoteopts,
4308 4313 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
4309 4314 "recover": (recover, []),
4310 4315 "^remove|rm":
4311 4316 (remove,
4312 4317 [('A', 'after', None, _('record delete for missing files')),
4313 4318 ('f', 'force', None,
4314 4319 _('remove (and delete) file even if added or modified')),
4315 4320 ] + walkopts,
4316 4321 _('[OPTION]... FILE...')),
4317 4322 "rename|mv":
4318 4323 (rename,
4319 4324 [('A', 'after', None, _('record a rename that has already occurred')),
4320 4325 ('f', 'force', None,
4321 4326 _('forcibly copy over an existing managed file')),
4322 4327 ] + walkopts + dryrunopts,
4323 4328 _('[OPTION]... SOURCE... DEST')),
4324 4329 "resolve":
4325 4330 (resolve,
4326 4331 [('a', 'all', None, _('select all unresolved files')),
4327 4332 ('l', 'list', None, _('list state of files needing merge')),
4328 4333 ('m', 'mark', None, _('mark files as resolved')),
4329 4334 ('u', 'unmark', None, _('mark files as unresolved')),
4330 4335 ('n', 'no-status', None, _('hide status prefix'))]
4331 4336 + walkopts,
4332 4337 _('[OPTION]... [FILE]...')),
4333 4338 "revert":
4334 4339 (revert,
4335 4340 [('a', 'all', None, _('revert all changes when no arguments given')),
4336 4341 ('d', 'date', '',
4337 4342 _('tipmost revision matching date'), _('DATE')),
4338 4343 ('r', 'rev', '',
4339 4344 _('revert to the specified revision'), _('REV')),
4340 4345 ('', 'no-backup', None, _('do not save backup copies of files')),
4341 4346 ] + walkopts + dryrunopts,
4342 4347 _('[OPTION]... [-r REV] [NAME]...')),
4343 4348 "rollback": (rollback, dryrunopts),
4344 4349 "root": (root, []),
4345 4350 "^serve":
4346 4351 (serve,
4347 4352 [('A', 'accesslog', '',
4348 4353 _('name of access log file to write to'), _('FILE')),
4349 4354 ('d', 'daemon', None, _('run server in background')),
4350 4355 ('', 'daemon-pipefds', '',
4351 4356 _('used internally by daemon mode'), _('NUM')),
4352 4357 ('E', 'errorlog', '',
4353 4358 _('name of error log file to write to'), _('FILE')),
4354 4359 # use string type, then we can check if something was passed
4355 4360 ('p', 'port', '',
4356 4361 _('port to listen on (default: 8000)'), _('PORT')),
4357 4362 ('a', 'address', '',
4358 4363 _('address to listen on (default: all interfaces)'), _('ADDR')),
4359 4364 ('', 'prefix', '',
4360 4365 _('prefix path to serve from (default: server root)'), _('PREFIX')),
4361 4366 ('n', 'name', '',
4362 4367 _('name to show in web pages (default: working directory)'),
4363 4368 _('NAME')),
4364 4369 ('', 'web-conf', '',
4365 4370 _('name of the hgweb config file (serve more than one repository)'),
4366 4371 _('FILE')),
4367 4372 ('', 'webdir-conf', '',
4368 4373 _('name of the hgweb config file (DEPRECATED)'), _('FILE')),
4369 4374 ('', 'pid-file', '',
4370 4375 _('name of file to write process ID to'), _('FILE')),
4371 4376 ('', 'stdio', None, _('for remote clients')),
4372 4377 ('t', 'templates', '',
4373 4378 _('web templates to use'), _('TEMPLATE')),
4374 4379 ('', 'style', '',
4375 4380 _('template style to use'), _('STYLE')),
4376 4381 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4377 4382 ('', 'certificate', '',
4378 4383 _('SSL certificate file'), _('FILE'))],
4379 4384 _('[OPTION]...')),
4380 4385 "showconfig|debugconfig":
4381 4386 (showconfig,
4382 4387 [('u', 'untrusted', None, _('show untrusted configuration options'))],
4383 4388 _('[-u] [NAME]...')),
4384 4389 "^summary|sum":
4385 4390 (summary,
4386 4391 [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
4387 4392 "^status|st":
4388 4393 (status,
4389 4394 [('A', 'all', None, _('show status of all files')),
4390 4395 ('m', 'modified', None, _('show only modified files')),
4391 4396 ('a', 'added', None, _('show only added files')),
4392 4397 ('r', 'removed', None, _('show only removed files')),
4393 4398 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4394 4399 ('c', 'clean', None, _('show only files without changes')),
4395 4400 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4396 4401 ('i', 'ignored', None, _('show only ignored files')),
4397 4402 ('n', 'no-status', None, _('hide status prefix')),
4398 4403 ('C', 'copies', None, _('show source of copied files')),
4399 4404 ('0', 'print0', None,
4400 4405 _('end filenames with NUL, for use with xargs')),
4401 4406 ('', 'rev', [],
4402 4407 _('show difference from revision'), _('REV')),
4403 4408 ('', 'change', '',
4404 4409 _('list the changed files of a revision'), _('REV')),
4405 4410 ] + walkopts + subrepoopts,
4406 4411 _('[OPTION]... [FILE]...')),
4407 4412 "tag":
4408 4413 (tag,
4409 4414 [('f', 'force', None, _('replace existing tag')),
4410 4415 ('l', 'local', None, _('make the tag local')),
4411 4416 ('r', 'rev', '',
4412 4417 _('revision to tag'), _('REV')),
4413 4418 ('', 'remove', None, _('remove a tag')),
4414 4419 # -l/--local is already there, commitopts cannot be used
4415 4420 ('e', 'edit', None, _('edit commit message')),
4416 4421 ('m', 'message', '',
4417 4422 _('use <text> as commit message'), _('TEXT')),
4418 4423 ] + commitopts2,
4419 4424 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
4420 4425 "tags": (tags, [], ''),
4421 4426 "tip":
4422 4427 (tip,
4423 4428 [('p', 'patch', None, _('show patch')),
4424 4429 ('g', 'git', None, _('use git extended diff format')),
4425 4430 ] + templateopts,
4426 4431 _('[-p] [-g]')),
4427 4432 "unbundle":
4428 4433 (unbundle,
4429 4434 [('u', 'update', None,
4430 4435 _('update to new branch head if changesets were unbundled'))],
4431 4436 _('[-u] FILE...')),
4432 4437 "^update|up|checkout|co":
4433 4438 (update,
4434 4439 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
4435 4440 ('c', 'check', None, _('check for uncommitted changes')),
4436 4441 ('d', 'date', '',
4437 4442 _('tipmost revision matching date'), _('DATE')),
4438 4443 ('r', 'rev', '',
4439 4444 _('revision'), _('REV'))],
4440 4445 _('[-c] [-C] [-d DATE] [[-r] REV]')),
4441 4446 "verify": (verify, []),
4442 4447 "version": (version_, []),
4443 4448 }
4444 4449
4445 4450 norepo = ("clone init version help debugcommands debugcomplete"
4446 4451 " debugdate debuginstall debugfsinfo debugpushkey")
4447 4452 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
4448 4453 " debugdata debugindex debugindexdot")
@@ -1,754 +1,755 b''
1 1 Short help:
2 2
3 3 $ hg
4 4 Mercurial Distributed SCM
5 5
6 6 basic commands:
7 7
8 8 add add the specified files on the next commit
9 9 annotate show changeset information by line for each file
10 10 clone make a copy of an existing repository
11 11 commit commit the specified files or all outstanding changes
12 12 diff diff repository (or selected files)
13 13 export dump the header and diffs for one or more changesets
14 14 forget forget the specified files on the next commit
15 15 init create a new repository in the given directory
16 16 log show revision history of entire repository or files
17 17 merge merge working directory with another revision
18 18 pull pull changes from the specified source
19 19 push push changes to the specified destination
20 20 remove remove the specified files on the next commit
21 21 serve start stand-alone webserver
22 22 status show changed files in the working directory
23 23 summary summarize working directory state
24 24 update update working directory (or switch revisions)
25 25
26 26 use "hg help" for the full list of commands or "hg -v" for details
27 27
28 28 $ hg -q
29 29 add add the specified files on the next commit
30 30 annotate show changeset information by line for each file
31 31 clone make a copy of an existing repository
32 32 commit commit the specified files or all outstanding changes
33 33 diff diff repository (or selected files)
34 34 export dump the header and diffs for one or more changesets
35 35 forget forget the specified files on the next commit
36 36 init create a new repository in the given directory
37 37 log show revision history of entire repository or files
38 38 merge merge working directory with another revision
39 39 pull pull changes from the specified source
40 40 push push changes to the specified destination
41 41 remove remove the specified files on the next commit
42 42 serve start stand-alone webserver
43 43 status show changed files in the working directory
44 44 summary summarize working directory state
45 45 update update working directory (or switch revisions)
46 46
47 47 $ hg help
48 48 Mercurial Distributed SCM
49 49
50 50 list of commands:
51 51
52 52 add add the specified files on the next commit
53 53 addremove add all new files, delete all missing files
54 54 annotate show changeset information by line for each file
55 55 archive create an unversioned archive of a repository revision
56 56 backout reverse effect of earlier changeset
57 57 bisect subdivision search of changesets
58 58 branch set or show the current branch name
59 59 branches list repository named branches
60 60 bundle create a changegroup file
61 61 cat output the current or given revision of files
62 62 clone make a copy of an existing repository
63 63 commit commit the specified files or all outstanding changes
64 64 copy mark files as copied for the next commit
65 65 diff diff repository (or selected files)
66 66 export dump the header and diffs for one or more changesets
67 67 forget forget the specified files on the next commit
68 68 grep search for a pattern in specified files and revisions
69 69 heads show current repository heads or show branch heads
70 70 help show help for a given topic or a help overview
71 71 identify identify the working copy or specified revision
72 72 import import an ordered set of patches
73 73 incoming show new changesets found in source
74 74 init create a new repository in the given directory
75 75 locate locate files matching specific patterns
76 76 log show revision history of entire repository or files
77 77 manifest output the current or given revision of the project manifest
78 78 merge merge working directory with another revision
79 79 outgoing show changesets not found in the destination
80 80 parents show the parents of the working directory or revision
81 81 paths show aliases for remote repositories
82 82 pull pull changes from the specified source
83 83 push push changes to the specified destination
84 84 recover roll back an interrupted transaction
85 85 remove remove the specified files on the next commit
86 86 rename rename files; equivalent of copy + remove
87 87 resolve redo merges or set/view the merge status of files
88 88 revert restore individual files or directories to an earlier state
89 89 rollback roll back the last transaction (dangerous)
90 90 root print the root (top) of the current working directory
91 91 serve start stand-alone webserver
92 92 showconfig show combined config settings from all hgrc files
93 93 status show changed files in the working directory
94 94 summary summarize working directory state
95 95 tag add one or more tags for the current or given revision
96 96 tags list repository tags
97 97 tip show the tip revision
98 98 unbundle apply one or more changegroup files
99 99 update update working directory (or switch revisions)
100 100 verify verify the integrity of the repository
101 101 version output version and copyright information
102 102
103 103 additional help topics:
104 104
105 105 config Configuration Files
106 106 dates Date Formats
107 107 patterns File Name Patterns
108 108 environment Environment Variables
109 109 revisions Specifying Single Revisions
110 110 multirevs Specifying Multiple Revisions
111 111 revsets Specifying Revision Sets
112 112 diffs Diff Formats
113 113 templating Template Usage
114 114 urls URL Paths
115 115 extensions Using additional features
116 116 hgweb Configuring hgweb
117 117 glossary Glossary
118 118
119 119 use "hg -v help" to show aliases and global options
120 120
121 121 $ hg -q help
122 122 add add the specified files on the next commit
123 123 addremove add all new files, delete all missing files
124 124 annotate show changeset information by line for each file
125 125 archive create an unversioned archive of a repository revision
126 126 backout reverse effect of earlier changeset
127 127 bisect subdivision search of changesets
128 128 branch set or show the current branch name
129 129 branches list repository named branches
130 130 bundle create a changegroup file
131 131 cat output the current or given revision of files
132 132 clone make a copy of an existing repository
133 133 commit commit the specified files or all outstanding changes
134 134 copy mark files as copied for the next commit
135 135 diff diff repository (or selected files)
136 136 export dump the header and diffs for one or more changesets
137 137 forget forget the specified files on the next commit
138 138 grep search for a pattern in specified files and revisions
139 139 heads show current repository heads or show branch heads
140 140 help show help for a given topic or a help overview
141 141 identify identify the working copy or specified revision
142 142 import import an ordered set of patches
143 143 incoming show new changesets found in source
144 144 init create a new repository in the given directory
145 145 locate locate files matching specific patterns
146 146 log show revision history of entire repository or files
147 147 manifest output the current or given revision of the project manifest
148 148 merge merge working directory with another revision
149 149 outgoing show changesets not found in the destination
150 150 parents show the parents of the working directory or revision
151 151 paths show aliases for remote repositories
152 152 pull pull changes from the specified source
153 153 push push changes to the specified destination
154 154 recover roll back an interrupted transaction
155 155 remove remove the specified files on the next commit
156 156 rename rename files; equivalent of copy + remove
157 157 resolve redo merges or set/view the merge status of files
158 158 revert restore individual files or directories to an earlier state
159 159 rollback roll back the last transaction (dangerous)
160 160 root print the root (top) of the current working directory
161 161 serve start stand-alone webserver
162 162 showconfig show combined config settings from all hgrc files
163 163 status show changed files in the working directory
164 164 summary summarize working directory state
165 165 tag add one or more tags for the current or given revision
166 166 tags list repository tags
167 167 tip show the tip revision
168 168 unbundle apply one or more changegroup files
169 169 update update working directory (or switch revisions)
170 170 verify verify the integrity of the repository
171 171 version output version and copyright information
172 172
173 173 additional help topics:
174 174
175 175 config Configuration Files
176 176 dates Date Formats
177 177 patterns File Name Patterns
178 178 environment Environment Variables
179 179 revisions Specifying Single Revisions
180 180 multirevs Specifying Multiple Revisions
181 181 revsets Specifying Revision Sets
182 182 diffs Diff Formats
183 183 templating Template Usage
184 184 urls URL Paths
185 185 extensions Using additional features
186 186 hgweb Configuring hgweb
187 187 glossary Glossary
188 188
189 189 Test short command list with verbose option
190 190
191 191 $ hg -v help shortlist
192 192 Mercurial Distributed SCM (version *) (glob)
193 193
194 194 Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
195 195 This is free software; see the source for copying conditions. There is NO
196 196 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
197 197
198 198 basic commands:
199 199
200 200 add:
201 201 add the specified files on the next commit
202 202 annotate, blame:
203 203 show changeset information by line for each file
204 204 clone:
205 205 make a copy of an existing repository
206 206 commit, ci:
207 207 commit the specified files or all outstanding changes
208 208 diff:
209 209 diff repository (or selected files)
210 210 export:
211 211 dump the header and diffs for one or more changesets
212 212 forget:
213 213 forget the specified files on the next commit
214 214 init:
215 215 create a new repository in the given directory
216 216 log, history:
217 217 show revision history of entire repository or files
218 218 merge:
219 219 merge working directory with another revision
220 220 pull:
221 221 pull changes from the specified source
222 222 push:
223 223 push changes to the specified destination
224 224 remove, rm:
225 225 remove the specified files on the next commit
226 226 serve:
227 227 start stand-alone webserver
228 228 status, st:
229 229 show changed files in the working directory
230 230 summary, sum:
231 231 summarize working directory state
232 232 update, up, checkout, co:
233 233 update working directory (or switch revisions)
234 234
235 235 global options:
236 236 -R --repository REPO repository root directory or name of overlay bundle
237 237 file
238 238 --cwd DIR change working directory
239 239 -y --noninteractive do not prompt, assume 'yes' for any required answers
240 240 -q --quiet suppress output
241 241 -v --verbose enable additional output
242 242 --config CONFIG [+] set/override config option (use 'section.name=value')
243 243 --debug enable debugging output
244 244 --debugger start debugger
245 245 --encoding ENCODE set the charset encoding (default: ascii)
246 246 --encodingmode MODE set the charset encoding mode (default: strict)
247 247 --traceback always print a traceback on exception
248 248 --time time how long the command takes
249 249 --profile print command execution profile
250 250 --version output version information and exit
251 251 -h --help display help and exit
252 252
253 253 [+] marked option can be specified multiple times
254 254
255 255 use "hg help" for the full list of commands
256 256
257 257 $ hg add -h
258 258 hg add [OPTION]... [FILE]...
259 259
260 260 add the specified files on the next commit
261 261
262 262 Schedule files to be version controlled and added to the repository.
263 263
264 264 The files will be added to the repository at the next commit. To undo an
265 265 add before that, see "hg forget".
266 266
267 267 If no names are given, add all files to the repository.
268 268
269 269 Returns 0 if all files are successfully added.
270 270
271 271 use "hg -v help add" to show verbose help
272 272
273 273 options:
274 274
275 275 -I --include PATTERN [+] include names matching the given patterns
276 276 -X --exclude PATTERN [+] exclude names matching the given patterns
277 277 -S --subrepos recurse into subrepositories
278 278 -n --dry-run do not perform actions, just print output
279 279
280 280 [+] marked option can be specified multiple times
281 281
282 282 use "hg -v help add" to show global options
283 283
284 284 Verbose help for add
285 285
286 286 $ hg add -hv
287 287 hg add [OPTION]... [FILE]...
288 288
289 289 add the specified files on the next commit
290 290
291 291 Schedule files to be version controlled and added to the repository.
292 292
293 293 The files will be added to the repository at the next commit. To undo an
294 294 add before that, see "hg forget".
295 295
296 296 If no names are given, add all files to the repository.
297 297
298 298 An example showing how new (unknown) files are added automatically by "hg
299 299 add":
300 300
301 301 $ ls
302 302 foo.c
303 303 $ hg status
304 304 ? foo.c
305 305 $ hg add
306 306 adding foo.c
307 307 $ hg status
308 308 A foo.c
309 309
310 310 Returns 0 if all files are successfully added.
311 311
312 312 options:
313 313
314 314 -I --include PATTERN [+] include names matching the given patterns
315 315 -X --exclude PATTERN [+] exclude names matching the given patterns
316 316 -S --subrepos recurse into subrepositories
317 317 -n --dry-run do not perform actions, just print output
318 318
319 319 global options:
320 320 -R --repository REPO repository root directory or name of overlay bundle
321 321 file
322 322 --cwd DIR change working directory
323 323 -y --noninteractive do not prompt, assume 'yes' for any required
324 324 answers
325 325 -q --quiet suppress output
326 326 -v --verbose enable additional output
327 327 --config CONFIG [+] set/override config option (use
328 328 'section.name=value')
329 329 --debug enable debugging output
330 330 --debugger start debugger
331 331 --encoding ENCODE set the charset encoding (default: ascii)
332 332 --encodingmode MODE set the charset encoding mode (default: strict)
333 333 --traceback always print a traceback on exception
334 334 --time time how long the command takes
335 335 --profile print command execution profile
336 336 --version output version information and exit
337 337 -h --help display help and exit
338 338
339 339 [+] marked option can be specified multiple times
340 340
341 341 Test help option with version option
342 342
343 343 $ hg add -h --version
344 344 Mercurial Distributed SCM (version *) (glob)
345 345
346 346 Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
347 347 This is free software; see the source for copying conditions. There is NO
348 348 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
349 349
350 350 hg add [OPTION]... [FILE]...
351 351
352 352 add the specified files on the next commit
353 353
354 354 Schedule files to be version controlled and added to the repository.
355 355
356 356 The files will be added to the repository at the next commit. To undo an
357 357 add before that, see "hg forget".
358 358
359 359 If no names are given, add all files to the repository.
360 360
361 361 Returns 0 if all files are successfully added.
362 362
363 363 use "hg -v help add" to show verbose help
364 364
365 365 options:
366 366
367 367 -I --include PATTERN [+] include names matching the given patterns
368 368 -X --exclude PATTERN [+] exclude names matching the given patterns
369 369 -S --subrepos recurse into subrepositories
370 370 -n --dry-run do not perform actions, just print output
371 371
372 372 [+] marked option can be specified multiple times
373 373
374 374 use "hg -v help add" to show global options
375 375
376 376 $ hg add --skjdfks
377 377 hg add: option --skjdfks not recognized
378 378 hg add [OPTION]... [FILE]...
379 379
380 380 add the specified files on the next commit
381 381
382 382 Schedule files to be version controlled and added to the repository.
383 383
384 384 The files will be added to the repository at the next commit. To undo an
385 385 add before that, see "hg forget".
386 386
387 387 If no names are given, add all files to the repository.
388 388
389 389 Returns 0 if all files are successfully added.
390 390
391 391 use "hg -v help add" to show verbose help
392 392
393 393 options:
394 394
395 395 -I --include PATTERN [+] include names matching the given patterns
396 396 -X --exclude PATTERN [+] exclude names matching the given patterns
397 397 -S --subrepos recurse into subrepositories
398 398 -n --dry-run do not perform actions, just print output
399 399
400 400 [+] marked option can be specified multiple times
401 401
402 402 use "hg -v help add" to show global options
403 403 [255]
404 404
405 405 Test ambiguous command help
406 406
407 407 $ hg help ad
408 408 list of commands:
409 409
410 410 add add the specified files on the next commit
411 411 addremove add all new files, delete all missing files
412 412
413 413 use "hg -v help ad" to show aliases and global options
414 414
415 415 Test command without options
416 416
417 417 $ hg help verify
418 418 hg verify
419 419
420 420 verify the integrity of the repository
421 421
422 422 Verify the integrity of the current repository.
423 423
424 424 This will perform an extensive check of the repository's integrity,
425 425 validating the hashes and checksums of each entry in the changelog,
426 426 manifest, and tracked files, as well as the integrity of their crosslinks
427 427 and indices.
428 428
429 429 Returns 0 on success, 1 if errors are encountered.
430 430
431 431 use "hg -v help verify" to show global options
432 432
433 433 $ hg help diff
434 434 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
435 435
436 436 diff repository (or selected files)
437 437
438 438 Show differences between revisions for the specified files.
439 439
440 440 Differences between files are shown using the unified diff format.
441 441
442 442 Note:
443 443 diff may generate unexpected results for merges, as it will default to
444 444 comparing against the working directory's first parent changeset if no
445 445 revisions are specified.
446 446
447 447 When two revision arguments are given, then changes are shown between
448 448 those revisions. If only one revision is specified then that revision is
449 449 compared to the working directory, and, when no revisions are specified,
450 450 the working directory files are compared to its parent.
451 451
452 452 Alternatively you can specify -c/--change with a revision to see the
453 453 changes in that changeset relative to its first parent.
454 454
455 455 Without the -a/--text option, diff will avoid generating diffs of files it
456 456 detects as binary. With -a, diff will generate a diff anyway, probably
457 457 with undesirable results.
458 458
459 459 Use the -g/--git option to generate diffs in the git extended diff format.
460 460 For more information, read "hg help diffs".
461 461
462 462 Returns 0 on success.
463 463
464 464 options:
465 465
466 466 -r --rev REV [+] revision
467 467 -c --change REV change made by revision
468 468 -a --text treat all files as text
469 469 -g --git use git extended diff format
470 470 --nodates omit dates from diff headers
471 471 -p --show-function show which function each change is in
472 472 --reverse produce a diff that undoes the changes
473 473 -w --ignore-all-space ignore white space when comparing lines
474 474 -b --ignore-space-change ignore changes in the amount of white space
475 475 -B --ignore-blank-lines ignore changes whose lines are all blank
476 476 -U --unified NUM number of lines of context to show
477 477 --stat output diffstat-style summary of changes
478 478 -I --include PATTERN [+] include names matching the given patterns
479 479 -X --exclude PATTERN [+] exclude names matching the given patterns
480 480 -S --subrepos recurse into subrepositories
481 481
482 482 [+] marked option can be specified multiple times
483 483
484 484 use "hg -v help diff" to show global options
485 485
486 486 $ hg help status
487 487 hg status [OPTION]... [FILE]...
488 488
489 489 aliases: st
490 490
491 491 show changed files in the working directory
492 492
493 493 Show status of files in the repository. If names are given, only files
494 494 that match are shown. Files that are clean or ignored or the source of a
495 495 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
496 496 -C/--copies or -A/--all are given. Unless options described with "show
497 497 only ..." are given, the options -mardu are used.
498 498
499 499 Option -q/--quiet hides untracked (unknown and ignored) files unless
500 500 explicitly requested with -u/--unknown or -i/--ignored.
501 501
502 NOTE: status may appear to disagree with diff if permissions have changed
503 or a merge has occurred. The standard diff format does not report
502 Note:
503 status may appear to disagree with diff if permissions have changed or
504 a merge has occurred. The standard diff format does not report
504 505 permission changes and diff only reports changes relative to one merge
505 506 parent.
506 507
507 508 If one revision is given, it is used as the base revision. If two
508 509 revisions are given, the differences between them are shown. The --change
509 510 option can also be used as a shortcut to list the changed files of a
510 511 revision from its first parent.
511 512
512 513 The codes used to show the status of files are:
513 514
514 515 M = modified
515 516 A = added
516 517 R = removed
517 518 C = clean
518 519 ! = missing (deleted by non-hg command, but still tracked)
519 520 ? = not tracked
520 521 I = ignored
521 522 = origin of the previous file listed as A (added)
522 523
523 524 Returns 0 on success.
524 525
525 526 options:
526 527
527 528 -A --all show status of all files
528 529 -m --modified show only modified files
529 530 -a --added show only added files
530 531 -r --removed show only removed files
531 532 -d --deleted show only deleted (but tracked) files
532 533 -c --clean show only files without changes
533 534 -u --unknown show only unknown (not tracked) files
534 535 -i --ignored show only ignored files
535 536 -n --no-status hide status prefix
536 537 -C --copies show source of copied files
537 538 -0 --print0 end filenames with NUL, for use with xargs
538 539 --rev REV [+] show difference from revision
539 540 --change REV list the changed files of a revision
540 541 -I --include PATTERN [+] include names matching the given patterns
541 542 -X --exclude PATTERN [+] exclude names matching the given patterns
542 543 -S --subrepos recurse into subrepositories
543 544
544 545 [+] marked option can be specified multiple times
545 546
546 547 use "hg -v help status" to show global options
547 548
548 549 $ hg -q help status
549 550 hg status [OPTION]... [FILE]...
550 551
551 552 show changed files in the working directory
552 553
553 554 $ hg help foo
554 555 hg: unknown command 'foo'
555 556 Mercurial Distributed SCM
556 557
557 558 basic commands:
558 559
559 560 add add the specified files on the next commit
560 561 annotate show changeset information by line for each file
561 562 clone make a copy of an existing repository
562 563 commit commit the specified files or all outstanding changes
563 564 diff diff repository (or selected files)
564 565 export dump the header and diffs for one or more changesets
565 566 forget forget the specified files on the next commit
566 567 init create a new repository in the given directory
567 568 log show revision history of entire repository or files
568 569 merge merge working directory with another revision
569 570 pull pull changes from the specified source
570 571 push push changes to the specified destination
571 572 remove remove the specified files on the next commit
572 573 serve start stand-alone webserver
573 574 status show changed files in the working directory
574 575 summary summarize working directory state
575 576 update update working directory (or switch revisions)
576 577
577 578 use "hg help" for the full list of commands or "hg -v" for details
578 579 [255]
579 580
580 581 $ hg skjdfks
581 582 hg: unknown command 'skjdfks'
582 583 Mercurial Distributed SCM
583 584
584 585 basic commands:
585 586
586 587 add add the specified files on the next commit
587 588 annotate show changeset information by line for each file
588 589 clone make a copy of an existing repository
589 590 commit commit the specified files or all outstanding changes
590 591 diff diff repository (or selected files)
591 592 export dump the header and diffs for one or more changesets
592 593 forget forget the specified files on the next commit
593 594 init create a new repository in the given directory
594 595 log show revision history of entire repository or files
595 596 merge merge working directory with another revision
596 597 pull pull changes from the specified source
597 598 push push changes to the specified destination
598 599 remove remove the specified files on the next commit
599 600 serve start stand-alone webserver
600 601 status show changed files in the working directory
601 602 summary summarize working directory state
602 603 update update working directory (or switch revisions)
603 604
604 605 use "hg help" for the full list of commands or "hg -v" for details
605 606 [255]
606 607
607 608 $ cat > helpext.py <<EOF
608 609 > import os
609 610 > from mercurial import commands
610 611 >
611 612 > def nohelp(ui, *args, **kwargs):
612 613 > pass
613 614 >
614 615 > cmdtable = {
615 616 > "nohelp": (nohelp, [], "hg nohelp"),
616 617 > }
617 618 >
618 619 > commands.norepo += ' nohelp'
619 620 > EOF
620 621 $ echo '[extensions]' >> $HGRCPATH
621 622 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
622 623
623 624 Test command with no help text
624 625
625 626 $ hg help nohelp
626 627 hg nohelp
627 628
628 629 (no help text available)
629 630
630 631 use "hg -v help nohelp" to show global options
631 632
632 633 Test that default list of commands omits extension commands
633 634
634 635 $ hg help
635 636 Mercurial Distributed SCM
636 637
637 638 list of commands:
638 639
639 640 add add the specified files on the next commit
640 641 addremove add all new files, delete all missing files
641 642 annotate show changeset information by line for each file
642 643 archive create an unversioned archive of a repository revision
643 644 backout reverse effect of earlier changeset
644 645 bisect subdivision search of changesets
645 646 branch set or show the current branch name
646 647 branches list repository named branches
647 648 bundle create a changegroup file
648 649 cat output the current or given revision of files
649 650 clone make a copy of an existing repository
650 651 commit commit the specified files or all outstanding changes
651 652 copy mark files as copied for the next commit
652 653 diff diff repository (or selected files)
653 654 export dump the header and diffs for one or more changesets
654 655 forget forget the specified files on the next commit
655 656 grep search for a pattern in specified files and revisions
656 657 heads show current repository heads or show branch heads
657 658 help show help for a given topic or a help overview
658 659 identify identify the working copy or specified revision
659 660 import import an ordered set of patches
660 661 incoming show new changesets found in source
661 662 init create a new repository in the given directory
662 663 locate locate files matching specific patterns
663 664 log show revision history of entire repository or files
664 665 manifest output the current or given revision of the project manifest
665 666 merge merge working directory with another revision
666 667 outgoing show changesets not found in the destination
667 668 parents show the parents of the working directory or revision
668 669 paths show aliases for remote repositories
669 670 pull pull changes from the specified source
670 671 push push changes to the specified destination
671 672 recover roll back an interrupted transaction
672 673 remove remove the specified files on the next commit
673 674 rename rename files; equivalent of copy + remove
674 675 resolve redo merges or set/view the merge status of files
675 676 revert restore individual files or directories to an earlier state
676 677 rollback roll back the last transaction (dangerous)
677 678 root print the root (top) of the current working directory
678 679 serve start stand-alone webserver
679 680 showconfig show combined config settings from all hgrc files
680 681 status show changed files in the working directory
681 682 summary summarize working directory state
682 683 tag add one or more tags for the current or given revision
683 684 tags list repository tags
684 685 tip show the tip revision
685 686 unbundle apply one or more changegroup files
686 687 update update working directory (or switch revisions)
687 688 verify verify the integrity of the repository
688 689 version output version and copyright information
689 690
690 691 enabled extensions:
691 692
692 693 helpext (no help text available)
693 694
694 695 additional help topics:
695 696
696 697 config Configuration Files
697 698 dates Date Formats
698 699 patterns File Name Patterns
699 700 environment Environment Variables
700 701 revisions Specifying Single Revisions
701 702 multirevs Specifying Multiple Revisions
702 703 revsets Specifying Revision Sets
703 704 diffs Diff Formats
704 705 templating Template Usage
705 706 urls URL Paths
706 707 extensions Using additional features
707 708 hgweb Configuring hgweb
708 709 glossary Glossary
709 710
710 711 use "hg -v help" to show aliases and global options
711 712
712 713 Test list of commands with command with no help text
713 714
714 715 $ hg help helpext
715 716 helpext extension - no help text available
716 717
717 718 list of commands:
718 719
719 720 nohelp (no help text available)
720 721
721 722 use "hg -v help helpext" to show aliases and global options
722 723
723 724 Test a help topic
724 725
725 726 $ hg help revs
726 727 Specifying Single Revisions
727 728
728 729 Mercurial supports several ways to specify individual revisions.
729 730
730 731 A plain integer is treated as a revision number. Negative integers are
731 732 treated as sequential offsets from the tip, with -1 denoting the tip, -2
732 733 denoting the revision prior to the tip, and so forth.
733 734
734 735 A 40-digit hexadecimal string is treated as a unique revision identifier.
735 736
736 737 A hexadecimal string less than 40 characters long is treated as a unique
737 738 revision identifier and is referred to as a short-form identifier. A
738 739 short-form identifier is only valid if it is the prefix of exactly one
739 740 full-length identifier.
740 741
741 742 Any other string is treated as a tag or branch name. A tag name is a
742 743 symbolic name associated with a revision identifier. A branch name denotes
743 744 the tipmost revision of that branch. Tag and branch names must not contain
744 745 the ":" character.
745 746
746 747 The reserved name "tip" is a special tag that always identifies the most
747 748 recent revision.
748 749
749 750 The reserved name "null" indicates the null revision. This is the revision
750 751 of an empty repository, and the parent of revision 0.
751 752
752 753 The reserved name "." indicates the working directory parent. If no
753 754 working directory is checked out, it is equivalent to null. If an
754 755 uncommitted merge is in progress, "." is the revision of the first parent.
General Comments 0
You need to be logged in to leave comments. Login now