##// END OF EJS Templates
grep: move match and diff logic to new module...
Yuya Nishihara -
r46288:de6f2afc default
parent child Browse files
Show More
@@ -0,0 +1,71 b''
1 # grep.py - logic for history walk and grep
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
7
8 from __future__ import absolute_import
9
10 import difflib
11
12 from . import pycompat
13
14
15 def matchlines(body, regexp):
16 begin = 0
17 linenum = 0
18 while begin < len(body):
19 match = regexp.search(body, begin)
20 if not match:
21 break
22 mstart, mend = match.span()
23 linenum += body.count(b'\n', begin, mstart) + 1
24 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
25 begin = body.find(b'\n', mend) + 1 or len(body) + 1
26 lend = begin - 1
27 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
28
29
30 class linestate(object):
31 def __init__(self, line, linenum, colstart, colend):
32 self.line = line
33 self.linenum = linenum
34 self.colstart = colstart
35 self.colend = colend
36
37 def __hash__(self):
38 return hash(self.line)
39
40 def __eq__(self, other):
41 return self.line == other.line
42
43 def findpos(self, regexp):
44 """Iterate all (start, end) indices of matches"""
45 yield self.colstart, self.colend
46 p = self.colend
47 while p < len(self.line):
48 m = regexp.search(self.line, p)
49 if not m:
50 break
51 if m.end() == p:
52 p += 1
53 else:
54 yield m.span()
55 p = m.end()
56
57
58 def difflinestates(a, b):
59 sm = difflib.SequenceMatcher(None, a, b)
60 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
61 if tag == 'insert':
62 for i in pycompat.xrange(blo, bhi):
63 yield (b'+', b[i])
64 elif tag == 'delete':
65 for i in pycompat.xrange(alo, ahi):
66 yield (b'-', a[i])
67 elif tag == 'replace':
68 for i in pycompat.xrange(alo, ahi):
69 yield (b'-', a[i])
70 for i in pycompat.xrange(blo, bhi):
71 yield (b'+', b[i])
@@ -1,7828 +1,7771 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 import difflib
11 10 import errno
12 11 import os
13 12 import re
14 13 import sys
15 14
16 15 from .i18n import _
17 16 from .node import (
18 17 hex,
19 18 nullid,
20 19 nullrev,
21 20 short,
22 21 wdirhex,
23 22 wdirrev,
24 23 )
25 24 from .pycompat import open
26 25 from . import (
27 26 archival,
28 27 bookmarks,
29 28 bundle2,
30 29 changegroup,
31 30 cmdutil,
32 31 copies,
33 32 debugcommands as debugcommandsmod,
34 33 destutil,
35 34 dirstateguard,
36 35 discovery,
37 36 encoding,
38 37 error,
39 38 exchange,
40 39 extensions,
41 40 filemerge,
42 41 formatter,
43 42 graphmod,
43 grep as grepmod,
44 44 hbisect,
45 45 help,
46 46 hg,
47 47 logcmdutil,
48 48 match as matchmod,
49 49 merge as mergemod,
50 50 mergestate as mergestatemod,
51 51 narrowspec,
52 52 obsolete,
53 53 obsutil,
54 54 patch,
55 55 phases,
56 56 pycompat,
57 57 rcutil,
58 58 registrar,
59 59 requirements,
60 60 revsetlang,
61 61 rewriteutil,
62 62 scmutil,
63 63 server,
64 64 shelve as shelvemod,
65 65 state as statemod,
66 66 streamclone,
67 67 tags as tagsmod,
68 68 ui as uimod,
69 69 util,
70 70 verify as verifymod,
71 71 vfs as vfsmod,
72 72 wireprotoserver,
73 73 )
74 74 from .utils import (
75 75 dateutil,
76 76 stringutil,
77 77 )
78 78
79 79 table = {}
80 80 table.update(debugcommandsmod.command._table)
81 81
82 82 command = registrar.command(table)
83 83 INTENT_READONLY = registrar.INTENT_READONLY
84 84
85 85 # common command options
86 86
87 87 globalopts = [
88 88 (
89 89 b'R',
90 90 b'repository',
91 91 b'',
92 92 _(b'repository root directory or name of overlay bundle file'),
93 93 _(b'REPO'),
94 94 ),
95 95 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
96 96 (
97 97 b'y',
98 98 b'noninteractive',
99 99 None,
100 100 _(
101 101 b'do not prompt, automatically pick the first choice for all prompts'
102 102 ),
103 103 ),
104 104 (b'q', b'quiet', None, _(b'suppress output')),
105 105 (b'v', b'verbose', None, _(b'enable additional output')),
106 106 (
107 107 b'',
108 108 b'color',
109 109 b'',
110 110 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
111 111 # and should not be translated
112 112 _(b"when to colorize (boolean, always, auto, never, or debug)"),
113 113 _(b'TYPE'),
114 114 ),
115 115 (
116 116 b'',
117 117 b'config',
118 118 [],
119 119 _(b'set/override config option (use \'section.name=value\')'),
120 120 _(b'CONFIG'),
121 121 ),
122 122 (b'', b'debug', None, _(b'enable debugging output')),
123 123 (b'', b'debugger', None, _(b'start debugger')),
124 124 (
125 125 b'',
126 126 b'encoding',
127 127 encoding.encoding,
128 128 _(b'set the charset encoding'),
129 129 _(b'ENCODE'),
130 130 ),
131 131 (
132 132 b'',
133 133 b'encodingmode',
134 134 encoding.encodingmode,
135 135 _(b'set the charset encoding mode'),
136 136 _(b'MODE'),
137 137 ),
138 138 (b'', b'traceback', None, _(b'always print a traceback on exception')),
139 139 (b'', b'time', None, _(b'time how long the command takes')),
140 140 (b'', b'profile', None, _(b'print command execution profile')),
141 141 (b'', b'version', None, _(b'output version information and exit')),
142 142 (b'h', b'help', None, _(b'display help and exit')),
143 143 (b'', b'hidden', False, _(b'consider hidden changesets')),
144 144 (
145 145 b'',
146 146 b'pager',
147 147 b'auto',
148 148 _(b"when to paginate (boolean, always, auto, or never)"),
149 149 _(b'TYPE'),
150 150 ),
151 151 ]
152 152
153 153 dryrunopts = cmdutil.dryrunopts
154 154 remoteopts = cmdutil.remoteopts
155 155 walkopts = cmdutil.walkopts
156 156 commitopts = cmdutil.commitopts
157 157 commitopts2 = cmdutil.commitopts2
158 158 commitopts3 = cmdutil.commitopts3
159 159 formatteropts = cmdutil.formatteropts
160 160 templateopts = cmdutil.templateopts
161 161 logopts = cmdutil.logopts
162 162 diffopts = cmdutil.diffopts
163 163 diffwsopts = cmdutil.diffwsopts
164 164 diffopts2 = cmdutil.diffopts2
165 165 mergetoolopts = cmdutil.mergetoolopts
166 166 similarityopts = cmdutil.similarityopts
167 167 subrepoopts = cmdutil.subrepoopts
168 168 debugrevlogopts = cmdutil.debugrevlogopts
169 169
170 170 # Commands start here, listed alphabetically
171 171
172 172
173 173 @command(
174 174 b'abort',
175 175 dryrunopts,
176 176 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
177 177 helpbasic=True,
178 178 )
179 179 def abort(ui, repo, **opts):
180 180 """abort an unfinished operation (EXPERIMENTAL)
181 181
182 182 Aborts a multistep operation like graft, histedit, rebase, merge,
183 183 and unshelve if they are in an unfinished state.
184 184
185 185 use --dry-run/-n to dry run the command.
186 186 """
187 187 dryrun = opts.get('dry_run')
188 188 abortstate = cmdutil.getunfinishedstate(repo)
189 189 if not abortstate:
190 190 raise error.Abort(_(b'no operation in progress'))
191 191 if not abortstate.abortfunc:
192 192 raise error.Abort(
193 193 (
194 194 _(b"%s in progress but does not support 'hg abort'")
195 195 % (abortstate._opname)
196 196 ),
197 197 hint=abortstate.hint(),
198 198 )
199 199 if dryrun:
200 200 ui.status(
201 201 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
202 202 )
203 203 return
204 204 return abortstate.abortfunc(ui, repo)
205 205
206 206
207 207 @command(
208 208 b'add',
209 209 walkopts + subrepoopts + dryrunopts,
210 210 _(b'[OPTION]... [FILE]...'),
211 211 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
212 212 helpbasic=True,
213 213 inferrepo=True,
214 214 )
215 215 def add(ui, repo, *pats, **opts):
216 216 """add the specified files on the next commit
217 217
218 218 Schedule files to be version controlled and added to the
219 219 repository.
220 220
221 221 The files will be added to the repository at the next commit. To
222 222 undo an add before that, see :hg:`forget`.
223 223
224 224 If no names are given, add all files to the repository (except
225 225 files matching ``.hgignore``).
226 226
227 227 .. container:: verbose
228 228
229 229 Examples:
230 230
231 231 - New (unknown) files are added
232 232 automatically by :hg:`add`::
233 233
234 234 $ ls
235 235 foo.c
236 236 $ hg status
237 237 ? foo.c
238 238 $ hg add
239 239 adding foo.c
240 240 $ hg status
241 241 A foo.c
242 242
243 243 - Specific files to be added can be specified::
244 244
245 245 $ ls
246 246 bar.c foo.c
247 247 $ hg status
248 248 ? bar.c
249 249 ? foo.c
250 250 $ hg add bar.c
251 251 $ hg status
252 252 A bar.c
253 253 ? foo.c
254 254
255 255 Returns 0 if all files are successfully added.
256 256 """
257 257
258 258 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
259 259 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
260 260 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
261 261 return rejected and 1 or 0
262 262
263 263
264 264 @command(
265 265 b'addremove',
266 266 similarityopts + subrepoopts + walkopts + dryrunopts,
267 267 _(b'[OPTION]... [FILE]...'),
268 268 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
269 269 inferrepo=True,
270 270 )
271 271 def addremove(ui, repo, *pats, **opts):
272 272 """add all new files, delete all missing files
273 273
274 274 Add all new files and remove all missing files from the
275 275 repository.
276 276
277 277 Unless names are given, new files are ignored if they match any of
278 278 the patterns in ``.hgignore``. As with add, these changes take
279 279 effect at the next commit.
280 280
281 281 Use the -s/--similarity option to detect renamed files. This
282 282 option takes a percentage between 0 (disabled) and 100 (files must
283 283 be identical) as its parameter. With a parameter greater than 0,
284 284 this compares every removed file with every added file and records
285 285 those similar enough as renames. Detecting renamed files this way
286 286 can be expensive. After using this option, :hg:`status -C` can be
287 287 used to check which files were identified as moved or renamed. If
288 288 not specified, -s/--similarity defaults to 100 and only renames of
289 289 identical files are detected.
290 290
291 291 .. container:: verbose
292 292
293 293 Examples:
294 294
295 295 - A number of files (bar.c and foo.c) are new,
296 296 while foobar.c has been removed (without using :hg:`remove`)
297 297 from the repository::
298 298
299 299 $ ls
300 300 bar.c foo.c
301 301 $ hg status
302 302 ! foobar.c
303 303 ? bar.c
304 304 ? foo.c
305 305 $ hg addremove
306 306 adding bar.c
307 307 adding foo.c
308 308 removing foobar.c
309 309 $ hg status
310 310 A bar.c
311 311 A foo.c
312 312 R foobar.c
313 313
314 314 - A file foobar.c was moved to foo.c without using :hg:`rename`.
315 315 Afterwards, it was edited slightly::
316 316
317 317 $ ls
318 318 foo.c
319 319 $ hg status
320 320 ! foobar.c
321 321 ? foo.c
322 322 $ hg addremove --similarity 90
323 323 removing foobar.c
324 324 adding foo.c
325 325 recording removal of foobar.c as rename to foo.c (94% similar)
326 326 $ hg status -C
327 327 A foo.c
328 328 foobar.c
329 329 R foobar.c
330 330
331 331 Returns 0 if all files are successfully added.
332 332 """
333 333 opts = pycompat.byteskwargs(opts)
334 334 if not opts.get(b'similarity'):
335 335 opts[b'similarity'] = b'100'
336 336 matcher = scmutil.match(repo[None], pats, opts)
337 337 relative = scmutil.anypats(pats, opts)
338 338 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
339 339 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
340 340
341 341
342 342 @command(
343 343 b'annotate|blame',
344 344 [
345 345 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
346 346 (
347 347 b'',
348 348 b'follow',
349 349 None,
350 350 _(b'follow copies/renames and list the filename (DEPRECATED)'),
351 351 ),
352 352 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
353 353 (b'a', b'text', None, _(b'treat all files as text')),
354 354 (b'u', b'user', None, _(b'list the author (long with -v)')),
355 355 (b'f', b'file', None, _(b'list the filename')),
356 356 (b'd', b'date', None, _(b'list the date (short with -q)')),
357 357 (b'n', b'number', None, _(b'list the revision number (default)')),
358 358 (b'c', b'changeset', None, _(b'list the changeset')),
359 359 (
360 360 b'l',
361 361 b'line-number',
362 362 None,
363 363 _(b'show line number at the first appearance'),
364 364 ),
365 365 (
366 366 b'',
367 367 b'skip',
368 368 [],
369 369 _(b'revset to not display (EXPERIMENTAL)'),
370 370 _(b'REV'),
371 371 ),
372 372 ]
373 373 + diffwsopts
374 374 + walkopts
375 375 + formatteropts,
376 376 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
377 377 helpcategory=command.CATEGORY_FILE_CONTENTS,
378 378 helpbasic=True,
379 379 inferrepo=True,
380 380 )
381 381 def annotate(ui, repo, *pats, **opts):
382 382 """show changeset information by line for each file
383 383
384 384 List changes in files, showing the revision id responsible for
385 385 each line.
386 386
387 387 This command is useful for discovering when a change was made and
388 388 by whom.
389 389
390 390 If you include --file, --user, or --date, the revision number is
391 391 suppressed unless you also include --number.
392 392
393 393 Without the -a/--text option, annotate will avoid processing files
394 394 it detects as binary. With -a, annotate will annotate the file
395 395 anyway, although the results will probably be neither useful
396 396 nor desirable.
397 397
398 398 .. container:: verbose
399 399
400 400 Template:
401 401
402 402 The following keywords are supported in addition to the common template
403 403 keywords and functions. See also :hg:`help templates`.
404 404
405 405 :lines: List of lines with annotation data.
406 406 :path: String. Repository-absolute path of the specified file.
407 407
408 408 And each entry of ``{lines}`` provides the following sub-keywords in
409 409 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
410 410
411 411 :line: String. Line content.
412 412 :lineno: Integer. Line number at that revision.
413 413 :path: String. Repository-absolute path of the file at that revision.
414 414
415 415 See :hg:`help templates.operators` for the list expansion syntax.
416 416
417 417 Returns 0 on success.
418 418 """
419 419 opts = pycompat.byteskwargs(opts)
420 420 if not pats:
421 421 raise error.Abort(_(b'at least one filename or pattern is required'))
422 422
423 423 if opts.get(b'follow'):
424 424 # --follow is deprecated and now just an alias for -f/--file
425 425 # to mimic the behavior of Mercurial before version 1.5
426 426 opts[b'file'] = True
427 427
428 428 if (
429 429 not opts.get(b'user')
430 430 and not opts.get(b'changeset')
431 431 and not opts.get(b'date')
432 432 and not opts.get(b'file')
433 433 ):
434 434 opts[b'number'] = True
435 435
436 436 linenumber = opts.get(b'line_number') is not None
437 437 if (
438 438 linenumber
439 439 and (not opts.get(b'changeset'))
440 440 and (not opts.get(b'number'))
441 441 ):
442 442 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
443 443
444 444 rev = opts.get(b'rev')
445 445 if rev:
446 446 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
447 447 ctx = scmutil.revsingle(repo, rev)
448 448
449 449 ui.pager(b'annotate')
450 450 rootfm = ui.formatter(b'annotate', opts)
451 451 if ui.debugflag:
452 452 shorthex = pycompat.identity
453 453 else:
454 454
455 455 def shorthex(h):
456 456 return h[:12]
457 457
458 458 if ui.quiet:
459 459 datefunc = dateutil.shortdate
460 460 else:
461 461 datefunc = dateutil.datestr
462 462 if ctx.rev() is None:
463 463 if opts.get(b'changeset'):
464 464 # omit "+" suffix which is appended to node hex
465 465 def formatrev(rev):
466 466 if rev == wdirrev:
467 467 return b'%d' % ctx.p1().rev()
468 468 else:
469 469 return b'%d' % rev
470 470
471 471 else:
472 472
473 473 def formatrev(rev):
474 474 if rev == wdirrev:
475 475 return b'%d+' % ctx.p1().rev()
476 476 else:
477 477 return b'%d ' % rev
478 478
479 479 def formathex(h):
480 480 if h == wdirhex:
481 481 return b'%s+' % shorthex(hex(ctx.p1().node()))
482 482 else:
483 483 return b'%s ' % shorthex(h)
484 484
485 485 else:
486 486 formatrev = b'%d'.__mod__
487 487 formathex = shorthex
488 488
489 489 opmap = [
490 490 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
491 491 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
492 492 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
493 493 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
494 494 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
495 495 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
496 496 ]
497 497 opnamemap = {
498 498 b'rev': b'number',
499 499 b'node': b'changeset',
500 500 b'path': b'file',
501 501 b'lineno': b'line_number',
502 502 }
503 503
504 504 if rootfm.isplain():
505 505
506 506 def makefunc(get, fmt):
507 507 return lambda x: fmt(get(x))
508 508
509 509 else:
510 510
511 511 def makefunc(get, fmt):
512 512 return get
513 513
514 514 datahint = rootfm.datahint()
515 515 funcmap = [
516 516 (makefunc(get, fmt), sep)
517 517 for fn, sep, get, fmt in opmap
518 518 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
519 519 ]
520 520 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
521 521 fields = b' '.join(
522 522 fn
523 523 for fn, sep, get, fmt in opmap
524 524 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
525 525 )
526 526
527 527 def bad(x, y):
528 528 raise error.Abort(b"%s: %s" % (x, y))
529 529
530 530 m = scmutil.match(ctx, pats, opts, badfn=bad)
531 531
532 532 follow = not opts.get(b'no_follow')
533 533 diffopts = patch.difffeatureopts(
534 534 ui, opts, section=b'annotate', whitespace=True
535 535 )
536 536 skiprevs = opts.get(b'skip')
537 537 if skiprevs:
538 538 skiprevs = scmutil.revrange(repo, skiprevs)
539 539
540 540 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
541 541 for abs in ctx.walk(m):
542 542 fctx = ctx[abs]
543 543 rootfm.startitem()
544 544 rootfm.data(path=abs)
545 545 if not opts.get(b'text') and fctx.isbinary():
546 546 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
547 547 continue
548 548
549 549 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
550 550 lines = fctx.annotate(
551 551 follow=follow, skiprevs=skiprevs, diffopts=diffopts
552 552 )
553 553 if not lines:
554 554 fm.end()
555 555 continue
556 556 formats = []
557 557 pieces = []
558 558
559 559 for f, sep in funcmap:
560 560 l = [f(n) for n in lines]
561 561 if fm.isplain():
562 562 sizes = [encoding.colwidth(x) for x in l]
563 563 ml = max(sizes)
564 564 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
565 565 else:
566 566 formats.append([b'%s'] * len(l))
567 567 pieces.append(l)
568 568
569 569 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
570 570 fm.startitem()
571 571 fm.context(fctx=n.fctx)
572 572 fm.write(fields, b"".join(f), *p)
573 573 if n.skip:
574 574 fmt = b"* %s"
575 575 else:
576 576 fmt = b": %s"
577 577 fm.write(b'line', fmt, n.text)
578 578
579 579 if not lines[-1].text.endswith(b'\n'):
580 580 fm.plain(b'\n')
581 581 fm.end()
582 582
583 583 rootfm.end()
584 584
585 585
586 586 @command(
587 587 b'archive',
588 588 [
589 589 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
590 590 (
591 591 b'p',
592 592 b'prefix',
593 593 b'',
594 594 _(b'directory prefix for files in archive'),
595 595 _(b'PREFIX'),
596 596 ),
597 597 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
598 598 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
599 599 ]
600 600 + subrepoopts
601 601 + walkopts,
602 602 _(b'[OPTION]... DEST'),
603 603 helpcategory=command.CATEGORY_IMPORT_EXPORT,
604 604 )
605 605 def archive(ui, repo, dest, **opts):
606 606 '''create an unversioned archive of a repository revision
607 607
608 608 By default, the revision used is the parent of the working
609 609 directory; use -r/--rev to specify a different revision.
610 610
611 611 The archive type is automatically detected based on file
612 612 extension (to override, use -t/--type).
613 613
614 614 .. container:: verbose
615 615
616 616 Examples:
617 617
618 618 - create a zip file containing the 1.0 release::
619 619
620 620 hg archive -r 1.0 project-1.0.zip
621 621
622 622 - create a tarball excluding .hg files::
623 623
624 624 hg archive project.tar.gz -X ".hg*"
625 625
626 626 Valid types are:
627 627
628 628 :``files``: a directory full of files (default)
629 629 :``tar``: tar archive, uncompressed
630 630 :``tbz2``: tar archive, compressed using bzip2
631 631 :``tgz``: tar archive, compressed using gzip
632 632 :``txz``: tar archive, compressed using lzma (only in Python 3)
633 633 :``uzip``: zip archive, uncompressed
634 634 :``zip``: zip archive, compressed using deflate
635 635
636 636 The exact name of the destination archive or directory is given
637 637 using a format string; see :hg:`help export` for details.
638 638
639 639 Each member added to an archive file has a directory prefix
640 640 prepended. Use -p/--prefix to specify a format string for the
641 641 prefix. The default is the basename of the archive, with suffixes
642 642 removed.
643 643
644 644 Returns 0 on success.
645 645 '''
646 646
647 647 opts = pycompat.byteskwargs(opts)
648 648 rev = opts.get(b'rev')
649 649 if rev:
650 650 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
651 651 ctx = scmutil.revsingle(repo, rev)
652 652 if not ctx:
653 653 raise error.Abort(_(b'no working directory: please specify a revision'))
654 654 node = ctx.node()
655 655 dest = cmdutil.makefilename(ctx, dest)
656 656 if os.path.realpath(dest) == repo.root:
657 657 raise error.Abort(_(b'repository root cannot be destination'))
658 658
659 659 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
660 660 prefix = opts.get(b'prefix')
661 661
662 662 if dest == b'-':
663 663 if kind == b'files':
664 664 raise error.Abort(_(b'cannot archive plain files to stdout'))
665 665 dest = cmdutil.makefileobj(ctx, dest)
666 666 if not prefix:
667 667 prefix = os.path.basename(repo.root) + b'-%h'
668 668
669 669 prefix = cmdutil.makefilename(ctx, prefix)
670 670 match = scmutil.match(ctx, [], opts)
671 671 archival.archive(
672 672 repo,
673 673 dest,
674 674 node,
675 675 kind,
676 676 not opts.get(b'no_decode'),
677 677 match,
678 678 prefix,
679 679 subrepos=opts.get(b'subrepos'),
680 680 )
681 681
682 682
683 683 @command(
684 684 b'backout',
685 685 [
686 686 (
687 687 b'',
688 688 b'merge',
689 689 None,
690 690 _(b'merge with old dirstate parent after backout'),
691 691 ),
692 692 (
693 693 b'',
694 694 b'commit',
695 695 None,
696 696 _(b'commit if no conflicts were encountered (DEPRECATED)'),
697 697 ),
698 698 (b'', b'no-commit', None, _(b'do not commit')),
699 699 (
700 700 b'',
701 701 b'parent',
702 702 b'',
703 703 _(b'parent to choose when backing out merge (DEPRECATED)'),
704 704 _(b'REV'),
705 705 ),
706 706 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
707 707 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
708 708 ]
709 709 + mergetoolopts
710 710 + walkopts
711 711 + commitopts
712 712 + commitopts2,
713 713 _(b'[OPTION]... [-r] REV'),
714 714 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
715 715 )
716 716 def backout(ui, repo, node=None, rev=None, **opts):
717 717 '''reverse effect of earlier changeset
718 718
719 719 Prepare a new changeset with the effect of REV undone in the
720 720 current working directory. If no conflicts were encountered,
721 721 it will be committed immediately.
722 722
723 723 If REV is the parent of the working directory, then this new changeset
724 724 is committed automatically (unless --no-commit is specified).
725 725
726 726 .. note::
727 727
728 728 :hg:`backout` cannot be used to fix either an unwanted or
729 729 incorrect merge.
730 730
731 731 .. container:: verbose
732 732
733 733 Examples:
734 734
735 735 - Reverse the effect of the parent of the working directory.
736 736 This backout will be committed immediately::
737 737
738 738 hg backout -r .
739 739
740 740 - Reverse the effect of previous bad revision 23::
741 741
742 742 hg backout -r 23
743 743
744 744 - Reverse the effect of previous bad revision 23 and
745 745 leave changes uncommitted::
746 746
747 747 hg backout -r 23 --no-commit
748 748 hg commit -m "Backout revision 23"
749 749
750 750 By default, the pending changeset will have one parent,
751 751 maintaining a linear history. With --merge, the pending
752 752 changeset will instead have two parents: the old parent of the
753 753 working directory and a new child of REV that simply undoes REV.
754 754
755 755 Before version 1.7, the behavior without --merge was equivalent
756 756 to specifying --merge followed by :hg:`update --clean .` to
757 757 cancel the merge and leave the child of REV as a head to be
758 758 merged separately.
759 759
760 760 See :hg:`help dates` for a list of formats valid for -d/--date.
761 761
762 762 See :hg:`help revert` for a way to restore files to the state
763 763 of another revision.
764 764
765 765 Returns 0 on success, 1 if nothing to backout or there are unresolved
766 766 files.
767 767 '''
768 768 with repo.wlock(), repo.lock():
769 769 return _dobackout(ui, repo, node, rev, **opts)
770 770
771 771
772 772 def _dobackout(ui, repo, node=None, rev=None, **opts):
773 773 opts = pycompat.byteskwargs(opts)
774 774 if opts.get(b'commit') and opts.get(b'no_commit'):
775 775 raise error.Abort(_(b"cannot use --commit with --no-commit"))
776 776 if opts.get(b'merge') and opts.get(b'no_commit'):
777 777 raise error.Abort(_(b"cannot use --merge with --no-commit"))
778 778
779 779 if rev and node:
780 780 raise error.Abort(_(b"please specify just one revision"))
781 781
782 782 if not rev:
783 783 rev = node
784 784
785 785 if not rev:
786 786 raise error.Abort(_(b"please specify a revision to backout"))
787 787
788 788 date = opts.get(b'date')
789 789 if date:
790 790 opts[b'date'] = dateutil.parsedate(date)
791 791
792 792 cmdutil.checkunfinished(repo)
793 793 cmdutil.bailifchanged(repo)
794 794 ctx = scmutil.revsingle(repo, rev)
795 795 node = ctx.node()
796 796
797 797 op1, op2 = repo.dirstate.parents()
798 798 if not repo.changelog.isancestor(node, op1):
799 799 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
800 800
801 801 p1, p2 = repo.changelog.parents(node)
802 802 if p1 == nullid:
803 803 raise error.Abort(_(b'cannot backout a change with no parents'))
804 804 if p2 != nullid:
805 805 if not opts.get(b'parent'):
806 806 raise error.Abort(_(b'cannot backout a merge changeset'))
807 807 p = repo.lookup(opts[b'parent'])
808 808 if p not in (p1, p2):
809 809 raise error.Abort(
810 810 _(b'%s is not a parent of %s') % (short(p), short(node))
811 811 )
812 812 parent = p
813 813 else:
814 814 if opts.get(b'parent'):
815 815 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
816 816 parent = p1
817 817
818 818 # the backout should appear on the same branch
819 819 branch = repo.dirstate.branch()
820 820 bheads = repo.branchheads(branch)
821 821 rctx = scmutil.revsingle(repo, hex(parent))
822 822 if not opts.get(b'merge') and op1 != node:
823 823 with dirstateguard.dirstateguard(repo, b'backout'):
824 824 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
825 825 with ui.configoverride(overrides, b'backout'):
826 826 stats = mergemod.back_out(ctx, parent=repo[parent])
827 827 repo.setparents(op1, op2)
828 828 hg._showstats(repo, stats)
829 829 if stats.unresolvedcount:
830 830 repo.ui.status(
831 831 _(b"use 'hg resolve' to retry unresolved file merges\n")
832 832 )
833 833 return 1
834 834 else:
835 835 hg.clean(repo, node, show_stats=False)
836 836 repo.dirstate.setbranch(branch)
837 837 cmdutil.revert(ui, repo, rctx)
838 838
839 839 if opts.get(b'no_commit'):
840 840 msg = _(b"changeset %s backed out, don't forget to commit.\n")
841 841 ui.status(msg % short(node))
842 842 return 0
843 843
844 844 def commitfunc(ui, repo, message, match, opts):
845 845 editform = b'backout'
846 846 e = cmdutil.getcommiteditor(
847 847 editform=editform, **pycompat.strkwargs(opts)
848 848 )
849 849 if not message:
850 850 # we don't translate commit messages
851 851 message = b"Backed out changeset %s" % short(node)
852 852 e = cmdutil.getcommiteditor(edit=True, editform=editform)
853 853 return repo.commit(
854 854 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
855 855 )
856 856
857 857 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
858 858 if not newnode:
859 859 ui.status(_(b"nothing changed\n"))
860 860 return 1
861 861 cmdutil.commitstatus(repo, newnode, branch, bheads)
862 862
863 863 def nice(node):
864 864 return b'%d:%s' % (repo.changelog.rev(node), short(node))
865 865
866 866 ui.status(
867 867 _(b'changeset %s backs out changeset %s\n')
868 868 % (nice(repo.changelog.tip()), nice(node))
869 869 )
870 870 if opts.get(b'merge') and op1 != node:
871 871 hg.clean(repo, op1, show_stats=False)
872 872 ui.status(
873 873 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
874 874 )
875 875 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
876 876 with ui.configoverride(overrides, b'backout'):
877 877 return hg.merge(repo[b'tip'])
878 878 return 0
879 879
880 880
881 881 @command(
882 882 b'bisect',
883 883 [
884 884 (b'r', b'reset', False, _(b'reset bisect state')),
885 885 (b'g', b'good', False, _(b'mark changeset good')),
886 886 (b'b', b'bad', False, _(b'mark changeset bad')),
887 887 (b's', b'skip', False, _(b'skip testing changeset')),
888 888 (b'e', b'extend', False, _(b'extend the bisect range')),
889 889 (
890 890 b'c',
891 891 b'command',
892 892 b'',
893 893 _(b'use command to check changeset state'),
894 894 _(b'CMD'),
895 895 ),
896 896 (b'U', b'noupdate', False, _(b'do not update to target')),
897 897 ],
898 898 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
899 899 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
900 900 )
901 901 def bisect(
902 902 ui,
903 903 repo,
904 904 rev=None,
905 905 extra=None,
906 906 command=None,
907 907 reset=None,
908 908 good=None,
909 909 bad=None,
910 910 skip=None,
911 911 extend=None,
912 912 noupdate=None,
913 913 ):
914 914 """subdivision search of changesets
915 915
916 916 This command helps to find changesets which introduce problems. To
917 917 use, mark the earliest changeset you know exhibits the problem as
918 918 bad, then mark the latest changeset which is free from the problem
919 919 as good. Bisect will update your working directory to a revision
920 920 for testing (unless the -U/--noupdate option is specified). Once
921 921 you have performed tests, mark the working directory as good or
922 922 bad, and bisect will either update to another candidate changeset
923 923 or announce that it has found the bad revision.
924 924
925 925 As a shortcut, you can also use the revision argument to mark a
926 926 revision as good or bad without checking it out first.
927 927
928 928 If you supply a command, it will be used for automatic bisection.
929 929 The environment variable HG_NODE will contain the ID of the
930 930 changeset being tested. The exit status of the command will be
931 931 used to mark revisions as good or bad: status 0 means good, 125
932 932 means to skip the revision, 127 (command not found) will abort the
933 933 bisection, and any other non-zero exit status means the revision
934 934 is bad.
935 935
936 936 .. container:: verbose
937 937
938 938 Some examples:
939 939
940 940 - start a bisection with known bad revision 34, and good revision 12::
941 941
942 942 hg bisect --bad 34
943 943 hg bisect --good 12
944 944
945 945 - advance the current bisection by marking current revision as good or
946 946 bad::
947 947
948 948 hg bisect --good
949 949 hg bisect --bad
950 950
951 951 - mark the current revision, or a known revision, to be skipped (e.g. if
952 952 that revision is not usable because of another issue)::
953 953
954 954 hg bisect --skip
955 955 hg bisect --skip 23
956 956
957 957 - skip all revisions that do not touch directories ``foo`` or ``bar``::
958 958
959 959 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
960 960
961 961 - forget the current bisection::
962 962
963 963 hg bisect --reset
964 964
965 965 - use 'make && make tests' to automatically find the first broken
966 966 revision::
967 967
968 968 hg bisect --reset
969 969 hg bisect --bad 34
970 970 hg bisect --good 12
971 971 hg bisect --command "make && make tests"
972 972
973 973 - see all changesets whose states are already known in the current
974 974 bisection::
975 975
976 976 hg log -r "bisect(pruned)"
977 977
978 978 - see the changeset currently being bisected (especially useful
979 979 if running with -U/--noupdate)::
980 980
981 981 hg log -r "bisect(current)"
982 982
983 983 - see all changesets that took part in the current bisection::
984 984
985 985 hg log -r "bisect(range)"
986 986
987 987 - you can even get a nice graph::
988 988
989 989 hg log --graph -r "bisect(range)"
990 990
991 991 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
992 992
993 993 Returns 0 on success.
994 994 """
995 995 # backward compatibility
996 996 if rev in b"good bad reset init".split():
997 997 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
998 998 cmd, rev, extra = rev, extra, None
999 999 if cmd == b"good":
1000 1000 good = True
1001 1001 elif cmd == b"bad":
1002 1002 bad = True
1003 1003 else:
1004 1004 reset = True
1005 1005 elif extra:
1006 1006 raise error.Abort(_(b'incompatible arguments'))
1007 1007
1008 1008 incompatibles = {
1009 1009 b'--bad': bad,
1010 1010 b'--command': bool(command),
1011 1011 b'--extend': extend,
1012 1012 b'--good': good,
1013 1013 b'--reset': reset,
1014 1014 b'--skip': skip,
1015 1015 }
1016 1016
1017 1017 enabled = [x for x in incompatibles if incompatibles[x]]
1018 1018
1019 1019 if len(enabled) > 1:
1020 1020 raise error.Abort(
1021 1021 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1022 1022 )
1023 1023
1024 1024 if reset:
1025 1025 hbisect.resetstate(repo)
1026 1026 return
1027 1027
1028 1028 state = hbisect.load_state(repo)
1029 1029
1030 1030 # update state
1031 1031 if good or bad or skip:
1032 1032 if rev:
1033 1033 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1034 1034 else:
1035 1035 nodes = [repo.lookup(b'.')]
1036 1036 if good:
1037 1037 state[b'good'] += nodes
1038 1038 elif bad:
1039 1039 state[b'bad'] += nodes
1040 1040 elif skip:
1041 1041 state[b'skip'] += nodes
1042 1042 hbisect.save_state(repo, state)
1043 1043 if not (state[b'good'] and state[b'bad']):
1044 1044 return
1045 1045
1046 1046 def mayupdate(repo, node, show_stats=True):
1047 1047 """common used update sequence"""
1048 1048 if noupdate:
1049 1049 return
1050 1050 cmdutil.checkunfinished(repo)
1051 1051 cmdutil.bailifchanged(repo)
1052 1052 return hg.clean(repo, node, show_stats=show_stats)
1053 1053
1054 1054 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1055 1055
1056 1056 if command:
1057 1057 changesets = 1
1058 1058 if noupdate:
1059 1059 try:
1060 1060 node = state[b'current'][0]
1061 1061 except LookupError:
1062 1062 raise error.Abort(
1063 1063 _(
1064 1064 b'current bisect revision is unknown - '
1065 1065 b'start a new bisect to fix'
1066 1066 )
1067 1067 )
1068 1068 else:
1069 1069 node, p2 = repo.dirstate.parents()
1070 1070 if p2 != nullid:
1071 1071 raise error.Abort(_(b'current bisect revision is a merge'))
1072 1072 if rev:
1073 1073 node = repo[scmutil.revsingle(repo, rev, node)].node()
1074 1074 with hbisect.restore_state(repo, state, node):
1075 1075 while changesets:
1076 1076 # update state
1077 1077 state[b'current'] = [node]
1078 1078 hbisect.save_state(repo, state)
1079 1079 status = ui.system(
1080 1080 command,
1081 1081 environ={b'HG_NODE': hex(node)},
1082 1082 blockedtag=b'bisect_check',
1083 1083 )
1084 1084 if status == 125:
1085 1085 transition = b"skip"
1086 1086 elif status == 0:
1087 1087 transition = b"good"
1088 1088 # status < 0 means process was killed
1089 1089 elif status == 127:
1090 1090 raise error.Abort(_(b"failed to execute %s") % command)
1091 1091 elif status < 0:
1092 1092 raise error.Abort(_(b"%s killed") % command)
1093 1093 else:
1094 1094 transition = b"bad"
1095 1095 state[transition].append(node)
1096 1096 ctx = repo[node]
1097 1097 ui.status(
1098 1098 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1099 1099 )
1100 1100 hbisect.checkstate(state)
1101 1101 # bisect
1102 1102 nodes, changesets, bgood = hbisect.bisect(repo, state)
1103 1103 # update to next check
1104 1104 node = nodes[0]
1105 1105 mayupdate(repo, node, show_stats=False)
1106 1106 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1107 1107 return
1108 1108
1109 1109 hbisect.checkstate(state)
1110 1110
1111 1111 # actually bisect
1112 1112 nodes, changesets, good = hbisect.bisect(repo, state)
1113 1113 if extend:
1114 1114 if not changesets:
1115 1115 extendnode = hbisect.extendrange(repo, state, nodes, good)
1116 1116 if extendnode is not None:
1117 1117 ui.write(
1118 1118 _(b"Extending search to changeset %d:%s\n")
1119 1119 % (extendnode.rev(), extendnode)
1120 1120 )
1121 1121 state[b'current'] = [extendnode.node()]
1122 1122 hbisect.save_state(repo, state)
1123 1123 return mayupdate(repo, extendnode.node())
1124 1124 raise error.Abort(_(b"nothing to extend"))
1125 1125
1126 1126 if changesets == 0:
1127 1127 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1128 1128 else:
1129 1129 assert len(nodes) == 1 # only a single node can be tested next
1130 1130 node = nodes[0]
1131 1131 # compute the approximate number of remaining tests
1132 1132 tests, size = 0, 2
1133 1133 while size <= changesets:
1134 1134 tests, size = tests + 1, size * 2
1135 1135 rev = repo.changelog.rev(node)
1136 1136 ui.write(
1137 1137 _(
1138 1138 b"Testing changeset %d:%s "
1139 1139 b"(%d changesets remaining, ~%d tests)\n"
1140 1140 )
1141 1141 % (rev, short(node), changesets, tests)
1142 1142 )
1143 1143 state[b'current'] = [node]
1144 1144 hbisect.save_state(repo, state)
1145 1145 return mayupdate(repo, node)
1146 1146
1147 1147
1148 1148 @command(
1149 1149 b'bookmarks|bookmark',
1150 1150 [
1151 1151 (b'f', b'force', False, _(b'force')),
1152 1152 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1153 1153 (b'd', b'delete', False, _(b'delete a given bookmark')),
1154 1154 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1155 1155 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1156 1156 (b'l', b'list', False, _(b'list existing bookmarks')),
1157 1157 ]
1158 1158 + formatteropts,
1159 1159 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1160 1160 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1161 1161 )
1162 1162 def bookmark(ui, repo, *names, **opts):
1163 1163 '''create a new bookmark or list existing bookmarks
1164 1164
1165 1165 Bookmarks are labels on changesets to help track lines of development.
1166 1166 Bookmarks are unversioned and can be moved, renamed and deleted.
1167 1167 Deleting or moving a bookmark has no effect on the associated changesets.
1168 1168
1169 1169 Creating or updating to a bookmark causes it to be marked as 'active'.
1170 1170 The active bookmark is indicated with a '*'.
1171 1171 When a commit is made, the active bookmark will advance to the new commit.
1172 1172 A plain :hg:`update` will also advance an active bookmark, if possible.
1173 1173 Updating away from a bookmark will cause it to be deactivated.
1174 1174
1175 1175 Bookmarks can be pushed and pulled between repositories (see
1176 1176 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1177 1177 diverged, a new 'divergent bookmark' of the form 'name@path' will
1178 1178 be created. Using :hg:`merge` will resolve the divergence.
1179 1179
1180 1180 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1181 1181 the active bookmark's name.
1182 1182
1183 1183 A bookmark named '@' has the special property that :hg:`clone` will
1184 1184 check it out by default if it exists.
1185 1185
1186 1186 .. container:: verbose
1187 1187
1188 1188 Template:
1189 1189
1190 1190 The following keywords are supported in addition to the common template
1191 1191 keywords and functions such as ``{bookmark}``. See also
1192 1192 :hg:`help templates`.
1193 1193
1194 1194 :active: Boolean. True if the bookmark is active.
1195 1195
1196 1196 Examples:
1197 1197
1198 1198 - create an active bookmark for a new line of development::
1199 1199
1200 1200 hg book new-feature
1201 1201
1202 1202 - create an inactive bookmark as a place marker::
1203 1203
1204 1204 hg book -i reviewed
1205 1205
1206 1206 - create an inactive bookmark on another changeset::
1207 1207
1208 1208 hg book -r .^ tested
1209 1209
1210 1210 - rename bookmark turkey to dinner::
1211 1211
1212 1212 hg book -m turkey dinner
1213 1213
1214 1214 - move the '@' bookmark from another branch::
1215 1215
1216 1216 hg book -f @
1217 1217
1218 1218 - print only the active bookmark name::
1219 1219
1220 1220 hg book -ql .
1221 1221 '''
1222 1222 opts = pycompat.byteskwargs(opts)
1223 1223 force = opts.get(b'force')
1224 1224 rev = opts.get(b'rev')
1225 1225 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1226 1226
1227 1227 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1228 1228 if action:
1229 1229 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1230 1230 elif names or rev:
1231 1231 action = b'add'
1232 1232 elif inactive:
1233 1233 action = b'inactive' # meaning deactivate
1234 1234 else:
1235 1235 action = b'list'
1236 1236
1237 1237 cmdutil.check_incompatible_arguments(
1238 1238 opts, b'inactive', [b'delete', b'list']
1239 1239 )
1240 1240 if not names and action in {b'add', b'delete'}:
1241 1241 raise error.Abort(_(b"bookmark name required"))
1242 1242
1243 1243 if action in {b'add', b'delete', b'rename', b'inactive'}:
1244 1244 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1245 1245 if action == b'delete':
1246 1246 names = pycompat.maplist(repo._bookmarks.expandname, names)
1247 1247 bookmarks.delete(repo, tr, names)
1248 1248 elif action == b'rename':
1249 1249 if not names:
1250 1250 raise error.Abort(_(b"new bookmark name required"))
1251 1251 elif len(names) > 1:
1252 1252 raise error.Abort(_(b"only one new bookmark name allowed"))
1253 1253 oldname = repo._bookmarks.expandname(opts[b'rename'])
1254 1254 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1255 1255 elif action == b'add':
1256 1256 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1257 1257 elif action == b'inactive':
1258 1258 if len(repo._bookmarks) == 0:
1259 1259 ui.status(_(b"no bookmarks set\n"))
1260 1260 elif not repo._activebookmark:
1261 1261 ui.status(_(b"no active bookmark\n"))
1262 1262 else:
1263 1263 bookmarks.deactivate(repo)
1264 1264 elif action == b'list':
1265 1265 names = pycompat.maplist(repo._bookmarks.expandname, names)
1266 1266 with ui.formatter(b'bookmarks', opts) as fm:
1267 1267 bookmarks.printbookmarks(ui, repo, fm, names)
1268 1268 else:
1269 1269 raise error.ProgrammingError(b'invalid action: %s' % action)
1270 1270
1271 1271
1272 1272 @command(
1273 1273 b'branch',
1274 1274 [
1275 1275 (
1276 1276 b'f',
1277 1277 b'force',
1278 1278 None,
1279 1279 _(b'set branch name even if it shadows an existing branch'),
1280 1280 ),
1281 1281 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1282 1282 (
1283 1283 b'r',
1284 1284 b'rev',
1285 1285 [],
1286 1286 _(b'change branches of the given revs (EXPERIMENTAL)'),
1287 1287 ),
1288 1288 ],
1289 1289 _(b'[-fC] [NAME]'),
1290 1290 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1291 1291 )
1292 1292 def branch(ui, repo, label=None, **opts):
1293 1293 """set or show the current branch name
1294 1294
1295 1295 .. note::
1296 1296
1297 1297 Branch names are permanent and global. Use :hg:`bookmark` to create a
1298 1298 light-weight bookmark instead. See :hg:`help glossary` for more
1299 1299 information about named branches and bookmarks.
1300 1300
1301 1301 With no argument, show the current branch name. With one argument,
1302 1302 set the working directory branch name (the branch will not exist
1303 1303 in the repository until the next commit). Standard practice
1304 1304 recommends that primary development take place on the 'default'
1305 1305 branch.
1306 1306
1307 1307 Unless -f/--force is specified, branch will not let you set a
1308 1308 branch name that already exists.
1309 1309
1310 1310 Use -C/--clean to reset the working directory branch to that of
1311 1311 the parent of the working directory, negating a previous branch
1312 1312 change.
1313 1313
1314 1314 Use the command :hg:`update` to switch to an existing branch. Use
1315 1315 :hg:`commit --close-branch` to mark this branch head as closed.
1316 1316 When all heads of a branch are closed, the branch will be
1317 1317 considered closed.
1318 1318
1319 1319 Returns 0 on success.
1320 1320 """
1321 1321 opts = pycompat.byteskwargs(opts)
1322 1322 revs = opts.get(b'rev')
1323 1323 if label:
1324 1324 label = label.strip()
1325 1325
1326 1326 if not opts.get(b'clean') and not label:
1327 1327 if revs:
1328 1328 raise error.Abort(_(b"no branch name specified for the revisions"))
1329 1329 ui.write(b"%s\n" % repo.dirstate.branch())
1330 1330 return
1331 1331
1332 1332 with repo.wlock():
1333 1333 if opts.get(b'clean'):
1334 1334 label = repo[b'.'].branch()
1335 1335 repo.dirstate.setbranch(label)
1336 1336 ui.status(_(b'reset working directory to branch %s\n') % label)
1337 1337 elif label:
1338 1338
1339 1339 scmutil.checknewlabel(repo, label, b'branch')
1340 1340 if revs:
1341 1341 return cmdutil.changebranch(ui, repo, revs, label, opts)
1342 1342
1343 1343 if not opts.get(b'force') and label in repo.branchmap():
1344 1344 if label not in [p.branch() for p in repo[None].parents()]:
1345 1345 raise error.Abort(
1346 1346 _(b'a branch of the same name already exists'),
1347 1347 # i18n: "it" refers to an existing branch
1348 1348 hint=_(b"use 'hg update' to switch to it"),
1349 1349 )
1350 1350
1351 1351 repo.dirstate.setbranch(label)
1352 1352 ui.status(_(b'marked working directory as branch %s\n') % label)
1353 1353
1354 1354 # find any open named branches aside from default
1355 1355 for n, h, t, c in repo.branchmap().iterbranches():
1356 1356 if n != b"default" and not c:
1357 1357 return 0
1358 1358 ui.status(
1359 1359 _(
1360 1360 b'(branches are permanent and global, '
1361 1361 b'did you want a bookmark?)\n'
1362 1362 )
1363 1363 )
1364 1364
1365 1365
1366 1366 @command(
1367 1367 b'branches',
1368 1368 [
1369 1369 (
1370 1370 b'a',
1371 1371 b'active',
1372 1372 False,
1373 1373 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1374 1374 ),
1375 1375 (b'c', b'closed', False, _(b'show normal and closed branches')),
1376 1376 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1377 1377 ]
1378 1378 + formatteropts,
1379 1379 _(b'[-c]'),
1380 1380 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1381 1381 intents={INTENT_READONLY},
1382 1382 )
1383 1383 def branches(ui, repo, active=False, closed=False, **opts):
1384 1384 """list repository named branches
1385 1385
1386 1386 List the repository's named branches, indicating which ones are
1387 1387 inactive. If -c/--closed is specified, also list branches which have
1388 1388 been marked closed (see :hg:`commit --close-branch`).
1389 1389
1390 1390 Use the command :hg:`update` to switch to an existing branch.
1391 1391
1392 1392 .. container:: verbose
1393 1393
1394 1394 Template:
1395 1395
1396 1396 The following keywords are supported in addition to the common template
1397 1397 keywords and functions such as ``{branch}``. See also
1398 1398 :hg:`help templates`.
1399 1399
1400 1400 :active: Boolean. True if the branch is active.
1401 1401 :closed: Boolean. True if the branch is closed.
1402 1402 :current: Boolean. True if it is the current branch.
1403 1403
1404 1404 Returns 0.
1405 1405 """
1406 1406
1407 1407 opts = pycompat.byteskwargs(opts)
1408 1408 revs = opts.get(b'rev')
1409 1409 selectedbranches = None
1410 1410 if revs:
1411 1411 revs = scmutil.revrange(repo, revs)
1412 1412 getbi = repo.revbranchcache().branchinfo
1413 1413 selectedbranches = {getbi(r)[0] for r in revs}
1414 1414
1415 1415 ui.pager(b'branches')
1416 1416 fm = ui.formatter(b'branches', opts)
1417 1417 hexfunc = fm.hexfunc
1418 1418
1419 1419 allheads = set(repo.heads())
1420 1420 branches = []
1421 1421 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1422 1422 if selectedbranches is not None and tag not in selectedbranches:
1423 1423 continue
1424 1424 isactive = False
1425 1425 if not isclosed:
1426 1426 openheads = set(repo.branchmap().iteropen(heads))
1427 1427 isactive = bool(openheads & allheads)
1428 1428 branches.append((tag, repo[tip], isactive, not isclosed))
1429 1429 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1430 1430
1431 1431 for tag, ctx, isactive, isopen in branches:
1432 1432 if active and not isactive:
1433 1433 continue
1434 1434 if isactive:
1435 1435 label = b'branches.active'
1436 1436 notice = b''
1437 1437 elif not isopen:
1438 1438 if not closed:
1439 1439 continue
1440 1440 label = b'branches.closed'
1441 1441 notice = _(b' (closed)')
1442 1442 else:
1443 1443 label = b'branches.inactive'
1444 1444 notice = _(b' (inactive)')
1445 1445 current = tag == repo.dirstate.branch()
1446 1446 if current:
1447 1447 label = b'branches.current'
1448 1448
1449 1449 fm.startitem()
1450 1450 fm.write(b'branch', b'%s', tag, label=label)
1451 1451 rev = ctx.rev()
1452 1452 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1453 1453 fmt = b' ' * padsize + b' %d:%s'
1454 1454 fm.condwrite(
1455 1455 not ui.quiet,
1456 1456 b'rev node',
1457 1457 fmt,
1458 1458 rev,
1459 1459 hexfunc(ctx.node()),
1460 1460 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1461 1461 )
1462 1462 fm.context(ctx=ctx)
1463 1463 fm.data(active=isactive, closed=not isopen, current=current)
1464 1464 if not ui.quiet:
1465 1465 fm.plain(notice)
1466 1466 fm.plain(b'\n')
1467 1467 fm.end()
1468 1468
1469 1469
1470 1470 @command(
1471 1471 b'bundle',
1472 1472 [
1473 1473 (
1474 1474 b'f',
1475 1475 b'force',
1476 1476 None,
1477 1477 _(b'run even when the destination is unrelated'),
1478 1478 ),
1479 1479 (
1480 1480 b'r',
1481 1481 b'rev',
1482 1482 [],
1483 1483 _(b'a changeset intended to be added to the destination'),
1484 1484 _(b'REV'),
1485 1485 ),
1486 1486 (
1487 1487 b'b',
1488 1488 b'branch',
1489 1489 [],
1490 1490 _(b'a specific branch you would like to bundle'),
1491 1491 _(b'BRANCH'),
1492 1492 ),
1493 1493 (
1494 1494 b'',
1495 1495 b'base',
1496 1496 [],
1497 1497 _(b'a base changeset assumed to be available at the destination'),
1498 1498 _(b'REV'),
1499 1499 ),
1500 1500 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1501 1501 (
1502 1502 b't',
1503 1503 b'type',
1504 1504 b'bzip2',
1505 1505 _(b'bundle compression type to use'),
1506 1506 _(b'TYPE'),
1507 1507 ),
1508 1508 ]
1509 1509 + remoteopts,
1510 1510 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1511 1511 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1512 1512 )
1513 1513 def bundle(ui, repo, fname, dest=None, **opts):
1514 1514 """create a bundle file
1515 1515
1516 1516 Generate a bundle file containing data to be transferred to another
1517 1517 repository.
1518 1518
1519 1519 To create a bundle containing all changesets, use -a/--all
1520 1520 (or --base null). Otherwise, hg assumes the destination will have
1521 1521 all the nodes you specify with --base parameters. Otherwise, hg
1522 1522 will assume the repository has all the nodes in destination, or
1523 1523 default-push/default if no destination is specified, where destination
1524 1524 is the repository you provide through DEST option.
1525 1525
1526 1526 You can change bundle format with the -t/--type option. See
1527 1527 :hg:`help bundlespec` for documentation on this format. By default,
1528 1528 the most appropriate format is used and compression defaults to
1529 1529 bzip2.
1530 1530
1531 1531 The bundle file can then be transferred using conventional means
1532 1532 and applied to another repository with the unbundle or pull
1533 1533 command. This is useful when direct push and pull are not
1534 1534 available or when exporting an entire repository is undesirable.
1535 1535
1536 1536 Applying bundles preserves all changeset contents including
1537 1537 permissions, copy/rename information, and revision history.
1538 1538
1539 1539 Returns 0 on success, 1 if no changes found.
1540 1540 """
1541 1541 opts = pycompat.byteskwargs(opts)
1542 1542 revs = None
1543 1543 if b'rev' in opts:
1544 1544 revstrings = opts[b'rev']
1545 1545 revs = scmutil.revrange(repo, revstrings)
1546 1546 if revstrings and not revs:
1547 1547 raise error.Abort(_(b'no commits to bundle'))
1548 1548
1549 1549 bundletype = opts.get(b'type', b'bzip2').lower()
1550 1550 try:
1551 1551 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1552 1552 except error.UnsupportedBundleSpecification as e:
1553 1553 raise error.Abort(
1554 1554 pycompat.bytestr(e),
1555 1555 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1556 1556 )
1557 1557 cgversion = bundlespec.contentopts[b"cg.version"]
1558 1558
1559 1559 # Packed bundles are a pseudo bundle format for now.
1560 1560 if cgversion == b's1':
1561 1561 raise error.Abort(
1562 1562 _(b'packed bundles cannot be produced by "hg bundle"'),
1563 1563 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1564 1564 )
1565 1565
1566 1566 if opts.get(b'all'):
1567 1567 if dest:
1568 1568 raise error.Abort(
1569 1569 _(b"--all is incompatible with specifying a destination")
1570 1570 )
1571 1571 if opts.get(b'base'):
1572 1572 ui.warn(_(b"ignoring --base because --all was specified\n"))
1573 1573 base = [nullrev]
1574 1574 else:
1575 1575 base = scmutil.revrange(repo, opts.get(b'base'))
1576 1576 if cgversion not in changegroup.supportedoutgoingversions(repo):
1577 1577 raise error.Abort(
1578 1578 _(b"repository does not support bundle version %s") % cgversion
1579 1579 )
1580 1580
1581 1581 if base:
1582 1582 if dest:
1583 1583 raise error.Abort(
1584 1584 _(b"--base is incompatible with specifying a destination")
1585 1585 )
1586 1586 common = [repo[rev].node() for rev in base]
1587 1587 heads = [repo[r].node() for r in revs] if revs else None
1588 1588 outgoing = discovery.outgoing(repo, common, heads)
1589 1589 else:
1590 1590 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1591 1591 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1592 1592 other = hg.peer(repo, opts, dest)
1593 1593 revs = [repo[r].hex() for r in revs]
1594 1594 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1595 1595 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1596 1596 outgoing = discovery.findcommonoutgoing(
1597 1597 repo,
1598 1598 other,
1599 1599 onlyheads=heads,
1600 1600 force=opts.get(b'force'),
1601 1601 portable=True,
1602 1602 )
1603 1603
1604 1604 if not outgoing.missing:
1605 1605 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1606 1606 return 1
1607 1607
1608 1608 if cgversion == b'01': # bundle1
1609 1609 bversion = b'HG10' + bundlespec.wirecompression
1610 1610 bcompression = None
1611 1611 elif cgversion in (b'02', b'03'):
1612 1612 bversion = b'HG20'
1613 1613 bcompression = bundlespec.wirecompression
1614 1614 else:
1615 1615 raise error.ProgrammingError(
1616 1616 b'bundle: unexpected changegroup version %s' % cgversion
1617 1617 )
1618 1618
1619 1619 # TODO compression options should be derived from bundlespec parsing.
1620 1620 # This is a temporary hack to allow adjusting bundle compression
1621 1621 # level without a) formalizing the bundlespec changes to declare it
1622 1622 # b) introducing a command flag.
1623 1623 compopts = {}
1624 1624 complevel = ui.configint(
1625 1625 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1626 1626 )
1627 1627 if complevel is None:
1628 1628 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1629 1629 if complevel is not None:
1630 1630 compopts[b'level'] = complevel
1631 1631
1632 1632 # Allow overriding the bundling of obsmarker in phases through
1633 1633 # configuration while we don't have a bundle version that include them
1634 1634 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1635 1635 bundlespec.contentopts[b'obsolescence'] = True
1636 1636 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1637 1637 bundlespec.contentopts[b'phases'] = True
1638 1638
1639 1639 bundle2.writenewbundle(
1640 1640 ui,
1641 1641 repo,
1642 1642 b'bundle',
1643 1643 fname,
1644 1644 bversion,
1645 1645 outgoing,
1646 1646 bundlespec.contentopts,
1647 1647 compression=bcompression,
1648 1648 compopts=compopts,
1649 1649 )
1650 1650
1651 1651
1652 1652 @command(
1653 1653 b'cat',
1654 1654 [
1655 1655 (
1656 1656 b'o',
1657 1657 b'output',
1658 1658 b'',
1659 1659 _(b'print output to file with formatted name'),
1660 1660 _(b'FORMAT'),
1661 1661 ),
1662 1662 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1663 1663 (b'', b'decode', None, _(b'apply any matching decode filter')),
1664 1664 ]
1665 1665 + walkopts
1666 1666 + formatteropts,
1667 1667 _(b'[OPTION]... FILE...'),
1668 1668 helpcategory=command.CATEGORY_FILE_CONTENTS,
1669 1669 inferrepo=True,
1670 1670 intents={INTENT_READONLY},
1671 1671 )
1672 1672 def cat(ui, repo, file1, *pats, **opts):
1673 1673 """output the current or given revision of files
1674 1674
1675 1675 Print the specified files as they were at the given revision. If
1676 1676 no revision is given, the parent of the working directory is used.
1677 1677
1678 1678 Output may be to a file, in which case the name of the file is
1679 1679 given using a template string. See :hg:`help templates`. In addition
1680 1680 to the common template keywords, the following formatting rules are
1681 1681 supported:
1682 1682
1683 1683 :``%%``: literal "%" character
1684 1684 :``%s``: basename of file being printed
1685 1685 :``%d``: dirname of file being printed, or '.' if in repository root
1686 1686 :``%p``: root-relative path name of file being printed
1687 1687 :``%H``: changeset hash (40 hexadecimal digits)
1688 1688 :``%R``: changeset revision number
1689 1689 :``%h``: short-form changeset hash (12 hexadecimal digits)
1690 1690 :``%r``: zero-padded changeset revision number
1691 1691 :``%b``: basename of the exporting repository
1692 1692 :``\\``: literal "\\" character
1693 1693
1694 1694 .. container:: verbose
1695 1695
1696 1696 Template:
1697 1697
1698 1698 The following keywords are supported in addition to the common template
1699 1699 keywords and functions. See also :hg:`help templates`.
1700 1700
1701 1701 :data: String. File content.
1702 1702 :path: String. Repository-absolute path of the file.
1703 1703
1704 1704 Returns 0 on success.
1705 1705 """
1706 1706 opts = pycompat.byteskwargs(opts)
1707 1707 rev = opts.get(b'rev')
1708 1708 if rev:
1709 1709 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1710 1710 ctx = scmutil.revsingle(repo, rev)
1711 1711 m = scmutil.match(ctx, (file1,) + pats, opts)
1712 1712 fntemplate = opts.pop(b'output', b'')
1713 1713 if cmdutil.isstdiofilename(fntemplate):
1714 1714 fntemplate = b''
1715 1715
1716 1716 if fntemplate:
1717 1717 fm = formatter.nullformatter(ui, b'cat', opts)
1718 1718 else:
1719 1719 ui.pager(b'cat')
1720 1720 fm = ui.formatter(b'cat', opts)
1721 1721 with fm:
1722 1722 return cmdutil.cat(
1723 1723 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1724 1724 )
1725 1725
1726 1726
1727 1727 @command(
1728 1728 b'clone',
1729 1729 [
1730 1730 (
1731 1731 b'U',
1732 1732 b'noupdate',
1733 1733 None,
1734 1734 _(
1735 1735 b'the clone will include an empty working '
1736 1736 b'directory (only a repository)'
1737 1737 ),
1738 1738 ),
1739 1739 (
1740 1740 b'u',
1741 1741 b'updaterev',
1742 1742 b'',
1743 1743 _(b'revision, tag, or branch to check out'),
1744 1744 _(b'REV'),
1745 1745 ),
1746 1746 (
1747 1747 b'r',
1748 1748 b'rev',
1749 1749 [],
1750 1750 _(
1751 1751 b'do not clone everything, but include this changeset'
1752 1752 b' and its ancestors'
1753 1753 ),
1754 1754 _(b'REV'),
1755 1755 ),
1756 1756 (
1757 1757 b'b',
1758 1758 b'branch',
1759 1759 [],
1760 1760 _(
1761 1761 b'do not clone everything, but include this branch\'s'
1762 1762 b' changesets and their ancestors'
1763 1763 ),
1764 1764 _(b'BRANCH'),
1765 1765 ),
1766 1766 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1767 1767 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1768 1768 (b'', b'stream', None, _(b'clone with minimal data processing')),
1769 1769 ]
1770 1770 + remoteopts,
1771 1771 _(b'[OPTION]... SOURCE [DEST]'),
1772 1772 helpcategory=command.CATEGORY_REPO_CREATION,
1773 1773 helpbasic=True,
1774 1774 norepo=True,
1775 1775 )
1776 1776 def clone(ui, source, dest=None, **opts):
1777 1777 """make a copy of an existing repository
1778 1778
1779 1779 Create a copy of an existing repository in a new directory.
1780 1780
1781 1781 If no destination directory name is specified, it defaults to the
1782 1782 basename of the source.
1783 1783
1784 1784 The location of the source is added to the new repository's
1785 1785 ``.hg/hgrc`` file, as the default to be used for future pulls.
1786 1786
1787 1787 Only local paths and ``ssh://`` URLs are supported as
1788 1788 destinations. For ``ssh://`` destinations, no working directory or
1789 1789 ``.hg/hgrc`` will be created on the remote side.
1790 1790
1791 1791 If the source repository has a bookmark called '@' set, that
1792 1792 revision will be checked out in the new repository by default.
1793 1793
1794 1794 To check out a particular version, use -u/--update, or
1795 1795 -U/--noupdate to create a clone with no working directory.
1796 1796
1797 1797 To pull only a subset of changesets, specify one or more revisions
1798 1798 identifiers with -r/--rev or branches with -b/--branch. The
1799 1799 resulting clone will contain only the specified changesets and
1800 1800 their ancestors. These options (or 'clone src#rev dest') imply
1801 1801 --pull, even for local source repositories.
1802 1802
1803 1803 In normal clone mode, the remote normalizes repository data into a common
1804 1804 exchange format and the receiving end translates this data into its local
1805 1805 storage format. --stream activates a different clone mode that essentially
1806 1806 copies repository files from the remote with minimal data processing. This
1807 1807 significantly reduces the CPU cost of a clone both remotely and locally.
1808 1808 However, it often increases the transferred data size by 30-40%. This can
1809 1809 result in substantially faster clones where I/O throughput is plentiful,
1810 1810 especially for larger repositories. A side-effect of --stream clones is
1811 1811 that storage settings and requirements on the remote are applied locally:
1812 1812 a modern client may inherit legacy or inefficient storage used by the
1813 1813 remote or a legacy Mercurial client may not be able to clone from a
1814 1814 modern Mercurial remote.
1815 1815
1816 1816 .. note::
1817 1817
1818 1818 Specifying a tag will include the tagged changeset but not the
1819 1819 changeset containing the tag.
1820 1820
1821 1821 .. container:: verbose
1822 1822
1823 1823 For efficiency, hardlinks are used for cloning whenever the
1824 1824 source and destination are on the same filesystem (note this
1825 1825 applies only to the repository data, not to the working
1826 1826 directory). Some filesystems, such as AFS, implement hardlinking
1827 1827 incorrectly, but do not report errors. In these cases, use the
1828 1828 --pull option to avoid hardlinking.
1829 1829
1830 1830 Mercurial will update the working directory to the first applicable
1831 1831 revision from this list:
1832 1832
1833 1833 a) null if -U or the source repository has no changesets
1834 1834 b) if -u . and the source repository is local, the first parent of
1835 1835 the source repository's working directory
1836 1836 c) the changeset specified with -u (if a branch name, this means the
1837 1837 latest head of that branch)
1838 1838 d) the changeset specified with -r
1839 1839 e) the tipmost head specified with -b
1840 1840 f) the tipmost head specified with the url#branch source syntax
1841 1841 g) the revision marked with the '@' bookmark, if present
1842 1842 h) the tipmost head of the default branch
1843 1843 i) tip
1844 1844
1845 1845 When cloning from servers that support it, Mercurial may fetch
1846 1846 pre-generated data from a server-advertised URL or inline from the
1847 1847 same stream. When this is done, hooks operating on incoming changesets
1848 1848 and changegroups may fire more than once, once for each pre-generated
1849 1849 bundle and as well as for any additional remaining data. In addition,
1850 1850 if an error occurs, the repository may be rolled back to a partial
1851 1851 clone. This behavior may change in future releases.
1852 1852 See :hg:`help -e clonebundles` for more.
1853 1853
1854 1854 Examples:
1855 1855
1856 1856 - clone a remote repository to a new directory named hg/::
1857 1857
1858 1858 hg clone https://www.mercurial-scm.org/repo/hg/
1859 1859
1860 1860 - create a lightweight local clone::
1861 1861
1862 1862 hg clone project/ project-feature/
1863 1863
1864 1864 - clone from an absolute path on an ssh server (note double-slash)::
1865 1865
1866 1866 hg clone ssh://user@server//home/projects/alpha/
1867 1867
1868 1868 - do a streaming clone while checking out a specified version::
1869 1869
1870 1870 hg clone --stream http://server/repo -u 1.5
1871 1871
1872 1872 - create a repository without changesets after a particular revision::
1873 1873
1874 1874 hg clone -r 04e544 experimental/ good/
1875 1875
1876 1876 - clone (and track) a particular named branch::
1877 1877
1878 1878 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1879 1879
1880 1880 See :hg:`help urls` for details on specifying URLs.
1881 1881
1882 1882 Returns 0 on success.
1883 1883 """
1884 1884 opts = pycompat.byteskwargs(opts)
1885 1885 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1886 1886
1887 1887 # --include/--exclude can come from narrow or sparse.
1888 1888 includepats, excludepats = None, None
1889 1889
1890 1890 # hg.clone() differentiates between None and an empty set. So make sure
1891 1891 # patterns are sets if narrow is requested without patterns.
1892 1892 if opts.get(b'narrow'):
1893 1893 includepats = set()
1894 1894 excludepats = set()
1895 1895
1896 1896 if opts.get(b'include'):
1897 1897 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1898 1898 if opts.get(b'exclude'):
1899 1899 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1900 1900
1901 1901 r = hg.clone(
1902 1902 ui,
1903 1903 opts,
1904 1904 source,
1905 1905 dest,
1906 1906 pull=opts.get(b'pull'),
1907 1907 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1908 1908 revs=opts.get(b'rev'),
1909 1909 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1910 1910 branch=opts.get(b'branch'),
1911 1911 shareopts=opts.get(b'shareopts'),
1912 1912 storeincludepats=includepats,
1913 1913 storeexcludepats=excludepats,
1914 1914 depth=opts.get(b'depth') or None,
1915 1915 )
1916 1916
1917 1917 return r is None
1918 1918
1919 1919
1920 1920 @command(
1921 1921 b'commit|ci',
1922 1922 [
1923 1923 (
1924 1924 b'A',
1925 1925 b'addremove',
1926 1926 None,
1927 1927 _(b'mark new/missing files as added/removed before committing'),
1928 1928 ),
1929 1929 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1930 1930 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1931 1931 (b's', b'secret', None, _(b'use the secret phase for committing')),
1932 1932 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1933 1933 (
1934 1934 b'',
1935 1935 b'force-close-branch',
1936 1936 None,
1937 1937 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1938 1938 ),
1939 1939 (b'i', b'interactive', None, _(b'use interactive mode')),
1940 1940 ]
1941 1941 + walkopts
1942 1942 + commitopts
1943 1943 + commitopts2
1944 1944 + subrepoopts,
1945 1945 _(b'[OPTION]... [FILE]...'),
1946 1946 helpcategory=command.CATEGORY_COMMITTING,
1947 1947 helpbasic=True,
1948 1948 inferrepo=True,
1949 1949 )
1950 1950 def commit(ui, repo, *pats, **opts):
1951 1951 """commit the specified files or all outstanding changes
1952 1952
1953 1953 Commit changes to the given files into the repository. Unlike a
1954 1954 centralized SCM, this operation is a local operation. See
1955 1955 :hg:`push` for a way to actively distribute your changes.
1956 1956
1957 1957 If a list of files is omitted, all changes reported by :hg:`status`
1958 1958 will be committed.
1959 1959
1960 1960 If you are committing the result of a merge, do not provide any
1961 1961 filenames or -I/-X filters.
1962 1962
1963 1963 If no commit message is specified, Mercurial starts your
1964 1964 configured editor where you can enter a message. In case your
1965 1965 commit fails, you will find a backup of your message in
1966 1966 ``.hg/last-message.txt``.
1967 1967
1968 1968 The --close-branch flag can be used to mark the current branch
1969 1969 head closed. When all heads of a branch are closed, the branch
1970 1970 will be considered closed and no longer listed.
1971 1971
1972 1972 The --amend flag can be used to amend the parent of the
1973 1973 working directory with a new commit that contains the changes
1974 1974 in the parent in addition to those currently reported by :hg:`status`,
1975 1975 if there are any. The old commit is stored in a backup bundle in
1976 1976 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1977 1977 on how to restore it).
1978 1978
1979 1979 Message, user and date are taken from the amended commit unless
1980 1980 specified. When a message isn't specified on the command line,
1981 1981 the editor will open with the message of the amended commit.
1982 1982
1983 1983 It is not possible to amend public changesets (see :hg:`help phases`)
1984 1984 or changesets that have children.
1985 1985
1986 1986 See :hg:`help dates` for a list of formats valid for -d/--date.
1987 1987
1988 1988 Returns 0 on success, 1 if nothing changed.
1989 1989
1990 1990 .. container:: verbose
1991 1991
1992 1992 Examples:
1993 1993
1994 1994 - commit all files ending in .py::
1995 1995
1996 1996 hg commit --include "set:**.py"
1997 1997
1998 1998 - commit all non-binary files::
1999 1999
2000 2000 hg commit --exclude "set:binary()"
2001 2001
2002 2002 - amend the current commit and set the date to now::
2003 2003
2004 2004 hg commit --amend --date now
2005 2005 """
2006 2006 with repo.wlock(), repo.lock():
2007 2007 return _docommit(ui, repo, *pats, **opts)
2008 2008
2009 2009
2010 2010 def _docommit(ui, repo, *pats, **opts):
2011 2011 if opts.get('interactive'):
2012 2012 opts.pop('interactive')
2013 2013 ret = cmdutil.dorecord(
2014 2014 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2015 2015 )
2016 2016 # ret can be 0 (no changes to record) or the value returned by
2017 2017 # commit(), 1 if nothing changed or None on success.
2018 2018 return 1 if ret == 0 else ret
2019 2019
2020 2020 opts = pycompat.byteskwargs(opts)
2021 2021 if opts.get(b'subrepos'):
2022 2022 if opts.get(b'amend'):
2023 2023 raise error.Abort(_(b'cannot amend with --subrepos'))
2024 2024 # Let --subrepos on the command line override config setting.
2025 2025 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2026 2026
2027 2027 cmdutil.checkunfinished(repo, commit=True)
2028 2028
2029 2029 branch = repo[None].branch()
2030 2030 bheads = repo.branchheads(branch)
2031 2031
2032 2032 extra = {}
2033 2033 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2034 2034 extra[b'close'] = b'1'
2035 2035
2036 2036 if repo[b'.'].closesbranch():
2037 2037 raise error.Abort(
2038 2038 _(b'current revision is already a branch closing head')
2039 2039 )
2040 2040 elif not bheads:
2041 2041 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2042 2042 elif (
2043 2043 branch == repo[b'.'].branch()
2044 2044 and repo[b'.'].node() not in bheads
2045 2045 and not opts.get(b'force_close_branch')
2046 2046 ):
2047 2047 hint = _(
2048 2048 b'use --force-close-branch to close branch from a non-head'
2049 2049 b' changeset'
2050 2050 )
2051 2051 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2052 2052 elif opts.get(b'amend'):
2053 2053 if (
2054 2054 repo[b'.'].p1().branch() != branch
2055 2055 and repo[b'.'].p2().branch() != branch
2056 2056 ):
2057 2057 raise error.Abort(_(b'can only close branch heads'))
2058 2058
2059 2059 if opts.get(b'amend'):
2060 2060 if ui.configbool(b'ui', b'commitsubrepos'):
2061 2061 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2062 2062
2063 2063 old = repo[b'.']
2064 2064 rewriteutil.precheck(repo, [old.rev()], b'amend')
2065 2065
2066 2066 # Currently histedit gets confused if an amend happens while histedit
2067 2067 # is in progress. Since we have a checkunfinished command, we are
2068 2068 # temporarily honoring it.
2069 2069 #
2070 2070 # Note: eventually this guard will be removed. Please do not expect
2071 2071 # this behavior to remain.
2072 2072 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2073 2073 cmdutil.checkunfinished(repo)
2074 2074
2075 2075 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2076 2076 if node == old.node():
2077 2077 ui.status(_(b"nothing changed\n"))
2078 2078 return 1
2079 2079 else:
2080 2080
2081 2081 def commitfunc(ui, repo, message, match, opts):
2082 2082 overrides = {}
2083 2083 if opts.get(b'secret'):
2084 2084 overrides[(b'phases', b'new-commit')] = b'secret'
2085 2085
2086 2086 baseui = repo.baseui
2087 2087 with baseui.configoverride(overrides, b'commit'):
2088 2088 with ui.configoverride(overrides, b'commit'):
2089 2089 editform = cmdutil.mergeeditform(
2090 2090 repo[None], b'commit.normal'
2091 2091 )
2092 2092 editor = cmdutil.getcommiteditor(
2093 2093 editform=editform, **pycompat.strkwargs(opts)
2094 2094 )
2095 2095 return repo.commit(
2096 2096 message,
2097 2097 opts.get(b'user'),
2098 2098 opts.get(b'date'),
2099 2099 match,
2100 2100 editor=editor,
2101 2101 extra=extra,
2102 2102 )
2103 2103
2104 2104 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2105 2105
2106 2106 if not node:
2107 2107 stat = cmdutil.postcommitstatus(repo, pats, opts)
2108 2108 if stat.deleted:
2109 2109 ui.status(
2110 2110 _(
2111 2111 b"nothing changed (%d missing files, see "
2112 2112 b"'hg status')\n"
2113 2113 )
2114 2114 % len(stat.deleted)
2115 2115 )
2116 2116 else:
2117 2117 ui.status(_(b"nothing changed\n"))
2118 2118 return 1
2119 2119
2120 2120 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2121 2121
2122 2122 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2123 2123 status(
2124 2124 ui,
2125 2125 repo,
2126 2126 modified=True,
2127 2127 added=True,
2128 2128 removed=True,
2129 2129 deleted=True,
2130 2130 unknown=True,
2131 2131 subrepos=opts.get(b'subrepos'),
2132 2132 )
2133 2133
2134 2134
2135 2135 @command(
2136 2136 b'config|showconfig|debugconfig',
2137 2137 [
2138 2138 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2139 2139 (b'e', b'edit', None, _(b'edit user config')),
2140 2140 (b'l', b'local', None, _(b'edit repository config')),
2141 2141 (
2142 2142 b'',
2143 2143 b'shared',
2144 2144 None,
2145 2145 _(b'edit shared source repository config (EXPERIMENTAL)'),
2146 2146 ),
2147 2147 (b'g', b'global', None, _(b'edit global config')),
2148 2148 ]
2149 2149 + formatteropts,
2150 2150 _(b'[-u] [NAME]...'),
2151 2151 helpcategory=command.CATEGORY_HELP,
2152 2152 optionalrepo=True,
2153 2153 intents={INTENT_READONLY},
2154 2154 )
2155 2155 def config(ui, repo, *values, **opts):
2156 2156 """show combined config settings from all hgrc files
2157 2157
2158 2158 With no arguments, print names and values of all config items.
2159 2159
2160 2160 With one argument of the form section.name, print just the value
2161 2161 of that config item.
2162 2162
2163 2163 With multiple arguments, print names and values of all config
2164 2164 items with matching section names or section.names.
2165 2165
2166 2166 With --edit, start an editor on the user-level config file. With
2167 2167 --global, edit the system-wide config file. With --local, edit the
2168 2168 repository-level config file.
2169 2169
2170 2170 With --debug, the source (filename and line number) is printed
2171 2171 for each config item.
2172 2172
2173 2173 See :hg:`help config` for more information about config files.
2174 2174
2175 2175 .. container:: verbose
2176 2176
2177 2177 Template:
2178 2178
2179 2179 The following keywords are supported. See also :hg:`help templates`.
2180 2180
2181 2181 :name: String. Config name.
2182 2182 :source: String. Filename and line number where the item is defined.
2183 2183 :value: String. Config value.
2184 2184
2185 2185 The --shared flag can be used to edit the config file of shared source
2186 2186 repository. It only works when you have shared using the experimental
2187 2187 share safe feature.
2188 2188
2189 2189 Returns 0 on success, 1 if NAME does not exist.
2190 2190
2191 2191 """
2192 2192
2193 2193 opts = pycompat.byteskwargs(opts)
2194 2194 editopts = (b'edit', b'local', b'global', b'shared')
2195 2195 if any(opts.get(o) for o in editopts):
2196 2196 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2197 2197 if opts.get(b'local'):
2198 2198 if not repo:
2199 2199 raise error.Abort(_(b"can't use --local outside a repository"))
2200 2200 paths = [repo.vfs.join(b'hgrc')]
2201 2201 elif opts.get(b'global'):
2202 2202 paths = rcutil.systemrcpath()
2203 2203 elif opts.get(b'shared'):
2204 2204 if not repo.shared():
2205 2205 raise error.Abort(
2206 2206 _(b"repository is not shared; can't use --shared")
2207 2207 )
2208 2208 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2209 2209 raise error.Abort(
2210 2210 _(
2211 2211 b"share safe feature not unabled; "
2212 2212 b"unable to edit shared source repository config"
2213 2213 )
2214 2214 )
2215 2215 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2216 2216 else:
2217 2217 paths = rcutil.userrcpath()
2218 2218
2219 2219 for f in paths:
2220 2220 if os.path.exists(f):
2221 2221 break
2222 2222 else:
2223 2223 if opts.get(b'global'):
2224 2224 samplehgrc = uimod.samplehgrcs[b'global']
2225 2225 elif opts.get(b'local'):
2226 2226 samplehgrc = uimod.samplehgrcs[b'local']
2227 2227 else:
2228 2228 samplehgrc = uimod.samplehgrcs[b'user']
2229 2229
2230 2230 f = paths[0]
2231 2231 fp = open(f, b"wb")
2232 2232 fp.write(util.tonativeeol(samplehgrc))
2233 2233 fp.close()
2234 2234
2235 2235 editor = ui.geteditor()
2236 2236 ui.system(
2237 2237 b"%s \"%s\"" % (editor, f),
2238 2238 onerr=error.Abort,
2239 2239 errprefix=_(b"edit failed"),
2240 2240 blockedtag=b'config_edit',
2241 2241 )
2242 2242 return
2243 2243 ui.pager(b'config')
2244 2244 fm = ui.formatter(b'config', opts)
2245 2245 for t, f in rcutil.rccomponents():
2246 2246 if t == b'path':
2247 2247 ui.debug(b'read config from: %s\n' % f)
2248 2248 elif t == b'resource':
2249 2249 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2250 2250 elif t == b'items':
2251 2251 # Don't print anything for 'items'.
2252 2252 pass
2253 2253 else:
2254 2254 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2255 2255 untrusted = bool(opts.get(b'untrusted'))
2256 2256
2257 2257 selsections = selentries = []
2258 2258 if values:
2259 2259 selsections = [v for v in values if b'.' not in v]
2260 2260 selentries = [v for v in values if b'.' in v]
2261 2261 uniquesel = len(selentries) == 1 and not selsections
2262 2262 selsections = set(selsections)
2263 2263 selentries = set(selentries)
2264 2264
2265 2265 matched = False
2266 2266 for section, name, value in ui.walkconfig(untrusted=untrusted):
2267 2267 source = ui.configsource(section, name, untrusted)
2268 2268 value = pycompat.bytestr(value)
2269 2269 defaultvalue = ui.configdefault(section, name)
2270 2270 if fm.isplain():
2271 2271 source = source or b'none'
2272 2272 value = value.replace(b'\n', b'\\n')
2273 2273 entryname = section + b'.' + name
2274 2274 if values and not (section in selsections or entryname in selentries):
2275 2275 continue
2276 2276 fm.startitem()
2277 2277 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2278 2278 if uniquesel:
2279 2279 fm.data(name=entryname)
2280 2280 fm.write(b'value', b'%s\n', value)
2281 2281 else:
2282 2282 fm.write(b'name value', b'%s=%s\n', entryname, value)
2283 2283 if formatter.isprintable(defaultvalue):
2284 2284 fm.data(defaultvalue=defaultvalue)
2285 2285 elif isinstance(defaultvalue, list) and all(
2286 2286 formatter.isprintable(e) for e in defaultvalue
2287 2287 ):
2288 2288 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2289 2289 # TODO: no idea how to process unsupported defaultvalue types
2290 2290 matched = True
2291 2291 fm.end()
2292 2292 if matched:
2293 2293 return 0
2294 2294 return 1
2295 2295
2296 2296
2297 2297 @command(
2298 2298 b'continue',
2299 2299 dryrunopts,
2300 2300 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2301 2301 helpbasic=True,
2302 2302 )
2303 2303 def continuecmd(ui, repo, **opts):
2304 2304 """resumes an interrupted operation (EXPERIMENTAL)
2305 2305
2306 2306 Finishes a multistep operation like graft, histedit, rebase, merge,
2307 2307 and unshelve if they are in an interrupted state.
2308 2308
2309 2309 use --dry-run/-n to dry run the command.
2310 2310 """
2311 2311 dryrun = opts.get('dry_run')
2312 2312 contstate = cmdutil.getunfinishedstate(repo)
2313 2313 if not contstate:
2314 2314 raise error.Abort(_(b'no operation in progress'))
2315 2315 if not contstate.continuefunc:
2316 2316 raise error.Abort(
2317 2317 (
2318 2318 _(b"%s in progress but does not support 'hg continue'")
2319 2319 % (contstate._opname)
2320 2320 ),
2321 2321 hint=contstate.continuemsg(),
2322 2322 )
2323 2323 if dryrun:
2324 2324 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2325 2325 return
2326 2326 return contstate.continuefunc(ui, repo)
2327 2327
2328 2328
2329 2329 @command(
2330 2330 b'copy|cp',
2331 2331 [
2332 2332 (b'', b'forget', None, _(b'unmark a file as copied')),
2333 2333 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2334 2334 (
2335 2335 b'',
2336 2336 b'at-rev',
2337 2337 b'',
2338 2338 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2339 2339 _(b'REV'),
2340 2340 ),
2341 2341 (
2342 2342 b'f',
2343 2343 b'force',
2344 2344 None,
2345 2345 _(b'forcibly copy over an existing managed file'),
2346 2346 ),
2347 2347 ]
2348 2348 + walkopts
2349 2349 + dryrunopts,
2350 2350 _(b'[OPTION]... SOURCE... DEST'),
2351 2351 helpcategory=command.CATEGORY_FILE_CONTENTS,
2352 2352 )
2353 2353 def copy(ui, repo, *pats, **opts):
2354 2354 """mark files as copied for the next commit
2355 2355
2356 2356 Mark dest as having copies of source files. If dest is a
2357 2357 directory, copies are put in that directory. If dest is a file,
2358 2358 the source must be a single file.
2359 2359
2360 2360 By default, this command copies the contents of files as they
2361 2361 exist in the working directory. If invoked with -A/--after, the
2362 2362 operation is recorded, but no copying is performed.
2363 2363
2364 2364 To undo marking a file as copied, use --forget. With that option,
2365 2365 all given (positional) arguments are unmarked as copies. The destination
2366 2366 file(s) will be left in place (still tracked).
2367 2367
2368 2368 This command takes effect with the next commit by default.
2369 2369
2370 2370 Returns 0 on success, 1 if errors are encountered.
2371 2371 """
2372 2372 opts = pycompat.byteskwargs(opts)
2373 2373 with repo.wlock():
2374 2374 return cmdutil.copy(ui, repo, pats, opts)
2375 2375
2376 2376
2377 2377 @command(
2378 2378 b'debugcommands',
2379 2379 [],
2380 2380 _(b'[COMMAND]'),
2381 2381 helpcategory=command.CATEGORY_HELP,
2382 2382 norepo=True,
2383 2383 )
2384 2384 def debugcommands(ui, cmd=b'', *args):
2385 2385 """list all available commands and options"""
2386 2386 for cmd, vals in sorted(pycompat.iteritems(table)):
2387 2387 cmd = cmd.split(b'|')[0]
2388 2388 opts = b', '.join([i[1] for i in vals[1]])
2389 2389 ui.write(b'%s: %s\n' % (cmd, opts))
2390 2390
2391 2391
2392 2392 @command(
2393 2393 b'debugcomplete',
2394 2394 [(b'o', b'options', None, _(b'show the command options'))],
2395 2395 _(b'[-o] CMD'),
2396 2396 helpcategory=command.CATEGORY_HELP,
2397 2397 norepo=True,
2398 2398 )
2399 2399 def debugcomplete(ui, cmd=b'', **opts):
2400 2400 """returns the completion list associated with the given command"""
2401 2401
2402 2402 if opts.get('options'):
2403 2403 options = []
2404 2404 otables = [globalopts]
2405 2405 if cmd:
2406 2406 aliases, entry = cmdutil.findcmd(cmd, table, False)
2407 2407 otables.append(entry[1])
2408 2408 for t in otables:
2409 2409 for o in t:
2410 2410 if b"(DEPRECATED)" in o[3]:
2411 2411 continue
2412 2412 if o[0]:
2413 2413 options.append(b'-%s' % o[0])
2414 2414 options.append(b'--%s' % o[1])
2415 2415 ui.write(b"%s\n" % b"\n".join(options))
2416 2416 return
2417 2417
2418 2418 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2419 2419 if ui.verbose:
2420 2420 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2421 2421 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2422 2422
2423 2423
2424 2424 @command(
2425 2425 b'diff',
2426 2426 [
2427 2427 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2428 2428 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2429 2429 ]
2430 2430 + diffopts
2431 2431 + diffopts2
2432 2432 + walkopts
2433 2433 + subrepoopts,
2434 2434 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2435 2435 helpcategory=command.CATEGORY_FILE_CONTENTS,
2436 2436 helpbasic=True,
2437 2437 inferrepo=True,
2438 2438 intents={INTENT_READONLY},
2439 2439 )
2440 2440 def diff(ui, repo, *pats, **opts):
2441 2441 """diff repository (or selected files)
2442 2442
2443 2443 Show differences between revisions for the specified files.
2444 2444
2445 2445 Differences between files are shown using the unified diff format.
2446 2446
2447 2447 .. note::
2448 2448
2449 2449 :hg:`diff` may generate unexpected results for merges, as it will
2450 2450 default to comparing against the working directory's first
2451 2451 parent changeset if no revisions are specified.
2452 2452
2453 2453 When two revision arguments are given, then changes are shown
2454 2454 between those revisions. If only one revision is specified then
2455 2455 that revision is compared to the working directory, and, when no
2456 2456 revisions are specified, the working directory files are compared
2457 2457 to its first parent.
2458 2458
2459 2459 Alternatively you can specify -c/--change with a revision to see
2460 2460 the changes in that changeset relative to its first parent.
2461 2461
2462 2462 Without the -a/--text option, diff will avoid generating diffs of
2463 2463 files it detects as binary. With -a, diff will generate a diff
2464 2464 anyway, probably with undesirable results.
2465 2465
2466 2466 Use the -g/--git option to generate diffs in the git extended diff
2467 2467 format. For more information, read :hg:`help diffs`.
2468 2468
2469 2469 .. container:: verbose
2470 2470
2471 2471 Examples:
2472 2472
2473 2473 - compare a file in the current working directory to its parent::
2474 2474
2475 2475 hg diff foo.c
2476 2476
2477 2477 - compare two historical versions of a directory, with rename info::
2478 2478
2479 2479 hg diff --git -r 1.0:1.2 lib/
2480 2480
2481 2481 - get change stats relative to the last change on some date::
2482 2482
2483 2483 hg diff --stat -r "date('may 2')"
2484 2484
2485 2485 - diff all newly-added files that contain a keyword::
2486 2486
2487 2487 hg diff "set:added() and grep(GNU)"
2488 2488
2489 2489 - compare a revision and its parents::
2490 2490
2491 2491 hg diff -c 9353 # compare against first parent
2492 2492 hg diff -r 9353^:9353 # same using revset syntax
2493 2493 hg diff -r 9353^2:9353 # compare against the second parent
2494 2494
2495 2495 Returns 0 on success.
2496 2496 """
2497 2497
2498 2498 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2499 2499 opts = pycompat.byteskwargs(opts)
2500 2500 revs = opts.get(b'rev')
2501 2501 change = opts.get(b'change')
2502 2502 stat = opts.get(b'stat')
2503 2503 reverse = opts.get(b'reverse')
2504 2504
2505 2505 if change:
2506 2506 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2507 2507 ctx2 = scmutil.revsingle(repo, change, None)
2508 2508 ctx1 = ctx2.p1()
2509 2509 else:
2510 2510 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2511 2511 ctx1, ctx2 = scmutil.revpair(repo, revs)
2512 2512
2513 2513 if reverse:
2514 2514 ctxleft = ctx2
2515 2515 ctxright = ctx1
2516 2516 else:
2517 2517 ctxleft = ctx1
2518 2518 ctxright = ctx2
2519 2519
2520 2520 diffopts = patch.diffallopts(ui, opts)
2521 2521 m = scmutil.match(ctx2, pats, opts)
2522 2522 m = repo.narrowmatch(m)
2523 2523 ui.pager(b'diff')
2524 2524 logcmdutil.diffordiffstat(
2525 2525 ui,
2526 2526 repo,
2527 2527 diffopts,
2528 2528 ctxleft,
2529 2529 ctxright,
2530 2530 m,
2531 2531 stat=stat,
2532 2532 listsubrepos=opts.get(b'subrepos'),
2533 2533 root=opts.get(b'root'),
2534 2534 )
2535 2535
2536 2536
2537 2537 @command(
2538 2538 b'export',
2539 2539 [
2540 2540 (
2541 2541 b'B',
2542 2542 b'bookmark',
2543 2543 b'',
2544 2544 _(b'export changes only reachable by given bookmark'),
2545 2545 _(b'BOOKMARK'),
2546 2546 ),
2547 2547 (
2548 2548 b'o',
2549 2549 b'output',
2550 2550 b'',
2551 2551 _(b'print output to file with formatted name'),
2552 2552 _(b'FORMAT'),
2553 2553 ),
2554 2554 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2555 2555 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2556 2556 ]
2557 2557 + diffopts
2558 2558 + formatteropts,
2559 2559 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2560 2560 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2561 2561 helpbasic=True,
2562 2562 intents={INTENT_READONLY},
2563 2563 )
2564 2564 def export(ui, repo, *changesets, **opts):
2565 2565 """dump the header and diffs for one or more changesets
2566 2566
2567 2567 Print the changeset header and diffs for one or more revisions.
2568 2568 If no revision is given, the parent of the working directory is used.
2569 2569
2570 2570 The information shown in the changeset header is: author, date,
2571 2571 branch name (if non-default), changeset hash, parent(s) and commit
2572 2572 comment.
2573 2573
2574 2574 .. note::
2575 2575
2576 2576 :hg:`export` may generate unexpected diff output for merge
2577 2577 changesets, as it will compare the merge changeset against its
2578 2578 first parent only.
2579 2579
2580 2580 Output may be to a file, in which case the name of the file is
2581 2581 given using a template string. See :hg:`help templates`. In addition
2582 2582 to the common template keywords, the following formatting rules are
2583 2583 supported:
2584 2584
2585 2585 :``%%``: literal "%" character
2586 2586 :``%H``: changeset hash (40 hexadecimal digits)
2587 2587 :``%N``: number of patches being generated
2588 2588 :``%R``: changeset revision number
2589 2589 :``%b``: basename of the exporting repository
2590 2590 :``%h``: short-form changeset hash (12 hexadecimal digits)
2591 2591 :``%m``: first line of the commit message (only alphanumeric characters)
2592 2592 :``%n``: zero-padded sequence number, starting at 1
2593 2593 :``%r``: zero-padded changeset revision number
2594 2594 :``\\``: literal "\\" character
2595 2595
2596 2596 Without the -a/--text option, export will avoid generating diffs
2597 2597 of files it detects as binary. With -a, export will generate a
2598 2598 diff anyway, probably with undesirable results.
2599 2599
2600 2600 With -B/--bookmark changesets reachable by the given bookmark are
2601 2601 selected.
2602 2602
2603 2603 Use the -g/--git option to generate diffs in the git extended diff
2604 2604 format. See :hg:`help diffs` for more information.
2605 2605
2606 2606 With the --switch-parent option, the diff will be against the
2607 2607 second parent. It can be useful to review a merge.
2608 2608
2609 2609 .. container:: verbose
2610 2610
2611 2611 Template:
2612 2612
2613 2613 The following keywords are supported in addition to the common template
2614 2614 keywords and functions. See also :hg:`help templates`.
2615 2615
2616 2616 :diff: String. Diff content.
2617 2617 :parents: List of strings. Parent nodes of the changeset.
2618 2618
2619 2619 Examples:
2620 2620
2621 2621 - use export and import to transplant a bugfix to the current
2622 2622 branch::
2623 2623
2624 2624 hg export -r 9353 | hg import -
2625 2625
2626 2626 - export all the changesets between two revisions to a file with
2627 2627 rename information::
2628 2628
2629 2629 hg export --git -r 123:150 > changes.txt
2630 2630
2631 2631 - split outgoing changes into a series of patches with
2632 2632 descriptive names::
2633 2633
2634 2634 hg export -r "outgoing()" -o "%n-%m.patch"
2635 2635
2636 2636 Returns 0 on success.
2637 2637 """
2638 2638 opts = pycompat.byteskwargs(opts)
2639 2639 bookmark = opts.get(b'bookmark')
2640 2640 changesets += tuple(opts.get(b'rev', []))
2641 2641
2642 2642 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2643 2643
2644 2644 if bookmark:
2645 2645 if bookmark not in repo._bookmarks:
2646 2646 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2647 2647
2648 2648 revs = scmutil.bookmarkrevs(repo, bookmark)
2649 2649 else:
2650 2650 if not changesets:
2651 2651 changesets = [b'.']
2652 2652
2653 2653 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2654 2654 revs = scmutil.revrange(repo, changesets)
2655 2655
2656 2656 if not revs:
2657 2657 raise error.Abort(_(b"export requires at least one changeset"))
2658 2658 if len(revs) > 1:
2659 2659 ui.note(_(b'exporting patches:\n'))
2660 2660 else:
2661 2661 ui.note(_(b'exporting patch:\n'))
2662 2662
2663 2663 fntemplate = opts.get(b'output')
2664 2664 if cmdutil.isstdiofilename(fntemplate):
2665 2665 fntemplate = b''
2666 2666
2667 2667 if fntemplate:
2668 2668 fm = formatter.nullformatter(ui, b'export', opts)
2669 2669 else:
2670 2670 ui.pager(b'export')
2671 2671 fm = ui.formatter(b'export', opts)
2672 2672 with fm:
2673 2673 cmdutil.export(
2674 2674 repo,
2675 2675 revs,
2676 2676 fm,
2677 2677 fntemplate=fntemplate,
2678 2678 switch_parent=opts.get(b'switch_parent'),
2679 2679 opts=patch.diffallopts(ui, opts),
2680 2680 )
2681 2681
2682 2682
2683 2683 @command(
2684 2684 b'files',
2685 2685 [
2686 2686 (
2687 2687 b'r',
2688 2688 b'rev',
2689 2689 b'',
2690 2690 _(b'search the repository as it is in REV'),
2691 2691 _(b'REV'),
2692 2692 ),
2693 2693 (
2694 2694 b'0',
2695 2695 b'print0',
2696 2696 None,
2697 2697 _(b'end filenames with NUL, for use with xargs'),
2698 2698 ),
2699 2699 ]
2700 2700 + walkopts
2701 2701 + formatteropts
2702 2702 + subrepoopts,
2703 2703 _(b'[OPTION]... [FILE]...'),
2704 2704 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2705 2705 intents={INTENT_READONLY},
2706 2706 )
2707 2707 def files(ui, repo, *pats, **opts):
2708 2708 """list tracked files
2709 2709
2710 2710 Print files under Mercurial control in the working directory or
2711 2711 specified revision for given files (excluding removed files).
2712 2712 Files can be specified as filenames or filesets.
2713 2713
2714 2714 If no files are given to match, this command prints the names
2715 2715 of all files under Mercurial control.
2716 2716
2717 2717 .. container:: verbose
2718 2718
2719 2719 Template:
2720 2720
2721 2721 The following keywords are supported in addition to the common template
2722 2722 keywords and functions. See also :hg:`help templates`.
2723 2723
2724 2724 :flags: String. Character denoting file's symlink and executable bits.
2725 2725 :path: String. Repository-absolute path of the file.
2726 2726 :size: Integer. Size of the file in bytes.
2727 2727
2728 2728 Examples:
2729 2729
2730 2730 - list all files under the current directory::
2731 2731
2732 2732 hg files .
2733 2733
2734 2734 - shows sizes and flags for current revision::
2735 2735
2736 2736 hg files -vr .
2737 2737
2738 2738 - list all files named README::
2739 2739
2740 2740 hg files -I "**/README"
2741 2741
2742 2742 - list all binary files::
2743 2743
2744 2744 hg files "set:binary()"
2745 2745
2746 2746 - find files containing a regular expression::
2747 2747
2748 2748 hg files "set:grep('bob')"
2749 2749
2750 2750 - search tracked file contents with xargs and grep::
2751 2751
2752 2752 hg files -0 | xargs -0 grep foo
2753 2753
2754 2754 See :hg:`help patterns` and :hg:`help filesets` for more information
2755 2755 on specifying file patterns.
2756 2756
2757 2757 Returns 0 if a match is found, 1 otherwise.
2758 2758
2759 2759 """
2760 2760
2761 2761 opts = pycompat.byteskwargs(opts)
2762 2762 rev = opts.get(b'rev')
2763 2763 if rev:
2764 2764 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2765 2765 ctx = scmutil.revsingle(repo, rev, None)
2766 2766
2767 2767 end = b'\n'
2768 2768 if opts.get(b'print0'):
2769 2769 end = b'\0'
2770 2770 fmt = b'%s' + end
2771 2771
2772 2772 m = scmutil.match(ctx, pats, opts)
2773 2773 ui.pager(b'files')
2774 2774 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2775 2775 with ui.formatter(b'files', opts) as fm:
2776 2776 return cmdutil.files(
2777 2777 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2778 2778 )
2779 2779
2780 2780
2781 2781 @command(
2782 2782 b'forget',
2783 2783 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2784 2784 + walkopts
2785 2785 + dryrunopts,
2786 2786 _(b'[OPTION]... FILE...'),
2787 2787 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2788 2788 helpbasic=True,
2789 2789 inferrepo=True,
2790 2790 )
2791 2791 def forget(ui, repo, *pats, **opts):
2792 2792 """forget the specified files on the next commit
2793 2793
2794 2794 Mark the specified files so they will no longer be tracked
2795 2795 after the next commit.
2796 2796
2797 2797 This only removes files from the current branch, not from the
2798 2798 entire project history, and it does not delete them from the
2799 2799 working directory.
2800 2800
2801 2801 To delete the file from the working directory, see :hg:`remove`.
2802 2802
2803 2803 To undo a forget before the next commit, see :hg:`add`.
2804 2804
2805 2805 .. container:: verbose
2806 2806
2807 2807 Examples:
2808 2808
2809 2809 - forget newly-added binary files::
2810 2810
2811 2811 hg forget "set:added() and binary()"
2812 2812
2813 2813 - forget files that would be excluded by .hgignore::
2814 2814
2815 2815 hg forget "set:hgignore()"
2816 2816
2817 2817 Returns 0 on success.
2818 2818 """
2819 2819
2820 2820 opts = pycompat.byteskwargs(opts)
2821 2821 if not pats:
2822 2822 raise error.Abort(_(b'no files specified'))
2823 2823
2824 2824 m = scmutil.match(repo[None], pats, opts)
2825 2825 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2826 2826 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2827 2827 rejected = cmdutil.forget(
2828 2828 ui,
2829 2829 repo,
2830 2830 m,
2831 2831 prefix=b"",
2832 2832 uipathfn=uipathfn,
2833 2833 explicitonly=False,
2834 2834 dryrun=dryrun,
2835 2835 interactive=interactive,
2836 2836 )[0]
2837 2837 return rejected and 1 or 0
2838 2838
2839 2839
2840 2840 @command(
2841 2841 b'graft',
2842 2842 [
2843 2843 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2844 2844 (
2845 2845 b'',
2846 2846 b'base',
2847 2847 b'',
2848 2848 _(b'base revision when doing the graft merge (ADVANCED)'),
2849 2849 _(b'REV'),
2850 2850 ),
2851 2851 (b'c', b'continue', False, _(b'resume interrupted graft')),
2852 2852 (b'', b'stop', False, _(b'stop interrupted graft')),
2853 2853 (b'', b'abort', False, _(b'abort interrupted graft')),
2854 2854 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2855 2855 (b'', b'log', None, _(b'append graft info to log message')),
2856 2856 (
2857 2857 b'',
2858 2858 b'no-commit',
2859 2859 None,
2860 2860 _(b"don't commit, just apply the changes in working directory"),
2861 2861 ),
2862 2862 (b'f', b'force', False, _(b'force graft')),
2863 2863 (
2864 2864 b'D',
2865 2865 b'currentdate',
2866 2866 False,
2867 2867 _(b'record the current date as commit date'),
2868 2868 ),
2869 2869 (
2870 2870 b'U',
2871 2871 b'currentuser',
2872 2872 False,
2873 2873 _(b'record the current user as committer'),
2874 2874 ),
2875 2875 ]
2876 2876 + commitopts2
2877 2877 + mergetoolopts
2878 2878 + dryrunopts,
2879 2879 _(b'[OPTION]... [-r REV]... REV...'),
2880 2880 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2881 2881 )
2882 2882 def graft(ui, repo, *revs, **opts):
2883 2883 '''copy changes from other branches onto the current branch
2884 2884
2885 2885 This command uses Mercurial's merge logic to copy individual
2886 2886 changes from other branches without merging branches in the
2887 2887 history graph. This is sometimes known as 'backporting' or
2888 2888 'cherry-picking'. By default, graft will copy user, date, and
2889 2889 description from the source changesets.
2890 2890
2891 2891 Changesets that are ancestors of the current revision, that have
2892 2892 already been grafted, or that are merges will be skipped.
2893 2893
2894 2894 If --log is specified, log messages will have a comment appended
2895 2895 of the form::
2896 2896
2897 2897 (grafted from CHANGESETHASH)
2898 2898
2899 2899 If --force is specified, revisions will be grafted even if they
2900 2900 are already ancestors of, or have been grafted to, the destination.
2901 2901 This is useful when the revisions have since been backed out.
2902 2902
2903 2903 If a graft merge results in conflicts, the graft process is
2904 2904 interrupted so that the current merge can be manually resolved.
2905 2905 Once all conflicts are addressed, the graft process can be
2906 2906 continued with the -c/--continue option.
2907 2907
2908 2908 The -c/--continue option reapplies all the earlier options.
2909 2909
2910 2910 .. container:: verbose
2911 2911
2912 2912 The --base option exposes more of how graft internally uses merge with a
2913 2913 custom base revision. --base can be used to specify another ancestor than
2914 2914 the first and only parent.
2915 2915
2916 2916 The command::
2917 2917
2918 2918 hg graft -r 345 --base 234
2919 2919
2920 2920 is thus pretty much the same as::
2921 2921
2922 2922 hg diff -r 234 -r 345 | hg import
2923 2923
2924 2924 but using merge to resolve conflicts and track moved files.
2925 2925
2926 2926 The result of a merge can thus be backported as a single commit by
2927 2927 specifying one of the merge parents as base, and thus effectively
2928 2928 grafting the changes from the other side.
2929 2929
2930 2930 It is also possible to collapse multiple changesets and clean up history
2931 2931 by specifying another ancestor as base, much like rebase --collapse
2932 2932 --keep.
2933 2933
2934 2934 The commit message can be tweaked after the fact using commit --amend .
2935 2935
2936 2936 For using non-ancestors as the base to backout changes, see the backout
2937 2937 command and the hidden --parent option.
2938 2938
2939 2939 .. container:: verbose
2940 2940
2941 2941 Examples:
2942 2942
2943 2943 - copy a single change to the stable branch and edit its description::
2944 2944
2945 2945 hg update stable
2946 2946 hg graft --edit 9393
2947 2947
2948 2948 - graft a range of changesets with one exception, updating dates::
2949 2949
2950 2950 hg graft -D "2085::2093 and not 2091"
2951 2951
2952 2952 - continue a graft after resolving conflicts::
2953 2953
2954 2954 hg graft -c
2955 2955
2956 2956 - show the source of a grafted changeset::
2957 2957
2958 2958 hg log --debug -r .
2959 2959
2960 2960 - show revisions sorted by date::
2961 2961
2962 2962 hg log -r "sort(all(), date)"
2963 2963
2964 2964 - backport the result of a merge as a single commit::
2965 2965
2966 2966 hg graft -r 123 --base 123^
2967 2967
2968 2968 - land a feature branch as one changeset::
2969 2969
2970 2970 hg up -cr default
2971 2971 hg graft -r featureX --base "ancestor('featureX', 'default')"
2972 2972
2973 2973 See :hg:`help revisions` for more about specifying revisions.
2974 2974
2975 2975 Returns 0 on successful completion, 1 if there are unresolved files.
2976 2976 '''
2977 2977 with repo.wlock():
2978 2978 return _dograft(ui, repo, *revs, **opts)
2979 2979
2980 2980
2981 2981 def _dograft(ui, repo, *revs, **opts):
2982 2982 opts = pycompat.byteskwargs(opts)
2983 2983 if revs and opts.get(b'rev'):
2984 2984 ui.warn(
2985 2985 _(
2986 2986 b'warning: inconsistent use of --rev might give unexpected '
2987 2987 b'revision ordering!\n'
2988 2988 )
2989 2989 )
2990 2990
2991 2991 revs = list(revs)
2992 2992 revs.extend(opts.get(b'rev'))
2993 2993 # a dict of data to be stored in state file
2994 2994 statedata = {}
2995 2995 # list of new nodes created by ongoing graft
2996 2996 statedata[b'newnodes'] = []
2997 2997
2998 2998 cmdutil.resolvecommitoptions(ui, opts)
2999 2999
3000 3000 editor = cmdutil.getcommiteditor(
3001 3001 editform=b'graft', **pycompat.strkwargs(opts)
3002 3002 )
3003 3003
3004 3004 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3005 3005
3006 3006 cont = False
3007 3007 if opts.get(b'no_commit'):
3008 3008 cmdutil.check_incompatible_arguments(
3009 3009 opts,
3010 3010 b'no_commit',
3011 3011 [b'edit', b'currentuser', b'currentdate', b'log'],
3012 3012 )
3013 3013
3014 3014 graftstate = statemod.cmdstate(repo, b'graftstate')
3015 3015
3016 3016 if opts.get(b'stop'):
3017 3017 cmdutil.check_incompatible_arguments(
3018 3018 opts,
3019 3019 b'stop',
3020 3020 [
3021 3021 b'edit',
3022 3022 b'log',
3023 3023 b'user',
3024 3024 b'date',
3025 3025 b'currentdate',
3026 3026 b'currentuser',
3027 3027 b'rev',
3028 3028 ],
3029 3029 )
3030 3030 return _stopgraft(ui, repo, graftstate)
3031 3031 elif opts.get(b'abort'):
3032 3032 cmdutil.check_incompatible_arguments(
3033 3033 opts,
3034 3034 b'abort',
3035 3035 [
3036 3036 b'edit',
3037 3037 b'log',
3038 3038 b'user',
3039 3039 b'date',
3040 3040 b'currentdate',
3041 3041 b'currentuser',
3042 3042 b'rev',
3043 3043 ],
3044 3044 )
3045 3045 return cmdutil.abortgraft(ui, repo, graftstate)
3046 3046 elif opts.get(b'continue'):
3047 3047 cont = True
3048 3048 if revs:
3049 3049 raise error.Abort(_(b"can't specify --continue and revisions"))
3050 3050 # read in unfinished revisions
3051 3051 if graftstate.exists():
3052 3052 statedata = cmdutil.readgraftstate(repo, graftstate)
3053 3053 if statedata.get(b'date'):
3054 3054 opts[b'date'] = statedata[b'date']
3055 3055 if statedata.get(b'user'):
3056 3056 opts[b'user'] = statedata[b'user']
3057 3057 if statedata.get(b'log'):
3058 3058 opts[b'log'] = True
3059 3059 if statedata.get(b'no_commit'):
3060 3060 opts[b'no_commit'] = statedata.get(b'no_commit')
3061 3061 if statedata.get(b'base'):
3062 3062 opts[b'base'] = statedata.get(b'base')
3063 3063 nodes = statedata[b'nodes']
3064 3064 revs = [repo[node].rev() for node in nodes]
3065 3065 else:
3066 3066 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3067 3067 else:
3068 3068 if not revs:
3069 3069 raise error.Abort(_(b'no revisions specified'))
3070 3070 cmdutil.checkunfinished(repo)
3071 3071 cmdutil.bailifchanged(repo)
3072 3072 revs = scmutil.revrange(repo, revs)
3073 3073
3074 3074 skipped = set()
3075 3075 basectx = None
3076 3076 if opts.get(b'base'):
3077 3077 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3078 3078 if basectx is None:
3079 3079 # check for merges
3080 3080 for rev in repo.revs(b'%ld and merge()', revs):
3081 3081 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3082 3082 skipped.add(rev)
3083 3083 revs = [r for r in revs if r not in skipped]
3084 3084 if not revs:
3085 3085 return -1
3086 3086 if basectx is not None and len(revs) != 1:
3087 3087 raise error.Abort(_(b'only one revision allowed with --base '))
3088 3088
3089 3089 # Don't check in the --continue case, in effect retaining --force across
3090 3090 # --continues. That's because without --force, any revisions we decided to
3091 3091 # skip would have been filtered out here, so they wouldn't have made their
3092 3092 # way to the graftstate. With --force, any revisions we would have otherwise
3093 3093 # skipped would not have been filtered out, and if they hadn't been applied
3094 3094 # already, they'd have been in the graftstate.
3095 3095 if not (cont or opts.get(b'force')) and basectx is None:
3096 3096 # check for ancestors of dest branch
3097 3097 ancestors = repo.revs(b'%ld & (::.)', revs)
3098 3098 for rev in ancestors:
3099 3099 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3100 3100
3101 3101 revs = [r for r in revs if r not in ancestors]
3102 3102
3103 3103 if not revs:
3104 3104 return -1
3105 3105
3106 3106 # analyze revs for earlier grafts
3107 3107 ids = {}
3108 3108 for ctx in repo.set(b"%ld", revs):
3109 3109 ids[ctx.hex()] = ctx.rev()
3110 3110 n = ctx.extra().get(b'source')
3111 3111 if n:
3112 3112 ids[n] = ctx.rev()
3113 3113
3114 3114 # check ancestors for earlier grafts
3115 3115 ui.debug(b'scanning for duplicate grafts\n')
3116 3116
3117 3117 # The only changesets we can be sure doesn't contain grafts of any
3118 3118 # revs, are the ones that are common ancestors of *all* revs:
3119 3119 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3120 3120 ctx = repo[rev]
3121 3121 n = ctx.extra().get(b'source')
3122 3122 if n in ids:
3123 3123 try:
3124 3124 r = repo[n].rev()
3125 3125 except error.RepoLookupError:
3126 3126 r = None
3127 3127 if r in revs:
3128 3128 ui.warn(
3129 3129 _(
3130 3130 b'skipping revision %d:%s '
3131 3131 b'(already grafted to %d:%s)\n'
3132 3132 )
3133 3133 % (r, repo[r], rev, ctx)
3134 3134 )
3135 3135 revs.remove(r)
3136 3136 elif ids[n] in revs:
3137 3137 if r is None:
3138 3138 ui.warn(
3139 3139 _(
3140 3140 b'skipping already grafted revision %d:%s '
3141 3141 b'(%d:%s also has unknown origin %s)\n'
3142 3142 )
3143 3143 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3144 3144 )
3145 3145 else:
3146 3146 ui.warn(
3147 3147 _(
3148 3148 b'skipping already grafted revision %d:%s '
3149 3149 b'(%d:%s also has origin %d:%s)\n'
3150 3150 )
3151 3151 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3152 3152 )
3153 3153 revs.remove(ids[n])
3154 3154 elif ctx.hex() in ids:
3155 3155 r = ids[ctx.hex()]
3156 3156 if r in revs:
3157 3157 ui.warn(
3158 3158 _(
3159 3159 b'skipping already grafted revision %d:%s '
3160 3160 b'(was grafted from %d:%s)\n'
3161 3161 )
3162 3162 % (r, repo[r], rev, ctx)
3163 3163 )
3164 3164 revs.remove(r)
3165 3165 if not revs:
3166 3166 return -1
3167 3167
3168 3168 if opts.get(b'no_commit'):
3169 3169 statedata[b'no_commit'] = True
3170 3170 if opts.get(b'base'):
3171 3171 statedata[b'base'] = opts[b'base']
3172 3172 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3173 3173 desc = b'%d:%s "%s"' % (
3174 3174 ctx.rev(),
3175 3175 ctx,
3176 3176 ctx.description().split(b'\n', 1)[0],
3177 3177 )
3178 3178 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3179 3179 if names:
3180 3180 desc += b' (%s)' % b' '.join(names)
3181 3181 ui.status(_(b'grafting %s\n') % desc)
3182 3182 if opts.get(b'dry_run'):
3183 3183 continue
3184 3184
3185 3185 source = ctx.extra().get(b'source')
3186 3186 extra = {}
3187 3187 if source:
3188 3188 extra[b'source'] = source
3189 3189 extra[b'intermediate-source'] = ctx.hex()
3190 3190 else:
3191 3191 extra[b'source'] = ctx.hex()
3192 3192 user = ctx.user()
3193 3193 if opts.get(b'user'):
3194 3194 user = opts[b'user']
3195 3195 statedata[b'user'] = user
3196 3196 date = ctx.date()
3197 3197 if opts.get(b'date'):
3198 3198 date = opts[b'date']
3199 3199 statedata[b'date'] = date
3200 3200 message = ctx.description()
3201 3201 if opts.get(b'log'):
3202 3202 message += b'\n(grafted from %s)' % ctx.hex()
3203 3203 statedata[b'log'] = True
3204 3204
3205 3205 # we don't merge the first commit when continuing
3206 3206 if not cont:
3207 3207 # perform the graft merge with p1(rev) as 'ancestor'
3208 3208 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3209 3209 base = ctx.p1() if basectx is None else basectx
3210 3210 with ui.configoverride(overrides, b'graft'):
3211 3211 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3212 3212 # report any conflicts
3213 3213 if stats.unresolvedcount > 0:
3214 3214 # write out state for --continue
3215 3215 nodes = [repo[rev].hex() for rev in revs[pos:]]
3216 3216 statedata[b'nodes'] = nodes
3217 3217 stateversion = 1
3218 3218 graftstate.save(stateversion, statedata)
3219 3219 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3220 3220 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3221 3221 return 1
3222 3222 else:
3223 3223 cont = False
3224 3224
3225 3225 # commit if --no-commit is false
3226 3226 if not opts.get(b'no_commit'):
3227 3227 node = repo.commit(
3228 3228 text=message, user=user, date=date, extra=extra, editor=editor
3229 3229 )
3230 3230 if node is None:
3231 3231 ui.warn(
3232 3232 _(b'note: graft of %d:%s created no changes to commit\n')
3233 3233 % (ctx.rev(), ctx)
3234 3234 )
3235 3235 # checking that newnodes exist because old state files won't have it
3236 3236 elif statedata.get(b'newnodes') is not None:
3237 3237 statedata[b'newnodes'].append(node)
3238 3238
3239 3239 # remove state when we complete successfully
3240 3240 if not opts.get(b'dry_run'):
3241 3241 graftstate.delete()
3242 3242
3243 3243 return 0
3244 3244
3245 3245
3246 3246 def _stopgraft(ui, repo, graftstate):
3247 3247 """stop the interrupted graft"""
3248 3248 if not graftstate.exists():
3249 3249 raise error.Abort(_(b"no interrupted graft found"))
3250 3250 pctx = repo[b'.']
3251 3251 mergemod.clean_update(pctx)
3252 3252 graftstate.delete()
3253 3253 ui.status(_(b"stopped the interrupted graft\n"))
3254 3254 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3255 3255 return 0
3256 3256
3257 3257
3258 3258 statemod.addunfinished(
3259 3259 b'graft',
3260 3260 fname=b'graftstate',
3261 3261 clearable=True,
3262 3262 stopflag=True,
3263 3263 continueflag=True,
3264 3264 abortfunc=cmdutil.hgabortgraft,
3265 3265 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3266 3266 )
3267 3267
3268 3268
3269 3269 @command(
3270 3270 b'grep',
3271 3271 [
3272 3272 (b'0', b'print0', None, _(b'end fields with NUL')),
3273 3273 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3274 3274 (
3275 3275 b'',
3276 3276 b'diff',
3277 3277 None,
3278 3278 _(
3279 3279 b'search revision differences for when the pattern was added '
3280 3280 b'or removed'
3281 3281 ),
3282 3282 ),
3283 3283 (b'a', b'text', None, _(b'treat all files as text')),
3284 3284 (
3285 3285 b'f',
3286 3286 b'follow',
3287 3287 None,
3288 3288 _(
3289 3289 b'follow changeset history,'
3290 3290 b' or file history across copies and renames'
3291 3291 ),
3292 3292 ),
3293 3293 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3294 3294 (
3295 3295 b'l',
3296 3296 b'files-with-matches',
3297 3297 None,
3298 3298 _(b'print only filenames and revisions that match'),
3299 3299 ),
3300 3300 (b'n', b'line-number', None, _(b'print matching line numbers')),
3301 3301 (
3302 3302 b'r',
3303 3303 b'rev',
3304 3304 [],
3305 3305 _(b'search files changed within revision range'),
3306 3306 _(b'REV'),
3307 3307 ),
3308 3308 (
3309 3309 b'',
3310 3310 b'all-files',
3311 3311 None,
3312 3312 _(
3313 3313 b'include all files in the changeset while grepping (DEPRECATED)'
3314 3314 ),
3315 3315 ),
3316 3316 (b'u', b'user', None, _(b'list the author (long with -v)')),
3317 3317 (b'd', b'date', None, _(b'list the date (short with -q)')),
3318 3318 ]
3319 3319 + formatteropts
3320 3320 + walkopts,
3321 3321 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3322 3322 helpcategory=command.CATEGORY_FILE_CONTENTS,
3323 3323 inferrepo=True,
3324 3324 intents={INTENT_READONLY},
3325 3325 )
3326 3326 def grep(ui, repo, pattern, *pats, **opts):
3327 3327 """search for a pattern in specified files
3328 3328
3329 3329 Search the working directory or revision history for a regular
3330 3330 expression in the specified files for the entire repository.
3331 3331
3332 3332 By default, grep searches the repository files in the working
3333 3333 directory and prints the files where it finds a match. To specify
3334 3334 historical revisions instead of the working directory, use the
3335 3335 --rev flag.
3336 3336
3337 3337 To search instead historical revision differences that contains a
3338 3338 change in match status ("-" for a match that becomes a non-match,
3339 3339 or "+" for a non-match that becomes a match), use the --diff flag.
3340 3340
3341 3341 PATTERN can be any Python (roughly Perl-compatible) regular
3342 3342 expression.
3343 3343
3344 3344 If no FILEs are specified and the --rev flag isn't supplied, all
3345 3345 files in the working directory are searched. When using the --rev
3346 3346 flag and specifying FILEs, use the --follow argument to also
3347 3347 follow the specified FILEs across renames and copies.
3348 3348
3349 3349 .. container:: verbose
3350 3350
3351 3351 Template:
3352 3352
3353 3353 The following keywords are supported in addition to the common template
3354 3354 keywords and functions. See also :hg:`help templates`.
3355 3355
3356 3356 :change: String. Character denoting insertion ``+`` or removal ``-``.
3357 3357 Available if ``--diff`` is specified.
3358 3358 :lineno: Integer. Line number of the match.
3359 3359 :path: String. Repository-absolute path of the file.
3360 3360 :texts: List of text chunks.
3361 3361
3362 3362 And each entry of ``{texts}`` provides the following sub-keywords.
3363 3363
3364 3364 :matched: Boolean. True if the chunk matches the specified pattern.
3365 3365 :text: String. Chunk content.
3366 3366
3367 3367 See :hg:`help templates.operators` for the list expansion syntax.
3368 3368
3369 3369 Returns 0 if a match is found, 1 otherwise.
3370 3370
3371 3371 """
3372 3372 opts = pycompat.byteskwargs(opts)
3373 3373 diff = opts.get(b'all') or opts.get(b'diff')
3374 3374 if diff and opts.get(b'all_files'):
3375 3375 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3376 3376 if opts.get(b'all_files') is None and not diff:
3377 3377 opts[b'all_files'] = True
3378 3378 plaingrep = (
3379 3379 opts.get(b'all_files')
3380 3380 and not opts.get(b'rev')
3381 3381 and not opts.get(b'follow')
3382 3382 )
3383 3383 all_files = opts.get(b'all_files')
3384 3384 if plaingrep:
3385 3385 opts[b'rev'] = [b'wdir()']
3386 3386
3387 3387 reflags = re.M
3388 3388 if opts.get(b'ignore_case'):
3389 3389 reflags |= re.I
3390 3390 try:
3391 3391 regexp = util.re.compile(pattern, reflags)
3392 3392 except re.error as inst:
3393 3393 ui.warn(
3394 3394 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3395 3395 )
3396 3396 return 1
3397 3397 sep, eol = b':', b'\n'
3398 3398 if opts.get(b'print0'):
3399 3399 sep = eol = b'\0'
3400 3400
3401 3401 getfile = util.lrucachefunc(repo.file)
3402
3403 def matchlines(body, regexp):
3404 begin = 0
3405 linenum = 0
3406 while begin < len(body):
3407 match = regexp.search(body, begin)
3408 if not match:
3409 break
3410 mstart, mend = match.span()
3411 linenum += body.count(b'\n', begin, mstart) + 1
3412 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3413 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3414 lend = begin - 1
3415 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3416
3417 class linestate(object):
3418 def __init__(self, line, linenum, colstart, colend):
3419 self.line = line
3420 self.linenum = linenum
3421 self.colstart = colstart
3422 self.colend = colend
3423
3424 def __hash__(self):
3425 return hash(self.line)
3426
3427 def __eq__(self, other):
3428 return self.line == other.line
3429
3430 def findpos(self, regexp):
3431 """Iterate all (start, end) indices of matches"""
3432 yield self.colstart, self.colend
3433 p = self.colend
3434 while p < len(self.line):
3435 m = regexp.search(self.line, p)
3436 if not m:
3437 break
3438 if m.end() == p:
3439 p += 1
3440 else:
3441 yield m.span()
3442 p = m.end()
3443
3444 3402 matches = {}
3445 3403 copies = {}
3446 3404
3447 3405 def grepbody(fn, rev, body):
3448 3406 matches[rev].setdefault(fn, [])
3449 3407 m = matches[rev][fn]
3450 3408 if body is None:
3451 3409 return
3452 3410
3453 for lnum, cstart, cend, line in matchlines(body, regexp):
3454 s = linestate(line, lnum, cstart, cend)
3411 for lnum, cstart, cend, line in grepmod.matchlines(body, regexp):
3412 s = grepmod.linestate(line, lnum, cstart, cend)
3455 3413 m.append(s)
3456 3414
3457 def difflinestates(a, b):
3458 sm = difflib.SequenceMatcher(None, a, b)
3459 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3460 if tag == 'insert':
3461 for i in pycompat.xrange(blo, bhi):
3462 yield (b'+', b[i])
3463 elif tag == 'delete':
3464 for i in pycompat.xrange(alo, ahi):
3465 yield (b'-', a[i])
3466 elif tag == 'replace':
3467 for i in pycompat.xrange(alo, ahi):
3468 yield (b'-', a[i])
3469 for i in pycompat.xrange(blo, bhi):
3470 yield (b'+', b[i])
3471
3472 3415 uipathfn = scmutil.getuipathfn(repo)
3473 3416
3474 3417 def display(fm, fn, ctx, pstates, states):
3475 3418 rev = scmutil.intrev(ctx)
3476 3419 if fm.isplain():
3477 3420 formatuser = ui.shortuser
3478 3421 else:
3479 3422 formatuser = pycompat.bytestr
3480 3423 if ui.quiet:
3481 3424 datefmt = b'%Y-%m-%d'
3482 3425 else:
3483 3426 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3484 3427 found = False
3485 3428
3486 3429 @util.cachefunc
3487 3430 def binary():
3488 3431 flog = getfile(fn)
3489 3432 try:
3490 3433 return stringutil.binary(flog.read(ctx.filenode(fn)))
3491 3434 except error.WdirUnsupported:
3492 3435 return ctx[fn].isbinary()
3493 3436
3494 3437 fieldnamemap = {b'linenumber': b'lineno'}
3495 3438 if diff:
3496 iter = difflinestates(pstates, states)
3439 iter = grepmod.difflinestates(pstates, states)
3497 3440 else:
3498 3441 iter = [(b'', l) for l in states]
3499 3442 for change, l in iter:
3500 3443 fm.startitem()
3501 3444 fm.context(ctx=ctx)
3502 3445 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3503 3446 fm.plain(uipathfn(fn), label=b'grep.filename')
3504 3447
3505 3448 cols = [
3506 3449 (b'rev', b'%d', rev, not plaingrep, b''),
3507 3450 (
3508 3451 b'linenumber',
3509 3452 b'%d',
3510 3453 l.linenum,
3511 3454 opts.get(b'line_number'),
3512 3455 b'',
3513 3456 ),
3514 3457 ]
3515 3458 if diff:
3516 3459 cols.append(
3517 3460 (
3518 3461 b'change',
3519 3462 b'%s',
3520 3463 change,
3521 3464 True,
3522 3465 b'grep.inserted '
3523 3466 if change == b'+'
3524 3467 else b'grep.deleted ',
3525 3468 )
3526 3469 )
3527 3470 cols.extend(
3528 3471 [
3529 3472 (
3530 3473 b'user',
3531 3474 b'%s',
3532 3475 formatuser(ctx.user()),
3533 3476 opts.get(b'user'),
3534 3477 b'',
3535 3478 ),
3536 3479 (
3537 3480 b'date',
3538 3481 b'%s',
3539 3482 fm.formatdate(ctx.date(), datefmt),
3540 3483 opts.get(b'date'),
3541 3484 b'',
3542 3485 ),
3543 3486 ]
3544 3487 )
3545 3488 for name, fmt, data, cond, extra_label in cols:
3546 3489 if cond:
3547 3490 fm.plain(sep, label=b'grep.sep')
3548 3491 field = fieldnamemap.get(name, name)
3549 3492 label = extra_label + (b'grep.%s' % name)
3550 3493 fm.condwrite(cond, field, fmt, data, label=label)
3551 3494 if not opts.get(b'files_with_matches'):
3552 3495 fm.plain(sep, label=b'grep.sep')
3553 3496 if not opts.get(b'text') and binary():
3554 3497 fm.plain(_(b" Binary file matches"))
3555 3498 else:
3556 3499 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3557 3500 fm.plain(eol)
3558 3501 found = True
3559 3502 if opts.get(b'files_with_matches'):
3560 3503 break
3561 3504 return found
3562 3505
3563 3506 def displaymatches(fm, l):
3564 3507 p = 0
3565 3508 for s, e in l.findpos(regexp):
3566 3509 if p < s:
3567 3510 fm.startitem()
3568 3511 fm.write(b'text', b'%s', l.line[p:s])
3569 3512 fm.data(matched=False)
3570 3513 fm.startitem()
3571 3514 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3572 3515 fm.data(matched=True)
3573 3516 p = e
3574 3517 if p < len(l.line):
3575 3518 fm.startitem()
3576 3519 fm.write(b'text', b'%s', l.line[p:])
3577 3520 fm.data(matched=False)
3578 3521 fm.end()
3579 3522
3580 3523 skip = set()
3581 3524 revfiles = {}
3582 3525 found = False
3583 3526 follow = opts.get(b'follow')
3584 3527
3585 3528 getrenamed = scmutil.getrenamedfn(repo)
3586 3529
3587 3530 def readfile(ctx, fn):
3588 3531 rev = ctx.rev()
3589 3532 if rev is None:
3590 3533 fctx = ctx[fn]
3591 3534 try:
3592 3535 return fctx.data()
3593 3536 except IOError as e:
3594 3537 if e.errno != errno.ENOENT:
3595 3538 raise
3596 3539 else:
3597 3540 flog = getfile(fn)
3598 3541 fnode = ctx.filenode(fn)
3599 3542 try:
3600 3543 return flog.read(fnode)
3601 3544 except error.CensoredNodeError:
3602 3545 ui.warn(
3603 3546 _(
3604 3547 b'cannot search in censored file: %(filename)s:%(revnum)s\n'
3605 3548 )
3606 3549 % {b'filename': fn, b'revnum': pycompat.bytestr(rev),}
3607 3550 )
3608 3551
3609 3552 def prep(ctx, fmatch):
3610 3553 rev = ctx.rev()
3611 3554 pctx = ctx.p1()
3612 3555 matches.setdefault(rev, {})
3613 3556 if diff:
3614 3557 parent = pctx.rev()
3615 3558 matches.setdefault(parent, {})
3616 3559 files = revfiles.setdefault(rev, [])
3617 3560 if rev is None:
3618 3561 # in `hg grep pattern`, 2/3 of the time is spent is spent in
3619 3562 # pathauditor checks without this in mozilla-central
3620 3563 contextmanager = repo.wvfs.audit.cached
3621 3564 else:
3622 3565 contextmanager = util.nullcontextmanager
3623 3566 with contextmanager():
3624 3567 # TODO: maybe better to warn missing files?
3625 3568 if all_files:
3626 3569 fmatch = matchmod.badmatch(fmatch, lambda f, msg: None)
3627 3570 filenames = ctx.matches(fmatch)
3628 3571 else:
3629 3572 filenames = (f for f in ctx.files() if fmatch(f))
3630 3573 for fn in filenames:
3631 3574 # fn might not exist in the revision (could be a file removed by
3632 3575 # the revision). We could check `fn not in ctx` even when rev is
3633 3576 # None, but it's less racy to protect againt that in readfile.
3634 3577 if rev is not None and fn not in ctx:
3635 3578 continue
3636 3579
3637 3580 copy = None
3638 3581 if follow:
3639 3582 copy = getrenamed(fn, rev)
3640 3583 if copy:
3641 3584 copies.setdefault(rev, {})[fn] = copy
3642 3585 if fn in skip:
3643 3586 skip.add(copy)
3644 3587 if fn in skip:
3645 3588 continue
3646 3589 files.append(fn)
3647 3590
3648 3591 if fn not in matches[rev]:
3649 3592 grepbody(fn, rev, readfile(ctx, fn))
3650 3593
3651 3594 if diff:
3652 3595 pfn = copy or fn
3653 3596 if pfn not in matches[parent] and pfn in pctx:
3654 3597 grepbody(pfn, parent, readfile(pctx, pfn))
3655 3598
3656 3599 wopts = logcmdutil.walkopts(
3657 3600 pats=pats,
3658 3601 opts=opts,
3659 3602 revspec=opts[b'rev'],
3660 3603 include_pats=opts[b'include'],
3661 3604 exclude_pats=opts[b'exclude'],
3662 3605 follow=follow,
3663 3606 force_changelog_traversal=all_files,
3664 3607 filter_revisions_by_pats=not all_files,
3665 3608 )
3666 3609 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3667 3610
3668 3611 ui.pager(b'grep')
3669 3612 fm = ui.formatter(b'grep', opts)
3670 3613 for ctx in cmdutil.walkchangerevs(repo, revs, makefilematcher, prep):
3671 3614 rev = ctx.rev()
3672 3615 parent = ctx.p1().rev()
3673 3616 for fn in sorted(revfiles.get(rev, [])):
3674 3617 states = matches[rev][fn]
3675 3618 copy = copies.get(rev, {}).get(fn)
3676 3619 if fn in skip:
3677 3620 if copy:
3678 3621 skip.add(copy)
3679 3622 continue
3680 3623 pstates = matches.get(parent, {}).get(copy or fn, [])
3681 3624 if pstates or states:
3682 3625 r = display(fm, fn, ctx, pstates, states)
3683 3626 found = found or r
3684 3627 if r and not diff and not all_files:
3685 3628 skip.add(fn)
3686 3629 if copy:
3687 3630 skip.add(copy)
3688 3631 del revfiles[rev]
3689 3632 # We will keep the matches dict for the duration of the window
3690 3633 # clear the matches dict once the window is over
3691 3634 if not revfiles:
3692 3635 matches.clear()
3693 3636 fm.end()
3694 3637
3695 3638 return not found
3696 3639
3697 3640
3698 3641 @command(
3699 3642 b'heads',
3700 3643 [
3701 3644 (
3702 3645 b'r',
3703 3646 b'rev',
3704 3647 b'',
3705 3648 _(b'show only heads which are descendants of STARTREV'),
3706 3649 _(b'STARTREV'),
3707 3650 ),
3708 3651 (b't', b'topo', False, _(b'show topological heads only')),
3709 3652 (
3710 3653 b'a',
3711 3654 b'active',
3712 3655 False,
3713 3656 _(b'show active branchheads only (DEPRECATED)'),
3714 3657 ),
3715 3658 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3716 3659 ]
3717 3660 + templateopts,
3718 3661 _(b'[-ct] [-r STARTREV] [REV]...'),
3719 3662 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3720 3663 intents={INTENT_READONLY},
3721 3664 )
3722 3665 def heads(ui, repo, *branchrevs, **opts):
3723 3666 """show branch heads
3724 3667
3725 3668 With no arguments, show all open branch heads in the repository.
3726 3669 Branch heads are changesets that have no descendants on the
3727 3670 same branch. They are where development generally takes place and
3728 3671 are the usual targets for update and merge operations.
3729 3672
3730 3673 If one or more REVs are given, only open branch heads on the
3731 3674 branches associated with the specified changesets are shown. This
3732 3675 means that you can use :hg:`heads .` to see the heads on the
3733 3676 currently checked-out branch.
3734 3677
3735 3678 If -c/--closed is specified, also show branch heads marked closed
3736 3679 (see :hg:`commit --close-branch`).
3737 3680
3738 3681 If STARTREV is specified, only those heads that are descendants of
3739 3682 STARTREV will be displayed.
3740 3683
3741 3684 If -t/--topo is specified, named branch mechanics will be ignored and only
3742 3685 topological heads (changesets with no children) will be shown.
3743 3686
3744 3687 Returns 0 if matching heads are found, 1 if not.
3745 3688 """
3746 3689
3747 3690 opts = pycompat.byteskwargs(opts)
3748 3691 start = None
3749 3692 rev = opts.get(b'rev')
3750 3693 if rev:
3751 3694 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3752 3695 start = scmutil.revsingle(repo, rev, None).node()
3753 3696
3754 3697 if opts.get(b'topo'):
3755 3698 heads = [repo[h] for h in repo.heads(start)]
3756 3699 else:
3757 3700 heads = []
3758 3701 for branch in repo.branchmap():
3759 3702 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3760 3703 heads = [repo[h] for h in heads]
3761 3704
3762 3705 if branchrevs:
3763 3706 branches = {
3764 3707 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3765 3708 }
3766 3709 heads = [h for h in heads if h.branch() in branches]
3767 3710
3768 3711 if opts.get(b'active') and branchrevs:
3769 3712 dagheads = repo.heads(start)
3770 3713 heads = [h for h in heads if h.node() in dagheads]
3771 3714
3772 3715 if branchrevs:
3773 3716 haveheads = {h.branch() for h in heads}
3774 3717 if branches - haveheads:
3775 3718 headless = b', '.join(b for b in branches - haveheads)
3776 3719 msg = _(b'no open branch heads found on branches %s')
3777 3720 if opts.get(b'rev'):
3778 3721 msg += _(b' (started at %s)') % opts[b'rev']
3779 3722 ui.warn((msg + b'\n') % headless)
3780 3723
3781 3724 if not heads:
3782 3725 return 1
3783 3726
3784 3727 ui.pager(b'heads')
3785 3728 heads = sorted(heads, key=lambda x: -(x.rev()))
3786 3729 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3787 3730 for ctx in heads:
3788 3731 displayer.show(ctx)
3789 3732 displayer.close()
3790 3733
3791 3734
3792 3735 @command(
3793 3736 b'help',
3794 3737 [
3795 3738 (b'e', b'extension', None, _(b'show only help for extensions')),
3796 3739 (b'c', b'command', None, _(b'show only help for commands')),
3797 3740 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3798 3741 (
3799 3742 b's',
3800 3743 b'system',
3801 3744 [],
3802 3745 _(b'show help for specific platform(s)'),
3803 3746 _(b'PLATFORM'),
3804 3747 ),
3805 3748 ],
3806 3749 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3807 3750 helpcategory=command.CATEGORY_HELP,
3808 3751 norepo=True,
3809 3752 intents={INTENT_READONLY},
3810 3753 )
3811 3754 def help_(ui, name=None, **opts):
3812 3755 """show help for a given topic or a help overview
3813 3756
3814 3757 With no arguments, print a list of commands with short help messages.
3815 3758
3816 3759 Given a topic, extension, or command name, print help for that
3817 3760 topic.
3818 3761
3819 3762 Returns 0 if successful.
3820 3763 """
3821 3764
3822 3765 keep = opts.get('system') or []
3823 3766 if len(keep) == 0:
3824 3767 if pycompat.sysplatform.startswith(b'win'):
3825 3768 keep.append(b'windows')
3826 3769 elif pycompat.sysplatform == b'OpenVMS':
3827 3770 keep.append(b'vms')
3828 3771 elif pycompat.sysplatform == b'plan9':
3829 3772 keep.append(b'plan9')
3830 3773 else:
3831 3774 keep.append(b'unix')
3832 3775 keep.append(pycompat.sysplatform.lower())
3833 3776 if ui.verbose:
3834 3777 keep.append(b'verbose')
3835 3778
3836 3779 commands = sys.modules[__name__]
3837 3780 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3838 3781 ui.pager(b'help')
3839 3782 ui.write(formatted)
3840 3783
3841 3784
3842 3785 @command(
3843 3786 b'identify|id',
3844 3787 [
3845 3788 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3846 3789 (b'n', b'num', None, _(b'show local revision number')),
3847 3790 (b'i', b'id', None, _(b'show global revision id')),
3848 3791 (b'b', b'branch', None, _(b'show branch')),
3849 3792 (b't', b'tags', None, _(b'show tags')),
3850 3793 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3851 3794 ]
3852 3795 + remoteopts
3853 3796 + formatteropts,
3854 3797 _(b'[-nibtB] [-r REV] [SOURCE]'),
3855 3798 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3856 3799 optionalrepo=True,
3857 3800 intents={INTENT_READONLY},
3858 3801 )
3859 3802 def identify(
3860 3803 ui,
3861 3804 repo,
3862 3805 source=None,
3863 3806 rev=None,
3864 3807 num=None,
3865 3808 id=None,
3866 3809 branch=None,
3867 3810 tags=None,
3868 3811 bookmarks=None,
3869 3812 **opts
3870 3813 ):
3871 3814 """identify the working directory or specified revision
3872 3815
3873 3816 Print a summary identifying the repository state at REV using one or
3874 3817 two parent hash identifiers, followed by a "+" if the working
3875 3818 directory has uncommitted changes, the branch name (if not default),
3876 3819 a list of tags, and a list of bookmarks.
3877 3820
3878 3821 When REV is not given, print a summary of the current state of the
3879 3822 repository including the working directory. Specify -r. to get information
3880 3823 of the working directory parent without scanning uncommitted changes.
3881 3824
3882 3825 Specifying a path to a repository root or Mercurial bundle will
3883 3826 cause lookup to operate on that repository/bundle.
3884 3827
3885 3828 .. container:: verbose
3886 3829
3887 3830 Template:
3888 3831
3889 3832 The following keywords are supported in addition to the common template
3890 3833 keywords and functions. See also :hg:`help templates`.
3891 3834
3892 3835 :dirty: String. Character ``+`` denoting if the working directory has
3893 3836 uncommitted changes.
3894 3837 :id: String. One or two nodes, optionally followed by ``+``.
3895 3838 :parents: List of strings. Parent nodes of the changeset.
3896 3839
3897 3840 Examples:
3898 3841
3899 3842 - generate a build identifier for the working directory::
3900 3843
3901 3844 hg id --id > build-id.dat
3902 3845
3903 3846 - find the revision corresponding to a tag::
3904 3847
3905 3848 hg id -n -r 1.3
3906 3849
3907 3850 - check the most recent revision of a remote repository::
3908 3851
3909 3852 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3910 3853
3911 3854 See :hg:`log` for generating more information about specific revisions,
3912 3855 including full hash identifiers.
3913 3856
3914 3857 Returns 0 if successful.
3915 3858 """
3916 3859
3917 3860 opts = pycompat.byteskwargs(opts)
3918 3861 if not repo and not source:
3919 3862 raise error.Abort(
3920 3863 _(b"there is no Mercurial repository here (.hg not found)")
3921 3864 )
3922 3865
3923 3866 default = not (num or id or branch or tags or bookmarks)
3924 3867 output = []
3925 3868 revs = []
3926 3869
3927 3870 if source:
3928 3871 source, branches = hg.parseurl(ui.expandpath(source))
3929 3872 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3930 3873 repo = peer.local()
3931 3874 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3932 3875
3933 3876 fm = ui.formatter(b'identify', opts)
3934 3877 fm.startitem()
3935 3878
3936 3879 if not repo:
3937 3880 if num or branch or tags:
3938 3881 raise error.Abort(
3939 3882 _(b"can't query remote revision number, branch, or tags")
3940 3883 )
3941 3884 if not rev and revs:
3942 3885 rev = revs[0]
3943 3886 if not rev:
3944 3887 rev = b"tip"
3945 3888
3946 3889 remoterev = peer.lookup(rev)
3947 3890 hexrev = fm.hexfunc(remoterev)
3948 3891 if default or id:
3949 3892 output = [hexrev]
3950 3893 fm.data(id=hexrev)
3951 3894
3952 3895 @util.cachefunc
3953 3896 def getbms():
3954 3897 bms = []
3955 3898
3956 3899 if b'bookmarks' in peer.listkeys(b'namespaces'):
3957 3900 hexremoterev = hex(remoterev)
3958 3901 bms = [
3959 3902 bm
3960 3903 for bm, bmr in pycompat.iteritems(
3961 3904 peer.listkeys(b'bookmarks')
3962 3905 )
3963 3906 if bmr == hexremoterev
3964 3907 ]
3965 3908
3966 3909 return sorted(bms)
3967 3910
3968 3911 if fm.isplain():
3969 3912 if bookmarks:
3970 3913 output.extend(getbms())
3971 3914 elif default and not ui.quiet:
3972 3915 # multiple bookmarks for a single parent separated by '/'
3973 3916 bm = b'/'.join(getbms())
3974 3917 if bm:
3975 3918 output.append(bm)
3976 3919 else:
3977 3920 fm.data(node=hex(remoterev))
3978 3921 if bookmarks or b'bookmarks' in fm.datahint():
3979 3922 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3980 3923 else:
3981 3924 if rev:
3982 3925 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3983 3926 ctx = scmutil.revsingle(repo, rev, None)
3984 3927
3985 3928 if ctx.rev() is None:
3986 3929 ctx = repo[None]
3987 3930 parents = ctx.parents()
3988 3931 taglist = []
3989 3932 for p in parents:
3990 3933 taglist.extend(p.tags())
3991 3934
3992 3935 dirty = b""
3993 3936 if ctx.dirty(missing=True, merge=False, branch=False):
3994 3937 dirty = b'+'
3995 3938 fm.data(dirty=dirty)
3996 3939
3997 3940 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3998 3941 if default or id:
3999 3942 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
4000 3943 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
4001 3944
4002 3945 if num:
4003 3946 numoutput = [b"%d" % p.rev() for p in parents]
4004 3947 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
4005 3948
4006 3949 fm.data(
4007 3950 parents=fm.formatlist(
4008 3951 [fm.hexfunc(p.node()) for p in parents], name=b'node'
4009 3952 )
4010 3953 )
4011 3954 else:
4012 3955 hexoutput = fm.hexfunc(ctx.node())
4013 3956 if default or id:
4014 3957 output = [hexoutput]
4015 3958 fm.data(id=hexoutput)
4016 3959
4017 3960 if num:
4018 3961 output.append(pycompat.bytestr(ctx.rev()))
4019 3962 taglist = ctx.tags()
4020 3963
4021 3964 if default and not ui.quiet:
4022 3965 b = ctx.branch()
4023 3966 if b != b'default':
4024 3967 output.append(b"(%s)" % b)
4025 3968
4026 3969 # multiple tags for a single parent separated by '/'
4027 3970 t = b'/'.join(taglist)
4028 3971 if t:
4029 3972 output.append(t)
4030 3973
4031 3974 # multiple bookmarks for a single parent separated by '/'
4032 3975 bm = b'/'.join(ctx.bookmarks())
4033 3976 if bm:
4034 3977 output.append(bm)
4035 3978 else:
4036 3979 if branch:
4037 3980 output.append(ctx.branch())
4038 3981
4039 3982 if tags:
4040 3983 output.extend(taglist)
4041 3984
4042 3985 if bookmarks:
4043 3986 output.extend(ctx.bookmarks())
4044 3987
4045 3988 fm.data(node=ctx.hex())
4046 3989 fm.data(branch=ctx.branch())
4047 3990 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4048 3991 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4049 3992 fm.context(ctx=ctx)
4050 3993
4051 3994 fm.plain(b"%s\n" % b' '.join(output))
4052 3995 fm.end()
4053 3996
4054 3997
4055 3998 @command(
4056 3999 b'import|patch',
4057 4000 [
4058 4001 (
4059 4002 b'p',
4060 4003 b'strip',
4061 4004 1,
4062 4005 _(
4063 4006 b'directory strip option for patch. This has the same '
4064 4007 b'meaning as the corresponding patch option'
4065 4008 ),
4066 4009 _(b'NUM'),
4067 4010 ),
4068 4011 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4069 4012 (b'', b'secret', None, _(b'use the secret phase for committing')),
4070 4013 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4071 4014 (
4072 4015 b'f',
4073 4016 b'force',
4074 4017 None,
4075 4018 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4076 4019 ),
4077 4020 (
4078 4021 b'',
4079 4022 b'no-commit',
4080 4023 None,
4081 4024 _(b"don't commit, just update the working directory"),
4082 4025 ),
4083 4026 (
4084 4027 b'',
4085 4028 b'bypass',
4086 4029 None,
4087 4030 _(b"apply patch without touching the working directory"),
4088 4031 ),
4089 4032 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4090 4033 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4091 4034 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4092 4035 (
4093 4036 b'',
4094 4037 b'import-branch',
4095 4038 None,
4096 4039 _(b'use any branch information in patch (implied by --exact)'),
4097 4040 ),
4098 4041 ]
4099 4042 + commitopts
4100 4043 + commitopts2
4101 4044 + similarityopts,
4102 4045 _(b'[OPTION]... PATCH...'),
4103 4046 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4104 4047 )
4105 4048 def import_(ui, repo, patch1=None, *patches, **opts):
4106 4049 """import an ordered set of patches
4107 4050
4108 4051 Import a list of patches and commit them individually (unless
4109 4052 --no-commit is specified).
4110 4053
4111 4054 To read a patch from standard input (stdin), use "-" as the patch
4112 4055 name. If a URL is specified, the patch will be downloaded from
4113 4056 there.
4114 4057
4115 4058 Import first applies changes to the working directory (unless
4116 4059 --bypass is specified), import will abort if there are outstanding
4117 4060 changes.
4118 4061
4119 4062 Use --bypass to apply and commit patches directly to the
4120 4063 repository, without affecting the working directory. Without
4121 4064 --exact, patches will be applied on top of the working directory
4122 4065 parent revision.
4123 4066
4124 4067 You can import a patch straight from a mail message. Even patches
4125 4068 as attachments work (to use the body part, it must have type
4126 4069 text/plain or text/x-patch). From and Subject headers of email
4127 4070 message are used as default committer and commit message. All
4128 4071 text/plain body parts before first diff are added to the commit
4129 4072 message.
4130 4073
4131 4074 If the imported patch was generated by :hg:`export`, user and
4132 4075 description from patch override values from message headers and
4133 4076 body. Values given on command line with -m/--message and -u/--user
4134 4077 override these.
4135 4078
4136 4079 If --exact is specified, import will set the working directory to
4137 4080 the parent of each patch before applying it, and will abort if the
4138 4081 resulting changeset has a different ID than the one recorded in
4139 4082 the patch. This will guard against various ways that portable
4140 4083 patch formats and mail systems might fail to transfer Mercurial
4141 4084 data or metadata. See :hg:`bundle` for lossless transmission.
4142 4085
4143 4086 Use --partial to ensure a changeset will be created from the patch
4144 4087 even if some hunks fail to apply. Hunks that fail to apply will be
4145 4088 written to a <target-file>.rej file. Conflicts can then be resolved
4146 4089 by hand before :hg:`commit --amend` is run to update the created
4147 4090 changeset. This flag exists to let people import patches that
4148 4091 partially apply without losing the associated metadata (author,
4149 4092 date, description, ...).
4150 4093
4151 4094 .. note::
4152 4095
4153 4096 When no hunks apply cleanly, :hg:`import --partial` will create
4154 4097 an empty changeset, importing only the patch metadata.
4155 4098
4156 4099 With -s/--similarity, hg will attempt to discover renames and
4157 4100 copies in the patch in the same way as :hg:`addremove`.
4158 4101
4159 4102 It is possible to use external patch programs to perform the patch
4160 4103 by setting the ``ui.patch`` configuration option. For the default
4161 4104 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4162 4105 See :hg:`help config` for more information about configuration
4163 4106 files and how to use these options.
4164 4107
4165 4108 See :hg:`help dates` for a list of formats valid for -d/--date.
4166 4109
4167 4110 .. container:: verbose
4168 4111
4169 4112 Examples:
4170 4113
4171 4114 - import a traditional patch from a website and detect renames::
4172 4115
4173 4116 hg import -s 80 http://example.com/bugfix.patch
4174 4117
4175 4118 - import a changeset from an hgweb server::
4176 4119
4177 4120 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4178 4121
4179 4122 - import all the patches in an Unix-style mbox::
4180 4123
4181 4124 hg import incoming-patches.mbox
4182 4125
4183 4126 - import patches from stdin::
4184 4127
4185 4128 hg import -
4186 4129
4187 4130 - attempt to exactly restore an exported changeset (not always
4188 4131 possible)::
4189 4132
4190 4133 hg import --exact proposed-fix.patch
4191 4134
4192 4135 - use an external tool to apply a patch which is too fuzzy for
4193 4136 the default internal tool.
4194 4137
4195 4138 hg import --config ui.patch="patch --merge" fuzzy.patch
4196 4139
4197 4140 - change the default fuzzing from 2 to a less strict 7
4198 4141
4199 4142 hg import --config ui.fuzz=7 fuzz.patch
4200 4143
4201 4144 Returns 0 on success, 1 on partial success (see --partial).
4202 4145 """
4203 4146
4204 4147 opts = pycompat.byteskwargs(opts)
4205 4148 if not patch1:
4206 4149 raise error.Abort(_(b'need at least one patch to import'))
4207 4150
4208 4151 patches = (patch1,) + patches
4209 4152
4210 4153 date = opts.get(b'date')
4211 4154 if date:
4212 4155 opts[b'date'] = dateutil.parsedate(date)
4213 4156
4214 4157 exact = opts.get(b'exact')
4215 4158 update = not opts.get(b'bypass')
4216 4159 if not update and opts.get(b'no_commit'):
4217 4160 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4218 4161 if opts.get(b'secret') and opts.get(b'no_commit'):
4219 4162 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4220 4163 try:
4221 4164 sim = float(opts.get(b'similarity') or 0)
4222 4165 except ValueError:
4223 4166 raise error.Abort(_(b'similarity must be a number'))
4224 4167 if sim < 0 or sim > 100:
4225 4168 raise error.Abort(_(b'similarity must be between 0 and 100'))
4226 4169 if sim and not update:
4227 4170 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4228 4171 if exact:
4229 4172 if opts.get(b'edit'):
4230 4173 raise error.Abort(_(b'cannot use --exact with --edit'))
4231 4174 if opts.get(b'prefix'):
4232 4175 raise error.Abort(_(b'cannot use --exact with --prefix'))
4233 4176
4234 4177 base = opts[b"base"]
4235 4178 msgs = []
4236 4179 ret = 0
4237 4180
4238 4181 with repo.wlock():
4239 4182 if update:
4240 4183 cmdutil.checkunfinished(repo)
4241 4184 if exact or not opts.get(b'force'):
4242 4185 cmdutil.bailifchanged(repo)
4243 4186
4244 4187 if not opts.get(b'no_commit'):
4245 4188 lock = repo.lock
4246 4189 tr = lambda: repo.transaction(b'import')
4247 4190 dsguard = util.nullcontextmanager
4248 4191 else:
4249 4192 lock = util.nullcontextmanager
4250 4193 tr = util.nullcontextmanager
4251 4194 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4252 4195 with lock(), tr(), dsguard():
4253 4196 parents = repo[None].parents()
4254 4197 for patchurl in patches:
4255 4198 if patchurl == b'-':
4256 4199 ui.status(_(b'applying patch from stdin\n'))
4257 4200 patchfile = ui.fin
4258 4201 patchurl = b'stdin' # for error message
4259 4202 else:
4260 4203 patchurl = os.path.join(base, patchurl)
4261 4204 ui.status(_(b'applying %s\n') % patchurl)
4262 4205 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4263 4206
4264 4207 haspatch = False
4265 4208 for hunk in patch.split(patchfile):
4266 4209 with patch.extract(ui, hunk) as patchdata:
4267 4210 msg, node, rej = cmdutil.tryimportone(
4268 4211 ui, repo, patchdata, parents, opts, msgs, hg.clean
4269 4212 )
4270 4213 if msg:
4271 4214 haspatch = True
4272 4215 ui.note(msg + b'\n')
4273 4216 if update or exact:
4274 4217 parents = repo[None].parents()
4275 4218 else:
4276 4219 parents = [repo[node]]
4277 4220 if rej:
4278 4221 ui.write_err(_(b"patch applied partially\n"))
4279 4222 ui.write_err(
4280 4223 _(
4281 4224 b"(fix the .rej files and run "
4282 4225 b"`hg commit --amend`)\n"
4283 4226 )
4284 4227 )
4285 4228 ret = 1
4286 4229 break
4287 4230
4288 4231 if not haspatch:
4289 4232 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4290 4233
4291 4234 if msgs:
4292 4235 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4293 4236 return ret
4294 4237
4295 4238
4296 4239 @command(
4297 4240 b'incoming|in',
4298 4241 [
4299 4242 (
4300 4243 b'f',
4301 4244 b'force',
4302 4245 None,
4303 4246 _(b'run even if remote repository is unrelated'),
4304 4247 ),
4305 4248 (b'n', b'newest-first', None, _(b'show newest record first')),
4306 4249 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4307 4250 (
4308 4251 b'r',
4309 4252 b'rev',
4310 4253 [],
4311 4254 _(b'a remote changeset intended to be added'),
4312 4255 _(b'REV'),
4313 4256 ),
4314 4257 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4315 4258 (
4316 4259 b'b',
4317 4260 b'branch',
4318 4261 [],
4319 4262 _(b'a specific branch you would like to pull'),
4320 4263 _(b'BRANCH'),
4321 4264 ),
4322 4265 ]
4323 4266 + logopts
4324 4267 + remoteopts
4325 4268 + subrepoopts,
4326 4269 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4327 4270 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4328 4271 )
4329 4272 def incoming(ui, repo, source=b"default", **opts):
4330 4273 """show new changesets found in source
4331 4274
4332 4275 Show new changesets found in the specified path/URL or the default
4333 4276 pull location. These are the changesets that would have been pulled
4334 4277 by :hg:`pull` at the time you issued this command.
4335 4278
4336 4279 See pull for valid source format details.
4337 4280
4338 4281 .. container:: verbose
4339 4282
4340 4283 With -B/--bookmarks, the result of bookmark comparison between
4341 4284 local and remote repositories is displayed. With -v/--verbose,
4342 4285 status is also displayed for each bookmark like below::
4343 4286
4344 4287 BM1 01234567890a added
4345 4288 BM2 1234567890ab advanced
4346 4289 BM3 234567890abc diverged
4347 4290 BM4 34567890abcd changed
4348 4291
4349 4292 The action taken locally when pulling depends on the
4350 4293 status of each bookmark:
4351 4294
4352 4295 :``added``: pull will create it
4353 4296 :``advanced``: pull will update it
4354 4297 :``diverged``: pull will create a divergent bookmark
4355 4298 :``changed``: result depends on remote changesets
4356 4299
4357 4300 From the point of view of pulling behavior, bookmark
4358 4301 existing only in the remote repository are treated as ``added``,
4359 4302 even if it is in fact locally deleted.
4360 4303
4361 4304 .. container:: verbose
4362 4305
4363 4306 For remote repository, using --bundle avoids downloading the
4364 4307 changesets twice if the incoming is followed by a pull.
4365 4308
4366 4309 Examples:
4367 4310
4368 4311 - show incoming changes with patches and full description::
4369 4312
4370 4313 hg incoming -vp
4371 4314
4372 4315 - show incoming changes excluding merges, store a bundle::
4373 4316
4374 4317 hg in -vpM --bundle incoming.hg
4375 4318 hg pull incoming.hg
4376 4319
4377 4320 - briefly list changes inside a bundle::
4378 4321
4379 4322 hg in changes.hg -T "{desc|firstline}\\n"
4380 4323
4381 4324 Returns 0 if there are incoming changes, 1 otherwise.
4382 4325 """
4383 4326 opts = pycompat.byteskwargs(opts)
4384 4327 if opts.get(b'graph'):
4385 4328 logcmdutil.checkunsupportedgraphflags([], opts)
4386 4329
4387 4330 def display(other, chlist, displayer):
4388 4331 revdag = logcmdutil.graphrevs(other, chlist, opts)
4389 4332 logcmdutil.displaygraph(
4390 4333 ui, repo, revdag, displayer, graphmod.asciiedges
4391 4334 )
4392 4335
4393 4336 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4394 4337 return 0
4395 4338
4396 4339 if opts.get(b'bundle') and opts.get(b'subrepos'):
4397 4340 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4398 4341
4399 4342 if opts.get(b'bookmarks'):
4400 4343 source, branches = hg.parseurl(
4401 4344 ui.expandpath(source), opts.get(b'branch')
4402 4345 )
4403 4346 other = hg.peer(repo, opts, source)
4404 4347 if b'bookmarks' not in other.listkeys(b'namespaces'):
4405 4348 ui.warn(_(b"remote doesn't support bookmarks\n"))
4406 4349 return 0
4407 4350 ui.pager(b'incoming')
4408 4351 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4409 4352 return bookmarks.incoming(ui, repo, other)
4410 4353
4411 4354 repo._subtoppath = ui.expandpath(source)
4412 4355 try:
4413 4356 return hg.incoming(ui, repo, source, opts)
4414 4357 finally:
4415 4358 del repo._subtoppath
4416 4359
4417 4360
4418 4361 @command(
4419 4362 b'init',
4420 4363 remoteopts,
4421 4364 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4422 4365 helpcategory=command.CATEGORY_REPO_CREATION,
4423 4366 helpbasic=True,
4424 4367 norepo=True,
4425 4368 )
4426 4369 def init(ui, dest=b".", **opts):
4427 4370 """create a new repository in the given directory
4428 4371
4429 4372 Initialize a new repository in the given directory. If the given
4430 4373 directory does not exist, it will be created.
4431 4374
4432 4375 If no directory is given, the current directory is used.
4433 4376
4434 4377 It is possible to specify an ``ssh://`` URL as the destination.
4435 4378 See :hg:`help urls` for more information.
4436 4379
4437 4380 Returns 0 on success.
4438 4381 """
4439 4382 opts = pycompat.byteskwargs(opts)
4440 4383 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4441 4384
4442 4385
4443 4386 @command(
4444 4387 b'locate',
4445 4388 [
4446 4389 (
4447 4390 b'r',
4448 4391 b'rev',
4449 4392 b'',
4450 4393 _(b'search the repository as it is in REV'),
4451 4394 _(b'REV'),
4452 4395 ),
4453 4396 (
4454 4397 b'0',
4455 4398 b'print0',
4456 4399 None,
4457 4400 _(b'end filenames with NUL, for use with xargs'),
4458 4401 ),
4459 4402 (
4460 4403 b'f',
4461 4404 b'fullpath',
4462 4405 None,
4463 4406 _(b'print complete paths from the filesystem root'),
4464 4407 ),
4465 4408 ]
4466 4409 + walkopts,
4467 4410 _(b'[OPTION]... [PATTERN]...'),
4468 4411 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4469 4412 )
4470 4413 def locate(ui, repo, *pats, **opts):
4471 4414 """locate files matching specific patterns (DEPRECATED)
4472 4415
4473 4416 Print files under Mercurial control in the working directory whose
4474 4417 names match the given patterns.
4475 4418
4476 4419 By default, this command searches all directories in the working
4477 4420 directory. To search just the current directory and its
4478 4421 subdirectories, use "--include .".
4479 4422
4480 4423 If no patterns are given to match, this command prints the names
4481 4424 of all files under Mercurial control in the working directory.
4482 4425
4483 4426 If you want to feed the output of this command into the "xargs"
4484 4427 command, use the -0 option to both this command and "xargs". This
4485 4428 will avoid the problem of "xargs" treating single filenames that
4486 4429 contain whitespace as multiple filenames.
4487 4430
4488 4431 See :hg:`help files` for a more versatile command.
4489 4432
4490 4433 Returns 0 if a match is found, 1 otherwise.
4491 4434 """
4492 4435 opts = pycompat.byteskwargs(opts)
4493 4436 if opts.get(b'print0'):
4494 4437 end = b'\0'
4495 4438 else:
4496 4439 end = b'\n'
4497 4440 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4498 4441
4499 4442 ret = 1
4500 4443 m = scmutil.match(
4501 4444 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4502 4445 )
4503 4446
4504 4447 ui.pager(b'locate')
4505 4448 if ctx.rev() is None:
4506 4449 # When run on the working copy, "locate" includes removed files, so
4507 4450 # we get the list of files from the dirstate.
4508 4451 filesgen = sorted(repo.dirstate.matches(m))
4509 4452 else:
4510 4453 filesgen = ctx.matches(m)
4511 4454 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4512 4455 for abs in filesgen:
4513 4456 if opts.get(b'fullpath'):
4514 4457 ui.write(repo.wjoin(abs), end)
4515 4458 else:
4516 4459 ui.write(uipathfn(abs), end)
4517 4460 ret = 0
4518 4461
4519 4462 return ret
4520 4463
4521 4464
4522 4465 @command(
4523 4466 b'log|history',
4524 4467 [
4525 4468 (
4526 4469 b'f',
4527 4470 b'follow',
4528 4471 None,
4529 4472 _(
4530 4473 b'follow changeset history, or file history across copies and renames'
4531 4474 ),
4532 4475 ),
4533 4476 (
4534 4477 b'',
4535 4478 b'follow-first',
4536 4479 None,
4537 4480 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4538 4481 ),
4539 4482 (
4540 4483 b'd',
4541 4484 b'date',
4542 4485 b'',
4543 4486 _(b'show revisions matching date spec'),
4544 4487 _(b'DATE'),
4545 4488 ),
4546 4489 (b'C', b'copies', None, _(b'show copied files')),
4547 4490 (
4548 4491 b'k',
4549 4492 b'keyword',
4550 4493 [],
4551 4494 _(b'do case-insensitive search for a given text'),
4552 4495 _(b'TEXT'),
4553 4496 ),
4554 4497 (
4555 4498 b'r',
4556 4499 b'rev',
4557 4500 [],
4558 4501 _(b'show the specified revision or revset'),
4559 4502 _(b'REV'),
4560 4503 ),
4561 4504 (
4562 4505 b'L',
4563 4506 b'line-range',
4564 4507 [],
4565 4508 _(b'follow line range of specified file (EXPERIMENTAL)'),
4566 4509 _(b'FILE,RANGE'),
4567 4510 ),
4568 4511 (
4569 4512 b'',
4570 4513 b'removed',
4571 4514 None,
4572 4515 _(b'include revisions where files were removed'),
4573 4516 ),
4574 4517 (
4575 4518 b'm',
4576 4519 b'only-merges',
4577 4520 None,
4578 4521 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4579 4522 ),
4580 4523 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4581 4524 (
4582 4525 b'',
4583 4526 b'only-branch',
4584 4527 [],
4585 4528 _(
4586 4529 b'show only changesets within the given named branch (DEPRECATED)'
4587 4530 ),
4588 4531 _(b'BRANCH'),
4589 4532 ),
4590 4533 (
4591 4534 b'b',
4592 4535 b'branch',
4593 4536 [],
4594 4537 _(b'show changesets within the given named branch'),
4595 4538 _(b'BRANCH'),
4596 4539 ),
4597 4540 (
4598 4541 b'P',
4599 4542 b'prune',
4600 4543 [],
4601 4544 _(b'do not display revision or any of its ancestors'),
4602 4545 _(b'REV'),
4603 4546 ),
4604 4547 ]
4605 4548 + logopts
4606 4549 + walkopts,
4607 4550 _(b'[OPTION]... [FILE]'),
4608 4551 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4609 4552 helpbasic=True,
4610 4553 inferrepo=True,
4611 4554 intents={INTENT_READONLY},
4612 4555 )
4613 4556 def log(ui, repo, *pats, **opts):
4614 4557 """show revision history of entire repository or files
4615 4558
4616 4559 Print the revision history of the specified files or the entire
4617 4560 project.
4618 4561
4619 4562 If no revision range is specified, the default is ``tip:0`` unless
4620 4563 --follow is set, in which case the working directory parent is
4621 4564 used as the starting revision.
4622 4565
4623 4566 File history is shown without following rename or copy history of
4624 4567 files. Use -f/--follow with a filename to follow history across
4625 4568 renames and copies. --follow without a filename will only show
4626 4569 ancestors of the starting revision.
4627 4570
4628 4571 By default this command prints revision number and changeset id,
4629 4572 tags, non-trivial parents, user, date and time, and a summary for
4630 4573 each commit. When the -v/--verbose switch is used, the list of
4631 4574 changed files and full commit message are shown.
4632 4575
4633 4576 With --graph the revisions are shown as an ASCII art DAG with the most
4634 4577 recent changeset at the top.
4635 4578 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4636 4579 involved in an unresolved merge conflict, '_' closes a branch,
4637 4580 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4638 4581 changeset from the lines below is a parent of the 'o' merge on the same
4639 4582 line.
4640 4583 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4641 4584 of a '|' indicates one or more revisions in a path are omitted.
4642 4585
4643 4586 .. container:: verbose
4644 4587
4645 4588 Use -L/--line-range FILE,M:N options to follow the history of lines
4646 4589 from M to N in FILE. With -p/--patch only diff hunks affecting
4647 4590 specified line range will be shown. This option requires --follow;
4648 4591 it can be specified multiple times. Currently, this option is not
4649 4592 compatible with --graph. This option is experimental.
4650 4593
4651 4594 .. note::
4652 4595
4653 4596 :hg:`log --patch` may generate unexpected diff output for merge
4654 4597 changesets, as it will only compare the merge changeset against
4655 4598 its first parent. Also, only files different from BOTH parents
4656 4599 will appear in files:.
4657 4600
4658 4601 .. note::
4659 4602
4660 4603 For performance reasons, :hg:`log FILE` may omit duplicate changes
4661 4604 made on branches and will not show removals or mode changes. To
4662 4605 see all such changes, use the --removed switch.
4663 4606
4664 4607 .. container:: verbose
4665 4608
4666 4609 .. note::
4667 4610
4668 4611 The history resulting from -L/--line-range options depends on diff
4669 4612 options; for instance if white-spaces are ignored, respective changes
4670 4613 with only white-spaces in specified line range will not be listed.
4671 4614
4672 4615 .. container:: verbose
4673 4616
4674 4617 Some examples:
4675 4618
4676 4619 - changesets with full descriptions and file lists::
4677 4620
4678 4621 hg log -v
4679 4622
4680 4623 - changesets ancestral to the working directory::
4681 4624
4682 4625 hg log -f
4683 4626
4684 4627 - last 10 commits on the current branch::
4685 4628
4686 4629 hg log -l 10 -b .
4687 4630
4688 4631 - changesets showing all modifications of a file, including removals::
4689 4632
4690 4633 hg log --removed file.c
4691 4634
4692 4635 - all changesets that touch a directory, with diffs, excluding merges::
4693 4636
4694 4637 hg log -Mp lib/
4695 4638
4696 4639 - all revision numbers that match a keyword::
4697 4640
4698 4641 hg log -k bug --template "{rev}\\n"
4699 4642
4700 4643 - the full hash identifier of the working directory parent::
4701 4644
4702 4645 hg log -r . --template "{node}\\n"
4703 4646
4704 4647 - list available log templates::
4705 4648
4706 4649 hg log -T list
4707 4650
4708 4651 - check if a given changeset is included in a tagged release::
4709 4652
4710 4653 hg log -r "a21ccf and ancestor(1.9)"
4711 4654
4712 4655 - find all changesets by some user in a date range::
4713 4656
4714 4657 hg log -k alice -d "may 2008 to jul 2008"
4715 4658
4716 4659 - summary of all changesets after the last tag::
4717 4660
4718 4661 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4719 4662
4720 4663 - changesets touching lines 13 to 23 for file.c::
4721 4664
4722 4665 hg log -L file.c,13:23
4723 4666
4724 4667 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4725 4668 main.c with patch::
4726 4669
4727 4670 hg log -L file.c,13:23 -L main.c,2:6 -p
4728 4671
4729 4672 See :hg:`help dates` for a list of formats valid for -d/--date.
4730 4673
4731 4674 See :hg:`help revisions` for more about specifying and ordering
4732 4675 revisions.
4733 4676
4734 4677 See :hg:`help templates` for more about pre-packaged styles and
4735 4678 specifying custom templates. The default template used by the log
4736 4679 command can be customized via the ``ui.logtemplate`` configuration
4737 4680 setting.
4738 4681
4739 4682 Returns 0 on success.
4740 4683
4741 4684 """
4742 4685 opts = pycompat.byteskwargs(opts)
4743 4686 linerange = opts.get(b'line_range')
4744 4687
4745 4688 if linerange and not opts.get(b'follow'):
4746 4689 raise error.Abort(_(b'--line-range requires --follow'))
4747 4690
4748 4691 if linerange and pats:
4749 4692 # TODO: take pats as patterns with no line-range filter
4750 4693 raise error.Abort(
4751 4694 _(b'FILE arguments are not compatible with --line-range option')
4752 4695 )
4753 4696
4754 4697 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4755 4698 revs, differ = logcmdutil.getrevs(
4756 4699 repo, logcmdutil.parseopts(ui, pats, opts)
4757 4700 )
4758 4701 if linerange:
4759 4702 # TODO: should follow file history from logcmdutil._initialrevs(),
4760 4703 # then filter the result by logcmdutil._makerevset() and --limit
4761 4704 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4762 4705
4763 4706 getcopies = None
4764 4707 if opts.get(b'copies'):
4765 4708 endrev = None
4766 4709 if revs:
4767 4710 endrev = revs.max() + 1
4768 4711 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4769 4712
4770 4713 ui.pager(b'log')
4771 4714 displayer = logcmdutil.changesetdisplayer(
4772 4715 ui, repo, opts, differ, buffered=True
4773 4716 )
4774 4717 if opts.get(b'graph'):
4775 4718 displayfn = logcmdutil.displaygraphrevs
4776 4719 else:
4777 4720 displayfn = logcmdutil.displayrevs
4778 4721 displayfn(ui, repo, revs, displayer, getcopies)
4779 4722
4780 4723
4781 4724 @command(
4782 4725 b'manifest',
4783 4726 [
4784 4727 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4785 4728 (b'', b'all', False, _(b"list files from all revisions")),
4786 4729 ]
4787 4730 + formatteropts,
4788 4731 _(b'[-r REV]'),
4789 4732 helpcategory=command.CATEGORY_MAINTENANCE,
4790 4733 intents={INTENT_READONLY},
4791 4734 )
4792 4735 def manifest(ui, repo, node=None, rev=None, **opts):
4793 4736 """output the current or given revision of the project manifest
4794 4737
4795 4738 Print a list of version controlled files for the given revision.
4796 4739 If no revision is given, the first parent of the working directory
4797 4740 is used, or the null revision if no revision is checked out.
4798 4741
4799 4742 With -v, print file permissions, symlink and executable bits.
4800 4743 With --debug, print file revision hashes.
4801 4744
4802 4745 If option --all is specified, the list of all files from all revisions
4803 4746 is printed. This includes deleted and renamed files.
4804 4747
4805 4748 Returns 0 on success.
4806 4749 """
4807 4750 opts = pycompat.byteskwargs(opts)
4808 4751 fm = ui.formatter(b'manifest', opts)
4809 4752
4810 4753 if opts.get(b'all'):
4811 4754 if rev or node:
4812 4755 raise error.Abort(_(b"can't specify a revision with --all"))
4813 4756
4814 4757 res = set()
4815 4758 for rev in repo:
4816 4759 ctx = repo[rev]
4817 4760 res |= set(ctx.files())
4818 4761
4819 4762 ui.pager(b'manifest')
4820 4763 for f in sorted(res):
4821 4764 fm.startitem()
4822 4765 fm.write(b"path", b'%s\n', f)
4823 4766 fm.end()
4824 4767 return
4825 4768
4826 4769 if rev and node:
4827 4770 raise error.Abort(_(b"please specify just one revision"))
4828 4771
4829 4772 if not node:
4830 4773 node = rev
4831 4774
4832 4775 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4833 4776 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4834 4777 if node:
4835 4778 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4836 4779 ctx = scmutil.revsingle(repo, node)
4837 4780 mf = ctx.manifest()
4838 4781 ui.pager(b'manifest')
4839 4782 for f in ctx:
4840 4783 fm.startitem()
4841 4784 fm.context(ctx=ctx)
4842 4785 fl = ctx[f].flags()
4843 4786 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4844 4787 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4845 4788 fm.write(b'path', b'%s\n', f)
4846 4789 fm.end()
4847 4790
4848 4791
4849 4792 @command(
4850 4793 b'merge',
4851 4794 [
4852 4795 (
4853 4796 b'f',
4854 4797 b'force',
4855 4798 None,
4856 4799 _(b'force a merge including outstanding changes (DEPRECATED)'),
4857 4800 ),
4858 4801 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4859 4802 (
4860 4803 b'P',
4861 4804 b'preview',
4862 4805 None,
4863 4806 _(b'review revisions to merge (no merge is performed)'),
4864 4807 ),
4865 4808 (b'', b'abort', None, _(b'abort the ongoing merge')),
4866 4809 ]
4867 4810 + mergetoolopts,
4868 4811 _(b'[-P] [[-r] REV]'),
4869 4812 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4870 4813 helpbasic=True,
4871 4814 )
4872 4815 def merge(ui, repo, node=None, **opts):
4873 4816 """merge another revision into working directory
4874 4817
4875 4818 The current working directory is updated with all changes made in
4876 4819 the requested revision since the last common predecessor revision.
4877 4820
4878 4821 Files that changed between either parent are marked as changed for
4879 4822 the next commit and a commit must be performed before any further
4880 4823 updates to the repository are allowed. The next commit will have
4881 4824 two parents.
4882 4825
4883 4826 ``--tool`` can be used to specify the merge tool used for file
4884 4827 merges. It overrides the HGMERGE environment variable and your
4885 4828 configuration files. See :hg:`help merge-tools` for options.
4886 4829
4887 4830 If no revision is specified, the working directory's parent is a
4888 4831 head revision, and the current branch contains exactly one other
4889 4832 head, the other head is merged with by default. Otherwise, an
4890 4833 explicit revision with which to merge must be provided.
4891 4834
4892 4835 See :hg:`help resolve` for information on handling file conflicts.
4893 4836
4894 4837 To undo an uncommitted merge, use :hg:`merge --abort` which
4895 4838 will check out a clean copy of the original merge parent, losing
4896 4839 all changes.
4897 4840
4898 4841 Returns 0 on success, 1 if there are unresolved files.
4899 4842 """
4900 4843
4901 4844 opts = pycompat.byteskwargs(opts)
4902 4845 abort = opts.get(b'abort')
4903 4846 if abort and repo.dirstate.p2() == nullid:
4904 4847 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4905 4848 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4906 4849 if abort:
4907 4850 state = cmdutil.getunfinishedstate(repo)
4908 4851 if state and state._opname != b'merge':
4909 4852 raise error.Abort(
4910 4853 _(b'cannot abort merge with %s in progress') % (state._opname),
4911 4854 hint=state.hint(),
4912 4855 )
4913 4856 if node:
4914 4857 raise error.Abort(_(b"cannot specify a node with --abort"))
4915 4858 return hg.abortmerge(repo.ui, repo)
4916 4859
4917 4860 if opts.get(b'rev') and node:
4918 4861 raise error.Abort(_(b"please specify just one revision"))
4919 4862 if not node:
4920 4863 node = opts.get(b'rev')
4921 4864
4922 4865 if node:
4923 4866 ctx = scmutil.revsingle(repo, node)
4924 4867 else:
4925 4868 if ui.configbool(b'commands', b'merge.require-rev'):
4926 4869 raise error.Abort(
4927 4870 _(
4928 4871 b'configuration requires specifying revision to merge '
4929 4872 b'with'
4930 4873 )
4931 4874 )
4932 4875 ctx = repo[destutil.destmerge(repo)]
4933 4876
4934 4877 if ctx.node() is None:
4935 4878 raise error.Abort(_(b'merging with the working copy has no effect'))
4936 4879
4937 4880 if opts.get(b'preview'):
4938 4881 # find nodes that are ancestors of p2 but not of p1
4939 4882 p1 = repo[b'.'].node()
4940 4883 p2 = ctx.node()
4941 4884 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4942 4885
4943 4886 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4944 4887 for node in nodes:
4945 4888 displayer.show(repo[node])
4946 4889 displayer.close()
4947 4890 return 0
4948 4891
4949 4892 # ui.forcemerge is an internal variable, do not document
4950 4893 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4951 4894 with ui.configoverride(overrides, b'merge'):
4952 4895 force = opts.get(b'force')
4953 4896 labels = [b'working copy', b'merge rev']
4954 4897 return hg.merge(ctx, force=force, labels=labels)
4955 4898
4956 4899
4957 4900 statemod.addunfinished(
4958 4901 b'merge',
4959 4902 fname=None,
4960 4903 clearable=True,
4961 4904 allowcommit=True,
4962 4905 cmdmsg=_(b'outstanding uncommitted merge'),
4963 4906 abortfunc=hg.abortmerge,
4964 4907 statushint=_(
4965 4908 b'To continue: hg commit\nTo abort: hg merge --abort'
4966 4909 ),
4967 4910 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4968 4911 )
4969 4912
4970 4913
4971 4914 @command(
4972 4915 b'outgoing|out',
4973 4916 [
4974 4917 (
4975 4918 b'f',
4976 4919 b'force',
4977 4920 None,
4978 4921 _(b'run even when the destination is unrelated'),
4979 4922 ),
4980 4923 (
4981 4924 b'r',
4982 4925 b'rev',
4983 4926 [],
4984 4927 _(b'a changeset intended to be included in the destination'),
4985 4928 _(b'REV'),
4986 4929 ),
4987 4930 (b'n', b'newest-first', None, _(b'show newest record first')),
4988 4931 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4989 4932 (
4990 4933 b'b',
4991 4934 b'branch',
4992 4935 [],
4993 4936 _(b'a specific branch you would like to push'),
4994 4937 _(b'BRANCH'),
4995 4938 ),
4996 4939 ]
4997 4940 + logopts
4998 4941 + remoteopts
4999 4942 + subrepoopts,
5000 4943 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
5001 4944 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5002 4945 )
5003 4946 def outgoing(ui, repo, dest=None, **opts):
5004 4947 """show changesets not found in the destination
5005 4948
5006 4949 Show changesets not found in the specified destination repository
5007 4950 or the default push location. These are the changesets that would
5008 4951 be pushed if a push was requested.
5009 4952
5010 4953 See pull for details of valid destination formats.
5011 4954
5012 4955 .. container:: verbose
5013 4956
5014 4957 With -B/--bookmarks, the result of bookmark comparison between
5015 4958 local and remote repositories is displayed. With -v/--verbose,
5016 4959 status is also displayed for each bookmark like below::
5017 4960
5018 4961 BM1 01234567890a added
5019 4962 BM2 deleted
5020 4963 BM3 234567890abc advanced
5021 4964 BM4 34567890abcd diverged
5022 4965 BM5 4567890abcde changed
5023 4966
5024 4967 The action taken when pushing depends on the
5025 4968 status of each bookmark:
5026 4969
5027 4970 :``added``: push with ``-B`` will create it
5028 4971 :``deleted``: push with ``-B`` will delete it
5029 4972 :``advanced``: push will update it
5030 4973 :``diverged``: push with ``-B`` will update it
5031 4974 :``changed``: push with ``-B`` will update it
5032 4975
5033 4976 From the point of view of pushing behavior, bookmarks
5034 4977 existing only in the remote repository are treated as
5035 4978 ``deleted``, even if it is in fact added remotely.
5036 4979
5037 4980 Returns 0 if there are outgoing changes, 1 otherwise.
5038 4981 """
5039 4982 # hg._outgoing() needs to re-resolve the path in order to handle #branch
5040 4983 # style URLs, so don't overwrite dest.
5041 4984 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5042 4985 if not path:
5043 4986 raise error.Abort(
5044 4987 _(b'default repository not configured!'),
5045 4988 hint=_(b"see 'hg help config.paths'"),
5046 4989 )
5047 4990
5048 4991 opts = pycompat.byteskwargs(opts)
5049 4992 if opts.get(b'graph'):
5050 4993 logcmdutil.checkunsupportedgraphflags([], opts)
5051 4994 o, other = hg._outgoing(ui, repo, dest, opts)
5052 4995 if not o:
5053 4996 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5054 4997 return
5055 4998
5056 4999 revdag = logcmdutil.graphrevs(repo, o, opts)
5057 5000 ui.pager(b'outgoing')
5058 5001 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5059 5002 logcmdutil.displaygraph(
5060 5003 ui, repo, revdag, displayer, graphmod.asciiedges
5061 5004 )
5062 5005 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5063 5006 return 0
5064 5007
5065 5008 if opts.get(b'bookmarks'):
5066 5009 dest = path.pushloc or path.loc
5067 5010 other = hg.peer(repo, opts, dest)
5068 5011 if b'bookmarks' not in other.listkeys(b'namespaces'):
5069 5012 ui.warn(_(b"remote doesn't support bookmarks\n"))
5070 5013 return 0
5071 5014 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5072 5015 ui.pager(b'outgoing')
5073 5016 return bookmarks.outgoing(ui, repo, other)
5074 5017
5075 5018 repo._subtoppath = path.pushloc or path.loc
5076 5019 try:
5077 5020 return hg.outgoing(ui, repo, dest, opts)
5078 5021 finally:
5079 5022 del repo._subtoppath
5080 5023
5081 5024
5082 5025 @command(
5083 5026 b'parents',
5084 5027 [
5085 5028 (
5086 5029 b'r',
5087 5030 b'rev',
5088 5031 b'',
5089 5032 _(b'show parents of the specified revision'),
5090 5033 _(b'REV'),
5091 5034 ),
5092 5035 ]
5093 5036 + templateopts,
5094 5037 _(b'[-r REV] [FILE]'),
5095 5038 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5096 5039 inferrepo=True,
5097 5040 )
5098 5041 def parents(ui, repo, file_=None, **opts):
5099 5042 """show the parents of the working directory or revision (DEPRECATED)
5100 5043
5101 5044 Print the working directory's parent revisions. If a revision is
5102 5045 given via -r/--rev, the parent of that revision will be printed.
5103 5046 If a file argument is given, the revision in which the file was
5104 5047 last changed (before the working directory revision or the
5105 5048 argument to --rev if given) is printed.
5106 5049
5107 5050 This command is equivalent to::
5108 5051
5109 5052 hg log -r "p1()+p2()" or
5110 5053 hg log -r "p1(REV)+p2(REV)" or
5111 5054 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5112 5055 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5113 5056
5114 5057 See :hg:`summary` and :hg:`help revsets` for related information.
5115 5058
5116 5059 Returns 0 on success.
5117 5060 """
5118 5061
5119 5062 opts = pycompat.byteskwargs(opts)
5120 5063 rev = opts.get(b'rev')
5121 5064 if rev:
5122 5065 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5123 5066 ctx = scmutil.revsingle(repo, rev, None)
5124 5067
5125 5068 if file_:
5126 5069 m = scmutil.match(ctx, (file_,), opts)
5127 5070 if m.anypats() or len(m.files()) != 1:
5128 5071 raise error.Abort(_(b'can only specify an explicit filename'))
5129 5072 file_ = m.files()[0]
5130 5073 filenodes = []
5131 5074 for cp in ctx.parents():
5132 5075 if not cp:
5133 5076 continue
5134 5077 try:
5135 5078 filenodes.append(cp.filenode(file_))
5136 5079 except error.LookupError:
5137 5080 pass
5138 5081 if not filenodes:
5139 5082 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5140 5083 p = []
5141 5084 for fn in filenodes:
5142 5085 fctx = repo.filectx(file_, fileid=fn)
5143 5086 p.append(fctx.node())
5144 5087 else:
5145 5088 p = [cp.node() for cp in ctx.parents()]
5146 5089
5147 5090 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5148 5091 for n in p:
5149 5092 if n != nullid:
5150 5093 displayer.show(repo[n])
5151 5094 displayer.close()
5152 5095
5153 5096
5154 5097 @command(
5155 5098 b'paths',
5156 5099 formatteropts,
5157 5100 _(b'[NAME]'),
5158 5101 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5159 5102 optionalrepo=True,
5160 5103 intents={INTENT_READONLY},
5161 5104 )
5162 5105 def paths(ui, repo, search=None, **opts):
5163 5106 """show aliases for remote repositories
5164 5107
5165 5108 Show definition of symbolic path name NAME. If no name is given,
5166 5109 show definition of all available names.
5167 5110
5168 5111 Option -q/--quiet suppresses all output when searching for NAME
5169 5112 and shows only the path names when listing all definitions.
5170 5113
5171 5114 Path names are defined in the [paths] section of your
5172 5115 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5173 5116 repository, ``.hg/hgrc`` is used, too.
5174 5117
5175 5118 The path names ``default`` and ``default-push`` have a special
5176 5119 meaning. When performing a push or pull operation, they are used
5177 5120 as fallbacks if no location is specified on the command-line.
5178 5121 When ``default-push`` is set, it will be used for push and
5179 5122 ``default`` will be used for pull; otherwise ``default`` is used
5180 5123 as the fallback for both. When cloning a repository, the clone
5181 5124 source is written as ``default`` in ``.hg/hgrc``.
5182 5125
5183 5126 .. note::
5184 5127
5185 5128 ``default`` and ``default-push`` apply to all inbound (e.g.
5186 5129 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5187 5130 and :hg:`bundle`) operations.
5188 5131
5189 5132 See :hg:`help urls` for more information.
5190 5133
5191 5134 .. container:: verbose
5192 5135
5193 5136 Template:
5194 5137
5195 5138 The following keywords are supported. See also :hg:`help templates`.
5196 5139
5197 5140 :name: String. Symbolic name of the path alias.
5198 5141 :pushurl: String. URL for push operations.
5199 5142 :url: String. URL or directory path for the other operations.
5200 5143
5201 5144 Returns 0 on success.
5202 5145 """
5203 5146
5204 5147 opts = pycompat.byteskwargs(opts)
5205 5148 ui.pager(b'paths')
5206 5149 if search:
5207 5150 pathitems = [
5208 5151 (name, path)
5209 5152 for name, path in pycompat.iteritems(ui.paths)
5210 5153 if name == search
5211 5154 ]
5212 5155 else:
5213 5156 pathitems = sorted(pycompat.iteritems(ui.paths))
5214 5157
5215 5158 fm = ui.formatter(b'paths', opts)
5216 5159 if fm.isplain():
5217 5160 hidepassword = util.hidepassword
5218 5161 else:
5219 5162 hidepassword = bytes
5220 5163 if ui.quiet:
5221 5164 namefmt = b'%s\n'
5222 5165 else:
5223 5166 namefmt = b'%s = '
5224 5167 showsubopts = not search and not ui.quiet
5225 5168
5226 5169 for name, path in pathitems:
5227 5170 fm.startitem()
5228 5171 fm.condwrite(not search, b'name', namefmt, name)
5229 5172 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5230 5173 for subopt, value in sorted(path.suboptions.items()):
5231 5174 assert subopt not in (b'name', b'url')
5232 5175 if showsubopts:
5233 5176 fm.plain(b'%s:%s = ' % (name, subopt))
5234 5177 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5235 5178
5236 5179 fm.end()
5237 5180
5238 5181 if search and not pathitems:
5239 5182 if not ui.quiet:
5240 5183 ui.warn(_(b"not found!\n"))
5241 5184 return 1
5242 5185 else:
5243 5186 return 0
5244 5187
5245 5188
5246 5189 @command(
5247 5190 b'phase',
5248 5191 [
5249 5192 (b'p', b'public', False, _(b'set changeset phase to public')),
5250 5193 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5251 5194 (b's', b'secret', False, _(b'set changeset phase to secret')),
5252 5195 (b'f', b'force', False, _(b'allow to move boundary backward')),
5253 5196 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5254 5197 ],
5255 5198 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5256 5199 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5257 5200 )
5258 5201 def phase(ui, repo, *revs, **opts):
5259 5202 """set or show the current phase name
5260 5203
5261 5204 With no argument, show the phase name of the current revision(s).
5262 5205
5263 5206 With one of -p/--public, -d/--draft or -s/--secret, change the
5264 5207 phase value of the specified revisions.
5265 5208
5266 5209 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5267 5210 lower phase to a higher phase. Phases are ordered as follows::
5268 5211
5269 5212 public < draft < secret
5270 5213
5271 5214 Returns 0 on success, 1 if some phases could not be changed.
5272 5215
5273 5216 (For more information about the phases concept, see :hg:`help phases`.)
5274 5217 """
5275 5218 opts = pycompat.byteskwargs(opts)
5276 5219 # search for a unique phase argument
5277 5220 targetphase = None
5278 5221 for idx, name in enumerate(phases.cmdphasenames):
5279 5222 if opts[name]:
5280 5223 if targetphase is not None:
5281 5224 raise error.Abort(_(b'only one phase can be specified'))
5282 5225 targetphase = idx
5283 5226
5284 5227 # look for specified revision
5285 5228 revs = list(revs)
5286 5229 revs.extend(opts[b'rev'])
5287 5230 if not revs:
5288 5231 # display both parents as the second parent phase can influence
5289 5232 # the phase of a merge commit
5290 5233 revs = [c.rev() for c in repo[None].parents()]
5291 5234
5292 5235 revs = scmutil.revrange(repo, revs)
5293 5236
5294 5237 ret = 0
5295 5238 if targetphase is None:
5296 5239 # display
5297 5240 for r in revs:
5298 5241 ctx = repo[r]
5299 5242 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5300 5243 else:
5301 5244 with repo.lock(), repo.transaction(b"phase") as tr:
5302 5245 # set phase
5303 5246 if not revs:
5304 5247 raise error.Abort(_(b'empty revision set'))
5305 5248 nodes = [repo[r].node() for r in revs]
5306 5249 # moving revision from public to draft may hide them
5307 5250 # We have to check result on an unfiltered repository
5308 5251 unfi = repo.unfiltered()
5309 5252 getphase = unfi._phasecache.phase
5310 5253 olddata = [getphase(unfi, r) for r in unfi]
5311 5254 phases.advanceboundary(repo, tr, targetphase, nodes)
5312 5255 if opts[b'force']:
5313 5256 phases.retractboundary(repo, tr, targetphase, nodes)
5314 5257 getphase = unfi._phasecache.phase
5315 5258 newdata = [getphase(unfi, r) for r in unfi]
5316 5259 changes = sum(newdata[r] != olddata[r] for r in unfi)
5317 5260 cl = unfi.changelog
5318 5261 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5319 5262 if rejected:
5320 5263 ui.warn(
5321 5264 _(
5322 5265 b'cannot move %i changesets to a higher '
5323 5266 b'phase, use --force\n'
5324 5267 )
5325 5268 % len(rejected)
5326 5269 )
5327 5270 ret = 1
5328 5271 if changes:
5329 5272 msg = _(b'phase changed for %i changesets\n') % changes
5330 5273 if ret:
5331 5274 ui.status(msg)
5332 5275 else:
5333 5276 ui.note(msg)
5334 5277 else:
5335 5278 ui.warn(_(b'no phases changed\n'))
5336 5279 return ret
5337 5280
5338 5281
5339 5282 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5340 5283 """Run after a changegroup has been added via pull/unbundle
5341 5284
5342 5285 This takes arguments below:
5343 5286
5344 5287 :modheads: change of heads by pull/unbundle
5345 5288 :optupdate: updating working directory is needed or not
5346 5289 :checkout: update destination revision (or None to default destination)
5347 5290 :brev: a name, which might be a bookmark to be activated after updating
5348 5291 """
5349 5292 if modheads == 0:
5350 5293 return
5351 5294 if optupdate:
5352 5295 try:
5353 5296 return hg.updatetotally(ui, repo, checkout, brev)
5354 5297 except error.UpdateAbort as inst:
5355 5298 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5356 5299 hint = inst.hint
5357 5300 raise error.UpdateAbort(msg, hint=hint)
5358 5301 if modheads is not None and modheads > 1:
5359 5302 currentbranchheads = len(repo.branchheads())
5360 5303 if currentbranchheads == modheads:
5361 5304 ui.status(
5362 5305 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5363 5306 )
5364 5307 elif currentbranchheads > 1:
5365 5308 ui.status(
5366 5309 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5367 5310 )
5368 5311 else:
5369 5312 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5370 5313 elif not ui.configbool(b'commands', b'update.requiredest'):
5371 5314 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5372 5315
5373 5316
5374 5317 @command(
5375 5318 b'pull',
5376 5319 [
5377 5320 (
5378 5321 b'u',
5379 5322 b'update',
5380 5323 None,
5381 5324 _(b'update to new branch head if new descendants were pulled'),
5382 5325 ),
5383 5326 (
5384 5327 b'f',
5385 5328 b'force',
5386 5329 None,
5387 5330 _(b'run even when remote repository is unrelated'),
5388 5331 ),
5389 5332 (b'', b'confirm', None, _(b'confirm pull before applying changes'),),
5390 5333 (
5391 5334 b'r',
5392 5335 b'rev',
5393 5336 [],
5394 5337 _(b'a remote changeset intended to be added'),
5395 5338 _(b'REV'),
5396 5339 ),
5397 5340 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5398 5341 (
5399 5342 b'b',
5400 5343 b'branch',
5401 5344 [],
5402 5345 _(b'a specific branch you would like to pull'),
5403 5346 _(b'BRANCH'),
5404 5347 ),
5405 5348 ]
5406 5349 + remoteopts,
5407 5350 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5408 5351 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5409 5352 helpbasic=True,
5410 5353 )
5411 5354 def pull(ui, repo, source=b"default", **opts):
5412 5355 """pull changes from the specified source
5413 5356
5414 5357 Pull changes from a remote repository to a local one.
5415 5358
5416 5359 This finds all changes from the repository at the specified path
5417 5360 or URL and adds them to a local repository (the current one unless
5418 5361 -R is specified). By default, this does not update the copy of the
5419 5362 project in the working directory.
5420 5363
5421 5364 When cloning from servers that support it, Mercurial may fetch
5422 5365 pre-generated data. When this is done, hooks operating on incoming
5423 5366 changesets and changegroups may fire more than once, once for each
5424 5367 pre-generated bundle and as well as for any additional remaining
5425 5368 data. See :hg:`help -e clonebundles` for more.
5426 5369
5427 5370 Use :hg:`incoming` if you want to see what would have been added
5428 5371 by a pull at the time you issued this command. If you then decide
5429 5372 to add those changes to the repository, you should use :hg:`pull
5430 5373 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5431 5374
5432 5375 If SOURCE is omitted, the 'default' path will be used.
5433 5376 See :hg:`help urls` for more information.
5434 5377
5435 5378 Specifying bookmark as ``.`` is equivalent to specifying the active
5436 5379 bookmark's name.
5437 5380
5438 5381 Returns 0 on success, 1 if an update had unresolved files.
5439 5382 """
5440 5383
5441 5384 opts = pycompat.byteskwargs(opts)
5442 5385 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5443 5386 b'update'
5444 5387 ):
5445 5388 msg = _(b'update destination required by configuration')
5446 5389 hint = _(b'use hg pull followed by hg update DEST')
5447 5390 raise error.Abort(msg, hint=hint)
5448 5391
5449 5392 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5450 5393 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5451 5394 other = hg.peer(repo, opts, source)
5452 5395 try:
5453 5396 revs, checkout = hg.addbranchrevs(
5454 5397 repo, other, branches, opts.get(b'rev')
5455 5398 )
5456 5399
5457 5400 pullopargs = {}
5458 5401
5459 5402 nodes = None
5460 5403 if opts.get(b'bookmark') or revs:
5461 5404 # The list of bookmark used here is the same used to actually update
5462 5405 # the bookmark names, to avoid the race from issue 4689 and we do
5463 5406 # all lookup and bookmark queries in one go so they see the same
5464 5407 # version of the server state (issue 4700).
5465 5408 nodes = []
5466 5409 fnodes = []
5467 5410 revs = revs or []
5468 5411 if revs and not other.capable(b'lookup'):
5469 5412 err = _(
5470 5413 b"other repository doesn't support revision lookup, "
5471 5414 b"so a rev cannot be specified."
5472 5415 )
5473 5416 raise error.Abort(err)
5474 5417 with other.commandexecutor() as e:
5475 5418 fremotebookmarks = e.callcommand(
5476 5419 b'listkeys', {b'namespace': b'bookmarks'}
5477 5420 )
5478 5421 for r in revs:
5479 5422 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5480 5423 remotebookmarks = fremotebookmarks.result()
5481 5424 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5482 5425 pullopargs[b'remotebookmarks'] = remotebookmarks
5483 5426 for b in opts.get(b'bookmark', []):
5484 5427 b = repo._bookmarks.expandname(b)
5485 5428 if b not in remotebookmarks:
5486 5429 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5487 5430 nodes.append(remotebookmarks[b])
5488 5431 for i, rev in enumerate(revs):
5489 5432 node = fnodes[i].result()
5490 5433 nodes.append(node)
5491 5434 if rev == checkout:
5492 5435 checkout = node
5493 5436
5494 5437 wlock = util.nullcontextmanager()
5495 5438 if opts.get(b'update'):
5496 5439 wlock = repo.wlock()
5497 5440 with wlock:
5498 5441 pullopargs.update(opts.get(b'opargs', {}))
5499 5442 modheads = exchange.pull(
5500 5443 repo,
5501 5444 other,
5502 5445 heads=nodes,
5503 5446 force=opts.get(b'force'),
5504 5447 bookmarks=opts.get(b'bookmark', ()),
5505 5448 opargs=pullopargs,
5506 5449 confirm=opts.get(b'confirm'),
5507 5450 ).cgresult
5508 5451
5509 5452 # brev is a name, which might be a bookmark to be activated at
5510 5453 # the end of the update. In other words, it is an explicit
5511 5454 # destination of the update
5512 5455 brev = None
5513 5456
5514 5457 if checkout:
5515 5458 checkout = repo.unfiltered().changelog.rev(checkout)
5516 5459
5517 5460 # order below depends on implementation of
5518 5461 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5519 5462 # because 'checkout' is determined without it.
5520 5463 if opts.get(b'rev'):
5521 5464 brev = opts[b'rev'][0]
5522 5465 elif opts.get(b'branch'):
5523 5466 brev = opts[b'branch'][0]
5524 5467 else:
5525 5468 brev = branches[0]
5526 5469 repo._subtoppath = source
5527 5470 try:
5528 5471 ret = postincoming(
5529 5472 ui, repo, modheads, opts.get(b'update'), checkout, brev
5530 5473 )
5531 5474 except error.FilteredRepoLookupError as exc:
5532 5475 msg = _(b'cannot update to target: %s') % exc.args[0]
5533 5476 exc.args = (msg,) + exc.args[1:]
5534 5477 raise
5535 5478 finally:
5536 5479 del repo._subtoppath
5537 5480
5538 5481 finally:
5539 5482 other.close()
5540 5483 return ret
5541 5484
5542 5485
5543 5486 @command(
5544 5487 b'push',
5545 5488 [
5546 5489 (b'f', b'force', None, _(b'force push')),
5547 5490 (
5548 5491 b'r',
5549 5492 b'rev',
5550 5493 [],
5551 5494 _(b'a changeset intended to be included in the destination'),
5552 5495 _(b'REV'),
5553 5496 ),
5554 5497 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5555 5498 (
5556 5499 b'b',
5557 5500 b'branch',
5558 5501 [],
5559 5502 _(b'a specific branch you would like to push'),
5560 5503 _(b'BRANCH'),
5561 5504 ),
5562 5505 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5563 5506 (
5564 5507 b'',
5565 5508 b'pushvars',
5566 5509 [],
5567 5510 _(b'variables that can be sent to server (ADVANCED)'),
5568 5511 ),
5569 5512 (
5570 5513 b'',
5571 5514 b'publish',
5572 5515 False,
5573 5516 _(b'push the changeset as public (EXPERIMENTAL)'),
5574 5517 ),
5575 5518 ]
5576 5519 + remoteopts,
5577 5520 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5578 5521 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5579 5522 helpbasic=True,
5580 5523 )
5581 5524 def push(ui, repo, dest=None, **opts):
5582 5525 """push changes to the specified destination
5583 5526
5584 5527 Push changesets from the local repository to the specified
5585 5528 destination.
5586 5529
5587 5530 This operation is symmetrical to pull: it is identical to a pull
5588 5531 in the destination repository from the current one.
5589 5532
5590 5533 By default, push will not allow creation of new heads at the
5591 5534 destination, since multiple heads would make it unclear which head
5592 5535 to use. In this situation, it is recommended to pull and merge
5593 5536 before pushing.
5594 5537
5595 5538 Use --new-branch if you want to allow push to create a new named
5596 5539 branch that is not present at the destination. This allows you to
5597 5540 only create a new branch without forcing other changes.
5598 5541
5599 5542 .. note::
5600 5543
5601 5544 Extra care should be taken with the -f/--force option,
5602 5545 which will push all new heads on all branches, an action which will
5603 5546 almost always cause confusion for collaborators.
5604 5547
5605 5548 If -r/--rev is used, the specified revision and all its ancestors
5606 5549 will be pushed to the remote repository.
5607 5550
5608 5551 If -B/--bookmark is used, the specified bookmarked revision, its
5609 5552 ancestors, and the bookmark will be pushed to the remote
5610 5553 repository. Specifying ``.`` is equivalent to specifying the active
5611 5554 bookmark's name.
5612 5555
5613 5556 Please see :hg:`help urls` for important details about ``ssh://``
5614 5557 URLs. If DESTINATION is omitted, a default path will be used.
5615 5558
5616 5559 .. container:: verbose
5617 5560
5618 5561 The --pushvars option sends strings to the server that become
5619 5562 environment variables prepended with ``HG_USERVAR_``. For example,
5620 5563 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5621 5564 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5622 5565
5623 5566 pushvars can provide for user-overridable hooks as well as set debug
5624 5567 levels. One example is having a hook that blocks commits containing
5625 5568 conflict markers, but enables the user to override the hook if the file
5626 5569 is using conflict markers for testing purposes or the file format has
5627 5570 strings that look like conflict markers.
5628 5571
5629 5572 By default, servers will ignore `--pushvars`. To enable it add the
5630 5573 following to your configuration file::
5631 5574
5632 5575 [push]
5633 5576 pushvars.server = true
5634 5577
5635 5578 Returns 0 if push was successful, 1 if nothing to push.
5636 5579 """
5637 5580
5638 5581 opts = pycompat.byteskwargs(opts)
5639 5582 if opts.get(b'bookmark'):
5640 5583 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5641 5584 for b in opts[b'bookmark']:
5642 5585 # translate -B options to -r so changesets get pushed
5643 5586 b = repo._bookmarks.expandname(b)
5644 5587 if b in repo._bookmarks:
5645 5588 opts.setdefault(b'rev', []).append(b)
5646 5589 else:
5647 5590 # if we try to push a deleted bookmark, translate it to null
5648 5591 # this lets simultaneous -r, -b options continue working
5649 5592 opts.setdefault(b'rev', []).append(b"null")
5650 5593
5651 5594 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5652 5595 if not path:
5653 5596 raise error.Abort(
5654 5597 _(b'default repository not configured!'),
5655 5598 hint=_(b"see 'hg help config.paths'"),
5656 5599 )
5657 5600 dest = path.pushloc or path.loc
5658 5601 branches = (path.branch, opts.get(b'branch') or [])
5659 5602 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5660 5603 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5661 5604 other = hg.peer(repo, opts, dest)
5662 5605
5663 5606 if revs:
5664 5607 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5665 5608 if not revs:
5666 5609 raise error.Abort(
5667 5610 _(b"specified revisions evaluate to an empty set"),
5668 5611 hint=_(b"use different revision arguments"),
5669 5612 )
5670 5613 elif path.pushrev:
5671 5614 # It doesn't make any sense to specify ancestor revisions. So limit
5672 5615 # to DAG heads to make discovery simpler.
5673 5616 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5674 5617 revs = scmutil.revrange(repo, [expr])
5675 5618 revs = [repo[rev].node() for rev in revs]
5676 5619 if not revs:
5677 5620 raise error.Abort(
5678 5621 _(b'default push revset for path evaluates to an empty set')
5679 5622 )
5680 5623 elif ui.configbool(b'commands', b'push.require-revs'):
5681 5624 raise error.Abort(
5682 5625 _(b'no revisions specified to push'),
5683 5626 hint=_(b'did you mean "hg push -r ."?'),
5684 5627 )
5685 5628
5686 5629 repo._subtoppath = dest
5687 5630 try:
5688 5631 # push subrepos depth-first for coherent ordering
5689 5632 c = repo[b'.']
5690 5633 subs = c.substate # only repos that are committed
5691 5634 for s in sorted(subs):
5692 5635 result = c.sub(s).push(opts)
5693 5636 if result == 0:
5694 5637 return not result
5695 5638 finally:
5696 5639 del repo._subtoppath
5697 5640
5698 5641 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5699 5642 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5700 5643
5701 5644 pushop = exchange.push(
5702 5645 repo,
5703 5646 other,
5704 5647 opts.get(b'force'),
5705 5648 revs=revs,
5706 5649 newbranch=opts.get(b'new_branch'),
5707 5650 bookmarks=opts.get(b'bookmark', ()),
5708 5651 publish=opts.get(b'publish'),
5709 5652 opargs=opargs,
5710 5653 )
5711 5654
5712 5655 result = not pushop.cgresult
5713 5656
5714 5657 if pushop.bkresult is not None:
5715 5658 if pushop.bkresult == 2:
5716 5659 result = 2
5717 5660 elif not result and pushop.bkresult:
5718 5661 result = 2
5719 5662
5720 5663 return result
5721 5664
5722 5665
5723 5666 @command(
5724 5667 b'recover',
5725 5668 [(b'', b'verify', False, b"run `hg verify` after successful recover"),],
5726 5669 helpcategory=command.CATEGORY_MAINTENANCE,
5727 5670 )
5728 5671 def recover(ui, repo, **opts):
5729 5672 """roll back an interrupted transaction
5730 5673
5731 5674 Recover from an interrupted commit or pull.
5732 5675
5733 5676 This command tries to fix the repository status after an
5734 5677 interrupted operation. It should only be necessary when Mercurial
5735 5678 suggests it.
5736 5679
5737 5680 Returns 0 if successful, 1 if nothing to recover or verify fails.
5738 5681 """
5739 5682 ret = repo.recover()
5740 5683 if ret:
5741 5684 if opts['verify']:
5742 5685 return hg.verify(repo)
5743 5686 else:
5744 5687 msg = _(
5745 5688 b"(verify step skipped, run `hg verify` to check your "
5746 5689 b"repository content)\n"
5747 5690 )
5748 5691 ui.warn(msg)
5749 5692 return 0
5750 5693 return 1
5751 5694
5752 5695
5753 5696 @command(
5754 5697 b'remove|rm',
5755 5698 [
5756 5699 (b'A', b'after', None, _(b'record delete for missing files')),
5757 5700 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5758 5701 ]
5759 5702 + subrepoopts
5760 5703 + walkopts
5761 5704 + dryrunopts,
5762 5705 _(b'[OPTION]... FILE...'),
5763 5706 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5764 5707 helpbasic=True,
5765 5708 inferrepo=True,
5766 5709 )
5767 5710 def remove(ui, repo, *pats, **opts):
5768 5711 """remove the specified files on the next commit
5769 5712
5770 5713 Schedule the indicated files for removal from the current branch.
5771 5714
5772 5715 This command schedules the files to be removed at the next commit.
5773 5716 To undo a remove before that, see :hg:`revert`. To undo added
5774 5717 files, see :hg:`forget`.
5775 5718
5776 5719 .. container:: verbose
5777 5720
5778 5721 -A/--after can be used to remove only files that have already
5779 5722 been deleted, -f/--force can be used to force deletion, and -Af
5780 5723 can be used to remove files from the next revision without
5781 5724 deleting them from the working directory.
5782 5725
5783 5726 The following table details the behavior of remove for different
5784 5727 file states (columns) and option combinations (rows). The file
5785 5728 states are Added [A], Clean [C], Modified [M] and Missing [!]
5786 5729 (as reported by :hg:`status`). The actions are Warn, Remove
5787 5730 (from branch) and Delete (from disk):
5788 5731
5789 5732 ========= == == == ==
5790 5733 opt/state A C M !
5791 5734 ========= == == == ==
5792 5735 none W RD W R
5793 5736 -f R RD RD R
5794 5737 -A W W W R
5795 5738 -Af R R R R
5796 5739 ========= == == == ==
5797 5740
5798 5741 .. note::
5799 5742
5800 5743 :hg:`remove` never deletes files in Added [A] state from the
5801 5744 working directory, not even if ``--force`` is specified.
5802 5745
5803 5746 Returns 0 on success, 1 if any warnings encountered.
5804 5747 """
5805 5748
5806 5749 opts = pycompat.byteskwargs(opts)
5807 5750 after, force = opts.get(b'after'), opts.get(b'force')
5808 5751 dryrun = opts.get(b'dry_run')
5809 5752 if not pats and not after:
5810 5753 raise error.Abort(_(b'no files specified'))
5811 5754
5812 5755 m = scmutil.match(repo[None], pats, opts)
5813 5756 subrepos = opts.get(b'subrepos')
5814 5757 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5815 5758 return cmdutil.remove(
5816 5759 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5817 5760 )
5818 5761
5819 5762
5820 5763 @command(
5821 5764 b'rename|move|mv',
5822 5765 [
5823 5766 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5824 5767 (
5825 5768 b'',
5826 5769 b'at-rev',
5827 5770 b'',
5828 5771 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5829 5772 _(b'REV'),
5830 5773 ),
5831 5774 (
5832 5775 b'f',
5833 5776 b'force',
5834 5777 None,
5835 5778 _(b'forcibly move over an existing managed file'),
5836 5779 ),
5837 5780 ]
5838 5781 + walkopts
5839 5782 + dryrunopts,
5840 5783 _(b'[OPTION]... SOURCE... DEST'),
5841 5784 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5842 5785 )
5843 5786 def rename(ui, repo, *pats, **opts):
5844 5787 """rename files; equivalent of copy + remove
5845 5788
5846 5789 Mark dest as copies of sources; mark sources for deletion. If dest
5847 5790 is a directory, copies are put in that directory. If dest is a
5848 5791 file, there can only be one source.
5849 5792
5850 5793 By default, this command copies the contents of files as they
5851 5794 exist in the working directory. If invoked with -A/--after, the
5852 5795 operation is recorded, but no copying is performed.
5853 5796
5854 5797 This command takes effect at the next commit. To undo a rename
5855 5798 before that, see :hg:`revert`.
5856 5799
5857 5800 Returns 0 on success, 1 if errors are encountered.
5858 5801 """
5859 5802 opts = pycompat.byteskwargs(opts)
5860 5803 with repo.wlock():
5861 5804 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5862 5805
5863 5806
5864 5807 @command(
5865 5808 b'resolve',
5866 5809 [
5867 5810 (b'a', b'all', None, _(b'select all unresolved files')),
5868 5811 (b'l', b'list', None, _(b'list state of files needing merge')),
5869 5812 (b'm', b'mark', None, _(b'mark files as resolved')),
5870 5813 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5871 5814 (b'n', b'no-status', None, _(b'hide status prefix')),
5872 5815 (b'', b're-merge', None, _(b're-merge files')),
5873 5816 ]
5874 5817 + mergetoolopts
5875 5818 + walkopts
5876 5819 + formatteropts,
5877 5820 _(b'[OPTION]... [FILE]...'),
5878 5821 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5879 5822 inferrepo=True,
5880 5823 )
5881 5824 def resolve(ui, repo, *pats, **opts):
5882 5825 """redo merges or set/view the merge status of files
5883 5826
5884 5827 Merges with unresolved conflicts are often the result of
5885 5828 non-interactive merging using the ``internal:merge`` configuration
5886 5829 setting, or a command-line merge tool like ``diff3``. The resolve
5887 5830 command is used to manage the files involved in a merge, after
5888 5831 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5889 5832 working directory must have two parents). See :hg:`help
5890 5833 merge-tools` for information on configuring merge tools.
5891 5834
5892 5835 The resolve command can be used in the following ways:
5893 5836
5894 5837 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5895 5838 the specified files, discarding any previous merge attempts. Re-merging
5896 5839 is not performed for files already marked as resolved. Use ``--all/-a``
5897 5840 to select all unresolved files. ``--tool`` can be used to specify
5898 5841 the merge tool used for the given files. It overrides the HGMERGE
5899 5842 environment variable and your configuration files. Previous file
5900 5843 contents are saved with a ``.orig`` suffix.
5901 5844
5902 5845 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5903 5846 (e.g. after having manually fixed-up the files). The default is
5904 5847 to mark all unresolved files.
5905 5848
5906 5849 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5907 5850 default is to mark all resolved files.
5908 5851
5909 5852 - :hg:`resolve -l`: list files which had or still have conflicts.
5910 5853 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5911 5854 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5912 5855 the list. See :hg:`help filesets` for details.
5913 5856
5914 5857 .. note::
5915 5858
5916 5859 Mercurial will not let you commit files with unresolved merge
5917 5860 conflicts. You must use :hg:`resolve -m ...` before you can
5918 5861 commit after a conflicting merge.
5919 5862
5920 5863 .. container:: verbose
5921 5864
5922 5865 Template:
5923 5866
5924 5867 The following keywords are supported in addition to the common template
5925 5868 keywords and functions. See also :hg:`help templates`.
5926 5869
5927 5870 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5928 5871 :path: String. Repository-absolute path of the file.
5929 5872
5930 5873 Returns 0 on success, 1 if any files fail a resolve attempt.
5931 5874 """
5932 5875
5933 5876 opts = pycompat.byteskwargs(opts)
5934 5877 confirm = ui.configbool(b'commands', b'resolve.confirm')
5935 5878 flaglist = b'all mark unmark list no_status re_merge'.split()
5936 5879 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5937 5880
5938 5881 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5939 5882 if actioncount > 1:
5940 5883 raise error.Abort(_(b"too many actions specified"))
5941 5884 elif actioncount == 0 and ui.configbool(
5942 5885 b'commands', b'resolve.explicit-re-merge'
5943 5886 ):
5944 5887 hint = _(b'use --mark, --unmark, --list or --re-merge')
5945 5888 raise error.Abort(_(b'no action specified'), hint=hint)
5946 5889 if pats and all:
5947 5890 raise error.Abort(_(b"can't specify --all and patterns"))
5948 5891 if not (all or pats or show or mark or unmark):
5949 5892 raise error.Abort(
5950 5893 _(b'no files or directories specified'),
5951 5894 hint=b'use --all to re-merge all unresolved files',
5952 5895 )
5953 5896
5954 5897 if confirm:
5955 5898 if all:
5956 5899 if ui.promptchoice(
5957 5900 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5958 5901 ):
5959 5902 raise error.Abort(_(b'user quit'))
5960 5903 if mark and not pats:
5961 5904 if ui.promptchoice(
5962 5905 _(
5963 5906 b'mark all unresolved files as resolved (yn)?'
5964 5907 b'$$ &Yes $$ &No'
5965 5908 )
5966 5909 ):
5967 5910 raise error.Abort(_(b'user quit'))
5968 5911 if unmark and not pats:
5969 5912 if ui.promptchoice(
5970 5913 _(
5971 5914 b'mark all resolved files as unresolved (yn)?'
5972 5915 b'$$ &Yes $$ &No'
5973 5916 )
5974 5917 ):
5975 5918 raise error.Abort(_(b'user quit'))
5976 5919
5977 5920 uipathfn = scmutil.getuipathfn(repo)
5978 5921
5979 5922 if show:
5980 5923 ui.pager(b'resolve')
5981 5924 fm = ui.formatter(b'resolve', opts)
5982 5925 ms = mergestatemod.mergestate.read(repo)
5983 5926 wctx = repo[None]
5984 5927 m = scmutil.match(wctx, pats, opts)
5985 5928
5986 5929 # Labels and keys based on merge state. Unresolved path conflicts show
5987 5930 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5988 5931 # resolved conflicts.
5989 5932 mergestateinfo = {
5990 5933 mergestatemod.MERGE_RECORD_UNRESOLVED: (
5991 5934 b'resolve.unresolved',
5992 5935 b'U',
5993 5936 ),
5994 5937 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5995 5938 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
5996 5939 b'resolve.unresolved',
5997 5940 b'P',
5998 5941 ),
5999 5942 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6000 5943 b'resolve.resolved',
6001 5944 b'R',
6002 5945 ),
6003 5946 }
6004 5947
6005 5948 for f in ms:
6006 5949 if not m(f):
6007 5950 continue
6008 5951
6009 5952 label, key = mergestateinfo[ms[f]]
6010 5953 fm.startitem()
6011 5954 fm.context(ctx=wctx)
6012 5955 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6013 5956 fm.data(path=f)
6014 5957 fm.plain(b'%s\n' % uipathfn(f), label=label)
6015 5958 fm.end()
6016 5959 return 0
6017 5960
6018 5961 with repo.wlock():
6019 5962 ms = mergestatemod.mergestate.read(repo)
6020 5963
6021 5964 if not (ms.active() or repo.dirstate.p2() != nullid):
6022 5965 raise error.Abort(
6023 5966 _(b'resolve command not applicable when not merging')
6024 5967 )
6025 5968
6026 5969 wctx = repo[None]
6027 5970 m = scmutil.match(wctx, pats, opts)
6028 5971 ret = 0
6029 5972 didwork = False
6030 5973
6031 5974 tocomplete = []
6032 5975 hasconflictmarkers = []
6033 5976 if mark:
6034 5977 markcheck = ui.config(b'commands', b'resolve.mark-check')
6035 5978 if markcheck not in [b'warn', b'abort']:
6036 5979 # Treat all invalid / unrecognized values as 'none'.
6037 5980 markcheck = False
6038 5981 for f in ms:
6039 5982 if not m(f):
6040 5983 continue
6041 5984
6042 5985 didwork = True
6043 5986
6044 5987 # path conflicts must be resolved manually
6045 5988 if ms[f] in (
6046 5989 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6047 5990 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6048 5991 ):
6049 5992 if mark:
6050 5993 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6051 5994 elif unmark:
6052 5995 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6053 5996 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6054 5997 ui.warn(
6055 5998 _(b'%s: path conflict must be resolved manually\n')
6056 5999 % uipathfn(f)
6057 6000 )
6058 6001 continue
6059 6002
6060 6003 if mark:
6061 6004 if markcheck:
6062 6005 fdata = repo.wvfs.tryread(f)
6063 6006 if (
6064 6007 filemerge.hasconflictmarkers(fdata)
6065 6008 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6066 6009 ):
6067 6010 hasconflictmarkers.append(f)
6068 6011 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6069 6012 elif unmark:
6070 6013 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6071 6014 else:
6072 6015 # backup pre-resolve (merge uses .orig for its own purposes)
6073 6016 a = repo.wjoin(f)
6074 6017 try:
6075 6018 util.copyfile(a, a + b".resolve")
6076 6019 except (IOError, OSError) as inst:
6077 6020 if inst.errno != errno.ENOENT:
6078 6021 raise
6079 6022
6080 6023 try:
6081 6024 # preresolve file
6082 6025 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6083 6026 with ui.configoverride(overrides, b'resolve'):
6084 6027 complete, r = ms.preresolve(f, wctx)
6085 6028 if not complete:
6086 6029 tocomplete.append(f)
6087 6030 elif r:
6088 6031 ret = 1
6089 6032 finally:
6090 6033 ms.commit()
6091 6034
6092 6035 # replace filemerge's .orig file with our resolve file, but only
6093 6036 # for merges that are complete
6094 6037 if complete:
6095 6038 try:
6096 6039 util.rename(
6097 6040 a + b".resolve", scmutil.backuppath(ui, repo, f)
6098 6041 )
6099 6042 except OSError as inst:
6100 6043 if inst.errno != errno.ENOENT:
6101 6044 raise
6102 6045
6103 6046 if hasconflictmarkers:
6104 6047 ui.warn(
6105 6048 _(
6106 6049 b'warning: the following files still have conflict '
6107 6050 b'markers:\n'
6108 6051 )
6109 6052 + b''.join(
6110 6053 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6111 6054 )
6112 6055 )
6113 6056 if markcheck == b'abort' and not all and not pats:
6114 6057 raise error.Abort(
6115 6058 _(b'conflict markers detected'),
6116 6059 hint=_(b'use --all to mark anyway'),
6117 6060 )
6118 6061
6119 6062 for f in tocomplete:
6120 6063 try:
6121 6064 # resolve file
6122 6065 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6123 6066 with ui.configoverride(overrides, b'resolve'):
6124 6067 r = ms.resolve(f, wctx)
6125 6068 if r:
6126 6069 ret = 1
6127 6070 finally:
6128 6071 ms.commit()
6129 6072
6130 6073 # replace filemerge's .orig file with our resolve file
6131 6074 a = repo.wjoin(f)
6132 6075 try:
6133 6076 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6134 6077 except OSError as inst:
6135 6078 if inst.errno != errno.ENOENT:
6136 6079 raise
6137 6080
6138 6081 ms.commit()
6139 6082 branchmerge = repo.dirstate.p2() != nullid
6140 6083 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6141 6084
6142 6085 if not didwork and pats:
6143 6086 hint = None
6144 6087 if not any([p for p in pats if p.find(b':') >= 0]):
6145 6088 pats = [b'path:%s' % p for p in pats]
6146 6089 m = scmutil.match(wctx, pats, opts)
6147 6090 for f in ms:
6148 6091 if not m(f):
6149 6092 continue
6150 6093
6151 6094 def flag(o):
6152 6095 if o == b're_merge':
6153 6096 return b'--re-merge '
6154 6097 return b'-%s ' % o[0:1]
6155 6098
6156 6099 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6157 6100 hint = _(b"(try: hg resolve %s%s)\n") % (
6158 6101 flags,
6159 6102 b' '.join(pats),
6160 6103 )
6161 6104 break
6162 6105 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6163 6106 if hint:
6164 6107 ui.warn(hint)
6165 6108
6166 6109 unresolvedf = list(ms.unresolved())
6167 6110 if not unresolvedf:
6168 6111 ui.status(_(b'(no more unresolved files)\n'))
6169 6112 cmdutil.checkafterresolved(repo)
6170 6113
6171 6114 return ret
6172 6115
6173 6116
6174 6117 @command(
6175 6118 b'revert',
6176 6119 [
6177 6120 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6178 6121 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6179 6122 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6180 6123 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6181 6124 (b'i', b'interactive', None, _(b'interactively select the changes')),
6182 6125 ]
6183 6126 + walkopts
6184 6127 + dryrunopts,
6185 6128 _(b'[OPTION]... [-r REV] [NAME]...'),
6186 6129 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6187 6130 )
6188 6131 def revert(ui, repo, *pats, **opts):
6189 6132 """restore files to their checkout state
6190 6133
6191 6134 .. note::
6192 6135
6193 6136 To check out earlier revisions, you should use :hg:`update REV`.
6194 6137 To cancel an uncommitted merge (and lose your changes),
6195 6138 use :hg:`merge --abort`.
6196 6139
6197 6140 With no revision specified, revert the specified files or directories
6198 6141 to the contents they had in the parent of the working directory.
6199 6142 This restores the contents of files to an unmodified
6200 6143 state and unschedules adds, removes, copies, and renames. If the
6201 6144 working directory has two parents, you must explicitly specify a
6202 6145 revision.
6203 6146
6204 6147 Using the -r/--rev or -d/--date options, revert the given files or
6205 6148 directories to their states as of a specific revision. Because
6206 6149 revert does not change the working directory parents, this will
6207 6150 cause these files to appear modified. This can be helpful to "back
6208 6151 out" some or all of an earlier change. See :hg:`backout` for a
6209 6152 related method.
6210 6153
6211 6154 Modified files are saved with a .orig suffix before reverting.
6212 6155 To disable these backups, use --no-backup. It is possible to store
6213 6156 the backup files in a custom directory relative to the root of the
6214 6157 repository by setting the ``ui.origbackuppath`` configuration
6215 6158 option.
6216 6159
6217 6160 See :hg:`help dates` for a list of formats valid for -d/--date.
6218 6161
6219 6162 See :hg:`help backout` for a way to reverse the effect of an
6220 6163 earlier changeset.
6221 6164
6222 6165 Returns 0 on success.
6223 6166 """
6224 6167
6225 6168 opts = pycompat.byteskwargs(opts)
6226 6169 if opts.get(b"date"):
6227 6170 if opts.get(b"rev"):
6228 6171 raise error.Abort(_(b"you can't specify a revision and a date"))
6229 6172 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6230 6173
6231 6174 parent, p2 = repo.dirstate.parents()
6232 6175 if not opts.get(b'rev') and p2 != nullid:
6233 6176 # revert after merge is a trap for new users (issue2915)
6234 6177 raise error.Abort(
6235 6178 _(b'uncommitted merge with no revision specified'),
6236 6179 hint=_(b"use 'hg update' or see 'hg help revert'"),
6237 6180 )
6238 6181
6239 6182 rev = opts.get(b'rev')
6240 6183 if rev:
6241 6184 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6242 6185 ctx = scmutil.revsingle(repo, rev)
6243 6186
6244 6187 if not (
6245 6188 pats
6246 6189 or opts.get(b'include')
6247 6190 or opts.get(b'exclude')
6248 6191 or opts.get(b'all')
6249 6192 or opts.get(b'interactive')
6250 6193 ):
6251 6194 msg = _(b"no files or directories specified")
6252 6195 if p2 != nullid:
6253 6196 hint = _(
6254 6197 b"uncommitted merge, use --all to discard all changes,"
6255 6198 b" or 'hg update -C .' to abort the merge"
6256 6199 )
6257 6200 raise error.Abort(msg, hint=hint)
6258 6201 dirty = any(repo.status())
6259 6202 node = ctx.node()
6260 6203 if node != parent:
6261 6204 if dirty:
6262 6205 hint = (
6263 6206 _(
6264 6207 b"uncommitted changes, use --all to discard all"
6265 6208 b" changes, or 'hg update %d' to update"
6266 6209 )
6267 6210 % ctx.rev()
6268 6211 )
6269 6212 else:
6270 6213 hint = (
6271 6214 _(
6272 6215 b"use --all to revert all files,"
6273 6216 b" or 'hg update %d' to update"
6274 6217 )
6275 6218 % ctx.rev()
6276 6219 )
6277 6220 elif dirty:
6278 6221 hint = _(b"uncommitted changes, use --all to discard all changes")
6279 6222 else:
6280 6223 hint = _(b"use --all to revert all files")
6281 6224 raise error.Abort(msg, hint=hint)
6282 6225
6283 6226 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6284 6227
6285 6228
6286 6229 @command(
6287 6230 b'rollback',
6288 6231 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6289 6232 helpcategory=command.CATEGORY_MAINTENANCE,
6290 6233 )
6291 6234 def rollback(ui, repo, **opts):
6292 6235 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6293 6236
6294 6237 Please use :hg:`commit --amend` instead of rollback to correct
6295 6238 mistakes in the last commit.
6296 6239
6297 6240 This command should be used with care. There is only one level of
6298 6241 rollback, and there is no way to undo a rollback. It will also
6299 6242 restore the dirstate at the time of the last transaction, losing
6300 6243 any dirstate changes since that time. This command does not alter
6301 6244 the working directory.
6302 6245
6303 6246 Transactions are used to encapsulate the effects of all commands
6304 6247 that create new changesets or propagate existing changesets into a
6305 6248 repository.
6306 6249
6307 6250 .. container:: verbose
6308 6251
6309 6252 For example, the following commands are transactional, and their
6310 6253 effects can be rolled back:
6311 6254
6312 6255 - commit
6313 6256 - import
6314 6257 - pull
6315 6258 - push (with this repository as the destination)
6316 6259 - unbundle
6317 6260
6318 6261 To avoid permanent data loss, rollback will refuse to rollback a
6319 6262 commit transaction if it isn't checked out. Use --force to
6320 6263 override this protection.
6321 6264
6322 6265 The rollback command can be entirely disabled by setting the
6323 6266 ``ui.rollback`` configuration setting to false. If you're here
6324 6267 because you want to use rollback and it's disabled, you can
6325 6268 re-enable the command by setting ``ui.rollback`` to true.
6326 6269
6327 6270 This command is not intended for use on public repositories. Once
6328 6271 changes are visible for pull by other users, rolling a transaction
6329 6272 back locally is ineffective (someone else may already have pulled
6330 6273 the changes). Furthermore, a race is possible with readers of the
6331 6274 repository; for example an in-progress pull from the repository
6332 6275 may fail if a rollback is performed.
6333 6276
6334 6277 Returns 0 on success, 1 if no rollback data is available.
6335 6278 """
6336 6279 if not ui.configbool(b'ui', b'rollback'):
6337 6280 raise error.Abort(
6338 6281 _(b'rollback is disabled because it is unsafe'),
6339 6282 hint=b'see `hg help -v rollback` for information',
6340 6283 )
6341 6284 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6342 6285
6343 6286
6344 6287 @command(
6345 6288 b'root',
6346 6289 [] + formatteropts,
6347 6290 intents={INTENT_READONLY},
6348 6291 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6349 6292 )
6350 6293 def root(ui, repo, **opts):
6351 6294 """print the root (top) of the current working directory
6352 6295
6353 6296 Print the root directory of the current repository.
6354 6297
6355 6298 .. container:: verbose
6356 6299
6357 6300 Template:
6358 6301
6359 6302 The following keywords are supported in addition to the common template
6360 6303 keywords and functions. See also :hg:`help templates`.
6361 6304
6362 6305 :hgpath: String. Path to the .hg directory.
6363 6306 :storepath: String. Path to the directory holding versioned data.
6364 6307
6365 6308 Returns 0 on success.
6366 6309 """
6367 6310 opts = pycompat.byteskwargs(opts)
6368 6311 with ui.formatter(b'root', opts) as fm:
6369 6312 fm.startitem()
6370 6313 fm.write(b'reporoot', b'%s\n', repo.root)
6371 6314 fm.data(hgpath=repo.path, storepath=repo.spath)
6372 6315
6373 6316
6374 6317 @command(
6375 6318 b'serve',
6376 6319 [
6377 6320 (
6378 6321 b'A',
6379 6322 b'accesslog',
6380 6323 b'',
6381 6324 _(b'name of access log file to write to'),
6382 6325 _(b'FILE'),
6383 6326 ),
6384 6327 (b'd', b'daemon', None, _(b'run server in background')),
6385 6328 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6386 6329 (
6387 6330 b'E',
6388 6331 b'errorlog',
6389 6332 b'',
6390 6333 _(b'name of error log file to write to'),
6391 6334 _(b'FILE'),
6392 6335 ),
6393 6336 # use string type, then we can check if something was passed
6394 6337 (
6395 6338 b'p',
6396 6339 b'port',
6397 6340 b'',
6398 6341 _(b'port to listen on (default: 8000)'),
6399 6342 _(b'PORT'),
6400 6343 ),
6401 6344 (
6402 6345 b'a',
6403 6346 b'address',
6404 6347 b'',
6405 6348 _(b'address to listen on (default: all interfaces)'),
6406 6349 _(b'ADDR'),
6407 6350 ),
6408 6351 (
6409 6352 b'',
6410 6353 b'prefix',
6411 6354 b'',
6412 6355 _(b'prefix path to serve from (default: server root)'),
6413 6356 _(b'PREFIX'),
6414 6357 ),
6415 6358 (
6416 6359 b'n',
6417 6360 b'name',
6418 6361 b'',
6419 6362 _(b'name to show in web pages (default: working directory)'),
6420 6363 _(b'NAME'),
6421 6364 ),
6422 6365 (
6423 6366 b'',
6424 6367 b'web-conf',
6425 6368 b'',
6426 6369 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6427 6370 _(b'FILE'),
6428 6371 ),
6429 6372 (
6430 6373 b'',
6431 6374 b'webdir-conf',
6432 6375 b'',
6433 6376 _(b'name of the hgweb config file (DEPRECATED)'),
6434 6377 _(b'FILE'),
6435 6378 ),
6436 6379 (
6437 6380 b'',
6438 6381 b'pid-file',
6439 6382 b'',
6440 6383 _(b'name of file to write process ID to'),
6441 6384 _(b'FILE'),
6442 6385 ),
6443 6386 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6444 6387 (
6445 6388 b'',
6446 6389 b'cmdserver',
6447 6390 b'',
6448 6391 _(b'for remote clients (ADVANCED)'),
6449 6392 _(b'MODE'),
6450 6393 ),
6451 6394 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6452 6395 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6453 6396 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6454 6397 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6455 6398 (b'', b'print-url', None, _(b'start and print only the URL')),
6456 6399 ]
6457 6400 + subrepoopts,
6458 6401 _(b'[OPTION]...'),
6459 6402 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6460 6403 helpbasic=True,
6461 6404 optionalrepo=True,
6462 6405 )
6463 6406 def serve(ui, repo, **opts):
6464 6407 """start stand-alone webserver
6465 6408
6466 6409 Start a local HTTP repository browser and pull server. You can use
6467 6410 this for ad-hoc sharing and browsing of repositories. It is
6468 6411 recommended to use a real web server to serve a repository for
6469 6412 longer periods of time.
6470 6413
6471 6414 Please note that the server does not implement access control.
6472 6415 This means that, by default, anybody can read from the server and
6473 6416 nobody can write to it by default. Set the ``web.allow-push``
6474 6417 option to ``*`` to allow everybody to push to the server. You
6475 6418 should use a real web server if you need to authenticate users.
6476 6419
6477 6420 By default, the server logs accesses to stdout and errors to
6478 6421 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6479 6422 files.
6480 6423
6481 6424 To have the server choose a free port number to listen on, specify
6482 6425 a port number of 0; in this case, the server will print the port
6483 6426 number it uses.
6484 6427
6485 6428 Returns 0 on success.
6486 6429 """
6487 6430
6488 6431 opts = pycompat.byteskwargs(opts)
6489 6432 if opts[b"stdio"] and opts[b"cmdserver"]:
6490 6433 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6491 6434 if opts[b"print_url"] and ui.verbose:
6492 6435 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6493 6436
6494 6437 if opts[b"stdio"]:
6495 6438 if repo is None:
6496 6439 raise error.RepoError(
6497 6440 _(b"there is no Mercurial repository here (.hg not found)")
6498 6441 )
6499 6442 s = wireprotoserver.sshserver(ui, repo)
6500 6443 s.serve_forever()
6501 6444
6502 6445 service = server.createservice(ui, repo, opts)
6503 6446 return server.runservice(opts, initfn=service.init, runfn=service.run)
6504 6447
6505 6448
6506 6449 @command(
6507 6450 b'shelve',
6508 6451 [
6509 6452 (
6510 6453 b'A',
6511 6454 b'addremove',
6512 6455 None,
6513 6456 _(b'mark new/missing files as added/removed before shelving'),
6514 6457 ),
6515 6458 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6516 6459 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6517 6460 (
6518 6461 b'',
6519 6462 b'date',
6520 6463 b'',
6521 6464 _(b'shelve with the specified commit date'),
6522 6465 _(b'DATE'),
6523 6466 ),
6524 6467 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6525 6468 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6526 6469 (
6527 6470 b'k',
6528 6471 b'keep',
6529 6472 False,
6530 6473 _(b'shelve, but keep changes in the working directory'),
6531 6474 ),
6532 6475 (b'l', b'list', None, _(b'list current shelves')),
6533 6476 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6534 6477 (
6535 6478 b'n',
6536 6479 b'name',
6537 6480 b'',
6538 6481 _(b'use the given name for the shelved commit'),
6539 6482 _(b'NAME'),
6540 6483 ),
6541 6484 (
6542 6485 b'p',
6543 6486 b'patch',
6544 6487 None,
6545 6488 _(
6546 6489 b'output patches for changes (provide the names of the shelved '
6547 6490 b'changes as positional arguments)'
6548 6491 ),
6549 6492 ),
6550 6493 (b'i', b'interactive', None, _(b'interactive mode')),
6551 6494 (
6552 6495 b'',
6553 6496 b'stat',
6554 6497 None,
6555 6498 _(
6556 6499 b'output diffstat-style summary of changes (provide the names of '
6557 6500 b'the shelved changes as positional arguments)'
6558 6501 ),
6559 6502 ),
6560 6503 ]
6561 6504 + cmdutil.walkopts,
6562 6505 _(b'hg shelve [OPTION]... [FILE]...'),
6563 6506 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6564 6507 )
6565 6508 def shelve(ui, repo, *pats, **opts):
6566 6509 '''save and set aside changes from the working directory
6567 6510
6568 6511 Shelving takes files that "hg status" reports as not clean, saves
6569 6512 the modifications to a bundle (a shelved change), and reverts the
6570 6513 files so that their state in the working directory becomes clean.
6571 6514
6572 6515 To restore these changes to the working directory, using "hg
6573 6516 unshelve"; this will work even if you switch to a different
6574 6517 commit.
6575 6518
6576 6519 When no files are specified, "hg shelve" saves all not-clean
6577 6520 files. If specific files or directories are named, only changes to
6578 6521 those files are shelved.
6579 6522
6580 6523 In bare shelve (when no files are specified, without interactive,
6581 6524 include and exclude option), shelving remembers information if the
6582 6525 working directory was on newly created branch, in other words working
6583 6526 directory was on different branch than its first parent. In this
6584 6527 situation unshelving restores branch information to the working directory.
6585 6528
6586 6529 Each shelved change has a name that makes it easier to find later.
6587 6530 The name of a shelved change defaults to being based on the active
6588 6531 bookmark, or if there is no active bookmark, the current named
6589 6532 branch. To specify a different name, use ``--name``.
6590 6533
6591 6534 To see a list of existing shelved changes, use the ``--list``
6592 6535 option. For each shelved change, this will print its name, age,
6593 6536 and description; use ``--patch`` or ``--stat`` for more details.
6594 6537
6595 6538 To delete specific shelved changes, use ``--delete``. To delete
6596 6539 all shelved changes, use ``--cleanup``.
6597 6540 '''
6598 6541 opts = pycompat.byteskwargs(opts)
6599 6542 allowables = [
6600 6543 (b'addremove', {b'create'}), # 'create' is pseudo action
6601 6544 (b'unknown', {b'create'}),
6602 6545 (b'cleanup', {b'cleanup'}),
6603 6546 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6604 6547 (b'delete', {b'delete'}),
6605 6548 (b'edit', {b'create'}),
6606 6549 (b'keep', {b'create'}),
6607 6550 (b'list', {b'list'}),
6608 6551 (b'message', {b'create'}),
6609 6552 (b'name', {b'create'}),
6610 6553 (b'patch', {b'patch', b'list'}),
6611 6554 (b'stat', {b'stat', b'list'}),
6612 6555 ]
6613 6556
6614 6557 def checkopt(opt):
6615 6558 if opts.get(opt):
6616 6559 for i, allowable in allowables:
6617 6560 if opts[i] and opt not in allowable:
6618 6561 raise error.Abort(
6619 6562 _(
6620 6563 b"options '--%s' and '--%s' may not be "
6621 6564 b"used together"
6622 6565 )
6623 6566 % (opt, i)
6624 6567 )
6625 6568 return True
6626 6569
6627 6570 if checkopt(b'cleanup'):
6628 6571 if pats:
6629 6572 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6630 6573 return shelvemod.cleanupcmd(ui, repo)
6631 6574 elif checkopt(b'delete'):
6632 6575 return shelvemod.deletecmd(ui, repo, pats)
6633 6576 elif checkopt(b'list'):
6634 6577 return shelvemod.listcmd(ui, repo, pats, opts)
6635 6578 elif checkopt(b'patch') or checkopt(b'stat'):
6636 6579 return shelvemod.patchcmds(ui, repo, pats, opts)
6637 6580 else:
6638 6581 return shelvemod.createcmd(ui, repo, pats, opts)
6639 6582
6640 6583
6641 6584 _NOTTERSE = b'nothing'
6642 6585
6643 6586
6644 6587 @command(
6645 6588 b'status|st',
6646 6589 [
6647 6590 (b'A', b'all', None, _(b'show status of all files')),
6648 6591 (b'm', b'modified', None, _(b'show only modified files')),
6649 6592 (b'a', b'added', None, _(b'show only added files')),
6650 6593 (b'r', b'removed', None, _(b'show only removed files')),
6651 6594 (b'd', b'deleted', None, _(b'show only missing files')),
6652 6595 (b'c', b'clean', None, _(b'show only files without changes')),
6653 6596 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6654 6597 (b'i', b'ignored', None, _(b'show only ignored files')),
6655 6598 (b'n', b'no-status', None, _(b'hide status prefix')),
6656 6599 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6657 6600 (
6658 6601 b'C',
6659 6602 b'copies',
6660 6603 None,
6661 6604 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6662 6605 ),
6663 6606 (
6664 6607 b'0',
6665 6608 b'print0',
6666 6609 None,
6667 6610 _(b'end filenames with NUL, for use with xargs'),
6668 6611 ),
6669 6612 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6670 6613 (
6671 6614 b'',
6672 6615 b'change',
6673 6616 b'',
6674 6617 _(b'list the changed files of a revision'),
6675 6618 _(b'REV'),
6676 6619 ),
6677 6620 ]
6678 6621 + walkopts
6679 6622 + subrepoopts
6680 6623 + formatteropts,
6681 6624 _(b'[OPTION]... [FILE]...'),
6682 6625 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6683 6626 helpbasic=True,
6684 6627 inferrepo=True,
6685 6628 intents={INTENT_READONLY},
6686 6629 )
6687 6630 def status(ui, repo, *pats, **opts):
6688 6631 """show changed files in the working directory
6689 6632
6690 6633 Show status of files in the repository. If names are given, only
6691 6634 files that match are shown. Files that are clean or ignored or
6692 6635 the source of a copy/move operation, are not listed unless
6693 6636 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6694 6637 Unless options described with "show only ..." are given, the
6695 6638 options -mardu are used.
6696 6639
6697 6640 Option -q/--quiet hides untracked (unknown and ignored) files
6698 6641 unless explicitly requested with -u/--unknown or -i/--ignored.
6699 6642
6700 6643 .. note::
6701 6644
6702 6645 :hg:`status` may appear to disagree with diff if permissions have
6703 6646 changed or a merge has occurred. The standard diff format does
6704 6647 not report permission changes and diff only reports changes
6705 6648 relative to one merge parent.
6706 6649
6707 6650 If one revision is given, it is used as the base revision.
6708 6651 If two revisions are given, the differences between them are
6709 6652 shown. The --change option can also be used as a shortcut to list
6710 6653 the changed files of a revision from its first parent.
6711 6654
6712 6655 The codes used to show the status of files are::
6713 6656
6714 6657 M = modified
6715 6658 A = added
6716 6659 R = removed
6717 6660 C = clean
6718 6661 ! = missing (deleted by non-hg command, but still tracked)
6719 6662 ? = not tracked
6720 6663 I = ignored
6721 6664 = origin of the previous file (with --copies)
6722 6665
6723 6666 .. container:: verbose
6724 6667
6725 6668 The -t/--terse option abbreviates the output by showing only the directory
6726 6669 name if all the files in it share the same status. The option takes an
6727 6670 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6728 6671 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6729 6672 for 'ignored' and 'c' for clean.
6730 6673
6731 6674 It abbreviates only those statuses which are passed. Note that clean and
6732 6675 ignored files are not displayed with '--terse ic' unless the -c/--clean
6733 6676 and -i/--ignored options are also used.
6734 6677
6735 6678 The -v/--verbose option shows information when the repository is in an
6736 6679 unfinished merge, shelve, rebase state etc. You can have this behavior
6737 6680 turned on by default by enabling the ``commands.status.verbose`` option.
6738 6681
6739 6682 You can skip displaying some of these states by setting
6740 6683 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6741 6684 'histedit', 'merge', 'rebase', or 'unshelve'.
6742 6685
6743 6686 Template:
6744 6687
6745 6688 The following keywords are supported in addition to the common template
6746 6689 keywords and functions. See also :hg:`help templates`.
6747 6690
6748 6691 :path: String. Repository-absolute path of the file.
6749 6692 :source: String. Repository-absolute path of the file originated from.
6750 6693 Available if ``--copies`` is specified.
6751 6694 :status: String. Character denoting file's status.
6752 6695
6753 6696 Examples:
6754 6697
6755 6698 - show changes in the working directory relative to a
6756 6699 changeset::
6757 6700
6758 6701 hg status --rev 9353
6759 6702
6760 6703 - show changes in the working directory relative to the
6761 6704 current directory (see :hg:`help patterns` for more information)::
6762 6705
6763 6706 hg status re:
6764 6707
6765 6708 - show all changes including copies in an existing changeset::
6766 6709
6767 6710 hg status --copies --change 9353
6768 6711
6769 6712 - get a NUL separated list of added files, suitable for xargs::
6770 6713
6771 6714 hg status -an0
6772 6715
6773 6716 - show more information about the repository status, abbreviating
6774 6717 added, removed, modified, deleted, and untracked paths::
6775 6718
6776 6719 hg status -v -t mardu
6777 6720
6778 6721 Returns 0 on success.
6779 6722
6780 6723 """
6781 6724
6782 6725 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6783 6726 opts = pycompat.byteskwargs(opts)
6784 6727 revs = opts.get(b'rev')
6785 6728 change = opts.get(b'change')
6786 6729 terse = opts.get(b'terse')
6787 6730 if terse is _NOTTERSE:
6788 6731 if revs:
6789 6732 terse = b''
6790 6733 else:
6791 6734 terse = ui.config(b'commands', b'status.terse')
6792 6735
6793 6736 if revs and terse:
6794 6737 msg = _(b'cannot use --terse with --rev')
6795 6738 raise error.Abort(msg)
6796 6739 elif change:
6797 6740 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6798 6741 ctx2 = scmutil.revsingle(repo, change, None)
6799 6742 ctx1 = ctx2.p1()
6800 6743 else:
6801 6744 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6802 6745 ctx1, ctx2 = scmutil.revpair(repo, revs)
6803 6746
6804 6747 forcerelativevalue = None
6805 6748 if ui.hasconfig(b'commands', b'status.relative'):
6806 6749 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6807 6750 uipathfn = scmutil.getuipathfn(
6808 6751 repo,
6809 6752 legacyrelativevalue=bool(pats),
6810 6753 forcerelativevalue=forcerelativevalue,
6811 6754 )
6812 6755
6813 6756 if opts.get(b'print0'):
6814 6757 end = b'\0'
6815 6758 else:
6816 6759 end = b'\n'
6817 6760 states = b'modified added removed deleted unknown ignored clean'.split()
6818 6761 show = [k for k in states if opts.get(k)]
6819 6762 if opts.get(b'all'):
6820 6763 show += ui.quiet and (states[:4] + [b'clean']) or states
6821 6764
6822 6765 if not show:
6823 6766 if ui.quiet:
6824 6767 show = states[:4]
6825 6768 else:
6826 6769 show = states[:5]
6827 6770
6828 6771 m = scmutil.match(ctx2, pats, opts)
6829 6772 if terse:
6830 6773 # we need to compute clean and unknown to terse
6831 6774 stat = repo.status(
6832 6775 ctx1.node(),
6833 6776 ctx2.node(),
6834 6777 m,
6835 6778 b'ignored' in show or b'i' in terse,
6836 6779 clean=True,
6837 6780 unknown=True,
6838 6781 listsubrepos=opts.get(b'subrepos'),
6839 6782 )
6840 6783
6841 6784 stat = cmdutil.tersedir(stat, terse)
6842 6785 else:
6843 6786 stat = repo.status(
6844 6787 ctx1.node(),
6845 6788 ctx2.node(),
6846 6789 m,
6847 6790 b'ignored' in show,
6848 6791 b'clean' in show,
6849 6792 b'unknown' in show,
6850 6793 opts.get(b'subrepos'),
6851 6794 )
6852 6795
6853 6796 changestates = zip(
6854 6797 states,
6855 6798 pycompat.iterbytestr(b'MAR!?IC'),
6856 6799 [getattr(stat, s.decode('utf8')) for s in states],
6857 6800 )
6858 6801
6859 6802 copy = {}
6860 6803 if (
6861 6804 opts.get(b'all')
6862 6805 or opts.get(b'copies')
6863 6806 or ui.configbool(b'ui', b'statuscopies')
6864 6807 ) and not opts.get(b'no_status'):
6865 6808 copy = copies.pathcopies(ctx1, ctx2, m)
6866 6809
6867 6810 morestatus = None
6868 6811 if (
6869 6812 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6870 6813 ) and not ui.plain():
6871 6814 morestatus = cmdutil.readmorestatus(repo)
6872 6815
6873 6816 ui.pager(b'status')
6874 6817 fm = ui.formatter(b'status', opts)
6875 6818 fmt = b'%s' + end
6876 6819 showchar = not opts.get(b'no_status')
6877 6820
6878 6821 for state, char, files in changestates:
6879 6822 if state in show:
6880 6823 label = b'status.' + state
6881 6824 for f in files:
6882 6825 fm.startitem()
6883 6826 fm.context(ctx=ctx2)
6884 6827 fm.data(itemtype=b'file', path=f)
6885 6828 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6886 6829 fm.plain(fmt % uipathfn(f), label=label)
6887 6830 if f in copy:
6888 6831 fm.data(source=copy[f])
6889 6832 fm.plain(
6890 6833 (b' %s' + end) % uipathfn(copy[f]),
6891 6834 label=b'status.copied',
6892 6835 )
6893 6836 if morestatus:
6894 6837 morestatus.formatfile(f, fm)
6895 6838
6896 6839 if morestatus:
6897 6840 morestatus.formatfooter(fm)
6898 6841 fm.end()
6899 6842
6900 6843
6901 6844 @command(
6902 6845 b'summary|sum',
6903 6846 [(b'', b'remote', None, _(b'check for push and pull'))],
6904 6847 b'[--remote]',
6905 6848 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6906 6849 helpbasic=True,
6907 6850 intents={INTENT_READONLY},
6908 6851 )
6909 6852 def summary(ui, repo, **opts):
6910 6853 """summarize working directory state
6911 6854
6912 6855 This generates a brief summary of the working directory state,
6913 6856 including parents, branch, commit status, phase and available updates.
6914 6857
6915 6858 With the --remote option, this will check the default paths for
6916 6859 incoming and outgoing changes. This can be time-consuming.
6917 6860
6918 6861 Returns 0 on success.
6919 6862 """
6920 6863
6921 6864 opts = pycompat.byteskwargs(opts)
6922 6865 ui.pager(b'summary')
6923 6866 ctx = repo[None]
6924 6867 parents = ctx.parents()
6925 6868 pnode = parents[0].node()
6926 6869 marks = []
6927 6870
6928 6871 try:
6929 6872 ms = mergestatemod.mergestate.read(repo)
6930 6873 except error.UnsupportedMergeRecords as e:
6931 6874 s = b' '.join(e.recordtypes)
6932 6875 ui.warn(
6933 6876 _(b'warning: merge state has unsupported record types: %s\n') % s
6934 6877 )
6935 6878 unresolved = []
6936 6879 else:
6937 6880 unresolved = list(ms.unresolved())
6938 6881
6939 6882 for p in parents:
6940 6883 # label with log.changeset (instead of log.parent) since this
6941 6884 # shows a working directory parent *changeset*:
6942 6885 # i18n: column positioning for "hg summary"
6943 6886 ui.write(
6944 6887 _(b'parent: %d:%s ') % (p.rev(), p),
6945 6888 label=logcmdutil.changesetlabels(p),
6946 6889 )
6947 6890 ui.write(b' '.join(p.tags()), label=b'log.tag')
6948 6891 if p.bookmarks():
6949 6892 marks.extend(p.bookmarks())
6950 6893 if p.rev() == -1:
6951 6894 if not len(repo):
6952 6895 ui.write(_(b' (empty repository)'))
6953 6896 else:
6954 6897 ui.write(_(b' (no revision checked out)'))
6955 6898 if p.obsolete():
6956 6899 ui.write(_(b' (obsolete)'))
6957 6900 if p.isunstable():
6958 6901 instabilities = (
6959 6902 ui.label(instability, b'trouble.%s' % instability)
6960 6903 for instability in p.instabilities()
6961 6904 )
6962 6905 ui.write(b' (' + b', '.join(instabilities) + b')')
6963 6906 ui.write(b'\n')
6964 6907 if p.description():
6965 6908 ui.status(
6966 6909 b' ' + p.description().splitlines()[0].strip() + b'\n',
6967 6910 label=b'log.summary',
6968 6911 )
6969 6912
6970 6913 branch = ctx.branch()
6971 6914 bheads = repo.branchheads(branch)
6972 6915 # i18n: column positioning for "hg summary"
6973 6916 m = _(b'branch: %s\n') % branch
6974 6917 if branch != b'default':
6975 6918 ui.write(m, label=b'log.branch')
6976 6919 else:
6977 6920 ui.status(m, label=b'log.branch')
6978 6921
6979 6922 if marks:
6980 6923 active = repo._activebookmark
6981 6924 # i18n: column positioning for "hg summary"
6982 6925 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6983 6926 if active is not None:
6984 6927 if active in marks:
6985 6928 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6986 6929 marks.remove(active)
6987 6930 else:
6988 6931 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6989 6932 for m in marks:
6990 6933 ui.write(b' ' + m, label=b'log.bookmark')
6991 6934 ui.write(b'\n', label=b'log.bookmark')
6992 6935
6993 6936 status = repo.status(unknown=True)
6994 6937
6995 6938 c = repo.dirstate.copies()
6996 6939 copied, renamed = [], []
6997 6940 for d, s in pycompat.iteritems(c):
6998 6941 if s in status.removed:
6999 6942 status.removed.remove(s)
7000 6943 renamed.append(d)
7001 6944 else:
7002 6945 copied.append(d)
7003 6946 if d in status.added:
7004 6947 status.added.remove(d)
7005 6948
7006 6949 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7007 6950
7008 6951 labels = [
7009 6952 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7010 6953 (ui.label(_(b'%d added'), b'status.added'), status.added),
7011 6954 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7012 6955 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7013 6956 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7014 6957 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7015 6958 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7016 6959 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7017 6960 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7018 6961 ]
7019 6962 t = []
7020 6963 for l, s in labels:
7021 6964 if s:
7022 6965 t.append(l % len(s))
7023 6966
7024 6967 t = b', '.join(t)
7025 6968 cleanworkdir = False
7026 6969
7027 6970 if repo.vfs.exists(b'graftstate'):
7028 6971 t += _(b' (graft in progress)')
7029 6972 if repo.vfs.exists(b'updatestate'):
7030 6973 t += _(b' (interrupted update)')
7031 6974 elif len(parents) > 1:
7032 6975 t += _(b' (merge)')
7033 6976 elif branch != parents[0].branch():
7034 6977 t += _(b' (new branch)')
7035 6978 elif parents[0].closesbranch() and pnode in repo.branchheads(
7036 6979 branch, closed=True
7037 6980 ):
7038 6981 t += _(b' (head closed)')
7039 6982 elif not (
7040 6983 status.modified
7041 6984 or status.added
7042 6985 or status.removed
7043 6986 or renamed
7044 6987 or copied
7045 6988 or subs
7046 6989 ):
7047 6990 t += _(b' (clean)')
7048 6991 cleanworkdir = True
7049 6992 elif pnode not in bheads:
7050 6993 t += _(b' (new branch head)')
7051 6994
7052 6995 if parents:
7053 6996 pendingphase = max(p.phase() for p in parents)
7054 6997 else:
7055 6998 pendingphase = phases.public
7056 6999
7057 7000 if pendingphase > phases.newcommitphase(ui):
7058 7001 t += b' (%s)' % phases.phasenames[pendingphase]
7059 7002
7060 7003 if cleanworkdir:
7061 7004 # i18n: column positioning for "hg summary"
7062 7005 ui.status(_(b'commit: %s\n') % t.strip())
7063 7006 else:
7064 7007 # i18n: column positioning for "hg summary"
7065 7008 ui.write(_(b'commit: %s\n') % t.strip())
7066 7009
7067 7010 # all ancestors of branch heads - all ancestors of parent = new csets
7068 7011 new = len(
7069 7012 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7070 7013 )
7071 7014
7072 7015 if new == 0:
7073 7016 # i18n: column positioning for "hg summary"
7074 7017 ui.status(_(b'update: (current)\n'))
7075 7018 elif pnode not in bheads:
7076 7019 # i18n: column positioning for "hg summary"
7077 7020 ui.write(_(b'update: %d new changesets (update)\n') % new)
7078 7021 else:
7079 7022 # i18n: column positioning for "hg summary"
7080 7023 ui.write(
7081 7024 _(b'update: %d new changesets, %d branch heads (merge)\n')
7082 7025 % (new, len(bheads))
7083 7026 )
7084 7027
7085 7028 t = []
7086 7029 draft = len(repo.revs(b'draft()'))
7087 7030 if draft:
7088 7031 t.append(_(b'%d draft') % draft)
7089 7032 secret = len(repo.revs(b'secret()'))
7090 7033 if secret:
7091 7034 t.append(_(b'%d secret') % secret)
7092 7035
7093 7036 if draft or secret:
7094 7037 ui.status(_(b'phases: %s\n') % b', '.join(t))
7095 7038
7096 7039 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7097 7040 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7098 7041 numtrouble = len(repo.revs(trouble + b"()"))
7099 7042 # We write all the possibilities to ease translation
7100 7043 troublemsg = {
7101 7044 b"orphan": _(b"orphan: %d changesets"),
7102 7045 b"contentdivergent": _(b"content-divergent: %d changesets"),
7103 7046 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7104 7047 }
7105 7048 if numtrouble > 0:
7106 7049 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7107 7050
7108 7051 cmdutil.summaryhooks(ui, repo)
7109 7052
7110 7053 if opts.get(b'remote'):
7111 7054 needsincoming, needsoutgoing = True, True
7112 7055 else:
7113 7056 needsincoming, needsoutgoing = False, False
7114 7057 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7115 7058 if i:
7116 7059 needsincoming = True
7117 7060 if o:
7118 7061 needsoutgoing = True
7119 7062 if not needsincoming and not needsoutgoing:
7120 7063 return
7121 7064
7122 7065 def getincoming():
7123 7066 source, branches = hg.parseurl(ui.expandpath(b'default'))
7124 7067 sbranch = branches[0]
7125 7068 try:
7126 7069 other = hg.peer(repo, {}, source)
7127 7070 except error.RepoError:
7128 7071 if opts.get(b'remote'):
7129 7072 raise
7130 7073 return source, sbranch, None, None, None
7131 7074 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7132 7075 if revs:
7133 7076 revs = [other.lookup(rev) for rev in revs]
7134 7077 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7135 7078 repo.ui.pushbuffer()
7136 7079 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7137 7080 repo.ui.popbuffer()
7138 7081 return source, sbranch, other, commoninc, commoninc[1]
7139 7082
7140 7083 if needsincoming:
7141 7084 source, sbranch, sother, commoninc, incoming = getincoming()
7142 7085 else:
7143 7086 source = sbranch = sother = commoninc = incoming = None
7144 7087
7145 7088 def getoutgoing():
7146 7089 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7147 7090 dbranch = branches[0]
7148 7091 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7149 7092 if source != dest:
7150 7093 try:
7151 7094 dother = hg.peer(repo, {}, dest)
7152 7095 except error.RepoError:
7153 7096 if opts.get(b'remote'):
7154 7097 raise
7155 7098 return dest, dbranch, None, None
7156 7099 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7157 7100 elif sother is None:
7158 7101 # there is no explicit destination peer, but source one is invalid
7159 7102 return dest, dbranch, None, None
7160 7103 else:
7161 7104 dother = sother
7162 7105 if source != dest or (sbranch is not None and sbranch != dbranch):
7163 7106 common = None
7164 7107 else:
7165 7108 common = commoninc
7166 7109 if revs:
7167 7110 revs = [repo.lookup(rev) for rev in revs]
7168 7111 repo.ui.pushbuffer()
7169 7112 outgoing = discovery.findcommonoutgoing(
7170 7113 repo, dother, onlyheads=revs, commoninc=common
7171 7114 )
7172 7115 repo.ui.popbuffer()
7173 7116 return dest, dbranch, dother, outgoing
7174 7117
7175 7118 if needsoutgoing:
7176 7119 dest, dbranch, dother, outgoing = getoutgoing()
7177 7120 else:
7178 7121 dest = dbranch = dother = outgoing = None
7179 7122
7180 7123 if opts.get(b'remote'):
7181 7124 t = []
7182 7125 if incoming:
7183 7126 t.append(_(b'1 or more incoming'))
7184 7127 o = outgoing.missing
7185 7128 if o:
7186 7129 t.append(_(b'%d outgoing') % len(o))
7187 7130 other = dother or sother
7188 7131 if b'bookmarks' in other.listkeys(b'namespaces'):
7189 7132 counts = bookmarks.summary(repo, other)
7190 7133 if counts[0] > 0:
7191 7134 t.append(_(b'%d incoming bookmarks') % counts[0])
7192 7135 if counts[1] > 0:
7193 7136 t.append(_(b'%d outgoing bookmarks') % counts[1])
7194 7137
7195 7138 if t:
7196 7139 # i18n: column positioning for "hg summary"
7197 7140 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7198 7141 else:
7199 7142 # i18n: column positioning for "hg summary"
7200 7143 ui.status(_(b'remote: (synced)\n'))
7201 7144
7202 7145 cmdutil.summaryremotehooks(
7203 7146 ui,
7204 7147 repo,
7205 7148 opts,
7206 7149 (
7207 7150 (source, sbranch, sother, commoninc),
7208 7151 (dest, dbranch, dother, outgoing),
7209 7152 ),
7210 7153 )
7211 7154
7212 7155
7213 7156 @command(
7214 7157 b'tag',
7215 7158 [
7216 7159 (b'f', b'force', None, _(b'force tag')),
7217 7160 (b'l', b'local', None, _(b'make the tag local')),
7218 7161 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7219 7162 (b'', b'remove', None, _(b'remove a tag')),
7220 7163 # -l/--local is already there, commitopts cannot be used
7221 7164 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7222 7165 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7223 7166 ]
7224 7167 + commitopts2,
7225 7168 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7226 7169 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7227 7170 )
7228 7171 def tag(ui, repo, name1, *names, **opts):
7229 7172 """add one or more tags for the current or given revision
7230 7173
7231 7174 Name a particular revision using <name>.
7232 7175
7233 7176 Tags are used to name particular revisions of the repository and are
7234 7177 very useful to compare different revisions, to go back to significant
7235 7178 earlier versions or to mark branch points as releases, etc. Changing
7236 7179 an existing tag is normally disallowed; use -f/--force to override.
7237 7180
7238 7181 If no revision is given, the parent of the working directory is
7239 7182 used.
7240 7183
7241 7184 To facilitate version control, distribution, and merging of tags,
7242 7185 they are stored as a file named ".hgtags" which is managed similarly
7243 7186 to other project files and can be hand-edited if necessary. This
7244 7187 also means that tagging creates a new commit. The file
7245 7188 ".hg/localtags" is used for local tags (not shared among
7246 7189 repositories).
7247 7190
7248 7191 Tag commits are usually made at the head of a branch. If the parent
7249 7192 of the working directory is not a branch head, :hg:`tag` aborts; use
7250 7193 -f/--force to force the tag commit to be based on a non-head
7251 7194 changeset.
7252 7195
7253 7196 See :hg:`help dates` for a list of formats valid for -d/--date.
7254 7197
7255 7198 Since tag names have priority over branch names during revision
7256 7199 lookup, using an existing branch name as a tag name is discouraged.
7257 7200
7258 7201 Returns 0 on success.
7259 7202 """
7260 7203 opts = pycompat.byteskwargs(opts)
7261 7204 with repo.wlock(), repo.lock():
7262 7205 rev_ = b"."
7263 7206 names = [t.strip() for t in (name1,) + names]
7264 7207 if len(names) != len(set(names)):
7265 7208 raise error.Abort(_(b'tag names must be unique'))
7266 7209 for n in names:
7267 7210 scmutil.checknewlabel(repo, n, b'tag')
7268 7211 if not n:
7269 7212 raise error.Abort(
7270 7213 _(b'tag names cannot consist entirely of whitespace')
7271 7214 )
7272 7215 if opts.get(b'rev') and opts.get(b'remove'):
7273 7216 raise error.Abort(_(b"--rev and --remove are incompatible"))
7274 7217 if opts.get(b'rev'):
7275 7218 rev_ = opts[b'rev']
7276 7219 message = opts.get(b'message')
7277 7220 if opts.get(b'remove'):
7278 7221 if opts.get(b'local'):
7279 7222 expectedtype = b'local'
7280 7223 else:
7281 7224 expectedtype = b'global'
7282 7225
7283 7226 for n in names:
7284 7227 if repo.tagtype(n) == b'global':
7285 7228 alltags = tagsmod.findglobaltags(ui, repo)
7286 7229 if alltags[n][0] == nullid:
7287 7230 raise error.Abort(_(b"tag '%s' is already removed") % n)
7288 7231 if not repo.tagtype(n):
7289 7232 raise error.Abort(_(b"tag '%s' does not exist") % n)
7290 7233 if repo.tagtype(n) != expectedtype:
7291 7234 if expectedtype == b'global':
7292 7235 raise error.Abort(
7293 7236 _(b"tag '%s' is not a global tag") % n
7294 7237 )
7295 7238 else:
7296 7239 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7297 7240 rev_ = b'null'
7298 7241 if not message:
7299 7242 # we don't translate commit messages
7300 7243 message = b'Removed tag %s' % b', '.join(names)
7301 7244 elif not opts.get(b'force'):
7302 7245 for n in names:
7303 7246 if n in repo.tags():
7304 7247 raise error.Abort(
7305 7248 _(b"tag '%s' already exists (use -f to force)") % n
7306 7249 )
7307 7250 if not opts.get(b'local'):
7308 7251 p1, p2 = repo.dirstate.parents()
7309 7252 if p2 != nullid:
7310 7253 raise error.Abort(_(b'uncommitted merge'))
7311 7254 bheads = repo.branchheads()
7312 7255 if not opts.get(b'force') and bheads and p1 not in bheads:
7313 7256 raise error.Abort(
7314 7257 _(
7315 7258 b'working directory is not at a branch head '
7316 7259 b'(use -f to force)'
7317 7260 )
7318 7261 )
7319 7262 node = scmutil.revsingle(repo, rev_).node()
7320 7263
7321 7264 if not message:
7322 7265 # we don't translate commit messages
7323 7266 message = b'Added tag %s for changeset %s' % (
7324 7267 b', '.join(names),
7325 7268 short(node),
7326 7269 )
7327 7270
7328 7271 date = opts.get(b'date')
7329 7272 if date:
7330 7273 date = dateutil.parsedate(date)
7331 7274
7332 7275 if opts.get(b'remove'):
7333 7276 editform = b'tag.remove'
7334 7277 else:
7335 7278 editform = b'tag.add'
7336 7279 editor = cmdutil.getcommiteditor(
7337 7280 editform=editform, **pycompat.strkwargs(opts)
7338 7281 )
7339 7282
7340 7283 # don't allow tagging the null rev
7341 7284 if (
7342 7285 not opts.get(b'remove')
7343 7286 and scmutil.revsingle(repo, rev_).rev() == nullrev
7344 7287 ):
7345 7288 raise error.Abort(_(b"cannot tag null revision"))
7346 7289
7347 7290 tagsmod.tag(
7348 7291 repo,
7349 7292 names,
7350 7293 node,
7351 7294 message,
7352 7295 opts.get(b'local'),
7353 7296 opts.get(b'user'),
7354 7297 date,
7355 7298 editor=editor,
7356 7299 )
7357 7300
7358 7301
7359 7302 @command(
7360 7303 b'tags',
7361 7304 formatteropts,
7362 7305 b'',
7363 7306 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7364 7307 intents={INTENT_READONLY},
7365 7308 )
7366 7309 def tags(ui, repo, **opts):
7367 7310 """list repository tags
7368 7311
7369 7312 This lists both regular and local tags. When the -v/--verbose
7370 7313 switch is used, a third column "local" is printed for local tags.
7371 7314 When the -q/--quiet switch is used, only the tag name is printed.
7372 7315
7373 7316 .. container:: verbose
7374 7317
7375 7318 Template:
7376 7319
7377 7320 The following keywords are supported in addition to the common template
7378 7321 keywords and functions such as ``{tag}``. See also
7379 7322 :hg:`help templates`.
7380 7323
7381 7324 :type: String. ``local`` for local tags.
7382 7325
7383 7326 Returns 0 on success.
7384 7327 """
7385 7328
7386 7329 opts = pycompat.byteskwargs(opts)
7387 7330 ui.pager(b'tags')
7388 7331 fm = ui.formatter(b'tags', opts)
7389 7332 hexfunc = fm.hexfunc
7390 7333
7391 7334 for t, n in reversed(repo.tagslist()):
7392 7335 hn = hexfunc(n)
7393 7336 label = b'tags.normal'
7394 7337 tagtype = b''
7395 7338 if repo.tagtype(t) == b'local':
7396 7339 label = b'tags.local'
7397 7340 tagtype = b'local'
7398 7341
7399 7342 fm.startitem()
7400 7343 fm.context(repo=repo)
7401 7344 fm.write(b'tag', b'%s', t, label=label)
7402 7345 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7403 7346 fm.condwrite(
7404 7347 not ui.quiet,
7405 7348 b'rev node',
7406 7349 fmt,
7407 7350 repo.changelog.rev(n),
7408 7351 hn,
7409 7352 label=label,
7410 7353 )
7411 7354 fm.condwrite(
7412 7355 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7413 7356 )
7414 7357 fm.plain(b'\n')
7415 7358 fm.end()
7416 7359
7417 7360
7418 7361 @command(
7419 7362 b'tip',
7420 7363 [
7421 7364 (b'p', b'patch', None, _(b'show patch')),
7422 7365 (b'g', b'git', None, _(b'use git extended diff format')),
7423 7366 ]
7424 7367 + templateopts,
7425 7368 _(b'[-p] [-g]'),
7426 7369 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7427 7370 )
7428 7371 def tip(ui, repo, **opts):
7429 7372 """show the tip revision (DEPRECATED)
7430 7373
7431 7374 The tip revision (usually just called the tip) is the changeset
7432 7375 most recently added to the repository (and therefore the most
7433 7376 recently changed head).
7434 7377
7435 7378 If you have just made a commit, that commit will be the tip. If
7436 7379 you have just pulled changes from another repository, the tip of
7437 7380 that repository becomes the current tip. The "tip" tag is special
7438 7381 and cannot be renamed or assigned to a different changeset.
7439 7382
7440 7383 This command is deprecated, please use :hg:`heads` instead.
7441 7384
7442 7385 Returns 0 on success.
7443 7386 """
7444 7387 opts = pycompat.byteskwargs(opts)
7445 7388 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7446 7389 displayer.show(repo[b'tip'])
7447 7390 displayer.close()
7448 7391
7449 7392
7450 7393 @command(
7451 7394 b'unbundle',
7452 7395 [
7453 7396 (
7454 7397 b'u',
7455 7398 b'update',
7456 7399 None,
7457 7400 _(b'update to new branch head if changesets were unbundled'),
7458 7401 )
7459 7402 ],
7460 7403 _(b'[-u] FILE...'),
7461 7404 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7462 7405 )
7463 7406 def unbundle(ui, repo, fname1, *fnames, **opts):
7464 7407 """apply one or more bundle files
7465 7408
7466 7409 Apply one or more bundle files generated by :hg:`bundle`.
7467 7410
7468 7411 Returns 0 on success, 1 if an update has unresolved files.
7469 7412 """
7470 7413 fnames = (fname1,) + fnames
7471 7414
7472 7415 with repo.lock():
7473 7416 for fname in fnames:
7474 7417 f = hg.openpath(ui, fname)
7475 7418 gen = exchange.readbundle(ui, f, fname)
7476 7419 if isinstance(gen, streamclone.streamcloneapplier):
7477 7420 raise error.Abort(
7478 7421 _(
7479 7422 b'packed bundles cannot be applied with '
7480 7423 b'"hg unbundle"'
7481 7424 ),
7482 7425 hint=_(b'use "hg debugapplystreamclonebundle"'),
7483 7426 )
7484 7427 url = b'bundle:' + fname
7485 7428 try:
7486 7429 txnname = b'unbundle'
7487 7430 if not isinstance(gen, bundle2.unbundle20):
7488 7431 txnname = b'unbundle\n%s' % util.hidepassword(url)
7489 7432 with repo.transaction(txnname) as tr:
7490 7433 op = bundle2.applybundle(
7491 7434 repo, gen, tr, source=b'unbundle', url=url
7492 7435 )
7493 7436 except error.BundleUnknownFeatureError as exc:
7494 7437 raise error.Abort(
7495 7438 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7496 7439 hint=_(
7497 7440 b"see https://mercurial-scm.org/"
7498 7441 b"wiki/BundleFeature for more "
7499 7442 b"information"
7500 7443 ),
7501 7444 )
7502 7445 modheads = bundle2.combinechangegroupresults(op)
7503 7446
7504 7447 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7505 7448
7506 7449
7507 7450 @command(
7508 7451 b'unshelve',
7509 7452 [
7510 7453 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7511 7454 (
7512 7455 b'c',
7513 7456 b'continue',
7514 7457 None,
7515 7458 _(b'continue an incomplete unshelve operation'),
7516 7459 ),
7517 7460 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7518 7461 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7519 7462 (
7520 7463 b'n',
7521 7464 b'name',
7522 7465 b'',
7523 7466 _(b'restore shelved change with given name'),
7524 7467 _(b'NAME'),
7525 7468 ),
7526 7469 (b't', b'tool', b'', _(b'specify merge tool')),
7527 7470 (
7528 7471 b'',
7529 7472 b'date',
7530 7473 b'',
7531 7474 _(b'set date for temporary commits (DEPRECATED)'),
7532 7475 _(b'DATE'),
7533 7476 ),
7534 7477 ],
7535 7478 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7536 7479 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7537 7480 )
7538 7481 def unshelve(ui, repo, *shelved, **opts):
7539 7482 """restore a shelved change to the working directory
7540 7483
7541 7484 This command accepts an optional name of a shelved change to
7542 7485 restore. If none is given, the most recent shelved change is used.
7543 7486
7544 7487 If a shelved change is applied successfully, the bundle that
7545 7488 contains the shelved changes is moved to a backup location
7546 7489 (.hg/shelve-backup).
7547 7490
7548 7491 Since you can restore a shelved change on top of an arbitrary
7549 7492 commit, it is possible that unshelving will result in a conflict
7550 7493 between your changes and the commits you are unshelving onto. If
7551 7494 this occurs, you must resolve the conflict, then use
7552 7495 ``--continue`` to complete the unshelve operation. (The bundle
7553 7496 will not be moved until you successfully complete the unshelve.)
7554 7497
7555 7498 (Alternatively, you can use ``--abort`` to abandon an unshelve
7556 7499 that causes a conflict. This reverts the unshelved changes, and
7557 7500 leaves the bundle in place.)
7558 7501
7559 7502 If bare shelved change (without interactive, include and exclude
7560 7503 option) was done on newly created branch it would restore branch
7561 7504 information to the working directory.
7562 7505
7563 7506 After a successful unshelve, the shelved changes are stored in a
7564 7507 backup directory. Only the N most recent backups are kept. N
7565 7508 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7566 7509 configuration option.
7567 7510
7568 7511 .. container:: verbose
7569 7512
7570 7513 Timestamp in seconds is used to decide order of backups. More
7571 7514 than ``maxbackups`` backups are kept, if same timestamp
7572 7515 prevents from deciding exact order of them, for safety.
7573 7516
7574 7517 Selected changes can be unshelved with ``--interactive`` flag.
7575 7518 The working directory is updated with the selected changes, and
7576 7519 only the unselected changes remain shelved.
7577 7520 Note: The whole shelve is applied to working directory first before
7578 7521 running interactively. So, this will bring up all the conflicts between
7579 7522 working directory and the shelve, irrespective of which changes will be
7580 7523 unshelved.
7581 7524 """
7582 7525 with repo.wlock():
7583 7526 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7584 7527
7585 7528
7586 7529 statemod.addunfinished(
7587 7530 b'unshelve',
7588 7531 fname=b'shelvedstate',
7589 7532 continueflag=True,
7590 7533 abortfunc=shelvemod.hgabortunshelve,
7591 7534 continuefunc=shelvemod.hgcontinueunshelve,
7592 7535 cmdmsg=_(b'unshelve already in progress'),
7593 7536 )
7594 7537
7595 7538
7596 7539 @command(
7597 7540 b'update|up|checkout|co',
7598 7541 [
7599 7542 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7600 7543 (b'c', b'check', None, _(b'require clean working directory')),
7601 7544 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7602 7545 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7603 7546 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7604 7547 ]
7605 7548 + mergetoolopts,
7606 7549 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7607 7550 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7608 7551 helpbasic=True,
7609 7552 )
7610 7553 def update(ui, repo, node=None, **opts):
7611 7554 """update working directory (or switch revisions)
7612 7555
7613 7556 Update the repository's working directory to the specified
7614 7557 changeset. If no changeset is specified, update to the tip of the
7615 7558 current named branch and move the active bookmark (see :hg:`help
7616 7559 bookmarks`).
7617 7560
7618 7561 Update sets the working directory's parent revision to the specified
7619 7562 changeset (see :hg:`help parents`).
7620 7563
7621 7564 If the changeset is not a descendant or ancestor of the working
7622 7565 directory's parent and there are uncommitted changes, the update is
7623 7566 aborted. With the -c/--check option, the working directory is checked
7624 7567 for uncommitted changes; if none are found, the working directory is
7625 7568 updated to the specified changeset.
7626 7569
7627 7570 .. container:: verbose
7628 7571
7629 7572 The -C/--clean, -c/--check, and -m/--merge options control what
7630 7573 happens if the working directory contains uncommitted changes.
7631 7574 At most of one of them can be specified.
7632 7575
7633 7576 1. If no option is specified, and if
7634 7577 the requested changeset is an ancestor or descendant of
7635 7578 the working directory's parent, the uncommitted changes
7636 7579 are merged into the requested changeset and the merged
7637 7580 result is left uncommitted. If the requested changeset is
7638 7581 not an ancestor or descendant (that is, it is on another
7639 7582 branch), the update is aborted and the uncommitted changes
7640 7583 are preserved.
7641 7584
7642 7585 2. With the -m/--merge option, the update is allowed even if the
7643 7586 requested changeset is not an ancestor or descendant of
7644 7587 the working directory's parent.
7645 7588
7646 7589 3. With the -c/--check option, the update is aborted and the
7647 7590 uncommitted changes are preserved.
7648 7591
7649 7592 4. With the -C/--clean option, uncommitted changes are discarded and
7650 7593 the working directory is updated to the requested changeset.
7651 7594
7652 7595 To cancel an uncommitted merge (and lose your changes), use
7653 7596 :hg:`merge --abort`.
7654 7597
7655 7598 Use null as the changeset to remove the working directory (like
7656 7599 :hg:`clone -U`).
7657 7600
7658 7601 If you want to revert just one file to an older revision, use
7659 7602 :hg:`revert [-r REV] NAME`.
7660 7603
7661 7604 See :hg:`help dates` for a list of formats valid for -d/--date.
7662 7605
7663 7606 Returns 0 on success, 1 if there are unresolved files.
7664 7607 """
7665 7608 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7666 7609 rev = opts.get('rev')
7667 7610 date = opts.get('date')
7668 7611 clean = opts.get('clean')
7669 7612 check = opts.get('check')
7670 7613 merge = opts.get('merge')
7671 7614 if rev and node:
7672 7615 raise error.Abort(_(b"please specify just one revision"))
7673 7616
7674 7617 if ui.configbool(b'commands', b'update.requiredest'):
7675 7618 if not node and not rev and not date:
7676 7619 raise error.Abort(
7677 7620 _(b'you must specify a destination'),
7678 7621 hint=_(b'for example: hg update ".::"'),
7679 7622 )
7680 7623
7681 7624 if rev is None or rev == b'':
7682 7625 rev = node
7683 7626
7684 7627 if date and rev is not None:
7685 7628 raise error.Abort(_(b"you can't specify a revision and a date"))
7686 7629
7687 7630 updatecheck = None
7688 7631 if check:
7689 7632 updatecheck = b'abort'
7690 7633 elif merge:
7691 7634 updatecheck = b'none'
7692 7635
7693 7636 with repo.wlock():
7694 7637 cmdutil.clearunfinished(repo)
7695 7638 if date:
7696 7639 rev = cmdutil.finddate(ui, repo, date)
7697 7640
7698 7641 # if we defined a bookmark, we have to remember the original name
7699 7642 brev = rev
7700 7643 if rev:
7701 7644 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7702 7645 ctx = scmutil.revsingle(repo, rev, default=None)
7703 7646 rev = ctx.rev()
7704 7647 hidden = ctx.hidden()
7705 7648 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7706 7649 with ui.configoverride(overrides, b'update'):
7707 7650 ret = hg.updatetotally(
7708 7651 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7709 7652 )
7710 7653 if hidden:
7711 7654 ctxstr = ctx.hex()[:12]
7712 7655 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7713 7656
7714 7657 if ctx.obsolete():
7715 7658 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7716 7659 ui.warn(b"(%s)\n" % obsfatemsg)
7717 7660 return ret
7718 7661
7719 7662
7720 7663 @command(
7721 7664 b'verify',
7722 7665 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7723 7666 helpcategory=command.CATEGORY_MAINTENANCE,
7724 7667 )
7725 7668 def verify(ui, repo, **opts):
7726 7669 """verify the integrity of the repository
7727 7670
7728 7671 Verify the integrity of the current repository.
7729 7672
7730 7673 This will perform an extensive check of the repository's
7731 7674 integrity, validating the hashes and checksums of each entry in
7732 7675 the changelog, manifest, and tracked files, as well as the
7733 7676 integrity of their crosslinks and indices.
7734 7677
7735 7678 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7736 7679 for more information about recovery from corruption of the
7737 7680 repository.
7738 7681
7739 7682 Returns 0 on success, 1 if errors are encountered.
7740 7683 """
7741 7684 opts = pycompat.byteskwargs(opts)
7742 7685
7743 7686 level = None
7744 7687 if opts[b'full']:
7745 7688 level = verifymod.VERIFY_FULL
7746 7689 return hg.verify(repo, level)
7747 7690
7748 7691
7749 7692 @command(
7750 7693 b'version',
7751 7694 [] + formatteropts,
7752 7695 helpcategory=command.CATEGORY_HELP,
7753 7696 norepo=True,
7754 7697 intents={INTENT_READONLY},
7755 7698 )
7756 7699 def version_(ui, **opts):
7757 7700 """output version and copyright information
7758 7701
7759 7702 .. container:: verbose
7760 7703
7761 7704 Template:
7762 7705
7763 7706 The following keywords are supported. See also :hg:`help templates`.
7764 7707
7765 7708 :extensions: List of extensions.
7766 7709 :ver: String. Version number.
7767 7710
7768 7711 And each entry of ``{extensions}`` provides the following sub-keywords
7769 7712 in addition to ``{ver}``.
7770 7713
7771 7714 :bundled: Boolean. True if included in the release.
7772 7715 :name: String. Extension name.
7773 7716 """
7774 7717 opts = pycompat.byteskwargs(opts)
7775 7718 if ui.verbose:
7776 7719 ui.pager(b'version')
7777 7720 fm = ui.formatter(b"version", opts)
7778 7721 fm.startitem()
7779 7722 fm.write(
7780 7723 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7781 7724 )
7782 7725 license = _(
7783 7726 b"(see https://mercurial-scm.org for more information)\n"
7784 7727 b"\nCopyright (C) 2005-2020 Matt Mackall and others\n"
7785 7728 b"This is free software; see the source for copying conditions. "
7786 7729 b"There is NO\nwarranty; "
7787 7730 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7788 7731 )
7789 7732 if not ui.quiet:
7790 7733 fm.plain(license)
7791 7734
7792 7735 if ui.verbose:
7793 7736 fm.plain(_(b"\nEnabled extensions:\n\n"))
7794 7737 # format names and versions into columns
7795 7738 names = []
7796 7739 vers = []
7797 7740 isinternals = []
7798 7741 for name, module in sorted(extensions.extensions()):
7799 7742 names.append(name)
7800 7743 vers.append(extensions.moduleversion(module) or None)
7801 7744 isinternals.append(extensions.ismoduleinternal(module))
7802 7745 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7803 7746 if names:
7804 7747 namefmt = b" %%-%ds " % max(len(n) for n in names)
7805 7748 places = [_(b"external"), _(b"internal")]
7806 7749 for n, v, p in zip(names, vers, isinternals):
7807 7750 fn.startitem()
7808 7751 fn.condwrite(ui.verbose, b"name", namefmt, n)
7809 7752 if ui.verbose:
7810 7753 fn.plain(b"%s " % places[p])
7811 7754 fn.data(bundled=p)
7812 7755 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7813 7756 if ui.verbose:
7814 7757 fn.plain(b"\n")
7815 7758 fn.end()
7816 7759 fm.end()
7817 7760
7818 7761
7819 7762 def loadcmdtable(ui, name, cmdtable):
7820 7763 """Load command functions from specified cmdtable
7821 7764 """
7822 7765 overrides = [cmd for cmd in cmdtable if cmd in table]
7823 7766 if overrides:
7824 7767 ui.warn(
7825 7768 _(b"extension '%s' overrides commands: %s\n")
7826 7769 % (name, b" ".join(overrides))
7827 7770 )
7828 7771 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now