##// END OF EJS Templates
py3: use bytes IO to write sample hgrc...
Yuya Nishihara -
r33650:62946544 default
parent child Browse files
Show More
@@ -1,5444 +1,5444 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 __future__ import absolute_import
9 9
10 10 import difflib
11 11 import errno
12 12 import os
13 13 import re
14 14 import sys
15 15
16 16 from .i18n import _
17 17 from .node import (
18 18 hex,
19 19 nullid,
20 20 nullrev,
21 21 short,
22 22 )
23 23 from . import (
24 24 archival,
25 25 bookmarks,
26 26 bundle2,
27 27 changegroup,
28 28 cmdutil,
29 29 copies,
30 30 debugcommands as debugcommandsmod,
31 31 destutil,
32 32 dirstateguard,
33 33 discovery,
34 34 encoding,
35 35 error,
36 36 exchange,
37 37 extensions,
38 38 formatter,
39 39 graphmod,
40 40 hbisect,
41 41 help,
42 42 hg,
43 43 lock as lockmod,
44 44 merge as mergemod,
45 45 obsolete,
46 46 patch,
47 47 phases,
48 48 pycompat,
49 49 rcutil,
50 50 registrar,
51 51 revsetlang,
52 52 scmutil,
53 53 server,
54 54 sshserver,
55 55 streamclone,
56 56 tags as tagsmod,
57 57 templatekw,
58 58 ui as uimod,
59 59 util,
60 60 )
61 61
62 62 release = lockmod.release
63 63
64 64 table = {}
65 65 table.update(debugcommandsmod.command._table)
66 66
67 67 command = registrar.command(table)
68 68
69 69 # common command options
70 70
71 71 globalopts = [
72 72 ('R', 'repository', '',
73 73 _('repository root directory or name of overlay bundle file'),
74 74 _('REPO')),
75 75 ('', 'cwd', '',
76 76 _('change working directory'), _('DIR')),
77 77 ('y', 'noninteractive', None,
78 78 _('do not prompt, automatically pick the first choice for all prompts')),
79 79 ('q', 'quiet', None, _('suppress output')),
80 80 ('v', 'verbose', None, _('enable additional output')),
81 81 ('', 'color', '',
82 82 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
83 83 # and should not be translated
84 84 _("when to colorize (boolean, always, auto, never, or debug)"),
85 85 _('TYPE')),
86 86 ('', 'config', [],
87 87 _('set/override config option (use \'section.name=value\')'),
88 88 _('CONFIG')),
89 89 ('', 'debug', None, _('enable debugging output')),
90 90 ('', 'debugger', None, _('start debugger')),
91 91 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
92 92 _('ENCODE')),
93 93 ('', 'encodingmode', encoding.encodingmode,
94 94 _('set the charset encoding mode'), _('MODE')),
95 95 ('', 'traceback', None, _('always print a traceback on exception')),
96 96 ('', 'time', None, _('time how long the command takes')),
97 97 ('', 'profile', None, _('print command execution profile')),
98 98 ('', 'version', None, _('output version information and exit')),
99 99 ('h', 'help', None, _('display help and exit')),
100 100 ('', 'hidden', False, _('consider hidden changesets')),
101 101 ('', 'pager', 'auto',
102 102 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
103 103 ]
104 104
105 105 dryrunopts = cmdutil.dryrunopts
106 106 remoteopts = cmdutil.remoteopts
107 107 walkopts = cmdutil.walkopts
108 108 commitopts = cmdutil.commitopts
109 109 commitopts2 = cmdutil.commitopts2
110 110 formatteropts = cmdutil.formatteropts
111 111 templateopts = cmdutil.templateopts
112 112 logopts = cmdutil.logopts
113 113 diffopts = cmdutil.diffopts
114 114 diffwsopts = cmdutil.diffwsopts
115 115 diffopts2 = cmdutil.diffopts2
116 116 mergetoolopts = cmdutil.mergetoolopts
117 117 similarityopts = cmdutil.similarityopts
118 118 subrepoopts = cmdutil.subrepoopts
119 119 debugrevlogopts = cmdutil.debugrevlogopts
120 120
121 121 # Commands start here, listed alphabetically
122 122
123 123 @command('^add',
124 124 walkopts + subrepoopts + dryrunopts,
125 125 _('[OPTION]... [FILE]...'),
126 126 inferrepo=True)
127 127 def add(ui, repo, *pats, **opts):
128 128 """add the specified files on the next commit
129 129
130 130 Schedule files to be version controlled and added to the
131 131 repository.
132 132
133 133 The files will be added to the repository at the next commit. To
134 134 undo an add before that, see :hg:`forget`.
135 135
136 136 If no names are given, add all files to the repository (except
137 137 files matching ``.hgignore``).
138 138
139 139 .. container:: verbose
140 140
141 141 Examples:
142 142
143 143 - New (unknown) files are added
144 144 automatically by :hg:`add`::
145 145
146 146 $ ls
147 147 foo.c
148 148 $ hg status
149 149 ? foo.c
150 150 $ hg add
151 151 adding foo.c
152 152 $ hg status
153 153 A foo.c
154 154
155 155 - Specific files to be added can be specified::
156 156
157 157 $ ls
158 158 bar.c foo.c
159 159 $ hg status
160 160 ? bar.c
161 161 ? foo.c
162 162 $ hg add bar.c
163 163 $ hg status
164 164 A bar.c
165 165 ? foo.c
166 166
167 167 Returns 0 if all files are successfully added.
168 168 """
169 169
170 170 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
171 171 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
172 172 return rejected and 1 or 0
173 173
174 174 @command('addremove',
175 175 similarityopts + subrepoopts + walkopts + dryrunopts,
176 176 _('[OPTION]... [FILE]...'),
177 177 inferrepo=True)
178 178 def addremove(ui, repo, *pats, **opts):
179 179 """add all new files, delete all missing files
180 180
181 181 Add all new files and remove all missing files from the
182 182 repository.
183 183
184 184 Unless names are given, new files are ignored if they match any of
185 185 the patterns in ``.hgignore``. As with add, these changes take
186 186 effect at the next commit.
187 187
188 188 Use the -s/--similarity option to detect renamed files. This
189 189 option takes a percentage between 0 (disabled) and 100 (files must
190 190 be identical) as its parameter. With a parameter greater than 0,
191 191 this compares every removed file with every added file and records
192 192 those similar enough as renames. Detecting renamed files this way
193 193 can be expensive. After using this option, :hg:`status -C` can be
194 194 used to check which files were identified as moved or renamed. If
195 195 not specified, -s/--similarity defaults to 100 and only renames of
196 196 identical files are detected.
197 197
198 198 .. container:: verbose
199 199
200 200 Examples:
201 201
202 202 - A number of files (bar.c and foo.c) are new,
203 203 while foobar.c has been removed (without using :hg:`remove`)
204 204 from the repository::
205 205
206 206 $ ls
207 207 bar.c foo.c
208 208 $ hg status
209 209 ! foobar.c
210 210 ? bar.c
211 211 ? foo.c
212 212 $ hg addremove
213 213 adding bar.c
214 214 adding foo.c
215 215 removing foobar.c
216 216 $ hg status
217 217 A bar.c
218 218 A foo.c
219 219 R foobar.c
220 220
221 221 - A file foobar.c was moved to foo.c without using :hg:`rename`.
222 222 Afterwards, it was edited slightly::
223 223
224 224 $ ls
225 225 foo.c
226 226 $ hg status
227 227 ! foobar.c
228 228 ? foo.c
229 229 $ hg addremove --similarity 90
230 230 removing foobar.c
231 231 adding foo.c
232 232 recording removal of foobar.c as rename to foo.c (94% similar)
233 233 $ hg status -C
234 234 A foo.c
235 235 foobar.c
236 236 R foobar.c
237 237
238 238 Returns 0 if all files are successfully added.
239 239 """
240 240 opts = pycompat.byteskwargs(opts)
241 241 try:
242 242 sim = float(opts.get('similarity') or 100)
243 243 except ValueError:
244 244 raise error.Abort(_('similarity must be a number'))
245 245 if sim < 0 or sim > 100:
246 246 raise error.Abort(_('similarity must be between 0 and 100'))
247 247 matcher = scmutil.match(repo[None], pats, opts)
248 248 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
249 249
250 250 @command('^annotate|blame',
251 251 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
252 252 ('', 'follow', None,
253 253 _('follow copies/renames and list the filename (DEPRECATED)')),
254 254 ('', 'no-follow', None, _("don't follow copies and renames")),
255 255 ('a', 'text', None, _('treat all files as text')),
256 256 ('u', 'user', None, _('list the author (long with -v)')),
257 257 ('f', 'file', None, _('list the filename')),
258 258 ('d', 'date', None, _('list the date (short with -q)')),
259 259 ('n', 'number', None, _('list the revision number (default)')),
260 260 ('c', 'changeset', None, _('list the changeset')),
261 261 ('l', 'line-number', None, _('show line number at the first appearance')),
262 262 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
263 263 ] + diffwsopts + walkopts + formatteropts,
264 264 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
265 265 inferrepo=True)
266 266 def annotate(ui, repo, *pats, **opts):
267 267 """show changeset information by line for each file
268 268
269 269 List changes in files, showing the revision id responsible for
270 270 each line.
271 271
272 272 This command is useful for discovering when a change was made and
273 273 by whom.
274 274
275 275 If you include --file, --user, or --date, the revision number is
276 276 suppressed unless you also include --number.
277 277
278 278 Without the -a/--text option, annotate will avoid processing files
279 279 it detects as binary. With -a, annotate will annotate the file
280 280 anyway, although the results will probably be neither useful
281 281 nor desirable.
282 282
283 283 Returns 0 on success.
284 284 """
285 285 opts = pycompat.byteskwargs(opts)
286 286 if not pats:
287 287 raise error.Abort(_('at least one filename or pattern is required'))
288 288
289 289 if opts.get('follow'):
290 290 # --follow is deprecated and now just an alias for -f/--file
291 291 # to mimic the behavior of Mercurial before version 1.5
292 292 opts['file'] = True
293 293
294 294 ctx = scmutil.revsingle(repo, opts.get('rev'))
295 295
296 296 rootfm = ui.formatter('annotate', opts)
297 297 if ui.quiet:
298 298 datefunc = util.shortdate
299 299 else:
300 300 datefunc = util.datestr
301 301 if ctx.rev() is None:
302 302 def hexfn(node):
303 303 if node is None:
304 304 return None
305 305 else:
306 306 return rootfm.hexfunc(node)
307 307 if opts.get('changeset'):
308 308 # omit "+" suffix which is appended to node hex
309 309 def formatrev(rev):
310 310 if rev is None:
311 311 return '%d' % ctx.p1().rev()
312 312 else:
313 313 return '%d' % rev
314 314 else:
315 315 def formatrev(rev):
316 316 if rev is None:
317 317 return '%d+' % ctx.p1().rev()
318 318 else:
319 319 return '%d ' % rev
320 320 def formathex(hex):
321 321 if hex is None:
322 322 return '%s+' % rootfm.hexfunc(ctx.p1().node())
323 323 else:
324 324 return '%s ' % hex
325 325 else:
326 326 hexfn = rootfm.hexfunc
327 327 formatrev = formathex = pycompat.bytestr
328 328
329 329 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
330 330 ('number', ' ', lambda x: x[0].rev(), formatrev),
331 331 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
332 332 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
333 333 ('file', ' ', lambda x: x[0].path(), str),
334 334 ('line_number', ':', lambda x: x[1], str),
335 335 ]
336 336 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
337 337
338 338 if (not opts.get('user') and not opts.get('changeset')
339 339 and not opts.get('date') and not opts.get('file')):
340 340 opts['number'] = True
341 341
342 342 linenumber = opts.get('line_number') is not None
343 343 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
344 344 raise error.Abort(_('at least one of -n/-c is required for -l'))
345 345
346 346 ui.pager('annotate')
347 347
348 348 if rootfm.isplain():
349 349 def makefunc(get, fmt):
350 350 return lambda x: fmt(get(x))
351 351 else:
352 352 def makefunc(get, fmt):
353 353 return get
354 354 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
355 355 if opts.get(op)]
356 356 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
357 357 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
358 358 if opts.get(op))
359 359
360 360 def bad(x, y):
361 361 raise error.Abort("%s: %s" % (x, y))
362 362
363 363 m = scmutil.match(ctx, pats, opts, badfn=bad)
364 364
365 365 follow = not opts.get('no_follow')
366 366 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
367 367 whitespace=True)
368 368 skiprevs = opts.get('skip')
369 369 if skiprevs:
370 370 skiprevs = scmutil.revrange(repo, skiprevs)
371 371
372 372 for abs in ctx.walk(m):
373 373 fctx = ctx[abs]
374 374 rootfm.startitem()
375 375 rootfm.data(abspath=abs, path=m.rel(abs))
376 376 if not opts.get('text') and fctx.isbinary():
377 377 rootfm.plain(_("%s: binary file\n")
378 378 % ((pats and m.rel(abs)) or abs))
379 379 continue
380 380
381 381 fm = rootfm.nested('lines')
382 382 lines = fctx.annotate(follow=follow, linenumber=linenumber,
383 383 skiprevs=skiprevs, diffopts=diffopts)
384 384 if not lines:
385 385 fm.end()
386 386 continue
387 387 formats = []
388 388 pieces = []
389 389
390 390 for f, sep in funcmap:
391 391 l = [f(n) for n, dummy in lines]
392 392 if fm.isplain():
393 393 sizes = [encoding.colwidth(x) for x in l]
394 394 ml = max(sizes)
395 395 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
396 396 else:
397 397 formats.append(['%s' for x in l])
398 398 pieces.append(l)
399 399
400 400 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
401 401 fm.startitem()
402 402 fm.write(fields, "".join(f), *p)
403 403 fm.write('line', ": %s", l[1])
404 404
405 405 if not lines[-1][1].endswith('\n'):
406 406 fm.plain('\n')
407 407 fm.end()
408 408
409 409 rootfm.end()
410 410
411 411 @command('archive',
412 412 [('', 'no-decode', None, _('do not pass files through decoders')),
413 413 ('p', 'prefix', '', _('directory prefix for files in archive'),
414 414 _('PREFIX')),
415 415 ('r', 'rev', '', _('revision to distribute'), _('REV')),
416 416 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
417 417 ] + subrepoopts + walkopts,
418 418 _('[OPTION]... DEST'))
419 419 def archive(ui, repo, dest, **opts):
420 420 '''create an unversioned archive of a repository revision
421 421
422 422 By default, the revision used is the parent of the working
423 423 directory; use -r/--rev to specify a different revision.
424 424
425 425 The archive type is automatically detected based on file
426 426 extension (to override, use -t/--type).
427 427
428 428 .. container:: verbose
429 429
430 430 Examples:
431 431
432 432 - create a zip file containing the 1.0 release::
433 433
434 434 hg archive -r 1.0 project-1.0.zip
435 435
436 436 - create a tarball excluding .hg files::
437 437
438 438 hg archive project.tar.gz -X ".hg*"
439 439
440 440 Valid types are:
441 441
442 442 :``files``: a directory full of files (default)
443 443 :``tar``: tar archive, uncompressed
444 444 :``tbz2``: tar archive, compressed using bzip2
445 445 :``tgz``: tar archive, compressed using gzip
446 446 :``uzip``: zip archive, uncompressed
447 447 :``zip``: zip archive, compressed using deflate
448 448
449 449 The exact name of the destination archive or directory is given
450 450 using a format string; see :hg:`help export` for details.
451 451
452 452 Each member added to an archive file has a directory prefix
453 453 prepended. Use -p/--prefix to specify a format string for the
454 454 prefix. The default is the basename of the archive, with suffixes
455 455 removed.
456 456
457 457 Returns 0 on success.
458 458 '''
459 459
460 460 opts = pycompat.byteskwargs(opts)
461 461 ctx = scmutil.revsingle(repo, opts.get('rev'))
462 462 if not ctx:
463 463 raise error.Abort(_('no working directory: please specify a revision'))
464 464 node = ctx.node()
465 465 dest = cmdutil.makefilename(repo, dest, node)
466 466 if os.path.realpath(dest) == repo.root:
467 467 raise error.Abort(_('repository root cannot be destination'))
468 468
469 469 kind = opts.get('type') or archival.guesskind(dest) or 'files'
470 470 prefix = opts.get('prefix')
471 471
472 472 if dest == '-':
473 473 if kind == 'files':
474 474 raise error.Abort(_('cannot archive plain files to stdout'))
475 475 dest = cmdutil.makefileobj(repo, dest)
476 476 if not prefix:
477 477 prefix = os.path.basename(repo.root) + '-%h'
478 478
479 479 prefix = cmdutil.makefilename(repo, prefix, node)
480 480 matchfn = scmutil.match(ctx, [], opts)
481 481 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
482 482 matchfn, prefix, subrepos=opts.get('subrepos'))
483 483
484 484 @command('backout',
485 485 [('', 'merge', None, _('merge with old dirstate parent after backout')),
486 486 ('', 'commit', None,
487 487 _('commit if no conflicts were encountered (DEPRECATED)')),
488 488 ('', 'no-commit', None, _('do not commit')),
489 489 ('', 'parent', '',
490 490 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
491 491 ('r', 'rev', '', _('revision to backout'), _('REV')),
492 492 ('e', 'edit', False, _('invoke editor on commit messages')),
493 493 ] + mergetoolopts + walkopts + commitopts + commitopts2,
494 494 _('[OPTION]... [-r] REV'))
495 495 def backout(ui, repo, node=None, rev=None, **opts):
496 496 '''reverse effect of earlier changeset
497 497
498 498 Prepare a new changeset with the effect of REV undone in the
499 499 current working directory. If no conflicts were encountered,
500 500 it will be committed immediately.
501 501
502 502 If REV is the parent of the working directory, then this new changeset
503 503 is committed automatically (unless --no-commit is specified).
504 504
505 505 .. note::
506 506
507 507 :hg:`backout` cannot be used to fix either an unwanted or
508 508 incorrect merge.
509 509
510 510 .. container:: verbose
511 511
512 512 Examples:
513 513
514 514 - Reverse the effect of the parent of the working directory.
515 515 This backout will be committed immediately::
516 516
517 517 hg backout -r .
518 518
519 519 - Reverse the effect of previous bad revision 23::
520 520
521 521 hg backout -r 23
522 522
523 523 - Reverse the effect of previous bad revision 23 and
524 524 leave changes uncommitted::
525 525
526 526 hg backout -r 23 --no-commit
527 527 hg commit -m "Backout revision 23"
528 528
529 529 By default, the pending changeset will have one parent,
530 530 maintaining a linear history. With --merge, the pending
531 531 changeset will instead have two parents: the old parent of the
532 532 working directory and a new child of REV that simply undoes REV.
533 533
534 534 Before version 1.7, the behavior without --merge was equivalent
535 535 to specifying --merge followed by :hg:`update --clean .` to
536 536 cancel the merge and leave the child of REV as a head to be
537 537 merged separately.
538 538
539 539 See :hg:`help dates` for a list of formats valid for -d/--date.
540 540
541 541 See :hg:`help revert` for a way to restore files to the state
542 542 of another revision.
543 543
544 544 Returns 0 on success, 1 if nothing to backout or there are unresolved
545 545 files.
546 546 '''
547 547 wlock = lock = None
548 548 try:
549 549 wlock = repo.wlock()
550 550 lock = repo.lock()
551 551 return _dobackout(ui, repo, node, rev, **opts)
552 552 finally:
553 553 release(lock, wlock)
554 554
555 555 def _dobackout(ui, repo, node=None, rev=None, **opts):
556 556 opts = pycompat.byteskwargs(opts)
557 557 if opts.get('commit') and opts.get('no_commit'):
558 558 raise error.Abort(_("cannot use --commit with --no-commit"))
559 559 if opts.get('merge') and opts.get('no_commit'):
560 560 raise error.Abort(_("cannot use --merge with --no-commit"))
561 561
562 562 if rev and node:
563 563 raise error.Abort(_("please specify just one revision"))
564 564
565 565 if not rev:
566 566 rev = node
567 567
568 568 if not rev:
569 569 raise error.Abort(_("please specify a revision to backout"))
570 570
571 571 date = opts.get('date')
572 572 if date:
573 573 opts['date'] = util.parsedate(date)
574 574
575 575 cmdutil.checkunfinished(repo)
576 576 cmdutil.bailifchanged(repo)
577 577 node = scmutil.revsingle(repo, rev).node()
578 578
579 579 op1, op2 = repo.dirstate.parents()
580 580 if not repo.changelog.isancestor(node, op1):
581 581 raise error.Abort(_('cannot backout change that is not an ancestor'))
582 582
583 583 p1, p2 = repo.changelog.parents(node)
584 584 if p1 == nullid:
585 585 raise error.Abort(_('cannot backout a change with no parents'))
586 586 if p2 != nullid:
587 587 if not opts.get('parent'):
588 588 raise error.Abort(_('cannot backout a merge changeset'))
589 589 p = repo.lookup(opts['parent'])
590 590 if p not in (p1, p2):
591 591 raise error.Abort(_('%s is not a parent of %s') %
592 592 (short(p), short(node)))
593 593 parent = p
594 594 else:
595 595 if opts.get('parent'):
596 596 raise error.Abort(_('cannot use --parent on non-merge changeset'))
597 597 parent = p1
598 598
599 599 # the backout should appear on the same branch
600 600 branch = repo.dirstate.branch()
601 601 bheads = repo.branchheads(branch)
602 602 rctx = scmutil.revsingle(repo, hex(parent))
603 603 if not opts.get('merge') and op1 != node:
604 604 dsguard = dirstateguard.dirstateguard(repo, 'backout')
605 605 try:
606 606 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
607 607 'backout')
608 608 stats = mergemod.update(repo, parent, True, True, node, False)
609 609 repo.setparents(op1, op2)
610 610 dsguard.close()
611 611 hg._showstats(repo, stats)
612 612 if stats[3]:
613 613 repo.ui.status(_("use 'hg resolve' to retry unresolved "
614 614 "file merges\n"))
615 615 return 1
616 616 finally:
617 617 ui.setconfig('ui', 'forcemerge', '', '')
618 618 lockmod.release(dsguard)
619 619 else:
620 620 hg.clean(repo, node, show_stats=False)
621 621 repo.dirstate.setbranch(branch)
622 622 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
623 623
624 624 if opts.get('no_commit'):
625 625 msg = _("changeset %s backed out, "
626 626 "don't forget to commit.\n")
627 627 ui.status(msg % short(node))
628 628 return 0
629 629
630 630 def commitfunc(ui, repo, message, match, opts):
631 631 editform = 'backout'
632 632 e = cmdutil.getcommiteditor(editform=editform,
633 633 **pycompat.strkwargs(opts))
634 634 if not message:
635 635 # we don't translate commit messages
636 636 message = "Backed out changeset %s" % short(node)
637 637 e = cmdutil.getcommiteditor(edit=True, editform=editform)
638 638 return repo.commit(message, opts.get('user'), opts.get('date'),
639 639 match, editor=e)
640 640 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
641 641 if not newnode:
642 642 ui.status(_("nothing changed\n"))
643 643 return 1
644 644 cmdutil.commitstatus(repo, newnode, branch, bheads)
645 645
646 646 def nice(node):
647 647 return '%d:%s' % (repo.changelog.rev(node), short(node))
648 648 ui.status(_('changeset %s backs out changeset %s\n') %
649 649 (nice(repo.changelog.tip()), nice(node)))
650 650 if opts.get('merge') and op1 != node:
651 651 hg.clean(repo, op1, show_stats=False)
652 652 ui.status(_('merging with changeset %s\n')
653 653 % nice(repo.changelog.tip()))
654 654 try:
655 655 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
656 656 'backout')
657 657 return hg.merge(repo, hex(repo.changelog.tip()))
658 658 finally:
659 659 ui.setconfig('ui', 'forcemerge', '', '')
660 660 return 0
661 661
662 662 @command('bisect',
663 663 [('r', 'reset', False, _('reset bisect state')),
664 664 ('g', 'good', False, _('mark changeset good')),
665 665 ('b', 'bad', False, _('mark changeset bad')),
666 666 ('s', 'skip', False, _('skip testing changeset')),
667 667 ('e', 'extend', False, _('extend the bisect range')),
668 668 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
669 669 ('U', 'noupdate', False, _('do not update to target'))],
670 670 _("[-gbsr] [-U] [-c CMD] [REV]"))
671 671 def bisect(ui, repo, rev=None, extra=None, command=None,
672 672 reset=None, good=None, bad=None, skip=None, extend=None,
673 673 noupdate=None):
674 674 """subdivision search of changesets
675 675
676 676 This command helps to find changesets which introduce problems. To
677 677 use, mark the earliest changeset you know exhibits the problem as
678 678 bad, then mark the latest changeset which is free from the problem
679 679 as good. Bisect will update your working directory to a revision
680 680 for testing (unless the -U/--noupdate option is specified). Once
681 681 you have performed tests, mark the working directory as good or
682 682 bad, and bisect will either update to another candidate changeset
683 683 or announce that it has found the bad revision.
684 684
685 685 As a shortcut, you can also use the revision argument to mark a
686 686 revision as good or bad without checking it out first.
687 687
688 688 If you supply a command, it will be used for automatic bisection.
689 689 The environment variable HG_NODE will contain the ID of the
690 690 changeset being tested. The exit status of the command will be
691 691 used to mark revisions as good or bad: status 0 means good, 125
692 692 means to skip the revision, 127 (command not found) will abort the
693 693 bisection, and any other non-zero exit status means the revision
694 694 is bad.
695 695
696 696 .. container:: verbose
697 697
698 698 Some examples:
699 699
700 700 - start a bisection with known bad revision 34, and good revision 12::
701 701
702 702 hg bisect --bad 34
703 703 hg bisect --good 12
704 704
705 705 - advance the current bisection by marking current revision as good or
706 706 bad::
707 707
708 708 hg bisect --good
709 709 hg bisect --bad
710 710
711 711 - mark the current revision, or a known revision, to be skipped (e.g. if
712 712 that revision is not usable because of another issue)::
713 713
714 714 hg bisect --skip
715 715 hg bisect --skip 23
716 716
717 717 - skip all revisions that do not touch directories ``foo`` or ``bar``::
718 718
719 719 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
720 720
721 721 - forget the current bisection::
722 722
723 723 hg bisect --reset
724 724
725 725 - use 'make && make tests' to automatically find the first broken
726 726 revision::
727 727
728 728 hg bisect --reset
729 729 hg bisect --bad 34
730 730 hg bisect --good 12
731 731 hg bisect --command "make && make tests"
732 732
733 733 - see all changesets whose states are already known in the current
734 734 bisection::
735 735
736 736 hg log -r "bisect(pruned)"
737 737
738 738 - see the changeset currently being bisected (especially useful
739 739 if running with -U/--noupdate)::
740 740
741 741 hg log -r "bisect(current)"
742 742
743 743 - see all changesets that took part in the current bisection::
744 744
745 745 hg log -r "bisect(range)"
746 746
747 747 - you can even get a nice graph::
748 748
749 749 hg log --graph -r "bisect(range)"
750 750
751 751 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
752 752
753 753 Returns 0 on success.
754 754 """
755 755 # backward compatibility
756 756 if rev in "good bad reset init".split():
757 757 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
758 758 cmd, rev, extra = rev, extra, None
759 759 if cmd == "good":
760 760 good = True
761 761 elif cmd == "bad":
762 762 bad = True
763 763 else:
764 764 reset = True
765 765 elif extra:
766 766 raise error.Abort(_('incompatible arguments'))
767 767
768 768 incompatibles = {
769 769 '--bad': bad,
770 770 '--command': bool(command),
771 771 '--extend': extend,
772 772 '--good': good,
773 773 '--reset': reset,
774 774 '--skip': skip,
775 775 }
776 776
777 777 enabled = [x for x in incompatibles if incompatibles[x]]
778 778
779 779 if len(enabled) > 1:
780 780 raise error.Abort(_('%s and %s are incompatible') %
781 781 tuple(sorted(enabled)[0:2]))
782 782
783 783 if reset:
784 784 hbisect.resetstate(repo)
785 785 return
786 786
787 787 state = hbisect.load_state(repo)
788 788
789 789 # update state
790 790 if good or bad or skip:
791 791 if rev:
792 792 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
793 793 else:
794 794 nodes = [repo.lookup('.')]
795 795 if good:
796 796 state['good'] += nodes
797 797 elif bad:
798 798 state['bad'] += nodes
799 799 elif skip:
800 800 state['skip'] += nodes
801 801 hbisect.save_state(repo, state)
802 802 if not (state['good'] and state['bad']):
803 803 return
804 804
805 805 def mayupdate(repo, node, show_stats=True):
806 806 """common used update sequence"""
807 807 if noupdate:
808 808 return
809 809 cmdutil.checkunfinished(repo)
810 810 cmdutil.bailifchanged(repo)
811 811 return hg.clean(repo, node, show_stats=show_stats)
812 812
813 813 displayer = cmdutil.show_changeset(ui, repo, {})
814 814
815 815 if command:
816 816 changesets = 1
817 817 if noupdate:
818 818 try:
819 819 node = state['current'][0]
820 820 except LookupError:
821 821 raise error.Abort(_('current bisect revision is unknown - '
822 822 'start a new bisect to fix'))
823 823 else:
824 824 node, p2 = repo.dirstate.parents()
825 825 if p2 != nullid:
826 826 raise error.Abort(_('current bisect revision is a merge'))
827 827 if rev:
828 828 node = repo[scmutil.revsingle(repo, rev, node)].node()
829 829 try:
830 830 while changesets:
831 831 # update state
832 832 state['current'] = [node]
833 833 hbisect.save_state(repo, state)
834 834 status = ui.system(command, environ={'HG_NODE': hex(node)},
835 835 blockedtag='bisect_check')
836 836 if status == 125:
837 837 transition = "skip"
838 838 elif status == 0:
839 839 transition = "good"
840 840 # status < 0 means process was killed
841 841 elif status == 127:
842 842 raise error.Abort(_("failed to execute %s") % command)
843 843 elif status < 0:
844 844 raise error.Abort(_("%s killed") % command)
845 845 else:
846 846 transition = "bad"
847 847 state[transition].append(node)
848 848 ctx = repo[node]
849 849 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
850 850 hbisect.checkstate(state)
851 851 # bisect
852 852 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
853 853 # update to next check
854 854 node = nodes[0]
855 855 mayupdate(repo, node, show_stats=False)
856 856 finally:
857 857 state['current'] = [node]
858 858 hbisect.save_state(repo, state)
859 859 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
860 860 return
861 861
862 862 hbisect.checkstate(state)
863 863
864 864 # actually bisect
865 865 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
866 866 if extend:
867 867 if not changesets:
868 868 extendnode = hbisect.extendrange(repo, state, nodes, good)
869 869 if extendnode is not None:
870 870 ui.write(_("Extending search to changeset %d:%s\n")
871 871 % (extendnode.rev(), extendnode))
872 872 state['current'] = [extendnode.node()]
873 873 hbisect.save_state(repo, state)
874 874 return mayupdate(repo, extendnode.node())
875 875 raise error.Abort(_("nothing to extend"))
876 876
877 877 if changesets == 0:
878 878 hbisect.printresult(ui, repo, state, displayer, nodes, good)
879 879 else:
880 880 assert len(nodes) == 1 # only a single node can be tested next
881 881 node = nodes[0]
882 882 # compute the approximate number of remaining tests
883 883 tests, size = 0, 2
884 884 while size <= changesets:
885 885 tests, size = tests + 1, size * 2
886 886 rev = repo.changelog.rev(node)
887 887 ui.write(_("Testing changeset %d:%s "
888 888 "(%d changesets remaining, ~%d tests)\n")
889 889 % (rev, short(node), changesets, tests))
890 890 state['current'] = [node]
891 891 hbisect.save_state(repo, state)
892 892 return mayupdate(repo, node)
893 893
894 894 @command('bookmarks|bookmark',
895 895 [('f', 'force', False, _('force')),
896 896 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
897 897 ('d', 'delete', False, _('delete a given bookmark')),
898 898 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
899 899 ('i', 'inactive', False, _('mark a bookmark inactive')),
900 900 ] + formatteropts,
901 901 _('hg bookmarks [OPTIONS]... [NAME]...'))
902 902 def bookmark(ui, repo, *names, **opts):
903 903 '''create a new bookmark or list existing bookmarks
904 904
905 905 Bookmarks are labels on changesets to help track lines of development.
906 906 Bookmarks are unversioned and can be moved, renamed and deleted.
907 907 Deleting or moving a bookmark has no effect on the associated changesets.
908 908
909 909 Creating or updating to a bookmark causes it to be marked as 'active'.
910 910 The active bookmark is indicated with a '*'.
911 911 When a commit is made, the active bookmark will advance to the new commit.
912 912 A plain :hg:`update` will also advance an active bookmark, if possible.
913 913 Updating away from a bookmark will cause it to be deactivated.
914 914
915 915 Bookmarks can be pushed and pulled between repositories (see
916 916 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
917 917 diverged, a new 'divergent bookmark' of the form 'name@path' will
918 918 be created. Using :hg:`merge` will resolve the divergence.
919 919
920 920 A bookmark named '@' has the special property that :hg:`clone` will
921 921 check it out by default if it exists.
922 922
923 923 .. container:: verbose
924 924
925 925 Examples:
926 926
927 927 - create an active bookmark for a new line of development::
928 928
929 929 hg book new-feature
930 930
931 931 - create an inactive bookmark as a place marker::
932 932
933 933 hg book -i reviewed
934 934
935 935 - create an inactive bookmark on another changeset::
936 936
937 937 hg book -r .^ tested
938 938
939 939 - rename bookmark turkey to dinner::
940 940
941 941 hg book -m turkey dinner
942 942
943 943 - move the '@' bookmark from another branch::
944 944
945 945 hg book -f @
946 946 '''
947 947 force = opts.get(r'force')
948 948 rev = opts.get(r'rev')
949 949 delete = opts.get(r'delete')
950 950 rename = opts.get(r'rename')
951 951 inactive = opts.get(r'inactive')
952 952
953 953 if delete and rename:
954 954 raise error.Abort(_("--delete and --rename are incompatible"))
955 955 if delete and rev:
956 956 raise error.Abort(_("--rev is incompatible with --delete"))
957 957 if rename and rev:
958 958 raise error.Abort(_("--rev is incompatible with --rename"))
959 959 if not names and (delete or rev):
960 960 raise error.Abort(_("bookmark name required"))
961 961
962 962 if delete or rename or names or inactive:
963 963 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
964 964 if delete:
965 965 bookmarks.delete(repo, tr, names)
966 966 elif rename:
967 967 if not names:
968 968 raise error.Abort(_("new bookmark name required"))
969 969 elif len(names) > 1:
970 970 raise error.Abort(_("only one new bookmark name allowed"))
971 971 bookmarks.rename(repo, tr, rename, names[0], force, inactive)
972 972 elif names:
973 973 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
974 974 elif inactive:
975 975 if len(repo._bookmarks) == 0:
976 976 ui.status(_("no bookmarks set\n"))
977 977 elif not repo._activebookmark:
978 978 ui.status(_("no active bookmark\n"))
979 979 else:
980 980 bookmarks.deactivate(repo)
981 981 else: # show bookmarks
982 982 bookmarks.printbookmarks(ui, repo, **opts)
983 983
984 984 @command('branch',
985 985 [('f', 'force', None,
986 986 _('set branch name even if it shadows an existing branch')),
987 987 ('C', 'clean', None, _('reset branch name to parent branch name'))],
988 988 _('[-fC] [NAME]'))
989 989 def branch(ui, repo, label=None, **opts):
990 990 """set or show the current branch name
991 991
992 992 .. note::
993 993
994 994 Branch names are permanent and global. Use :hg:`bookmark` to create a
995 995 light-weight bookmark instead. See :hg:`help glossary` for more
996 996 information about named branches and bookmarks.
997 997
998 998 With no argument, show the current branch name. With one argument,
999 999 set the working directory branch name (the branch will not exist
1000 1000 in the repository until the next commit). Standard practice
1001 1001 recommends that primary development take place on the 'default'
1002 1002 branch.
1003 1003
1004 1004 Unless -f/--force is specified, branch will not let you set a
1005 1005 branch name that already exists.
1006 1006
1007 1007 Use -C/--clean to reset the working directory branch to that of
1008 1008 the parent of the working directory, negating a previous branch
1009 1009 change.
1010 1010
1011 1011 Use the command :hg:`update` to switch to an existing branch. Use
1012 1012 :hg:`commit --close-branch` to mark this branch head as closed.
1013 1013 When all heads of a branch are closed, the branch will be
1014 1014 considered closed.
1015 1015
1016 1016 Returns 0 on success.
1017 1017 """
1018 1018 opts = pycompat.byteskwargs(opts)
1019 1019 if label:
1020 1020 label = label.strip()
1021 1021
1022 1022 if not opts.get('clean') and not label:
1023 1023 ui.write("%s\n" % repo.dirstate.branch())
1024 1024 return
1025 1025
1026 1026 with repo.wlock():
1027 1027 if opts.get('clean'):
1028 1028 label = repo[None].p1().branch()
1029 1029 repo.dirstate.setbranch(label)
1030 1030 ui.status(_('reset working directory to branch %s\n') % label)
1031 1031 elif label:
1032 1032 if not opts.get('force') and label in repo.branchmap():
1033 1033 if label not in [p.branch() for p in repo[None].parents()]:
1034 1034 raise error.Abort(_('a branch of the same name already'
1035 1035 ' exists'),
1036 1036 # i18n: "it" refers to an existing branch
1037 1037 hint=_("use 'hg update' to switch to it"))
1038 1038 scmutil.checknewlabel(repo, label, 'branch')
1039 1039 repo.dirstate.setbranch(label)
1040 1040 ui.status(_('marked working directory as branch %s\n') % label)
1041 1041
1042 1042 # find any open named branches aside from default
1043 1043 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1044 1044 if n != "default" and not c]
1045 1045 if not others:
1046 1046 ui.status(_('(branches are permanent and global, '
1047 1047 'did you want a bookmark?)\n'))
1048 1048
1049 1049 @command('branches',
1050 1050 [('a', 'active', False,
1051 1051 _('show only branches that have unmerged heads (DEPRECATED)')),
1052 1052 ('c', 'closed', False, _('show normal and closed branches')),
1053 1053 ] + formatteropts,
1054 1054 _('[-c]'))
1055 1055 def branches(ui, repo, active=False, closed=False, **opts):
1056 1056 """list repository named branches
1057 1057
1058 1058 List the repository's named branches, indicating which ones are
1059 1059 inactive. If -c/--closed is specified, also list branches which have
1060 1060 been marked closed (see :hg:`commit --close-branch`).
1061 1061
1062 1062 Use the command :hg:`update` to switch to an existing branch.
1063 1063
1064 1064 Returns 0.
1065 1065 """
1066 1066
1067 1067 opts = pycompat.byteskwargs(opts)
1068 1068 ui.pager('branches')
1069 1069 fm = ui.formatter('branches', opts)
1070 1070 hexfunc = fm.hexfunc
1071 1071
1072 1072 allheads = set(repo.heads())
1073 1073 branches = []
1074 1074 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1075 1075 isactive = not isclosed and bool(set(heads) & allheads)
1076 1076 branches.append((tag, repo[tip], isactive, not isclosed))
1077 1077 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1078 1078 reverse=True)
1079 1079
1080 1080 for tag, ctx, isactive, isopen in branches:
1081 1081 if active and not isactive:
1082 1082 continue
1083 1083 if isactive:
1084 1084 label = 'branches.active'
1085 1085 notice = ''
1086 1086 elif not isopen:
1087 1087 if not closed:
1088 1088 continue
1089 1089 label = 'branches.closed'
1090 1090 notice = _(' (closed)')
1091 1091 else:
1092 1092 label = 'branches.inactive'
1093 1093 notice = _(' (inactive)')
1094 1094 current = (tag == repo.dirstate.branch())
1095 1095 if current:
1096 1096 label = 'branches.current'
1097 1097
1098 1098 fm.startitem()
1099 1099 fm.write('branch', '%s', tag, label=label)
1100 1100 rev = ctx.rev()
1101 1101 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1102 1102 fmt = ' ' * padsize + ' %d:%s'
1103 1103 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1104 1104 label='log.changeset changeset.%s' % ctx.phasestr())
1105 1105 fm.context(ctx=ctx)
1106 1106 fm.data(active=isactive, closed=not isopen, current=current)
1107 1107 if not ui.quiet:
1108 1108 fm.plain(notice)
1109 1109 fm.plain('\n')
1110 1110 fm.end()
1111 1111
1112 1112 @command('bundle',
1113 1113 [('f', 'force', None, _('run even when the destination is unrelated')),
1114 1114 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1115 1115 _('REV')),
1116 1116 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1117 1117 _('BRANCH')),
1118 1118 ('', 'base', [],
1119 1119 _('a base changeset assumed to be available at the destination'),
1120 1120 _('REV')),
1121 1121 ('a', 'all', None, _('bundle all changesets in the repository')),
1122 1122 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1123 1123 ] + remoteopts,
1124 1124 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1125 1125 def bundle(ui, repo, fname, dest=None, **opts):
1126 1126 """create a bundle file
1127 1127
1128 1128 Generate a bundle file containing data to be added to a repository.
1129 1129
1130 1130 To create a bundle containing all changesets, use -a/--all
1131 1131 (or --base null). Otherwise, hg assumes the destination will have
1132 1132 all the nodes you specify with --base parameters. Otherwise, hg
1133 1133 will assume the repository has all the nodes in destination, or
1134 1134 default-push/default if no destination is specified.
1135 1135
1136 1136 You can change bundle format with the -t/--type option. See
1137 1137 :hg:`help bundlespec` for documentation on this format. By default,
1138 1138 the most appropriate format is used and compression defaults to
1139 1139 bzip2.
1140 1140
1141 1141 The bundle file can then be transferred using conventional means
1142 1142 and applied to another repository with the unbundle or pull
1143 1143 command. This is useful when direct push and pull are not
1144 1144 available or when exporting an entire repository is undesirable.
1145 1145
1146 1146 Applying bundles preserves all changeset contents including
1147 1147 permissions, copy/rename information, and revision history.
1148 1148
1149 1149 Returns 0 on success, 1 if no changes found.
1150 1150 """
1151 1151 opts = pycompat.byteskwargs(opts)
1152 1152 revs = None
1153 1153 if 'rev' in opts:
1154 1154 revstrings = opts['rev']
1155 1155 revs = scmutil.revrange(repo, revstrings)
1156 1156 if revstrings and not revs:
1157 1157 raise error.Abort(_('no commits to bundle'))
1158 1158
1159 1159 bundletype = opts.get('type', 'bzip2').lower()
1160 1160 try:
1161 1161 bcompression, cgversion, params = exchange.parsebundlespec(
1162 1162 repo, bundletype, strict=False)
1163 1163 except error.UnsupportedBundleSpecification as e:
1164 1164 raise error.Abort(str(e),
1165 1165 hint=_("see 'hg help bundlespec' for supported "
1166 1166 "values for --type"))
1167 1167
1168 1168 # Packed bundles are a pseudo bundle format for now.
1169 1169 if cgversion == 's1':
1170 1170 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1171 1171 hint=_("use 'hg debugcreatestreamclonebundle'"))
1172 1172
1173 1173 if opts.get('all'):
1174 1174 if dest:
1175 1175 raise error.Abort(_("--all is incompatible with specifying "
1176 1176 "a destination"))
1177 1177 if opts.get('base'):
1178 1178 ui.warn(_("ignoring --base because --all was specified\n"))
1179 1179 base = ['null']
1180 1180 else:
1181 1181 base = scmutil.revrange(repo, opts.get('base'))
1182 1182 if cgversion not in changegroup.supportedoutgoingversions(repo):
1183 1183 raise error.Abort(_("repository does not support bundle version %s") %
1184 1184 cgversion)
1185 1185
1186 1186 if base:
1187 1187 if dest:
1188 1188 raise error.Abort(_("--base is incompatible with specifying "
1189 1189 "a destination"))
1190 1190 common = [repo.lookup(rev) for rev in base]
1191 1191 heads = revs and map(repo.lookup, revs) or None
1192 1192 outgoing = discovery.outgoing(repo, common, heads)
1193 1193 else:
1194 1194 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1195 1195 dest, branches = hg.parseurl(dest, opts.get('branch'))
1196 1196 other = hg.peer(repo, opts, dest)
1197 1197 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1198 1198 heads = revs and map(repo.lookup, revs) or revs
1199 1199 outgoing = discovery.findcommonoutgoing(repo, other,
1200 1200 onlyheads=heads,
1201 1201 force=opts.get('force'),
1202 1202 portable=True)
1203 1203
1204 1204 if not outgoing.missing:
1205 1205 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1206 1206 return 1
1207 1207
1208 1208 if cgversion == '01': #bundle1
1209 1209 if bcompression is None:
1210 1210 bcompression = 'UN'
1211 1211 bversion = 'HG10' + bcompression
1212 1212 bcompression = None
1213 1213 elif cgversion in ('02', '03'):
1214 1214 bversion = 'HG20'
1215 1215 else:
1216 1216 raise error.ProgrammingError(
1217 1217 'bundle: unexpected changegroup version %s' % cgversion)
1218 1218
1219 1219 # TODO compression options should be derived from bundlespec parsing.
1220 1220 # This is a temporary hack to allow adjusting bundle compression
1221 1221 # level without a) formalizing the bundlespec changes to declare it
1222 1222 # b) introducing a command flag.
1223 1223 compopts = {}
1224 1224 complevel = ui.configint('experimental', 'bundlecomplevel')
1225 1225 if complevel is not None:
1226 1226 compopts['level'] = complevel
1227 1227
1228 1228
1229 1229 contentopts = {'cg.version': cgversion}
1230 1230 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1231 1231 contentopts['obsolescence'] = True
1232 1232 if repo.ui.configbool('experimental', 'bundle-phases'):
1233 1233 contentopts['phases'] = True
1234 1234 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1235 1235 contentopts, compression=bcompression,
1236 1236 compopts=compopts)
1237 1237
1238 1238 @command('cat',
1239 1239 [('o', 'output', '',
1240 1240 _('print output to file with formatted name'), _('FORMAT')),
1241 1241 ('r', 'rev', '', _('print the given revision'), _('REV')),
1242 1242 ('', 'decode', None, _('apply any matching decode filter')),
1243 1243 ] + walkopts + formatteropts,
1244 1244 _('[OPTION]... FILE...'),
1245 1245 inferrepo=True)
1246 1246 def cat(ui, repo, file1, *pats, **opts):
1247 1247 """output the current or given revision of files
1248 1248
1249 1249 Print the specified files as they were at the given revision. If
1250 1250 no revision is given, the parent of the working directory is used.
1251 1251
1252 1252 Output may be to a file, in which case the name of the file is
1253 1253 given using a format string. The formatting rules as follows:
1254 1254
1255 1255 :``%%``: literal "%" character
1256 1256 :``%s``: basename of file being printed
1257 1257 :``%d``: dirname of file being printed, or '.' if in repository root
1258 1258 :``%p``: root-relative path name of file being printed
1259 1259 :``%H``: changeset hash (40 hexadecimal digits)
1260 1260 :``%R``: changeset revision number
1261 1261 :``%h``: short-form changeset hash (12 hexadecimal digits)
1262 1262 :``%r``: zero-padded changeset revision number
1263 1263 :``%b``: basename of the exporting repository
1264 1264
1265 1265 Returns 0 on success.
1266 1266 """
1267 1267 ctx = scmutil.revsingle(repo, opts.get('rev'))
1268 1268 m = scmutil.match(ctx, (file1,) + pats, opts)
1269 1269 fntemplate = opts.pop('output', '')
1270 1270 if cmdutil.isstdiofilename(fntemplate):
1271 1271 fntemplate = ''
1272 1272
1273 1273 if fntemplate:
1274 1274 fm = formatter.nullformatter(ui, 'cat')
1275 1275 else:
1276 1276 ui.pager('cat')
1277 1277 fm = ui.formatter('cat', opts)
1278 1278 with fm:
1279 1279 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', **opts)
1280 1280
1281 1281 @command('^clone',
1282 1282 [('U', 'noupdate', None, _('the clone will include an empty working '
1283 1283 'directory (only a repository)')),
1284 1284 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1285 1285 _('REV')),
1286 1286 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1287 1287 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1288 1288 ('', 'pull', None, _('use pull protocol to copy metadata')),
1289 1289 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1290 1290 ] + remoteopts,
1291 1291 _('[OPTION]... SOURCE [DEST]'),
1292 1292 norepo=True)
1293 1293 def clone(ui, source, dest=None, **opts):
1294 1294 """make a copy of an existing repository
1295 1295
1296 1296 Create a copy of an existing repository in a new directory.
1297 1297
1298 1298 If no destination directory name is specified, it defaults to the
1299 1299 basename of the source.
1300 1300
1301 1301 The location of the source is added to the new repository's
1302 1302 ``.hg/hgrc`` file, as the default to be used for future pulls.
1303 1303
1304 1304 Only local paths and ``ssh://`` URLs are supported as
1305 1305 destinations. For ``ssh://`` destinations, no working directory or
1306 1306 ``.hg/hgrc`` will be created on the remote side.
1307 1307
1308 1308 If the source repository has a bookmark called '@' set, that
1309 1309 revision will be checked out in the new repository by default.
1310 1310
1311 1311 To check out a particular version, use -u/--update, or
1312 1312 -U/--noupdate to create a clone with no working directory.
1313 1313
1314 1314 To pull only a subset of changesets, specify one or more revisions
1315 1315 identifiers with -r/--rev or branches with -b/--branch. The
1316 1316 resulting clone will contain only the specified changesets and
1317 1317 their ancestors. These options (or 'clone src#rev dest') imply
1318 1318 --pull, even for local source repositories.
1319 1319
1320 1320 .. note::
1321 1321
1322 1322 Specifying a tag will include the tagged changeset but not the
1323 1323 changeset containing the tag.
1324 1324
1325 1325 .. container:: verbose
1326 1326
1327 1327 For efficiency, hardlinks are used for cloning whenever the
1328 1328 source and destination are on the same filesystem (note this
1329 1329 applies only to the repository data, not to the working
1330 1330 directory). Some filesystems, such as AFS, implement hardlinking
1331 1331 incorrectly, but do not report errors. In these cases, use the
1332 1332 --pull option to avoid hardlinking.
1333 1333
1334 1334 In some cases, you can clone repositories and the working
1335 1335 directory using full hardlinks with ::
1336 1336
1337 1337 $ cp -al REPO REPOCLONE
1338 1338
1339 1339 This is the fastest way to clone, but it is not always safe. The
1340 1340 operation is not atomic (making sure REPO is not modified during
1341 1341 the operation is up to you) and you have to make sure your
1342 1342 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1343 1343 so). Also, this is not compatible with certain extensions that
1344 1344 place their metadata under the .hg directory, such as mq.
1345 1345
1346 1346 Mercurial will update the working directory to the first applicable
1347 1347 revision from this list:
1348 1348
1349 1349 a) null if -U or the source repository has no changesets
1350 1350 b) if -u . and the source repository is local, the first parent of
1351 1351 the source repository's working directory
1352 1352 c) the changeset specified with -u (if a branch name, this means the
1353 1353 latest head of that branch)
1354 1354 d) the changeset specified with -r
1355 1355 e) the tipmost head specified with -b
1356 1356 f) the tipmost head specified with the url#branch source syntax
1357 1357 g) the revision marked with the '@' bookmark, if present
1358 1358 h) the tipmost head of the default branch
1359 1359 i) tip
1360 1360
1361 1361 When cloning from servers that support it, Mercurial may fetch
1362 1362 pre-generated data from a server-advertised URL. When this is done,
1363 1363 hooks operating on incoming changesets and changegroups may fire twice,
1364 1364 once for the bundle fetched from the URL and another for any additional
1365 1365 data not fetched from this URL. In addition, if an error occurs, the
1366 1366 repository may be rolled back to a partial clone. This behavior may
1367 1367 change in future releases. See :hg:`help -e clonebundles` for more.
1368 1368
1369 1369 Examples:
1370 1370
1371 1371 - clone a remote repository to a new directory named hg/::
1372 1372
1373 1373 hg clone https://www.mercurial-scm.org/repo/hg/
1374 1374
1375 1375 - create a lightweight local clone::
1376 1376
1377 1377 hg clone project/ project-feature/
1378 1378
1379 1379 - clone from an absolute path on an ssh server (note double-slash)::
1380 1380
1381 1381 hg clone ssh://user@server//home/projects/alpha/
1382 1382
1383 1383 - do a high-speed clone over a LAN while checking out a
1384 1384 specified version::
1385 1385
1386 1386 hg clone --uncompressed http://server/repo -u 1.5
1387 1387
1388 1388 - create a repository without changesets after a particular revision::
1389 1389
1390 1390 hg clone -r 04e544 experimental/ good/
1391 1391
1392 1392 - clone (and track) a particular named branch::
1393 1393
1394 1394 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1395 1395
1396 1396 See :hg:`help urls` for details on specifying URLs.
1397 1397
1398 1398 Returns 0 on success.
1399 1399 """
1400 1400 opts = pycompat.byteskwargs(opts)
1401 1401 if opts.get('noupdate') and opts.get('updaterev'):
1402 1402 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1403 1403
1404 1404 r = hg.clone(ui, opts, source, dest,
1405 1405 pull=opts.get('pull'),
1406 1406 stream=opts.get('uncompressed'),
1407 1407 rev=opts.get('rev'),
1408 1408 update=opts.get('updaterev') or not opts.get('noupdate'),
1409 1409 branch=opts.get('branch'),
1410 1410 shareopts=opts.get('shareopts'))
1411 1411
1412 1412 return r is None
1413 1413
1414 1414 @command('^commit|ci',
1415 1415 [('A', 'addremove', None,
1416 1416 _('mark new/missing files as added/removed before committing')),
1417 1417 ('', 'close-branch', None,
1418 1418 _('mark a branch head as closed')),
1419 1419 ('', 'amend', None, _('amend the parent of the working directory')),
1420 1420 ('s', 'secret', None, _('use the secret phase for committing')),
1421 1421 ('e', 'edit', None, _('invoke editor on commit messages')),
1422 1422 ('i', 'interactive', None, _('use interactive mode')),
1423 1423 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1424 1424 _('[OPTION]... [FILE]...'),
1425 1425 inferrepo=True)
1426 1426 def commit(ui, repo, *pats, **opts):
1427 1427 """commit the specified files or all outstanding changes
1428 1428
1429 1429 Commit changes to the given files into the repository. Unlike a
1430 1430 centralized SCM, this operation is a local operation. See
1431 1431 :hg:`push` for a way to actively distribute your changes.
1432 1432
1433 1433 If a list of files is omitted, all changes reported by :hg:`status`
1434 1434 will be committed.
1435 1435
1436 1436 If you are committing the result of a merge, do not provide any
1437 1437 filenames or -I/-X filters.
1438 1438
1439 1439 If no commit message is specified, Mercurial starts your
1440 1440 configured editor where you can enter a message. In case your
1441 1441 commit fails, you will find a backup of your message in
1442 1442 ``.hg/last-message.txt``.
1443 1443
1444 1444 The --close-branch flag can be used to mark the current branch
1445 1445 head closed. When all heads of a branch are closed, the branch
1446 1446 will be considered closed and no longer listed.
1447 1447
1448 1448 The --amend flag can be used to amend the parent of the
1449 1449 working directory with a new commit that contains the changes
1450 1450 in the parent in addition to those currently reported by :hg:`status`,
1451 1451 if there are any. The old commit is stored in a backup bundle in
1452 1452 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1453 1453 on how to restore it).
1454 1454
1455 1455 Message, user and date are taken from the amended commit unless
1456 1456 specified. When a message isn't specified on the command line,
1457 1457 the editor will open with the message of the amended commit.
1458 1458
1459 1459 It is not possible to amend public changesets (see :hg:`help phases`)
1460 1460 or changesets that have children.
1461 1461
1462 1462 See :hg:`help dates` for a list of formats valid for -d/--date.
1463 1463
1464 1464 Returns 0 on success, 1 if nothing changed.
1465 1465
1466 1466 .. container:: verbose
1467 1467
1468 1468 Examples:
1469 1469
1470 1470 - commit all files ending in .py::
1471 1471
1472 1472 hg commit --include "set:**.py"
1473 1473
1474 1474 - commit all non-binary files::
1475 1475
1476 1476 hg commit --exclude "set:binary()"
1477 1477
1478 1478 - amend the current commit and set the date to now::
1479 1479
1480 1480 hg commit --amend --date now
1481 1481 """
1482 1482 wlock = lock = None
1483 1483 try:
1484 1484 wlock = repo.wlock()
1485 1485 lock = repo.lock()
1486 1486 return _docommit(ui, repo, *pats, **opts)
1487 1487 finally:
1488 1488 release(lock, wlock)
1489 1489
1490 1490 def _docommit(ui, repo, *pats, **opts):
1491 1491 if opts.get(r'interactive'):
1492 1492 opts.pop(r'interactive')
1493 1493 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1494 1494 cmdutil.recordfilter, *pats,
1495 1495 **opts)
1496 1496 # ret can be 0 (no changes to record) or the value returned by
1497 1497 # commit(), 1 if nothing changed or None on success.
1498 1498 return 1 if ret == 0 else ret
1499 1499
1500 1500 opts = pycompat.byteskwargs(opts)
1501 1501 if opts.get('subrepos'):
1502 1502 if opts.get('amend'):
1503 1503 raise error.Abort(_('cannot amend with --subrepos'))
1504 1504 # Let --subrepos on the command line override config setting.
1505 1505 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1506 1506
1507 1507 cmdutil.checkunfinished(repo, commit=True)
1508 1508
1509 1509 branch = repo[None].branch()
1510 1510 bheads = repo.branchheads(branch)
1511 1511
1512 1512 extra = {}
1513 1513 if opts.get('close_branch'):
1514 1514 extra['close'] = 1
1515 1515
1516 1516 if not bheads:
1517 1517 raise error.Abort(_('can only close branch heads'))
1518 1518 elif opts.get('amend'):
1519 1519 if repo[None].parents()[0].p1().branch() != branch and \
1520 1520 repo[None].parents()[0].p2().branch() != branch:
1521 1521 raise error.Abort(_('can only close branch heads'))
1522 1522
1523 1523 if opts.get('amend'):
1524 1524 if ui.configbool('ui', 'commitsubrepos'):
1525 1525 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1526 1526
1527 1527 old = repo['.']
1528 1528 if not old.mutable():
1529 1529 raise error.Abort(_('cannot amend public changesets'))
1530 1530 if len(repo[None].parents()) > 1:
1531 1531 raise error.Abort(_('cannot amend while merging'))
1532 1532 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1533 1533 if not allowunstable and old.children():
1534 1534 raise error.Abort(_('cannot amend changeset with children'))
1535 1535
1536 1536 # Currently histedit gets confused if an amend happens while histedit
1537 1537 # is in progress. Since we have a checkunfinished command, we are
1538 1538 # temporarily honoring it.
1539 1539 #
1540 1540 # Note: eventually this guard will be removed. Please do not expect
1541 1541 # this behavior to remain.
1542 1542 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1543 1543 cmdutil.checkunfinished(repo)
1544 1544
1545 1545 # commitfunc is used only for temporary amend commit by cmdutil.amend
1546 1546 def commitfunc(ui, repo, message, match, opts):
1547 1547 return repo.commit(message,
1548 1548 opts.get('user') or old.user(),
1549 1549 opts.get('date') or old.date(),
1550 1550 match,
1551 1551 extra=extra)
1552 1552
1553 1553 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1554 1554 if node == old.node():
1555 1555 ui.status(_("nothing changed\n"))
1556 1556 return 1
1557 1557 else:
1558 1558 def commitfunc(ui, repo, message, match, opts):
1559 1559 overrides = {}
1560 1560 if opts.get('secret'):
1561 1561 overrides[('phases', 'new-commit')] = 'secret'
1562 1562
1563 1563 baseui = repo.baseui
1564 1564 with baseui.configoverride(overrides, 'commit'):
1565 1565 with ui.configoverride(overrides, 'commit'):
1566 1566 editform = cmdutil.mergeeditform(repo[None],
1567 1567 'commit.normal')
1568 1568 editor = cmdutil.getcommiteditor(
1569 1569 editform=editform, **pycompat.strkwargs(opts))
1570 1570 return repo.commit(message,
1571 1571 opts.get('user'),
1572 1572 opts.get('date'),
1573 1573 match,
1574 1574 editor=editor,
1575 1575 extra=extra)
1576 1576
1577 1577 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1578 1578
1579 1579 if not node:
1580 1580 stat = cmdutil.postcommitstatus(repo, pats, opts)
1581 1581 if stat[3]:
1582 1582 ui.status(_("nothing changed (%d missing files, see "
1583 1583 "'hg status')\n") % len(stat[3]))
1584 1584 else:
1585 1585 ui.status(_("nothing changed\n"))
1586 1586 return 1
1587 1587
1588 1588 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1589 1589
1590 1590 @command('config|showconfig|debugconfig',
1591 1591 [('u', 'untrusted', None, _('show untrusted configuration options')),
1592 1592 ('e', 'edit', None, _('edit user config')),
1593 1593 ('l', 'local', None, _('edit repository config')),
1594 1594 ('g', 'global', None, _('edit global config'))] + formatteropts,
1595 1595 _('[-u] [NAME]...'),
1596 1596 optionalrepo=True)
1597 1597 def config(ui, repo, *values, **opts):
1598 1598 """show combined config settings from all hgrc files
1599 1599
1600 1600 With no arguments, print names and values of all config items.
1601 1601
1602 1602 With one argument of the form section.name, print just the value
1603 1603 of that config item.
1604 1604
1605 1605 With multiple arguments, print names and values of all config
1606 1606 items with matching section names.
1607 1607
1608 1608 With --edit, start an editor on the user-level config file. With
1609 1609 --global, edit the system-wide config file. With --local, edit the
1610 1610 repository-level config file.
1611 1611
1612 1612 With --debug, the source (filename and line number) is printed
1613 1613 for each config item.
1614 1614
1615 1615 See :hg:`help config` for more information about config files.
1616 1616
1617 1617 Returns 0 on success, 1 if NAME does not exist.
1618 1618
1619 1619 """
1620 1620
1621 1621 opts = pycompat.byteskwargs(opts)
1622 1622 if opts.get('edit') or opts.get('local') or opts.get('global'):
1623 1623 if opts.get('local') and opts.get('global'):
1624 1624 raise error.Abort(_("can't use --local and --global together"))
1625 1625
1626 1626 if opts.get('local'):
1627 1627 if not repo:
1628 1628 raise error.Abort(_("can't use --local outside a repository"))
1629 1629 paths = [repo.vfs.join('hgrc')]
1630 1630 elif opts.get('global'):
1631 1631 paths = rcutil.systemrcpath()
1632 1632 else:
1633 1633 paths = rcutil.userrcpath()
1634 1634
1635 1635 for f in paths:
1636 1636 if os.path.exists(f):
1637 1637 break
1638 1638 else:
1639 1639 if opts.get('global'):
1640 1640 samplehgrc = uimod.samplehgrcs['global']
1641 1641 elif opts.get('local'):
1642 1642 samplehgrc = uimod.samplehgrcs['local']
1643 1643 else:
1644 1644 samplehgrc = uimod.samplehgrcs['user']
1645 1645
1646 1646 f = paths[0]
1647 fp = open(f, "w")
1648 fp.write(samplehgrc)
1647 fp = open(f, "wb")
1648 fp.write(util.tonativeeol(samplehgrc))
1649 1649 fp.close()
1650 1650
1651 1651 editor = ui.geteditor()
1652 1652 ui.system("%s \"%s\"" % (editor, f),
1653 1653 onerr=error.Abort, errprefix=_("edit failed"),
1654 1654 blockedtag='config_edit')
1655 1655 return
1656 1656 ui.pager('config')
1657 1657 fm = ui.formatter('config', opts)
1658 1658 for t, f in rcutil.rccomponents():
1659 1659 if t == 'path':
1660 1660 ui.debug('read config from: %s\n' % f)
1661 1661 elif t == 'items':
1662 1662 for section, name, value, source in f:
1663 1663 ui.debug('set config by: %s\n' % source)
1664 1664 else:
1665 1665 raise error.ProgrammingError('unknown rctype: %s' % t)
1666 1666 untrusted = bool(opts.get('untrusted'))
1667 1667 if values:
1668 1668 sections = [v for v in values if '.' not in v]
1669 1669 items = [v for v in values if '.' in v]
1670 1670 if len(items) > 1 or items and sections:
1671 1671 raise error.Abort(_('only one config item permitted'))
1672 1672 matched = False
1673 1673 for section, name, value in ui.walkconfig(untrusted=untrusted):
1674 1674 source = ui.configsource(section, name, untrusted)
1675 1675 value = pycompat.bytestr(value)
1676 1676 if fm.isplain():
1677 1677 source = source or 'none'
1678 1678 value = value.replace('\n', '\\n')
1679 1679 entryname = section + '.' + name
1680 1680 if values:
1681 1681 for v in values:
1682 1682 if v == section:
1683 1683 fm.startitem()
1684 1684 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1685 1685 fm.write('name value', '%s=%s\n', entryname, value)
1686 1686 matched = True
1687 1687 elif v == entryname:
1688 1688 fm.startitem()
1689 1689 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1690 1690 fm.write('value', '%s\n', value)
1691 1691 fm.data(name=entryname)
1692 1692 matched = True
1693 1693 else:
1694 1694 fm.startitem()
1695 1695 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1696 1696 fm.write('name value', '%s=%s\n', entryname, value)
1697 1697 matched = True
1698 1698 fm.end()
1699 1699 if matched:
1700 1700 return 0
1701 1701 return 1
1702 1702
1703 1703 @command('copy|cp',
1704 1704 [('A', 'after', None, _('record a copy that has already occurred')),
1705 1705 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1706 1706 ] + walkopts + dryrunopts,
1707 1707 _('[OPTION]... [SOURCE]... DEST'))
1708 1708 def copy(ui, repo, *pats, **opts):
1709 1709 """mark files as copied for the next commit
1710 1710
1711 1711 Mark dest as having copies of source files. If dest is a
1712 1712 directory, copies are put in that directory. If dest is a file,
1713 1713 the source must be a single file.
1714 1714
1715 1715 By default, this command copies the contents of files as they
1716 1716 exist in the working directory. If invoked with -A/--after, the
1717 1717 operation is recorded, but no copying is performed.
1718 1718
1719 1719 This command takes effect with the next commit. To undo a copy
1720 1720 before that, see :hg:`revert`.
1721 1721
1722 1722 Returns 0 on success, 1 if errors are encountered.
1723 1723 """
1724 1724 opts = pycompat.byteskwargs(opts)
1725 1725 with repo.wlock(False):
1726 1726 return cmdutil.copy(ui, repo, pats, opts)
1727 1727
1728 1728 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1729 1729 def debugcommands(ui, cmd='', *args):
1730 1730 """list all available commands and options"""
1731 1731 for cmd, vals in sorted(table.iteritems()):
1732 1732 cmd = cmd.split('|')[0].strip('^')
1733 1733 opts = ', '.join([i[1] for i in vals[1]])
1734 1734 ui.write('%s: %s\n' % (cmd, opts))
1735 1735
1736 1736 @command('debugcomplete',
1737 1737 [('o', 'options', None, _('show the command options'))],
1738 1738 _('[-o] CMD'),
1739 1739 norepo=True)
1740 1740 def debugcomplete(ui, cmd='', **opts):
1741 1741 """returns the completion list associated with the given command"""
1742 1742
1743 1743 if opts.get('options'):
1744 1744 options = []
1745 1745 otables = [globalopts]
1746 1746 if cmd:
1747 1747 aliases, entry = cmdutil.findcmd(cmd, table, False)
1748 1748 otables.append(entry[1])
1749 1749 for t in otables:
1750 1750 for o in t:
1751 1751 if "(DEPRECATED)" in o[3]:
1752 1752 continue
1753 1753 if o[0]:
1754 1754 options.append('-%s' % o[0])
1755 1755 options.append('--%s' % o[1])
1756 1756 ui.write("%s\n" % "\n".join(options))
1757 1757 return
1758 1758
1759 1759 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1760 1760 if ui.verbose:
1761 1761 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1762 1762 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1763 1763
1764 1764 @command('^diff',
1765 1765 [('r', 'rev', [], _('revision'), _('REV')),
1766 1766 ('c', 'change', '', _('change made by revision'), _('REV'))
1767 1767 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1768 1768 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1769 1769 inferrepo=True)
1770 1770 def diff(ui, repo, *pats, **opts):
1771 1771 """diff repository (or selected files)
1772 1772
1773 1773 Show differences between revisions for the specified files.
1774 1774
1775 1775 Differences between files are shown using the unified diff format.
1776 1776
1777 1777 .. note::
1778 1778
1779 1779 :hg:`diff` may generate unexpected results for merges, as it will
1780 1780 default to comparing against the working directory's first
1781 1781 parent changeset if no revisions are specified.
1782 1782
1783 1783 When two revision arguments are given, then changes are shown
1784 1784 between those revisions. If only one revision is specified then
1785 1785 that revision is compared to the working directory, and, when no
1786 1786 revisions are specified, the working directory files are compared
1787 1787 to its first parent.
1788 1788
1789 1789 Alternatively you can specify -c/--change with a revision to see
1790 1790 the changes in that changeset relative to its first parent.
1791 1791
1792 1792 Without the -a/--text option, diff will avoid generating diffs of
1793 1793 files it detects as binary. With -a, diff will generate a diff
1794 1794 anyway, probably with undesirable results.
1795 1795
1796 1796 Use the -g/--git option to generate diffs in the git extended diff
1797 1797 format. For more information, read :hg:`help diffs`.
1798 1798
1799 1799 .. container:: verbose
1800 1800
1801 1801 Examples:
1802 1802
1803 1803 - compare a file in the current working directory to its parent::
1804 1804
1805 1805 hg diff foo.c
1806 1806
1807 1807 - compare two historical versions of a directory, with rename info::
1808 1808
1809 1809 hg diff --git -r 1.0:1.2 lib/
1810 1810
1811 1811 - get change stats relative to the last change on some date::
1812 1812
1813 1813 hg diff --stat -r "date('may 2')"
1814 1814
1815 1815 - diff all newly-added files that contain a keyword::
1816 1816
1817 1817 hg diff "set:added() and grep(GNU)"
1818 1818
1819 1819 - compare a revision and its parents::
1820 1820
1821 1821 hg diff -c 9353 # compare against first parent
1822 1822 hg diff -r 9353^:9353 # same using revset syntax
1823 1823 hg diff -r 9353^2:9353 # compare against the second parent
1824 1824
1825 1825 Returns 0 on success.
1826 1826 """
1827 1827
1828 1828 opts = pycompat.byteskwargs(opts)
1829 1829 revs = opts.get('rev')
1830 1830 change = opts.get('change')
1831 1831 stat = opts.get('stat')
1832 1832 reverse = opts.get('reverse')
1833 1833
1834 1834 if revs and change:
1835 1835 msg = _('cannot specify --rev and --change at the same time')
1836 1836 raise error.Abort(msg)
1837 1837 elif change:
1838 1838 node2 = scmutil.revsingle(repo, change, None).node()
1839 1839 node1 = repo[node2].p1().node()
1840 1840 else:
1841 1841 node1, node2 = scmutil.revpair(repo, revs)
1842 1842
1843 1843 if reverse:
1844 1844 node1, node2 = node2, node1
1845 1845
1846 1846 diffopts = patch.diffallopts(ui, opts)
1847 1847 m = scmutil.match(repo[node2], pats, opts)
1848 1848 ui.pager('diff')
1849 1849 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1850 1850 listsubrepos=opts.get('subrepos'),
1851 1851 root=opts.get('root'))
1852 1852
1853 1853 @command('^export',
1854 1854 [('o', 'output', '',
1855 1855 _('print output to file with formatted name'), _('FORMAT')),
1856 1856 ('', 'switch-parent', None, _('diff against the second parent')),
1857 1857 ('r', 'rev', [], _('revisions to export'), _('REV')),
1858 1858 ] + diffopts,
1859 1859 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1860 1860 def export(ui, repo, *changesets, **opts):
1861 1861 """dump the header and diffs for one or more changesets
1862 1862
1863 1863 Print the changeset header and diffs for one or more revisions.
1864 1864 If no revision is given, the parent of the working directory is used.
1865 1865
1866 1866 The information shown in the changeset header is: author, date,
1867 1867 branch name (if non-default), changeset hash, parent(s) and commit
1868 1868 comment.
1869 1869
1870 1870 .. note::
1871 1871
1872 1872 :hg:`export` may generate unexpected diff output for merge
1873 1873 changesets, as it will compare the merge changeset against its
1874 1874 first parent only.
1875 1875
1876 1876 Output may be to a file, in which case the name of the file is
1877 1877 given using a format string. The formatting rules are as follows:
1878 1878
1879 1879 :``%%``: literal "%" character
1880 1880 :``%H``: changeset hash (40 hexadecimal digits)
1881 1881 :``%N``: number of patches being generated
1882 1882 :``%R``: changeset revision number
1883 1883 :``%b``: basename of the exporting repository
1884 1884 :``%h``: short-form changeset hash (12 hexadecimal digits)
1885 1885 :``%m``: first line of the commit message (only alphanumeric characters)
1886 1886 :``%n``: zero-padded sequence number, starting at 1
1887 1887 :``%r``: zero-padded changeset revision number
1888 1888
1889 1889 Without the -a/--text option, export will avoid generating diffs
1890 1890 of files it detects as binary. With -a, export will generate a
1891 1891 diff anyway, probably with undesirable results.
1892 1892
1893 1893 Use the -g/--git option to generate diffs in the git extended diff
1894 1894 format. See :hg:`help diffs` for more information.
1895 1895
1896 1896 With the --switch-parent option, the diff will be against the
1897 1897 second parent. It can be useful to review a merge.
1898 1898
1899 1899 .. container:: verbose
1900 1900
1901 1901 Examples:
1902 1902
1903 1903 - use export and import to transplant a bugfix to the current
1904 1904 branch::
1905 1905
1906 1906 hg export -r 9353 | hg import -
1907 1907
1908 1908 - export all the changesets between two revisions to a file with
1909 1909 rename information::
1910 1910
1911 1911 hg export --git -r 123:150 > changes.txt
1912 1912
1913 1913 - split outgoing changes into a series of patches with
1914 1914 descriptive names::
1915 1915
1916 1916 hg export -r "outgoing()" -o "%n-%m.patch"
1917 1917
1918 1918 Returns 0 on success.
1919 1919 """
1920 1920 opts = pycompat.byteskwargs(opts)
1921 1921 changesets += tuple(opts.get('rev', []))
1922 1922 if not changesets:
1923 1923 changesets = ['.']
1924 1924 revs = scmutil.revrange(repo, changesets)
1925 1925 if not revs:
1926 1926 raise error.Abort(_("export requires at least one changeset"))
1927 1927 if len(revs) > 1:
1928 1928 ui.note(_('exporting patches:\n'))
1929 1929 else:
1930 1930 ui.note(_('exporting patch:\n'))
1931 1931 ui.pager('export')
1932 1932 cmdutil.export(repo, revs, fntemplate=opts.get('output'),
1933 1933 switch_parent=opts.get('switch_parent'),
1934 1934 opts=patch.diffallopts(ui, opts))
1935 1935
1936 1936 @command('files',
1937 1937 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
1938 1938 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
1939 1939 ] + walkopts + formatteropts + subrepoopts,
1940 1940 _('[OPTION]... [FILE]...'))
1941 1941 def files(ui, repo, *pats, **opts):
1942 1942 """list tracked files
1943 1943
1944 1944 Print files under Mercurial control in the working directory or
1945 1945 specified revision for given files (excluding removed files).
1946 1946 Files can be specified as filenames or filesets.
1947 1947
1948 1948 If no files are given to match, this command prints the names
1949 1949 of all files under Mercurial control.
1950 1950
1951 1951 .. container:: verbose
1952 1952
1953 1953 Examples:
1954 1954
1955 1955 - list all files under the current directory::
1956 1956
1957 1957 hg files .
1958 1958
1959 1959 - shows sizes and flags for current revision::
1960 1960
1961 1961 hg files -vr .
1962 1962
1963 1963 - list all files named README::
1964 1964
1965 1965 hg files -I "**/README"
1966 1966
1967 1967 - list all binary files::
1968 1968
1969 1969 hg files "set:binary()"
1970 1970
1971 1971 - find files containing a regular expression::
1972 1972
1973 1973 hg files "set:grep('bob')"
1974 1974
1975 1975 - search tracked file contents with xargs and grep::
1976 1976
1977 1977 hg files -0 | xargs -0 grep foo
1978 1978
1979 1979 See :hg:`help patterns` and :hg:`help filesets` for more information
1980 1980 on specifying file patterns.
1981 1981
1982 1982 Returns 0 if a match is found, 1 otherwise.
1983 1983
1984 1984 """
1985 1985
1986 1986 opts = pycompat.byteskwargs(opts)
1987 1987 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
1988 1988
1989 1989 end = '\n'
1990 1990 if opts.get('print0'):
1991 1991 end = '\0'
1992 1992 fmt = '%s' + end
1993 1993
1994 1994 m = scmutil.match(ctx, pats, opts)
1995 1995 ui.pager('files')
1996 1996 with ui.formatter('files', opts) as fm:
1997 1997 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
1998 1998
1999 1999 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2000 2000 def forget(ui, repo, *pats, **opts):
2001 2001 """forget the specified files on the next commit
2002 2002
2003 2003 Mark the specified files so they will no longer be tracked
2004 2004 after the next commit.
2005 2005
2006 2006 This only removes files from the current branch, not from the
2007 2007 entire project history, and it does not delete them from the
2008 2008 working directory.
2009 2009
2010 2010 To delete the file from the working directory, see :hg:`remove`.
2011 2011
2012 2012 To undo a forget before the next commit, see :hg:`add`.
2013 2013
2014 2014 .. container:: verbose
2015 2015
2016 2016 Examples:
2017 2017
2018 2018 - forget newly-added binary files::
2019 2019
2020 2020 hg forget "set:added() and binary()"
2021 2021
2022 2022 - forget files that would be excluded by .hgignore::
2023 2023
2024 2024 hg forget "set:hgignore()"
2025 2025
2026 2026 Returns 0 on success.
2027 2027 """
2028 2028
2029 2029 opts = pycompat.byteskwargs(opts)
2030 2030 if not pats:
2031 2031 raise error.Abort(_('no files specified'))
2032 2032
2033 2033 m = scmutil.match(repo[None], pats, opts)
2034 2034 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2035 2035 return rejected and 1 or 0
2036 2036
2037 2037 @command(
2038 2038 'graft',
2039 2039 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2040 2040 ('c', 'continue', False, _('resume interrupted graft')),
2041 2041 ('e', 'edit', False, _('invoke editor on commit messages')),
2042 2042 ('', 'log', None, _('append graft info to log message')),
2043 2043 ('f', 'force', False, _('force graft')),
2044 2044 ('D', 'currentdate', False,
2045 2045 _('record the current date as commit date')),
2046 2046 ('U', 'currentuser', False,
2047 2047 _('record the current user as committer'), _('DATE'))]
2048 2048 + commitopts2 + mergetoolopts + dryrunopts,
2049 2049 _('[OPTION]... [-r REV]... REV...'))
2050 2050 def graft(ui, repo, *revs, **opts):
2051 2051 '''copy changes from other branches onto the current branch
2052 2052
2053 2053 This command uses Mercurial's merge logic to copy individual
2054 2054 changes from other branches without merging branches in the
2055 2055 history graph. This is sometimes known as 'backporting' or
2056 2056 'cherry-picking'. By default, graft will copy user, date, and
2057 2057 description from the source changesets.
2058 2058
2059 2059 Changesets that are ancestors of the current revision, that have
2060 2060 already been grafted, or that are merges will be skipped.
2061 2061
2062 2062 If --log is specified, log messages will have a comment appended
2063 2063 of the form::
2064 2064
2065 2065 (grafted from CHANGESETHASH)
2066 2066
2067 2067 If --force is specified, revisions will be grafted even if they
2068 2068 are already ancestors of or have been grafted to the destination.
2069 2069 This is useful when the revisions have since been backed out.
2070 2070
2071 2071 If a graft merge results in conflicts, the graft process is
2072 2072 interrupted so that the current merge can be manually resolved.
2073 2073 Once all conflicts are addressed, the graft process can be
2074 2074 continued with the -c/--continue option.
2075 2075
2076 2076 .. note::
2077 2077
2078 2078 The -c/--continue option does not reapply earlier options, except
2079 2079 for --force.
2080 2080
2081 2081 .. container:: verbose
2082 2082
2083 2083 Examples:
2084 2084
2085 2085 - copy a single change to the stable branch and edit its description::
2086 2086
2087 2087 hg update stable
2088 2088 hg graft --edit 9393
2089 2089
2090 2090 - graft a range of changesets with one exception, updating dates::
2091 2091
2092 2092 hg graft -D "2085::2093 and not 2091"
2093 2093
2094 2094 - continue a graft after resolving conflicts::
2095 2095
2096 2096 hg graft -c
2097 2097
2098 2098 - show the source of a grafted changeset::
2099 2099
2100 2100 hg log --debug -r .
2101 2101
2102 2102 - show revisions sorted by date::
2103 2103
2104 2104 hg log -r "sort(all(), date)"
2105 2105
2106 2106 See :hg:`help revisions` for more about specifying revisions.
2107 2107
2108 2108 Returns 0 on successful completion.
2109 2109 '''
2110 2110 with repo.wlock():
2111 2111 return _dograft(ui, repo, *revs, **opts)
2112 2112
2113 2113 def _dograft(ui, repo, *revs, **opts):
2114 2114 opts = pycompat.byteskwargs(opts)
2115 2115 if revs and opts.get('rev'):
2116 2116 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2117 2117 'revision ordering!\n'))
2118 2118
2119 2119 revs = list(revs)
2120 2120 revs.extend(opts.get('rev'))
2121 2121
2122 2122 if not opts.get('user') and opts.get('currentuser'):
2123 2123 opts['user'] = ui.username()
2124 2124 if not opts.get('date') and opts.get('currentdate'):
2125 2125 opts['date'] = "%d %d" % util.makedate()
2126 2126
2127 2127 editor = cmdutil.getcommiteditor(editform='graft',
2128 2128 **pycompat.strkwargs(opts))
2129 2129
2130 2130 cont = False
2131 2131 if opts.get('continue'):
2132 2132 cont = True
2133 2133 if revs:
2134 2134 raise error.Abort(_("can't specify --continue and revisions"))
2135 2135 # read in unfinished revisions
2136 2136 try:
2137 2137 nodes = repo.vfs.read('graftstate').splitlines()
2138 2138 revs = [repo[node].rev() for node in nodes]
2139 2139 except IOError as inst:
2140 2140 if inst.errno != errno.ENOENT:
2141 2141 raise
2142 2142 cmdutil.wrongtooltocontinue(repo, _('graft'))
2143 2143 else:
2144 2144 cmdutil.checkunfinished(repo)
2145 2145 cmdutil.bailifchanged(repo)
2146 2146 if not revs:
2147 2147 raise error.Abort(_('no revisions specified'))
2148 2148 revs = scmutil.revrange(repo, revs)
2149 2149
2150 2150 skipped = set()
2151 2151 # check for merges
2152 2152 for rev in repo.revs('%ld and merge()', revs):
2153 2153 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2154 2154 skipped.add(rev)
2155 2155 revs = [r for r in revs if r not in skipped]
2156 2156 if not revs:
2157 2157 return -1
2158 2158
2159 2159 # Don't check in the --continue case, in effect retaining --force across
2160 2160 # --continues. That's because without --force, any revisions we decided to
2161 2161 # skip would have been filtered out here, so they wouldn't have made their
2162 2162 # way to the graftstate. With --force, any revisions we would have otherwise
2163 2163 # skipped would not have been filtered out, and if they hadn't been applied
2164 2164 # already, they'd have been in the graftstate.
2165 2165 if not (cont or opts.get('force')):
2166 2166 # check for ancestors of dest branch
2167 2167 crev = repo['.'].rev()
2168 2168 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2169 2169 # XXX make this lazy in the future
2170 2170 # don't mutate while iterating, create a copy
2171 2171 for rev in list(revs):
2172 2172 if rev in ancestors:
2173 2173 ui.warn(_('skipping ancestor revision %d:%s\n') %
2174 2174 (rev, repo[rev]))
2175 2175 # XXX remove on list is slow
2176 2176 revs.remove(rev)
2177 2177 if not revs:
2178 2178 return -1
2179 2179
2180 2180 # analyze revs for earlier grafts
2181 2181 ids = {}
2182 2182 for ctx in repo.set("%ld", revs):
2183 2183 ids[ctx.hex()] = ctx.rev()
2184 2184 n = ctx.extra().get('source')
2185 2185 if n:
2186 2186 ids[n] = ctx.rev()
2187 2187
2188 2188 # check ancestors for earlier grafts
2189 2189 ui.debug('scanning for duplicate grafts\n')
2190 2190
2191 2191 # The only changesets we can be sure doesn't contain grafts of any
2192 2192 # revs, are the ones that are common ancestors of *all* revs:
2193 2193 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2194 2194 ctx = repo[rev]
2195 2195 n = ctx.extra().get('source')
2196 2196 if n in ids:
2197 2197 try:
2198 2198 r = repo[n].rev()
2199 2199 except error.RepoLookupError:
2200 2200 r = None
2201 2201 if r in revs:
2202 2202 ui.warn(_('skipping revision %d:%s '
2203 2203 '(already grafted to %d:%s)\n')
2204 2204 % (r, repo[r], rev, ctx))
2205 2205 revs.remove(r)
2206 2206 elif ids[n] in revs:
2207 2207 if r is None:
2208 2208 ui.warn(_('skipping already grafted revision %d:%s '
2209 2209 '(%d:%s also has unknown origin %s)\n')
2210 2210 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2211 2211 else:
2212 2212 ui.warn(_('skipping already grafted revision %d:%s '
2213 2213 '(%d:%s also has origin %d:%s)\n')
2214 2214 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2215 2215 revs.remove(ids[n])
2216 2216 elif ctx.hex() in ids:
2217 2217 r = ids[ctx.hex()]
2218 2218 ui.warn(_('skipping already grafted revision %d:%s '
2219 2219 '(was grafted from %d:%s)\n') %
2220 2220 (r, repo[r], rev, ctx))
2221 2221 revs.remove(r)
2222 2222 if not revs:
2223 2223 return -1
2224 2224
2225 2225 for pos, ctx in enumerate(repo.set("%ld", revs)):
2226 2226 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2227 2227 ctx.description().split('\n', 1)[0])
2228 2228 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2229 2229 if names:
2230 2230 desc += ' (%s)' % ' '.join(names)
2231 2231 ui.status(_('grafting %s\n') % desc)
2232 2232 if opts.get('dry_run'):
2233 2233 continue
2234 2234
2235 2235 source = ctx.extra().get('source')
2236 2236 extra = {}
2237 2237 if source:
2238 2238 extra['source'] = source
2239 2239 extra['intermediate-source'] = ctx.hex()
2240 2240 else:
2241 2241 extra['source'] = ctx.hex()
2242 2242 user = ctx.user()
2243 2243 if opts.get('user'):
2244 2244 user = opts['user']
2245 2245 date = ctx.date()
2246 2246 if opts.get('date'):
2247 2247 date = opts['date']
2248 2248 message = ctx.description()
2249 2249 if opts.get('log'):
2250 2250 message += '\n(grafted from %s)' % ctx.hex()
2251 2251
2252 2252 # we don't merge the first commit when continuing
2253 2253 if not cont:
2254 2254 # perform the graft merge with p1(rev) as 'ancestor'
2255 2255 try:
2256 2256 # ui.forcemerge is an internal variable, do not document
2257 2257 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2258 2258 'graft')
2259 2259 stats = mergemod.graft(repo, ctx, ctx.p1(),
2260 2260 ['local', 'graft'])
2261 2261 finally:
2262 2262 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2263 2263 # report any conflicts
2264 2264 if stats and stats[3] > 0:
2265 2265 # write out state for --continue
2266 2266 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2267 2267 repo.vfs.write('graftstate', ''.join(nodelines))
2268 2268 extra = ''
2269 2269 if opts.get('user'):
2270 2270 extra += ' --user %s' % util.shellquote(opts['user'])
2271 2271 if opts.get('date'):
2272 2272 extra += ' --date %s' % util.shellquote(opts['date'])
2273 2273 if opts.get('log'):
2274 2274 extra += ' --log'
2275 2275 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2276 2276 raise error.Abort(
2277 2277 _("unresolved conflicts, can't continue"),
2278 2278 hint=hint)
2279 2279 else:
2280 2280 cont = False
2281 2281
2282 2282 # commit
2283 2283 node = repo.commit(text=message, user=user,
2284 2284 date=date, extra=extra, editor=editor)
2285 2285 if node is None:
2286 2286 ui.warn(
2287 2287 _('note: graft of %d:%s created no changes to commit\n') %
2288 2288 (ctx.rev(), ctx))
2289 2289
2290 2290 # remove state when we complete successfully
2291 2291 if not opts.get('dry_run'):
2292 2292 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2293 2293
2294 2294 return 0
2295 2295
2296 2296 @command('grep',
2297 2297 [('0', 'print0', None, _('end fields with NUL')),
2298 2298 ('', 'all', None, _('print all revisions that match')),
2299 2299 ('a', 'text', None, _('treat all files as text')),
2300 2300 ('f', 'follow', None,
2301 2301 _('follow changeset history,'
2302 2302 ' or file history across copies and renames')),
2303 2303 ('i', 'ignore-case', None, _('ignore case when matching')),
2304 2304 ('l', 'files-with-matches', None,
2305 2305 _('print only filenames and revisions that match')),
2306 2306 ('n', 'line-number', None, _('print matching line numbers')),
2307 2307 ('r', 'rev', [],
2308 2308 _('only search files changed within revision range'), _('REV')),
2309 2309 ('u', 'user', None, _('list the author (long with -v)')),
2310 2310 ('d', 'date', None, _('list the date (short with -q)')),
2311 2311 ] + formatteropts + walkopts,
2312 2312 _('[OPTION]... PATTERN [FILE]...'),
2313 2313 inferrepo=True)
2314 2314 def grep(ui, repo, pattern, *pats, **opts):
2315 2315 """search revision history for a pattern in specified files
2316 2316
2317 2317 Search revision history for a regular expression in the specified
2318 2318 files or the entire project.
2319 2319
2320 2320 By default, grep prints the most recent revision number for each
2321 2321 file in which it finds a match. To get it to print every revision
2322 2322 that contains a change in match status ("-" for a match that becomes
2323 2323 a non-match, or "+" for a non-match that becomes a match), use the
2324 2324 --all flag.
2325 2325
2326 2326 PATTERN can be any Python (roughly Perl-compatible) regular
2327 2327 expression.
2328 2328
2329 2329 If no FILEs are specified (and -f/--follow isn't set), all files in
2330 2330 the repository are searched, including those that don't exist in the
2331 2331 current branch or have been deleted in a prior changeset.
2332 2332
2333 2333 Returns 0 if a match is found, 1 otherwise.
2334 2334 """
2335 2335 opts = pycompat.byteskwargs(opts)
2336 2336 reflags = re.M
2337 2337 if opts.get('ignore_case'):
2338 2338 reflags |= re.I
2339 2339 try:
2340 2340 regexp = util.re.compile(pattern, reflags)
2341 2341 except re.error as inst:
2342 2342 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2343 2343 return 1
2344 2344 sep, eol = ':', '\n'
2345 2345 if opts.get('print0'):
2346 2346 sep = eol = '\0'
2347 2347
2348 2348 getfile = util.lrucachefunc(repo.file)
2349 2349
2350 2350 def matchlines(body):
2351 2351 begin = 0
2352 2352 linenum = 0
2353 2353 while begin < len(body):
2354 2354 match = regexp.search(body, begin)
2355 2355 if not match:
2356 2356 break
2357 2357 mstart, mend = match.span()
2358 2358 linenum += body.count('\n', begin, mstart) + 1
2359 2359 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2360 2360 begin = body.find('\n', mend) + 1 or len(body) + 1
2361 2361 lend = begin - 1
2362 2362 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2363 2363
2364 2364 class linestate(object):
2365 2365 def __init__(self, line, linenum, colstart, colend):
2366 2366 self.line = line
2367 2367 self.linenum = linenum
2368 2368 self.colstart = colstart
2369 2369 self.colend = colend
2370 2370
2371 2371 def __hash__(self):
2372 2372 return hash((self.linenum, self.line))
2373 2373
2374 2374 def __eq__(self, other):
2375 2375 return self.line == other.line
2376 2376
2377 2377 def findpos(self):
2378 2378 """Iterate all (start, end) indices of matches"""
2379 2379 yield self.colstart, self.colend
2380 2380 p = self.colend
2381 2381 while p < len(self.line):
2382 2382 m = regexp.search(self.line, p)
2383 2383 if not m:
2384 2384 break
2385 2385 yield m.span()
2386 2386 p = m.end()
2387 2387
2388 2388 matches = {}
2389 2389 copies = {}
2390 2390 def grepbody(fn, rev, body):
2391 2391 matches[rev].setdefault(fn, [])
2392 2392 m = matches[rev][fn]
2393 2393 for lnum, cstart, cend, line in matchlines(body):
2394 2394 s = linestate(line, lnum, cstart, cend)
2395 2395 m.append(s)
2396 2396
2397 2397 def difflinestates(a, b):
2398 2398 sm = difflib.SequenceMatcher(None, a, b)
2399 2399 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2400 2400 if tag == 'insert':
2401 2401 for i in xrange(blo, bhi):
2402 2402 yield ('+', b[i])
2403 2403 elif tag == 'delete':
2404 2404 for i in xrange(alo, ahi):
2405 2405 yield ('-', a[i])
2406 2406 elif tag == 'replace':
2407 2407 for i in xrange(alo, ahi):
2408 2408 yield ('-', a[i])
2409 2409 for i in xrange(blo, bhi):
2410 2410 yield ('+', b[i])
2411 2411
2412 2412 def display(fm, fn, ctx, pstates, states):
2413 2413 rev = ctx.rev()
2414 2414 if fm.isplain():
2415 2415 formatuser = ui.shortuser
2416 2416 else:
2417 2417 formatuser = str
2418 2418 if ui.quiet:
2419 2419 datefmt = '%Y-%m-%d'
2420 2420 else:
2421 2421 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2422 2422 found = False
2423 2423 @util.cachefunc
2424 2424 def binary():
2425 2425 flog = getfile(fn)
2426 2426 return util.binary(flog.read(ctx.filenode(fn)))
2427 2427
2428 2428 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2429 2429 if opts.get('all'):
2430 2430 iter = difflinestates(pstates, states)
2431 2431 else:
2432 2432 iter = [('', l) for l in states]
2433 2433 for change, l in iter:
2434 2434 fm.startitem()
2435 2435 fm.data(node=fm.hexfunc(ctx.node()))
2436 2436 cols = [
2437 2437 ('filename', fn, True),
2438 2438 ('rev', rev, True),
2439 2439 ('linenumber', l.linenum, opts.get('line_number')),
2440 2440 ]
2441 2441 if opts.get('all'):
2442 2442 cols.append(('change', change, True))
2443 2443 cols.extend([
2444 2444 ('user', formatuser(ctx.user()), opts.get('user')),
2445 2445 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2446 2446 ])
2447 2447 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2448 2448 for name, data, cond in cols:
2449 2449 field = fieldnamemap.get(name, name)
2450 2450 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2451 2451 if cond and name != lastcol:
2452 2452 fm.plain(sep, label='grep.sep')
2453 2453 if not opts.get('files_with_matches'):
2454 2454 fm.plain(sep, label='grep.sep')
2455 2455 if not opts.get('text') and binary():
2456 2456 fm.plain(_(" Binary file matches"))
2457 2457 else:
2458 2458 displaymatches(fm.nested('texts'), l)
2459 2459 fm.plain(eol)
2460 2460 found = True
2461 2461 if opts.get('files_with_matches'):
2462 2462 break
2463 2463 return found
2464 2464
2465 2465 def displaymatches(fm, l):
2466 2466 p = 0
2467 2467 for s, e in l.findpos():
2468 2468 if p < s:
2469 2469 fm.startitem()
2470 2470 fm.write('text', '%s', l.line[p:s])
2471 2471 fm.data(matched=False)
2472 2472 fm.startitem()
2473 2473 fm.write('text', '%s', l.line[s:e], label='grep.match')
2474 2474 fm.data(matched=True)
2475 2475 p = e
2476 2476 if p < len(l.line):
2477 2477 fm.startitem()
2478 2478 fm.write('text', '%s', l.line[p:])
2479 2479 fm.data(matched=False)
2480 2480 fm.end()
2481 2481
2482 2482 skip = {}
2483 2483 revfiles = {}
2484 2484 matchfn = scmutil.match(repo[None], pats, opts)
2485 2485 found = False
2486 2486 follow = opts.get('follow')
2487 2487
2488 2488 def prep(ctx, fns):
2489 2489 rev = ctx.rev()
2490 2490 pctx = ctx.p1()
2491 2491 parent = pctx.rev()
2492 2492 matches.setdefault(rev, {})
2493 2493 matches.setdefault(parent, {})
2494 2494 files = revfiles.setdefault(rev, [])
2495 2495 for fn in fns:
2496 2496 flog = getfile(fn)
2497 2497 try:
2498 2498 fnode = ctx.filenode(fn)
2499 2499 except error.LookupError:
2500 2500 continue
2501 2501
2502 2502 copied = flog.renamed(fnode)
2503 2503 copy = follow and copied and copied[0]
2504 2504 if copy:
2505 2505 copies.setdefault(rev, {})[fn] = copy
2506 2506 if fn in skip:
2507 2507 if copy:
2508 2508 skip[copy] = True
2509 2509 continue
2510 2510 files.append(fn)
2511 2511
2512 2512 if fn not in matches[rev]:
2513 2513 grepbody(fn, rev, flog.read(fnode))
2514 2514
2515 2515 pfn = copy or fn
2516 2516 if pfn not in matches[parent]:
2517 2517 try:
2518 2518 fnode = pctx.filenode(pfn)
2519 2519 grepbody(pfn, parent, flog.read(fnode))
2520 2520 except error.LookupError:
2521 2521 pass
2522 2522
2523 2523 ui.pager('grep')
2524 2524 fm = ui.formatter('grep', opts)
2525 2525 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2526 2526 rev = ctx.rev()
2527 2527 parent = ctx.p1().rev()
2528 2528 for fn in sorted(revfiles.get(rev, [])):
2529 2529 states = matches[rev][fn]
2530 2530 copy = copies.get(rev, {}).get(fn)
2531 2531 if fn in skip:
2532 2532 if copy:
2533 2533 skip[copy] = True
2534 2534 continue
2535 2535 pstates = matches.get(parent, {}).get(copy or fn, [])
2536 2536 if pstates or states:
2537 2537 r = display(fm, fn, ctx, pstates, states)
2538 2538 found = found or r
2539 2539 if r and not opts.get('all'):
2540 2540 skip[fn] = True
2541 2541 if copy:
2542 2542 skip[copy] = True
2543 2543 del matches[rev]
2544 2544 del revfiles[rev]
2545 2545 fm.end()
2546 2546
2547 2547 return not found
2548 2548
2549 2549 @command('heads',
2550 2550 [('r', 'rev', '',
2551 2551 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2552 2552 ('t', 'topo', False, _('show topological heads only')),
2553 2553 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2554 2554 ('c', 'closed', False, _('show normal and closed branch heads')),
2555 2555 ] + templateopts,
2556 2556 _('[-ct] [-r STARTREV] [REV]...'))
2557 2557 def heads(ui, repo, *branchrevs, **opts):
2558 2558 """show branch heads
2559 2559
2560 2560 With no arguments, show all open branch heads in the repository.
2561 2561 Branch heads are changesets that have no descendants on the
2562 2562 same branch. They are where development generally takes place and
2563 2563 are the usual targets for update and merge operations.
2564 2564
2565 2565 If one or more REVs are given, only open branch heads on the
2566 2566 branches associated with the specified changesets are shown. This
2567 2567 means that you can use :hg:`heads .` to see the heads on the
2568 2568 currently checked-out branch.
2569 2569
2570 2570 If -c/--closed is specified, also show branch heads marked closed
2571 2571 (see :hg:`commit --close-branch`).
2572 2572
2573 2573 If STARTREV is specified, only those heads that are descendants of
2574 2574 STARTREV will be displayed.
2575 2575
2576 2576 If -t/--topo is specified, named branch mechanics will be ignored and only
2577 2577 topological heads (changesets with no children) will be shown.
2578 2578
2579 2579 Returns 0 if matching heads are found, 1 if not.
2580 2580 """
2581 2581
2582 2582 opts = pycompat.byteskwargs(opts)
2583 2583 start = None
2584 2584 if 'rev' in opts:
2585 2585 start = scmutil.revsingle(repo, opts['rev'], None).node()
2586 2586
2587 2587 if opts.get('topo'):
2588 2588 heads = [repo[h] for h in repo.heads(start)]
2589 2589 else:
2590 2590 heads = []
2591 2591 for branch in repo.branchmap():
2592 2592 heads += repo.branchheads(branch, start, opts.get('closed'))
2593 2593 heads = [repo[h] for h in heads]
2594 2594
2595 2595 if branchrevs:
2596 2596 branches = set(repo[br].branch() for br in branchrevs)
2597 2597 heads = [h for h in heads if h.branch() in branches]
2598 2598
2599 2599 if opts.get('active') and branchrevs:
2600 2600 dagheads = repo.heads(start)
2601 2601 heads = [h for h in heads if h.node() in dagheads]
2602 2602
2603 2603 if branchrevs:
2604 2604 haveheads = set(h.branch() for h in heads)
2605 2605 if branches - haveheads:
2606 2606 headless = ', '.join(b for b in branches - haveheads)
2607 2607 msg = _('no open branch heads found on branches %s')
2608 2608 if opts.get('rev'):
2609 2609 msg += _(' (started at %s)') % opts['rev']
2610 2610 ui.warn((msg + '\n') % headless)
2611 2611
2612 2612 if not heads:
2613 2613 return 1
2614 2614
2615 2615 ui.pager('heads')
2616 2616 heads = sorted(heads, key=lambda x: -x.rev())
2617 2617 displayer = cmdutil.show_changeset(ui, repo, opts)
2618 2618 for ctx in heads:
2619 2619 displayer.show(ctx)
2620 2620 displayer.close()
2621 2621
2622 2622 @command('help',
2623 2623 [('e', 'extension', None, _('show only help for extensions')),
2624 2624 ('c', 'command', None, _('show only help for commands')),
2625 2625 ('k', 'keyword', None, _('show topics matching keyword')),
2626 2626 ('s', 'system', [], _('show help for specific platform(s)')),
2627 2627 ],
2628 2628 _('[-ecks] [TOPIC]'),
2629 2629 norepo=True)
2630 2630 def help_(ui, name=None, **opts):
2631 2631 """show help for a given topic or a help overview
2632 2632
2633 2633 With no arguments, print a list of commands with short help messages.
2634 2634
2635 2635 Given a topic, extension, or command name, print help for that
2636 2636 topic.
2637 2637
2638 2638 Returns 0 if successful.
2639 2639 """
2640 2640
2641 2641 keep = opts.get(r'system') or []
2642 2642 if len(keep) == 0:
2643 2643 if pycompat.sysplatform.startswith('win'):
2644 2644 keep.append('windows')
2645 2645 elif pycompat.sysplatform == 'OpenVMS':
2646 2646 keep.append('vms')
2647 2647 elif pycompat.sysplatform == 'plan9':
2648 2648 keep.append('plan9')
2649 2649 else:
2650 2650 keep.append('unix')
2651 2651 keep.append(pycompat.sysplatform.lower())
2652 2652 if ui.verbose:
2653 2653 keep.append('verbose')
2654 2654
2655 2655 commands = sys.modules[__name__]
2656 2656 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
2657 2657 ui.pager('help')
2658 2658 ui.write(formatted)
2659 2659
2660 2660
2661 2661 @command('identify|id',
2662 2662 [('r', 'rev', '',
2663 2663 _('identify the specified revision'), _('REV')),
2664 2664 ('n', 'num', None, _('show local revision number')),
2665 2665 ('i', 'id', None, _('show global revision id')),
2666 2666 ('b', 'branch', None, _('show branch')),
2667 2667 ('t', 'tags', None, _('show tags')),
2668 2668 ('B', 'bookmarks', None, _('show bookmarks')),
2669 2669 ] + remoteopts + formatteropts,
2670 2670 _('[-nibtB] [-r REV] [SOURCE]'),
2671 2671 optionalrepo=True)
2672 2672 def identify(ui, repo, source=None, rev=None,
2673 2673 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2674 2674 """identify the working directory or specified revision
2675 2675
2676 2676 Print a summary identifying the repository state at REV using one or
2677 2677 two parent hash identifiers, followed by a "+" if the working
2678 2678 directory has uncommitted changes, the branch name (if not default),
2679 2679 a list of tags, and a list of bookmarks.
2680 2680
2681 2681 When REV is not given, print a summary of the current state of the
2682 2682 repository.
2683 2683
2684 2684 Specifying a path to a repository root or Mercurial bundle will
2685 2685 cause lookup to operate on that repository/bundle.
2686 2686
2687 2687 .. container:: verbose
2688 2688
2689 2689 Examples:
2690 2690
2691 2691 - generate a build identifier for the working directory::
2692 2692
2693 2693 hg id --id > build-id.dat
2694 2694
2695 2695 - find the revision corresponding to a tag::
2696 2696
2697 2697 hg id -n -r 1.3
2698 2698
2699 2699 - check the most recent revision of a remote repository::
2700 2700
2701 2701 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2702 2702
2703 2703 See :hg:`log` for generating more information about specific revisions,
2704 2704 including full hash identifiers.
2705 2705
2706 2706 Returns 0 if successful.
2707 2707 """
2708 2708
2709 2709 opts = pycompat.byteskwargs(opts)
2710 2710 if not repo and not source:
2711 2711 raise error.Abort(_("there is no Mercurial repository here "
2712 2712 "(.hg not found)"))
2713 2713
2714 2714 if ui.debugflag:
2715 2715 hexfunc = hex
2716 2716 else:
2717 2717 hexfunc = short
2718 2718 default = not (num or id or branch or tags or bookmarks)
2719 2719 output = []
2720 2720 revs = []
2721 2721
2722 2722 if source:
2723 2723 source, branches = hg.parseurl(ui.expandpath(source))
2724 2724 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2725 2725 repo = peer.local()
2726 2726 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2727 2727
2728 2728 fm = ui.formatter('identify', opts)
2729 2729 fm.startitem()
2730 2730
2731 2731 if not repo:
2732 2732 if num or branch or tags:
2733 2733 raise error.Abort(
2734 2734 _("can't query remote revision number, branch, or tags"))
2735 2735 if not rev and revs:
2736 2736 rev = revs[0]
2737 2737 if not rev:
2738 2738 rev = "tip"
2739 2739
2740 2740 remoterev = peer.lookup(rev)
2741 2741 hexrev = hexfunc(remoterev)
2742 2742 if default or id:
2743 2743 output = [hexrev]
2744 2744 fm.data(id=hexrev)
2745 2745
2746 2746 def getbms():
2747 2747 bms = []
2748 2748
2749 2749 if 'bookmarks' in peer.listkeys('namespaces'):
2750 2750 hexremoterev = hex(remoterev)
2751 2751 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2752 2752 if bmr == hexremoterev]
2753 2753
2754 2754 return sorted(bms)
2755 2755
2756 2756 bms = getbms()
2757 2757 if bookmarks:
2758 2758 output.extend(bms)
2759 2759 elif default and not ui.quiet:
2760 2760 # multiple bookmarks for a single parent separated by '/'
2761 2761 bm = '/'.join(bms)
2762 2762 if bm:
2763 2763 output.append(bm)
2764 2764
2765 2765 fm.data(node=hex(remoterev))
2766 2766 fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
2767 2767 else:
2768 2768 ctx = scmutil.revsingle(repo, rev, None)
2769 2769
2770 2770 if ctx.rev() is None:
2771 2771 ctx = repo[None]
2772 2772 parents = ctx.parents()
2773 2773 taglist = []
2774 2774 for p in parents:
2775 2775 taglist.extend(p.tags())
2776 2776
2777 2777 dirty = ""
2778 2778 if ctx.dirty(missing=True, merge=False, branch=False):
2779 2779 dirty = '+'
2780 2780 fm.data(dirty=dirty)
2781 2781
2782 2782 hexoutput = [hexfunc(p.node()) for p in parents]
2783 2783 if default or id:
2784 2784 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
2785 2785 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
2786 2786
2787 2787 if num:
2788 2788 numoutput = ["%d" % p.rev() for p in parents]
2789 2789 output.append("%s%s" % ('+'.join(numoutput), dirty))
2790 2790
2791 2791 fn = fm.nested('parents')
2792 2792 for p in parents:
2793 2793 fn.startitem()
2794 2794 fn.data(rev=p.rev())
2795 2795 fn.data(node=p.hex())
2796 2796 fn.context(ctx=p)
2797 2797 fn.end()
2798 2798 else:
2799 2799 hexoutput = hexfunc(ctx.node())
2800 2800 if default or id:
2801 2801 output = [hexoutput]
2802 2802 fm.data(id=hexoutput)
2803 2803
2804 2804 if num:
2805 2805 output.append(pycompat.bytestr(ctx.rev()))
2806 2806 taglist = ctx.tags()
2807 2807
2808 2808 if default and not ui.quiet:
2809 2809 b = ctx.branch()
2810 2810 if b != 'default':
2811 2811 output.append("(%s)" % b)
2812 2812
2813 2813 # multiple tags for a single parent separated by '/'
2814 2814 t = '/'.join(taglist)
2815 2815 if t:
2816 2816 output.append(t)
2817 2817
2818 2818 # multiple bookmarks for a single parent separated by '/'
2819 2819 bm = '/'.join(ctx.bookmarks())
2820 2820 if bm:
2821 2821 output.append(bm)
2822 2822 else:
2823 2823 if branch:
2824 2824 output.append(ctx.branch())
2825 2825
2826 2826 if tags:
2827 2827 output.extend(taglist)
2828 2828
2829 2829 if bookmarks:
2830 2830 output.extend(ctx.bookmarks())
2831 2831
2832 2832 fm.data(node=ctx.hex())
2833 2833 fm.data(branch=ctx.branch())
2834 2834 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
2835 2835 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
2836 2836 fm.context(ctx=ctx)
2837 2837
2838 2838 fm.plain("%s\n" % ' '.join(output))
2839 2839 fm.end()
2840 2840
2841 2841 @command('import|patch',
2842 2842 [('p', 'strip', 1,
2843 2843 _('directory strip option for patch. This has the same '
2844 2844 'meaning as the corresponding patch option'), _('NUM')),
2845 2845 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2846 2846 ('e', 'edit', False, _('invoke editor on commit messages')),
2847 2847 ('f', 'force', None,
2848 2848 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2849 2849 ('', 'no-commit', None,
2850 2850 _("don't commit, just update the working directory")),
2851 2851 ('', 'bypass', None,
2852 2852 _("apply patch without touching the working directory")),
2853 2853 ('', 'partial', None,
2854 2854 _('commit even if some hunks fail')),
2855 2855 ('', 'exact', None,
2856 2856 _('abort if patch would apply lossily')),
2857 2857 ('', 'prefix', '',
2858 2858 _('apply patch to subdirectory'), _('DIR')),
2859 2859 ('', 'import-branch', None,
2860 2860 _('use any branch information in patch (implied by --exact)'))] +
2861 2861 commitopts + commitopts2 + similarityopts,
2862 2862 _('[OPTION]... PATCH...'))
2863 2863 def import_(ui, repo, patch1=None, *patches, **opts):
2864 2864 """import an ordered set of patches
2865 2865
2866 2866 Import a list of patches and commit them individually (unless
2867 2867 --no-commit is specified).
2868 2868
2869 2869 To read a patch from standard input (stdin), use "-" as the patch
2870 2870 name. If a URL is specified, the patch will be downloaded from
2871 2871 there.
2872 2872
2873 2873 Import first applies changes to the working directory (unless
2874 2874 --bypass is specified), import will abort if there are outstanding
2875 2875 changes.
2876 2876
2877 2877 Use --bypass to apply and commit patches directly to the
2878 2878 repository, without affecting the working directory. Without
2879 2879 --exact, patches will be applied on top of the working directory
2880 2880 parent revision.
2881 2881
2882 2882 You can import a patch straight from a mail message. Even patches
2883 2883 as attachments work (to use the body part, it must have type
2884 2884 text/plain or text/x-patch). From and Subject headers of email
2885 2885 message are used as default committer and commit message. All
2886 2886 text/plain body parts before first diff are added to the commit
2887 2887 message.
2888 2888
2889 2889 If the imported patch was generated by :hg:`export`, user and
2890 2890 description from patch override values from message headers and
2891 2891 body. Values given on command line with -m/--message and -u/--user
2892 2892 override these.
2893 2893
2894 2894 If --exact is specified, import will set the working directory to
2895 2895 the parent of each patch before applying it, and will abort if the
2896 2896 resulting changeset has a different ID than the one recorded in
2897 2897 the patch. This will guard against various ways that portable
2898 2898 patch formats and mail systems might fail to transfer Mercurial
2899 2899 data or metadata. See :hg:`bundle` for lossless transmission.
2900 2900
2901 2901 Use --partial to ensure a changeset will be created from the patch
2902 2902 even if some hunks fail to apply. Hunks that fail to apply will be
2903 2903 written to a <target-file>.rej file. Conflicts can then be resolved
2904 2904 by hand before :hg:`commit --amend` is run to update the created
2905 2905 changeset. This flag exists to let people import patches that
2906 2906 partially apply without losing the associated metadata (author,
2907 2907 date, description, ...).
2908 2908
2909 2909 .. note::
2910 2910
2911 2911 When no hunks apply cleanly, :hg:`import --partial` will create
2912 2912 an empty changeset, importing only the patch metadata.
2913 2913
2914 2914 With -s/--similarity, hg will attempt to discover renames and
2915 2915 copies in the patch in the same way as :hg:`addremove`.
2916 2916
2917 2917 It is possible to use external patch programs to perform the patch
2918 2918 by setting the ``ui.patch`` configuration option. For the default
2919 2919 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2920 2920 See :hg:`help config` for more information about configuration
2921 2921 files and how to use these options.
2922 2922
2923 2923 See :hg:`help dates` for a list of formats valid for -d/--date.
2924 2924
2925 2925 .. container:: verbose
2926 2926
2927 2927 Examples:
2928 2928
2929 2929 - import a traditional patch from a website and detect renames::
2930 2930
2931 2931 hg import -s 80 http://example.com/bugfix.patch
2932 2932
2933 2933 - import a changeset from an hgweb server::
2934 2934
2935 2935 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
2936 2936
2937 2937 - import all the patches in an Unix-style mbox::
2938 2938
2939 2939 hg import incoming-patches.mbox
2940 2940
2941 2941 - import patches from stdin::
2942 2942
2943 2943 hg import -
2944 2944
2945 2945 - attempt to exactly restore an exported changeset (not always
2946 2946 possible)::
2947 2947
2948 2948 hg import --exact proposed-fix.patch
2949 2949
2950 2950 - use an external tool to apply a patch which is too fuzzy for
2951 2951 the default internal tool.
2952 2952
2953 2953 hg import --config ui.patch="patch --merge" fuzzy.patch
2954 2954
2955 2955 - change the default fuzzing from 2 to a less strict 7
2956 2956
2957 2957 hg import --config ui.fuzz=7 fuzz.patch
2958 2958
2959 2959 Returns 0 on success, 1 on partial success (see --partial).
2960 2960 """
2961 2961
2962 2962 opts = pycompat.byteskwargs(opts)
2963 2963 if not patch1:
2964 2964 raise error.Abort(_('need at least one patch to import'))
2965 2965
2966 2966 patches = (patch1,) + patches
2967 2967
2968 2968 date = opts.get('date')
2969 2969 if date:
2970 2970 opts['date'] = util.parsedate(date)
2971 2971
2972 2972 exact = opts.get('exact')
2973 2973 update = not opts.get('bypass')
2974 2974 if not update and opts.get('no_commit'):
2975 2975 raise error.Abort(_('cannot use --no-commit with --bypass'))
2976 2976 try:
2977 2977 sim = float(opts.get('similarity') or 0)
2978 2978 except ValueError:
2979 2979 raise error.Abort(_('similarity must be a number'))
2980 2980 if sim < 0 or sim > 100:
2981 2981 raise error.Abort(_('similarity must be between 0 and 100'))
2982 2982 if sim and not update:
2983 2983 raise error.Abort(_('cannot use --similarity with --bypass'))
2984 2984 if exact:
2985 2985 if opts.get('edit'):
2986 2986 raise error.Abort(_('cannot use --exact with --edit'))
2987 2987 if opts.get('prefix'):
2988 2988 raise error.Abort(_('cannot use --exact with --prefix'))
2989 2989
2990 2990 base = opts["base"]
2991 2991 wlock = dsguard = lock = tr = None
2992 2992 msgs = []
2993 2993 ret = 0
2994 2994
2995 2995
2996 2996 try:
2997 2997 wlock = repo.wlock()
2998 2998
2999 2999 if update:
3000 3000 cmdutil.checkunfinished(repo)
3001 3001 if (exact or not opts.get('force')):
3002 3002 cmdutil.bailifchanged(repo)
3003 3003
3004 3004 if not opts.get('no_commit'):
3005 3005 lock = repo.lock()
3006 3006 tr = repo.transaction('import')
3007 3007 else:
3008 3008 dsguard = dirstateguard.dirstateguard(repo, 'import')
3009 3009 parents = repo[None].parents()
3010 3010 for patchurl in patches:
3011 3011 if patchurl == '-':
3012 3012 ui.status(_('applying patch from stdin\n'))
3013 3013 patchfile = ui.fin
3014 3014 patchurl = 'stdin' # for error message
3015 3015 else:
3016 3016 patchurl = os.path.join(base, patchurl)
3017 3017 ui.status(_('applying %s\n') % patchurl)
3018 3018 patchfile = hg.openpath(ui, patchurl)
3019 3019
3020 3020 haspatch = False
3021 3021 for hunk in patch.split(patchfile):
3022 3022 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3023 3023 parents, opts,
3024 3024 msgs, hg.clean)
3025 3025 if msg:
3026 3026 haspatch = True
3027 3027 ui.note(msg + '\n')
3028 3028 if update or exact:
3029 3029 parents = repo[None].parents()
3030 3030 else:
3031 3031 parents = [repo[node]]
3032 3032 if rej:
3033 3033 ui.write_err(_("patch applied partially\n"))
3034 3034 ui.write_err(_("(fix the .rej files and run "
3035 3035 "`hg commit --amend`)\n"))
3036 3036 ret = 1
3037 3037 break
3038 3038
3039 3039 if not haspatch:
3040 3040 raise error.Abort(_('%s: no diffs found') % patchurl)
3041 3041
3042 3042 if tr:
3043 3043 tr.close()
3044 3044 if msgs:
3045 3045 repo.savecommitmessage('\n* * *\n'.join(msgs))
3046 3046 if dsguard:
3047 3047 dsguard.close()
3048 3048 return ret
3049 3049 finally:
3050 3050 if tr:
3051 3051 tr.release()
3052 3052 release(lock, dsguard, wlock)
3053 3053
3054 3054 @command('incoming|in',
3055 3055 [('f', 'force', None,
3056 3056 _('run even if remote repository is unrelated')),
3057 3057 ('n', 'newest-first', None, _('show newest record first')),
3058 3058 ('', 'bundle', '',
3059 3059 _('file to store the bundles into'), _('FILE')),
3060 3060 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3061 3061 ('B', 'bookmarks', False, _("compare bookmarks")),
3062 3062 ('b', 'branch', [],
3063 3063 _('a specific branch you would like to pull'), _('BRANCH')),
3064 3064 ] + logopts + remoteopts + subrepoopts,
3065 3065 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3066 3066 def incoming(ui, repo, source="default", **opts):
3067 3067 """show new changesets found in source
3068 3068
3069 3069 Show new changesets found in the specified path/URL or the default
3070 3070 pull location. These are the changesets that would have been pulled
3071 3071 if a pull at the time you issued this command.
3072 3072
3073 3073 See pull for valid source format details.
3074 3074
3075 3075 .. container:: verbose
3076 3076
3077 3077 With -B/--bookmarks, the result of bookmark comparison between
3078 3078 local and remote repositories is displayed. With -v/--verbose,
3079 3079 status is also displayed for each bookmark like below::
3080 3080
3081 3081 BM1 01234567890a added
3082 3082 BM2 1234567890ab advanced
3083 3083 BM3 234567890abc diverged
3084 3084 BM4 34567890abcd changed
3085 3085
3086 3086 The action taken locally when pulling depends on the
3087 3087 status of each bookmark:
3088 3088
3089 3089 :``added``: pull will create it
3090 3090 :``advanced``: pull will update it
3091 3091 :``diverged``: pull will create a divergent bookmark
3092 3092 :``changed``: result depends on remote changesets
3093 3093
3094 3094 From the point of view of pulling behavior, bookmark
3095 3095 existing only in the remote repository are treated as ``added``,
3096 3096 even if it is in fact locally deleted.
3097 3097
3098 3098 .. container:: verbose
3099 3099
3100 3100 For remote repository, using --bundle avoids downloading the
3101 3101 changesets twice if the incoming is followed by a pull.
3102 3102
3103 3103 Examples:
3104 3104
3105 3105 - show incoming changes with patches and full description::
3106 3106
3107 3107 hg incoming -vp
3108 3108
3109 3109 - show incoming changes excluding merges, store a bundle::
3110 3110
3111 3111 hg in -vpM --bundle incoming.hg
3112 3112 hg pull incoming.hg
3113 3113
3114 3114 - briefly list changes inside a bundle::
3115 3115
3116 3116 hg in changes.hg -T "{desc|firstline}\\n"
3117 3117
3118 3118 Returns 0 if there are incoming changes, 1 otherwise.
3119 3119 """
3120 3120 opts = pycompat.byteskwargs(opts)
3121 3121 if opts.get('graph'):
3122 3122 cmdutil.checkunsupportedgraphflags([], opts)
3123 3123 def display(other, chlist, displayer):
3124 3124 revdag = cmdutil.graphrevs(other, chlist, opts)
3125 3125 cmdutil.displaygraph(ui, repo, revdag, displayer,
3126 3126 graphmod.asciiedges)
3127 3127
3128 3128 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3129 3129 return 0
3130 3130
3131 3131 if opts.get('bundle') and opts.get('subrepos'):
3132 3132 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3133 3133
3134 3134 if opts.get('bookmarks'):
3135 3135 source, branches = hg.parseurl(ui.expandpath(source),
3136 3136 opts.get('branch'))
3137 3137 other = hg.peer(repo, opts, source)
3138 3138 if 'bookmarks' not in other.listkeys('namespaces'):
3139 3139 ui.warn(_("remote doesn't support bookmarks\n"))
3140 3140 return 0
3141 3141 ui.pager('incoming')
3142 3142 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3143 3143 return bookmarks.incoming(ui, repo, other)
3144 3144
3145 3145 repo._subtoppath = ui.expandpath(source)
3146 3146 try:
3147 3147 return hg.incoming(ui, repo, source, opts)
3148 3148 finally:
3149 3149 del repo._subtoppath
3150 3150
3151 3151
3152 3152 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3153 3153 norepo=True)
3154 3154 def init(ui, dest=".", **opts):
3155 3155 """create a new repository in the given directory
3156 3156
3157 3157 Initialize a new repository in the given directory. If the given
3158 3158 directory does not exist, it will be created.
3159 3159
3160 3160 If no directory is given, the current directory is used.
3161 3161
3162 3162 It is possible to specify an ``ssh://`` URL as the destination.
3163 3163 See :hg:`help urls` for more information.
3164 3164
3165 3165 Returns 0 on success.
3166 3166 """
3167 3167 opts = pycompat.byteskwargs(opts)
3168 3168 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3169 3169
3170 3170 @command('locate',
3171 3171 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3172 3172 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3173 3173 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3174 3174 ] + walkopts,
3175 3175 _('[OPTION]... [PATTERN]...'))
3176 3176 def locate(ui, repo, *pats, **opts):
3177 3177 """locate files matching specific patterns (DEPRECATED)
3178 3178
3179 3179 Print files under Mercurial control in the working directory whose
3180 3180 names match the given patterns.
3181 3181
3182 3182 By default, this command searches all directories in the working
3183 3183 directory. To search just the current directory and its
3184 3184 subdirectories, use "--include .".
3185 3185
3186 3186 If no patterns are given to match, this command prints the names
3187 3187 of all files under Mercurial control in the working directory.
3188 3188
3189 3189 If you want to feed the output of this command into the "xargs"
3190 3190 command, use the -0 option to both this command and "xargs". This
3191 3191 will avoid the problem of "xargs" treating single filenames that
3192 3192 contain whitespace as multiple filenames.
3193 3193
3194 3194 See :hg:`help files` for a more versatile command.
3195 3195
3196 3196 Returns 0 if a match is found, 1 otherwise.
3197 3197 """
3198 3198 opts = pycompat.byteskwargs(opts)
3199 3199 if opts.get('print0'):
3200 3200 end = '\0'
3201 3201 else:
3202 3202 end = '\n'
3203 3203 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3204 3204
3205 3205 ret = 1
3206 3206 ctx = repo[rev]
3207 3207 m = scmutil.match(ctx, pats, opts, default='relglob',
3208 3208 badfn=lambda x, y: False)
3209 3209
3210 3210 ui.pager('locate')
3211 3211 for abs in ctx.matches(m):
3212 3212 if opts.get('fullpath'):
3213 3213 ui.write(repo.wjoin(abs), end)
3214 3214 else:
3215 3215 ui.write(((pats and m.rel(abs)) or abs), end)
3216 3216 ret = 0
3217 3217
3218 3218 return ret
3219 3219
3220 3220 @command('^log|history',
3221 3221 [('f', 'follow', None,
3222 3222 _('follow changeset history, or file history across copies and renames')),
3223 3223 ('', 'follow-first', None,
3224 3224 _('only follow the first parent of merge changesets (DEPRECATED)')),
3225 3225 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3226 3226 ('C', 'copies', None, _('show copied files')),
3227 3227 ('k', 'keyword', [],
3228 3228 _('do case-insensitive search for a given text'), _('TEXT')),
3229 3229 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3230 3230 ('', 'removed', None, _('include revisions where files were removed')),
3231 3231 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3232 3232 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3233 3233 ('', 'only-branch', [],
3234 3234 _('show only changesets within the given named branch (DEPRECATED)'),
3235 3235 _('BRANCH')),
3236 3236 ('b', 'branch', [],
3237 3237 _('show changesets within the given named branch'), _('BRANCH')),
3238 3238 ('P', 'prune', [],
3239 3239 _('do not display revision or any of its ancestors'), _('REV')),
3240 3240 ] + logopts + walkopts,
3241 3241 _('[OPTION]... [FILE]'),
3242 3242 inferrepo=True)
3243 3243 def log(ui, repo, *pats, **opts):
3244 3244 """show revision history of entire repository or files
3245 3245
3246 3246 Print the revision history of the specified files or the entire
3247 3247 project.
3248 3248
3249 3249 If no revision range is specified, the default is ``tip:0`` unless
3250 3250 --follow is set, in which case the working directory parent is
3251 3251 used as the starting revision.
3252 3252
3253 3253 File history is shown without following rename or copy history of
3254 3254 files. Use -f/--follow with a filename to follow history across
3255 3255 renames and copies. --follow without a filename will only show
3256 3256 ancestors or descendants of the starting revision.
3257 3257
3258 3258 By default this command prints revision number and changeset id,
3259 3259 tags, non-trivial parents, user, date and time, and a summary for
3260 3260 each commit. When the -v/--verbose switch is used, the list of
3261 3261 changed files and full commit message are shown.
3262 3262
3263 3263 With --graph the revisions are shown as an ASCII art DAG with the most
3264 3264 recent changeset at the top.
3265 3265 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3266 3266 and '+' represents a fork where the changeset from the lines below is a
3267 3267 parent of the 'o' merge on the same line.
3268 3268 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3269 3269 of a '|' indicates one or more revisions in a path are omitted.
3270 3270
3271 3271 .. note::
3272 3272
3273 3273 :hg:`log --patch` may generate unexpected diff output for merge
3274 3274 changesets, as it will only compare the merge changeset against
3275 3275 its first parent. Also, only files different from BOTH parents
3276 3276 will appear in files:.
3277 3277
3278 3278 .. note::
3279 3279
3280 3280 For performance reasons, :hg:`log FILE` may omit duplicate changes
3281 3281 made on branches and will not show removals or mode changes. To
3282 3282 see all such changes, use the --removed switch.
3283 3283
3284 3284 .. container:: verbose
3285 3285
3286 3286 Some examples:
3287 3287
3288 3288 - changesets with full descriptions and file lists::
3289 3289
3290 3290 hg log -v
3291 3291
3292 3292 - changesets ancestral to the working directory::
3293 3293
3294 3294 hg log -f
3295 3295
3296 3296 - last 10 commits on the current branch::
3297 3297
3298 3298 hg log -l 10 -b .
3299 3299
3300 3300 - changesets showing all modifications of a file, including removals::
3301 3301
3302 3302 hg log --removed file.c
3303 3303
3304 3304 - all changesets that touch a directory, with diffs, excluding merges::
3305 3305
3306 3306 hg log -Mp lib/
3307 3307
3308 3308 - all revision numbers that match a keyword::
3309 3309
3310 3310 hg log -k bug --template "{rev}\\n"
3311 3311
3312 3312 - the full hash identifier of the working directory parent::
3313 3313
3314 3314 hg log -r . --template "{node}\\n"
3315 3315
3316 3316 - list available log templates::
3317 3317
3318 3318 hg log -T list
3319 3319
3320 3320 - check if a given changeset is included in a tagged release::
3321 3321
3322 3322 hg log -r "a21ccf and ancestor(1.9)"
3323 3323
3324 3324 - find all changesets by some user in a date range::
3325 3325
3326 3326 hg log -k alice -d "may 2008 to jul 2008"
3327 3327
3328 3328 - summary of all changesets after the last tag::
3329 3329
3330 3330 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3331 3331
3332 3332 See :hg:`help dates` for a list of formats valid for -d/--date.
3333 3333
3334 3334 See :hg:`help revisions` for more about specifying and ordering
3335 3335 revisions.
3336 3336
3337 3337 See :hg:`help templates` for more about pre-packaged styles and
3338 3338 specifying custom templates.
3339 3339
3340 3340 Returns 0 on success.
3341 3341
3342 3342 """
3343 3343 opts = pycompat.byteskwargs(opts)
3344 3344 if opts.get('follow') and opts.get('rev'):
3345 3345 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3346 3346 del opts['follow']
3347 3347
3348 3348 if opts.get('graph'):
3349 3349 return cmdutil.graphlog(ui, repo, pats, opts)
3350 3350
3351 3351 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3352 3352 limit = cmdutil.loglimit(opts)
3353 3353 count = 0
3354 3354
3355 3355 getrenamed = None
3356 3356 if opts.get('copies'):
3357 3357 endrev = None
3358 3358 if opts.get('rev'):
3359 3359 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3360 3360 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3361 3361
3362 3362 ui.pager('log')
3363 3363 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3364 3364 for rev in revs:
3365 3365 if count == limit:
3366 3366 break
3367 3367 ctx = repo[rev]
3368 3368 copies = None
3369 3369 if getrenamed is not None and rev:
3370 3370 copies = []
3371 3371 for fn in ctx.files():
3372 3372 rename = getrenamed(fn, rev)
3373 3373 if rename:
3374 3374 copies.append((fn, rename[0]))
3375 3375 if filematcher:
3376 3376 revmatchfn = filematcher(ctx.rev())
3377 3377 else:
3378 3378 revmatchfn = None
3379 3379 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3380 3380 if displayer.flush(ctx):
3381 3381 count += 1
3382 3382
3383 3383 displayer.close()
3384 3384
3385 3385 @command('manifest',
3386 3386 [('r', 'rev', '', _('revision to display'), _('REV')),
3387 3387 ('', 'all', False, _("list files from all revisions"))]
3388 3388 + formatteropts,
3389 3389 _('[-r REV]'))
3390 3390 def manifest(ui, repo, node=None, rev=None, **opts):
3391 3391 """output the current or given revision of the project manifest
3392 3392
3393 3393 Print a list of version controlled files for the given revision.
3394 3394 If no revision is given, the first parent of the working directory
3395 3395 is used, or the null revision if no revision is checked out.
3396 3396
3397 3397 With -v, print file permissions, symlink and executable bits.
3398 3398 With --debug, print file revision hashes.
3399 3399
3400 3400 If option --all is specified, the list of all files from all revisions
3401 3401 is printed. This includes deleted and renamed files.
3402 3402
3403 3403 Returns 0 on success.
3404 3404 """
3405 3405 opts = pycompat.byteskwargs(opts)
3406 3406 fm = ui.formatter('manifest', opts)
3407 3407
3408 3408 if opts.get('all'):
3409 3409 if rev or node:
3410 3410 raise error.Abort(_("can't specify a revision with --all"))
3411 3411
3412 3412 res = []
3413 3413 prefix = "data/"
3414 3414 suffix = ".i"
3415 3415 plen = len(prefix)
3416 3416 slen = len(suffix)
3417 3417 with repo.lock():
3418 3418 for fn, b, size in repo.store.datafiles():
3419 3419 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3420 3420 res.append(fn[plen:-slen])
3421 3421 ui.pager('manifest')
3422 3422 for f in res:
3423 3423 fm.startitem()
3424 3424 fm.write("path", '%s\n', f)
3425 3425 fm.end()
3426 3426 return
3427 3427
3428 3428 if rev and node:
3429 3429 raise error.Abort(_("please specify just one revision"))
3430 3430
3431 3431 if not node:
3432 3432 node = rev
3433 3433
3434 3434 char = {'l': '@', 'x': '*', '': ''}
3435 3435 mode = {'l': '644', 'x': '755', '': '644'}
3436 3436 ctx = scmutil.revsingle(repo, node)
3437 3437 mf = ctx.manifest()
3438 3438 ui.pager('manifest')
3439 3439 for f in ctx:
3440 3440 fm.startitem()
3441 3441 fl = ctx[f].flags()
3442 3442 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3443 3443 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3444 3444 fm.write('path', '%s\n', f)
3445 3445 fm.end()
3446 3446
3447 3447 @command('^merge',
3448 3448 [('f', 'force', None,
3449 3449 _('force a merge including outstanding changes (DEPRECATED)')),
3450 3450 ('r', 'rev', '', _('revision to merge'), _('REV')),
3451 3451 ('P', 'preview', None,
3452 3452 _('review revisions to merge (no merge is performed)'))
3453 3453 ] + mergetoolopts,
3454 3454 _('[-P] [[-r] REV]'))
3455 3455 def merge(ui, repo, node=None, **opts):
3456 3456 """merge another revision into working directory
3457 3457
3458 3458 The current working directory is updated with all changes made in
3459 3459 the requested revision since the last common predecessor revision.
3460 3460
3461 3461 Files that changed between either parent are marked as changed for
3462 3462 the next commit and a commit must be performed before any further
3463 3463 updates to the repository are allowed. The next commit will have
3464 3464 two parents.
3465 3465
3466 3466 ``--tool`` can be used to specify the merge tool used for file
3467 3467 merges. It overrides the HGMERGE environment variable and your
3468 3468 configuration files. See :hg:`help merge-tools` for options.
3469 3469
3470 3470 If no revision is specified, the working directory's parent is a
3471 3471 head revision, and the current branch contains exactly one other
3472 3472 head, the other head is merged with by default. Otherwise, an
3473 3473 explicit revision with which to merge with must be provided.
3474 3474
3475 3475 See :hg:`help resolve` for information on handling file conflicts.
3476 3476
3477 3477 To undo an uncommitted merge, use :hg:`update --clean .` which
3478 3478 will check out a clean copy of the original merge parent, losing
3479 3479 all changes.
3480 3480
3481 3481 Returns 0 on success, 1 if there are unresolved files.
3482 3482 """
3483 3483
3484 3484 opts = pycompat.byteskwargs(opts)
3485 3485 if opts.get('rev') and node:
3486 3486 raise error.Abort(_("please specify just one revision"))
3487 3487 if not node:
3488 3488 node = opts.get('rev')
3489 3489
3490 3490 if node:
3491 3491 node = scmutil.revsingle(repo, node).node()
3492 3492
3493 3493 if not node:
3494 3494 node = repo[destutil.destmerge(repo)].node()
3495 3495
3496 3496 if opts.get('preview'):
3497 3497 # find nodes that are ancestors of p2 but not of p1
3498 3498 p1 = repo.lookup('.')
3499 3499 p2 = repo.lookup(node)
3500 3500 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3501 3501
3502 3502 displayer = cmdutil.show_changeset(ui, repo, opts)
3503 3503 for node in nodes:
3504 3504 displayer.show(repo[node])
3505 3505 displayer.close()
3506 3506 return 0
3507 3507
3508 3508 try:
3509 3509 # ui.forcemerge is an internal variable, do not document
3510 3510 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3511 3511 force = opts.get('force')
3512 3512 labels = ['working copy', 'merge rev']
3513 3513 return hg.merge(repo, node, force=force, mergeforce=force,
3514 3514 labels=labels)
3515 3515 finally:
3516 3516 ui.setconfig('ui', 'forcemerge', '', 'merge')
3517 3517
3518 3518 @command('outgoing|out',
3519 3519 [('f', 'force', None, _('run even when the destination is unrelated')),
3520 3520 ('r', 'rev', [],
3521 3521 _('a changeset intended to be included in the destination'), _('REV')),
3522 3522 ('n', 'newest-first', None, _('show newest record first')),
3523 3523 ('B', 'bookmarks', False, _('compare bookmarks')),
3524 3524 ('b', 'branch', [], _('a specific branch you would like to push'),
3525 3525 _('BRANCH')),
3526 3526 ] + logopts + remoteopts + subrepoopts,
3527 3527 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3528 3528 def outgoing(ui, repo, dest=None, **opts):
3529 3529 """show changesets not found in the destination
3530 3530
3531 3531 Show changesets not found in the specified destination repository
3532 3532 or the default push location. These are the changesets that would
3533 3533 be pushed if a push was requested.
3534 3534
3535 3535 See pull for details of valid destination formats.
3536 3536
3537 3537 .. container:: verbose
3538 3538
3539 3539 With -B/--bookmarks, the result of bookmark comparison between
3540 3540 local and remote repositories is displayed. With -v/--verbose,
3541 3541 status is also displayed for each bookmark like below::
3542 3542
3543 3543 BM1 01234567890a added
3544 3544 BM2 deleted
3545 3545 BM3 234567890abc advanced
3546 3546 BM4 34567890abcd diverged
3547 3547 BM5 4567890abcde changed
3548 3548
3549 3549 The action taken when pushing depends on the
3550 3550 status of each bookmark:
3551 3551
3552 3552 :``added``: push with ``-B`` will create it
3553 3553 :``deleted``: push with ``-B`` will delete it
3554 3554 :``advanced``: push will update it
3555 3555 :``diverged``: push with ``-B`` will update it
3556 3556 :``changed``: push with ``-B`` will update it
3557 3557
3558 3558 From the point of view of pushing behavior, bookmarks
3559 3559 existing only in the remote repository are treated as
3560 3560 ``deleted``, even if it is in fact added remotely.
3561 3561
3562 3562 Returns 0 if there are outgoing changes, 1 otherwise.
3563 3563 """
3564 3564 opts = pycompat.byteskwargs(opts)
3565 3565 if opts.get('graph'):
3566 3566 cmdutil.checkunsupportedgraphflags([], opts)
3567 3567 o, other = hg._outgoing(ui, repo, dest, opts)
3568 3568 if not o:
3569 3569 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3570 3570 return
3571 3571
3572 3572 revdag = cmdutil.graphrevs(repo, o, opts)
3573 3573 ui.pager('outgoing')
3574 3574 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3575 3575 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3576 3576 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3577 3577 return 0
3578 3578
3579 3579 if opts.get('bookmarks'):
3580 3580 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3581 3581 dest, branches = hg.parseurl(dest, opts.get('branch'))
3582 3582 other = hg.peer(repo, opts, dest)
3583 3583 if 'bookmarks' not in other.listkeys('namespaces'):
3584 3584 ui.warn(_("remote doesn't support bookmarks\n"))
3585 3585 return 0
3586 3586 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3587 3587 ui.pager('outgoing')
3588 3588 return bookmarks.outgoing(ui, repo, other)
3589 3589
3590 3590 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3591 3591 try:
3592 3592 return hg.outgoing(ui, repo, dest, opts)
3593 3593 finally:
3594 3594 del repo._subtoppath
3595 3595
3596 3596 @command('parents',
3597 3597 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3598 3598 ] + templateopts,
3599 3599 _('[-r REV] [FILE]'),
3600 3600 inferrepo=True)
3601 3601 def parents(ui, repo, file_=None, **opts):
3602 3602 """show the parents of the working directory or revision (DEPRECATED)
3603 3603
3604 3604 Print the working directory's parent revisions. If a revision is
3605 3605 given via -r/--rev, the parent of that revision will be printed.
3606 3606 If a file argument is given, the revision in which the file was
3607 3607 last changed (before the working directory revision or the
3608 3608 argument to --rev if given) is printed.
3609 3609
3610 3610 This command is equivalent to::
3611 3611
3612 3612 hg log -r "p1()+p2()" or
3613 3613 hg log -r "p1(REV)+p2(REV)" or
3614 3614 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3615 3615 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3616 3616
3617 3617 See :hg:`summary` and :hg:`help revsets` for related information.
3618 3618
3619 3619 Returns 0 on success.
3620 3620 """
3621 3621
3622 3622 opts = pycompat.byteskwargs(opts)
3623 3623 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3624 3624
3625 3625 if file_:
3626 3626 m = scmutil.match(ctx, (file_,), opts)
3627 3627 if m.anypats() or len(m.files()) != 1:
3628 3628 raise error.Abort(_('can only specify an explicit filename'))
3629 3629 file_ = m.files()[0]
3630 3630 filenodes = []
3631 3631 for cp in ctx.parents():
3632 3632 if not cp:
3633 3633 continue
3634 3634 try:
3635 3635 filenodes.append(cp.filenode(file_))
3636 3636 except error.LookupError:
3637 3637 pass
3638 3638 if not filenodes:
3639 3639 raise error.Abort(_("'%s' not found in manifest!") % file_)
3640 3640 p = []
3641 3641 for fn in filenodes:
3642 3642 fctx = repo.filectx(file_, fileid=fn)
3643 3643 p.append(fctx.node())
3644 3644 else:
3645 3645 p = [cp.node() for cp in ctx.parents()]
3646 3646
3647 3647 displayer = cmdutil.show_changeset(ui, repo, opts)
3648 3648 for n in p:
3649 3649 if n != nullid:
3650 3650 displayer.show(repo[n])
3651 3651 displayer.close()
3652 3652
3653 3653 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3654 3654 def paths(ui, repo, search=None, **opts):
3655 3655 """show aliases for remote repositories
3656 3656
3657 3657 Show definition of symbolic path name NAME. If no name is given,
3658 3658 show definition of all available names.
3659 3659
3660 3660 Option -q/--quiet suppresses all output when searching for NAME
3661 3661 and shows only the path names when listing all definitions.
3662 3662
3663 3663 Path names are defined in the [paths] section of your
3664 3664 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3665 3665 repository, ``.hg/hgrc`` is used, too.
3666 3666
3667 3667 The path names ``default`` and ``default-push`` have a special
3668 3668 meaning. When performing a push or pull operation, they are used
3669 3669 as fallbacks if no location is specified on the command-line.
3670 3670 When ``default-push`` is set, it will be used for push and
3671 3671 ``default`` will be used for pull; otherwise ``default`` is used
3672 3672 as the fallback for both. When cloning a repository, the clone
3673 3673 source is written as ``default`` in ``.hg/hgrc``.
3674 3674
3675 3675 .. note::
3676 3676
3677 3677 ``default`` and ``default-push`` apply to all inbound (e.g.
3678 3678 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3679 3679 and :hg:`bundle`) operations.
3680 3680
3681 3681 See :hg:`help urls` for more information.
3682 3682
3683 3683 Returns 0 on success.
3684 3684 """
3685 3685
3686 3686 opts = pycompat.byteskwargs(opts)
3687 3687 ui.pager('paths')
3688 3688 if search:
3689 3689 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3690 3690 if name == search]
3691 3691 else:
3692 3692 pathitems = sorted(ui.paths.iteritems())
3693 3693
3694 3694 fm = ui.formatter('paths', opts)
3695 3695 if fm.isplain():
3696 3696 hidepassword = util.hidepassword
3697 3697 else:
3698 3698 hidepassword = str
3699 3699 if ui.quiet:
3700 3700 namefmt = '%s\n'
3701 3701 else:
3702 3702 namefmt = '%s = '
3703 3703 showsubopts = not search and not ui.quiet
3704 3704
3705 3705 for name, path in pathitems:
3706 3706 fm.startitem()
3707 3707 fm.condwrite(not search, 'name', namefmt, name)
3708 3708 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3709 3709 for subopt, value in sorted(path.suboptions.items()):
3710 3710 assert subopt not in ('name', 'url')
3711 3711 if showsubopts:
3712 3712 fm.plain('%s:%s = ' % (name, subopt))
3713 3713 fm.condwrite(showsubopts, subopt, '%s\n', value)
3714 3714
3715 3715 fm.end()
3716 3716
3717 3717 if search and not pathitems:
3718 3718 if not ui.quiet:
3719 3719 ui.warn(_("not found!\n"))
3720 3720 return 1
3721 3721 else:
3722 3722 return 0
3723 3723
3724 3724 @command('phase',
3725 3725 [('p', 'public', False, _('set changeset phase to public')),
3726 3726 ('d', 'draft', False, _('set changeset phase to draft')),
3727 3727 ('s', 'secret', False, _('set changeset phase to secret')),
3728 3728 ('f', 'force', False, _('allow to move boundary backward')),
3729 3729 ('r', 'rev', [], _('target revision'), _('REV')),
3730 3730 ],
3731 3731 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3732 3732 def phase(ui, repo, *revs, **opts):
3733 3733 """set or show the current phase name
3734 3734
3735 3735 With no argument, show the phase name of the current revision(s).
3736 3736
3737 3737 With one of -p/--public, -d/--draft or -s/--secret, change the
3738 3738 phase value of the specified revisions.
3739 3739
3740 3740 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3741 3741 lower phase to an higher phase. Phases are ordered as follows::
3742 3742
3743 3743 public < draft < secret
3744 3744
3745 3745 Returns 0 on success, 1 if some phases could not be changed.
3746 3746
3747 3747 (For more information about the phases concept, see :hg:`help phases`.)
3748 3748 """
3749 3749 opts = pycompat.byteskwargs(opts)
3750 3750 # search for a unique phase argument
3751 3751 targetphase = None
3752 3752 for idx, name in enumerate(phases.phasenames):
3753 3753 if opts[name]:
3754 3754 if targetphase is not None:
3755 3755 raise error.Abort(_('only one phase can be specified'))
3756 3756 targetphase = idx
3757 3757
3758 3758 # look for specified revision
3759 3759 revs = list(revs)
3760 3760 revs.extend(opts['rev'])
3761 3761 if not revs:
3762 3762 # display both parents as the second parent phase can influence
3763 3763 # the phase of a merge commit
3764 3764 revs = [c.rev() for c in repo[None].parents()]
3765 3765
3766 3766 revs = scmutil.revrange(repo, revs)
3767 3767
3768 3768 lock = None
3769 3769 ret = 0
3770 3770 if targetphase is None:
3771 3771 # display
3772 3772 for r in revs:
3773 3773 ctx = repo[r]
3774 3774 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3775 3775 else:
3776 3776 tr = None
3777 3777 lock = repo.lock()
3778 3778 try:
3779 3779 tr = repo.transaction("phase")
3780 3780 # set phase
3781 3781 if not revs:
3782 3782 raise error.Abort(_('empty revision set'))
3783 3783 nodes = [repo[r].node() for r in revs]
3784 3784 # moving revision from public to draft may hide them
3785 3785 # We have to check result on an unfiltered repository
3786 3786 unfi = repo.unfiltered()
3787 3787 getphase = unfi._phasecache.phase
3788 3788 olddata = [getphase(unfi, r) for r in unfi]
3789 3789 phases.advanceboundary(repo, tr, targetphase, nodes)
3790 3790 if opts['force']:
3791 3791 phases.retractboundary(repo, tr, targetphase, nodes)
3792 3792 tr.close()
3793 3793 finally:
3794 3794 if tr is not None:
3795 3795 tr.release()
3796 3796 lock.release()
3797 3797 getphase = unfi._phasecache.phase
3798 3798 newdata = [getphase(unfi, r) for r in unfi]
3799 3799 changes = sum(newdata[r] != olddata[r] for r in unfi)
3800 3800 cl = unfi.changelog
3801 3801 rejected = [n for n in nodes
3802 3802 if newdata[cl.rev(n)] < targetphase]
3803 3803 if rejected:
3804 3804 ui.warn(_('cannot move %i changesets to a higher '
3805 3805 'phase, use --force\n') % len(rejected))
3806 3806 ret = 1
3807 3807 if changes:
3808 3808 msg = _('phase changed for %i changesets\n') % changes
3809 3809 if ret:
3810 3810 ui.status(msg)
3811 3811 else:
3812 3812 ui.note(msg)
3813 3813 else:
3814 3814 ui.warn(_('no phases changed\n'))
3815 3815 return ret
3816 3816
3817 3817 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3818 3818 """Run after a changegroup has been added via pull/unbundle
3819 3819
3820 3820 This takes arguments below:
3821 3821
3822 3822 :modheads: change of heads by pull/unbundle
3823 3823 :optupdate: updating working directory is needed or not
3824 3824 :checkout: update destination revision (or None to default destination)
3825 3825 :brev: a name, which might be a bookmark to be activated after updating
3826 3826 """
3827 3827 if modheads == 0:
3828 3828 return
3829 3829 if optupdate:
3830 3830 try:
3831 3831 return hg.updatetotally(ui, repo, checkout, brev)
3832 3832 except error.UpdateAbort as inst:
3833 3833 msg = _("not updating: %s") % str(inst)
3834 3834 hint = inst.hint
3835 3835 raise error.UpdateAbort(msg, hint=hint)
3836 3836 if modheads > 1:
3837 3837 currentbranchheads = len(repo.branchheads())
3838 3838 if currentbranchheads == modheads:
3839 3839 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3840 3840 elif currentbranchheads > 1:
3841 3841 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3842 3842 "merge)\n"))
3843 3843 else:
3844 3844 ui.status(_("(run 'hg heads' to see heads)\n"))
3845 3845 else:
3846 3846 ui.status(_("(run 'hg update' to get a working copy)\n"))
3847 3847
3848 3848 @command('^pull',
3849 3849 [('u', 'update', None,
3850 3850 _('update to new branch head if changesets were pulled')),
3851 3851 ('f', 'force', None, _('run even when remote repository is unrelated')),
3852 3852 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3853 3853 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3854 3854 ('b', 'branch', [], _('a specific branch you would like to pull'),
3855 3855 _('BRANCH')),
3856 3856 ] + remoteopts,
3857 3857 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3858 3858 def pull(ui, repo, source="default", **opts):
3859 3859 """pull changes from the specified source
3860 3860
3861 3861 Pull changes from a remote repository to a local one.
3862 3862
3863 3863 This finds all changes from the repository at the specified path
3864 3864 or URL and adds them to a local repository (the current one unless
3865 3865 -R is specified). By default, this does not update the copy of the
3866 3866 project in the working directory.
3867 3867
3868 3868 Use :hg:`incoming` if you want to see what would have been added
3869 3869 by a pull at the time you issued this command. If you then decide
3870 3870 to add those changes to the repository, you should use :hg:`pull
3871 3871 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3872 3872
3873 3873 If SOURCE is omitted, the 'default' path will be used.
3874 3874 See :hg:`help urls` for more information.
3875 3875
3876 3876 Specifying bookmark as ``.`` is equivalent to specifying the active
3877 3877 bookmark's name.
3878 3878
3879 3879 Returns 0 on success, 1 if an update had unresolved files.
3880 3880 """
3881 3881
3882 3882 opts = pycompat.byteskwargs(opts)
3883 3883 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
3884 3884 msg = _('update destination required by configuration')
3885 3885 hint = _('use hg pull followed by hg update DEST')
3886 3886 raise error.Abort(msg, hint=hint)
3887 3887
3888 3888 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3889 3889 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3890 3890 other = hg.peer(repo, opts, source)
3891 3891 try:
3892 3892 revs, checkout = hg.addbranchrevs(repo, other, branches,
3893 3893 opts.get('rev'))
3894 3894
3895 3895
3896 3896 pullopargs = {}
3897 3897 if opts.get('bookmark'):
3898 3898 if not revs:
3899 3899 revs = []
3900 3900 # The list of bookmark used here is not the one used to actually
3901 3901 # update the bookmark name. This can result in the revision pulled
3902 3902 # not ending up with the name of the bookmark because of a race
3903 3903 # condition on the server. (See issue 4689 for details)
3904 3904 remotebookmarks = other.listkeys('bookmarks')
3905 3905 pullopargs['remotebookmarks'] = remotebookmarks
3906 3906 for b in opts['bookmark']:
3907 3907 b = repo._bookmarks.expandname(b)
3908 3908 if b not in remotebookmarks:
3909 3909 raise error.Abort(_('remote bookmark %s not found!') % b)
3910 3910 revs.append(remotebookmarks[b])
3911 3911
3912 3912 if revs:
3913 3913 try:
3914 3914 # When 'rev' is a bookmark name, we cannot guarantee that it
3915 3915 # will be updated with that name because of a race condition
3916 3916 # server side. (See issue 4689 for details)
3917 3917 oldrevs = revs
3918 3918 revs = [] # actually, nodes
3919 3919 for r in oldrevs:
3920 3920 node = other.lookup(r)
3921 3921 revs.append(node)
3922 3922 if r == checkout:
3923 3923 checkout = node
3924 3924 except error.CapabilityError:
3925 3925 err = _("other repository doesn't support revision lookup, "
3926 3926 "so a rev cannot be specified.")
3927 3927 raise error.Abort(err)
3928 3928
3929 3929 pullopargs.update(opts.get('opargs', {}))
3930 3930 modheads = exchange.pull(repo, other, heads=revs,
3931 3931 force=opts.get('force'),
3932 3932 bookmarks=opts.get('bookmark', ()),
3933 3933 opargs=pullopargs).cgresult
3934 3934
3935 3935 # brev is a name, which might be a bookmark to be activated at
3936 3936 # the end of the update. In other words, it is an explicit
3937 3937 # destination of the update
3938 3938 brev = None
3939 3939
3940 3940 if checkout:
3941 3941 checkout = str(repo.changelog.rev(checkout))
3942 3942
3943 3943 # order below depends on implementation of
3944 3944 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3945 3945 # because 'checkout' is determined without it.
3946 3946 if opts.get('rev'):
3947 3947 brev = opts['rev'][0]
3948 3948 elif opts.get('branch'):
3949 3949 brev = opts['branch'][0]
3950 3950 else:
3951 3951 brev = branches[0]
3952 3952 repo._subtoppath = source
3953 3953 try:
3954 3954 ret = postincoming(ui, repo, modheads, opts.get('update'),
3955 3955 checkout, brev)
3956 3956
3957 3957 finally:
3958 3958 del repo._subtoppath
3959 3959
3960 3960 finally:
3961 3961 other.close()
3962 3962 return ret
3963 3963
3964 3964 @command('^push',
3965 3965 [('f', 'force', None, _('force push')),
3966 3966 ('r', 'rev', [],
3967 3967 _('a changeset intended to be included in the destination'),
3968 3968 _('REV')),
3969 3969 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
3970 3970 ('b', 'branch', [],
3971 3971 _('a specific branch you would like to push'), _('BRANCH')),
3972 3972 ('', 'new-branch', False, _('allow pushing a new branch')),
3973 3973 ] + remoteopts,
3974 3974 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
3975 3975 def push(ui, repo, dest=None, **opts):
3976 3976 """push changes to the specified destination
3977 3977
3978 3978 Push changesets from the local repository to the specified
3979 3979 destination.
3980 3980
3981 3981 This operation is symmetrical to pull: it is identical to a pull
3982 3982 in the destination repository from the current one.
3983 3983
3984 3984 By default, push will not allow creation of new heads at the
3985 3985 destination, since multiple heads would make it unclear which head
3986 3986 to use. In this situation, it is recommended to pull and merge
3987 3987 before pushing.
3988 3988
3989 3989 Use --new-branch if you want to allow push to create a new named
3990 3990 branch that is not present at the destination. This allows you to
3991 3991 only create a new branch without forcing other changes.
3992 3992
3993 3993 .. note::
3994 3994
3995 3995 Extra care should be taken with the -f/--force option,
3996 3996 which will push all new heads on all branches, an action which will
3997 3997 almost always cause confusion for collaborators.
3998 3998
3999 3999 If -r/--rev is used, the specified revision and all its ancestors
4000 4000 will be pushed to the remote repository.
4001 4001
4002 4002 If -B/--bookmark is used, the specified bookmarked revision, its
4003 4003 ancestors, and the bookmark will be pushed to the remote
4004 4004 repository. Specifying ``.`` is equivalent to specifying the active
4005 4005 bookmark's name.
4006 4006
4007 4007 Please see :hg:`help urls` for important details about ``ssh://``
4008 4008 URLs. If DESTINATION is omitted, a default path will be used.
4009 4009
4010 4010 Returns 0 if push was successful, 1 if nothing to push.
4011 4011 """
4012 4012
4013 4013 opts = pycompat.byteskwargs(opts)
4014 4014 if opts.get('bookmark'):
4015 4015 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4016 4016 for b in opts['bookmark']:
4017 4017 # translate -B options to -r so changesets get pushed
4018 4018 b = repo._bookmarks.expandname(b)
4019 4019 if b in repo._bookmarks:
4020 4020 opts.setdefault('rev', []).append(b)
4021 4021 else:
4022 4022 # if we try to push a deleted bookmark, translate it to null
4023 4023 # this lets simultaneous -r, -b options continue working
4024 4024 opts.setdefault('rev', []).append("null")
4025 4025
4026 4026 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4027 4027 if not path:
4028 4028 raise error.Abort(_('default repository not configured!'),
4029 4029 hint=_("see 'hg help config.paths'"))
4030 4030 dest = path.pushloc or path.loc
4031 4031 branches = (path.branch, opts.get('branch') or [])
4032 4032 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4033 4033 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4034 4034 other = hg.peer(repo, opts, dest)
4035 4035
4036 4036 if revs:
4037 4037 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4038 4038 if not revs:
4039 4039 raise error.Abort(_("specified revisions evaluate to an empty set"),
4040 4040 hint=_("use different revision arguments"))
4041 4041 elif path.pushrev:
4042 4042 # It doesn't make any sense to specify ancestor revisions. So limit
4043 4043 # to DAG heads to make discovery simpler.
4044 4044 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4045 4045 revs = scmutil.revrange(repo, [expr])
4046 4046 revs = [repo[rev].node() for rev in revs]
4047 4047 if not revs:
4048 4048 raise error.Abort(_('default push revset for path evaluates to an '
4049 4049 'empty set'))
4050 4050
4051 4051 repo._subtoppath = dest
4052 4052 try:
4053 4053 # push subrepos depth-first for coherent ordering
4054 4054 c = repo['']
4055 4055 subs = c.substate # only repos that are committed
4056 4056 for s in sorted(subs):
4057 4057 result = c.sub(s).push(opts)
4058 4058 if result == 0:
4059 4059 return not result
4060 4060 finally:
4061 4061 del repo._subtoppath
4062 4062 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4063 4063 newbranch=opts.get('new_branch'),
4064 4064 bookmarks=opts.get('bookmark', ()),
4065 4065 opargs=opts.get('opargs'))
4066 4066
4067 4067 result = not pushop.cgresult
4068 4068
4069 4069 if pushop.bkresult is not None:
4070 4070 if pushop.bkresult == 2:
4071 4071 result = 2
4072 4072 elif not result and pushop.bkresult:
4073 4073 result = 2
4074 4074
4075 4075 return result
4076 4076
4077 4077 @command('recover', [])
4078 4078 def recover(ui, repo):
4079 4079 """roll back an interrupted transaction
4080 4080
4081 4081 Recover from an interrupted commit or pull.
4082 4082
4083 4083 This command tries to fix the repository status after an
4084 4084 interrupted operation. It should only be necessary when Mercurial
4085 4085 suggests it.
4086 4086
4087 4087 Returns 0 if successful, 1 if nothing to recover or verify fails.
4088 4088 """
4089 4089 if repo.recover():
4090 4090 return hg.verify(repo)
4091 4091 return 1
4092 4092
4093 4093 @command('^remove|rm',
4094 4094 [('A', 'after', None, _('record delete for missing files')),
4095 4095 ('f', 'force', None,
4096 4096 _('forget added files, delete modified files')),
4097 4097 ] + subrepoopts + walkopts,
4098 4098 _('[OPTION]... FILE...'),
4099 4099 inferrepo=True)
4100 4100 def remove(ui, repo, *pats, **opts):
4101 4101 """remove the specified files on the next commit
4102 4102
4103 4103 Schedule the indicated files for removal from the current branch.
4104 4104
4105 4105 This command schedules the files to be removed at the next commit.
4106 4106 To undo a remove before that, see :hg:`revert`. To undo added
4107 4107 files, see :hg:`forget`.
4108 4108
4109 4109 .. container:: verbose
4110 4110
4111 4111 -A/--after can be used to remove only files that have already
4112 4112 been deleted, -f/--force can be used to force deletion, and -Af
4113 4113 can be used to remove files from the next revision without
4114 4114 deleting them from the working directory.
4115 4115
4116 4116 The following table details the behavior of remove for different
4117 4117 file states (columns) and option combinations (rows). The file
4118 4118 states are Added [A], Clean [C], Modified [M] and Missing [!]
4119 4119 (as reported by :hg:`status`). The actions are Warn, Remove
4120 4120 (from branch) and Delete (from disk):
4121 4121
4122 4122 ========= == == == ==
4123 4123 opt/state A C M !
4124 4124 ========= == == == ==
4125 4125 none W RD W R
4126 4126 -f R RD RD R
4127 4127 -A W W W R
4128 4128 -Af R R R R
4129 4129 ========= == == == ==
4130 4130
4131 4131 .. note::
4132 4132
4133 4133 :hg:`remove` never deletes files in Added [A] state from the
4134 4134 working directory, not even if ``--force`` is specified.
4135 4135
4136 4136 Returns 0 on success, 1 if any warnings encountered.
4137 4137 """
4138 4138
4139 4139 opts = pycompat.byteskwargs(opts)
4140 4140 after, force = opts.get('after'), opts.get('force')
4141 4141 if not pats and not after:
4142 4142 raise error.Abort(_('no files specified'))
4143 4143
4144 4144 m = scmutil.match(repo[None], pats, opts)
4145 4145 subrepos = opts.get('subrepos')
4146 4146 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4147 4147
4148 4148 @command('rename|move|mv',
4149 4149 [('A', 'after', None, _('record a rename that has already occurred')),
4150 4150 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4151 4151 ] + walkopts + dryrunopts,
4152 4152 _('[OPTION]... SOURCE... DEST'))
4153 4153 def rename(ui, repo, *pats, **opts):
4154 4154 """rename files; equivalent of copy + remove
4155 4155
4156 4156 Mark dest as copies of sources; mark sources for deletion. If dest
4157 4157 is a directory, copies are put in that directory. If dest is a
4158 4158 file, there can only be one source.
4159 4159
4160 4160 By default, this command copies the contents of files as they
4161 4161 exist in the working directory. If invoked with -A/--after, the
4162 4162 operation is recorded, but no copying is performed.
4163 4163
4164 4164 This command takes effect at the next commit. To undo a rename
4165 4165 before that, see :hg:`revert`.
4166 4166
4167 4167 Returns 0 on success, 1 if errors are encountered.
4168 4168 """
4169 4169 opts = pycompat.byteskwargs(opts)
4170 4170 with repo.wlock(False):
4171 4171 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4172 4172
4173 4173 @command('resolve',
4174 4174 [('a', 'all', None, _('select all unresolved files')),
4175 4175 ('l', 'list', None, _('list state of files needing merge')),
4176 4176 ('m', 'mark', None, _('mark files as resolved')),
4177 4177 ('u', 'unmark', None, _('mark files as unresolved')),
4178 4178 ('n', 'no-status', None, _('hide status prefix'))]
4179 4179 + mergetoolopts + walkopts + formatteropts,
4180 4180 _('[OPTION]... [FILE]...'),
4181 4181 inferrepo=True)
4182 4182 def resolve(ui, repo, *pats, **opts):
4183 4183 """redo merges or set/view the merge status of files
4184 4184
4185 4185 Merges with unresolved conflicts are often the result of
4186 4186 non-interactive merging using the ``internal:merge`` configuration
4187 4187 setting, or a command-line merge tool like ``diff3``. The resolve
4188 4188 command is used to manage the files involved in a merge, after
4189 4189 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4190 4190 working directory must have two parents). See :hg:`help
4191 4191 merge-tools` for information on configuring merge tools.
4192 4192
4193 4193 The resolve command can be used in the following ways:
4194 4194
4195 4195 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4196 4196 files, discarding any previous merge attempts. Re-merging is not
4197 4197 performed for files already marked as resolved. Use ``--all/-a``
4198 4198 to select all unresolved files. ``--tool`` can be used to specify
4199 4199 the merge tool used for the given files. It overrides the HGMERGE
4200 4200 environment variable and your configuration files. Previous file
4201 4201 contents are saved with a ``.orig`` suffix.
4202 4202
4203 4203 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4204 4204 (e.g. after having manually fixed-up the files). The default is
4205 4205 to mark all unresolved files.
4206 4206
4207 4207 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4208 4208 default is to mark all resolved files.
4209 4209
4210 4210 - :hg:`resolve -l`: list files which had or still have conflicts.
4211 4211 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4212 4212 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4213 4213 the list. See :hg:`help filesets` for details.
4214 4214
4215 4215 .. note::
4216 4216
4217 4217 Mercurial will not let you commit files with unresolved merge
4218 4218 conflicts. You must use :hg:`resolve -m ...` before you can
4219 4219 commit after a conflicting merge.
4220 4220
4221 4221 Returns 0 on success, 1 if any files fail a resolve attempt.
4222 4222 """
4223 4223
4224 4224 opts = pycompat.byteskwargs(opts)
4225 4225 flaglist = 'all mark unmark list no_status'.split()
4226 4226 all, mark, unmark, show, nostatus = \
4227 4227 [opts.get(o) for o in flaglist]
4228 4228
4229 4229 if (show and (mark or unmark)) or (mark and unmark):
4230 4230 raise error.Abort(_("too many options specified"))
4231 4231 if pats and all:
4232 4232 raise error.Abort(_("can't specify --all and patterns"))
4233 4233 if not (all or pats or show or mark or unmark):
4234 4234 raise error.Abort(_('no files or directories specified'),
4235 4235 hint=('use --all to re-merge all unresolved files'))
4236 4236
4237 4237 if show:
4238 4238 ui.pager('resolve')
4239 4239 fm = ui.formatter('resolve', opts)
4240 4240 ms = mergemod.mergestate.read(repo)
4241 4241 m = scmutil.match(repo[None], pats, opts)
4242 4242 for f in ms:
4243 4243 if not m(f):
4244 4244 continue
4245 4245 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4246 4246 'd': 'driverresolved'}[ms[f]]
4247 4247 fm.startitem()
4248 4248 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4249 4249 fm.write('path', '%s\n', f, label=l)
4250 4250 fm.end()
4251 4251 return 0
4252 4252
4253 4253 with repo.wlock():
4254 4254 ms = mergemod.mergestate.read(repo)
4255 4255
4256 4256 if not (ms.active() or repo.dirstate.p2() != nullid):
4257 4257 raise error.Abort(
4258 4258 _('resolve command not applicable when not merging'))
4259 4259
4260 4260 wctx = repo[None]
4261 4261
4262 4262 if ms.mergedriver and ms.mdstate() == 'u':
4263 4263 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4264 4264 ms.commit()
4265 4265 # allow mark and unmark to go through
4266 4266 if not mark and not unmark and not proceed:
4267 4267 return 1
4268 4268
4269 4269 m = scmutil.match(wctx, pats, opts)
4270 4270 ret = 0
4271 4271 didwork = False
4272 4272 runconclude = False
4273 4273
4274 4274 tocomplete = []
4275 4275 for f in ms:
4276 4276 if not m(f):
4277 4277 continue
4278 4278
4279 4279 didwork = True
4280 4280
4281 4281 # don't let driver-resolved files be marked, and run the conclude
4282 4282 # step if asked to resolve
4283 4283 if ms[f] == "d":
4284 4284 exact = m.exact(f)
4285 4285 if mark:
4286 4286 if exact:
4287 4287 ui.warn(_('not marking %s as it is driver-resolved\n')
4288 4288 % f)
4289 4289 elif unmark:
4290 4290 if exact:
4291 4291 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4292 4292 % f)
4293 4293 else:
4294 4294 runconclude = True
4295 4295 continue
4296 4296
4297 4297 if mark:
4298 4298 ms.mark(f, "r")
4299 4299 elif unmark:
4300 4300 ms.mark(f, "u")
4301 4301 else:
4302 4302 # backup pre-resolve (merge uses .orig for its own purposes)
4303 4303 a = repo.wjoin(f)
4304 4304 try:
4305 4305 util.copyfile(a, a + ".resolve")
4306 4306 except (IOError, OSError) as inst:
4307 4307 if inst.errno != errno.ENOENT:
4308 4308 raise
4309 4309
4310 4310 try:
4311 4311 # preresolve file
4312 4312 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4313 4313 'resolve')
4314 4314 complete, r = ms.preresolve(f, wctx)
4315 4315 if not complete:
4316 4316 tocomplete.append(f)
4317 4317 elif r:
4318 4318 ret = 1
4319 4319 finally:
4320 4320 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4321 4321 ms.commit()
4322 4322
4323 4323 # replace filemerge's .orig file with our resolve file, but only
4324 4324 # for merges that are complete
4325 4325 if complete:
4326 4326 try:
4327 4327 util.rename(a + ".resolve",
4328 4328 scmutil.origpath(ui, repo, a))
4329 4329 except OSError as inst:
4330 4330 if inst.errno != errno.ENOENT:
4331 4331 raise
4332 4332
4333 4333 for f in tocomplete:
4334 4334 try:
4335 4335 # resolve file
4336 4336 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4337 4337 'resolve')
4338 4338 r = ms.resolve(f, wctx)
4339 4339 if r:
4340 4340 ret = 1
4341 4341 finally:
4342 4342 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4343 4343 ms.commit()
4344 4344
4345 4345 # replace filemerge's .orig file with our resolve file
4346 4346 a = repo.wjoin(f)
4347 4347 try:
4348 4348 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4349 4349 except OSError as inst:
4350 4350 if inst.errno != errno.ENOENT:
4351 4351 raise
4352 4352
4353 4353 ms.commit()
4354 4354 ms.recordactions()
4355 4355
4356 4356 if not didwork and pats:
4357 4357 hint = None
4358 4358 if not any([p for p in pats if p.find(':') >= 0]):
4359 4359 pats = ['path:%s' % p for p in pats]
4360 4360 m = scmutil.match(wctx, pats, opts)
4361 4361 for f in ms:
4362 4362 if not m(f):
4363 4363 continue
4364 4364 flags = ''.join(['-%s ' % o[0] for o in flaglist
4365 4365 if opts.get(o)])
4366 4366 hint = _("(try: hg resolve %s%s)\n") % (
4367 4367 flags,
4368 4368 ' '.join(pats))
4369 4369 break
4370 4370 ui.warn(_("arguments do not match paths that need resolving\n"))
4371 4371 if hint:
4372 4372 ui.warn(hint)
4373 4373 elif ms.mergedriver and ms.mdstate() != 's':
4374 4374 # run conclude step when either a driver-resolved file is requested
4375 4375 # or there are no driver-resolved files
4376 4376 # we can't use 'ret' to determine whether any files are unresolved
4377 4377 # because we might not have tried to resolve some
4378 4378 if ((runconclude or not list(ms.driverresolved()))
4379 4379 and not list(ms.unresolved())):
4380 4380 proceed = mergemod.driverconclude(repo, ms, wctx)
4381 4381 ms.commit()
4382 4382 if not proceed:
4383 4383 return 1
4384 4384
4385 4385 # Nudge users into finishing an unfinished operation
4386 4386 unresolvedf = list(ms.unresolved())
4387 4387 driverresolvedf = list(ms.driverresolved())
4388 4388 if not unresolvedf and not driverresolvedf:
4389 4389 ui.status(_('(no more unresolved files)\n'))
4390 4390 cmdutil.checkafterresolved(repo)
4391 4391 elif not unresolvedf:
4392 4392 ui.status(_('(no more unresolved files -- '
4393 4393 'run "hg resolve --all" to conclude)\n'))
4394 4394
4395 4395 return ret
4396 4396
4397 4397 @command('revert',
4398 4398 [('a', 'all', None, _('revert all changes when no arguments given')),
4399 4399 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4400 4400 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4401 4401 ('C', 'no-backup', None, _('do not save backup copies of files')),
4402 4402 ('i', 'interactive', None,
4403 4403 _('interactively select the changes (EXPERIMENTAL)')),
4404 4404 ] + walkopts + dryrunopts,
4405 4405 _('[OPTION]... [-r REV] [NAME]...'))
4406 4406 def revert(ui, repo, *pats, **opts):
4407 4407 """restore files to their checkout state
4408 4408
4409 4409 .. note::
4410 4410
4411 4411 To check out earlier revisions, you should use :hg:`update REV`.
4412 4412 To cancel an uncommitted merge (and lose your changes),
4413 4413 use :hg:`update --clean .`.
4414 4414
4415 4415 With no revision specified, revert the specified files or directories
4416 4416 to the contents they had in the parent of the working directory.
4417 4417 This restores the contents of files to an unmodified
4418 4418 state and unschedules adds, removes, copies, and renames. If the
4419 4419 working directory has two parents, you must explicitly specify a
4420 4420 revision.
4421 4421
4422 4422 Using the -r/--rev or -d/--date options, revert the given files or
4423 4423 directories to their states as of a specific revision. Because
4424 4424 revert does not change the working directory parents, this will
4425 4425 cause these files to appear modified. This can be helpful to "back
4426 4426 out" some or all of an earlier change. See :hg:`backout` for a
4427 4427 related method.
4428 4428
4429 4429 Modified files are saved with a .orig suffix before reverting.
4430 4430 To disable these backups, use --no-backup. It is possible to store
4431 4431 the backup files in a custom directory relative to the root of the
4432 4432 repository by setting the ``ui.origbackuppath`` configuration
4433 4433 option.
4434 4434
4435 4435 See :hg:`help dates` for a list of formats valid for -d/--date.
4436 4436
4437 4437 See :hg:`help backout` for a way to reverse the effect of an
4438 4438 earlier changeset.
4439 4439
4440 4440 Returns 0 on success.
4441 4441 """
4442 4442
4443 4443 if opts.get("date"):
4444 4444 if opts.get("rev"):
4445 4445 raise error.Abort(_("you can't specify a revision and a date"))
4446 4446 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4447 4447
4448 4448 parent, p2 = repo.dirstate.parents()
4449 4449 if not opts.get('rev') and p2 != nullid:
4450 4450 # revert after merge is a trap for new users (issue2915)
4451 4451 raise error.Abort(_('uncommitted merge with no revision specified'),
4452 4452 hint=_("use 'hg update' or see 'hg help revert'"))
4453 4453
4454 4454 ctx = scmutil.revsingle(repo, opts.get('rev'))
4455 4455
4456 4456 if (not (pats or opts.get('include') or opts.get('exclude') or
4457 4457 opts.get('all') or opts.get('interactive'))):
4458 4458 msg = _("no files or directories specified")
4459 4459 if p2 != nullid:
4460 4460 hint = _("uncommitted merge, use --all to discard all changes,"
4461 4461 " or 'hg update -C .' to abort the merge")
4462 4462 raise error.Abort(msg, hint=hint)
4463 4463 dirty = any(repo.status())
4464 4464 node = ctx.node()
4465 4465 if node != parent:
4466 4466 if dirty:
4467 4467 hint = _("uncommitted changes, use --all to discard all"
4468 4468 " changes, or 'hg update %s' to update") % ctx.rev()
4469 4469 else:
4470 4470 hint = _("use --all to revert all files,"
4471 4471 " or 'hg update %s' to update") % ctx.rev()
4472 4472 elif dirty:
4473 4473 hint = _("uncommitted changes, use --all to discard all changes")
4474 4474 else:
4475 4475 hint = _("use --all to revert all files")
4476 4476 raise error.Abort(msg, hint=hint)
4477 4477
4478 4478 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4479 4479
4480 4480 @command('rollback', dryrunopts +
4481 4481 [('f', 'force', False, _('ignore safety measures'))])
4482 4482 def rollback(ui, repo, **opts):
4483 4483 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4484 4484
4485 4485 Please use :hg:`commit --amend` instead of rollback to correct
4486 4486 mistakes in the last commit.
4487 4487
4488 4488 This command should be used with care. There is only one level of
4489 4489 rollback, and there is no way to undo a rollback. It will also
4490 4490 restore the dirstate at the time of the last transaction, losing
4491 4491 any dirstate changes since that time. This command does not alter
4492 4492 the working directory.
4493 4493
4494 4494 Transactions are used to encapsulate the effects of all commands
4495 4495 that create new changesets or propagate existing changesets into a
4496 4496 repository.
4497 4497
4498 4498 .. container:: verbose
4499 4499
4500 4500 For example, the following commands are transactional, and their
4501 4501 effects can be rolled back:
4502 4502
4503 4503 - commit
4504 4504 - import
4505 4505 - pull
4506 4506 - push (with this repository as the destination)
4507 4507 - unbundle
4508 4508
4509 4509 To avoid permanent data loss, rollback will refuse to rollback a
4510 4510 commit transaction if it isn't checked out. Use --force to
4511 4511 override this protection.
4512 4512
4513 4513 The rollback command can be entirely disabled by setting the
4514 4514 ``ui.rollback`` configuration setting to false. If you're here
4515 4515 because you want to use rollback and it's disabled, you can
4516 4516 re-enable the command by setting ``ui.rollback`` to true.
4517 4517
4518 4518 This command is not intended for use on public repositories. Once
4519 4519 changes are visible for pull by other users, rolling a transaction
4520 4520 back locally is ineffective (someone else may already have pulled
4521 4521 the changes). Furthermore, a race is possible with readers of the
4522 4522 repository; for example an in-progress pull from the repository
4523 4523 may fail if a rollback is performed.
4524 4524
4525 4525 Returns 0 on success, 1 if no rollback data is available.
4526 4526 """
4527 4527 if not ui.configbool('ui', 'rollback'):
4528 4528 raise error.Abort(_('rollback is disabled because it is unsafe'),
4529 4529 hint=('see `hg help -v rollback` for information'))
4530 4530 return repo.rollback(dryrun=opts.get(r'dry_run'),
4531 4531 force=opts.get(r'force'))
4532 4532
4533 4533 @command('root', [])
4534 4534 def root(ui, repo):
4535 4535 """print the root (top) of the current working directory
4536 4536
4537 4537 Print the root directory of the current repository.
4538 4538
4539 4539 Returns 0 on success.
4540 4540 """
4541 4541 ui.write(repo.root + "\n")
4542 4542
4543 4543 @command('^serve',
4544 4544 [('A', 'accesslog', '', _('name of access log file to write to'),
4545 4545 _('FILE')),
4546 4546 ('d', 'daemon', None, _('run server in background')),
4547 4547 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4548 4548 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4549 4549 # use string type, then we can check if something was passed
4550 4550 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4551 4551 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4552 4552 _('ADDR')),
4553 4553 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4554 4554 _('PREFIX')),
4555 4555 ('n', 'name', '',
4556 4556 _('name to show in web pages (default: working directory)'), _('NAME')),
4557 4557 ('', 'web-conf', '',
4558 4558 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4559 4559 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4560 4560 _('FILE')),
4561 4561 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4562 4562 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4563 4563 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4564 4564 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4565 4565 ('', 'style', '', _('template style to use'), _('STYLE')),
4566 4566 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4567 4567 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))]
4568 4568 + subrepoopts,
4569 4569 _('[OPTION]...'),
4570 4570 optionalrepo=True)
4571 4571 def serve(ui, repo, **opts):
4572 4572 """start stand-alone webserver
4573 4573
4574 4574 Start a local HTTP repository browser and pull server. You can use
4575 4575 this for ad-hoc sharing and browsing of repositories. It is
4576 4576 recommended to use a real web server to serve a repository for
4577 4577 longer periods of time.
4578 4578
4579 4579 Please note that the server does not implement access control.
4580 4580 This means that, by default, anybody can read from the server and
4581 4581 nobody can write to it by default. Set the ``web.allow_push``
4582 4582 option to ``*`` to allow everybody to push to the server. You
4583 4583 should use a real web server if you need to authenticate users.
4584 4584
4585 4585 By default, the server logs accesses to stdout and errors to
4586 4586 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4587 4587 files.
4588 4588
4589 4589 To have the server choose a free port number to listen on, specify
4590 4590 a port number of 0; in this case, the server will print the port
4591 4591 number it uses.
4592 4592
4593 4593 Returns 0 on success.
4594 4594 """
4595 4595
4596 4596 opts = pycompat.byteskwargs(opts)
4597 4597 if opts["stdio"] and opts["cmdserver"]:
4598 4598 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4599 4599
4600 4600 if opts["stdio"]:
4601 4601 if repo is None:
4602 4602 raise error.RepoError(_("there is no Mercurial repository here"
4603 4603 " (.hg not found)"))
4604 4604 s = sshserver.sshserver(ui, repo)
4605 4605 s.serve_forever()
4606 4606
4607 4607 service = server.createservice(ui, repo, opts)
4608 4608 return server.runservice(opts, initfn=service.init, runfn=service.run)
4609 4609
4610 4610 @command('^status|st',
4611 4611 [('A', 'all', None, _('show status of all files')),
4612 4612 ('m', 'modified', None, _('show only modified files')),
4613 4613 ('a', 'added', None, _('show only added files')),
4614 4614 ('r', 'removed', None, _('show only removed files')),
4615 4615 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4616 4616 ('c', 'clean', None, _('show only files without changes')),
4617 4617 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4618 4618 ('i', 'ignored', None, _('show only ignored files')),
4619 4619 ('n', 'no-status', None, _('hide status prefix')),
4620 4620 ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')),
4621 4621 ('C', 'copies', None, _('show source of copied files')),
4622 4622 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4623 4623 ('', 'rev', [], _('show difference from revision'), _('REV')),
4624 4624 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4625 4625 ] + walkopts + subrepoopts + formatteropts,
4626 4626 _('[OPTION]... [FILE]...'),
4627 4627 inferrepo=True)
4628 4628 def status(ui, repo, *pats, **opts):
4629 4629 """show changed files in the working directory
4630 4630
4631 4631 Show status of files in the repository. If names are given, only
4632 4632 files that match are shown. Files that are clean or ignored or
4633 4633 the source of a copy/move operation, are not listed unless
4634 4634 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4635 4635 Unless options described with "show only ..." are given, the
4636 4636 options -mardu are used.
4637 4637
4638 4638 Option -q/--quiet hides untracked (unknown and ignored) files
4639 4639 unless explicitly requested with -u/--unknown or -i/--ignored.
4640 4640
4641 4641 .. note::
4642 4642
4643 4643 :hg:`status` may appear to disagree with diff if permissions have
4644 4644 changed or a merge has occurred. The standard diff format does
4645 4645 not report permission changes and diff only reports changes
4646 4646 relative to one merge parent.
4647 4647
4648 4648 If one revision is given, it is used as the base revision.
4649 4649 If two revisions are given, the differences between them are
4650 4650 shown. The --change option can also be used as a shortcut to list
4651 4651 the changed files of a revision from its first parent.
4652 4652
4653 4653 The codes used to show the status of files are::
4654 4654
4655 4655 M = modified
4656 4656 A = added
4657 4657 R = removed
4658 4658 C = clean
4659 4659 ! = missing (deleted by non-hg command, but still tracked)
4660 4660 ? = not tracked
4661 4661 I = ignored
4662 4662 = origin of the previous file (with --copies)
4663 4663
4664 4664 .. container:: verbose
4665 4665
4666 4666 The -t/--terse option abbreviates the output by showing directory name
4667 4667 if all the files in it share the same status. The option expects a value
4668 4668 which can be a string formed by using 'm', 'a', 'r', 'd', 'u', 'i', 'c'
4669 4669 where, 'm' stands for 'modified', 'a' for 'added', 'r' for 'removed',
4670 4670 'd' for 'deleted', 'u' for 'unknown', 'i' for 'ignored' and 'c' for clean.
4671 4671
4672 4672 It terses the output of only those status which are passed. The ignored
4673 4673 files are not considered while tersing until 'i' is there in --terse value
4674 4674 or the --ignored option is used.
4675 4675
4676 4676 Examples:
4677 4677
4678 4678 - show changes in the working directory relative to a
4679 4679 changeset::
4680 4680
4681 4681 hg status --rev 9353
4682 4682
4683 4683 - show changes in the working directory relative to the
4684 4684 current directory (see :hg:`help patterns` for more information)::
4685 4685
4686 4686 hg status re:
4687 4687
4688 4688 - show all changes including copies in an existing changeset::
4689 4689
4690 4690 hg status --copies --change 9353
4691 4691
4692 4692 - get a NUL separated list of added files, suitable for xargs::
4693 4693
4694 4694 hg status -an0
4695 4695
4696 4696 Returns 0 on success.
4697 4697 """
4698 4698
4699 4699 opts = pycompat.byteskwargs(opts)
4700 4700 revs = opts.get('rev')
4701 4701 change = opts.get('change')
4702 4702 terse = opts.get('terse')
4703 4703
4704 4704 if revs and change:
4705 4705 msg = _('cannot specify --rev and --change at the same time')
4706 4706 raise error.Abort(msg)
4707 4707 elif revs and terse:
4708 4708 msg = _('cannot use --terse with --rev')
4709 4709 raise error.Abort(msg)
4710 4710 elif change:
4711 4711 node2 = scmutil.revsingle(repo, change, None).node()
4712 4712 node1 = repo[node2].p1().node()
4713 4713 else:
4714 4714 node1, node2 = scmutil.revpair(repo, revs)
4715 4715
4716 4716 if pats or ui.configbool('commands', 'status.relative'):
4717 4717 cwd = repo.getcwd()
4718 4718 else:
4719 4719 cwd = ''
4720 4720
4721 4721 if opts.get('print0'):
4722 4722 end = '\0'
4723 4723 else:
4724 4724 end = '\n'
4725 4725 copy = {}
4726 4726 states = 'modified added removed deleted unknown ignored clean'.split()
4727 4727 show = [k for k in states if opts.get(k)]
4728 4728 if opts.get('all'):
4729 4729 show += ui.quiet and (states[:4] + ['clean']) or states
4730 4730
4731 4731 if not show:
4732 4732 if ui.quiet:
4733 4733 show = states[:4]
4734 4734 else:
4735 4735 show = states[:5]
4736 4736
4737 4737 m = scmutil.match(repo[node2], pats, opts)
4738 4738 stat = repo.status(node1, node2, m,
4739 4739 'ignored' in show, 'clean' in show, 'unknown' in show,
4740 4740 opts.get('subrepos'))
4741 4741 if terse:
4742 4742 stat = cmdutil.tersestatus(repo.root, stat, terse,
4743 4743 repo.dirstate._ignore, opts.get('ignored'))
4744 4744 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4745 4745
4746 4746 if (opts.get('all') or opts.get('copies')
4747 4747 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4748 4748 copy = copies.pathcopies(repo[node1], repo[node2], m)
4749 4749
4750 4750 ui.pager('status')
4751 4751 fm = ui.formatter('status', opts)
4752 4752 fmt = '%s' + end
4753 4753 showchar = not opts.get('no_status')
4754 4754
4755 4755 for state, char, files in changestates:
4756 4756 if state in show:
4757 4757 label = 'status.' + state
4758 4758 for f in files:
4759 4759 fm.startitem()
4760 4760 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4761 4761 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4762 4762 if f in copy:
4763 4763 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4764 4764 label='status.copied')
4765 4765 fm.end()
4766 4766
4767 4767 @command('^summary|sum',
4768 4768 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4769 4769 def summary(ui, repo, **opts):
4770 4770 """summarize working directory state
4771 4771
4772 4772 This generates a brief summary of the working directory state,
4773 4773 including parents, branch, commit status, phase and available updates.
4774 4774
4775 4775 With the --remote option, this will check the default paths for
4776 4776 incoming and outgoing changes. This can be time-consuming.
4777 4777
4778 4778 Returns 0 on success.
4779 4779 """
4780 4780
4781 4781 opts = pycompat.byteskwargs(opts)
4782 4782 ui.pager('summary')
4783 4783 ctx = repo[None]
4784 4784 parents = ctx.parents()
4785 4785 pnode = parents[0].node()
4786 4786 marks = []
4787 4787
4788 4788 ms = None
4789 4789 try:
4790 4790 ms = mergemod.mergestate.read(repo)
4791 4791 except error.UnsupportedMergeRecords as e:
4792 4792 s = ' '.join(e.recordtypes)
4793 4793 ui.warn(
4794 4794 _('warning: merge state has unsupported record types: %s\n') % s)
4795 4795 unresolved = []
4796 4796 else:
4797 4797 unresolved = list(ms.unresolved())
4798 4798
4799 4799 for p in parents:
4800 4800 # label with log.changeset (instead of log.parent) since this
4801 4801 # shows a working directory parent *changeset*:
4802 4802 # i18n: column positioning for "hg summary"
4803 4803 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4804 4804 label=cmdutil._changesetlabels(p))
4805 4805 ui.write(' '.join(p.tags()), label='log.tag')
4806 4806 if p.bookmarks():
4807 4807 marks.extend(p.bookmarks())
4808 4808 if p.rev() == -1:
4809 4809 if not len(repo):
4810 4810 ui.write(_(' (empty repository)'))
4811 4811 else:
4812 4812 ui.write(_(' (no revision checked out)'))
4813 4813 if p.obsolete():
4814 4814 ui.write(_(' (obsolete)'))
4815 4815 if p.troubled():
4816 4816 ui.write(' ('
4817 4817 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4818 4818 for trouble in p.troubles())
4819 4819 + ')')
4820 4820 ui.write('\n')
4821 4821 if p.description():
4822 4822 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4823 4823 label='log.summary')
4824 4824
4825 4825 branch = ctx.branch()
4826 4826 bheads = repo.branchheads(branch)
4827 4827 # i18n: column positioning for "hg summary"
4828 4828 m = _('branch: %s\n') % branch
4829 4829 if branch != 'default':
4830 4830 ui.write(m, label='log.branch')
4831 4831 else:
4832 4832 ui.status(m, label='log.branch')
4833 4833
4834 4834 if marks:
4835 4835 active = repo._activebookmark
4836 4836 # i18n: column positioning for "hg summary"
4837 4837 ui.write(_('bookmarks:'), label='log.bookmark')
4838 4838 if active is not None:
4839 4839 if active in marks:
4840 4840 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
4841 4841 marks.remove(active)
4842 4842 else:
4843 4843 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
4844 4844 for m in marks:
4845 4845 ui.write(' ' + m, label='log.bookmark')
4846 4846 ui.write('\n', label='log.bookmark')
4847 4847
4848 4848 status = repo.status(unknown=True)
4849 4849
4850 4850 c = repo.dirstate.copies()
4851 4851 copied, renamed = [], []
4852 4852 for d, s in c.iteritems():
4853 4853 if s in status.removed:
4854 4854 status.removed.remove(s)
4855 4855 renamed.append(d)
4856 4856 else:
4857 4857 copied.append(d)
4858 4858 if d in status.added:
4859 4859 status.added.remove(d)
4860 4860
4861 4861 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4862 4862
4863 4863 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4864 4864 (ui.label(_('%d added'), 'status.added'), status.added),
4865 4865 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4866 4866 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4867 4867 (ui.label(_('%d copied'), 'status.copied'), copied),
4868 4868 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4869 4869 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4870 4870 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4871 4871 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4872 4872 t = []
4873 4873 for l, s in labels:
4874 4874 if s:
4875 4875 t.append(l % len(s))
4876 4876
4877 4877 t = ', '.join(t)
4878 4878 cleanworkdir = False
4879 4879
4880 4880 if repo.vfs.exists('graftstate'):
4881 4881 t += _(' (graft in progress)')
4882 4882 if repo.vfs.exists('updatestate'):
4883 4883 t += _(' (interrupted update)')
4884 4884 elif len(parents) > 1:
4885 4885 t += _(' (merge)')
4886 4886 elif branch != parents[0].branch():
4887 4887 t += _(' (new branch)')
4888 4888 elif (parents[0].closesbranch() and
4889 4889 pnode in repo.branchheads(branch, closed=True)):
4890 4890 t += _(' (head closed)')
4891 4891 elif not (status.modified or status.added or status.removed or renamed or
4892 4892 copied or subs):
4893 4893 t += _(' (clean)')
4894 4894 cleanworkdir = True
4895 4895 elif pnode not in bheads:
4896 4896 t += _(' (new branch head)')
4897 4897
4898 4898 if parents:
4899 4899 pendingphase = max(p.phase() for p in parents)
4900 4900 else:
4901 4901 pendingphase = phases.public
4902 4902
4903 4903 if pendingphase > phases.newcommitphase(ui):
4904 4904 t += ' (%s)' % phases.phasenames[pendingphase]
4905 4905
4906 4906 if cleanworkdir:
4907 4907 # i18n: column positioning for "hg summary"
4908 4908 ui.status(_('commit: %s\n') % t.strip())
4909 4909 else:
4910 4910 # i18n: column positioning for "hg summary"
4911 4911 ui.write(_('commit: %s\n') % t.strip())
4912 4912
4913 4913 # all ancestors of branch heads - all ancestors of parent = new csets
4914 4914 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4915 4915 bheads))
4916 4916
4917 4917 if new == 0:
4918 4918 # i18n: column positioning for "hg summary"
4919 4919 ui.status(_('update: (current)\n'))
4920 4920 elif pnode not in bheads:
4921 4921 # i18n: column positioning for "hg summary"
4922 4922 ui.write(_('update: %d new changesets (update)\n') % new)
4923 4923 else:
4924 4924 # i18n: column positioning for "hg summary"
4925 4925 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4926 4926 (new, len(bheads)))
4927 4927
4928 4928 t = []
4929 4929 draft = len(repo.revs('draft()'))
4930 4930 if draft:
4931 4931 t.append(_('%d draft') % draft)
4932 4932 secret = len(repo.revs('secret()'))
4933 4933 if secret:
4934 4934 t.append(_('%d secret') % secret)
4935 4935
4936 4936 if draft or secret:
4937 4937 ui.status(_('phases: %s\n') % ', '.join(t))
4938 4938
4939 4939 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4940 4940 for trouble in ("unstable", "divergent", "bumped"):
4941 4941 numtrouble = len(repo.revs(trouble + "()"))
4942 4942 # We write all the possibilities to ease translation
4943 4943 troublemsg = {
4944 4944 "unstable": _("orphan: %d changesets"),
4945 4945 "divergent": _("divergent: %d changesets"),
4946 4946 "bumped": _("bumped: %d changesets"),
4947 4947 }
4948 4948 if numtrouble > 0:
4949 4949 ui.status(troublemsg[trouble] % numtrouble + "\n")
4950 4950
4951 4951 cmdutil.summaryhooks(ui, repo)
4952 4952
4953 4953 if opts.get('remote'):
4954 4954 needsincoming, needsoutgoing = True, True
4955 4955 else:
4956 4956 needsincoming, needsoutgoing = False, False
4957 4957 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4958 4958 if i:
4959 4959 needsincoming = True
4960 4960 if o:
4961 4961 needsoutgoing = True
4962 4962 if not needsincoming and not needsoutgoing:
4963 4963 return
4964 4964
4965 4965 def getincoming():
4966 4966 source, branches = hg.parseurl(ui.expandpath('default'))
4967 4967 sbranch = branches[0]
4968 4968 try:
4969 4969 other = hg.peer(repo, {}, source)
4970 4970 except error.RepoError:
4971 4971 if opts.get('remote'):
4972 4972 raise
4973 4973 return source, sbranch, None, None, None
4974 4974 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4975 4975 if revs:
4976 4976 revs = [other.lookup(rev) for rev in revs]
4977 4977 ui.debug('comparing with %s\n' % util.hidepassword(source))
4978 4978 repo.ui.pushbuffer()
4979 4979 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
4980 4980 repo.ui.popbuffer()
4981 4981 return source, sbranch, other, commoninc, commoninc[1]
4982 4982
4983 4983 if needsincoming:
4984 4984 source, sbranch, sother, commoninc, incoming = getincoming()
4985 4985 else:
4986 4986 source = sbranch = sother = commoninc = incoming = None
4987 4987
4988 4988 def getoutgoing():
4989 4989 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
4990 4990 dbranch = branches[0]
4991 4991 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
4992 4992 if source != dest:
4993 4993 try:
4994 4994 dother = hg.peer(repo, {}, dest)
4995 4995 except error.RepoError:
4996 4996 if opts.get('remote'):
4997 4997 raise
4998 4998 return dest, dbranch, None, None
4999 4999 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5000 5000 elif sother is None:
5001 5001 # there is no explicit destination peer, but source one is invalid
5002 5002 return dest, dbranch, None, None
5003 5003 else:
5004 5004 dother = sother
5005 5005 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5006 5006 common = None
5007 5007 else:
5008 5008 common = commoninc
5009 5009 if revs:
5010 5010 revs = [repo.lookup(rev) for rev in revs]
5011 5011 repo.ui.pushbuffer()
5012 5012 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5013 5013 commoninc=common)
5014 5014 repo.ui.popbuffer()
5015 5015 return dest, dbranch, dother, outgoing
5016 5016
5017 5017 if needsoutgoing:
5018 5018 dest, dbranch, dother, outgoing = getoutgoing()
5019 5019 else:
5020 5020 dest = dbranch = dother = outgoing = None
5021 5021
5022 5022 if opts.get('remote'):
5023 5023 t = []
5024 5024 if incoming:
5025 5025 t.append(_('1 or more incoming'))
5026 5026 o = outgoing.missing
5027 5027 if o:
5028 5028 t.append(_('%d outgoing') % len(o))
5029 5029 other = dother or sother
5030 5030 if 'bookmarks' in other.listkeys('namespaces'):
5031 5031 counts = bookmarks.summary(repo, other)
5032 5032 if counts[0] > 0:
5033 5033 t.append(_('%d incoming bookmarks') % counts[0])
5034 5034 if counts[1] > 0:
5035 5035 t.append(_('%d outgoing bookmarks') % counts[1])
5036 5036
5037 5037 if t:
5038 5038 # i18n: column positioning for "hg summary"
5039 5039 ui.write(_('remote: %s\n') % (', '.join(t)))
5040 5040 else:
5041 5041 # i18n: column positioning for "hg summary"
5042 5042 ui.status(_('remote: (synced)\n'))
5043 5043
5044 5044 cmdutil.summaryremotehooks(ui, repo, opts,
5045 5045 ((source, sbranch, sother, commoninc),
5046 5046 (dest, dbranch, dother, outgoing)))
5047 5047
5048 5048 @command('tag',
5049 5049 [('f', 'force', None, _('force tag')),
5050 5050 ('l', 'local', None, _('make the tag local')),
5051 5051 ('r', 'rev', '', _('revision to tag'), _('REV')),
5052 5052 ('', 'remove', None, _('remove a tag')),
5053 5053 # -l/--local is already there, commitopts cannot be used
5054 5054 ('e', 'edit', None, _('invoke editor on commit messages')),
5055 5055 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5056 5056 ] + commitopts2,
5057 5057 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5058 5058 def tag(ui, repo, name1, *names, **opts):
5059 5059 """add one or more tags for the current or given revision
5060 5060
5061 5061 Name a particular revision using <name>.
5062 5062
5063 5063 Tags are used to name particular revisions of the repository and are
5064 5064 very useful to compare different revisions, to go back to significant
5065 5065 earlier versions or to mark branch points as releases, etc. Changing
5066 5066 an existing tag is normally disallowed; use -f/--force to override.
5067 5067
5068 5068 If no revision is given, the parent of the working directory is
5069 5069 used.
5070 5070
5071 5071 To facilitate version control, distribution, and merging of tags,
5072 5072 they are stored as a file named ".hgtags" which is managed similarly
5073 5073 to other project files and can be hand-edited if necessary. This
5074 5074 also means that tagging creates a new commit. The file
5075 5075 ".hg/localtags" is used for local tags (not shared among
5076 5076 repositories).
5077 5077
5078 5078 Tag commits are usually made at the head of a branch. If the parent
5079 5079 of the working directory is not a branch head, :hg:`tag` aborts; use
5080 5080 -f/--force to force the tag commit to be based on a non-head
5081 5081 changeset.
5082 5082
5083 5083 See :hg:`help dates` for a list of formats valid for -d/--date.
5084 5084
5085 5085 Since tag names have priority over branch names during revision
5086 5086 lookup, using an existing branch name as a tag name is discouraged.
5087 5087
5088 5088 Returns 0 on success.
5089 5089 """
5090 5090 opts = pycompat.byteskwargs(opts)
5091 5091 wlock = lock = None
5092 5092 try:
5093 5093 wlock = repo.wlock()
5094 5094 lock = repo.lock()
5095 5095 rev_ = "."
5096 5096 names = [t.strip() for t in (name1,) + names]
5097 5097 if len(names) != len(set(names)):
5098 5098 raise error.Abort(_('tag names must be unique'))
5099 5099 for n in names:
5100 5100 scmutil.checknewlabel(repo, n, 'tag')
5101 5101 if not n:
5102 5102 raise error.Abort(_('tag names cannot consist entirely of '
5103 5103 'whitespace'))
5104 5104 if opts.get('rev') and opts.get('remove'):
5105 5105 raise error.Abort(_("--rev and --remove are incompatible"))
5106 5106 if opts.get('rev'):
5107 5107 rev_ = opts['rev']
5108 5108 message = opts.get('message')
5109 5109 if opts.get('remove'):
5110 5110 if opts.get('local'):
5111 5111 expectedtype = 'local'
5112 5112 else:
5113 5113 expectedtype = 'global'
5114 5114
5115 5115 for n in names:
5116 5116 if not repo.tagtype(n):
5117 5117 raise error.Abort(_("tag '%s' does not exist") % n)
5118 5118 if repo.tagtype(n) != expectedtype:
5119 5119 if expectedtype == 'global':
5120 5120 raise error.Abort(_("tag '%s' is not a global tag") % n)
5121 5121 else:
5122 5122 raise error.Abort(_("tag '%s' is not a local tag") % n)
5123 5123 rev_ = 'null'
5124 5124 if not message:
5125 5125 # we don't translate commit messages
5126 5126 message = 'Removed tag %s' % ', '.join(names)
5127 5127 elif not opts.get('force'):
5128 5128 for n in names:
5129 5129 if n in repo.tags():
5130 5130 raise error.Abort(_("tag '%s' already exists "
5131 5131 "(use -f to force)") % n)
5132 5132 if not opts.get('local'):
5133 5133 p1, p2 = repo.dirstate.parents()
5134 5134 if p2 != nullid:
5135 5135 raise error.Abort(_('uncommitted merge'))
5136 5136 bheads = repo.branchheads()
5137 5137 if not opts.get('force') and bheads and p1 not in bheads:
5138 5138 raise error.Abort(_('working directory is not at a branch head '
5139 5139 '(use -f to force)'))
5140 5140 r = scmutil.revsingle(repo, rev_).node()
5141 5141
5142 5142 if not message:
5143 5143 # we don't translate commit messages
5144 5144 message = ('Added tag %s for changeset %s' %
5145 5145 (', '.join(names), short(r)))
5146 5146
5147 5147 date = opts.get('date')
5148 5148 if date:
5149 5149 date = util.parsedate(date)
5150 5150
5151 5151 if opts.get('remove'):
5152 5152 editform = 'tag.remove'
5153 5153 else:
5154 5154 editform = 'tag.add'
5155 5155 editor = cmdutil.getcommiteditor(editform=editform,
5156 5156 **pycompat.strkwargs(opts))
5157 5157
5158 5158 # don't allow tagging the null rev
5159 5159 if (not opts.get('remove') and
5160 5160 scmutil.revsingle(repo, rev_).rev() == nullrev):
5161 5161 raise error.Abort(_("cannot tag null revision"))
5162 5162
5163 5163 tagsmod.tag(repo, names, r, message, opts.get('local'),
5164 5164 opts.get('user'), date, editor=editor)
5165 5165 finally:
5166 5166 release(lock, wlock)
5167 5167
5168 5168 @command('tags', formatteropts, '')
5169 5169 def tags(ui, repo, **opts):
5170 5170 """list repository tags
5171 5171
5172 5172 This lists both regular and local tags. When the -v/--verbose
5173 5173 switch is used, a third column "local" is printed for local tags.
5174 5174 When the -q/--quiet switch is used, only the tag name is printed.
5175 5175
5176 5176 Returns 0 on success.
5177 5177 """
5178 5178
5179 5179 opts = pycompat.byteskwargs(opts)
5180 5180 ui.pager('tags')
5181 5181 fm = ui.formatter('tags', opts)
5182 5182 hexfunc = fm.hexfunc
5183 5183 tagtype = ""
5184 5184
5185 5185 for t, n in reversed(repo.tagslist()):
5186 5186 hn = hexfunc(n)
5187 5187 label = 'tags.normal'
5188 5188 tagtype = ''
5189 5189 if repo.tagtype(t) == 'local':
5190 5190 label = 'tags.local'
5191 5191 tagtype = 'local'
5192 5192
5193 5193 fm.startitem()
5194 5194 fm.write('tag', '%s', t, label=label)
5195 5195 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5196 5196 fm.condwrite(not ui.quiet, 'rev node', fmt,
5197 5197 repo.changelog.rev(n), hn, label=label)
5198 5198 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5199 5199 tagtype, label=label)
5200 5200 fm.plain('\n')
5201 5201 fm.end()
5202 5202
5203 5203 @command('tip',
5204 5204 [('p', 'patch', None, _('show patch')),
5205 5205 ('g', 'git', None, _('use git extended diff format')),
5206 5206 ] + templateopts,
5207 5207 _('[-p] [-g]'))
5208 5208 def tip(ui, repo, **opts):
5209 5209 """show the tip revision (DEPRECATED)
5210 5210
5211 5211 The tip revision (usually just called the tip) is the changeset
5212 5212 most recently added to the repository (and therefore the most
5213 5213 recently changed head).
5214 5214
5215 5215 If you have just made a commit, that commit will be the tip. If
5216 5216 you have just pulled changes from another repository, the tip of
5217 5217 that repository becomes the current tip. The "tip" tag is special
5218 5218 and cannot be renamed or assigned to a different changeset.
5219 5219
5220 5220 This command is deprecated, please use :hg:`heads` instead.
5221 5221
5222 5222 Returns 0 on success.
5223 5223 """
5224 5224 opts = pycompat.byteskwargs(opts)
5225 5225 displayer = cmdutil.show_changeset(ui, repo, opts)
5226 5226 displayer.show(repo['tip'])
5227 5227 displayer.close()
5228 5228
5229 5229 @command('unbundle',
5230 5230 [('u', 'update', None,
5231 5231 _('update to new branch head if changesets were unbundled'))],
5232 5232 _('[-u] FILE...'))
5233 5233 def unbundle(ui, repo, fname1, *fnames, **opts):
5234 5234 """apply one or more bundle files
5235 5235
5236 5236 Apply one or more bundle files generated by :hg:`bundle`.
5237 5237
5238 5238 Returns 0 on success, 1 if an update has unresolved files.
5239 5239 """
5240 5240 fnames = (fname1,) + fnames
5241 5241
5242 5242 with repo.lock():
5243 5243 for fname in fnames:
5244 5244 f = hg.openpath(ui, fname)
5245 5245 gen = exchange.readbundle(ui, f, fname)
5246 5246 if isinstance(gen, streamclone.streamcloneapplier):
5247 5247 raise error.Abort(
5248 5248 _('packed bundles cannot be applied with '
5249 5249 '"hg unbundle"'),
5250 5250 hint=_('use "hg debugapplystreamclonebundle"'))
5251 5251 url = 'bundle:' + fname
5252 5252 try:
5253 5253 txnname = 'unbundle'
5254 5254 if not isinstance(gen, bundle2.unbundle20):
5255 5255 txnname = 'unbundle\n%s' % util.hidepassword(url)
5256 5256 with repo.transaction(txnname) as tr:
5257 5257 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5258 5258 url=url)
5259 5259 except error.BundleUnknownFeatureError as exc:
5260 5260 raise error.Abort(
5261 5261 _('%s: unknown bundle feature, %s') % (fname, exc),
5262 5262 hint=_("see https://mercurial-scm.org/"
5263 5263 "wiki/BundleFeature for more "
5264 5264 "information"))
5265 5265 modheads = bundle2.combinechangegroupresults(op)
5266 5266
5267 5267 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
5268 5268
5269 5269 @command('^update|up|checkout|co',
5270 5270 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5271 5271 ('c', 'check', None, _('require clean working directory')),
5272 5272 ('m', 'merge', None, _('merge uncommitted changes')),
5273 5273 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5274 5274 ('r', 'rev', '', _('revision'), _('REV'))
5275 5275 ] + mergetoolopts,
5276 5276 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5277 5277 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5278 5278 merge=None, tool=None):
5279 5279 """update working directory (or switch revisions)
5280 5280
5281 5281 Update the repository's working directory to the specified
5282 5282 changeset. If no changeset is specified, update to the tip of the
5283 5283 current named branch and move the active bookmark (see :hg:`help
5284 5284 bookmarks`).
5285 5285
5286 5286 Update sets the working directory's parent revision to the specified
5287 5287 changeset (see :hg:`help parents`).
5288 5288
5289 5289 If the changeset is not a descendant or ancestor of the working
5290 5290 directory's parent and there are uncommitted changes, the update is
5291 5291 aborted. With the -c/--check option, the working directory is checked
5292 5292 for uncommitted changes; if none are found, the working directory is
5293 5293 updated to the specified changeset.
5294 5294
5295 5295 .. container:: verbose
5296 5296
5297 5297 The -C/--clean, -c/--check, and -m/--merge options control what
5298 5298 happens if the working directory contains uncommitted changes.
5299 5299 At most of one of them can be specified.
5300 5300
5301 5301 1. If no option is specified, and if
5302 5302 the requested changeset is an ancestor or descendant of
5303 5303 the working directory's parent, the uncommitted changes
5304 5304 are merged into the requested changeset and the merged
5305 5305 result is left uncommitted. If the requested changeset is
5306 5306 not an ancestor or descendant (that is, it is on another
5307 5307 branch), the update is aborted and the uncommitted changes
5308 5308 are preserved.
5309 5309
5310 5310 2. With the -m/--merge option, the update is allowed even if the
5311 5311 requested changeset is not an ancestor or descendant of
5312 5312 the working directory's parent.
5313 5313
5314 5314 3. With the -c/--check option, the update is aborted and the
5315 5315 uncommitted changes are preserved.
5316 5316
5317 5317 4. With the -C/--clean option, uncommitted changes are discarded and
5318 5318 the working directory is updated to the requested changeset.
5319 5319
5320 5320 To cancel an uncommitted merge (and lose your changes), use
5321 5321 :hg:`update --clean .`.
5322 5322
5323 5323 Use null as the changeset to remove the working directory (like
5324 5324 :hg:`clone -U`).
5325 5325
5326 5326 If you want to revert just one file to an older revision, use
5327 5327 :hg:`revert [-r REV] NAME`.
5328 5328
5329 5329 See :hg:`help dates` for a list of formats valid for -d/--date.
5330 5330
5331 5331 Returns 0 on success, 1 if there are unresolved files.
5332 5332 """
5333 5333 if rev and node:
5334 5334 raise error.Abort(_("please specify just one revision"))
5335 5335
5336 5336 if ui.configbool('commands', 'update.requiredest'):
5337 5337 if not node and not rev and not date:
5338 5338 raise error.Abort(_('you must specify a destination'),
5339 5339 hint=_('for example: hg update ".::"'))
5340 5340
5341 5341 if rev is None or rev == '':
5342 5342 rev = node
5343 5343
5344 5344 if date and rev is not None:
5345 5345 raise error.Abort(_("you can't specify a revision and a date"))
5346 5346
5347 5347 if len([x for x in (clean, check, merge) if x]) > 1:
5348 5348 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5349 5349 "or -m/merge"))
5350 5350
5351 5351 updatecheck = None
5352 5352 if check:
5353 5353 updatecheck = 'abort'
5354 5354 elif merge:
5355 5355 updatecheck = 'none'
5356 5356
5357 5357 with repo.wlock():
5358 5358 cmdutil.clearunfinished(repo)
5359 5359
5360 5360 if date:
5361 5361 rev = cmdutil.finddate(ui, repo, date)
5362 5362
5363 5363 # if we defined a bookmark, we have to remember the original name
5364 5364 brev = rev
5365 5365 rev = scmutil.revsingle(repo, rev, rev).rev()
5366 5366
5367 5367 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5368 5368
5369 5369 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5370 5370 updatecheck=updatecheck)
5371 5371
5372 5372 @command('verify', [])
5373 5373 def verify(ui, repo):
5374 5374 """verify the integrity of the repository
5375 5375
5376 5376 Verify the integrity of the current repository.
5377 5377
5378 5378 This will perform an extensive check of the repository's
5379 5379 integrity, validating the hashes and checksums of each entry in
5380 5380 the changelog, manifest, and tracked files, as well as the
5381 5381 integrity of their crosslinks and indices.
5382 5382
5383 5383 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5384 5384 for more information about recovery from corruption of the
5385 5385 repository.
5386 5386
5387 5387 Returns 0 on success, 1 if errors are encountered.
5388 5388 """
5389 5389 return hg.verify(repo)
5390 5390
5391 5391 @command('version', [] + formatteropts, norepo=True)
5392 5392 def version_(ui, **opts):
5393 5393 """output version and copyright information"""
5394 5394 opts = pycompat.byteskwargs(opts)
5395 5395 if ui.verbose:
5396 5396 ui.pager('version')
5397 5397 fm = ui.formatter("version", opts)
5398 5398 fm.startitem()
5399 5399 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5400 5400 util.version())
5401 5401 license = _(
5402 5402 "(see https://mercurial-scm.org for more information)\n"
5403 5403 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5404 5404 "This is free software; see the source for copying conditions. "
5405 5405 "There is NO\nwarranty; "
5406 5406 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5407 5407 )
5408 5408 if not ui.quiet:
5409 5409 fm.plain(license)
5410 5410
5411 5411 if ui.verbose:
5412 5412 fm.plain(_("\nEnabled extensions:\n\n"))
5413 5413 # format names and versions into columns
5414 5414 names = []
5415 5415 vers = []
5416 5416 isinternals = []
5417 5417 for name, module in extensions.extensions():
5418 5418 names.append(name)
5419 5419 vers.append(extensions.moduleversion(module) or None)
5420 5420 isinternals.append(extensions.ismoduleinternal(module))
5421 5421 fn = fm.nested("extensions")
5422 5422 if names:
5423 5423 namefmt = " %%-%ds " % max(len(n) for n in names)
5424 5424 places = [_("external"), _("internal")]
5425 5425 for n, v, p in zip(names, vers, isinternals):
5426 5426 fn.startitem()
5427 5427 fn.condwrite(ui.verbose, "name", namefmt, n)
5428 5428 if ui.verbose:
5429 5429 fn.plain("%s " % places[p])
5430 5430 fn.data(bundled=p)
5431 5431 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5432 5432 if ui.verbose:
5433 5433 fn.plain("\n")
5434 5434 fn.end()
5435 5435 fm.end()
5436 5436
5437 5437 def loadcmdtable(ui, name, cmdtable):
5438 5438 """Load command functions from specified cmdtable
5439 5439 """
5440 5440 overrides = [cmd for cmd in cmdtable if cmd in table]
5441 5441 if overrides:
5442 5442 ui.warn(_("extension '%s' overrides commands: %s\n")
5443 5443 % (name, " ".join(overrides)))
5444 5444 table.update(cmdtable)
@@ -1,1064 +1,1064 b''
1 1 # hg.py - repository classes for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
5 5 #
6 6 # This software may be used and distributed according to the terms of the
7 7 # GNU General Public License version 2 or any later version.
8 8
9 9 from __future__ import absolute_import
10 10
11 11 import errno
12 12 import hashlib
13 13 import os
14 14 import shutil
15 15
16 16 from .i18n import _
17 17 from .node import nullid
18 18
19 19 from . import (
20 20 bookmarks,
21 21 bundlerepo,
22 22 cmdutil,
23 23 destutil,
24 24 discovery,
25 25 error,
26 26 exchange,
27 27 extensions,
28 28 httppeer,
29 29 localrepo,
30 30 lock,
31 31 merge as mergemod,
32 32 node,
33 33 phases,
34 34 repoview,
35 35 scmutil,
36 36 sshpeer,
37 37 statichttprepo,
38 38 ui as uimod,
39 39 unionrepo,
40 40 url,
41 41 util,
42 42 verify as verifymod,
43 43 vfs as vfsmod,
44 44 )
45 45
46 46 release = lock.release
47 47
48 48 # shared features
49 49 sharedbookmarks = 'bookmarks'
50 50
51 51 def _local(path):
52 52 path = util.expandpath(util.urllocalpath(path))
53 53 return (os.path.isfile(path) and bundlerepo or localrepo)
54 54
55 55 def addbranchrevs(lrepo, other, branches, revs):
56 56 peer = other.peer() # a courtesy to callers using a localrepo for other
57 57 hashbranch, branches = branches
58 58 if not hashbranch and not branches:
59 59 x = revs or None
60 60 if util.safehasattr(revs, 'first'):
61 61 y = revs.first()
62 62 elif revs:
63 63 y = revs[0]
64 64 else:
65 65 y = None
66 66 return x, y
67 67 if revs:
68 68 revs = list(revs)
69 69 else:
70 70 revs = []
71 71
72 72 if not peer.capable('branchmap'):
73 73 if branches:
74 74 raise error.Abort(_("remote branch lookup not supported"))
75 75 revs.append(hashbranch)
76 76 return revs, revs[0]
77 77 branchmap = peer.branchmap()
78 78
79 79 def primary(branch):
80 80 if branch == '.':
81 81 if not lrepo:
82 82 raise error.Abort(_("dirstate branch not accessible"))
83 83 branch = lrepo.dirstate.branch()
84 84 if branch in branchmap:
85 85 revs.extend(node.hex(r) for r in reversed(branchmap[branch]))
86 86 return True
87 87 else:
88 88 return False
89 89
90 90 for branch in branches:
91 91 if not primary(branch):
92 92 raise error.RepoLookupError(_("unknown branch '%s'") % branch)
93 93 if hashbranch:
94 94 if not primary(hashbranch):
95 95 revs.append(hashbranch)
96 96 return revs, revs[0]
97 97
98 98 def parseurl(path, branches=None):
99 99 '''parse url#branch, returning (url, (branch, branches))'''
100 100
101 101 u = util.url(path)
102 102 branch = None
103 103 if u.fragment:
104 104 branch = u.fragment
105 105 u.fragment = None
106 106 return bytes(u), (branch, branches or [])
107 107
108 108 schemes = {
109 109 'bundle': bundlerepo,
110 110 'union': unionrepo,
111 111 'file': _local,
112 112 'http': httppeer,
113 113 'https': httppeer,
114 114 'ssh': sshpeer,
115 115 'static-http': statichttprepo,
116 116 }
117 117
118 118 def _peerlookup(path):
119 119 u = util.url(path)
120 120 scheme = u.scheme or 'file'
121 121 thing = schemes.get(scheme) or schemes['file']
122 122 try:
123 123 return thing(path)
124 124 except TypeError:
125 125 # we can't test callable(thing) because 'thing' can be an unloaded
126 126 # module that implements __call__
127 127 if not util.safehasattr(thing, 'instance'):
128 128 raise
129 129 return thing
130 130
131 131 def islocal(repo):
132 132 '''return true if repo (or path pointing to repo) is local'''
133 133 if isinstance(repo, bytes):
134 134 try:
135 135 return _peerlookup(repo).islocal(repo)
136 136 except AttributeError:
137 137 return False
138 138 return repo.local()
139 139
140 140 def openpath(ui, path):
141 141 '''open path with open if local, url.open if remote'''
142 142 pathurl = util.url(path, parsequery=False, parsefragment=False)
143 143 if pathurl.islocal():
144 144 return util.posixfile(pathurl.localpath(), 'rb')
145 145 else:
146 146 return url.open(ui, path)
147 147
148 148 # a list of (ui, repo) functions called for wire peer initialization
149 149 wirepeersetupfuncs = []
150 150
151 151 def _peerorrepo(ui, path, create=False, presetupfuncs=None):
152 152 """return a repository object for the specified path"""
153 153 obj = _peerlookup(path).instance(ui, path, create)
154 154 ui = getattr(obj, "ui", ui)
155 155 for f in presetupfuncs or []:
156 156 f(ui, obj)
157 157 for name, module in extensions.extensions(ui):
158 158 hook = getattr(module, 'reposetup', None)
159 159 if hook:
160 160 hook(ui, obj)
161 161 if not obj.local():
162 162 for f in wirepeersetupfuncs:
163 163 f(ui, obj)
164 164 return obj
165 165
166 166 def repository(ui, path='', create=False, presetupfuncs=None):
167 167 """return a repository object for the specified path"""
168 168 peer = _peerorrepo(ui, path, create, presetupfuncs=presetupfuncs)
169 169 repo = peer.local()
170 170 if not repo:
171 171 raise error.Abort(_("repository '%s' is not local") %
172 172 (path or peer.url()))
173 173 return repo.filtered('visible')
174 174
175 175 def peer(uiorrepo, opts, path, create=False):
176 176 '''return a repository peer for the specified path'''
177 177 rui = remoteui(uiorrepo, opts)
178 178 return _peerorrepo(rui, path, create).peer()
179 179
180 180 def defaultdest(source):
181 181 '''return default destination of clone if none is given
182 182
183 183 >>> defaultdest('foo')
184 184 'foo'
185 185 >>> defaultdest('/foo/bar')
186 186 'bar'
187 187 >>> defaultdest('/')
188 188 ''
189 189 >>> defaultdest('')
190 190 ''
191 191 >>> defaultdest('http://example.org/')
192 192 ''
193 193 >>> defaultdest('http://example.org/foo/')
194 194 'foo'
195 195 '''
196 196 path = util.url(source).path
197 197 if not path:
198 198 return ''
199 199 return os.path.basename(os.path.normpath(path))
200 200
201 201 def share(ui, source, dest=None, update=True, bookmarks=True, defaultpath=None,
202 202 relative=False):
203 203 '''create a shared repository'''
204 204
205 205 if not islocal(source):
206 206 raise error.Abort(_('can only share local repositories'))
207 207
208 208 if not dest:
209 209 dest = defaultdest(source)
210 210 else:
211 211 dest = ui.expandpath(dest)
212 212
213 213 if isinstance(source, str):
214 214 origsource = ui.expandpath(source)
215 215 source, branches = parseurl(origsource)
216 216 srcrepo = repository(ui, source)
217 217 rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None)
218 218 else:
219 219 srcrepo = source.local()
220 220 origsource = source = srcrepo.url()
221 221 checkout = None
222 222
223 223 sharedpath = srcrepo.sharedpath # if our source is already sharing
224 224
225 225 destwvfs = vfsmod.vfs(dest, realpath=True)
226 226 destvfs = vfsmod.vfs(os.path.join(destwvfs.base, '.hg'), realpath=True)
227 227
228 228 if destvfs.lexists():
229 229 raise error.Abort(_('destination already exists'))
230 230
231 231 if not destwvfs.isdir():
232 232 destwvfs.mkdir()
233 233 destvfs.makedir()
234 234
235 235 requirements = ''
236 236 try:
237 237 requirements = srcrepo.vfs.read('requires')
238 238 except IOError as inst:
239 239 if inst.errno != errno.ENOENT:
240 240 raise
241 241
242 242 if relative:
243 243 try:
244 244 sharedpath = os.path.relpath(sharedpath, destvfs.base)
245 245 requirements += 'relshared\n'
246 246 except IOError as e:
247 247 raise error.Abort(_('cannot calculate relative path'),
248 248 hint=str(e))
249 249 else:
250 250 requirements += 'shared\n'
251 251
252 252 destvfs.write('requires', requirements)
253 253 destvfs.write('sharedpath', sharedpath)
254 254
255 255 r = repository(ui, destwvfs.base)
256 256 postshare(srcrepo, r, bookmarks=bookmarks, defaultpath=defaultpath)
257 257 _postshareupdate(r, update, checkout=checkout)
258 258
259 259 def postshare(sourcerepo, destrepo, bookmarks=True, defaultpath=None):
260 260 """Called after a new shared repo is created.
261 261
262 262 The new repo only has a requirements file and pointer to the source.
263 263 This function configures additional shared data.
264 264
265 265 Extensions can wrap this function and write additional entries to
266 266 destrepo/.hg/shared to indicate additional pieces of data to be shared.
267 267 """
268 268 default = defaultpath or sourcerepo.ui.config('paths', 'default')
269 269 if default:
270 270 fp = destrepo.vfs("hgrc", "w", text=True)
271 271 fp.write("[paths]\n")
272 272 fp.write("default = %s\n" % default)
273 273 fp.close()
274 274
275 275 with destrepo.wlock():
276 276 if bookmarks:
277 277 fp = destrepo.vfs('shared', 'w')
278 278 fp.write(sharedbookmarks + '\n')
279 279 fp.close()
280 280
281 281 def _postshareupdate(repo, update, checkout=None):
282 282 """Maybe perform a working directory update after a shared repo is created.
283 283
284 284 ``update`` can be a boolean or a revision to update to.
285 285 """
286 286 if not update:
287 287 return
288 288
289 289 repo.ui.status(_("updating working directory\n"))
290 290 if update is not True:
291 291 checkout = update
292 292 for test in (checkout, 'default', 'tip'):
293 293 if test is None:
294 294 continue
295 295 try:
296 296 uprev = repo.lookup(test)
297 297 break
298 298 except error.RepoLookupError:
299 299 continue
300 300 _update(repo, uprev)
301 301
302 302 def copystore(ui, srcrepo, destpath):
303 303 '''copy files from store of srcrepo in destpath
304 304
305 305 returns destlock
306 306 '''
307 307 destlock = None
308 308 try:
309 309 hardlink = None
310 310 num = 0
311 311 closetopic = [None]
312 312 def prog(topic, pos):
313 313 if pos is None:
314 314 closetopic[0] = topic
315 315 else:
316 316 ui.progress(topic, pos + num)
317 317 srcpublishing = srcrepo.publishing()
318 318 srcvfs = vfsmod.vfs(srcrepo.sharedpath)
319 319 dstvfs = vfsmod.vfs(destpath)
320 320 for f in srcrepo.store.copylist():
321 321 if srcpublishing and f.endswith('phaseroots'):
322 322 continue
323 323 dstbase = os.path.dirname(f)
324 324 if dstbase and not dstvfs.exists(dstbase):
325 325 dstvfs.mkdir(dstbase)
326 326 if srcvfs.exists(f):
327 327 if f.endswith('data'):
328 328 # 'dstbase' may be empty (e.g. revlog format 0)
329 329 lockfile = os.path.join(dstbase, "lock")
330 330 # lock to avoid premature writing to the target
331 331 destlock = lock.lock(dstvfs, lockfile)
332 332 hardlink, n = util.copyfiles(srcvfs.join(f), dstvfs.join(f),
333 333 hardlink, progress=prog)
334 334 num += n
335 335 if hardlink:
336 336 ui.debug("linked %d files\n" % num)
337 337 if closetopic[0]:
338 338 ui.progress(closetopic[0], None)
339 339 else:
340 340 ui.debug("copied %d files\n" % num)
341 341 if closetopic[0]:
342 342 ui.progress(closetopic[0], None)
343 343 return destlock
344 344 except: # re-raises
345 345 release(destlock)
346 346 raise
347 347
348 348 def clonewithshare(ui, peeropts, sharepath, source, srcpeer, dest, pull=False,
349 349 rev=None, update=True, stream=False):
350 350 """Perform a clone using a shared repo.
351 351
352 352 The store for the repository will be located at <sharepath>/.hg. The
353 353 specified revisions will be cloned or pulled from "source". A shared repo
354 354 will be created at "dest" and a working copy will be created if "update" is
355 355 True.
356 356 """
357 357 revs = None
358 358 if rev:
359 359 if not srcpeer.capable('lookup'):
360 360 raise error.Abort(_("src repository does not support "
361 361 "revision lookup and so doesn't "
362 362 "support clone by revision"))
363 363 revs = [srcpeer.lookup(r) for r in rev]
364 364
365 365 # Obtain a lock before checking for or cloning the pooled repo otherwise
366 366 # 2 clients may race creating or populating it.
367 367 pooldir = os.path.dirname(sharepath)
368 368 # lock class requires the directory to exist.
369 369 try:
370 370 util.makedir(pooldir, False)
371 371 except OSError as e:
372 372 if e.errno != errno.EEXIST:
373 373 raise
374 374
375 375 poolvfs = vfsmod.vfs(pooldir)
376 376 basename = os.path.basename(sharepath)
377 377
378 378 with lock.lock(poolvfs, '%s.lock' % basename):
379 379 if os.path.exists(sharepath):
380 380 ui.status(_('(sharing from existing pooled repository %s)\n') %
381 381 basename)
382 382 else:
383 383 ui.status(_('(sharing from new pooled repository %s)\n') % basename)
384 384 # Always use pull mode because hardlinks in share mode don't work
385 385 # well. Never update because working copies aren't necessary in
386 386 # share mode.
387 387 clone(ui, peeropts, source, dest=sharepath, pull=True,
388 388 rev=rev, update=False, stream=stream)
389 389
390 390 # Resolve the value to put in [paths] section for the source.
391 391 if islocal(source):
392 392 defaultpath = os.path.abspath(util.urllocalpath(source))
393 393 else:
394 394 defaultpath = source
395 395
396 396 sharerepo = repository(ui, path=sharepath)
397 397 share(ui, sharerepo, dest=dest, update=False, bookmarks=False,
398 398 defaultpath=defaultpath)
399 399
400 400 # We need to perform a pull against the dest repo to fetch bookmarks
401 401 # and other non-store data that isn't shared by default. In the case of
402 402 # non-existing shared repo, this means we pull from the remote twice. This
403 403 # is a bit weird. But at the time it was implemented, there wasn't an easy
404 404 # way to pull just non-changegroup data.
405 405 destrepo = repository(ui, path=dest)
406 406 exchange.pull(destrepo, srcpeer, heads=revs)
407 407
408 408 _postshareupdate(destrepo, update)
409 409
410 410 return srcpeer, peer(ui, peeropts, dest)
411 411
412 412 # Recomputing branch cache might be slow on big repos,
413 413 # so just copy it
414 414 def _copycache(srcrepo, dstcachedir, fname):
415 415 """copy a cache from srcrepo to destcachedir (if it exists)"""
416 416 srcbranchcache = srcrepo.vfs.join('cache/%s' % fname)
417 417 dstbranchcache = os.path.join(dstcachedir, fname)
418 418 if os.path.exists(srcbranchcache):
419 419 if not os.path.exists(dstcachedir):
420 420 os.mkdir(dstcachedir)
421 421 util.copyfile(srcbranchcache, dstbranchcache)
422 422
423 423 def _cachetocopy(srcrepo):
424 424 """return the list of cache file valuable to copy during a clone"""
425 425 # In local clones we're copying all nodes, not just served
426 426 # ones. Therefore copy all branch caches over.
427 427 cachefiles = ['branch2']
428 428 cachefiles += ['branch2-%s' % f for f in repoview.filtertable]
429 429 cachefiles += ['rbc-names-v1', 'rbc-revs-v1']
430 430 cachefiles += ['tags2']
431 431 cachefiles += ['tags2-%s' % f for f in repoview.filtertable]
432 432 cachefiles += ['hgtagsfnodes1']
433 433 return cachefiles
434 434
435 435 def clone(ui, peeropts, source, dest=None, pull=False, rev=None,
436 436 update=True, stream=False, branch=None, shareopts=None):
437 437 """Make a copy of an existing repository.
438 438
439 439 Create a copy of an existing repository in a new directory. The
440 440 source and destination are URLs, as passed to the repository
441 441 function. Returns a pair of repository peers, the source and
442 442 newly created destination.
443 443
444 444 The location of the source is added to the new repository's
445 445 .hg/hgrc file, as the default to be used for future pulls and
446 446 pushes.
447 447
448 448 If an exception is raised, the partly cloned/updated destination
449 449 repository will be deleted.
450 450
451 451 Arguments:
452 452
453 453 source: repository object or URL
454 454
455 455 dest: URL of destination repository to create (defaults to base
456 456 name of source repository)
457 457
458 458 pull: always pull from source repository, even in local case or if the
459 459 server prefers streaming
460 460
461 461 stream: stream raw data uncompressed from repository (fast over
462 462 LAN, slow over WAN)
463 463
464 464 rev: revision to clone up to (implies pull=True)
465 465
466 466 update: update working directory after clone completes, if
467 467 destination is local repository (True means update to default rev,
468 468 anything else is treated as a revision)
469 469
470 470 branch: branches to clone
471 471
472 472 shareopts: dict of options to control auto sharing behavior. The "pool" key
473 473 activates auto sharing mode and defines the directory for stores. The
474 474 "mode" key determines how to construct the directory name of the shared
475 475 repository. "identity" means the name is derived from the node of the first
476 476 changeset in the repository. "remote" means the name is derived from the
477 477 remote's path/URL. Defaults to "identity."
478 478 """
479 479
480 480 if isinstance(source, bytes):
481 481 origsource = ui.expandpath(source)
482 482 source, branch = parseurl(origsource, branch)
483 483 srcpeer = peer(ui, peeropts, source)
484 484 else:
485 485 srcpeer = source.peer() # in case we were called with a localrepo
486 486 branch = (None, branch or [])
487 487 origsource = source = srcpeer.url()
488 488 rev, checkout = addbranchrevs(srcpeer, srcpeer, branch, rev)
489 489
490 490 if dest is None:
491 491 dest = defaultdest(source)
492 492 if dest:
493 493 ui.status(_("destination directory: %s\n") % dest)
494 494 else:
495 495 dest = ui.expandpath(dest)
496 496
497 497 dest = util.urllocalpath(dest)
498 498 source = util.urllocalpath(source)
499 499
500 500 if not dest:
501 501 raise error.Abort(_("empty destination path is not valid"))
502 502
503 503 destvfs = vfsmod.vfs(dest, expandpath=True)
504 504 if destvfs.lexists():
505 505 if not destvfs.isdir():
506 506 raise error.Abort(_("destination '%s' already exists") % dest)
507 507 elif destvfs.listdir():
508 508 raise error.Abort(_("destination '%s' is not empty") % dest)
509 509
510 510 shareopts = shareopts or {}
511 511 sharepool = shareopts.get('pool')
512 512 sharenamemode = shareopts.get('mode')
513 513 if sharepool and islocal(dest):
514 514 sharepath = None
515 515 if sharenamemode == 'identity':
516 516 # Resolve the name from the initial changeset in the remote
517 517 # repository. This returns nullid when the remote is empty. It
518 518 # raises RepoLookupError if revision 0 is filtered or otherwise
519 519 # not available. If we fail to resolve, sharing is not enabled.
520 520 try:
521 521 rootnode = srcpeer.lookup('0')
522 522 if rootnode != node.nullid:
523 523 sharepath = os.path.join(sharepool, node.hex(rootnode))
524 524 else:
525 525 ui.status(_('(not using pooled storage: '
526 526 'remote appears to be empty)\n'))
527 527 except error.RepoLookupError:
528 528 ui.status(_('(not using pooled storage: '
529 529 'unable to resolve identity of remote)\n'))
530 530 elif sharenamemode == 'remote':
531 531 sharepath = os.path.join(
532 532 sharepool, hashlib.sha1(source).hexdigest())
533 533 else:
534 534 raise error.Abort(_('unknown share naming mode: %s') %
535 535 sharenamemode)
536 536
537 537 if sharepath:
538 538 return clonewithshare(ui, peeropts, sharepath, source, srcpeer,
539 539 dest, pull=pull, rev=rev, update=update,
540 540 stream=stream)
541 541
542 542 srclock = destlock = cleandir = None
543 543 srcrepo = srcpeer.local()
544 544 try:
545 545 abspath = origsource
546 546 if islocal(origsource):
547 547 abspath = os.path.abspath(util.urllocalpath(origsource))
548 548
549 549 if islocal(dest):
550 550 cleandir = dest
551 551
552 552 copy = False
553 553 if (srcrepo and srcrepo.cancopy() and islocal(dest)
554 554 and not phases.hassecret(srcrepo)):
555 555 copy = not pull and not rev
556 556
557 557 if copy:
558 558 try:
559 559 # we use a lock here because if we race with commit, we
560 560 # can end up with extra data in the cloned revlogs that's
561 561 # not pointed to by changesets, thus causing verify to
562 562 # fail
563 563 srclock = srcrepo.lock(wait=False)
564 564 except error.LockError:
565 565 copy = False
566 566
567 567 if copy:
568 568 srcrepo.hook('preoutgoing', throw=True, source='clone')
569 569 hgdir = os.path.realpath(os.path.join(dest, ".hg"))
570 570 if not os.path.exists(dest):
571 571 os.mkdir(dest)
572 572 else:
573 573 # only clean up directories we create ourselves
574 574 cleandir = hgdir
575 575 try:
576 576 destpath = hgdir
577 577 util.makedir(destpath, notindexed=True)
578 578 except OSError as inst:
579 579 if inst.errno == errno.EEXIST:
580 580 cleandir = None
581 581 raise error.Abort(_("destination '%s' already exists")
582 582 % dest)
583 583 raise
584 584
585 585 destlock = copystore(ui, srcrepo, destpath)
586 586 # copy bookmarks over
587 587 srcbookmarks = srcrepo.vfs.join('bookmarks')
588 588 dstbookmarks = os.path.join(destpath, 'bookmarks')
589 589 if os.path.exists(srcbookmarks):
590 590 util.copyfile(srcbookmarks, dstbookmarks)
591 591
592 592 dstcachedir = os.path.join(destpath, 'cache')
593 593 for cache in _cachetocopy(srcrepo):
594 594 _copycache(srcrepo, dstcachedir, cache)
595 595
596 596 # we need to re-init the repo after manually copying the data
597 597 # into it
598 598 destpeer = peer(srcrepo, peeropts, dest)
599 599 srcrepo.hook('outgoing', source='clone',
600 600 node=node.hex(node.nullid))
601 601 else:
602 602 try:
603 603 destpeer = peer(srcrepo or ui, peeropts, dest, create=True)
604 604 # only pass ui when no srcrepo
605 605 except OSError as inst:
606 606 if inst.errno == errno.EEXIST:
607 607 cleandir = None
608 608 raise error.Abort(_("destination '%s' already exists")
609 609 % dest)
610 610 raise
611 611
612 612 revs = None
613 613 if rev:
614 614 if not srcpeer.capable('lookup'):
615 615 raise error.Abort(_("src repository does not support "
616 616 "revision lookup and so doesn't "
617 617 "support clone by revision"))
618 618 revs = [srcpeer.lookup(r) for r in rev]
619 619 checkout = revs[0]
620 620 local = destpeer.local()
621 621 if local:
622 622 if not stream:
623 623 if pull:
624 624 stream = False
625 625 else:
626 626 stream = None
627 627 # internal config: ui.quietbookmarkmove
628 628 overrides = {('ui', 'quietbookmarkmove'): True}
629 629 with local.ui.configoverride(overrides, 'clone'):
630 630 exchange.pull(local, srcpeer, revs,
631 631 streamclonerequested=stream)
632 632 elif srcrepo:
633 633 exchange.push(srcrepo, destpeer, revs=revs,
634 634 bookmarks=srcrepo._bookmarks.keys())
635 635 else:
636 636 raise error.Abort(_("clone from remote to remote not supported")
637 637 )
638 638
639 639 cleandir = None
640 640
641 641 destrepo = destpeer.local()
642 642 if destrepo:
643 643 template = uimod.samplehgrcs['cloned']
644 fp = destrepo.vfs("hgrc", "w", text=True)
644 fp = destrepo.vfs("hgrc", "wb")
645 645 u = util.url(abspath)
646 646 u.passwd = None
647 defaulturl = str(u)
648 fp.write(template % defaulturl)
647 defaulturl = bytes(u)
648 fp.write(util.tonativeeol(template % defaulturl))
649 649 fp.close()
650 650
651 651 destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone')
652 652
653 653 if update:
654 654 if update is not True:
655 655 checkout = srcpeer.lookup(update)
656 656 uprev = None
657 657 status = None
658 658 if checkout is not None:
659 659 try:
660 660 uprev = destrepo.lookup(checkout)
661 661 except error.RepoLookupError:
662 662 if update is not True:
663 663 try:
664 664 uprev = destrepo.lookup(update)
665 665 except error.RepoLookupError:
666 666 pass
667 667 if uprev is None:
668 668 try:
669 669 uprev = destrepo._bookmarks['@']
670 670 update = '@'
671 671 bn = destrepo[uprev].branch()
672 672 if bn == 'default':
673 673 status = _("updating to bookmark @\n")
674 674 else:
675 675 status = (_("updating to bookmark @ on branch %s\n")
676 676 % bn)
677 677 except KeyError:
678 678 try:
679 679 uprev = destrepo.branchtip('default')
680 680 except error.RepoLookupError:
681 681 uprev = destrepo.lookup('tip')
682 682 if not status:
683 683 bn = destrepo[uprev].branch()
684 684 status = _("updating to branch %s\n") % bn
685 685 destrepo.ui.status(status)
686 686 _update(destrepo, uprev)
687 687 if update in destrepo._bookmarks:
688 688 bookmarks.activate(destrepo, update)
689 689 finally:
690 690 release(srclock, destlock)
691 691 if cleandir is not None:
692 692 shutil.rmtree(cleandir, True)
693 693 if srcpeer is not None:
694 694 srcpeer.close()
695 695 return srcpeer, destpeer
696 696
697 697 def _showstats(repo, stats, quietempty=False):
698 698 if quietempty and not any(stats):
699 699 return
700 700 repo.ui.status(_("%d files updated, %d files merged, "
701 701 "%d files removed, %d files unresolved\n") % stats)
702 702
703 703 def updaterepo(repo, node, overwrite, updatecheck=None):
704 704 """Update the working directory to node.
705 705
706 706 When overwrite is set, changes are clobbered, merged else
707 707
708 708 returns stats (see pydoc mercurial.merge.applyupdates)"""
709 709 return mergemod.update(repo, node, False, overwrite,
710 710 labels=['working copy', 'destination'],
711 711 updatecheck=updatecheck)
712 712
713 713 def update(repo, node, quietempty=False, updatecheck=None):
714 714 """update the working directory to node"""
715 715 stats = updaterepo(repo, node, False, updatecheck=updatecheck)
716 716 _showstats(repo, stats, quietempty)
717 717 if stats[3]:
718 718 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
719 719 return stats[3] > 0
720 720
721 721 # naming conflict in clone()
722 722 _update = update
723 723
724 724 def clean(repo, node, show_stats=True, quietempty=False):
725 725 """forcibly switch the working directory to node, clobbering changes"""
726 726 stats = updaterepo(repo, node, True)
727 727 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
728 728 if show_stats:
729 729 _showstats(repo, stats, quietempty)
730 730 return stats[3] > 0
731 731
732 732 # naming conflict in updatetotally()
733 733 _clean = clean
734 734
735 735 def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
736 736 """Update the working directory with extra care for non-file components
737 737
738 738 This takes care of non-file components below:
739 739
740 740 :bookmark: might be advanced or (in)activated
741 741
742 742 This takes arguments below:
743 743
744 744 :checkout: to which revision the working directory is updated
745 745 :brev: a name, which might be a bookmark to be activated after updating
746 746 :clean: whether changes in the working directory can be discarded
747 747 :updatecheck: how to deal with a dirty working directory
748 748
749 749 Valid values for updatecheck are (None => linear):
750 750
751 751 * abort: abort if the working directory is dirty
752 752 * none: don't check (merge working directory changes into destination)
753 753 * linear: check that update is linear before merging working directory
754 754 changes into destination
755 755 * noconflict: check that the update does not result in file merges
756 756
757 757 This returns whether conflict is detected at updating or not.
758 758 """
759 759 if updatecheck is None:
760 760 updatecheck = ui.config('experimental', 'updatecheck')
761 761 if updatecheck not in ('abort', 'none', 'linear', 'noconflict'):
762 762 # If not configured, or invalid value configured
763 763 updatecheck = 'linear'
764 764 with repo.wlock():
765 765 movemarkfrom = None
766 766 warndest = False
767 767 if checkout is None:
768 768 updata = destutil.destupdate(repo, clean=clean)
769 769 checkout, movemarkfrom, brev = updata
770 770 warndest = True
771 771
772 772 if clean:
773 773 ret = _clean(repo, checkout)
774 774 else:
775 775 if updatecheck == 'abort':
776 776 cmdutil.bailifchanged(repo, merge=False)
777 777 updatecheck = 'none'
778 778 ret = _update(repo, checkout, updatecheck=updatecheck)
779 779
780 780 if not ret and movemarkfrom:
781 781 if movemarkfrom == repo['.'].node():
782 782 pass # no-op update
783 783 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
784 784 b = ui.label(repo._activebookmark, 'bookmarks.active')
785 785 ui.status(_("updating bookmark %s\n") % b)
786 786 else:
787 787 # this can happen with a non-linear update
788 788 b = ui.label(repo._activebookmark, 'bookmarks')
789 789 ui.status(_("(leaving bookmark %s)\n") % b)
790 790 bookmarks.deactivate(repo)
791 791 elif brev in repo._bookmarks:
792 792 if brev != repo._activebookmark:
793 793 b = ui.label(brev, 'bookmarks.active')
794 794 ui.status(_("(activating bookmark %s)\n") % b)
795 795 bookmarks.activate(repo, brev)
796 796 elif brev:
797 797 if repo._activebookmark:
798 798 b = ui.label(repo._activebookmark, 'bookmarks')
799 799 ui.status(_("(leaving bookmark %s)\n") % b)
800 800 bookmarks.deactivate(repo)
801 801
802 802 if warndest:
803 803 destutil.statusotherdests(ui, repo)
804 804
805 805 return ret
806 806
807 807 def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None):
808 808 """Branch merge with node, resolving changes. Return true if any
809 809 unresolved conflicts."""
810 810 stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce,
811 811 labels=labels)
812 812 _showstats(repo, stats)
813 813 if stats[3]:
814 814 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
815 815 "or 'hg update -C .' to abandon\n"))
816 816 elif remind:
817 817 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
818 818 return stats[3] > 0
819 819
820 820 def _incoming(displaychlist, subreporecurse, ui, repo, source,
821 821 opts, buffered=False):
822 822 """
823 823 Helper for incoming / gincoming.
824 824 displaychlist gets called with
825 825 (remoterepo, incomingchangesetlist, displayer) parameters,
826 826 and is supposed to contain only code that can't be unified.
827 827 """
828 828 source, branches = parseurl(ui.expandpath(source), opts.get('branch'))
829 829 other = peer(repo, opts, source)
830 830 ui.status(_('comparing with %s\n') % util.hidepassword(source))
831 831 revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev'))
832 832
833 833 if revs:
834 834 revs = [other.lookup(rev) for rev in revs]
835 835 other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other,
836 836 revs, opts["bundle"], opts["force"])
837 837 try:
838 838 if not chlist:
839 839 ui.status(_("no changes found\n"))
840 840 return subreporecurse()
841 841 ui.pager('incoming')
842 842 displayer = cmdutil.show_changeset(ui, other, opts, buffered)
843 843 displaychlist(other, chlist, displayer)
844 844 displayer.close()
845 845 finally:
846 846 cleanupfn()
847 847 subreporecurse()
848 848 return 0 # exit code is zero since we found incoming changes
849 849
850 850 def incoming(ui, repo, source, opts):
851 851 def subreporecurse():
852 852 ret = 1
853 853 if opts.get('subrepos'):
854 854 ctx = repo[None]
855 855 for subpath in sorted(ctx.substate):
856 856 sub = ctx.sub(subpath)
857 857 ret = min(ret, sub.incoming(ui, source, opts))
858 858 return ret
859 859
860 860 def display(other, chlist, displayer):
861 861 limit = cmdutil.loglimit(opts)
862 862 if opts.get('newest_first'):
863 863 chlist.reverse()
864 864 count = 0
865 865 for n in chlist:
866 866 if limit is not None and count >= limit:
867 867 break
868 868 parents = [p for p in other.changelog.parents(n) if p != nullid]
869 869 if opts.get('no_merges') and len(parents) == 2:
870 870 continue
871 871 count += 1
872 872 displayer.show(other[n])
873 873 return _incoming(display, subreporecurse, ui, repo, source, opts)
874 874
875 875 def _outgoing(ui, repo, dest, opts):
876 876 dest = ui.expandpath(dest or 'default-push', dest or 'default')
877 877 dest, branches = parseurl(dest, opts.get('branch'))
878 878 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
879 879 revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev'))
880 880 if revs:
881 881 revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)]
882 882
883 883 other = peer(repo, opts, dest)
884 884 outgoing = discovery.findcommonoutgoing(repo, other, revs,
885 885 force=opts.get('force'))
886 886 o = outgoing.missing
887 887 if not o:
888 888 scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
889 889 return o, other
890 890
891 891 def outgoing(ui, repo, dest, opts):
892 892 def recurse():
893 893 ret = 1
894 894 if opts.get('subrepos'):
895 895 ctx = repo[None]
896 896 for subpath in sorted(ctx.substate):
897 897 sub = ctx.sub(subpath)
898 898 ret = min(ret, sub.outgoing(ui, dest, opts))
899 899 return ret
900 900
901 901 limit = cmdutil.loglimit(opts)
902 902 o, other = _outgoing(ui, repo, dest, opts)
903 903 if not o:
904 904 cmdutil.outgoinghooks(ui, repo, other, opts, o)
905 905 return recurse()
906 906
907 907 if opts.get('newest_first'):
908 908 o.reverse()
909 909 ui.pager('outgoing')
910 910 displayer = cmdutil.show_changeset(ui, repo, opts)
911 911 count = 0
912 912 for n in o:
913 913 if limit is not None and count >= limit:
914 914 break
915 915 parents = [p for p in repo.changelog.parents(n) if p != nullid]
916 916 if opts.get('no_merges') and len(parents) == 2:
917 917 continue
918 918 count += 1
919 919 displayer.show(repo[n])
920 920 displayer.close()
921 921 cmdutil.outgoinghooks(ui, repo, other, opts, o)
922 922 recurse()
923 923 return 0 # exit code is zero since we found outgoing changes
924 924
925 925 def verify(repo):
926 926 """verify the consistency of a repository"""
927 927 ret = verifymod.verify(repo)
928 928
929 929 # Broken subrepo references in hidden csets don't seem worth worrying about,
930 930 # since they can't be pushed/pulled, and --hidden can be used if they are a
931 931 # concern.
932 932
933 933 # pathto() is needed for -R case
934 934 revs = repo.revs("filelog(%s)",
935 935 util.pathto(repo.root, repo.getcwd(), '.hgsubstate'))
936 936
937 937 if revs:
938 938 repo.ui.status(_('checking subrepo links\n'))
939 939 for rev in revs:
940 940 ctx = repo[rev]
941 941 try:
942 942 for subpath in ctx.substate:
943 943 try:
944 944 ret = (ctx.sub(subpath, allowcreate=False).verify()
945 945 or ret)
946 946 except error.RepoError as e:
947 947 repo.ui.warn(('%s: %s\n') % (rev, e))
948 948 except Exception:
949 949 repo.ui.warn(_('.hgsubstate is corrupt in revision %s\n') %
950 950 node.short(ctx.node()))
951 951
952 952 return ret
953 953
954 954 def remoteui(src, opts):
955 955 'build a remote ui from ui or repo and opts'
956 956 if util.safehasattr(src, 'baseui'): # looks like a repository
957 957 dst = src.baseui.copy() # drop repo-specific config
958 958 src = src.ui # copy target options from repo
959 959 else: # assume it's a global ui object
960 960 dst = src.copy() # keep all global options
961 961
962 962 # copy ssh-specific options
963 963 for o in 'ssh', 'remotecmd':
964 964 v = opts.get(o) or src.config('ui', o)
965 965 if v:
966 966 dst.setconfig("ui", o, v, 'copied')
967 967
968 968 # copy bundle-specific options
969 969 r = src.config('bundle', 'mainreporoot')
970 970 if r:
971 971 dst.setconfig('bundle', 'mainreporoot', r, 'copied')
972 972
973 973 # copy selected local settings to the remote ui
974 974 for sect in ('auth', 'hostfingerprints', 'hostsecurity', 'http_proxy'):
975 975 for key, val in src.configitems(sect):
976 976 dst.setconfig(sect, key, val, 'copied')
977 977 v = src.config('web', 'cacerts')
978 978 if v:
979 979 dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied')
980 980
981 981 return dst
982 982
983 983 # Files of interest
984 984 # Used to check if the repository has changed looking at mtime and size of
985 985 # these files.
986 986 foi = [('spath', '00changelog.i'),
987 987 ('spath', 'phaseroots'), # ! phase can change content at the same size
988 988 ('spath', 'obsstore'),
989 989 ('path', 'bookmarks'), # ! bookmark can change content at the same size
990 990 ]
991 991
992 992 class cachedlocalrepo(object):
993 993 """Holds a localrepository that can be cached and reused."""
994 994
995 995 def __init__(self, repo):
996 996 """Create a new cached repo from an existing repo.
997 997
998 998 We assume the passed in repo was recently created. If the
999 999 repo has changed between when it was created and when it was
1000 1000 turned into a cache, it may not refresh properly.
1001 1001 """
1002 1002 assert isinstance(repo, localrepo.localrepository)
1003 1003 self._repo = repo
1004 1004 self._state, self.mtime = self._repostate()
1005 1005 self._filtername = repo.filtername
1006 1006
1007 1007 def fetch(self):
1008 1008 """Refresh (if necessary) and return a repository.
1009 1009
1010 1010 If the cached instance is out of date, it will be recreated
1011 1011 automatically and returned.
1012 1012
1013 1013 Returns a tuple of the repo and a boolean indicating whether a new
1014 1014 repo instance was created.
1015 1015 """
1016 1016 # We compare the mtimes and sizes of some well-known files to
1017 1017 # determine if the repo changed. This is not precise, as mtimes
1018 1018 # are susceptible to clock skew and imprecise filesystems and
1019 1019 # file content can change while maintaining the same size.
1020 1020
1021 1021 state, mtime = self._repostate()
1022 1022 if state == self._state:
1023 1023 return self._repo, False
1024 1024
1025 1025 repo = repository(self._repo.baseui, self._repo.url())
1026 1026 if self._filtername:
1027 1027 self._repo = repo.filtered(self._filtername)
1028 1028 else:
1029 1029 self._repo = repo.unfiltered()
1030 1030 self._state = state
1031 1031 self.mtime = mtime
1032 1032
1033 1033 return self._repo, True
1034 1034
1035 1035 def _repostate(self):
1036 1036 state = []
1037 1037 maxmtime = -1
1038 1038 for attr, fname in foi:
1039 1039 prefix = getattr(self._repo, attr)
1040 1040 p = os.path.join(prefix, fname)
1041 1041 try:
1042 1042 st = os.stat(p)
1043 1043 except OSError:
1044 1044 st = os.stat(prefix)
1045 1045 state.append((st.st_mtime, st.st_size))
1046 1046 maxmtime = max(maxmtime, st.st_mtime)
1047 1047
1048 1048 return tuple(state), maxmtime
1049 1049
1050 1050 def copy(self):
1051 1051 """Obtain a copy of this class instance.
1052 1052
1053 1053 A new localrepository instance is obtained. The new instance should be
1054 1054 completely independent of the original.
1055 1055 """
1056 1056 repo = repository(self._repo.baseui, self._repo.origroot)
1057 1057 if self._filtername:
1058 1058 repo = repo.filtered(self._filtername)
1059 1059 else:
1060 1060 repo = repo.unfiltered()
1061 1061 c = cachedlocalrepo(repo)
1062 1062 c._state = self._state
1063 1063 c.mtime = self.mtime
1064 1064 return c
@@ -1,1777 +1,1777 b''
1 1 # ui.py - user interface bits 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 __future__ import absolute_import
9 9
10 10 import collections
11 11 import contextlib
12 12 import errno
13 13 import getpass
14 14 import inspect
15 15 import os
16 16 import re
17 17 import signal
18 18 import socket
19 19 import subprocess
20 20 import sys
21 21 import tempfile
22 22 import traceback
23 23
24 24 from .i18n import _
25 25 from .node import hex
26 26
27 27 from . import (
28 28 color,
29 29 config,
30 30 configitems,
31 31 encoding,
32 32 error,
33 33 formatter,
34 34 progress,
35 35 pycompat,
36 36 rcutil,
37 37 scmutil,
38 38 util,
39 39 )
40 40
41 41 urlreq = util.urlreq
42 42
43 43 # for use with str.translate(None, _keepalnum), to keep just alphanumerics
44 44 _keepalnum = ''.join(c for c in map(pycompat.bytechr, range(256))
45 45 if not c.isalnum())
46 46
47 47 # The config knobs that will be altered (if unset) by ui.tweakdefaults.
48 48 tweakrc = """
49 49 [ui]
50 50 # The rollback command is dangerous. As a rule, don't use it.
51 51 rollback = False
52 52
53 53 [commands]
54 54 # Make `hg status` emit cwd-relative paths by default.
55 55 status.relative = yes
56 56
57 57 [diff]
58 58 git = 1
59 59 """
60 60
61 61 samplehgrcs = {
62 62 'user':
63 """# example user config (see 'hg help config' for more info)
63 b"""# example user config (see 'hg help config' for more info)
64 64 [ui]
65 65 # name and email, e.g.
66 66 # username = Jane Doe <jdoe@example.com>
67 67 username =
68 68
69 69 # uncomment to disable color in command output
70 70 # (see 'hg help color' for details)
71 71 # color = never
72 72
73 73 # uncomment to disable command output pagination
74 74 # (see 'hg help pager' for details)
75 75 # paginate = never
76 76
77 77 [extensions]
78 78 # uncomment these lines to enable some popular extensions
79 79 # (see 'hg help extensions' for more info)
80 80 #
81 81 # churn =
82 82 """,
83 83
84 84 'cloned':
85 """# example repository config (see 'hg help config' for more info)
85 b"""# example repository config (see 'hg help config' for more info)
86 86 [paths]
87 87 default = %s
88 88
89 89 # path aliases to other clones of this repo in URLs or filesystem paths
90 90 # (see 'hg help config.paths' for more info)
91 91 #
92 92 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
93 93 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
94 94 # my-clone = /home/jdoe/jdoes-clone
95 95
96 96 [ui]
97 97 # name and email (local to this repository, optional), e.g.
98 98 # username = Jane Doe <jdoe@example.com>
99 99 """,
100 100
101 101 'local':
102 """# example repository config (see 'hg help config' for more info)
102 b"""# example repository config (see 'hg help config' for more info)
103 103 [paths]
104 104 # path aliases to other clones of this repo in URLs or filesystem paths
105 105 # (see 'hg help config.paths' for more info)
106 106 #
107 107 # default = http://example.com/hg/example-repo
108 108 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
109 109 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
110 110 # my-clone = /home/jdoe/jdoes-clone
111 111
112 112 [ui]
113 113 # name and email (local to this repository, optional), e.g.
114 114 # username = Jane Doe <jdoe@example.com>
115 115 """,
116 116
117 117 'global':
118 """# example system-wide hg config (see 'hg help config' for more info)
118 b"""# example system-wide hg config (see 'hg help config' for more info)
119 119
120 120 [ui]
121 121 # uncomment to disable color in command output
122 122 # (see 'hg help color' for details)
123 123 # color = never
124 124
125 125 # uncomment to disable command output pagination
126 126 # (see 'hg help pager' for details)
127 127 # paginate = never
128 128
129 129 [extensions]
130 130 # uncomment these lines to enable some popular extensions
131 131 # (see 'hg help extensions' for more info)
132 132 #
133 133 # blackbox =
134 134 # churn =
135 135 """,
136 136 }
137 137
138 138
139 139 class httppasswordmgrdbproxy(object):
140 140 """Delays loading urllib2 until it's needed."""
141 141 def __init__(self):
142 142 self._mgr = None
143 143
144 144 def _get_mgr(self):
145 145 if self._mgr is None:
146 146 self._mgr = urlreq.httppasswordmgrwithdefaultrealm()
147 147 return self._mgr
148 148
149 149 def add_password(self, *args, **kwargs):
150 150 return self._get_mgr().add_password(*args, **kwargs)
151 151
152 152 def find_user_password(self, *args, **kwargs):
153 153 return self._get_mgr().find_user_password(*args, **kwargs)
154 154
155 155 def _catchterm(*args):
156 156 raise error.SignalInterrupt
157 157
158 158 # unique object used to detect no default value has been provided when
159 159 # retrieving configuration value.
160 160 _unset = object()
161 161
162 162 class ui(object):
163 163 def __init__(self, src=None):
164 164 """Create a fresh new ui object if no src given
165 165
166 166 Use uimod.ui.load() to create a ui which knows global and user configs.
167 167 In most cases, you should use ui.copy() to create a copy of an existing
168 168 ui object.
169 169 """
170 170 # _buffers: used for temporary capture of output
171 171 self._buffers = []
172 172 # _exithandlers: callbacks run at the end of a request
173 173 self._exithandlers = []
174 174 # 3-tuple describing how each buffer in the stack behaves.
175 175 # Values are (capture stderr, capture subprocesses, apply labels).
176 176 self._bufferstates = []
177 177 # When a buffer is active, defines whether we are expanding labels.
178 178 # This exists to prevent an extra list lookup.
179 179 self._bufferapplylabels = None
180 180 self.quiet = self.verbose = self.debugflag = self.tracebackflag = False
181 181 self._reportuntrusted = True
182 182 self._knownconfig = configitems.coreitems
183 183 self._ocfg = config.config() # overlay
184 184 self._tcfg = config.config() # trusted
185 185 self._ucfg = config.config() # untrusted
186 186 self._trustusers = set()
187 187 self._trustgroups = set()
188 188 self.callhooks = True
189 189 # Insecure server connections requested.
190 190 self.insecureconnections = False
191 191 # Blocked time
192 192 self.logblockedtimes = False
193 193 # color mode: see mercurial/color.py for possible value
194 194 self._colormode = None
195 195 self._terminfoparams = {}
196 196 self._styles = {}
197 197
198 198 if src:
199 199 self._exithandlers = src._exithandlers
200 200 self.fout = src.fout
201 201 self.ferr = src.ferr
202 202 self.fin = src.fin
203 203 self.pageractive = src.pageractive
204 204 self._disablepager = src._disablepager
205 205 self._tweaked = src._tweaked
206 206
207 207 self._tcfg = src._tcfg.copy()
208 208 self._ucfg = src._ucfg.copy()
209 209 self._ocfg = src._ocfg.copy()
210 210 self._trustusers = src._trustusers.copy()
211 211 self._trustgroups = src._trustgroups.copy()
212 212 self.environ = src.environ
213 213 self.callhooks = src.callhooks
214 214 self.insecureconnections = src.insecureconnections
215 215 self._colormode = src._colormode
216 216 self._terminfoparams = src._terminfoparams.copy()
217 217 self._styles = src._styles.copy()
218 218
219 219 self.fixconfig()
220 220
221 221 self.httppasswordmgrdb = src.httppasswordmgrdb
222 222 self._blockedtimes = src._blockedtimes
223 223 else:
224 224 self.fout = util.stdout
225 225 self.ferr = util.stderr
226 226 self.fin = util.stdin
227 227 self.pageractive = False
228 228 self._disablepager = False
229 229 self._tweaked = False
230 230
231 231 # shared read-only environment
232 232 self.environ = encoding.environ
233 233
234 234 self.httppasswordmgrdb = httppasswordmgrdbproxy()
235 235 self._blockedtimes = collections.defaultdict(int)
236 236
237 237 allowed = self.configlist('experimental', 'exportableenviron')
238 238 if '*' in allowed:
239 239 self._exportableenviron = self.environ
240 240 else:
241 241 self._exportableenviron = {}
242 242 for k in allowed:
243 243 if k in self.environ:
244 244 self._exportableenviron[k] = self.environ[k]
245 245
246 246 @classmethod
247 247 def load(cls):
248 248 """Create a ui and load global and user configs"""
249 249 u = cls()
250 250 # we always trust global config files and environment variables
251 251 for t, f in rcutil.rccomponents():
252 252 if t == 'path':
253 253 u.readconfig(f, trust=True)
254 254 elif t == 'items':
255 255 sections = set()
256 256 for section, name, value, source in f:
257 257 # do not set u._ocfg
258 258 # XXX clean this up once immutable config object is a thing
259 259 u._tcfg.set(section, name, value, source)
260 260 u._ucfg.set(section, name, value, source)
261 261 sections.add(section)
262 262 for section in sections:
263 263 u.fixconfig(section=section)
264 264 else:
265 265 raise error.ProgrammingError('unknown rctype: %s' % t)
266 266 u._maybetweakdefaults()
267 267 return u
268 268
269 269 def _maybetweakdefaults(self):
270 270 if not self.configbool('ui', 'tweakdefaults'):
271 271 return
272 272 if self._tweaked or self.plain('tweakdefaults'):
273 273 return
274 274
275 275 # Note: it is SUPER IMPORTANT that you set self._tweaked to
276 276 # True *before* any calls to setconfig(), otherwise you'll get
277 277 # infinite recursion between setconfig and this method.
278 278 #
279 279 # TODO: We should extract an inner method in setconfig() to
280 280 # avoid this weirdness.
281 281 self._tweaked = True
282 282 tmpcfg = config.config()
283 283 tmpcfg.parse('<tweakdefaults>', tweakrc)
284 284 for section in tmpcfg:
285 285 for name, value in tmpcfg.items(section):
286 286 if not self.hasconfig(section, name):
287 287 self.setconfig(section, name, value, "<tweakdefaults>")
288 288
289 289 def copy(self):
290 290 return self.__class__(self)
291 291
292 292 def resetstate(self):
293 293 """Clear internal state that shouldn't persist across commands"""
294 294 if self._progbar:
295 295 self._progbar.resetstate() # reset last-print time of progress bar
296 296 self.httppasswordmgrdb = httppasswordmgrdbproxy()
297 297
298 298 @contextlib.contextmanager
299 299 def timeblockedsection(self, key):
300 300 # this is open-coded below - search for timeblockedsection to find them
301 301 starttime = util.timer()
302 302 try:
303 303 yield
304 304 finally:
305 305 self._blockedtimes[key + '_blocked'] += \
306 306 (util.timer() - starttime) * 1000
307 307
308 308 def formatter(self, topic, opts):
309 309 return formatter.formatter(self, self, topic, opts)
310 310
311 311 def _trusted(self, fp, f):
312 312 st = util.fstat(fp)
313 313 if util.isowner(st):
314 314 return True
315 315
316 316 tusers, tgroups = self._trustusers, self._trustgroups
317 317 if '*' in tusers or '*' in tgroups:
318 318 return True
319 319
320 320 user = util.username(st.st_uid)
321 321 group = util.groupname(st.st_gid)
322 322 if user in tusers or group in tgroups or user == util.username():
323 323 return True
324 324
325 325 if self._reportuntrusted:
326 326 self.warn(_('not trusting file %s from untrusted '
327 327 'user %s, group %s\n') % (f, user, group))
328 328 return False
329 329
330 330 def readconfig(self, filename, root=None, trust=False,
331 331 sections=None, remap=None):
332 332 try:
333 333 fp = open(filename, u'rb')
334 334 except IOError:
335 335 if not sections: # ignore unless we were looking for something
336 336 return
337 337 raise
338 338
339 339 cfg = config.config()
340 340 trusted = sections or trust or self._trusted(fp, filename)
341 341
342 342 try:
343 343 cfg.read(filename, fp, sections=sections, remap=remap)
344 344 fp.close()
345 345 except error.ConfigError as inst:
346 346 if trusted:
347 347 raise
348 348 self.warn(_("ignored: %s\n") % str(inst))
349 349
350 350 if self.plain():
351 351 for k in ('debug', 'fallbackencoding', 'quiet', 'slash',
352 352 'logtemplate', 'statuscopies', 'style',
353 353 'traceback', 'verbose'):
354 354 if k in cfg['ui']:
355 355 del cfg['ui'][k]
356 356 for k, v in cfg.items('defaults'):
357 357 del cfg['defaults'][k]
358 358 for k, v in cfg.items('commands'):
359 359 del cfg['commands'][k]
360 360 # Don't remove aliases from the configuration if in the exceptionlist
361 361 if self.plain('alias'):
362 362 for k, v in cfg.items('alias'):
363 363 del cfg['alias'][k]
364 364 if self.plain('revsetalias'):
365 365 for k, v in cfg.items('revsetalias'):
366 366 del cfg['revsetalias'][k]
367 367 if self.plain('templatealias'):
368 368 for k, v in cfg.items('templatealias'):
369 369 del cfg['templatealias'][k]
370 370
371 371 if trusted:
372 372 self._tcfg.update(cfg)
373 373 self._tcfg.update(self._ocfg)
374 374 self._ucfg.update(cfg)
375 375 self._ucfg.update(self._ocfg)
376 376
377 377 if root is None:
378 378 root = os.path.expanduser('~')
379 379 self.fixconfig(root=root)
380 380
381 381 def fixconfig(self, root=None, section=None):
382 382 if section in (None, 'paths'):
383 383 # expand vars and ~
384 384 # translate paths relative to root (or home) into absolute paths
385 385 root = root or pycompat.getcwd()
386 386 for c in self._tcfg, self._ucfg, self._ocfg:
387 387 for n, p in c.items('paths'):
388 388 # Ignore sub-options.
389 389 if ':' in n:
390 390 continue
391 391 if not p:
392 392 continue
393 393 if '%%' in p:
394 394 s = self.configsource('paths', n) or 'none'
395 395 self.warn(_("(deprecated '%%' in path %s=%s from %s)\n")
396 396 % (n, p, s))
397 397 p = p.replace('%%', '%')
398 398 p = util.expandpath(p)
399 399 if not util.hasscheme(p) and not os.path.isabs(p):
400 400 p = os.path.normpath(os.path.join(root, p))
401 401 c.set("paths", n, p)
402 402
403 403 if section in (None, 'ui'):
404 404 # update ui options
405 405 self.debugflag = self.configbool('ui', 'debug')
406 406 self.verbose = self.debugflag or self.configbool('ui', 'verbose')
407 407 self.quiet = not self.debugflag and self.configbool('ui', 'quiet')
408 408 if self.verbose and self.quiet:
409 409 self.quiet = self.verbose = False
410 410 self._reportuntrusted = self.debugflag or self.configbool("ui",
411 411 "report_untrusted")
412 412 self.tracebackflag = self.configbool('ui', 'traceback')
413 413 self.logblockedtimes = self.configbool('ui', 'logblockedtimes')
414 414
415 415 if section in (None, 'trusted'):
416 416 # update trust information
417 417 self._trustusers.update(self.configlist('trusted', 'users'))
418 418 self._trustgroups.update(self.configlist('trusted', 'groups'))
419 419
420 420 def backupconfig(self, section, item):
421 421 return (self._ocfg.backup(section, item),
422 422 self._tcfg.backup(section, item),
423 423 self._ucfg.backup(section, item),)
424 424 def restoreconfig(self, data):
425 425 self._ocfg.restore(data[0])
426 426 self._tcfg.restore(data[1])
427 427 self._ucfg.restore(data[2])
428 428
429 429 def setconfig(self, section, name, value, source=''):
430 430 for cfg in (self._ocfg, self._tcfg, self._ucfg):
431 431 cfg.set(section, name, value, source)
432 432 self.fixconfig(section=section)
433 433 self._maybetweakdefaults()
434 434
435 435 def _data(self, untrusted):
436 436 return untrusted and self._ucfg or self._tcfg
437 437
438 438 def configsource(self, section, name, untrusted=False):
439 439 return self._data(untrusted).source(section, name)
440 440
441 441 def config(self, section, name, default=_unset, untrusted=False):
442 442 """return the plain string version of a config"""
443 443 value = self._config(section, name, default=default,
444 444 untrusted=untrusted)
445 445 if value is _unset:
446 446 return None
447 447 return value
448 448
449 449 def _config(self, section, name, default=_unset, untrusted=False):
450 450 value = default
451 451 item = self._knownconfig.get(section, {}).get(name)
452 452 alternates = [(section, name)]
453 453
454 454 if item is not None:
455 455 alternates.extend(item.alias)
456 456
457 457 if default is _unset:
458 458 if item is None:
459 459 value = default
460 460 elif item.default is configitems.dynamicdefault:
461 461 value = None
462 462 msg = "config item requires an explicit default value: '%s.%s'"
463 463 msg %= (section, name)
464 464 self.develwarn(msg, 2, 'warn-config-default')
465 465 elif callable(item.default):
466 466 value = item.default()
467 467 else:
468 468 value = item.default
469 469 elif (item is not None
470 470 and item.default is not configitems.dynamicdefault):
471 471 msg = ("specifying a default value for a registered "
472 472 "config item: '%s.%s' '%s'")
473 473 msg %= (section, name, default)
474 474 self.develwarn(msg, 2, 'warn-config-default')
475 475
476 476 for s, n in alternates:
477 477 candidate = self._data(untrusted).get(s, n, None)
478 478 if candidate is not None:
479 479 value = candidate
480 480 section = s
481 481 name = n
482 482 break
483 483
484 484 if self.debugflag and not untrusted and self._reportuntrusted:
485 485 for s, n in alternates:
486 486 uvalue = self._ucfg.get(s, n)
487 487 if uvalue is not None and uvalue != value:
488 488 self.debug("ignoring untrusted configuration option "
489 489 "%s.%s = %s\n" % (s, n, uvalue))
490 490 return value
491 491
492 492 def configsuboptions(self, section, name, default=_unset, untrusted=False):
493 493 """Get a config option and all sub-options.
494 494
495 495 Some config options have sub-options that are declared with the
496 496 format "key:opt = value". This method is used to return the main
497 497 option and all its declared sub-options.
498 498
499 499 Returns a 2-tuple of ``(option, sub-options)``, where `sub-options``
500 500 is a dict of defined sub-options where keys and values are strings.
501 501 """
502 502 main = self.config(section, name, default, untrusted=untrusted)
503 503 data = self._data(untrusted)
504 504 sub = {}
505 505 prefix = '%s:' % name
506 506 for k, v in data.items(section):
507 507 if k.startswith(prefix):
508 508 sub[k[len(prefix):]] = v
509 509
510 510 if self.debugflag and not untrusted and self._reportuntrusted:
511 511 for k, v in sub.items():
512 512 uvalue = self._ucfg.get(section, '%s:%s' % (name, k))
513 513 if uvalue is not None and uvalue != v:
514 514 self.debug('ignoring untrusted configuration option '
515 515 '%s:%s.%s = %s\n' % (section, name, k, uvalue))
516 516
517 517 return main, sub
518 518
519 519 def configpath(self, section, name, default=_unset, untrusted=False):
520 520 'get a path config item, expanded relative to repo root or config file'
521 521 v = self.config(section, name, default, untrusted)
522 522 if v is None:
523 523 return None
524 524 if not os.path.isabs(v) or "://" not in v:
525 525 src = self.configsource(section, name, untrusted)
526 526 if ':' in src:
527 527 base = os.path.dirname(src.rsplit(':')[0])
528 528 v = os.path.join(base, os.path.expanduser(v))
529 529 return v
530 530
531 531 def configbool(self, section, name, default=_unset, untrusted=False):
532 532 """parse a configuration element as a boolean
533 533
534 534 >>> u = ui(); s = 'foo'
535 535 >>> u.setconfig(s, 'true', 'yes')
536 536 >>> u.configbool(s, 'true')
537 537 True
538 538 >>> u.setconfig(s, 'false', 'no')
539 539 >>> u.configbool(s, 'false')
540 540 False
541 541 >>> u.configbool(s, 'unknown')
542 542 False
543 543 >>> u.configbool(s, 'unknown', True)
544 544 True
545 545 >>> u.setconfig(s, 'invalid', 'somevalue')
546 546 >>> u.configbool(s, 'invalid')
547 547 Traceback (most recent call last):
548 548 ...
549 549 ConfigError: foo.invalid is not a boolean ('somevalue')
550 550 """
551 551
552 552 v = self._config(section, name, default, untrusted=untrusted)
553 553 if v is None:
554 554 return v
555 555 if v is _unset:
556 556 if default is _unset:
557 557 return False
558 558 return default
559 559 if isinstance(v, bool):
560 560 return v
561 561 b = util.parsebool(v)
562 562 if b is None:
563 563 raise error.ConfigError(_("%s.%s is not a boolean ('%s')")
564 564 % (section, name, v))
565 565 return b
566 566
567 567 def configwith(self, convert, section, name, default=_unset,
568 568 desc=None, untrusted=False):
569 569 """parse a configuration element with a conversion function
570 570
571 571 >>> u = ui(); s = 'foo'
572 572 >>> u.setconfig(s, 'float1', '42')
573 573 >>> u.configwith(float, s, 'float1')
574 574 42.0
575 575 >>> u.setconfig(s, 'float2', '-4.25')
576 576 >>> u.configwith(float, s, 'float2')
577 577 -4.25
578 578 >>> u.configwith(float, s, 'unknown', 7)
579 579 7.0
580 580 >>> u.setconfig(s, 'invalid', 'somevalue')
581 581 >>> u.configwith(float, s, 'invalid')
582 582 Traceback (most recent call last):
583 583 ...
584 584 ConfigError: foo.invalid is not a valid float ('somevalue')
585 585 >>> u.configwith(float, s, 'invalid', desc='womble')
586 586 Traceback (most recent call last):
587 587 ...
588 588 ConfigError: foo.invalid is not a valid womble ('somevalue')
589 589 """
590 590
591 591 v = self.config(section, name, default, untrusted)
592 592 if v is None:
593 593 return v # do not attempt to convert None
594 594 try:
595 595 return convert(v)
596 596 except (ValueError, error.ParseError):
597 597 if desc is None:
598 598 desc = convert.__name__
599 599 raise error.ConfigError(_("%s.%s is not a valid %s ('%s')")
600 600 % (section, name, desc, v))
601 601
602 602 def configint(self, section, name, default=_unset, untrusted=False):
603 603 """parse a configuration element as an integer
604 604
605 605 >>> u = ui(); s = 'foo'
606 606 >>> u.setconfig(s, 'int1', '42')
607 607 >>> u.configint(s, 'int1')
608 608 42
609 609 >>> u.setconfig(s, 'int2', '-42')
610 610 >>> u.configint(s, 'int2')
611 611 -42
612 612 >>> u.configint(s, 'unknown', 7)
613 613 7
614 614 >>> u.setconfig(s, 'invalid', 'somevalue')
615 615 >>> u.configint(s, 'invalid')
616 616 Traceback (most recent call last):
617 617 ...
618 618 ConfigError: foo.invalid is not a valid integer ('somevalue')
619 619 """
620 620
621 621 return self.configwith(int, section, name, default, 'integer',
622 622 untrusted)
623 623
624 624 def configbytes(self, section, name, default=_unset, untrusted=False):
625 625 """parse a configuration element as a quantity in bytes
626 626
627 627 Units can be specified as b (bytes), k or kb (kilobytes), m or
628 628 mb (megabytes), g or gb (gigabytes).
629 629
630 630 >>> u = ui(); s = 'foo'
631 631 >>> u.setconfig(s, 'val1', '42')
632 632 >>> u.configbytes(s, 'val1')
633 633 42
634 634 >>> u.setconfig(s, 'val2', '42.5 kb')
635 635 >>> u.configbytes(s, 'val2')
636 636 43520
637 637 >>> u.configbytes(s, 'unknown', '7 MB')
638 638 7340032
639 639 >>> u.setconfig(s, 'invalid', 'somevalue')
640 640 >>> u.configbytes(s, 'invalid')
641 641 Traceback (most recent call last):
642 642 ...
643 643 ConfigError: foo.invalid is not a byte quantity ('somevalue')
644 644 """
645 645
646 646 value = self._config(section, name, default, untrusted)
647 647 if value is _unset:
648 648 if default is _unset:
649 649 default = 0
650 650 value = default
651 651 if not isinstance(value, bytes):
652 652 return value
653 653 try:
654 654 return util.sizetoint(value)
655 655 except error.ParseError:
656 656 raise error.ConfigError(_("%s.%s is not a byte quantity ('%s')")
657 657 % (section, name, value))
658 658
659 659 def configlist(self, section, name, default=_unset, untrusted=False):
660 660 """parse a configuration element as a list of comma/space separated
661 661 strings
662 662
663 663 >>> u = ui(); s = 'foo'
664 664 >>> u.setconfig(s, 'list1', 'this,is "a small" ,test')
665 665 >>> u.configlist(s, 'list1')
666 666 ['this', 'is', 'a small', 'test']
667 667 """
668 668 # default is not always a list
669 669 v = self.configwith(config.parselist, section, name, default,
670 670 'list', untrusted)
671 671 if isinstance(v, bytes):
672 672 return config.parselist(v)
673 673 elif v is None:
674 674 return []
675 675 return v
676 676
677 677 def configdate(self, section, name, default=_unset, untrusted=False):
678 678 """parse a configuration element as a tuple of ints
679 679
680 680 >>> u = ui(); s = 'foo'
681 681 >>> u.setconfig(s, 'date', '0 0')
682 682 >>> u.configdate(s, 'date')
683 683 (0, 0)
684 684 """
685 685 if self.config(section, name, default, untrusted):
686 686 return self.configwith(util.parsedate, section, name, default,
687 687 'date', untrusted)
688 688 if default is _unset:
689 689 return None
690 690 return default
691 691
692 692 def hasconfig(self, section, name, untrusted=False):
693 693 return self._data(untrusted).hasitem(section, name)
694 694
695 695 def has_section(self, section, untrusted=False):
696 696 '''tell whether section exists in config.'''
697 697 return section in self._data(untrusted)
698 698
699 699 def configitems(self, section, untrusted=False, ignoresub=False):
700 700 items = self._data(untrusted).items(section)
701 701 if ignoresub:
702 702 newitems = {}
703 703 for k, v in items:
704 704 if ':' not in k:
705 705 newitems[k] = v
706 706 items = newitems.items()
707 707 if self.debugflag and not untrusted and self._reportuntrusted:
708 708 for k, v in self._ucfg.items(section):
709 709 if self._tcfg.get(section, k) != v:
710 710 self.debug("ignoring untrusted configuration option "
711 711 "%s.%s = %s\n" % (section, k, v))
712 712 return items
713 713
714 714 def walkconfig(self, untrusted=False):
715 715 cfg = self._data(untrusted)
716 716 for section in cfg.sections():
717 717 for name, value in self.configitems(section, untrusted):
718 718 yield section, name, value
719 719
720 720 def plain(self, feature=None):
721 721 '''is plain mode active?
722 722
723 723 Plain mode means that all configuration variables which affect
724 724 the behavior and output of Mercurial should be
725 725 ignored. Additionally, the output should be stable,
726 726 reproducible and suitable for use in scripts or applications.
727 727
728 728 The only way to trigger plain mode is by setting either the
729 729 `HGPLAIN' or `HGPLAINEXCEPT' environment variables.
730 730
731 731 The return value can either be
732 732 - False if HGPLAIN is not set, or feature is in HGPLAINEXCEPT
733 733 - True otherwise
734 734 '''
735 735 if ('HGPLAIN' not in encoding.environ and
736 736 'HGPLAINEXCEPT' not in encoding.environ):
737 737 return False
738 738 exceptions = encoding.environ.get('HGPLAINEXCEPT',
739 739 '').strip().split(',')
740 740 if feature and exceptions:
741 741 return feature not in exceptions
742 742 return True
743 743
744 744 def username(self):
745 745 """Return default username to be used in commits.
746 746
747 747 Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
748 748 and stop searching if one of these is set.
749 749 If not found and ui.askusername is True, ask the user, else use
750 750 ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
751 751 """
752 752 user = encoding.environ.get("HGUSER")
753 753 if user is None:
754 754 user = self.config("ui", "username")
755 755 if user is not None:
756 756 user = os.path.expandvars(user)
757 757 if user is None:
758 758 user = encoding.environ.get("EMAIL")
759 759 if user is None and self.configbool("ui", "askusername"):
760 760 user = self.prompt(_("enter a commit username:"), default=None)
761 761 if user is None and not self.interactive():
762 762 try:
763 763 user = '%s@%s' % (util.getuser(), socket.getfqdn())
764 764 self.warn(_("no username found, using '%s' instead\n") % user)
765 765 except KeyError:
766 766 pass
767 767 if not user:
768 768 raise error.Abort(_('no username supplied'),
769 769 hint=_("use 'hg config --edit' "
770 770 'to set your username'))
771 771 if "\n" in user:
772 772 raise error.Abort(_("username %s contains a newline\n")
773 773 % repr(user))
774 774 return user
775 775
776 776 def shortuser(self, user):
777 777 """Return a short representation of a user name or email address."""
778 778 if not self.verbose:
779 779 user = util.shortuser(user)
780 780 return user
781 781
782 782 def expandpath(self, loc, default=None):
783 783 """Return repository location relative to cwd or from [paths]"""
784 784 try:
785 785 p = self.paths.getpath(loc)
786 786 if p:
787 787 return p.rawloc
788 788 except error.RepoError:
789 789 pass
790 790
791 791 if default:
792 792 try:
793 793 p = self.paths.getpath(default)
794 794 if p:
795 795 return p.rawloc
796 796 except error.RepoError:
797 797 pass
798 798
799 799 return loc
800 800
801 801 @util.propertycache
802 802 def paths(self):
803 803 return paths(self)
804 804
805 805 def pushbuffer(self, error=False, subproc=False, labeled=False):
806 806 """install a buffer to capture standard output of the ui object
807 807
808 808 If error is True, the error output will be captured too.
809 809
810 810 If subproc is True, output from subprocesses (typically hooks) will be
811 811 captured too.
812 812
813 813 If labeled is True, any labels associated with buffered
814 814 output will be handled. By default, this has no effect
815 815 on the output returned, but extensions and GUI tools may
816 816 handle this argument and returned styled output. If output
817 817 is being buffered so it can be captured and parsed or
818 818 processed, labeled should not be set to True.
819 819 """
820 820 self._buffers.append([])
821 821 self._bufferstates.append((error, subproc, labeled))
822 822 self._bufferapplylabels = labeled
823 823
824 824 def popbuffer(self):
825 825 '''pop the last buffer and return the buffered output'''
826 826 self._bufferstates.pop()
827 827 if self._bufferstates:
828 828 self._bufferapplylabels = self._bufferstates[-1][2]
829 829 else:
830 830 self._bufferapplylabels = None
831 831
832 832 return "".join(self._buffers.pop())
833 833
834 834 def write(self, *args, **opts):
835 835 '''write args to output
836 836
837 837 By default, this method simply writes to the buffer or stdout.
838 838 Color mode can be set on the UI class to have the output decorated
839 839 with color modifier before being written to stdout.
840 840
841 841 The color used is controlled by an optional keyword argument, "label".
842 842 This should be a string containing label names separated by space.
843 843 Label names take the form of "topic.type". For example, ui.debug()
844 844 issues a label of "ui.debug".
845 845
846 846 When labeling output for a specific command, a label of
847 847 "cmdname.type" is recommended. For example, status issues
848 848 a label of "status.modified" for modified files.
849 849 '''
850 850 if self._buffers and not opts.get('prompt', False):
851 851 if self._bufferapplylabels:
852 852 label = opts.get('label', '')
853 853 self._buffers[-1].extend(self.label(a, label) for a in args)
854 854 else:
855 855 self._buffers[-1].extend(args)
856 856 elif self._colormode == 'win32':
857 857 # windows color printing is its own can of crab, defer to
858 858 # the color module and that is it.
859 859 color.win32print(self, self._write, *args, **opts)
860 860 else:
861 861 msgs = args
862 862 if self._colormode is not None:
863 863 label = opts.get('label', '')
864 864 msgs = [self.label(a, label) for a in args]
865 865 self._write(*msgs, **opts)
866 866
867 867 def _write(self, *msgs, **opts):
868 868 self._progclear()
869 869 # opencode timeblockedsection because this is a critical path
870 870 starttime = util.timer()
871 871 try:
872 872 for a in msgs:
873 873 self.fout.write(a)
874 874 except IOError as err:
875 875 raise error.StdioError(err)
876 876 finally:
877 877 self._blockedtimes['stdio_blocked'] += \
878 878 (util.timer() - starttime) * 1000
879 879
880 880 def write_err(self, *args, **opts):
881 881 self._progclear()
882 882 if self._bufferstates and self._bufferstates[-1][0]:
883 883 self.write(*args, **opts)
884 884 elif self._colormode == 'win32':
885 885 # windows color printing is its own can of crab, defer to
886 886 # the color module and that is it.
887 887 color.win32print(self, self._write_err, *args, **opts)
888 888 else:
889 889 msgs = args
890 890 if self._colormode is not None:
891 891 label = opts.get('label', '')
892 892 msgs = [self.label(a, label) for a in args]
893 893 self._write_err(*msgs, **opts)
894 894
895 895 def _write_err(self, *msgs, **opts):
896 896 try:
897 897 with self.timeblockedsection('stdio'):
898 898 if not getattr(self.fout, 'closed', False):
899 899 self.fout.flush()
900 900 for a in msgs:
901 901 self.ferr.write(a)
902 902 # stderr may be buffered under win32 when redirected to files,
903 903 # including stdout.
904 904 if not getattr(self.ferr, 'closed', False):
905 905 self.ferr.flush()
906 906 except IOError as inst:
907 907 raise error.StdioError(inst)
908 908
909 909 def flush(self):
910 910 # opencode timeblockedsection because this is a critical path
911 911 starttime = util.timer()
912 912 try:
913 913 try:
914 914 self.fout.flush()
915 915 except IOError as err:
916 916 raise error.StdioError(err)
917 917 finally:
918 918 try:
919 919 self.ferr.flush()
920 920 except IOError as err:
921 921 raise error.StdioError(err)
922 922 finally:
923 923 self._blockedtimes['stdio_blocked'] += \
924 924 (util.timer() - starttime) * 1000
925 925
926 926 def _isatty(self, fh):
927 927 if self.configbool('ui', 'nontty'):
928 928 return False
929 929 return util.isatty(fh)
930 930
931 931 def disablepager(self):
932 932 self._disablepager = True
933 933
934 934 def pager(self, command):
935 935 """Start a pager for subsequent command output.
936 936
937 937 Commands which produce a long stream of output should call
938 938 this function to activate the user's preferred pagination
939 939 mechanism (which may be no pager). Calling this function
940 940 precludes any future use of interactive functionality, such as
941 941 prompting the user or activating curses.
942 942
943 943 Args:
944 944 command: The full, non-aliased name of the command. That is, "log"
945 945 not "history, "summary" not "summ", etc.
946 946 """
947 947 if (self._disablepager
948 948 or self.pageractive
949 949 or command in self.configlist('pager', 'ignore')
950 950 or not self.configbool('ui', 'paginate')
951 951 or not self.configbool('pager', 'attend-' + command, True)
952 952 # TODO: if we want to allow HGPLAINEXCEPT=pager,
953 953 # formatted() will need some adjustment.
954 954 or not self.formatted()
955 955 or self.plain()
956 956 # TODO: expose debugger-enabled on the UI object
957 957 or '--debugger' in pycompat.sysargv):
958 958 # We only want to paginate if the ui appears to be
959 959 # interactive, the user didn't say HGPLAIN or
960 960 # HGPLAINEXCEPT=pager, and the user didn't specify --debug.
961 961 return
962 962
963 963 pagercmd = self.config('pager', 'pager', rcutil.fallbackpager)
964 964 if not pagercmd:
965 965 return
966 966
967 967 pagerenv = {}
968 968 for name, value in rcutil.defaultpagerenv().items():
969 969 if name not in encoding.environ:
970 970 pagerenv[name] = value
971 971
972 972 self.debug('starting pager for command %r\n' % command)
973 973 self.flush()
974 974
975 975 wasformatted = self.formatted()
976 976 if util.safehasattr(signal, "SIGPIPE"):
977 977 signal.signal(signal.SIGPIPE, _catchterm)
978 978 if self._runpager(pagercmd, pagerenv):
979 979 self.pageractive = True
980 980 # Preserve the formatted-ness of the UI. This is important
981 981 # because we mess with stdout, which might confuse
982 982 # auto-detection of things being formatted.
983 983 self.setconfig('ui', 'formatted', wasformatted, 'pager')
984 984 self.setconfig('ui', 'interactive', False, 'pager')
985 985
986 986 # If pagermode differs from color.mode, reconfigure color now that
987 987 # pageractive is set.
988 988 cm = self._colormode
989 989 if cm != self.config('color', 'pagermode', cm):
990 990 color.setup(self)
991 991 else:
992 992 # If the pager can't be spawned in dispatch when --pager=on is
993 993 # given, don't try again when the command runs, to avoid a duplicate
994 994 # warning about a missing pager command.
995 995 self.disablepager()
996 996
997 997 def _runpager(self, command, env=None):
998 998 """Actually start the pager and set up file descriptors.
999 999
1000 1000 This is separate in part so that extensions (like chg) can
1001 1001 override how a pager is invoked.
1002 1002 """
1003 1003 if command == 'cat':
1004 1004 # Save ourselves some work.
1005 1005 return False
1006 1006 # If the command doesn't contain any of these characters, we
1007 1007 # assume it's a binary and exec it directly. This means for
1008 1008 # simple pager command configurations, we can degrade
1009 1009 # gracefully and tell the user about their broken pager.
1010 1010 shell = any(c in command for c in "|&;<>()$`\\\"' \t\n*?[#~=%")
1011 1011
1012 1012 if pycompat.osname == 'nt' and not shell:
1013 1013 # Window's built-in `more` cannot be invoked with shell=False, but
1014 1014 # its `more.com` can. Hide this implementation detail from the
1015 1015 # user so we can also get sane bad PAGER behavior. MSYS has
1016 1016 # `more.exe`, so do a cmd.exe style resolution of the executable to
1017 1017 # determine which one to use.
1018 1018 fullcmd = util.findexe(command)
1019 1019 if not fullcmd:
1020 1020 self.warn(_("missing pager command '%s', skipping pager\n")
1021 1021 % command)
1022 1022 return False
1023 1023
1024 1024 command = fullcmd
1025 1025
1026 1026 try:
1027 1027 pager = subprocess.Popen(
1028 1028 command, shell=shell, bufsize=-1,
1029 1029 close_fds=util.closefds, stdin=subprocess.PIPE,
1030 1030 stdout=util.stdout, stderr=util.stderr,
1031 1031 env=util.shellenviron(env))
1032 1032 except OSError as e:
1033 1033 if e.errno == errno.ENOENT and not shell:
1034 1034 self.warn(_("missing pager command '%s', skipping pager\n")
1035 1035 % command)
1036 1036 return False
1037 1037 raise
1038 1038
1039 1039 # back up original file descriptors
1040 1040 stdoutfd = os.dup(util.stdout.fileno())
1041 1041 stderrfd = os.dup(util.stderr.fileno())
1042 1042
1043 1043 os.dup2(pager.stdin.fileno(), util.stdout.fileno())
1044 1044 if self._isatty(util.stderr):
1045 1045 os.dup2(pager.stdin.fileno(), util.stderr.fileno())
1046 1046
1047 1047 @self.atexit
1048 1048 def killpager():
1049 1049 if util.safehasattr(signal, "SIGINT"):
1050 1050 signal.signal(signal.SIGINT, signal.SIG_IGN)
1051 1051 # restore original fds, closing pager.stdin copies in the process
1052 1052 os.dup2(stdoutfd, util.stdout.fileno())
1053 1053 os.dup2(stderrfd, util.stderr.fileno())
1054 1054 pager.stdin.close()
1055 1055 pager.wait()
1056 1056
1057 1057 return True
1058 1058
1059 1059 def atexit(self, func, *args, **kwargs):
1060 1060 '''register a function to run after dispatching a request
1061 1061
1062 1062 Handlers do not stay registered across request boundaries.'''
1063 1063 self._exithandlers.append((func, args, kwargs))
1064 1064 return func
1065 1065
1066 1066 def interface(self, feature):
1067 1067 """what interface to use for interactive console features?
1068 1068
1069 1069 The interface is controlled by the value of `ui.interface` but also by
1070 1070 the value of feature-specific configuration. For example:
1071 1071
1072 1072 ui.interface.histedit = text
1073 1073 ui.interface.chunkselector = curses
1074 1074
1075 1075 Here the features are "histedit" and "chunkselector".
1076 1076
1077 1077 The configuration above means that the default interfaces for commands
1078 1078 is curses, the interface for histedit is text and the interface for
1079 1079 selecting chunk is crecord (the best curses interface available).
1080 1080
1081 1081 Consider the following example:
1082 1082 ui.interface = curses
1083 1083 ui.interface.histedit = text
1084 1084
1085 1085 Then histedit will use the text interface and chunkselector will use
1086 1086 the default curses interface (crecord at the moment).
1087 1087 """
1088 1088 alldefaults = frozenset(["text", "curses"])
1089 1089
1090 1090 featureinterfaces = {
1091 1091 "chunkselector": [
1092 1092 "text",
1093 1093 "curses",
1094 1094 ]
1095 1095 }
1096 1096
1097 1097 # Feature-specific interface
1098 1098 if feature not in featureinterfaces.keys():
1099 1099 # Programming error, not user error
1100 1100 raise ValueError("Unknown feature requested %s" % feature)
1101 1101
1102 1102 availableinterfaces = frozenset(featureinterfaces[feature])
1103 1103 if alldefaults > availableinterfaces:
1104 1104 # Programming error, not user error. We need a use case to
1105 1105 # define the right thing to do here.
1106 1106 raise ValueError(
1107 1107 "Feature %s does not handle all default interfaces" %
1108 1108 feature)
1109 1109
1110 1110 if self.plain():
1111 1111 return "text"
1112 1112
1113 1113 # Default interface for all the features
1114 1114 defaultinterface = "text"
1115 1115 i = self.config("ui", "interface")
1116 1116 if i in alldefaults:
1117 1117 defaultinterface = i
1118 1118
1119 1119 choseninterface = defaultinterface
1120 1120 f = self.config("ui", "interface.%s" % feature, None)
1121 1121 if f in availableinterfaces:
1122 1122 choseninterface = f
1123 1123
1124 1124 if i is not None and defaultinterface != i:
1125 1125 if f is not None:
1126 1126 self.warn(_("invalid value for ui.interface: %s\n") %
1127 1127 (i,))
1128 1128 else:
1129 1129 self.warn(_("invalid value for ui.interface: %s (using %s)\n") %
1130 1130 (i, choseninterface))
1131 1131 if f is not None and choseninterface != f:
1132 1132 self.warn(_("invalid value for ui.interface.%s: %s (using %s)\n") %
1133 1133 (feature, f, choseninterface))
1134 1134
1135 1135 return choseninterface
1136 1136
1137 1137 def interactive(self):
1138 1138 '''is interactive input allowed?
1139 1139
1140 1140 An interactive session is a session where input can be reasonably read
1141 1141 from `sys.stdin'. If this function returns false, any attempt to read
1142 1142 from stdin should fail with an error, unless a sensible default has been
1143 1143 specified.
1144 1144
1145 1145 Interactiveness is triggered by the value of the `ui.interactive'
1146 1146 configuration variable or - if it is unset - when `sys.stdin' points
1147 1147 to a terminal device.
1148 1148
1149 1149 This function refers to input only; for output, see `ui.formatted()'.
1150 1150 '''
1151 1151 i = self.configbool("ui", "interactive")
1152 1152 if i is None:
1153 1153 # some environments replace stdin without implementing isatty
1154 1154 # usually those are non-interactive
1155 1155 return self._isatty(self.fin)
1156 1156
1157 1157 return i
1158 1158
1159 1159 def termwidth(self):
1160 1160 '''how wide is the terminal in columns?
1161 1161 '''
1162 1162 if 'COLUMNS' in encoding.environ:
1163 1163 try:
1164 1164 return int(encoding.environ['COLUMNS'])
1165 1165 except ValueError:
1166 1166 pass
1167 1167 return scmutil.termsize(self)[0]
1168 1168
1169 1169 def formatted(self):
1170 1170 '''should formatted output be used?
1171 1171
1172 1172 It is often desirable to format the output to suite the output medium.
1173 1173 Examples of this are truncating long lines or colorizing messages.
1174 1174 However, this is not often not desirable when piping output into other
1175 1175 utilities, e.g. `grep'.
1176 1176
1177 1177 Formatted output is triggered by the value of the `ui.formatted'
1178 1178 configuration variable or - if it is unset - when `sys.stdout' points
1179 1179 to a terminal device. Please note that `ui.formatted' should be
1180 1180 considered an implementation detail; it is not intended for use outside
1181 1181 Mercurial or its extensions.
1182 1182
1183 1183 This function refers to output only; for input, see `ui.interactive()'.
1184 1184 This function always returns false when in plain mode, see `ui.plain()'.
1185 1185 '''
1186 1186 if self.plain():
1187 1187 return False
1188 1188
1189 1189 i = self.configbool("ui", "formatted")
1190 1190 if i is None:
1191 1191 # some environments replace stdout without implementing isatty
1192 1192 # usually those are non-interactive
1193 1193 return self._isatty(self.fout)
1194 1194
1195 1195 return i
1196 1196
1197 1197 def _readline(self, prompt=''):
1198 1198 if self._isatty(self.fin):
1199 1199 try:
1200 1200 # magically add command line editing support, where
1201 1201 # available
1202 1202 import readline
1203 1203 # force demandimport to really load the module
1204 1204 readline.read_history_file
1205 1205 # windows sometimes raises something other than ImportError
1206 1206 except Exception:
1207 1207 pass
1208 1208
1209 1209 # call write() so output goes through subclassed implementation
1210 1210 # e.g. color extension on Windows
1211 1211 self.write(prompt, prompt=True)
1212 1212
1213 1213 # instead of trying to emulate raw_input, swap (self.fin,
1214 1214 # self.fout) with (sys.stdin, sys.stdout)
1215 1215 oldin = sys.stdin
1216 1216 oldout = sys.stdout
1217 1217 sys.stdin = self.fin
1218 1218 sys.stdout = self.fout
1219 1219 # prompt ' ' must exist; otherwise readline may delete entire line
1220 1220 # - http://bugs.python.org/issue12833
1221 1221 with self.timeblockedsection('stdio'):
1222 1222 line = raw_input(' ')
1223 1223 sys.stdin = oldin
1224 1224 sys.stdout = oldout
1225 1225
1226 1226 # When stdin is in binary mode on Windows, it can cause
1227 1227 # raw_input() to emit an extra trailing carriage return
1228 1228 if pycompat.oslinesep == '\r\n' and line and line[-1] == '\r':
1229 1229 line = line[:-1]
1230 1230 return line
1231 1231
1232 1232 def prompt(self, msg, default="y"):
1233 1233 """Prompt user with msg, read response.
1234 1234 If ui is not interactive, the default is returned.
1235 1235 """
1236 1236 if not self.interactive():
1237 1237 self.write(msg, ' ', default or '', "\n")
1238 1238 return default
1239 1239 try:
1240 1240 r = self._readline(self.label(msg, 'ui.prompt'))
1241 1241 if not r:
1242 1242 r = default
1243 1243 if self.configbool('ui', 'promptecho'):
1244 1244 self.write(r, "\n")
1245 1245 return r
1246 1246 except EOFError:
1247 1247 raise error.ResponseExpected()
1248 1248
1249 1249 @staticmethod
1250 1250 def extractchoices(prompt):
1251 1251 """Extract prompt message and list of choices from specified prompt.
1252 1252
1253 1253 This returns tuple "(message, choices)", and "choices" is the
1254 1254 list of tuple "(response character, text without &)".
1255 1255
1256 1256 >>> ui.extractchoices("awake? $$ &Yes $$ &No")
1257 1257 ('awake? ', [('y', 'Yes'), ('n', 'No')])
1258 1258 >>> ui.extractchoices("line\\nbreak? $$ &Yes $$ &No")
1259 1259 ('line\\nbreak? ', [('y', 'Yes'), ('n', 'No')])
1260 1260 >>> ui.extractchoices("want lots of $$money$$?$$Ye&s$$N&o")
1261 1261 ('want lots of $$money$$?', [('s', 'Yes'), ('o', 'No')])
1262 1262 """
1263 1263
1264 1264 # Sadly, the prompt string may have been built with a filename
1265 1265 # containing "$$" so let's try to find the first valid-looking
1266 1266 # prompt to start parsing. Sadly, we also can't rely on
1267 1267 # choices containing spaces, ASCII, or basically anything
1268 1268 # except an ampersand followed by a character.
1269 1269 m = re.match(br'(?s)(.+?)\$\$([^\$]*&[^ \$].*)', prompt)
1270 1270 msg = m.group(1)
1271 1271 choices = [p.strip(' ') for p in m.group(2).split('$$')]
1272 1272 return (msg,
1273 1273 [(s[s.index('&') + 1].lower(), s.replace('&', '', 1))
1274 1274 for s in choices])
1275 1275
1276 1276 def promptchoice(self, prompt, default=0):
1277 1277 """Prompt user with a message, read response, and ensure it matches
1278 1278 one of the provided choices. The prompt is formatted as follows:
1279 1279
1280 1280 "would you like fries with that (Yn)? $$ &Yes $$ &No"
1281 1281
1282 1282 The index of the choice is returned. Responses are case
1283 1283 insensitive. If ui is not interactive, the default is
1284 1284 returned.
1285 1285 """
1286 1286
1287 1287 msg, choices = self.extractchoices(prompt)
1288 1288 resps = [r for r, t in choices]
1289 1289 while True:
1290 1290 r = self.prompt(msg, resps[default])
1291 1291 if r.lower() in resps:
1292 1292 return resps.index(r.lower())
1293 1293 self.write(_("unrecognized response\n"))
1294 1294
1295 1295 def getpass(self, prompt=None, default=None):
1296 1296 if not self.interactive():
1297 1297 return default
1298 1298 try:
1299 1299 self.write_err(self.label(prompt or _('password: '), 'ui.prompt'))
1300 1300 # disable getpass() only if explicitly specified. it's still valid
1301 1301 # to interact with tty even if fin is not a tty.
1302 1302 with self.timeblockedsection('stdio'):
1303 1303 if self.configbool('ui', 'nontty'):
1304 1304 l = self.fin.readline()
1305 1305 if not l:
1306 1306 raise EOFError
1307 1307 return l.rstrip('\n')
1308 1308 else:
1309 1309 return getpass.getpass('')
1310 1310 except EOFError:
1311 1311 raise error.ResponseExpected()
1312 1312 def status(self, *msg, **opts):
1313 1313 '''write status message to output (if ui.quiet is False)
1314 1314
1315 1315 This adds an output label of "ui.status".
1316 1316 '''
1317 1317 if not self.quiet:
1318 1318 opts[r'label'] = opts.get(r'label', '') + ' ui.status'
1319 1319 self.write(*msg, **opts)
1320 1320 def warn(self, *msg, **opts):
1321 1321 '''write warning message to output (stderr)
1322 1322
1323 1323 This adds an output label of "ui.warning".
1324 1324 '''
1325 1325 opts[r'label'] = opts.get(r'label', '') + ' ui.warning'
1326 1326 self.write_err(*msg, **opts)
1327 1327 def note(self, *msg, **opts):
1328 1328 '''write note to output (if ui.verbose is True)
1329 1329
1330 1330 This adds an output label of "ui.note".
1331 1331 '''
1332 1332 if self.verbose:
1333 1333 opts[r'label'] = opts.get(r'label', '') + ' ui.note'
1334 1334 self.write(*msg, **opts)
1335 1335 def debug(self, *msg, **opts):
1336 1336 '''write debug message to output (if ui.debugflag is True)
1337 1337
1338 1338 This adds an output label of "ui.debug".
1339 1339 '''
1340 1340 if self.debugflag:
1341 1341 opts[r'label'] = opts.get(r'label', '') + ' ui.debug'
1342 1342 self.write(*msg, **opts)
1343 1343
1344 1344 def edit(self, text, user, extra=None, editform=None, pending=None,
1345 1345 repopath=None):
1346 1346 extra_defaults = {
1347 1347 'prefix': 'editor',
1348 1348 'suffix': '.txt',
1349 1349 }
1350 1350 if extra is not None:
1351 1351 extra_defaults.update(extra)
1352 1352 extra = extra_defaults
1353 1353
1354 1354 rdir = None
1355 1355 if self.configbool('experimental', 'editortmpinhg'):
1356 1356 rdir = repopath
1357 1357 (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-',
1358 1358 suffix=extra['suffix'],
1359 1359 dir=rdir)
1360 1360 try:
1361 1361 f = os.fdopen(fd, r'wb')
1362 1362 f.write(util.tonativeeol(text))
1363 1363 f.close()
1364 1364
1365 1365 environ = {'HGUSER': user}
1366 1366 if 'transplant_source' in extra:
1367 1367 environ.update({'HGREVISION': hex(extra['transplant_source'])})
1368 1368 for label in ('intermediate-source', 'source', 'rebase_source'):
1369 1369 if label in extra:
1370 1370 environ.update({'HGREVISION': extra[label]})
1371 1371 break
1372 1372 if editform:
1373 1373 environ.update({'HGEDITFORM': editform})
1374 1374 if pending:
1375 1375 environ.update({'HG_PENDING': pending})
1376 1376
1377 1377 editor = self.geteditor()
1378 1378
1379 1379 self.system("%s \"%s\"" % (editor, name),
1380 1380 environ=environ,
1381 1381 onerr=error.Abort, errprefix=_("edit failed"),
1382 1382 blockedtag='editor')
1383 1383
1384 1384 f = open(name, r'rb')
1385 1385 t = util.fromnativeeol(f.read())
1386 1386 f.close()
1387 1387 finally:
1388 1388 os.unlink(name)
1389 1389
1390 1390 return t
1391 1391
1392 1392 def system(self, cmd, environ=None, cwd=None, onerr=None, errprefix=None,
1393 1393 blockedtag=None):
1394 1394 '''execute shell command with appropriate output stream. command
1395 1395 output will be redirected if fout is not stdout.
1396 1396
1397 1397 if command fails and onerr is None, return status, else raise onerr
1398 1398 object as exception.
1399 1399 '''
1400 1400 if blockedtag is None:
1401 1401 # Long cmds tend to be because of an absolute path on cmd. Keep
1402 1402 # the tail end instead
1403 1403 cmdsuffix = cmd.translate(None, _keepalnum)[-85:]
1404 1404 blockedtag = 'unknown_system_' + cmdsuffix
1405 1405 out = self.fout
1406 1406 if any(s[1] for s in self._bufferstates):
1407 1407 out = self
1408 1408 with self.timeblockedsection(blockedtag):
1409 1409 rc = self._runsystem(cmd, environ=environ, cwd=cwd, out=out)
1410 1410 if rc and onerr:
1411 1411 errmsg = '%s %s' % (os.path.basename(cmd.split(None, 1)[0]),
1412 1412 util.explainexit(rc)[0])
1413 1413 if errprefix:
1414 1414 errmsg = '%s: %s' % (errprefix, errmsg)
1415 1415 raise onerr(errmsg)
1416 1416 return rc
1417 1417
1418 1418 def _runsystem(self, cmd, environ, cwd, out):
1419 1419 """actually execute the given shell command (can be overridden by
1420 1420 extensions like chg)"""
1421 1421 return util.system(cmd, environ=environ, cwd=cwd, out=out)
1422 1422
1423 1423 def traceback(self, exc=None, force=False):
1424 1424 '''print exception traceback if traceback printing enabled or forced.
1425 1425 only to call in exception handler. returns true if traceback
1426 1426 printed.'''
1427 1427 if self.tracebackflag or force:
1428 1428 if exc is None:
1429 1429 exc = sys.exc_info()
1430 1430 cause = getattr(exc[1], 'cause', None)
1431 1431
1432 1432 if cause is not None:
1433 1433 causetb = traceback.format_tb(cause[2])
1434 1434 exctb = traceback.format_tb(exc[2])
1435 1435 exconly = traceback.format_exception_only(cause[0], cause[1])
1436 1436
1437 1437 # exclude frame where 'exc' was chained and rethrown from exctb
1438 1438 self.write_err('Traceback (most recent call last):\n',
1439 1439 ''.join(exctb[:-1]),
1440 1440 ''.join(causetb),
1441 1441 ''.join(exconly))
1442 1442 else:
1443 1443 output = traceback.format_exception(exc[0], exc[1], exc[2])
1444 1444 data = r''.join(output)
1445 1445 if pycompat.ispy3:
1446 1446 enc = pycompat.sysstr(encoding.encoding)
1447 1447 data = data.encode(enc, errors=r'replace')
1448 1448 self.write_err(data)
1449 1449 return self.tracebackflag or force
1450 1450
1451 1451 def geteditor(self):
1452 1452 '''return editor to use'''
1453 1453 if pycompat.sysplatform == 'plan9':
1454 1454 # vi is the MIPS instruction simulator on Plan 9. We
1455 1455 # instead default to E to plumb commit messages to
1456 1456 # avoid confusion.
1457 1457 editor = 'E'
1458 1458 else:
1459 1459 editor = 'vi'
1460 1460 return (encoding.environ.get("HGEDITOR") or
1461 1461 self.config("ui", "editor", editor))
1462 1462
1463 1463 @util.propertycache
1464 1464 def _progbar(self):
1465 1465 """setup the progbar singleton to the ui object"""
1466 1466 if (self.quiet or self.debugflag
1467 1467 or self.configbool('progress', 'disable')
1468 1468 or not progress.shouldprint(self)):
1469 1469 return None
1470 1470 return getprogbar(self)
1471 1471
1472 1472 def _progclear(self):
1473 1473 """clear progress bar output if any. use it before any output"""
1474 1474 if '_progbar' not in vars(self): # nothing loaded yet
1475 1475 return
1476 1476 if self._progbar is not None and self._progbar.printed:
1477 1477 self._progbar.clear()
1478 1478
1479 1479 def progress(self, topic, pos, item="", unit="", total=None):
1480 1480 '''show a progress message
1481 1481
1482 1482 By default a textual progress bar will be displayed if an operation
1483 1483 takes too long. 'topic' is the current operation, 'item' is a
1484 1484 non-numeric marker of the current position (i.e. the currently
1485 1485 in-process file), 'pos' is the current numeric position (i.e.
1486 1486 revision, bytes, etc.), unit is a corresponding unit label,
1487 1487 and total is the highest expected pos.
1488 1488
1489 1489 Multiple nested topics may be active at a time.
1490 1490
1491 1491 All topics should be marked closed by setting pos to None at
1492 1492 termination.
1493 1493 '''
1494 1494 if self._progbar is not None:
1495 1495 self._progbar.progress(topic, pos, item=item, unit=unit,
1496 1496 total=total)
1497 1497 if pos is None or not self.configbool('progress', 'debug'):
1498 1498 return
1499 1499
1500 1500 if unit:
1501 1501 unit = ' ' + unit
1502 1502 if item:
1503 1503 item = ' ' + item
1504 1504
1505 1505 if total:
1506 1506 pct = 100.0 * pos / total
1507 1507 self.debug('%s:%s %s/%s%s (%4.2f%%)\n'
1508 1508 % (topic, item, pos, total, unit, pct))
1509 1509 else:
1510 1510 self.debug('%s:%s %s%s\n' % (topic, item, pos, unit))
1511 1511
1512 1512 def log(self, service, *msg, **opts):
1513 1513 '''hook for logging facility extensions
1514 1514
1515 1515 service should be a readily-identifiable subsystem, which will
1516 1516 allow filtering.
1517 1517
1518 1518 *msg should be a newline-terminated format string to log, and
1519 1519 then any values to %-format into that format string.
1520 1520
1521 1521 **opts currently has no defined meanings.
1522 1522 '''
1523 1523
1524 1524 def label(self, msg, label):
1525 1525 '''style msg based on supplied label
1526 1526
1527 1527 If some color mode is enabled, this will add the necessary control
1528 1528 characters to apply such color. In addition, 'debug' color mode adds
1529 1529 markup showing which label affects a piece of text.
1530 1530
1531 1531 ui.write(s, 'label') is equivalent to
1532 1532 ui.write(ui.label(s, 'label')).
1533 1533 '''
1534 1534 if self._colormode is not None:
1535 1535 return color.colorlabel(self, msg, label)
1536 1536 return msg
1537 1537
1538 1538 def develwarn(self, msg, stacklevel=1, config=None):
1539 1539 """issue a developer warning message
1540 1540
1541 1541 Use 'stacklevel' to report the offender some layers further up in the
1542 1542 stack.
1543 1543 """
1544 1544 if not self.configbool('devel', 'all-warnings'):
1545 1545 if config is not None and not self.configbool('devel', config):
1546 1546 return
1547 1547 msg = 'devel-warn: ' + msg
1548 1548 stacklevel += 1 # get in develwarn
1549 1549 if self.tracebackflag:
1550 1550 util.debugstacktrace(msg, stacklevel, self.ferr, self.fout)
1551 1551 self.log('develwarn', '%s at:\n%s' %
1552 1552 (msg, ''.join(util.getstackframes(stacklevel))))
1553 1553 else:
1554 1554 curframe = inspect.currentframe()
1555 1555 calframe = inspect.getouterframes(curframe, 2)
1556 1556 self.write_err('%s at: %s:%s (%s)\n'
1557 1557 % ((msg,) + calframe[stacklevel][1:4]))
1558 1558 self.log('develwarn', '%s at: %s:%s (%s)\n',
1559 1559 msg, *calframe[stacklevel][1:4])
1560 1560 curframe = calframe = None # avoid cycles
1561 1561
1562 1562 def deprecwarn(self, msg, version):
1563 1563 """issue a deprecation warning
1564 1564
1565 1565 - msg: message explaining what is deprecated and how to upgrade,
1566 1566 - version: last version where the API will be supported,
1567 1567 """
1568 1568 if not (self.configbool('devel', 'all-warnings')
1569 1569 or self.configbool('devel', 'deprec-warn')):
1570 1570 return
1571 1571 msg += ("\n(compatibility will be dropped after Mercurial-%s,"
1572 1572 " update your code.)") % version
1573 1573 self.develwarn(msg, stacklevel=2, config='deprec-warn')
1574 1574
1575 1575 def exportableenviron(self):
1576 1576 """The environment variables that are safe to export, e.g. through
1577 1577 hgweb.
1578 1578 """
1579 1579 return self._exportableenviron
1580 1580
1581 1581 @contextlib.contextmanager
1582 1582 def configoverride(self, overrides, source=""):
1583 1583 """Context manager for temporary config overrides
1584 1584 `overrides` must be a dict of the following structure:
1585 1585 {(section, name) : value}"""
1586 1586 backups = {}
1587 1587 try:
1588 1588 for (section, name), value in overrides.items():
1589 1589 backups[(section, name)] = self.backupconfig(section, name)
1590 1590 self.setconfig(section, name, value, source)
1591 1591 yield
1592 1592 finally:
1593 1593 for __, backup in backups.items():
1594 1594 self.restoreconfig(backup)
1595 1595 # just restoring ui.quiet config to the previous value is not enough
1596 1596 # as it does not update ui.quiet class member
1597 1597 if ('ui', 'quiet') in overrides:
1598 1598 self.fixconfig(section='ui')
1599 1599
1600 1600 class paths(dict):
1601 1601 """Represents a collection of paths and their configs.
1602 1602
1603 1603 Data is initially derived from ui instances and the config files they have
1604 1604 loaded.
1605 1605 """
1606 1606 def __init__(self, ui):
1607 1607 dict.__init__(self)
1608 1608
1609 1609 for name, loc in ui.configitems('paths', ignoresub=True):
1610 1610 # No location is the same as not existing.
1611 1611 if not loc:
1612 1612 continue
1613 1613 loc, sub = ui.configsuboptions('paths', name)
1614 1614 self[name] = path(ui, name, rawloc=loc, suboptions=sub)
1615 1615
1616 1616 def getpath(self, name, default=None):
1617 1617 """Return a ``path`` from a string, falling back to default.
1618 1618
1619 1619 ``name`` can be a named path or locations. Locations are filesystem
1620 1620 paths or URIs.
1621 1621
1622 1622 Returns None if ``name`` is not a registered path, a URI, or a local
1623 1623 path to a repo.
1624 1624 """
1625 1625 # Only fall back to default if no path was requested.
1626 1626 if name is None:
1627 1627 if not default:
1628 1628 default = ()
1629 1629 elif not isinstance(default, (tuple, list)):
1630 1630 default = (default,)
1631 1631 for k in default:
1632 1632 try:
1633 1633 return self[k]
1634 1634 except KeyError:
1635 1635 continue
1636 1636 return None
1637 1637
1638 1638 # Most likely empty string.
1639 1639 # This may need to raise in the future.
1640 1640 if not name:
1641 1641 return None
1642 1642
1643 1643 try:
1644 1644 return self[name]
1645 1645 except KeyError:
1646 1646 # Try to resolve as a local path or URI.
1647 1647 try:
1648 1648 # We don't pass sub-options in, so no need to pass ui instance.
1649 1649 return path(None, None, rawloc=name)
1650 1650 except ValueError:
1651 1651 raise error.RepoError(_('repository %s does not exist') %
1652 1652 name)
1653 1653
1654 1654 _pathsuboptions = {}
1655 1655
1656 1656 def pathsuboption(option, attr):
1657 1657 """Decorator used to declare a path sub-option.
1658 1658
1659 1659 Arguments are the sub-option name and the attribute it should set on
1660 1660 ``path`` instances.
1661 1661
1662 1662 The decorated function will receive as arguments a ``ui`` instance,
1663 1663 ``path`` instance, and the string value of this option from the config.
1664 1664 The function should return the value that will be set on the ``path``
1665 1665 instance.
1666 1666
1667 1667 This decorator can be used to perform additional verification of
1668 1668 sub-options and to change the type of sub-options.
1669 1669 """
1670 1670 def register(func):
1671 1671 _pathsuboptions[option] = (attr, func)
1672 1672 return func
1673 1673 return register
1674 1674
1675 1675 @pathsuboption('pushurl', 'pushloc')
1676 1676 def pushurlpathoption(ui, path, value):
1677 1677 u = util.url(value)
1678 1678 # Actually require a URL.
1679 1679 if not u.scheme:
1680 1680 ui.warn(_('(paths.%s:pushurl not a URL; ignoring)\n') % path.name)
1681 1681 return None
1682 1682
1683 1683 # Don't support the #foo syntax in the push URL to declare branch to
1684 1684 # push.
1685 1685 if u.fragment:
1686 1686 ui.warn(_('("#fragment" in paths.%s:pushurl not supported; '
1687 1687 'ignoring)\n') % path.name)
1688 1688 u.fragment = None
1689 1689
1690 1690 return str(u)
1691 1691
1692 1692 @pathsuboption('pushrev', 'pushrev')
1693 1693 def pushrevpathoption(ui, path, value):
1694 1694 return value
1695 1695
1696 1696 class path(object):
1697 1697 """Represents an individual path and its configuration."""
1698 1698
1699 1699 def __init__(self, ui, name, rawloc=None, suboptions=None):
1700 1700 """Construct a path from its config options.
1701 1701
1702 1702 ``ui`` is the ``ui`` instance the path is coming from.
1703 1703 ``name`` is the symbolic name of the path.
1704 1704 ``rawloc`` is the raw location, as defined in the config.
1705 1705 ``pushloc`` is the raw locations pushes should be made to.
1706 1706
1707 1707 If ``name`` is not defined, we require that the location be a) a local
1708 1708 filesystem path with a .hg directory or b) a URL. If not,
1709 1709 ``ValueError`` is raised.
1710 1710 """
1711 1711 if not rawloc:
1712 1712 raise ValueError('rawloc must be defined')
1713 1713
1714 1714 # Locations may define branches via syntax <base>#<branch>.
1715 1715 u = util.url(rawloc)
1716 1716 branch = None
1717 1717 if u.fragment:
1718 1718 branch = u.fragment
1719 1719 u.fragment = None
1720 1720
1721 1721 self.url = u
1722 1722 self.branch = branch
1723 1723
1724 1724 self.name = name
1725 1725 self.rawloc = rawloc
1726 1726 self.loc = '%s' % u
1727 1727
1728 1728 # When given a raw location but not a symbolic name, validate the
1729 1729 # location is valid.
1730 1730 if not name and not u.scheme and not self._isvalidlocalpath(self.loc):
1731 1731 raise ValueError('location is not a URL or path to a local '
1732 1732 'repo: %s' % rawloc)
1733 1733
1734 1734 suboptions = suboptions or {}
1735 1735
1736 1736 # Now process the sub-options. If a sub-option is registered, its
1737 1737 # attribute will always be present. The value will be None if there
1738 1738 # was no valid sub-option.
1739 1739 for suboption, (attr, func) in _pathsuboptions.iteritems():
1740 1740 if suboption not in suboptions:
1741 1741 setattr(self, attr, None)
1742 1742 continue
1743 1743
1744 1744 value = func(ui, self, suboptions[suboption])
1745 1745 setattr(self, attr, value)
1746 1746
1747 1747 def _isvalidlocalpath(self, path):
1748 1748 """Returns True if the given path is a potentially valid repository.
1749 1749 This is its own function so that extensions can change the definition of
1750 1750 'valid' in this case (like when pulling from a git repo into a hg
1751 1751 one)."""
1752 1752 return os.path.isdir(os.path.join(path, '.hg'))
1753 1753
1754 1754 @property
1755 1755 def suboptions(self):
1756 1756 """Return sub-options and their values for this path.
1757 1757
1758 1758 This is intended to be used for presentation purposes.
1759 1759 """
1760 1760 d = {}
1761 1761 for subopt, (attr, _func) in _pathsuboptions.iteritems():
1762 1762 value = getattr(self, attr)
1763 1763 if value is not None:
1764 1764 d[subopt] = value
1765 1765 return d
1766 1766
1767 1767 # we instantiate one globally shared progress bar to avoid
1768 1768 # competing progress bars when multiple UI objects get created
1769 1769 _progresssingleton = None
1770 1770
1771 1771 def getprogbar(ui):
1772 1772 global _progresssingleton
1773 1773 if _progresssingleton is None:
1774 1774 # passing 'ui' object to the singleton is fishy,
1775 1775 # this is how the extension used to work but feel free to rework it.
1776 1776 _progresssingleton = progress.progbar(ui)
1777 1777 return _progresssingleton
General Comments 0
You need to be logged in to leave comments. Login now