##// END OF EJS Templates
status: outputting structured unfinished-operation information...
Rodrigo Damazio Bovendorp -
r44313:aac921f5 default
parent child Browse files
Show More
@@ -1,4017 +1,4024 b''
1 1 # cmdutil.py - help for command processing in mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import copy as copymod
11 11 import errno
12 12 import os
13 13 import re
14 14
15 15 from .i18n import _
16 16 from .node import (
17 17 hex,
18 18 nullid,
19 19 nullrev,
20 20 short,
21 21 )
22 22 from .pycompat import (
23 23 getattr,
24 24 open,
25 25 setattr,
26 26 )
27 27 from .thirdparty import attr
28 28
29 29 from . import (
30 30 bookmarks,
31 31 changelog,
32 32 copies,
33 33 crecord as crecordmod,
34 34 dirstateguard,
35 35 encoding,
36 36 error,
37 37 formatter,
38 38 logcmdutil,
39 39 match as matchmod,
40 40 merge as mergemod,
41 41 mergeutil,
42 42 obsolete,
43 43 patch,
44 44 pathutil,
45 45 phases,
46 46 pycompat,
47 47 repair,
48 48 revlog,
49 49 rewriteutil,
50 50 scmutil,
51 51 smartset,
52 52 state as statemod,
53 53 subrepoutil,
54 54 templatekw,
55 55 templater,
56 56 util,
57 57 vfs as vfsmod,
58 58 )
59 59
60 60 from .utils import (
61 61 dateutil,
62 62 stringutil,
63 63 )
64 64
65 65 if pycompat.TYPE_CHECKING:
66 66 from typing import (
67 67 Any,
68 68 Dict,
69 69 )
70 70
71 71 for t in (Any, Dict):
72 72 assert t
73 73
74 74 stringio = util.stringio
75 75
76 76 # templates of common command options
77 77
78 78 dryrunopts = [
79 79 (b'n', b'dry-run', None, _(b'do not perform actions, just print output')),
80 80 ]
81 81
82 82 confirmopts = [
83 83 (b'', b'confirm', None, _(b'ask before applying actions')),
84 84 ]
85 85
86 86 remoteopts = [
87 87 (b'e', b'ssh', b'', _(b'specify ssh command to use'), _(b'CMD')),
88 88 (
89 89 b'',
90 90 b'remotecmd',
91 91 b'',
92 92 _(b'specify hg command to run on the remote side'),
93 93 _(b'CMD'),
94 94 ),
95 95 (
96 96 b'',
97 97 b'insecure',
98 98 None,
99 99 _(b'do not verify server certificate (ignoring web.cacerts config)'),
100 100 ),
101 101 ]
102 102
103 103 walkopts = [
104 104 (
105 105 b'I',
106 106 b'include',
107 107 [],
108 108 _(b'include names matching the given patterns'),
109 109 _(b'PATTERN'),
110 110 ),
111 111 (
112 112 b'X',
113 113 b'exclude',
114 114 [],
115 115 _(b'exclude names matching the given patterns'),
116 116 _(b'PATTERN'),
117 117 ),
118 118 ]
119 119
120 120 commitopts = [
121 121 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
122 122 (b'l', b'logfile', b'', _(b'read commit message from file'), _(b'FILE')),
123 123 ]
124 124
125 125 commitopts2 = [
126 126 (
127 127 b'd',
128 128 b'date',
129 129 b'',
130 130 _(b'record the specified date as commit date'),
131 131 _(b'DATE'),
132 132 ),
133 133 (
134 134 b'u',
135 135 b'user',
136 136 b'',
137 137 _(b'record the specified user as committer'),
138 138 _(b'USER'),
139 139 ),
140 140 ]
141 141
142 142 commitopts3 = [
143 143 (b'D', b'currentdate', None, _(b'record the current date as commit date')),
144 144 (b'U', b'currentuser', None, _(b'record the current user as committer')),
145 145 ]
146 146
147 147 formatteropts = [
148 148 (b'T', b'template', b'', _(b'display with template'), _(b'TEMPLATE')),
149 149 ]
150 150
151 151 templateopts = [
152 152 (
153 153 b'',
154 154 b'style',
155 155 b'',
156 156 _(b'display using template map file (DEPRECATED)'),
157 157 _(b'STYLE'),
158 158 ),
159 159 (b'T', b'template', b'', _(b'display with template'), _(b'TEMPLATE')),
160 160 ]
161 161
162 162 logopts = [
163 163 (b'p', b'patch', None, _(b'show patch')),
164 164 (b'g', b'git', None, _(b'use git extended diff format')),
165 165 (b'l', b'limit', b'', _(b'limit number of changes displayed'), _(b'NUM')),
166 166 (b'M', b'no-merges', None, _(b'do not show merges')),
167 167 (b'', b'stat', None, _(b'output diffstat-style summary of changes')),
168 168 (b'G', b'graph', None, _(b"show the revision DAG")),
169 169 ] + templateopts
170 170
171 171 diffopts = [
172 172 (b'a', b'text', None, _(b'treat all files as text')),
173 173 (b'g', b'git', None, _(b'use git extended diff format')),
174 174 (b'', b'binary', None, _(b'generate binary diffs in git mode (default)')),
175 175 (b'', b'nodates', None, _(b'omit dates from diff headers')),
176 176 ]
177 177
178 178 diffwsopts = [
179 179 (
180 180 b'w',
181 181 b'ignore-all-space',
182 182 None,
183 183 _(b'ignore white space when comparing lines'),
184 184 ),
185 185 (
186 186 b'b',
187 187 b'ignore-space-change',
188 188 None,
189 189 _(b'ignore changes in the amount of white space'),
190 190 ),
191 191 (
192 192 b'B',
193 193 b'ignore-blank-lines',
194 194 None,
195 195 _(b'ignore changes whose lines are all blank'),
196 196 ),
197 197 (
198 198 b'Z',
199 199 b'ignore-space-at-eol',
200 200 None,
201 201 _(b'ignore changes in whitespace at EOL'),
202 202 ),
203 203 ]
204 204
205 205 diffopts2 = (
206 206 [
207 207 (b'', b'noprefix', None, _(b'omit a/ and b/ prefixes from filenames')),
208 208 (
209 209 b'p',
210 210 b'show-function',
211 211 None,
212 212 _(b'show which function each change is in'),
213 213 ),
214 214 (b'', b'reverse', None, _(b'produce a diff that undoes the changes')),
215 215 ]
216 216 + diffwsopts
217 217 + [
218 218 (
219 219 b'U',
220 220 b'unified',
221 221 b'',
222 222 _(b'number of lines of context to show'),
223 223 _(b'NUM'),
224 224 ),
225 225 (b'', b'stat', None, _(b'output diffstat-style summary of changes')),
226 226 (
227 227 b'',
228 228 b'root',
229 229 b'',
230 230 _(b'produce diffs relative to subdirectory'),
231 231 _(b'DIR'),
232 232 ),
233 233 ]
234 234 )
235 235
236 236 mergetoolopts = [
237 237 (b't', b'tool', b'', _(b'specify merge tool'), _(b'TOOL')),
238 238 ]
239 239
240 240 similarityopts = [
241 241 (
242 242 b's',
243 243 b'similarity',
244 244 b'',
245 245 _(b'guess renamed files by similarity (0<=s<=100)'),
246 246 _(b'SIMILARITY'),
247 247 )
248 248 ]
249 249
250 250 subrepoopts = [(b'S', b'subrepos', None, _(b'recurse into subrepositories'))]
251 251
252 252 debugrevlogopts = [
253 253 (b'c', b'changelog', False, _(b'open changelog')),
254 254 (b'm', b'manifest', False, _(b'open manifest')),
255 255 (b'', b'dir', b'', _(b'open directory manifest')),
256 256 ]
257 257
258 258 # special string such that everything below this line will be ingored in the
259 259 # editor text
260 260 _linebelow = b"^HG: ------------------------ >8 ------------------------$"
261 261
262 262
263 263 def resolvecommitoptions(ui, opts):
264 264 """modify commit options dict to handle related options
265 265
266 266 The return value indicates that ``rewrite.update-timestamp`` is the reason
267 267 the ``date`` option is set.
268 268 """
269 269 if opts.get(b'date') and opts.get(b'currentdate'):
270 270 raise error.Abort(_(b'--date and --currentdate are mutually exclusive'))
271 271 if opts.get(b'user') and opts.get(b'currentuser'):
272 272 raise error.Abort(_(b'--user and --currentuser are mutually exclusive'))
273 273
274 274 datemaydiffer = False # date-only change should be ignored?
275 275
276 276 if opts.get(b'currentdate'):
277 277 opts[b'date'] = b'%d %d' % dateutil.makedate()
278 278 elif (
279 279 not opts.get(b'date')
280 280 and ui.configbool(b'rewrite', b'update-timestamp')
281 281 and opts.get(b'currentdate') is None
282 282 ):
283 283 opts[b'date'] = b'%d %d' % dateutil.makedate()
284 284 datemaydiffer = True
285 285
286 286 if opts.get(b'currentuser'):
287 287 opts[b'user'] = ui.username()
288 288
289 289 return datemaydiffer
290 290
291 291
292 292 def checknotesize(ui, opts):
293 293 """ make sure note is of valid format """
294 294
295 295 note = opts.get(b'note')
296 296 if not note:
297 297 return
298 298
299 299 if len(note) > 255:
300 300 raise error.Abort(_(b"cannot store a note of more than 255 bytes"))
301 301 if b'\n' in note:
302 302 raise error.Abort(_(b"note cannot contain a newline"))
303 303
304 304
305 305 def ishunk(x):
306 306 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
307 307 return isinstance(x, hunkclasses)
308 308
309 309
310 310 def newandmodified(chunks, originalchunks):
311 311 newlyaddedandmodifiedfiles = set()
312 312 alsorestore = set()
313 313 for chunk in chunks:
314 314 if (
315 315 ishunk(chunk)
316 316 and chunk.header.isnewfile()
317 317 and chunk not in originalchunks
318 318 ):
319 319 newlyaddedandmodifiedfiles.add(chunk.header.filename())
320 320 alsorestore.update(
321 321 set(chunk.header.files()) - {chunk.header.filename()}
322 322 )
323 323 return newlyaddedandmodifiedfiles, alsorestore
324 324
325 325
326 326 def parsealiases(cmd):
327 327 return cmd.split(b"|")
328 328
329 329
330 330 def setupwrapcolorwrite(ui):
331 331 # wrap ui.write so diff output can be labeled/colorized
332 332 def wrapwrite(orig, *args, **kw):
333 333 label = kw.pop('label', b'')
334 334 for chunk, l in patch.difflabel(lambda: args):
335 335 orig(chunk, label=label + l)
336 336
337 337 oldwrite = ui.write
338 338
339 339 def wrap(*args, **kwargs):
340 340 return wrapwrite(oldwrite, *args, **kwargs)
341 341
342 342 setattr(ui, 'write', wrap)
343 343 return oldwrite
344 344
345 345
346 346 def filterchunks(ui, originalhunks, usecurses, testfile, match, operation=None):
347 347 try:
348 348 if usecurses:
349 349 if testfile:
350 350 recordfn = crecordmod.testdecorator(
351 351 testfile, crecordmod.testchunkselector
352 352 )
353 353 else:
354 354 recordfn = crecordmod.chunkselector
355 355
356 356 return crecordmod.filterpatch(
357 357 ui, originalhunks, recordfn, operation
358 358 )
359 359 except crecordmod.fallbackerror as e:
360 360 ui.warn(b'%s\n' % e.message) # pytype: disable=attribute-error
361 361 ui.warn(_(b'falling back to text mode\n'))
362 362
363 363 return patch.filterpatch(ui, originalhunks, match, operation)
364 364
365 365
366 366 def recordfilter(ui, originalhunks, match, operation=None):
367 367 """ Prompts the user to filter the originalhunks and return a list of
368 368 selected hunks.
369 369 *operation* is used for to build ui messages to indicate the user what
370 370 kind of filtering they are doing: reverting, committing, shelving, etc.
371 371 (see patch.filterpatch).
372 372 """
373 373 usecurses = crecordmod.checkcurses(ui)
374 374 testfile = ui.config(b'experimental', b'crecordtest')
375 375 oldwrite = setupwrapcolorwrite(ui)
376 376 try:
377 377 newchunks, newopts = filterchunks(
378 378 ui, originalhunks, usecurses, testfile, match, operation
379 379 )
380 380 finally:
381 381 ui.write = oldwrite
382 382 return newchunks, newopts
383 383
384 384
385 385 def dorecord(
386 386 ui, repo, commitfunc, cmdsuggest, backupall, filterfn, *pats, **opts
387 387 ):
388 388 opts = pycompat.byteskwargs(opts)
389 389 if not ui.interactive():
390 390 if cmdsuggest:
391 391 msg = _(b'running non-interactively, use %s instead') % cmdsuggest
392 392 else:
393 393 msg = _(b'running non-interactively')
394 394 raise error.Abort(msg)
395 395
396 396 # make sure username is set before going interactive
397 397 if not opts.get(b'user'):
398 398 ui.username() # raise exception, username not provided
399 399
400 400 def recordfunc(ui, repo, message, match, opts):
401 401 """This is generic record driver.
402 402
403 403 Its job is to interactively filter local changes, and
404 404 accordingly prepare working directory into a state in which the
405 405 job can be delegated to a non-interactive commit command such as
406 406 'commit' or 'qrefresh'.
407 407
408 408 After the actual job is done by non-interactive command, the
409 409 working directory is restored to its original state.
410 410
411 411 In the end we'll record interesting changes, and everything else
412 412 will be left in place, so the user can continue working.
413 413 """
414 414 if not opts.get(b'interactive-unshelve'):
415 415 checkunfinished(repo, commit=True)
416 416 wctx = repo[None]
417 417 merge = len(wctx.parents()) > 1
418 418 if merge:
419 419 raise error.Abort(
420 420 _(
421 421 b'cannot partially commit a merge '
422 422 b'(use "hg commit" instead)'
423 423 )
424 424 )
425 425
426 426 def fail(f, msg):
427 427 raise error.Abort(b'%s: %s' % (f, msg))
428 428
429 429 force = opts.get(b'force')
430 430 if not force:
431 431 match = matchmod.badmatch(match, fail)
432 432
433 433 status = repo.status(match=match)
434 434
435 435 overrides = {(b'ui', b'commitsubrepos'): True}
436 436
437 437 with repo.ui.configoverride(overrides, b'record'):
438 438 # subrepoutil.precommit() modifies the status
439 439 tmpstatus = scmutil.status(
440 440 copymod.copy(status.modified),
441 441 copymod.copy(status.added),
442 442 copymod.copy(status.removed),
443 443 copymod.copy(status.deleted),
444 444 copymod.copy(status.unknown),
445 445 copymod.copy(status.ignored),
446 446 copymod.copy(status.clean), # pytype: disable=wrong-arg-count
447 447 )
448 448
449 449 # Force allows -X subrepo to skip the subrepo.
450 450 subs, commitsubs, newstate = subrepoutil.precommit(
451 451 repo.ui, wctx, tmpstatus, match, force=True
452 452 )
453 453 for s in subs:
454 454 if s in commitsubs:
455 455 dirtyreason = wctx.sub(s).dirtyreason(True)
456 456 raise error.Abort(dirtyreason)
457 457
458 458 if not force:
459 459 repo.checkcommitpatterns(wctx, match, status, fail)
460 460 diffopts = patch.difffeatureopts(
461 461 ui,
462 462 opts=opts,
463 463 whitespace=True,
464 464 section=b'commands',
465 465 configprefix=b'commit.interactive.',
466 466 )
467 467 diffopts.nodates = True
468 468 diffopts.git = True
469 469 diffopts.showfunc = True
470 470 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
471 471 originalchunks = patch.parsepatch(originaldiff)
472 472 match = scmutil.match(repo[None], pats)
473 473
474 474 # 1. filter patch, since we are intending to apply subset of it
475 475 try:
476 476 chunks, newopts = filterfn(ui, originalchunks, match)
477 477 except error.PatchError as err:
478 478 raise error.Abort(_(b'error parsing patch: %s') % err)
479 479 opts.update(newopts)
480 480
481 481 # We need to keep a backup of files that have been newly added and
482 482 # modified during the recording process because there is a previous
483 483 # version without the edit in the workdir. We also will need to restore
484 484 # files that were the sources of renames so that the patch application
485 485 # works.
486 486 newlyaddedandmodifiedfiles, alsorestore = newandmodified(
487 487 chunks, originalchunks
488 488 )
489 489 contenders = set()
490 490 for h in chunks:
491 491 try:
492 492 contenders.update(set(h.files()))
493 493 except AttributeError:
494 494 pass
495 495
496 496 changed = status.modified + status.added + status.removed
497 497 newfiles = [f for f in changed if f in contenders]
498 498 if not newfiles:
499 499 ui.status(_(b'no changes to record\n'))
500 500 return 0
501 501
502 502 modified = set(status.modified)
503 503
504 504 # 2. backup changed files, so we can restore them in the end
505 505
506 506 if backupall:
507 507 tobackup = changed
508 508 else:
509 509 tobackup = [
510 510 f
511 511 for f in newfiles
512 512 if f in modified or f in newlyaddedandmodifiedfiles
513 513 ]
514 514 backups = {}
515 515 if tobackup:
516 516 backupdir = repo.vfs.join(b'record-backups')
517 517 try:
518 518 os.mkdir(backupdir)
519 519 except OSError as err:
520 520 if err.errno != errno.EEXIST:
521 521 raise
522 522 try:
523 523 # backup continues
524 524 for f in tobackup:
525 525 fd, tmpname = pycompat.mkstemp(
526 526 prefix=f.replace(b'/', b'_') + b'.', dir=backupdir
527 527 )
528 528 os.close(fd)
529 529 ui.debug(b'backup %r as %r\n' % (f, tmpname))
530 530 util.copyfile(repo.wjoin(f), tmpname, copystat=True)
531 531 backups[f] = tmpname
532 532
533 533 fp = stringio()
534 534 for c in chunks:
535 535 fname = c.filename()
536 536 if fname in backups:
537 537 c.write(fp)
538 538 dopatch = fp.tell()
539 539 fp.seek(0)
540 540
541 541 # 2.5 optionally review / modify patch in text editor
542 542 if opts.get(b'review', False):
543 543 patchtext = (
544 544 crecordmod.diffhelptext
545 545 + crecordmod.patchhelptext
546 546 + fp.read()
547 547 )
548 548 reviewedpatch = ui.edit(
549 549 patchtext, b"", action=b"diff", repopath=repo.path
550 550 )
551 551 fp.truncate(0)
552 552 fp.write(reviewedpatch)
553 553 fp.seek(0)
554 554
555 555 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
556 556 # 3a. apply filtered patch to clean repo (clean)
557 557 if backups:
558 558 # Equivalent to hg.revert
559 559 m = scmutil.matchfiles(repo, set(backups.keys()) | alsorestore)
560 560 mergemod.update(
561 561 repo,
562 562 repo.dirstate.p1(),
563 563 branchmerge=False,
564 564 force=True,
565 565 matcher=m,
566 566 )
567 567
568 568 # 3b. (apply)
569 569 if dopatch:
570 570 try:
571 571 ui.debug(b'applying patch\n')
572 572 ui.debug(fp.getvalue())
573 573 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
574 574 except error.PatchError as err:
575 575 raise error.Abort(pycompat.bytestr(err))
576 576 del fp
577 577
578 578 # 4. We prepared working directory according to filtered
579 579 # patch. Now is the time to delegate the job to
580 580 # commit/qrefresh or the like!
581 581
582 582 # Make all of the pathnames absolute.
583 583 newfiles = [repo.wjoin(nf) for nf in newfiles]
584 584 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts))
585 585 finally:
586 586 # 5. finally restore backed-up files
587 587 try:
588 588 dirstate = repo.dirstate
589 589 for realname, tmpname in pycompat.iteritems(backups):
590 590 ui.debug(b'restoring %r to %r\n' % (tmpname, realname))
591 591
592 592 if dirstate[realname] == b'n':
593 593 # without normallookup, restoring timestamp
594 594 # may cause partially committed files
595 595 # to be treated as unmodified
596 596 dirstate.normallookup(realname)
597 597
598 598 # copystat=True here and above are a hack to trick any
599 599 # editors that have f open that we haven't modified them.
600 600 #
601 601 # Also note that this racy as an editor could notice the
602 602 # file's mtime before we've finished writing it.
603 603 util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
604 604 os.unlink(tmpname)
605 605 if tobackup:
606 606 os.rmdir(backupdir)
607 607 except OSError:
608 608 pass
609 609
610 610 def recordinwlock(ui, repo, message, match, opts):
611 611 with repo.wlock():
612 612 return recordfunc(ui, repo, message, match, opts)
613 613
614 614 return commit(ui, repo, recordinwlock, pats, opts)
615 615
616 616
617 617 class dirnode(object):
618 618 """
619 619 Represent a directory in user working copy with information required for
620 620 the purpose of tersing its status.
621 621
622 622 path is the path to the directory, without a trailing '/'
623 623
624 624 statuses is a set of statuses of all files in this directory (this includes
625 625 all the files in all the subdirectories too)
626 626
627 627 files is a list of files which are direct child of this directory
628 628
629 629 subdirs is a dictionary of sub-directory name as the key and it's own
630 630 dirnode object as the value
631 631 """
632 632
633 633 def __init__(self, dirpath):
634 634 self.path = dirpath
635 635 self.statuses = set()
636 636 self.files = []
637 637 self.subdirs = {}
638 638
639 639 def _addfileindir(self, filename, status):
640 640 """Add a file in this directory as a direct child."""
641 641 self.files.append((filename, status))
642 642
643 643 def addfile(self, filename, status):
644 644 """
645 645 Add a file to this directory or to its direct parent directory.
646 646
647 647 If the file is not direct child of this directory, we traverse to the
648 648 directory of which this file is a direct child of and add the file
649 649 there.
650 650 """
651 651
652 652 # the filename contains a path separator, it means it's not the direct
653 653 # child of this directory
654 654 if b'/' in filename:
655 655 subdir, filep = filename.split(b'/', 1)
656 656
657 657 # does the dirnode object for subdir exists
658 658 if subdir not in self.subdirs:
659 659 subdirpath = pathutil.join(self.path, subdir)
660 660 self.subdirs[subdir] = dirnode(subdirpath)
661 661
662 662 # try adding the file in subdir
663 663 self.subdirs[subdir].addfile(filep, status)
664 664
665 665 else:
666 666 self._addfileindir(filename, status)
667 667
668 668 if status not in self.statuses:
669 669 self.statuses.add(status)
670 670
671 671 def iterfilepaths(self):
672 672 """Yield (status, path) for files directly under this directory."""
673 673 for f, st in self.files:
674 674 yield st, pathutil.join(self.path, f)
675 675
676 676 def tersewalk(self, terseargs):
677 677 """
678 678 Yield (status, path) obtained by processing the status of this
679 679 dirnode.
680 680
681 681 terseargs is the string of arguments passed by the user with `--terse`
682 682 flag.
683 683
684 684 Following are the cases which can happen:
685 685
686 686 1) All the files in the directory (including all the files in its
687 687 subdirectories) share the same status and the user has asked us to terse
688 688 that status. -> yield (status, dirpath). dirpath will end in '/'.
689 689
690 690 2) Otherwise, we do following:
691 691
692 692 a) Yield (status, filepath) for all the files which are in this
693 693 directory (only the ones in this directory, not the subdirs)
694 694
695 695 b) Recurse the function on all the subdirectories of this
696 696 directory
697 697 """
698 698
699 699 if len(self.statuses) == 1:
700 700 onlyst = self.statuses.pop()
701 701
702 702 # Making sure we terse only when the status abbreviation is
703 703 # passed as terse argument
704 704 if onlyst in terseargs:
705 705 yield onlyst, self.path + b'/'
706 706 return
707 707
708 708 # add the files to status list
709 709 for st, fpath in self.iterfilepaths():
710 710 yield st, fpath
711 711
712 712 # recurse on the subdirs
713 713 for dirobj in self.subdirs.values():
714 714 for st, fpath in dirobj.tersewalk(terseargs):
715 715 yield st, fpath
716 716
717 717
718 718 def tersedir(statuslist, terseargs):
719 719 """
720 720 Terse the status if all the files in a directory shares the same status.
721 721
722 722 statuslist is scmutil.status() object which contains a list of files for
723 723 each status.
724 724 terseargs is string which is passed by the user as the argument to `--terse`
725 725 flag.
726 726
727 727 The function makes a tree of objects of dirnode class, and at each node it
728 728 stores the information required to know whether we can terse a certain
729 729 directory or not.
730 730 """
731 731 # the order matters here as that is used to produce final list
732 732 allst = (b'm', b'a', b'r', b'd', b'u', b'i', b'c')
733 733
734 734 # checking the argument validity
735 735 for s in pycompat.bytestr(terseargs):
736 736 if s not in allst:
737 737 raise error.Abort(_(b"'%s' not recognized") % s)
738 738
739 739 # creating a dirnode object for the root of the repo
740 740 rootobj = dirnode(b'')
741 741 pstatus = (
742 742 b'modified',
743 743 b'added',
744 744 b'deleted',
745 745 b'clean',
746 746 b'unknown',
747 747 b'ignored',
748 748 b'removed',
749 749 )
750 750
751 751 tersedict = {}
752 752 for attrname in pstatus:
753 753 statuschar = attrname[0:1]
754 754 for f in getattr(statuslist, attrname):
755 755 rootobj.addfile(f, statuschar)
756 756 tersedict[statuschar] = []
757 757
758 758 # we won't be tersing the root dir, so add files in it
759 759 for st, fpath in rootobj.iterfilepaths():
760 760 tersedict[st].append(fpath)
761 761
762 762 # process each sub-directory and build tersedict
763 763 for subdir in rootobj.subdirs.values():
764 764 for st, f in subdir.tersewalk(terseargs):
765 765 tersedict[st].append(f)
766 766
767 767 tersedlist = []
768 768 for st in allst:
769 769 tersedict[st].sort()
770 770 tersedlist.append(tersedict[st])
771 771
772 772 return scmutil.status(*tersedlist)
773 773
774 774
775 775 def _commentlines(raw):
776 776 '''Surround lineswith a comment char and a new line'''
777 777 lines = raw.splitlines()
778 778 commentedlines = [b'# %s' % line for line in lines]
779 779 return b'\n'.join(commentedlines) + b'\n'
780 780
781 781
782 782 @attr.s(frozen=True)
783 783 class morestatus(object):
784 784 reporoot = attr.ib()
785 785 unfinishedop = attr.ib()
786 786 unfinishedmsg = attr.ib()
787 787 inmergestate = attr.ib()
788 788 unresolvedpaths = attr.ib()
789 789 _label = b'status.morestatus'
790 790
791 791 def formatfile(self, path, fm):
792 792 if self.inmergestate and path in self.unresolvedpaths:
793 793 fm.data(unresolved=True)
794 794
795 795 def formatfooter(self, fm):
796 fm.startitem()
797 fm.data(
798 itemtype=b'morestatus',
799 unfinished=self.unfinishedop,
800 unfinishedmsg=self.unfinishedmsg,
801 )
802
796 803 statemsg = (
797 804 _(b'The repository is in an unfinished *%s* state.')
798 805 % self.unfinishedop
799 806 )
800 807 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)
801 808
802 809 self._formatconflicts(fm)
803 810 if self.unfinishedmsg:
804 811 fm.plain(
805 812 b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label
806 813 )
807 814
808 815 def _formatconflicts(self, fm):
809 816 if not self.inmergestate:
810 817 return
811 818
812 819 if self.unresolvedpaths:
813 820 mergeliststr = b'\n'.join(
814 821 [
815 822 b' %s'
816 823 % util.pathto(self.reporoot, encoding.getcwd(), path)
817 824 for path in self.unresolvedpaths
818 825 ]
819 826 )
820 827 msg = (
821 828 _(
822 829 '''Unresolved merge conflicts:
823 830
824 831 %s
825 832
826 833 To mark files as resolved: hg resolve --mark FILE'''
827 834 )
828 835 % mergeliststr
829 836 )
830 837 else:
831 838 msg = _(b'No unresolved merge conflicts.')
832 839
833 840 fm.plain(b'%s\n' % _commentlines(msg), label=self._label)
834 841
835 842
836 843 def readmorestatus(repo):
837 844 """Returns a morestatus object if the repo has unfinished state."""
838 845 statetuple = statemod.getrepostate(repo)
839 846 if not statetuple:
840 847 return None
841 848
842 849 unfinishedop, unfinishedmsg = statetuple
843 850 mergestate = mergemod.mergestate.read(repo)
844 851 unresolved = None
845 852 if mergestate.active():
846 853 unresolved = sorted(mergestate.unresolved())
847 854 return morestatus(
848 855 repo.root,
849 856 unfinishedop,
850 857 unfinishedmsg,
851 858 unresolved is not None,
852 859 unresolved,
853 860 )
854 861
855 862
856 863 def findpossible(cmd, table, strict=False):
857 864 """
858 865 Return cmd -> (aliases, command table entry)
859 866 for each matching command.
860 867 Return debug commands (or their aliases) only if no normal command matches.
861 868 """
862 869 choice = {}
863 870 debugchoice = {}
864 871
865 872 if cmd in table:
866 873 # short-circuit exact matches, "log" alias beats "log|history"
867 874 keys = [cmd]
868 875 else:
869 876 keys = table.keys()
870 877
871 878 allcmds = []
872 879 for e in keys:
873 880 aliases = parsealiases(e)
874 881 allcmds.extend(aliases)
875 882 found = None
876 883 if cmd in aliases:
877 884 found = cmd
878 885 elif not strict:
879 886 for a in aliases:
880 887 if a.startswith(cmd):
881 888 found = a
882 889 break
883 890 if found is not None:
884 891 if aliases[0].startswith(b"debug") or found.startswith(b"debug"):
885 892 debugchoice[found] = (aliases, table[e])
886 893 else:
887 894 choice[found] = (aliases, table[e])
888 895
889 896 if not choice and debugchoice:
890 897 choice = debugchoice
891 898
892 899 return choice, allcmds
893 900
894 901
895 902 def findcmd(cmd, table, strict=True):
896 903 """Return (aliases, command table entry) for command string."""
897 904 choice, allcmds = findpossible(cmd, table, strict)
898 905
899 906 if cmd in choice:
900 907 return choice[cmd]
901 908
902 909 if len(choice) > 1:
903 910 clist = sorted(choice)
904 911 raise error.AmbiguousCommand(cmd, clist)
905 912
906 913 if choice:
907 914 return list(choice.values())[0]
908 915
909 916 raise error.UnknownCommand(cmd, allcmds)
910 917
911 918
912 919 def changebranch(ui, repo, revs, label):
913 920 """ Change the branch name of given revs to label """
914 921
915 922 with repo.wlock(), repo.lock(), repo.transaction(b'branches'):
916 923 # abort in case of uncommitted merge or dirty wdir
917 924 bailifchanged(repo)
918 925 revs = scmutil.revrange(repo, revs)
919 926 if not revs:
920 927 raise error.Abort(b"empty revision set")
921 928 roots = repo.revs(b'roots(%ld)', revs)
922 929 if len(roots) > 1:
923 930 raise error.Abort(
924 931 _(b"cannot change branch of non-linear revisions")
925 932 )
926 933 rewriteutil.precheck(repo, revs, b'change branch of')
927 934
928 935 root = repo[roots.first()]
929 936 rpb = {parent.branch() for parent in root.parents()}
930 937 if label not in rpb and label in repo.branchmap():
931 938 raise error.Abort(_(b"a branch of the same name already exists"))
932 939
933 940 if repo.revs(b'obsolete() and %ld', revs):
934 941 raise error.Abort(
935 942 _(b"cannot change branch of a obsolete changeset")
936 943 )
937 944
938 945 # make sure only topological heads
939 946 if repo.revs(b'heads(%ld) - head()', revs):
940 947 raise error.Abort(_(b"cannot change branch in middle of a stack"))
941 948
942 949 replacements = {}
943 950 # avoid import cycle mercurial.cmdutil -> mercurial.context ->
944 951 # mercurial.subrepo -> mercurial.cmdutil
945 952 from . import context
946 953
947 954 for rev in revs:
948 955 ctx = repo[rev]
949 956 oldbranch = ctx.branch()
950 957 # check if ctx has same branch
951 958 if oldbranch == label:
952 959 continue
953 960
954 961 def filectxfn(repo, newctx, path):
955 962 try:
956 963 return ctx[path]
957 964 except error.ManifestLookupError:
958 965 return None
959 966
960 967 ui.debug(
961 968 b"changing branch of '%s' from '%s' to '%s'\n"
962 969 % (hex(ctx.node()), oldbranch, label)
963 970 )
964 971 extra = ctx.extra()
965 972 extra[b'branch_change'] = hex(ctx.node())
966 973 # While changing branch of set of linear commits, make sure that
967 974 # we base our commits on new parent rather than old parent which
968 975 # was obsoleted while changing the branch
969 976 p1 = ctx.p1().node()
970 977 p2 = ctx.p2().node()
971 978 if p1 in replacements:
972 979 p1 = replacements[p1][0]
973 980 if p2 in replacements:
974 981 p2 = replacements[p2][0]
975 982
976 983 mc = context.memctx(
977 984 repo,
978 985 (p1, p2),
979 986 ctx.description(),
980 987 ctx.files(),
981 988 filectxfn,
982 989 user=ctx.user(),
983 990 date=ctx.date(),
984 991 extra=extra,
985 992 branch=label,
986 993 )
987 994
988 995 newnode = repo.commitctx(mc)
989 996 replacements[ctx.node()] = (newnode,)
990 997 ui.debug(b'new node id is %s\n' % hex(newnode))
991 998
992 999 # create obsmarkers and move bookmarks
993 1000 scmutil.cleanupnodes(
994 1001 repo, replacements, b'branch-change', fixphase=True
995 1002 )
996 1003
997 1004 # move the working copy too
998 1005 wctx = repo[None]
999 1006 # in-progress merge is a bit too complex for now.
1000 1007 if len(wctx.parents()) == 1:
1001 1008 newid = replacements.get(wctx.p1().node())
1002 1009 if newid is not None:
1003 1010 # avoid import cycle mercurial.cmdutil -> mercurial.hg ->
1004 1011 # mercurial.cmdutil
1005 1012 from . import hg
1006 1013
1007 1014 hg.update(repo, newid[0], quietempty=True)
1008 1015
1009 1016 ui.status(_(b"changed branch on %d changesets\n") % len(replacements))
1010 1017
1011 1018
1012 1019 def findrepo(p):
1013 1020 while not os.path.isdir(os.path.join(p, b".hg")):
1014 1021 oldp, p = p, os.path.dirname(p)
1015 1022 if p == oldp:
1016 1023 return None
1017 1024
1018 1025 return p
1019 1026
1020 1027
1021 1028 def bailifchanged(repo, merge=True, hint=None):
1022 1029 """ enforce the precondition that working directory must be clean.
1023 1030
1024 1031 'merge' can be set to false if a pending uncommitted merge should be
1025 1032 ignored (such as when 'update --check' runs).
1026 1033
1027 1034 'hint' is the usual hint given to Abort exception.
1028 1035 """
1029 1036
1030 1037 if merge and repo.dirstate.p2() != nullid:
1031 1038 raise error.Abort(_(b'outstanding uncommitted merge'), hint=hint)
1032 1039 st = repo.status()
1033 1040 if st.modified or st.added or st.removed or st.deleted:
1034 1041 raise error.Abort(_(b'uncommitted changes'), hint=hint)
1035 1042 ctx = repo[None]
1036 1043 for s in sorted(ctx.substate):
1037 1044 ctx.sub(s).bailifchanged(hint=hint)
1038 1045
1039 1046
1040 1047 def logmessage(ui, opts):
1041 1048 """ get the log message according to -m and -l option """
1042 1049 message = opts.get(b'message')
1043 1050 logfile = opts.get(b'logfile')
1044 1051
1045 1052 if message and logfile:
1046 1053 raise error.Abort(
1047 1054 _(b'options --message and --logfile are mutually exclusive')
1048 1055 )
1049 1056 if not message and logfile:
1050 1057 try:
1051 1058 if isstdiofilename(logfile):
1052 1059 message = ui.fin.read()
1053 1060 else:
1054 1061 message = b'\n'.join(util.readfile(logfile).splitlines())
1055 1062 except IOError as inst:
1056 1063 raise error.Abort(
1057 1064 _(b"can't read commit message '%s': %s")
1058 1065 % (logfile, encoding.strtolocal(inst.strerror))
1059 1066 )
1060 1067 return message
1061 1068
1062 1069
1063 1070 def mergeeditform(ctxorbool, baseformname):
1064 1071 """return appropriate editform name (referencing a committemplate)
1065 1072
1066 1073 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
1067 1074 merging is committed.
1068 1075
1069 1076 This returns baseformname with '.merge' appended if it is a merge,
1070 1077 otherwise '.normal' is appended.
1071 1078 """
1072 1079 if isinstance(ctxorbool, bool):
1073 1080 if ctxorbool:
1074 1081 return baseformname + b".merge"
1075 1082 elif len(ctxorbool.parents()) > 1:
1076 1083 return baseformname + b".merge"
1077 1084
1078 1085 return baseformname + b".normal"
1079 1086
1080 1087
1081 1088 def getcommiteditor(
1082 1089 edit=False, finishdesc=None, extramsg=None, editform=b'', **opts
1083 1090 ):
1084 1091 """get appropriate commit message editor according to '--edit' option
1085 1092
1086 1093 'finishdesc' is a function to be called with edited commit message
1087 1094 (= 'description' of the new changeset) just after editing, but
1088 1095 before checking empty-ness. It should return actual text to be
1089 1096 stored into history. This allows to change description before
1090 1097 storing.
1091 1098
1092 1099 'extramsg' is a extra message to be shown in the editor instead of
1093 1100 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
1094 1101 is automatically added.
1095 1102
1096 1103 'editform' is a dot-separated list of names, to distinguish
1097 1104 the purpose of commit text editing.
1098 1105
1099 1106 'getcommiteditor' returns 'commitforceeditor' regardless of
1100 1107 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
1101 1108 they are specific for usage in MQ.
1102 1109 """
1103 1110 if edit or finishdesc or extramsg:
1104 1111 return lambda r, c, s: commitforceeditor(
1105 1112 r, c, s, finishdesc=finishdesc, extramsg=extramsg, editform=editform
1106 1113 )
1107 1114 elif editform:
1108 1115 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
1109 1116 else:
1110 1117 return commiteditor
1111 1118
1112 1119
1113 1120 def _escapecommandtemplate(tmpl):
1114 1121 parts = []
1115 1122 for typ, start, end in templater.scantemplate(tmpl, raw=True):
1116 1123 if typ == b'string':
1117 1124 parts.append(stringutil.escapestr(tmpl[start:end]))
1118 1125 else:
1119 1126 parts.append(tmpl[start:end])
1120 1127 return b''.join(parts)
1121 1128
1122 1129
1123 1130 def rendercommandtemplate(ui, tmpl, props):
1124 1131 r"""Expand a literal template 'tmpl' in a way suitable for command line
1125 1132
1126 1133 '\' in outermost string is not taken as an escape character because it
1127 1134 is a directory separator on Windows.
1128 1135
1129 1136 >>> from . import ui as uimod
1130 1137 >>> ui = uimod.ui()
1131 1138 >>> rendercommandtemplate(ui, b'c:\\{path}', {b'path': b'foo'})
1132 1139 'c:\\foo'
1133 1140 >>> rendercommandtemplate(ui, b'{"c:\\{path}"}', {'path': b'foo'})
1134 1141 'c:{path}'
1135 1142 """
1136 1143 if not tmpl:
1137 1144 return tmpl
1138 1145 t = formatter.maketemplater(ui, _escapecommandtemplate(tmpl))
1139 1146 return t.renderdefault(props)
1140 1147
1141 1148
1142 1149 def rendertemplate(ctx, tmpl, props=None):
1143 1150 """Expand a literal template 'tmpl' byte-string against one changeset
1144 1151
1145 1152 Each props item must be a stringify-able value or a callable returning
1146 1153 such value, i.e. no bare list nor dict should be passed.
1147 1154 """
1148 1155 repo = ctx.repo()
1149 1156 tres = formatter.templateresources(repo.ui, repo)
1150 1157 t = formatter.maketemplater(
1151 1158 repo.ui, tmpl, defaults=templatekw.keywords, resources=tres
1152 1159 )
1153 1160 mapping = {b'ctx': ctx}
1154 1161 if props:
1155 1162 mapping.update(props)
1156 1163 return t.renderdefault(mapping)
1157 1164
1158 1165
1159 1166 def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None):
1160 1167 r"""Convert old-style filename format string to template string
1161 1168
1162 1169 >>> _buildfntemplate(b'foo-%b-%n.patch', seqno=0)
1163 1170 'foo-{reporoot|basename}-{seqno}.patch'
1164 1171 >>> _buildfntemplate(b'%R{tags % "{tag}"}%H')
1165 1172 '{rev}{tags % "{tag}"}{node}'
1166 1173
1167 1174 '\' in outermost strings has to be escaped because it is a directory
1168 1175 separator on Windows:
1169 1176
1170 1177 >>> _buildfntemplate(b'c:\\tmp\\%R\\%n.patch', seqno=0)
1171 1178 'c:\\\\tmp\\\\{rev}\\\\{seqno}.patch'
1172 1179 >>> _buildfntemplate(b'\\\\foo\\bar.patch')
1173 1180 '\\\\\\\\foo\\\\bar.patch'
1174 1181 >>> _buildfntemplate(b'\\{tags % "{tag}"}')
1175 1182 '\\\\{tags % "{tag}"}'
1176 1183
1177 1184 but inner strings follow the template rules (i.e. '\' is taken as an
1178 1185 escape character):
1179 1186
1180 1187 >>> _buildfntemplate(br'{"c:\tmp"}', seqno=0)
1181 1188 '{"c:\\tmp"}'
1182 1189 """
1183 1190 expander = {
1184 1191 b'H': b'{node}',
1185 1192 b'R': b'{rev}',
1186 1193 b'h': b'{node|short}',
1187 1194 b'm': br'{sub(r"[^\w]", "_", desc|firstline)}',
1188 1195 b'r': b'{if(revwidth, pad(rev, revwidth, "0", left=True), rev)}',
1189 1196 b'%': b'%',
1190 1197 b'b': b'{reporoot|basename}',
1191 1198 }
1192 1199 if total is not None:
1193 1200 expander[b'N'] = b'{total}'
1194 1201 if seqno is not None:
1195 1202 expander[b'n'] = b'{seqno}'
1196 1203 if total is not None and seqno is not None:
1197 1204 expander[b'n'] = b'{pad(seqno, total|stringify|count, "0", left=True)}'
1198 1205 if pathname is not None:
1199 1206 expander[b's'] = b'{pathname|basename}'
1200 1207 expander[b'd'] = b'{if(pathname|dirname, pathname|dirname, ".")}'
1201 1208 expander[b'p'] = b'{pathname}'
1202 1209
1203 1210 newname = []
1204 1211 for typ, start, end in templater.scantemplate(pat, raw=True):
1205 1212 if typ != b'string':
1206 1213 newname.append(pat[start:end])
1207 1214 continue
1208 1215 i = start
1209 1216 while i < end:
1210 1217 n = pat.find(b'%', i, end)
1211 1218 if n < 0:
1212 1219 newname.append(stringutil.escapestr(pat[i:end]))
1213 1220 break
1214 1221 newname.append(stringutil.escapestr(pat[i:n]))
1215 1222 if n + 2 > end:
1216 1223 raise error.Abort(
1217 1224 _(b"incomplete format spec in output filename")
1218 1225 )
1219 1226 c = pat[n + 1 : n + 2]
1220 1227 i = n + 2
1221 1228 try:
1222 1229 newname.append(expander[c])
1223 1230 except KeyError:
1224 1231 raise error.Abort(
1225 1232 _(b"invalid format spec '%%%s' in output filename") % c
1226 1233 )
1227 1234 return b''.join(newname)
1228 1235
1229 1236
1230 1237 def makefilename(ctx, pat, **props):
1231 1238 if not pat:
1232 1239 return pat
1233 1240 tmpl = _buildfntemplate(pat, **props)
1234 1241 # BUG: alias expansion shouldn't be made against template fragments
1235 1242 # rewritten from %-format strings, but we have no easy way to partially
1236 1243 # disable the expansion.
1237 1244 return rendertemplate(ctx, tmpl, pycompat.byteskwargs(props))
1238 1245
1239 1246
1240 1247 def isstdiofilename(pat):
1241 1248 """True if the given pat looks like a filename denoting stdin/stdout"""
1242 1249 return not pat or pat == b'-'
1243 1250
1244 1251
1245 1252 class _unclosablefile(object):
1246 1253 def __init__(self, fp):
1247 1254 self._fp = fp
1248 1255
1249 1256 def close(self):
1250 1257 pass
1251 1258
1252 1259 def __iter__(self):
1253 1260 return iter(self._fp)
1254 1261
1255 1262 def __getattr__(self, attr):
1256 1263 return getattr(self._fp, attr)
1257 1264
1258 1265 def __enter__(self):
1259 1266 return self
1260 1267
1261 1268 def __exit__(self, exc_type, exc_value, exc_tb):
1262 1269 pass
1263 1270
1264 1271
1265 1272 def makefileobj(ctx, pat, mode=b'wb', **props):
1266 1273 writable = mode not in (b'r', b'rb')
1267 1274
1268 1275 if isstdiofilename(pat):
1269 1276 repo = ctx.repo()
1270 1277 if writable:
1271 1278 fp = repo.ui.fout
1272 1279 else:
1273 1280 fp = repo.ui.fin
1274 1281 return _unclosablefile(fp)
1275 1282 fn = makefilename(ctx, pat, **props)
1276 1283 return open(fn, mode)
1277 1284
1278 1285
1279 1286 def openstorage(repo, cmd, file_, opts, returnrevlog=False):
1280 1287 """opens the changelog, manifest, a filelog or a given revlog"""
1281 1288 cl = opts[b'changelog']
1282 1289 mf = opts[b'manifest']
1283 1290 dir = opts[b'dir']
1284 1291 msg = None
1285 1292 if cl and mf:
1286 1293 msg = _(b'cannot specify --changelog and --manifest at the same time')
1287 1294 elif cl and dir:
1288 1295 msg = _(b'cannot specify --changelog and --dir at the same time')
1289 1296 elif cl or mf or dir:
1290 1297 if file_:
1291 1298 msg = _(b'cannot specify filename with --changelog or --manifest')
1292 1299 elif not repo:
1293 1300 msg = _(
1294 1301 b'cannot specify --changelog or --manifest or --dir '
1295 1302 b'without a repository'
1296 1303 )
1297 1304 if msg:
1298 1305 raise error.Abort(msg)
1299 1306
1300 1307 r = None
1301 1308 if repo:
1302 1309 if cl:
1303 1310 r = repo.unfiltered().changelog
1304 1311 elif dir:
1305 1312 if b'treemanifest' not in repo.requirements:
1306 1313 raise error.Abort(
1307 1314 _(
1308 1315 b"--dir can only be used on repos with "
1309 1316 b"treemanifest enabled"
1310 1317 )
1311 1318 )
1312 1319 if not dir.endswith(b'/'):
1313 1320 dir = dir + b'/'
1314 1321 dirlog = repo.manifestlog.getstorage(dir)
1315 1322 if len(dirlog):
1316 1323 r = dirlog
1317 1324 elif mf:
1318 1325 r = repo.manifestlog.getstorage(b'')
1319 1326 elif file_:
1320 1327 filelog = repo.file(file_)
1321 1328 if len(filelog):
1322 1329 r = filelog
1323 1330
1324 1331 # Not all storage may be revlogs. If requested, try to return an actual
1325 1332 # revlog instance.
1326 1333 if returnrevlog:
1327 1334 if isinstance(r, revlog.revlog):
1328 1335 pass
1329 1336 elif util.safehasattr(r, b'_revlog'):
1330 1337 r = r._revlog # pytype: disable=attribute-error
1331 1338 elif r is not None:
1332 1339 raise error.Abort(_(b'%r does not appear to be a revlog') % r)
1333 1340
1334 1341 if not r:
1335 1342 if not returnrevlog:
1336 1343 raise error.Abort(_(b'cannot give path to non-revlog'))
1337 1344
1338 1345 if not file_:
1339 1346 raise error.CommandError(cmd, _(b'invalid arguments'))
1340 1347 if not os.path.isfile(file_):
1341 1348 raise error.Abort(_(b"revlog '%s' not found") % file_)
1342 1349 r = revlog.revlog(
1343 1350 vfsmod.vfs(encoding.getcwd(), audit=False), file_[:-2] + b".i"
1344 1351 )
1345 1352 return r
1346 1353
1347 1354
1348 1355 def openrevlog(repo, cmd, file_, opts):
1349 1356 """Obtain a revlog backing storage of an item.
1350 1357
1351 1358 This is similar to ``openstorage()`` except it always returns a revlog.
1352 1359
1353 1360 In most cases, a caller cares about the main storage object - not the
1354 1361 revlog backing it. Therefore, this function should only be used by code
1355 1362 that needs to examine low-level revlog implementation details. e.g. debug
1356 1363 commands.
1357 1364 """
1358 1365 return openstorage(repo, cmd, file_, opts, returnrevlog=True)
1359 1366
1360 1367
1361 1368 def copy(ui, repo, pats, opts, rename=False):
1362 1369 # called with the repo lock held
1363 1370 #
1364 1371 # hgsep => pathname that uses "/" to separate directories
1365 1372 # ossep => pathname that uses os.sep to separate directories
1366 1373 cwd = repo.getcwd()
1367 1374 targets = {}
1368 1375 after = opts.get(b"after")
1369 1376 dryrun = opts.get(b"dry_run")
1370 1377 wctx = repo[None]
1371 1378
1372 1379 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
1373 1380
1374 1381 def walkpat(pat):
1375 1382 srcs = []
1376 1383 if after:
1377 1384 badstates = b'?'
1378 1385 else:
1379 1386 badstates = b'?r'
1380 1387 m = scmutil.match(wctx, [pat], opts, globbed=True)
1381 1388 for abs in wctx.walk(m):
1382 1389 state = repo.dirstate[abs]
1383 1390 rel = uipathfn(abs)
1384 1391 exact = m.exact(abs)
1385 1392 if state in badstates:
1386 1393 if exact and state == b'?':
1387 1394 ui.warn(_(b'%s: not copying - file is not managed\n') % rel)
1388 1395 if exact and state == b'r':
1389 1396 ui.warn(
1390 1397 _(
1391 1398 b'%s: not copying - file has been marked for'
1392 1399 b' remove\n'
1393 1400 )
1394 1401 % rel
1395 1402 )
1396 1403 continue
1397 1404 # abs: hgsep
1398 1405 # rel: ossep
1399 1406 srcs.append((abs, rel, exact))
1400 1407 return srcs
1401 1408
1402 1409 # abssrc: hgsep
1403 1410 # relsrc: ossep
1404 1411 # otarget: ossep
1405 1412 def copyfile(abssrc, relsrc, otarget, exact):
1406 1413 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
1407 1414 if b'/' in abstarget:
1408 1415 # We cannot normalize abstarget itself, this would prevent
1409 1416 # case only renames, like a => A.
1410 1417 abspath, absname = abstarget.rsplit(b'/', 1)
1411 1418 abstarget = repo.dirstate.normalize(abspath) + b'/' + absname
1412 1419 reltarget = repo.pathto(abstarget, cwd)
1413 1420 target = repo.wjoin(abstarget)
1414 1421 src = repo.wjoin(abssrc)
1415 1422 state = repo.dirstate[abstarget]
1416 1423
1417 1424 scmutil.checkportable(ui, abstarget)
1418 1425
1419 1426 # check for collisions
1420 1427 prevsrc = targets.get(abstarget)
1421 1428 if prevsrc is not None:
1422 1429 ui.warn(
1423 1430 _(b'%s: not overwriting - %s collides with %s\n')
1424 1431 % (
1425 1432 reltarget,
1426 1433 repo.pathto(abssrc, cwd),
1427 1434 repo.pathto(prevsrc, cwd),
1428 1435 )
1429 1436 )
1430 1437 return True # report a failure
1431 1438
1432 1439 # check for overwrites
1433 1440 exists = os.path.lexists(target)
1434 1441 samefile = False
1435 1442 if exists and abssrc != abstarget:
1436 1443 if repo.dirstate.normalize(abssrc) == repo.dirstate.normalize(
1437 1444 abstarget
1438 1445 ):
1439 1446 if not rename:
1440 1447 ui.warn(_(b"%s: can't copy - same file\n") % reltarget)
1441 1448 return True # report a failure
1442 1449 exists = False
1443 1450 samefile = True
1444 1451
1445 1452 if not after and exists or after and state in b'mn':
1446 1453 if not opts[b'force']:
1447 1454 if state in b'mn':
1448 1455 msg = _(b'%s: not overwriting - file already committed\n')
1449 1456 if after:
1450 1457 flags = b'--after --force'
1451 1458 else:
1452 1459 flags = b'--force'
1453 1460 if rename:
1454 1461 hint = (
1455 1462 _(
1456 1463 b"('hg rename %s' to replace the file by "
1457 1464 b'recording a rename)\n'
1458 1465 )
1459 1466 % flags
1460 1467 )
1461 1468 else:
1462 1469 hint = (
1463 1470 _(
1464 1471 b"('hg copy %s' to replace the file by "
1465 1472 b'recording a copy)\n'
1466 1473 )
1467 1474 % flags
1468 1475 )
1469 1476 else:
1470 1477 msg = _(b'%s: not overwriting - file exists\n')
1471 1478 if rename:
1472 1479 hint = _(
1473 1480 b"('hg rename --after' to record the rename)\n"
1474 1481 )
1475 1482 else:
1476 1483 hint = _(b"('hg copy --after' to record the copy)\n")
1477 1484 ui.warn(msg % reltarget)
1478 1485 ui.warn(hint)
1479 1486 return True # report a failure
1480 1487
1481 1488 if after:
1482 1489 if not exists:
1483 1490 if rename:
1484 1491 ui.warn(
1485 1492 _(b'%s: not recording move - %s does not exist\n')
1486 1493 % (relsrc, reltarget)
1487 1494 )
1488 1495 else:
1489 1496 ui.warn(
1490 1497 _(b'%s: not recording copy - %s does not exist\n')
1491 1498 % (relsrc, reltarget)
1492 1499 )
1493 1500 return True # report a failure
1494 1501 elif not dryrun:
1495 1502 try:
1496 1503 if exists:
1497 1504 os.unlink(target)
1498 1505 targetdir = os.path.dirname(target) or b'.'
1499 1506 if not os.path.isdir(targetdir):
1500 1507 os.makedirs(targetdir)
1501 1508 if samefile:
1502 1509 tmp = target + b"~hgrename"
1503 1510 os.rename(src, tmp)
1504 1511 os.rename(tmp, target)
1505 1512 else:
1506 1513 # Preserve stat info on renames, not on copies; this matches
1507 1514 # Linux CLI behavior.
1508 1515 util.copyfile(src, target, copystat=rename)
1509 1516 srcexists = True
1510 1517 except IOError as inst:
1511 1518 if inst.errno == errno.ENOENT:
1512 1519 ui.warn(_(b'%s: deleted in working directory\n') % relsrc)
1513 1520 srcexists = False
1514 1521 else:
1515 1522 ui.warn(
1516 1523 _(b'%s: cannot copy - %s\n')
1517 1524 % (relsrc, encoding.strtolocal(inst.strerror))
1518 1525 )
1519 1526 return True # report a failure
1520 1527
1521 1528 if ui.verbose or not exact:
1522 1529 if rename:
1523 1530 ui.status(_(b'moving %s to %s\n') % (relsrc, reltarget))
1524 1531 else:
1525 1532 ui.status(_(b'copying %s to %s\n') % (relsrc, reltarget))
1526 1533
1527 1534 targets[abstarget] = abssrc
1528 1535
1529 1536 # fix up dirstate
1530 1537 scmutil.dirstatecopy(
1531 1538 ui, repo, wctx, abssrc, abstarget, dryrun=dryrun, cwd=cwd
1532 1539 )
1533 1540 if rename and not dryrun:
1534 1541 if not after and srcexists and not samefile:
1535 1542 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
1536 1543 repo.wvfs.unlinkpath(abssrc, rmdir=rmdir)
1537 1544 wctx.forget([abssrc])
1538 1545
1539 1546 # pat: ossep
1540 1547 # dest ossep
1541 1548 # srcs: list of (hgsep, hgsep, ossep, bool)
1542 1549 # return: function that takes hgsep and returns ossep
1543 1550 def targetpathfn(pat, dest, srcs):
1544 1551 if os.path.isdir(pat):
1545 1552 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1546 1553 abspfx = util.localpath(abspfx)
1547 1554 if destdirexists:
1548 1555 striplen = len(os.path.split(abspfx)[0])
1549 1556 else:
1550 1557 striplen = len(abspfx)
1551 1558 if striplen:
1552 1559 striplen += len(pycompat.ossep)
1553 1560 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1554 1561 elif destdirexists:
1555 1562 res = lambda p: os.path.join(
1556 1563 dest, os.path.basename(util.localpath(p))
1557 1564 )
1558 1565 else:
1559 1566 res = lambda p: dest
1560 1567 return res
1561 1568
1562 1569 # pat: ossep
1563 1570 # dest ossep
1564 1571 # srcs: list of (hgsep, hgsep, ossep, bool)
1565 1572 # return: function that takes hgsep and returns ossep
1566 1573 def targetpathafterfn(pat, dest, srcs):
1567 1574 if matchmod.patkind(pat):
1568 1575 # a mercurial pattern
1569 1576 res = lambda p: os.path.join(
1570 1577 dest, os.path.basename(util.localpath(p))
1571 1578 )
1572 1579 else:
1573 1580 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1574 1581 if len(abspfx) < len(srcs[0][0]):
1575 1582 # A directory. Either the target path contains the last
1576 1583 # component of the source path or it does not.
1577 1584 def evalpath(striplen):
1578 1585 score = 0
1579 1586 for s in srcs:
1580 1587 t = os.path.join(dest, util.localpath(s[0])[striplen:])
1581 1588 if os.path.lexists(t):
1582 1589 score += 1
1583 1590 return score
1584 1591
1585 1592 abspfx = util.localpath(abspfx)
1586 1593 striplen = len(abspfx)
1587 1594 if striplen:
1588 1595 striplen += len(pycompat.ossep)
1589 1596 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1590 1597 score = evalpath(striplen)
1591 1598 striplen1 = len(os.path.split(abspfx)[0])
1592 1599 if striplen1:
1593 1600 striplen1 += len(pycompat.ossep)
1594 1601 if evalpath(striplen1) > score:
1595 1602 striplen = striplen1
1596 1603 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1597 1604 else:
1598 1605 # a file
1599 1606 if destdirexists:
1600 1607 res = lambda p: os.path.join(
1601 1608 dest, os.path.basename(util.localpath(p))
1602 1609 )
1603 1610 else:
1604 1611 res = lambda p: dest
1605 1612 return res
1606 1613
1607 1614 pats = scmutil.expandpats(pats)
1608 1615 if not pats:
1609 1616 raise error.Abort(_(b'no source or destination specified'))
1610 1617 if len(pats) == 1:
1611 1618 raise error.Abort(_(b'no destination specified'))
1612 1619 dest = pats.pop()
1613 1620 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
1614 1621 if not destdirexists:
1615 1622 if len(pats) > 1 or matchmod.patkind(pats[0]):
1616 1623 raise error.Abort(
1617 1624 _(
1618 1625 b'with multiple sources, destination must be an '
1619 1626 b'existing directory'
1620 1627 )
1621 1628 )
1622 1629 if util.endswithsep(dest):
1623 1630 raise error.Abort(_(b'destination %s is not a directory') % dest)
1624 1631
1625 1632 tfn = targetpathfn
1626 1633 if after:
1627 1634 tfn = targetpathafterfn
1628 1635 copylist = []
1629 1636 for pat in pats:
1630 1637 srcs = walkpat(pat)
1631 1638 if not srcs:
1632 1639 continue
1633 1640 copylist.append((tfn(pat, dest, srcs), srcs))
1634 1641 if not copylist:
1635 1642 raise error.Abort(_(b'no files to copy'))
1636 1643
1637 1644 errors = 0
1638 1645 for targetpath, srcs in copylist:
1639 1646 for abssrc, relsrc, exact in srcs:
1640 1647 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
1641 1648 errors += 1
1642 1649
1643 1650 return errors != 0
1644 1651
1645 1652
1646 1653 ## facility to let extension process additional data into an import patch
1647 1654 # list of identifier to be executed in order
1648 1655 extrapreimport = [] # run before commit
1649 1656 extrapostimport = [] # run after commit
1650 1657 # mapping from identifier to actual import function
1651 1658 #
1652 1659 # 'preimport' are run before the commit is made and are provided the following
1653 1660 # arguments:
1654 1661 # - repo: the localrepository instance,
1655 1662 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
1656 1663 # - extra: the future extra dictionary of the changeset, please mutate it,
1657 1664 # - opts: the import options.
1658 1665 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
1659 1666 # mutation of in memory commit and more. Feel free to rework the code to get
1660 1667 # there.
1661 1668 extrapreimportmap = {}
1662 1669 # 'postimport' are run after the commit is made and are provided the following
1663 1670 # argument:
1664 1671 # - ctx: the changectx created by import.
1665 1672 extrapostimportmap = {}
1666 1673
1667 1674
1668 1675 def tryimportone(ui, repo, patchdata, parents, opts, msgs, updatefunc):
1669 1676 """Utility function used by commands.import to import a single patch
1670 1677
1671 1678 This function is explicitly defined here to help the evolve extension to
1672 1679 wrap this part of the import logic.
1673 1680
1674 1681 The API is currently a bit ugly because it a simple code translation from
1675 1682 the import command. Feel free to make it better.
1676 1683
1677 1684 :patchdata: a dictionary containing parsed patch data (such as from
1678 1685 ``patch.extract()``)
1679 1686 :parents: nodes that will be parent of the created commit
1680 1687 :opts: the full dict of option passed to the import command
1681 1688 :msgs: list to save commit message to.
1682 1689 (used in case we need to save it when failing)
1683 1690 :updatefunc: a function that update a repo to a given node
1684 1691 updatefunc(<repo>, <node>)
1685 1692 """
1686 1693 # avoid cycle context -> subrepo -> cmdutil
1687 1694 from . import context
1688 1695
1689 1696 tmpname = patchdata.get(b'filename')
1690 1697 message = patchdata.get(b'message')
1691 1698 user = opts.get(b'user') or patchdata.get(b'user')
1692 1699 date = opts.get(b'date') or patchdata.get(b'date')
1693 1700 branch = patchdata.get(b'branch')
1694 1701 nodeid = patchdata.get(b'nodeid')
1695 1702 p1 = patchdata.get(b'p1')
1696 1703 p2 = patchdata.get(b'p2')
1697 1704
1698 1705 nocommit = opts.get(b'no_commit')
1699 1706 importbranch = opts.get(b'import_branch')
1700 1707 update = not opts.get(b'bypass')
1701 1708 strip = opts[b"strip"]
1702 1709 prefix = opts[b"prefix"]
1703 1710 sim = float(opts.get(b'similarity') or 0)
1704 1711
1705 1712 if not tmpname:
1706 1713 return None, None, False
1707 1714
1708 1715 rejects = False
1709 1716
1710 1717 cmdline_message = logmessage(ui, opts)
1711 1718 if cmdline_message:
1712 1719 # pickup the cmdline msg
1713 1720 message = cmdline_message
1714 1721 elif message:
1715 1722 # pickup the patch msg
1716 1723 message = message.strip()
1717 1724 else:
1718 1725 # launch the editor
1719 1726 message = None
1720 1727 ui.debug(b'message:\n%s\n' % (message or b''))
1721 1728
1722 1729 if len(parents) == 1:
1723 1730 parents.append(repo[nullid])
1724 1731 if opts.get(b'exact'):
1725 1732 if not nodeid or not p1:
1726 1733 raise error.Abort(_(b'not a Mercurial patch'))
1727 1734 p1 = repo[p1]
1728 1735 p2 = repo[p2 or nullid]
1729 1736 elif p2:
1730 1737 try:
1731 1738 p1 = repo[p1]
1732 1739 p2 = repo[p2]
1733 1740 # Without any options, consider p2 only if the
1734 1741 # patch is being applied on top of the recorded
1735 1742 # first parent.
1736 1743 if p1 != parents[0]:
1737 1744 p1 = parents[0]
1738 1745 p2 = repo[nullid]
1739 1746 except error.RepoError:
1740 1747 p1, p2 = parents
1741 1748 if p2.node() == nullid:
1742 1749 ui.warn(
1743 1750 _(
1744 1751 b"warning: import the patch as a normal revision\n"
1745 1752 b"(use --exact to import the patch as a merge)\n"
1746 1753 )
1747 1754 )
1748 1755 else:
1749 1756 p1, p2 = parents
1750 1757
1751 1758 n = None
1752 1759 if update:
1753 1760 if p1 != parents[0]:
1754 1761 updatefunc(repo, p1.node())
1755 1762 if p2 != parents[1]:
1756 1763 repo.setparents(p1.node(), p2.node())
1757 1764
1758 1765 if opts.get(b'exact') or importbranch:
1759 1766 repo.dirstate.setbranch(branch or b'default')
1760 1767
1761 1768 partial = opts.get(b'partial', False)
1762 1769 files = set()
1763 1770 try:
1764 1771 patch.patch(
1765 1772 ui,
1766 1773 repo,
1767 1774 tmpname,
1768 1775 strip=strip,
1769 1776 prefix=prefix,
1770 1777 files=files,
1771 1778 eolmode=None,
1772 1779 similarity=sim / 100.0,
1773 1780 )
1774 1781 except error.PatchError as e:
1775 1782 if not partial:
1776 1783 raise error.Abort(pycompat.bytestr(e))
1777 1784 if partial:
1778 1785 rejects = True
1779 1786
1780 1787 files = list(files)
1781 1788 if nocommit:
1782 1789 if message:
1783 1790 msgs.append(message)
1784 1791 else:
1785 1792 if opts.get(b'exact') or p2:
1786 1793 # If you got here, you either use --force and know what
1787 1794 # you are doing or used --exact or a merge patch while
1788 1795 # being updated to its first parent.
1789 1796 m = None
1790 1797 else:
1791 1798 m = scmutil.matchfiles(repo, files or [])
1792 1799 editform = mergeeditform(repo[None], b'import.normal')
1793 1800 if opts.get(b'exact'):
1794 1801 editor = None
1795 1802 else:
1796 1803 editor = getcommiteditor(
1797 1804 editform=editform, **pycompat.strkwargs(opts)
1798 1805 )
1799 1806 extra = {}
1800 1807 for idfunc in extrapreimport:
1801 1808 extrapreimportmap[idfunc](repo, patchdata, extra, opts)
1802 1809 overrides = {}
1803 1810 if partial:
1804 1811 overrides[(b'ui', b'allowemptycommit')] = True
1805 1812 if opts.get(b'secret'):
1806 1813 overrides[(b'phases', b'new-commit')] = b'secret'
1807 1814 with repo.ui.configoverride(overrides, b'import'):
1808 1815 n = repo.commit(
1809 1816 message, user, date, match=m, editor=editor, extra=extra
1810 1817 )
1811 1818 for idfunc in extrapostimport:
1812 1819 extrapostimportmap[idfunc](repo[n])
1813 1820 else:
1814 1821 if opts.get(b'exact') or importbranch:
1815 1822 branch = branch or b'default'
1816 1823 else:
1817 1824 branch = p1.branch()
1818 1825 store = patch.filestore()
1819 1826 try:
1820 1827 files = set()
1821 1828 try:
1822 1829 patch.patchrepo(
1823 1830 ui,
1824 1831 repo,
1825 1832 p1,
1826 1833 store,
1827 1834 tmpname,
1828 1835 strip,
1829 1836 prefix,
1830 1837 files,
1831 1838 eolmode=None,
1832 1839 )
1833 1840 except error.PatchError as e:
1834 1841 raise error.Abort(stringutil.forcebytestr(e))
1835 1842 if opts.get(b'exact'):
1836 1843 editor = None
1837 1844 else:
1838 1845 editor = getcommiteditor(editform=b'import.bypass')
1839 1846 memctx = context.memctx(
1840 1847 repo,
1841 1848 (p1.node(), p2.node()),
1842 1849 message,
1843 1850 files=files,
1844 1851 filectxfn=store,
1845 1852 user=user,
1846 1853 date=date,
1847 1854 branch=branch,
1848 1855 editor=editor,
1849 1856 )
1850 1857 n = memctx.commit()
1851 1858 finally:
1852 1859 store.close()
1853 1860 if opts.get(b'exact') and nocommit:
1854 1861 # --exact with --no-commit is still useful in that it does merge
1855 1862 # and branch bits
1856 1863 ui.warn(_(b"warning: can't check exact import with --no-commit\n"))
1857 1864 elif opts.get(b'exact') and (not n or hex(n) != nodeid):
1858 1865 raise error.Abort(_(b'patch is damaged or loses information'))
1859 1866 msg = _(b'applied to working directory')
1860 1867 if n:
1861 1868 # i18n: refers to a short changeset id
1862 1869 msg = _(b'created %s') % short(n)
1863 1870 return msg, n, rejects
1864 1871
1865 1872
1866 1873 # facility to let extensions include additional data in an exported patch
1867 1874 # list of identifiers to be executed in order
1868 1875 extraexport = []
1869 1876 # mapping from identifier to actual export function
1870 1877 # function as to return a string to be added to the header or None
1871 1878 # it is given two arguments (sequencenumber, changectx)
1872 1879 extraexportmap = {}
1873 1880
1874 1881
1875 1882 def _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts):
1876 1883 node = scmutil.binnode(ctx)
1877 1884 parents = [p.node() for p in ctx.parents() if p]
1878 1885 branch = ctx.branch()
1879 1886 if switch_parent:
1880 1887 parents.reverse()
1881 1888
1882 1889 if parents:
1883 1890 prev = parents[0]
1884 1891 else:
1885 1892 prev = nullid
1886 1893
1887 1894 fm.context(ctx=ctx)
1888 1895 fm.plain(b'# HG changeset patch\n')
1889 1896 fm.write(b'user', b'# User %s\n', ctx.user())
1890 1897 fm.plain(b'# Date %d %d\n' % ctx.date())
1891 1898 fm.write(b'date', b'# %s\n', fm.formatdate(ctx.date()))
1892 1899 fm.condwrite(
1893 1900 branch and branch != b'default', b'branch', b'# Branch %s\n', branch
1894 1901 )
1895 1902 fm.write(b'node', b'# Node ID %s\n', hex(node))
1896 1903 fm.plain(b'# Parent %s\n' % hex(prev))
1897 1904 if len(parents) > 1:
1898 1905 fm.plain(b'# Parent %s\n' % hex(parents[1]))
1899 1906 fm.data(parents=fm.formatlist(pycompat.maplist(hex, parents), name=b'node'))
1900 1907
1901 1908 # TODO: redesign extraexportmap function to support formatter
1902 1909 for headerid in extraexport:
1903 1910 header = extraexportmap[headerid](seqno, ctx)
1904 1911 if header is not None:
1905 1912 fm.plain(b'# %s\n' % header)
1906 1913
1907 1914 fm.write(b'desc', b'%s\n', ctx.description().rstrip())
1908 1915 fm.plain(b'\n')
1909 1916
1910 1917 if fm.isplain():
1911 1918 chunkiter = patch.diffui(repo, prev, node, match, opts=diffopts)
1912 1919 for chunk, label in chunkiter:
1913 1920 fm.plain(chunk, label=label)
1914 1921 else:
1915 1922 chunkiter = patch.diff(repo, prev, node, match, opts=diffopts)
1916 1923 # TODO: make it structured?
1917 1924 fm.data(diff=b''.join(chunkiter))
1918 1925
1919 1926
1920 1927 def _exportfile(repo, revs, fm, dest, switch_parent, diffopts, match):
1921 1928 """Export changesets to stdout or a single file"""
1922 1929 for seqno, rev in enumerate(revs, 1):
1923 1930 ctx = repo[rev]
1924 1931 if not dest.startswith(b'<'):
1925 1932 repo.ui.note(b"%s\n" % dest)
1926 1933 fm.startitem()
1927 1934 _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts)
1928 1935
1929 1936
1930 1937 def _exportfntemplate(
1931 1938 repo, revs, basefm, fntemplate, switch_parent, diffopts, match
1932 1939 ):
1933 1940 """Export changesets to possibly multiple files"""
1934 1941 total = len(revs)
1935 1942 revwidth = max(len(str(rev)) for rev in revs)
1936 1943 filemap = util.sortdict() # filename: [(seqno, rev), ...]
1937 1944
1938 1945 for seqno, rev in enumerate(revs, 1):
1939 1946 ctx = repo[rev]
1940 1947 dest = makefilename(
1941 1948 ctx, fntemplate, total=total, seqno=seqno, revwidth=revwidth
1942 1949 )
1943 1950 filemap.setdefault(dest, []).append((seqno, rev))
1944 1951
1945 1952 for dest in filemap:
1946 1953 with formatter.maybereopen(basefm, dest) as fm:
1947 1954 repo.ui.note(b"%s\n" % dest)
1948 1955 for seqno, rev in filemap[dest]:
1949 1956 fm.startitem()
1950 1957 ctx = repo[rev]
1951 1958 _exportsingle(
1952 1959 repo, ctx, fm, match, switch_parent, seqno, diffopts
1953 1960 )
1954 1961
1955 1962
1956 1963 def _prefetchchangedfiles(repo, revs, match):
1957 1964 allfiles = set()
1958 1965 for rev in revs:
1959 1966 for file in repo[rev].files():
1960 1967 if not match or match(file):
1961 1968 allfiles.add(file)
1962 1969 scmutil.prefetchfiles(repo, revs, scmutil.matchfiles(repo, allfiles))
1963 1970
1964 1971
1965 1972 def export(
1966 1973 repo,
1967 1974 revs,
1968 1975 basefm,
1969 1976 fntemplate=b'hg-%h.patch',
1970 1977 switch_parent=False,
1971 1978 opts=None,
1972 1979 match=None,
1973 1980 ):
1974 1981 '''export changesets as hg patches
1975 1982
1976 1983 Args:
1977 1984 repo: The repository from which we're exporting revisions.
1978 1985 revs: A list of revisions to export as revision numbers.
1979 1986 basefm: A formatter to which patches should be written.
1980 1987 fntemplate: An optional string to use for generating patch file names.
1981 1988 switch_parent: If True, show diffs against second parent when not nullid.
1982 1989 Default is false, which always shows diff against p1.
1983 1990 opts: diff options to use for generating the patch.
1984 1991 match: If specified, only export changes to files matching this matcher.
1985 1992
1986 1993 Returns:
1987 1994 Nothing.
1988 1995
1989 1996 Side Effect:
1990 1997 "HG Changeset Patch" data is emitted to one of the following
1991 1998 destinations:
1992 1999 fntemplate specified: Each rev is written to a unique file named using
1993 2000 the given template.
1994 2001 Otherwise: All revs will be written to basefm.
1995 2002 '''
1996 2003 _prefetchchangedfiles(repo, revs, match)
1997 2004
1998 2005 if not fntemplate:
1999 2006 _exportfile(
2000 2007 repo, revs, basefm, b'<unnamed>', switch_parent, opts, match
2001 2008 )
2002 2009 else:
2003 2010 _exportfntemplate(
2004 2011 repo, revs, basefm, fntemplate, switch_parent, opts, match
2005 2012 )
2006 2013
2007 2014
2008 2015 def exportfile(repo, revs, fp, switch_parent=False, opts=None, match=None):
2009 2016 """Export changesets to the given file stream"""
2010 2017 _prefetchchangedfiles(repo, revs, match)
2011 2018
2012 2019 dest = getattr(fp, 'name', b'<unnamed>')
2013 2020 with formatter.formatter(repo.ui, fp, b'export', {}) as fm:
2014 2021 _exportfile(repo, revs, fm, dest, switch_parent, opts, match)
2015 2022
2016 2023
2017 2024 def showmarker(fm, marker, index=None):
2018 2025 """utility function to display obsolescence marker in a readable way
2019 2026
2020 2027 To be used by debug function."""
2021 2028 if index is not None:
2022 2029 fm.write(b'index', b'%i ', index)
2023 2030 fm.write(b'prednode', b'%s ', hex(marker.prednode()))
2024 2031 succs = marker.succnodes()
2025 2032 fm.condwrite(
2026 2033 succs,
2027 2034 b'succnodes',
2028 2035 b'%s ',
2029 2036 fm.formatlist(map(hex, succs), name=b'node'),
2030 2037 )
2031 2038 fm.write(b'flag', b'%X ', marker.flags())
2032 2039 parents = marker.parentnodes()
2033 2040 if parents is not None:
2034 2041 fm.write(
2035 2042 b'parentnodes',
2036 2043 b'{%s} ',
2037 2044 fm.formatlist(map(hex, parents), name=b'node', sep=b', '),
2038 2045 )
2039 2046 fm.write(b'date', b'(%s) ', fm.formatdate(marker.date()))
2040 2047 meta = marker.metadata().copy()
2041 2048 meta.pop(b'date', None)
2042 2049 smeta = pycompat.rapply(pycompat.maybebytestr, meta)
2043 2050 fm.write(
2044 2051 b'metadata', b'{%s}', fm.formatdict(smeta, fmt=b'%r: %r', sep=b', ')
2045 2052 )
2046 2053 fm.plain(b'\n')
2047 2054
2048 2055
2049 2056 def finddate(ui, repo, date):
2050 2057 """Find the tipmost changeset that matches the given date spec"""
2051 2058
2052 2059 df = dateutil.matchdate(date)
2053 2060 m = scmutil.matchall(repo)
2054 2061 results = {}
2055 2062
2056 2063 def prep(ctx, fns):
2057 2064 d = ctx.date()
2058 2065 if df(d[0]):
2059 2066 results[ctx.rev()] = d
2060 2067
2061 2068 for ctx in walkchangerevs(repo, m, {b'rev': None}, prep):
2062 2069 rev = ctx.rev()
2063 2070 if rev in results:
2064 2071 ui.status(
2065 2072 _(b"found revision %d from %s\n")
2066 2073 % (rev, dateutil.datestr(results[rev]))
2067 2074 )
2068 2075 return b'%d' % rev
2069 2076
2070 2077 raise error.Abort(_(b"revision matching date not found"))
2071 2078
2072 2079
2073 2080 def increasingwindows(windowsize=8, sizelimit=512):
2074 2081 while True:
2075 2082 yield windowsize
2076 2083 if windowsize < sizelimit:
2077 2084 windowsize *= 2
2078 2085
2079 2086
2080 2087 def _walkrevs(repo, opts):
2081 2088 # Default --rev value depends on --follow but --follow behavior
2082 2089 # depends on revisions resolved from --rev...
2083 2090 follow = opts.get(b'follow') or opts.get(b'follow_first')
2084 2091 if opts.get(b'rev'):
2085 2092 revs = scmutil.revrange(repo, opts[b'rev'])
2086 2093 elif follow and repo.dirstate.p1() == nullid:
2087 2094 revs = smartset.baseset()
2088 2095 elif follow:
2089 2096 revs = repo.revs(b'reverse(:.)')
2090 2097 else:
2091 2098 revs = smartset.spanset(repo)
2092 2099 revs.reverse()
2093 2100 return revs
2094 2101
2095 2102
2096 2103 class FileWalkError(Exception):
2097 2104 pass
2098 2105
2099 2106
2100 2107 def walkfilerevs(repo, match, follow, revs, fncache):
2101 2108 '''Walks the file history for the matched files.
2102 2109
2103 2110 Returns the changeset revs that are involved in the file history.
2104 2111
2105 2112 Throws FileWalkError if the file history can't be walked using
2106 2113 filelogs alone.
2107 2114 '''
2108 2115 wanted = set()
2109 2116 copies = []
2110 2117 minrev, maxrev = min(revs), max(revs)
2111 2118
2112 2119 def filerevs(filelog, last):
2113 2120 """
2114 2121 Only files, no patterns. Check the history of each file.
2115 2122
2116 2123 Examines filelog entries within minrev, maxrev linkrev range
2117 2124 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
2118 2125 tuples in backwards order
2119 2126 """
2120 2127 cl_count = len(repo)
2121 2128 revs = []
2122 2129 for j in pycompat.xrange(0, last + 1):
2123 2130 linkrev = filelog.linkrev(j)
2124 2131 if linkrev < minrev:
2125 2132 continue
2126 2133 # only yield rev for which we have the changelog, it can
2127 2134 # happen while doing "hg log" during a pull or commit
2128 2135 if linkrev >= cl_count:
2129 2136 break
2130 2137
2131 2138 parentlinkrevs = []
2132 2139 for p in filelog.parentrevs(j):
2133 2140 if p != nullrev:
2134 2141 parentlinkrevs.append(filelog.linkrev(p))
2135 2142 n = filelog.node(j)
2136 2143 revs.append(
2137 2144 (linkrev, parentlinkrevs, follow and filelog.renamed(n))
2138 2145 )
2139 2146
2140 2147 return reversed(revs)
2141 2148
2142 2149 def iterfiles():
2143 2150 pctx = repo[b'.']
2144 2151 for filename in match.files():
2145 2152 if follow:
2146 2153 if filename not in pctx:
2147 2154 raise error.Abort(
2148 2155 _(
2149 2156 b'cannot follow file not in parent '
2150 2157 b'revision: "%s"'
2151 2158 )
2152 2159 % filename
2153 2160 )
2154 2161 yield filename, pctx[filename].filenode()
2155 2162 else:
2156 2163 yield filename, None
2157 2164 for filename_node in copies:
2158 2165 yield filename_node
2159 2166
2160 2167 for file_, node in iterfiles():
2161 2168 filelog = repo.file(file_)
2162 2169 if not len(filelog):
2163 2170 if node is None:
2164 2171 # A zero count may be a directory or deleted file, so
2165 2172 # try to find matching entries on the slow path.
2166 2173 if follow:
2167 2174 raise error.Abort(
2168 2175 _(b'cannot follow nonexistent file: "%s"') % file_
2169 2176 )
2170 2177 raise FileWalkError(b"Cannot walk via filelog")
2171 2178 else:
2172 2179 continue
2173 2180
2174 2181 if node is None:
2175 2182 last = len(filelog) - 1
2176 2183 else:
2177 2184 last = filelog.rev(node)
2178 2185
2179 2186 # keep track of all ancestors of the file
2180 2187 ancestors = {filelog.linkrev(last)}
2181 2188
2182 2189 # iterate from latest to oldest revision
2183 2190 for rev, flparentlinkrevs, copied in filerevs(filelog, last):
2184 2191 if not follow:
2185 2192 if rev > maxrev:
2186 2193 continue
2187 2194 else:
2188 2195 # Note that last might not be the first interesting
2189 2196 # rev to us:
2190 2197 # if the file has been changed after maxrev, we'll
2191 2198 # have linkrev(last) > maxrev, and we still need
2192 2199 # to explore the file graph
2193 2200 if rev not in ancestors:
2194 2201 continue
2195 2202 # XXX insert 1327 fix here
2196 2203 if flparentlinkrevs:
2197 2204 ancestors.update(flparentlinkrevs)
2198 2205
2199 2206 fncache.setdefault(rev, []).append(file_)
2200 2207 wanted.add(rev)
2201 2208 if copied:
2202 2209 copies.append(copied)
2203 2210
2204 2211 return wanted
2205 2212
2206 2213
2207 2214 class _followfilter(object):
2208 2215 def __init__(self, repo, onlyfirst=False):
2209 2216 self.repo = repo
2210 2217 self.startrev = nullrev
2211 2218 self.roots = set()
2212 2219 self.onlyfirst = onlyfirst
2213 2220
2214 2221 def match(self, rev):
2215 2222 def realparents(rev):
2216 2223 if self.onlyfirst:
2217 2224 return self.repo.changelog.parentrevs(rev)[0:1]
2218 2225 else:
2219 2226 return filter(
2220 2227 lambda x: x != nullrev, self.repo.changelog.parentrevs(rev)
2221 2228 )
2222 2229
2223 2230 if self.startrev == nullrev:
2224 2231 self.startrev = rev
2225 2232 return True
2226 2233
2227 2234 if rev > self.startrev:
2228 2235 # forward: all descendants
2229 2236 if not self.roots:
2230 2237 self.roots.add(self.startrev)
2231 2238 for parent in realparents(rev):
2232 2239 if parent in self.roots:
2233 2240 self.roots.add(rev)
2234 2241 return True
2235 2242 else:
2236 2243 # backwards: all parents
2237 2244 if not self.roots:
2238 2245 self.roots.update(realparents(self.startrev))
2239 2246 if rev in self.roots:
2240 2247 self.roots.remove(rev)
2241 2248 self.roots.update(realparents(rev))
2242 2249 return True
2243 2250
2244 2251 return False
2245 2252
2246 2253
2247 2254 def walkchangerevs(repo, match, opts, prepare):
2248 2255 '''Iterate over files and the revs in which they changed.
2249 2256
2250 2257 Callers most commonly need to iterate backwards over the history
2251 2258 in which they are interested. Doing so has awful (quadratic-looking)
2252 2259 performance, so we use iterators in a "windowed" way.
2253 2260
2254 2261 We walk a window of revisions in the desired order. Within the
2255 2262 window, we first walk forwards to gather data, then in the desired
2256 2263 order (usually backwards) to display it.
2257 2264
2258 2265 This function returns an iterator yielding contexts. Before
2259 2266 yielding each context, the iterator will first call the prepare
2260 2267 function on each context in the window in forward order.'''
2261 2268
2262 2269 allfiles = opts.get(b'all_files')
2263 2270 follow = opts.get(b'follow') or opts.get(b'follow_first')
2264 2271 revs = _walkrevs(repo, opts)
2265 2272 if not revs:
2266 2273 return []
2267 2274 wanted = set()
2268 2275 slowpath = match.anypats() or (not match.always() and opts.get(b'removed'))
2269 2276 fncache = {}
2270 2277 change = repo.__getitem__
2271 2278
2272 2279 # First step is to fill wanted, the set of revisions that we want to yield.
2273 2280 # When it does not induce extra cost, we also fill fncache for revisions in
2274 2281 # wanted: a cache of filenames that were changed (ctx.files()) and that
2275 2282 # match the file filtering conditions.
2276 2283
2277 2284 if match.always() or allfiles:
2278 2285 # No files, no patterns. Display all revs.
2279 2286 wanted = revs
2280 2287 elif not slowpath:
2281 2288 # We only have to read through the filelog to find wanted revisions
2282 2289
2283 2290 try:
2284 2291 wanted = walkfilerevs(repo, match, follow, revs, fncache)
2285 2292 except FileWalkError:
2286 2293 slowpath = True
2287 2294
2288 2295 # We decided to fall back to the slowpath because at least one
2289 2296 # of the paths was not a file. Check to see if at least one of them
2290 2297 # existed in history, otherwise simply return
2291 2298 for path in match.files():
2292 2299 if path == b'.' or path in repo.store:
2293 2300 break
2294 2301 else:
2295 2302 return []
2296 2303
2297 2304 if slowpath:
2298 2305 # We have to read the changelog to match filenames against
2299 2306 # changed files
2300 2307
2301 2308 if follow:
2302 2309 raise error.Abort(
2303 2310 _(b'can only follow copies/renames for explicit filenames')
2304 2311 )
2305 2312
2306 2313 # The slow path checks files modified in every changeset.
2307 2314 # This is really slow on large repos, so compute the set lazily.
2308 2315 class lazywantedset(object):
2309 2316 def __init__(self):
2310 2317 self.set = set()
2311 2318 self.revs = set(revs)
2312 2319
2313 2320 # No need to worry about locality here because it will be accessed
2314 2321 # in the same order as the increasing window below.
2315 2322 def __contains__(self, value):
2316 2323 if value in self.set:
2317 2324 return True
2318 2325 elif not value in self.revs:
2319 2326 return False
2320 2327 else:
2321 2328 self.revs.discard(value)
2322 2329 ctx = change(value)
2323 2330 if allfiles:
2324 2331 matches = list(ctx.manifest().walk(match))
2325 2332 else:
2326 2333 matches = [f for f in ctx.files() if match(f)]
2327 2334 if matches:
2328 2335 fncache[value] = matches
2329 2336 self.set.add(value)
2330 2337 return True
2331 2338 return False
2332 2339
2333 2340 def discard(self, value):
2334 2341 self.revs.discard(value)
2335 2342 self.set.discard(value)
2336 2343
2337 2344 wanted = lazywantedset()
2338 2345
2339 2346 # it might be worthwhile to do this in the iterator if the rev range
2340 2347 # is descending and the prune args are all within that range
2341 2348 for rev in opts.get(b'prune', ()):
2342 2349 rev = repo[rev].rev()
2343 2350 ff = _followfilter(repo)
2344 2351 stop = min(revs[0], revs[-1])
2345 2352 for x in pycompat.xrange(rev, stop - 1, -1):
2346 2353 if ff.match(x):
2347 2354 wanted = wanted - [x]
2348 2355
2349 2356 # Now that wanted is correctly initialized, we can iterate over the
2350 2357 # revision range, yielding only revisions in wanted.
2351 2358 def iterate():
2352 2359 if follow and match.always():
2353 2360 ff = _followfilter(repo, onlyfirst=opts.get(b'follow_first'))
2354 2361
2355 2362 def want(rev):
2356 2363 return ff.match(rev) and rev in wanted
2357 2364
2358 2365 else:
2359 2366
2360 2367 def want(rev):
2361 2368 return rev in wanted
2362 2369
2363 2370 it = iter(revs)
2364 2371 stopiteration = False
2365 2372 for windowsize in increasingwindows():
2366 2373 nrevs = []
2367 2374 for i in pycompat.xrange(windowsize):
2368 2375 rev = next(it, None)
2369 2376 if rev is None:
2370 2377 stopiteration = True
2371 2378 break
2372 2379 elif want(rev):
2373 2380 nrevs.append(rev)
2374 2381 for rev in sorted(nrevs):
2375 2382 fns = fncache.get(rev)
2376 2383 ctx = change(rev)
2377 2384 if not fns:
2378 2385
2379 2386 def fns_generator():
2380 2387 if allfiles:
2381 2388 fiter = iter(ctx)
2382 2389 else:
2383 2390 fiter = ctx.files()
2384 2391 for f in fiter:
2385 2392 if match(f):
2386 2393 yield f
2387 2394
2388 2395 fns = fns_generator()
2389 2396 prepare(ctx, fns)
2390 2397 for rev in nrevs:
2391 2398 yield change(rev)
2392 2399
2393 2400 if stopiteration:
2394 2401 break
2395 2402
2396 2403 return iterate()
2397 2404
2398 2405
2399 2406 def add(ui, repo, match, prefix, uipathfn, explicitonly, **opts):
2400 2407 bad = []
2401 2408
2402 2409 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2403 2410 names = []
2404 2411 wctx = repo[None]
2405 2412 cca = None
2406 2413 abort, warn = scmutil.checkportabilityalert(ui)
2407 2414 if abort or warn:
2408 2415 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
2409 2416
2410 2417 match = repo.narrowmatch(match, includeexact=True)
2411 2418 badmatch = matchmod.badmatch(match, badfn)
2412 2419 dirstate = repo.dirstate
2413 2420 # We don't want to just call wctx.walk here, since it would return a lot of
2414 2421 # clean files, which we aren't interested in and takes time.
2415 2422 for f in sorted(
2416 2423 dirstate.walk(
2417 2424 badmatch,
2418 2425 subrepos=sorted(wctx.substate),
2419 2426 unknown=True,
2420 2427 ignored=False,
2421 2428 full=False,
2422 2429 )
2423 2430 ):
2424 2431 exact = match.exact(f)
2425 2432 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
2426 2433 if cca:
2427 2434 cca(f)
2428 2435 names.append(f)
2429 2436 if ui.verbose or not exact:
2430 2437 ui.status(
2431 2438 _(b'adding %s\n') % uipathfn(f), label=b'ui.addremove.added'
2432 2439 )
2433 2440
2434 2441 for subpath in sorted(wctx.substate):
2435 2442 sub = wctx.sub(subpath)
2436 2443 try:
2437 2444 submatch = matchmod.subdirmatcher(subpath, match)
2438 2445 subprefix = repo.wvfs.reljoin(prefix, subpath)
2439 2446 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2440 2447 if opts.get('subrepos'):
2441 2448 bad.extend(
2442 2449 sub.add(ui, submatch, subprefix, subuipathfn, False, **opts)
2443 2450 )
2444 2451 else:
2445 2452 bad.extend(
2446 2453 sub.add(ui, submatch, subprefix, subuipathfn, True, **opts)
2447 2454 )
2448 2455 except error.LookupError:
2449 2456 ui.status(
2450 2457 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2451 2458 )
2452 2459
2453 2460 if not opts.get('dry_run'):
2454 2461 rejected = wctx.add(names, prefix)
2455 2462 bad.extend(f for f in rejected if f in match.files())
2456 2463 return bad
2457 2464
2458 2465
2459 2466 def addwebdirpath(repo, serverpath, webconf):
2460 2467 webconf[serverpath] = repo.root
2461 2468 repo.ui.debug(b'adding %s = %s\n' % (serverpath, repo.root))
2462 2469
2463 2470 for r in repo.revs(b'filelog("path:.hgsub")'):
2464 2471 ctx = repo[r]
2465 2472 for subpath in ctx.substate:
2466 2473 ctx.sub(subpath).addwebdirpath(serverpath, webconf)
2467 2474
2468 2475
2469 2476 def forget(
2470 2477 ui, repo, match, prefix, uipathfn, explicitonly, dryrun, interactive
2471 2478 ):
2472 2479 if dryrun and interactive:
2473 2480 raise error.Abort(_(b"cannot specify both --dry-run and --interactive"))
2474 2481 bad = []
2475 2482 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2476 2483 wctx = repo[None]
2477 2484 forgot = []
2478 2485
2479 2486 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
2480 2487 forget = sorted(s.modified + s.added + s.deleted + s.clean)
2481 2488 if explicitonly:
2482 2489 forget = [f for f in forget if match.exact(f)]
2483 2490
2484 2491 for subpath in sorted(wctx.substate):
2485 2492 sub = wctx.sub(subpath)
2486 2493 submatch = matchmod.subdirmatcher(subpath, match)
2487 2494 subprefix = repo.wvfs.reljoin(prefix, subpath)
2488 2495 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2489 2496 try:
2490 2497 subbad, subforgot = sub.forget(
2491 2498 submatch,
2492 2499 subprefix,
2493 2500 subuipathfn,
2494 2501 dryrun=dryrun,
2495 2502 interactive=interactive,
2496 2503 )
2497 2504 bad.extend([subpath + b'/' + f for f in subbad])
2498 2505 forgot.extend([subpath + b'/' + f for f in subforgot])
2499 2506 except error.LookupError:
2500 2507 ui.status(
2501 2508 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2502 2509 )
2503 2510
2504 2511 if not explicitonly:
2505 2512 for f in match.files():
2506 2513 if f not in repo.dirstate and not repo.wvfs.isdir(f):
2507 2514 if f not in forgot:
2508 2515 if repo.wvfs.exists(f):
2509 2516 # Don't complain if the exact case match wasn't given.
2510 2517 # But don't do this until after checking 'forgot', so
2511 2518 # that subrepo files aren't normalized, and this op is
2512 2519 # purely from data cached by the status walk above.
2513 2520 if repo.dirstate.normalize(f) in repo.dirstate:
2514 2521 continue
2515 2522 ui.warn(
2516 2523 _(
2517 2524 b'not removing %s: '
2518 2525 b'file is already untracked\n'
2519 2526 )
2520 2527 % uipathfn(f)
2521 2528 )
2522 2529 bad.append(f)
2523 2530
2524 2531 if interactive:
2525 2532 responses = _(
2526 2533 b'[Ynsa?]'
2527 2534 b'$$ &Yes, forget this file'
2528 2535 b'$$ &No, skip this file'
2529 2536 b'$$ &Skip remaining files'
2530 2537 b'$$ Include &all remaining files'
2531 2538 b'$$ &? (display help)'
2532 2539 )
2533 2540 for filename in forget[:]:
2534 2541 r = ui.promptchoice(
2535 2542 _(b'forget %s %s') % (uipathfn(filename), responses)
2536 2543 )
2537 2544 if r == 4: # ?
2538 2545 while r == 4:
2539 2546 for c, t in ui.extractchoices(responses)[1]:
2540 2547 ui.write(b'%s - %s\n' % (c, encoding.lower(t)))
2541 2548 r = ui.promptchoice(
2542 2549 _(b'forget %s %s') % (uipathfn(filename), responses)
2543 2550 )
2544 2551 if r == 0: # yes
2545 2552 continue
2546 2553 elif r == 1: # no
2547 2554 forget.remove(filename)
2548 2555 elif r == 2: # Skip
2549 2556 fnindex = forget.index(filename)
2550 2557 del forget[fnindex:]
2551 2558 break
2552 2559 elif r == 3: # All
2553 2560 break
2554 2561
2555 2562 for f in forget:
2556 2563 if ui.verbose or not match.exact(f) or interactive:
2557 2564 ui.status(
2558 2565 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2559 2566 )
2560 2567
2561 2568 if not dryrun:
2562 2569 rejected = wctx.forget(forget, prefix)
2563 2570 bad.extend(f for f in rejected if f in match.files())
2564 2571 forgot.extend(f for f in forget if f not in rejected)
2565 2572 return bad, forgot
2566 2573
2567 2574
2568 2575 def files(ui, ctx, m, uipathfn, fm, fmt, subrepos):
2569 2576 ret = 1
2570 2577
2571 2578 needsfctx = ui.verbose or {b'size', b'flags'} & fm.datahint()
2572 2579 for f in ctx.matches(m):
2573 2580 fm.startitem()
2574 2581 fm.context(ctx=ctx)
2575 2582 if needsfctx:
2576 2583 fc = ctx[f]
2577 2584 fm.write(b'size flags', b'% 10d % 1s ', fc.size(), fc.flags())
2578 2585 fm.data(path=f)
2579 2586 fm.plain(fmt % uipathfn(f))
2580 2587 ret = 0
2581 2588
2582 2589 for subpath in sorted(ctx.substate):
2583 2590 submatch = matchmod.subdirmatcher(subpath, m)
2584 2591 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2585 2592 if subrepos or m.exact(subpath) or any(submatch.files()):
2586 2593 sub = ctx.sub(subpath)
2587 2594 try:
2588 2595 recurse = m.exact(subpath) or subrepos
2589 2596 if (
2590 2597 sub.printfiles(ui, submatch, subuipathfn, fm, fmt, recurse)
2591 2598 == 0
2592 2599 ):
2593 2600 ret = 0
2594 2601 except error.LookupError:
2595 2602 ui.status(
2596 2603 _(b"skipping missing subrepository: %s\n")
2597 2604 % uipathfn(subpath)
2598 2605 )
2599 2606
2600 2607 return ret
2601 2608
2602 2609
2603 2610 def remove(
2604 2611 ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun, warnings=None
2605 2612 ):
2606 2613 ret = 0
2607 2614 s = repo.status(match=m, clean=True)
2608 2615 modified, added, deleted, clean = s.modified, s.added, s.deleted, s.clean
2609 2616
2610 2617 wctx = repo[None]
2611 2618
2612 2619 if warnings is None:
2613 2620 warnings = []
2614 2621 warn = True
2615 2622 else:
2616 2623 warn = False
2617 2624
2618 2625 subs = sorted(wctx.substate)
2619 2626 progress = ui.makeprogress(
2620 2627 _(b'searching'), total=len(subs), unit=_(b'subrepos')
2621 2628 )
2622 2629 for subpath in subs:
2623 2630 submatch = matchmod.subdirmatcher(subpath, m)
2624 2631 subprefix = repo.wvfs.reljoin(prefix, subpath)
2625 2632 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2626 2633 if subrepos or m.exact(subpath) or any(submatch.files()):
2627 2634 progress.increment()
2628 2635 sub = wctx.sub(subpath)
2629 2636 try:
2630 2637 if sub.removefiles(
2631 2638 submatch,
2632 2639 subprefix,
2633 2640 subuipathfn,
2634 2641 after,
2635 2642 force,
2636 2643 subrepos,
2637 2644 dryrun,
2638 2645 warnings,
2639 2646 ):
2640 2647 ret = 1
2641 2648 except error.LookupError:
2642 2649 warnings.append(
2643 2650 _(b"skipping missing subrepository: %s\n")
2644 2651 % uipathfn(subpath)
2645 2652 )
2646 2653 progress.complete()
2647 2654
2648 2655 # warn about failure to delete explicit files/dirs
2649 2656 deleteddirs = pathutil.dirs(deleted)
2650 2657 files = m.files()
2651 2658 progress = ui.makeprogress(
2652 2659 _(b'deleting'), total=len(files), unit=_(b'files')
2653 2660 )
2654 2661 for f in files:
2655 2662
2656 2663 def insubrepo():
2657 2664 for subpath in wctx.substate:
2658 2665 if f.startswith(subpath + b'/'):
2659 2666 return True
2660 2667 return False
2661 2668
2662 2669 progress.increment()
2663 2670 isdir = f in deleteddirs or wctx.hasdir(f)
2664 2671 if f in repo.dirstate or isdir or f == b'.' or insubrepo() or f in subs:
2665 2672 continue
2666 2673
2667 2674 if repo.wvfs.exists(f):
2668 2675 if repo.wvfs.isdir(f):
2669 2676 warnings.append(
2670 2677 _(b'not removing %s: no tracked files\n') % uipathfn(f)
2671 2678 )
2672 2679 else:
2673 2680 warnings.append(
2674 2681 _(b'not removing %s: file is untracked\n') % uipathfn(f)
2675 2682 )
2676 2683 # missing files will generate a warning elsewhere
2677 2684 ret = 1
2678 2685 progress.complete()
2679 2686
2680 2687 if force:
2681 2688 list = modified + deleted + clean + added
2682 2689 elif after:
2683 2690 list = deleted
2684 2691 remaining = modified + added + clean
2685 2692 progress = ui.makeprogress(
2686 2693 _(b'skipping'), total=len(remaining), unit=_(b'files')
2687 2694 )
2688 2695 for f in remaining:
2689 2696 progress.increment()
2690 2697 if ui.verbose or (f in files):
2691 2698 warnings.append(
2692 2699 _(b'not removing %s: file still exists\n') % uipathfn(f)
2693 2700 )
2694 2701 ret = 1
2695 2702 progress.complete()
2696 2703 else:
2697 2704 list = deleted + clean
2698 2705 progress = ui.makeprogress(
2699 2706 _(b'skipping'), total=(len(modified) + len(added)), unit=_(b'files')
2700 2707 )
2701 2708 for f in modified:
2702 2709 progress.increment()
2703 2710 warnings.append(
2704 2711 _(
2705 2712 b'not removing %s: file is modified (use -f'
2706 2713 b' to force removal)\n'
2707 2714 )
2708 2715 % uipathfn(f)
2709 2716 )
2710 2717 ret = 1
2711 2718 for f in added:
2712 2719 progress.increment()
2713 2720 warnings.append(
2714 2721 _(
2715 2722 b"not removing %s: file has been marked for add"
2716 2723 b" (use 'hg forget' to undo add)\n"
2717 2724 )
2718 2725 % uipathfn(f)
2719 2726 )
2720 2727 ret = 1
2721 2728 progress.complete()
2722 2729
2723 2730 list = sorted(list)
2724 2731 progress = ui.makeprogress(
2725 2732 _(b'deleting'), total=len(list), unit=_(b'files')
2726 2733 )
2727 2734 for f in list:
2728 2735 if ui.verbose or not m.exact(f):
2729 2736 progress.increment()
2730 2737 ui.status(
2731 2738 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2732 2739 )
2733 2740 progress.complete()
2734 2741
2735 2742 if not dryrun:
2736 2743 with repo.wlock():
2737 2744 if not after:
2738 2745 for f in list:
2739 2746 if f in added:
2740 2747 continue # we never unlink added files on remove
2741 2748 rmdir = repo.ui.configbool(
2742 2749 b'experimental', b'removeemptydirs'
2743 2750 )
2744 2751 repo.wvfs.unlinkpath(f, ignoremissing=True, rmdir=rmdir)
2745 2752 repo[None].forget(list)
2746 2753
2747 2754 if warn:
2748 2755 for warning in warnings:
2749 2756 ui.warn(warning)
2750 2757
2751 2758 return ret
2752 2759
2753 2760
2754 2761 def _catfmtneedsdata(fm):
2755 2762 return not fm.datahint() or b'data' in fm.datahint()
2756 2763
2757 2764
2758 2765 def _updatecatformatter(fm, ctx, matcher, path, decode):
2759 2766 """Hook for adding data to the formatter used by ``hg cat``.
2760 2767
2761 2768 Extensions (e.g., lfs) can wrap this to inject keywords/data, but must call
2762 2769 this method first."""
2763 2770
2764 2771 # data() can be expensive to fetch (e.g. lfs), so don't fetch it if it
2765 2772 # wasn't requested.
2766 2773 data = b''
2767 2774 if _catfmtneedsdata(fm):
2768 2775 data = ctx[path].data()
2769 2776 if decode:
2770 2777 data = ctx.repo().wwritedata(path, data)
2771 2778 fm.startitem()
2772 2779 fm.context(ctx=ctx)
2773 2780 fm.write(b'data', b'%s', data)
2774 2781 fm.data(path=path)
2775 2782
2776 2783
2777 2784 def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
2778 2785 err = 1
2779 2786 opts = pycompat.byteskwargs(opts)
2780 2787
2781 2788 def write(path):
2782 2789 filename = None
2783 2790 if fntemplate:
2784 2791 filename = makefilename(
2785 2792 ctx, fntemplate, pathname=os.path.join(prefix, path)
2786 2793 )
2787 2794 # attempt to create the directory if it does not already exist
2788 2795 try:
2789 2796 os.makedirs(os.path.dirname(filename))
2790 2797 except OSError:
2791 2798 pass
2792 2799 with formatter.maybereopen(basefm, filename) as fm:
2793 2800 _updatecatformatter(fm, ctx, matcher, path, opts.get(b'decode'))
2794 2801
2795 2802 # Automation often uses hg cat on single files, so special case it
2796 2803 # for performance to avoid the cost of parsing the manifest.
2797 2804 if len(matcher.files()) == 1 and not matcher.anypats():
2798 2805 file = matcher.files()[0]
2799 2806 mfl = repo.manifestlog
2800 2807 mfnode = ctx.manifestnode()
2801 2808 try:
2802 2809 if mfnode and mfl[mfnode].find(file)[0]:
2803 2810 if _catfmtneedsdata(basefm):
2804 2811 scmutil.prefetchfiles(repo, [ctx.rev()], matcher)
2805 2812 write(file)
2806 2813 return 0
2807 2814 except KeyError:
2808 2815 pass
2809 2816
2810 2817 if _catfmtneedsdata(basefm):
2811 2818 scmutil.prefetchfiles(repo, [ctx.rev()], matcher)
2812 2819
2813 2820 for abs in ctx.walk(matcher):
2814 2821 write(abs)
2815 2822 err = 0
2816 2823
2817 2824 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2818 2825 for subpath in sorted(ctx.substate):
2819 2826 sub = ctx.sub(subpath)
2820 2827 try:
2821 2828 submatch = matchmod.subdirmatcher(subpath, matcher)
2822 2829 subprefix = os.path.join(prefix, subpath)
2823 2830 if not sub.cat(
2824 2831 submatch,
2825 2832 basefm,
2826 2833 fntemplate,
2827 2834 subprefix,
2828 2835 **pycompat.strkwargs(opts)
2829 2836 ):
2830 2837 err = 0
2831 2838 except error.RepoLookupError:
2832 2839 ui.status(
2833 2840 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2834 2841 )
2835 2842
2836 2843 return err
2837 2844
2838 2845
2839 2846 def commit(ui, repo, commitfunc, pats, opts):
2840 2847 '''commit the specified files or all outstanding changes'''
2841 2848 date = opts.get(b'date')
2842 2849 if date:
2843 2850 opts[b'date'] = dateutil.parsedate(date)
2844 2851 message = logmessage(ui, opts)
2845 2852 matcher = scmutil.match(repo[None], pats, opts)
2846 2853
2847 2854 dsguard = None
2848 2855 # extract addremove carefully -- this function can be called from a command
2849 2856 # that doesn't support addremove
2850 2857 if opts.get(b'addremove'):
2851 2858 dsguard = dirstateguard.dirstateguard(repo, b'commit')
2852 2859 with dsguard or util.nullcontextmanager():
2853 2860 if dsguard:
2854 2861 relative = scmutil.anypats(pats, opts)
2855 2862 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2856 2863 if scmutil.addremove(repo, matcher, b"", uipathfn, opts) != 0:
2857 2864 raise error.Abort(
2858 2865 _(b"failed to mark all new/missing files as added/removed")
2859 2866 )
2860 2867
2861 2868 return commitfunc(ui, repo, message, matcher, opts)
2862 2869
2863 2870
2864 2871 def samefile(f, ctx1, ctx2):
2865 2872 if f in ctx1.manifest():
2866 2873 a = ctx1.filectx(f)
2867 2874 if f in ctx2.manifest():
2868 2875 b = ctx2.filectx(f)
2869 2876 return not a.cmp(b) and a.flags() == b.flags()
2870 2877 else:
2871 2878 return False
2872 2879 else:
2873 2880 return f not in ctx2.manifest()
2874 2881
2875 2882
2876 2883 def amend(ui, repo, old, extra, pats, opts):
2877 2884 # avoid cycle context -> subrepo -> cmdutil
2878 2885 from . import context
2879 2886
2880 2887 # amend will reuse the existing user if not specified, but the obsolete
2881 2888 # marker creation requires that the current user's name is specified.
2882 2889 if obsolete.isenabled(repo, obsolete.createmarkersopt):
2883 2890 ui.username() # raise exception if username not set
2884 2891
2885 2892 ui.note(_(b'amending changeset %s\n') % old)
2886 2893 base = old.p1()
2887 2894
2888 2895 with repo.wlock(), repo.lock(), repo.transaction(b'amend'):
2889 2896 # Participating changesets:
2890 2897 #
2891 2898 # wctx o - workingctx that contains changes from working copy
2892 2899 # | to go into amending commit
2893 2900 # |
2894 2901 # old o - changeset to amend
2895 2902 # |
2896 2903 # base o - first parent of the changeset to amend
2897 2904 wctx = repo[None]
2898 2905
2899 2906 # Copy to avoid mutating input
2900 2907 extra = extra.copy()
2901 2908 # Update extra dict from amended commit (e.g. to preserve graft
2902 2909 # source)
2903 2910 extra.update(old.extra())
2904 2911
2905 2912 # Also update it from the from the wctx
2906 2913 extra.update(wctx.extra())
2907 2914
2908 2915 # date-only change should be ignored?
2909 2916 datemaydiffer = resolvecommitoptions(ui, opts)
2910 2917
2911 2918 date = old.date()
2912 2919 if opts.get(b'date'):
2913 2920 date = dateutil.parsedate(opts.get(b'date'))
2914 2921 user = opts.get(b'user') or old.user()
2915 2922
2916 2923 if len(old.parents()) > 1:
2917 2924 # ctx.files() isn't reliable for merges, so fall back to the
2918 2925 # slower repo.status() method
2919 2926 st = base.status(old)
2920 2927 files = set(st.modified) | set(st.added) | set(st.removed)
2921 2928 else:
2922 2929 files = set(old.files())
2923 2930
2924 2931 # add/remove the files to the working copy if the "addremove" option
2925 2932 # was specified.
2926 2933 matcher = scmutil.match(wctx, pats, opts)
2927 2934 relative = scmutil.anypats(pats, opts)
2928 2935 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2929 2936 if opts.get(b'addremove') and scmutil.addremove(
2930 2937 repo, matcher, b"", uipathfn, opts
2931 2938 ):
2932 2939 raise error.Abort(
2933 2940 _(b"failed to mark all new/missing files as added/removed")
2934 2941 )
2935 2942
2936 2943 # Check subrepos. This depends on in-place wctx._status update in
2937 2944 # subrepo.precommit(). To minimize the risk of this hack, we do
2938 2945 # nothing if .hgsub does not exist.
2939 2946 if b'.hgsub' in wctx or b'.hgsub' in old:
2940 2947 subs, commitsubs, newsubstate = subrepoutil.precommit(
2941 2948 ui, wctx, wctx._status, matcher
2942 2949 )
2943 2950 # amend should abort if commitsubrepos is enabled
2944 2951 assert not commitsubs
2945 2952 if subs:
2946 2953 subrepoutil.writestate(repo, newsubstate)
2947 2954
2948 2955 ms = mergemod.mergestate.read(repo)
2949 2956 mergeutil.checkunresolved(ms)
2950 2957
2951 2958 filestoamend = set(f for f in wctx.files() if matcher(f))
2952 2959
2953 2960 changes = len(filestoamend) > 0
2954 2961 if changes:
2955 2962 # Recompute copies (avoid recording a -> b -> a)
2956 2963 copied = copies.pathcopies(base, wctx, matcher)
2957 2964 if old.p2:
2958 2965 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
2959 2966
2960 2967 # Prune files which were reverted by the updates: if old
2961 2968 # introduced file X and the file was renamed in the working
2962 2969 # copy, then those two files are the same and
2963 2970 # we can discard X from our list of files. Likewise if X
2964 2971 # was removed, it's no longer relevant. If X is missing (aka
2965 2972 # deleted), old X must be preserved.
2966 2973 files.update(filestoamend)
2967 2974 files = [
2968 2975 f
2969 2976 for f in files
2970 2977 if (f not in filestoamend or not samefile(f, wctx, base))
2971 2978 ]
2972 2979
2973 2980 def filectxfn(repo, ctx_, path):
2974 2981 try:
2975 2982 # If the file being considered is not amongst the files
2976 2983 # to be amended, we should return the file context from the
2977 2984 # old changeset. This avoids issues when only some files in
2978 2985 # the working copy are being amended but there are also
2979 2986 # changes to other files from the old changeset.
2980 2987 if path not in filestoamend:
2981 2988 return old.filectx(path)
2982 2989
2983 2990 # Return None for removed files.
2984 2991 if path in wctx.removed():
2985 2992 return None
2986 2993
2987 2994 fctx = wctx[path]
2988 2995 flags = fctx.flags()
2989 2996 mctx = context.memfilectx(
2990 2997 repo,
2991 2998 ctx_,
2992 2999 fctx.path(),
2993 3000 fctx.data(),
2994 3001 islink=b'l' in flags,
2995 3002 isexec=b'x' in flags,
2996 3003 copysource=copied.get(path),
2997 3004 )
2998 3005 return mctx
2999 3006 except KeyError:
3000 3007 return None
3001 3008
3002 3009 else:
3003 3010 ui.note(_(b'copying changeset %s to %s\n') % (old, base))
3004 3011
3005 3012 # Use version of files as in the old cset
3006 3013 def filectxfn(repo, ctx_, path):
3007 3014 try:
3008 3015 return old.filectx(path)
3009 3016 except KeyError:
3010 3017 return None
3011 3018
3012 3019 # See if we got a message from -m or -l, if not, open the editor with
3013 3020 # the message of the changeset to amend.
3014 3021 message = logmessage(ui, opts)
3015 3022
3016 3023 editform = mergeeditform(old, b'commit.amend')
3017 3024
3018 3025 if not message:
3019 3026 message = old.description()
3020 3027 # Default if message isn't provided and --edit is not passed is to
3021 3028 # invoke editor, but allow --no-edit. If somehow we don't have any
3022 3029 # description, let's always start the editor.
3023 3030 doedit = not message or opts.get(b'edit') in [True, None]
3024 3031 else:
3025 3032 # Default if message is provided is to not invoke editor, but allow
3026 3033 # --edit.
3027 3034 doedit = opts.get(b'edit') is True
3028 3035 editor = getcommiteditor(edit=doedit, editform=editform)
3029 3036
3030 3037 pureextra = extra.copy()
3031 3038 extra[b'amend_source'] = old.hex()
3032 3039
3033 3040 new = context.memctx(
3034 3041 repo,
3035 3042 parents=[base.node(), old.p2().node()],
3036 3043 text=message,
3037 3044 files=files,
3038 3045 filectxfn=filectxfn,
3039 3046 user=user,
3040 3047 date=date,
3041 3048 extra=extra,
3042 3049 editor=editor,
3043 3050 )
3044 3051
3045 3052 newdesc = changelog.stripdesc(new.description())
3046 3053 if (
3047 3054 (not changes)
3048 3055 and newdesc == old.description()
3049 3056 and user == old.user()
3050 3057 and (date == old.date() or datemaydiffer)
3051 3058 and pureextra == old.extra()
3052 3059 ):
3053 3060 # nothing changed. continuing here would create a new node
3054 3061 # anyway because of the amend_source noise.
3055 3062 #
3056 3063 # This not what we expect from amend.
3057 3064 return old.node()
3058 3065
3059 3066 commitphase = None
3060 3067 if opts.get(b'secret'):
3061 3068 commitphase = phases.secret
3062 3069 newid = repo.commitctx(new)
3063 3070
3064 3071 # Reroute the working copy parent to the new changeset
3065 3072 repo.setparents(newid, nullid)
3066 3073 mapping = {old.node(): (newid,)}
3067 3074 obsmetadata = None
3068 3075 if opts.get(b'note'):
3069 3076 obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])}
3070 3077 backup = ui.configbool(b'rewrite', b'backup-bundle')
3071 3078 scmutil.cleanupnodes(
3072 3079 repo,
3073 3080 mapping,
3074 3081 b'amend',
3075 3082 metadata=obsmetadata,
3076 3083 fixphase=True,
3077 3084 targetphase=commitphase,
3078 3085 backup=backup,
3079 3086 )
3080 3087
3081 3088 # Fixing the dirstate because localrepo.commitctx does not update
3082 3089 # it. This is rather convenient because we did not need to update
3083 3090 # the dirstate for all the files in the new commit which commitctx
3084 3091 # could have done if it updated the dirstate. Now, we can
3085 3092 # selectively update the dirstate only for the amended files.
3086 3093 dirstate = repo.dirstate
3087 3094
3088 3095 # Update the state of the files which were added and modified in the
3089 3096 # amend to "normal" in the dirstate. We need to use "normallookup" since
3090 3097 # the files may have changed since the command started; using "normal"
3091 3098 # would mark them as clean but with uncommitted contents.
3092 3099 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
3093 3100 for f in normalfiles:
3094 3101 dirstate.normallookup(f)
3095 3102
3096 3103 # Update the state of files which were removed in the amend
3097 3104 # to "removed" in the dirstate.
3098 3105 removedfiles = set(wctx.removed()) & filestoamend
3099 3106 for f in removedfiles:
3100 3107 dirstate.drop(f)
3101 3108
3102 3109 return newid
3103 3110
3104 3111
3105 3112 def commiteditor(repo, ctx, subs, editform=b''):
3106 3113 if ctx.description():
3107 3114 return ctx.description()
3108 3115 return commitforceeditor(
3109 3116 repo, ctx, subs, editform=editform, unchangedmessagedetection=True
3110 3117 )
3111 3118
3112 3119
3113 3120 def commitforceeditor(
3114 3121 repo,
3115 3122 ctx,
3116 3123 subs,
3117 3124 finishdesc=None,
3118 3125 extramsg=None,
3119 3126 editform=b'',
3120 3127 unchangedmessagedetection=False,
3121 3128 ):
3122 3129 if not extramsg:
3123 3130 extramsg = _(b"Leave message empty to abort commit.")
3124 3131
3125 3132 forms = [e for e in editform.split(b'.') if e]
3126 3133 forms.insert(0, b'changeset')
3127 3134 templatetext = None
3128 3135 while forms:
3129 3136 ref = b'.'.join(forms)
3130 3137 if repo.ui.config(b'committemplate', ref):
3131 3138 templatetext = committext = buildcommittemplate(
3132 3139 repo, ctx, subs, extramsg, ref
3133 3140 )
3134 3141 break
3135 3142 forms.pop()
3136 3143 else:
3137 3144 committext = buildcommittext(repo, ctx, subs, extramsg)
3138 3145
3139 3146 # run editor in the repository root
3140 3147 olddir = encoding.getcwd()
3141 3148 os.chdir(repo.root)
3142 3149
3143 3150 # make in-memory changes visible to external process
3144 3151 tr = repo.currenttransaction()
3145 3152 repo.dirstate.write(tr)
3146 3153 pending = tr and tr.writepending() and repo.root
3147 3154
3148 3155 editortext = repo.ui.edit(
3149 3156 committext,
3150 3157 ctx.user(),
3151 3158 ctx.extra(),
3152 3159 editform=editform,
3153 3160 pending=pending,
3154 3161 repopath=repo.path,
3155 3162 action=b'commit',
3156 3163 )
3157 3164 text = editortext
3158 3165
3159 3166 # strip away anything below this special string (used for editors that want
3160 3167 # to display the diff)
3161 3168 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
3162 3169 if stripbelow:
3163 3170 text = text[: stripbelow.start()]
3164 3171
3165 3172 text = re.sub(b"(?m)^HG:.*(\n|$)", b"", text)
3166 3173 os.chdir(olddir)
3167 3174
3168 3175 if finishdesc:
3169 3176 text = finishdesc(text)
3170 3177 if not text.strip():
3171 3178 raise error.Abort(_(b"empty commit message"))
3172 3179 if unchangedmessagedetection and editortext == templatetext:
3173 3180 raise error.Abort(_(b"commit message unchanged"))
3174 3181
3175 3182 return text
3176 3183
3177 3184
3178 3185 def buildcommittemplate(repo, ctx, subs, extramsg, ref):
3179 3186 ui = repo.ui
3180 3187 spec = formatter.templatespec(ref, None, None)
3181 3188 t = logcmdutil.changesettemplater(ui, repo, spec)
3182 3189 t.t.cache.update(
3183 3190 (k, templater.unquotestring(v))
3184 3191 for k, v in repo.ui.configitems(b'committemplate')
3185 3192 )
3186 3193
3187 3194 if not extramsg:
3188 3195 extramsg = b'' # ensure that extramsg is string
3189 3196
3190 3197 ui.pushbuffer()
3191 3198 t.show(ctx, extramsg=extramsg)
3192 3199 return ui.popbuffer()
3193 3200
3194 3201
3195 3202 def hgprefix(msg):
3196 3203 return b"\n".join([b"HG: %s" % a for a in msg.split(b"\n") if a])
3197 3204
3198 3205
3199 3206 def buildcommittext(repo, ctx, subs, extramsg):
3200 3207 edittext = []
3201 3208 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
3202 3209 if ctx.description():
3203 3210 edittext.append(ctx.description())
3204 3211 edittext.append(b"")
3205 3212 edittext.append(b"") # Empty line between message and comments.
3206 3213 edittext.append(
3207 3214 hgprefix(
3208 3215 _(
3209 3216 b"Enter commit message."
3210 3217 b" Lines beginning with 'HG:' are removed."
3211 3218 )
3212 3219 )
3213 3220 )
3214 3221 edittext.append(hgprefix(extramsg))
3215 3222 edittext.append(b"HG: --")
3216 3223 edittext.append(hgprefix(_(b"user: %s") % ctx.user()))
3217 3224 if ctx.p2():
3218 3225 edittext.append(hgprefix(_(b"branch merge")))
3219 3226 if ctx.branch():
3220 3227 edittext.append(hgprefix(_(b"branch '%s'") % ctx.branch()))
3221 3228 if bookmarks.isactivewdirparent(repo):
3222 3229 edittext.append(hgprefix(_(b"bookmark '%s'") % repo._activebookmark))
3223 3230 edittext.extend([hgprefix(_(b"subrepo %s") % s) for s in subs])
3224 3231 edittext.extend([hgprefix(_(b"added %s") % f) for f in added])
3225 3232 edittext.extend([hgprefix(_(b"changed %s") % f) for f in modified])
3226 3233 edittext.extend([hgprefix(_(b"removed %s") % f) for f in removed])
3227 3234 if not added and not modified and not removed:
3228 3235 edittext.append(hgprefix(_(b"no files changed")))
3229 3236 edittext.append(b"")
3230 3237
3231 3238 return b"\n".join(edittext)
3232 3239
3233 3240
3234 3241 def commitstatus(repo, node, branch, bheads=None, opts=None):
3235 3242 if opts is None:
3236 3243 opts = {}
3237 3244 ctx = repo[node]
3238 3245 parents = ctx.parents()
3239 3246
3240 3247 if (
3241 3248 not opts.get(b'amend')
3242 3249 and bheads
3243 3250 and node not in bheads
3244 3251 and not [
3245 3252 x for x in parents if x.node() in bheads and x.branch() == branch
3246 3253 ]
3247 3254 ):
3248 3255 repo.ui.status(_(b'created new head\n'))
3249 3256 # The message is not printed for initial roots. For the other
3250 3257 # changesets, it is printed in the following situations:
3251 3258 #
3252 3259 # Par column: for the 2 parents with ...
3253 3260 # N: null or no parent
3254 3261 # B: parent is on another named branch
3255 3262 # C: parent is a regular non head changeset
3256 3263 # H: parent was a branch head of the current branch
3257 3264 # Msg column: whether we print "created new head" message
3258 3265 # In the following, it is assumed that there already exists some
3259 3266 # initial branch heads of the current branch, otherwise nothing is
3260 3267 # printed anyway.
3261 3268 #
3262 3269 # Par Msg Comment
3263 3270 # N N y additional topo root
3264 3271 #
3265 3272 # B N y additional branch root
3266 3273 # C N y additional topo head
3267 3274 # H N n usual case
3268 3275 #
3269 3276 # B B y weird additional branch root
3270 3277 # C B y branch merge
3271 3278 # H B n merge with named branch
3272 3279 #
3273 3280 # C C y additional head from merge
3274 3281 # C H n merge with a head
3275 3282 #
3276 3283 # H H n head merge: head count decreases
3277 3284
3278 3285 if not opts.get(b'close_branch'):
3279 3286 for r in parents:
3280 3287 if r.closesbranch() and r.branch() == branch:
3281 3288 repo.ui.status(
3282 3289 _(b'reopening closed branch head %d\n') % r.rev()
3283 3290 )
3284 3291
3285 3292 if repo.ui.debugflag:
3286 3293 repo.ui.write(
3287 3294 _(b'committed changeset %d:%s\n') % (ctx.rev(), ctx.hex())
3288 3295 )
3289 3296 elif repo.ui.verbose:
3290 3297 repo.ui.write(_(b'committed changeset %d:%s\n') % (ctx.rev(), ctx))
3291 3298
3292 3299
3293 3300 def postcommitstatus(repo, pats, opts):
3294 3301 return repo.status(match=scmutil.match(repo[None], pats, opts))
3295 3302
3296 3303
3297 3304 def revert(ui, repo, ctx, parents, *pats, **opts):
3298 3305 opts = pycompat.byteskwargs(opts)
3299 3306 parent, p2 = parents
3300 3307 node = ctx.node()
3301 3308
3302 3309 mf = ctx.manifest()
3303 3310 if node == p2:
3304 3311 parent = p2
3305 3312
3306 3313 # need all matching names in dirstate and manifest of target rev,
3307 3314 # so have to walk both. do not print errors if files exist in one
3308 3315 # but not other. in both cases, filesets should be evaluated against
3309 3316 # workingctx to get consistent result (issue4497). this means 'set:**'
3310 3317 # cannot be used to select missing files from target rev.
3311 3318
3312 3319 # `names` is a mapping for all elements in working copy and target revision
3313 3320 # The mapping is in the form:
3314 3321 # <abs path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
3315 3322 names = {}
3316 3323 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
3317 3324
3318 3325 with repo.wlock():
3319 3326 ## filling of the `names` mapping
3320 3327 # walk dirstate to fill `names`
3321 3328
3322 3329 interactive = opts.get(b'interactive', False)
3323 3330 wctx = repo[None]
3324 3331 m = scmutil.match(wctx, pats, opts)
3325 3332
3326 3333 # we'll need this later
3327 3334 targetsubs = sorted(s for s in wctx.substate if m(s))
3328 3335
3329 3336 if not m.always():
3330 3337 matcher = matchmod.badmatch(m, lambda x, y: False)
3331 3338 for abs in wctx.walk(matcher):
3332 3339 names[abs] = m.exact(abs)
3333 3340
3334 3341 # walk target manifest to fill `names`
3335 3342
3336 3343 def badfn(path, msg):
3337 3344 if path in names:
3338 3345 return
3339 3346 if path in ctx.substate:
3340 3347 return
3341 3348 path_ = path + b'/'
3342 3349 for f in names:
3343 3350 if f.startswith(path_):
3344 3351 return
3345 3352 ui.warn(b"%s: %s\n" % (uipathfn(path), msg))
3346 3353
3347 3354 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
3348 3355 if abs not in names:
3349 3356 names[abs] = m.exact(abs)
3350 3357
3351 3358 # Find status of all file in `names`.
3352 3359 m = scmutil.matchfiles(repo, names)
3353 3360
3354 3361 changes = repo.status(
3355 3362 node1=node, match=m, unknown=True, ignored=True, clean=True
3356 3363 )
3357 3364 else:
3358 3365 changes = repo.status(node1=node, match=m)
3359 3366 for kind in changes:
3360 3367 for abs in kind:
3361 3368 names[abs] = m.exact(abs)
3362 3369
3363 3370 m = scmutil.matchfiles(repo, names)
3364 3371
3365 3372 modified = set(changes.modified)
3366 3373 added = set(changes.added)
3367 3374 removed = set(changes.removed)
3368 3375 _deleted = set(changes.deleted)
3369 3376 unknown = set(changes.unknown)
3370 3377 unknown.update(changes.ignored)
3371 3378 clean = set(changes.clean)
3372 3379 modadded = set()
3373 3380
3374 3381 # We need to account for the state of the file in the dirstate,
3375 3382 # even when we revert against something else than parent. This will
3376 3383 # slightly alter the behavior of revert (doing back up or not, delete
3377 3384 # or just forget etc).
3378 3385 if parent == node:
3379 3386 dsmodified = modified
3380 3387 dsadded = added
3381 3388 dsremoved = removed
3382 3389 # store all local modifications, useful later for rename detection
3383 3390 localchanges = dsmodified | dsadded
3384 3391 modified, added, removed = set(), set(), set()
3385 3392 else:
3386 3393 changes = repo.status(node1=parent, match=m)
3387 3394 dsmodified = set(changes.modified)
3388 3395 dsadded = set(changes.added)
3389 3396 dsremoved = set(changes.removed)
3390 3397 # store all local modifications, useful later for rename detection
3391 3398 localchanges = dsmodified | dsadded
3392 3399
3393 3400 # only take into account for removes between wc and target
3394 3401 clean |= dsremoved - removed
3395 3402 dsremoved &= removed
3396 3403 # distinct between dirstate remove and other
3397 3404 removed -= dsremoved
3398 3405
3399 3406 modadded = added & dsmodified
3400 3407 added -= modadded
3401 3408
3402 3409 # tell newly modified apart.
3403 3410 dsmodified &= modified
3404 3411 dsmodified |= modified & dsadded # dirstate added may need backup
3405 3412 modified -= dsmodified
3406 3413
3407 3414 # We need to wait for some post-processing to update this set
3408 3415 # before making the distinction. The dirstate will be used for
3409 3416 # that purpose.
3410 3417 dsadded = added
3411 3418
3412 3419 # in case of merge, files that are actually added can be reported as
3413 3420 # modified, we need to post process the result
3414 3421 if p2 != nullid:
3415 3422 mergeadd = set(dsmodified)
3416 3423 for path in dsmodified:
3417 3424 if path in mf:
3418 3425 mergeadd.remove(path)
3419 3426 dsadded |= mergeadd
3420 3427 dsmodified -= mergeadd
3421 3428
3422 3429 # if f is a rename, update `names` to also revert the source
3423 3430 for f in localchanges:
3424 3431 src = repo.dirstate.copied(f)
3425 3432 # XXX should we check for rename down to target node?
3426 3433 if src and src not in names and repo.dirstate[src] == b'r':
3427 3434 dsremoved.add(src)
3428 3435 names[src] = True
3429 3436
3430 3437 # determine the exact nature of the deleted changesets
3431 3438 deladded = set(_deleted)
3432 3439 for path in _deleted:
3433 3440 if path in mf:
3434 3441 deladded.remove(path)
3435 3442 deleted = _deleted - deladded
3436 3443
3437 3444 # distinguish between file to forget and the other
3438 3445 added = set()
3439 3446 for abs in dsadded:
3440 3447 if repo.dirstate[abs] != b'a':
3441 3448 added.add(abs)
3442 3449 dsadded -= added
3443 3450
3444 3451 for abs in deladded:
3445 3452 if repo.dirstate[abs] == b'a':
3446 3453 dsadded.add(abs)
3447 3454 deladded -= dsadded
3448 3455
3449 3456 # For files marked as removed, we check if an unknown file is present at
3450 3457 # the same path. If a such file exists it may need to be backed up.
3451 3458 # Making the distinction at this stage helps have simpler backup
3452 3459 # logic.
3453 3460 removunk = set()
3454 3461 for abs in removed:
3455 3462 target = repo.wjoin(abs)
3456 3463 if os.path.lexists(target):
3457 3464 removunk.add(abs)
3458 3465 removed -= removunk
3459 3466
3460 3467 dsremovunk = set()
3461 3468 for abs in dsremoved:
3462 3469 target = repo.wjoin(abs)
3463 3470 if os.path.lexists(target):
3464 3471 dsremovunk.add(abs)
3465 3472 dsremoved -= dsremovunk
3466 3473
3467 3474 # action to be actually performed by revert
3468 3475 # (<list of file>, message>) tuple
3469 3476 actions = {
3470 3477 b'revert': ([], _(b'reverting %s\n')),
3471 3478 b'add': ([], _(b'adding %s\n')),
3472 3479 b'remove': ([], _(b'removing %s\n')),
3473 3480 b'drop': ([], _(b'removing %s\n')),
3474 3481 b'forget': ([], _(b'forgetting %s\n')),
3475 3482 b'undelete': ([], _(b'undeleting %s\n')),
3476 3483 b'noop': (None, _(b'no changes needed to %s\n')),
3477 3484 b'unknown': (None, _(b'file not managed: %s\n')),
3478 3485 }
3479 3486
3480 3487 # "constant" that convey the backup strategy.
3481 3488 # All set to `discard` if `no-backup` is set do avoid checking
3482 3489 # no_backup lower in the code.
3483 3490 # These values are ordered for comparison purposes
3484 3491 backupinteractive = 3 # do backup if interactively modified
3485 3492 backup = 2 # unconditionally do backup
3486 3493 check = 1 # check if the existing file differs from target
3487 3494 discard = 0 # never do backup
3488 3495 if opts.get(b'no_backup'):
3489 3496 backupinteractive = backup = check = discard
3490 3497 if interactive:
3491 3498 dsmodifiedbackup = backupinteractive
3492 3499 else:
3493 3500 dsmodifiedbackup = backup
3494 3501 tobackup = set()
3495 3502
3496 3503 backupanddel = actions[b'remove']
3497 3504 if not opts.get(b'no_backup'):
3498 3505 backupanddel = actions[b'drop']
3499 3506
3500 3507 disptable = (
3501 3508 # dispatch table:
3502 3509 # file state
3503 3510 # action
3504 3511 # make backup
3505 3512 ## Sets that results that will change file on disk
3506 3513 # Modified compared to target, no local change
3507 3514 (modified, actions[b'revert'], discard),
3508 3515 # Modified compared to target, but local file is deleted
3509 3516 (deleted, actions[b'revert'], discard),
3510 3517 # Modified compared to target, local change
3511 3518 (dsmodified, actions[b'revert'], dsmodifiedbackup),
3512 3519 # Added since target
3513 3520 (added, actions[b'remove'], discard),
3514 3521 # Added in working directory
3515 3522 (dsadded, actions[b'forget'], discard),
3516 3523 # Added since target, have local modification
3517 3524 (modadded, backupanddel, backup),
3518 3525 # Added since target but file is missing in working directory
3519 3526 (deladded, actions[b'drop'], discard),
3520 3527 # Removed since target, before working copy parent
3521 3528 (removed, actions[b'add'], discard),
3522 3529 # Same as `removed` but an unknown file exists at the same path
3523 3530 (removunk, actions[b'add'], check),
3524 3531 # Removed since targe, marked as such in working copy parent
3525 3532 (dsremoved, actions[b'undelete'], discard),
3526 3533 # Same as `dsremoved` but an unknown file exists at the same path
3527 3534 (dsremovunk, actions[b'undelete'], check),
3528 3535 ## the following sets does not result in any file changes
3529 3536 # File with no modification
3530 3537 (clean, actions[b'noop'], discard),
3531 3538 # Existing file, not tracked anywhere
3532 3539 (unknown, actions[b'unknown'], discard),
3533 3540 )
3534 3541
3535 3542 for abs, exact in sorted(names.items()):
3536 3543 # target file to be touch on disk (relative to cwd)
3537 3544 target = repo.wjoin(abs)
3538 3545 # search the entry in the dispatch table.
3539 3546 # if the file is in any of these sets, it was touched in the working
3540 3547 # directory parent and we are sure it needs to be reverted.
3541 3548 for table, (xlist, msg), dobackup in disptable:
3542 3549 if abs not in table:
3543 3550 continue
3544 3551 if xlist is not None:
3545 3552 xlist.append(abs)
3546 3553 if dobackup:
3547 3554 # If in interactive mode, don't automatically create
3548 3555 # .orig files (issue4793)
3549 3556 if dobackup == backupinteractive:
3550 3557 tobackup.add(abs)
3551 3558 elif backup <= dobackup or wctx[abs].cmp(ctx[abs]):
3552 3559 absbakname = scmutil.backuppath(ui, repo, abs)
3553 3560 bakname = os.path.relpath(
3554 3561 absbakname, start=repo.root
3555 3562 )
3556 3563 ui.note(
3557 3564 _(b'saving current version of %s as %s\n')
3558 3565 % (uipathfn(abs), uipathfn(bakname))
3559 3566 )
3560 3567 if not opts.get(b'dry_run'):
3561 3568 if interactive:
3562 3569 util.copyfile(target, absbakname)
3563 3570 else:
3564 3571 util.rename(target, absbakname)
3565 3572 if opts.get(b'dry_run'):
3566 3573 if ui.verbose or not exact:
3567 3574 ui.status(msg % uipathfn(abs))
3568 3575 elif exact:
3569 3576 ui.warn(msg % uipathfn(abs))
3570 3577 break
3571 3578
3572 3579 if not opts.get(b'dry_run'):
3573 3580 needdata = (b'revert', b'add', b'undelete')
3574 3581 oplist = [actions[name][0] for name in needdata]
3575 3582 prefetch = scmutil.prefetchfiles
3576 3583 matchfiles = scmutil.matchfiles
3577 3584 prefetch(
3578 3585 repo,
3579 3586 [ctx.rev()],
3580 3587 matchfiles(repo, [f for sublist in oplist for f in sublist]),
3581 3588 )
3582 3589 match = scmutil.match(repo[None], pats)
3583 3590 _performrevert(
3584 3591 repo,
3585 3592 parents,
3586 3593 ctx,
3587 3594 names,
3588 3595 uipathfn,
3589 3596 actions,
3590 3597 match,
3591 3598 interactive,
3592 3599 tobackup,
3593 3600 )
3594 3601
3595 3602 if targetsubs:
3596 3603 # Revert the subrepos on the revert list
3597 3604 for sub in targetsubs:
3598 3605 try:
3599 3606 wctx.sub(sub).revert(
3600 3607 ctx.substate[sub], *pats, **pycompat.strkwargs(opts)
3601 3608 )
3602 3609 except KeyError:
3603 3610 raise error.Abort(
3604 3611 b"subrepository '%s' does not exist in %s!"
3605 3612 % (sub, short(ctx.node()))
3606 3613 )
3607 3614
3608 3615
3609 3616 def _performrevert(
3610 3617 repo,
3611 3618 parents,
3612 3619 ctx,
3613 3620 names,
3614 3621 uipathfn,
3615 3622 actions,
3616 3623 match,
3617 3624 interactive=False,
3618 3625 tobackup=None,
3619 3626 ):
3620 3627 """function that actually perform all the actions computed for revert
3621 3628
3622 3629 This is an independent function to let extension to plug in and react to
3623 3630 the imminent revert.
3624 3631
3625 3632 Make sure you have the working directory locked when calling this function.
3626 3633 """
3627 3634 parent, p2 = parents
3628 3635 node = ctx.node()
3629 3636 excluded_files = []
3630 3637
3631 3638 def checkout(f):
3632 3639 fc = ctx[f]
3633 3640 repo.wwrite(f, fc.data(), fc.flags())
3634 3641
3635 3642 def doremove(f):
3636 3643 try:
3637 3644 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
3638 3645 repo.wvfs.unlinkpath(f, rmdir=rmdir)
3639 3646 except OSError:
3640 3647 pass
3641 3648 repo.dirstate.remove(f)
3642 3649
3643 3650 def prntstatusmsg(action, f):
3644 3651 exact = names[f]
3645 3652 if repo.ui.verbose or not exact:
3646 3653 repo.ui.status(actions[action][1] % uipathfn(f))
3647 3654
3648 3655 audit_path = pathutil.pathauditor(repo.root, cached=True)
3649 3656 for f in actions[b'forget'][0]:
3650 3657 if interactive:
3651 3658 choice = repo.ui.promptchoice(
3652 3659 _(b"forget added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3653 3660 )
3654 3661 if choice == 0:
3655 3662 prntstatusmsg(b'forget', f)
3656 3663 repo.dirstate.drop(f)
3657 3664 else:
3658 3665 excluded_files.append(f)
3659 3666 else:
3660 3667 prntstatusmsg(b'forget', f)
3661 3668 repo.dirstate.drop(f)
3662 3669 for f in actions[b'remove'][0]:
3663 3670 audit_path(f)
3664 3671 if interactive:
3665 3672 choice = repo.ui.promptchoice(
3666 3673 _(b"remove added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3667 3674 )
3668 3675 if choice == 0:
3669 3676 prntstatusmsg(b'remove', f)
3670 3677 doremove(f)
3671 3678 else:
3672 3679 excluded_files.append(f)
3673 3680 else:
3674 3681 prntstatusmsg(b'remove', f)
3675 3682 doremove(f)
3676 3683 for f in actions[b'drop'][0]:
3677 3684 audit_path(f)
3678 3685 prntstatusmsg(b'drop', f)
3679 3686 repo.dirstate.remove(f)
3680 3687
3681 3688 normal = None
3682 3689 if node == parent:
3683 3690 # We're reverting to our parent. If possible, we'd like status
3684 3691 # to report the file as clean. We have to use normallookup for
3685 3692 # merges to avoid losing information about merged/dirty files.
3686 3693 if p2 != nullid:
3687 3694 normal = repo.dirstate.normallookup
3688 3695 else:
3689 3696 normal = repo.dirstate.normal
3690 3697
3691 3698 newlyaddedandmodifiedfiles = set()
3692 3699 if interactive:
3693 3700 # Prompt the user for changes to revert
3694 3701 torevert = [f for f in actions[b'revert'][0] if f not in excluded_files]
3695 3702 m = scmutil.matchfiles(repo, torevert)
3696 3703 diffopts = patch.difffeatureopts(
3697 3704 repo.ui,
3698 3705 whitespace=True,
3699 3706 section=b'commands',
3700 3707 configprefix=b'revert.interactive.',
3701 3708 )
3702 3709 diffopts.nodates = True
3703 3710 diffopts.git = True
3704 3711 operation = b'apply'
3705 3712 if node == parent:
3706 3713 if repo.ui.configbool(
3707 3714 b'experimental', b'revert.interactive.select-to-keep'
3708 3715 ):
3709 3716 operation = b'keep'
3710 3717 else:
3711 3718 operation = b'discard'
3712 3719
3713 3720 if operation == b'apply':
3714 3721 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
3715 3722 else:
3716 3723 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
3717 3724 originalchunks = patch.parsepatch(diff)
3718 3725
3719 3726 try:
3720 3727
3721 3728 chunks, opts = recordfilter(
3722 3729 repo.ui, originalchunks, match, operation=operation
3723 3730 )
3724 3731 if operation == b'discard':
3725 3732 chunks = patch.reversehunks(chunks)
3726 3733
3727 3734 except error.PatchError as err:
3728 3735 raise error.Abort(_(b'error parsing patch: %s') % err)
3729 3736
3730 3737 # FIXME: when doing an interactive revert of a copy, there's no way of
3731 3738 # performing a partial revert of the added file, the only option is
3732 3739 # "remove added file <name> (Yn)?", so we don't need to worry about the
3733 3740 # alsorestore value. Ideally we'd be able to partially revert
3734 3741 # copied/renamed files.
3735 3742 newlyaddedandmodifiedfiles, unusedalsorestore = newandmodified(
3736 3743 chunks, originalchunks
3737 3744 )
3738 3745 if tobackup is None:
3739 3746 tobackup = set()
3740 3747 # Apply changes
3741 3748 fp = stringio()
3742 3749 # chunks are serialized per file, but files aren't sorted
3743 3750 for f in sorted(set(c.header.filename() for c in chunks if ishunk(c))):
3744 3751 prntstatusmsg(b'revert', f)
3745 3752 files = set()
3746 3753 for c in chunks:
3747 3754 if ishunk(c):
3748 3755 abs = c.header.filename()
3749 3756 # Create a backup file only if this hunk should be backed up
3750 3757 if c.header.filename() in tobackup:
3751 3758 target = repo.wjoin(abs)
3752 3759 bakname = scmutil.backuppath(repo.ui, repo, abs)
3753 3760 util.copyfile(target, bakname)
3754 3761 tobackup.remove(abs)
3755 3762 if abs not in files:
3756 3763 files.add(abs)
3757 3764 if operation == b'keep':
3758 3765 checkout(abs)
3759 3766 c.write(fp)
3760 3767 dopatch = fp.tell()
3761 3768 fp.seek(0)
3762 3769 if dopatch:
3763 3770 try:
3764 3771 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
3765 3772 except error.PatchError as err:
3766 3773 raise error.Abort(pycompat.bytestr(err))
3767 3774 del fp
3768 3775 else:
3769 3776 for f in actions[b'revert'][0]:
3770 3777 prntstatusmsg(b'revert', f)
3771 3778 checkout(f)
3772 3779 if normal:
3773 3780 normal(f)
3774 3781
3775 3782 for f in actions[b'add'][0]:
3776 3783 # Don't checkout modified files, they are already created by the diff
3777 3784 if f not in newlyaddedandmodifiedfiles:
3778 3785 prntstatusmsg(b'add', f)
3779 3786 checkout(f)
3780 3787 repo.dirstate.add(f)
3781 3788
3782 3789 normal = repo.dirstate.normallookup
3783 3790 if node == parent and p2 == nullid:
3784 3791 normal = repo.dirstate.normal
3785 3792 for f in actions[b'undelete'][0]:
3786 3793 if interactive:
3787 3794 choice = repo.ui.promptchoice(
3788 3795 _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f
3789 3796 )
3790 3797 if choice == 0:
3791 3798 prntstatusmsg(b'undelete', f)
3792 3799 checkout(f)
3793 3800 normal(f)
3794 3801 else:
3795 3802 excluded_files.append(f)
3796 3803 else:
3797 3804 prntstatusmsg(b'undelete', f)
3798 3805 checkout(f)
3799 3806 normal(f)
3800 3807
3801 3808 copied = copies.pathcopies(repo[parent], ctx)
3802 3809
3803 3810 for f in (
3804 3811 actions[b'add'][0] + actions[b'undelete'][0] + actions[b'revert'][0]
3805 3812 ):
3806 3813 if f in copied:
3807 3814 repo.dirstate.copy(copied[f], f)
3808 3815
3809 3816
3810 3817 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3811 3818 # commands.outgoing. "missing" is "missing" of the result of
3812 3819 # "findcommonoutgoing()"
3813 3820 outgoinghooks = util.hooks()
3814 3821
3815 3822 # a list of (ui, repo) functions called by commands.summary
3816 3823 summaryhooks = util.hooks()
3817 3824
3818 3825 # a list of (ui, repo, opts, changes) functions called by commands.summary.
3819 3826 #
3820 3827 # functions should return tuple of booleans below, if 'changes' is None:
3821 3828 # (whether-incomings-are-needed, whether-outgoings-are-needed)
3822 3829 #
3823 3830 # otherwise, 'changes' is a tuple of tuples below:
3824 3831 # - (sourceurl, sourcebranch, sourcepeer, incoming)
3825 3832 # - (desturl, destbranch, destpeer, outgoing)
3826 3833 summaryremotehooks = util.hooks()
3827 3834
3828 3835
3829 3836 def checkunfinished(repo, commit=False, skipmerge=False):
3830 3837 '''Look for an unfinished multistep operation, like graft, and abort
3831 3838 if found. It's probably good to check this right before
3832 3839 bailifchanged().
3833 3840 '''
3834 3841 # Check for non-clearable states first, so things like rebase will take
3835 3842 # precedence over update.
3836 3843 for state in statemod._unfinishedstates:
3837 3844 if (
3838 3845 state._clearable
3839 3846 or (commit and state._allowcommit)
3840 3847 or state._reportonly
3841 3848 ):
3842 3849 continue
3843 3850 if state.isunfinished(repo):
3844 3851 raise error.Abort(state.msg(), hint=state.hint())
3845 3852
3846 3853 for s in statemod._unfinishedstates:
3847 3854 if (
3848 3855 not s._clearable
3849 3856 or (commit and s._allowcommit)
3850 3857 or (s._opname == b'merge' and skipmerge)
3851 3858 or s._reportonly
3852 3859 ):
3853 3860 continue
3854 3861 if s.isunfinished(repo):
3855 3862 raise error.Abort(s.msg(), hint=s.hint())
3856 3863
3857 3864
3858 3865 def clearunfinished(repo):
3859 3866 '''Check for unfinished operations (as above), and clear the ones
3860 3867 that are clearable.
3861 3868 '''
3862 3869 for state in statemod._unfinishedstates:
3863 3870 if state._reportonly:
3864 3871 continue
3865 3872 if not state._clearable and state.isunfinished(repo):
3866 3873 raise error.Abort(state.msg(), hint=state.hint())
3867 3874
3868 3875 for s in statemod._unfinishedstates:
3869 3876 if s._opname == b'merge' or state._reportonly:
3870 3877 continue
3871 3878 if s._clearable and s.isunfinished(repo):
3872 3879 util.unlink(repo.vfs.join(s._fname))
3873 3880
3874 3881
3875 3882 def getunfinishedstate(repo):
3876 3883 ''' Checks for unfinished operations and returns statecheck object
3877 3884 for it'''
3878 3885 for state in statemod._unfinishedstates:
3879 3886 if state.isunfinished(repo):
3880 3887 return state
3881 3888 return None
3882 3889
3883 3890
3884 3891 def howtocontinue(repo):
3885 3892 '''Check for an unfinished operation and return the command to finish
3886 3893 it.
3887 3894
3888 3895 statemod._unfinishedstates list is checked for an unfinished operation
3889 3896 and the corresponding message to finish it is generated if a method to
3890 3897 continue is supported by the operation.
3891 3898
3892 3899 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3893 3900 a boolean.
3894 3901 '''
3895 3902 contmsg = _(b"continue: %s")
3896 3903 for state in statemod._unfinishedstates:
3897 3904 if not state._continueflag:
3898 3905 continue
3899 3906 if state.isunfinished(repo):
3900 3907 return contmsg % state.continuemsg(), True
3901 3908 if repo[None].dirty(missing=True, merge=False, branch=False):
3902 3909 return contmsg % _(b"hg commit"), False
3903 3910 return None, None
3904 3911
3905 3912
3906 3913 def checkafterresolved(repo):
3907 3914 '''Inform the user about the next action after completing hg resolve
3908 3915
3909 3916 If there's a an unfinished operation that supports continue flag,
3910 3917 howtocontinue will yield repo.ui.warn as the reporter.
3911 3918
3912 3919 Otherwise, it will yield repo.ui.note.
3913 3920 '''
3914 3921 msg, warning = howtocontinue(repo)
3915 3922 if msg is not None:
3916 3923 if warning:
3917 3924 repo.ui.warn(b"%s\n" % msg)
3918 3925 else:
3919 3926 repo.ui.note(b"%s\n" % msg)
3920 3927
3921 3928
3922 3929 def wrongtooltocontinue(repo, task):
3923 3930 '''Raise an abort suggesting how to properly continue if there is an
3924 3931 active task.
3925 3932
3926 3933 Uses howtocontinue() to find the active task.
3927 3934
3928 3935 If there's no task (repo.ui.note for 'hg commit'), it does not offer
3929 3936 a hint.
3930 3937 '''
3931 3938 after = howtocontinue(repo)
3932 3939 hint = None
3933 3940 if after[1]:
3934 3941 hint = after[0]
3935 3942 raise error.Abort(_(b'no %s in progress') % task, hint=hint)
3936 3943
3937 3944
3938 3945 def abortgraft(ui, repo, graftstate):
3939 3946 """abort the interrupted graft and rollbacks to the state before interrupted
3940 3947 graft"""
3941 3948 if not graftstate.exists():
3942 3949 raise error.Abort(_(b"no interrupted graft to abort"))
3943 3950 statedata = readgraftstate(repo, graftstate)
3944 3951 newnodes = statedata.get(b'newnodes')
3945 3952 if newnodes is None:
3946 3953 # and old graft state which does not have all the data required to abort
3947 3954 # the graft
3948 3955 raise error.Abort(_(b"cannot abort using an old graftstate"))
3949 3956
3950 3957 # changeset from which graft operation was started
3951 3958 if len(newnodes) > 0:
3952 3959 startctx = repo[newnodes[0]].p1()
3953 3960 else:
3954 3961 startctx = repo[b'.']
3955 3962 # whether to strip or not
3956 3963 cleanup = False
3957 3964 from . import hg
3958 3965
3959 3966 if newnodes:
3960 3967 newnodes = [repo[r].rev() for r in newnodes]
3961 3968 cleanup = True
3962 3969 # checking that none of the newnodes turned public or is public
3963 3970 immutable = [c for c in newnodes if not repo[c].mutable()]
3964 3971 if immutable:
3965 3972 repo.ui.warn(
3966 3973 _(b"cannot clean up public changesets %s\n")
3967 3974 % b', '.join(bytes(repo[r]) for r in immutable),
3968 3975 hint=_(b"see 'hg help phases' for details"),
3969 3976 )
3970 3977 cleanup = False
3971 3978
3972 3979 # checking that no new nodes are created on top of grafted revs
3973 3980 desc = set(repo.changelog.descendants(newnodes))
3974 3981 if desc - set(newnodes):
3975 3982 repo.ui.warn(
3976 3983 _(
3977 3984 b"new changesets detected on destination "
3978 3985 b"branch, can't strip\n"
3979 3986 )
3980 3987 )
3981 3988 cleanup = False
3982 3989
3983 3990 if cleanup:
3984 3991 with repo.wlock(), repo.lock():
3985 3992 hg.updaterepo(repo, startctx.node(), overwrite=True)
3986 3993 # stripping the new nodes created
3987 3994 strippoints = [
3988 3995 c.node() for c in repo.set(b"roots(%ld)", newnodes)
3989 3996 ]
3990 3997 repair.strip(repo.ui, repo, strippoints, backup=False)
3991 3998
3992 3999 if not cleanup:
3993 4000 # we don't update to the startnode if we can't strip
3994 4001 startctx = repo[b'.']
3995 4002 hg.updaterepo(repo, startctx.node(), overwrite=True)
3996 4003
3997 4004 ui.status(_(b"graft aborted\n"))
3998 4005 ui.status(_(b"working directory is now at %s\n") % startctx.hex()[:12])
3999 4006 graftstate.delete()
4000 4007 return 0
4001 4008
4002 4009
4003 4010 def readgraftstate(repo, graftstate):
4004 4011 # type: (Any, statemod.cmdstate) -> Dict[bytes, Any]
4005 4012 """read the graft state file and return a dict of the data stored in it"""
4006 4013 try:
4007 4014 return graftstate.read()
4008 4015 except error.CorruptedState:
4009 4016 nodes = repo.vfs.read(b'graftstate').splitlines()
4010 4017 return {b'nodes': nodes}
4011 4018
4012 4019
4013 4020 def hgabortgraft(ui, repo):
4014 4021 """ abort logic for aborting graft using 'hg abort'"""
4015 4022 with repo.wlock():
4016 4023 graftstate = statemod.cmdstate(repo, b'graftstate')
4017 4024 return abortgraft(ui, repo, graftstate)
@@ -1,7838 +1,7838 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import difflib
11 11 import errno
12 12 import os
13 13 import re
14 14 import sys
15 15
16 16 from .i18n import _
17 17 from .node import (
18 18 hex,
19 19 nullid,
20 20 nullrev,
21 21 short,
22 22 wdirhex,
23 23 wdirrev,
24 24 )
25 25 from .pycompat import open
26 26 from . import (
27 27 archival,
28 28 bookmarks,
29 29 bundle2,
30 30 changegroup,
31 31 cmdutil,
32 32 copies,
33 33 debugcommands as debugcommandsmod,
34 34 destutil,
35 35 dirstateguard,
36 36 discovery,
37 37 encoding,
38 38 error,
39 39 exchange,
40 40 extensions,
41 41 filemerge,
42 42 formatter,
43 43 graphmod,
44 44 hbisect,
45 45 help,
46 46 hg,
47 47 logcmdutil,
48 48 merge as mergemod,
49 49 narrowspec,
50 50 obsolete,
51 51 obsutil,
52 52 patch,
53 53 phases,
54 54 pycompat,
55 55 rcutil,
56 56 registrar,
57 57 revsetlang,
58 58 rewriteutil,
59 59 scmutil,
60 60 server,
61 61 shelve as shelvemod,
62 62 state as statemod,
63 63 streamclone,
64 64 tags as tagsmod,
65 65 ui as uimod,
66 66 util,
67 67 verify as verifymod,
68 68 wireprotoserver,
69 69 )
70 70 from .utils import (
71 71 dateutil,
72 72 stringutil,
73 73 )
74 74
75 75 table = {}
76 76 table.update(debugcommandsmod.command._table)
77 77
78 78 command = registrar.command(table)
79 79 INTENT_READONLY = registrar.INTENT_READONLY
80 80
81 81 # common command options
82 82
83 83 globalopts = [
84 84 (
85 85 b'R',
86 86 b'repository',
87 87 b'',
88 88 _(b'repository root directory or name of overlay bundle file'),
89 89 _(b'REPO'),
90 90 ),
91 91 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
92 92 (
93 93 b'y',
94 94 b'noninteractive',
95 95 None,
96 96 _(
97 97 b'do not prompt, automatically pick the first choice for all prompts'
98 98 ),
99 99 ),
100 100 (b'q', b'quiet', None, _(b'suppress output')),
101 101 (b'v', b'verbose', None, _(b'enable additional output')),
102 102 (
103 103 b'',
104 104 b'color',
105 105 b'',
106 106 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
107 107 # and should not be translated
108 108 _(b"when to colorize (boolean, always, auto, never, or debug)"),
109 109 _(b'TYPE'),
110 110 ),
111 111 (
112 112 b'',
113 113 b'config',
114 114 [],
115 115 _(b'set/override config option (use \'section.name=value\')'),
116 116 _(b'CONFIG'),
117 117 ),
118 118 (b'', b'debug', None, _(b'enable debugging output')),
119 119 (b'', b'debugger', None, _(b'start debugger')),
120 120 (
121 121 b'',
122 122 b'encoding',
123 123 encoding.encoding,
124 124 _(b'set the charset encoding'),
125 125 _(b'ENCODE'),
126 126 ),
127 127 (
128 128 b'',
129 129 b'encodingmode',
130 130 encoding.encodingmode,
131 131 _(b'set the charset encoding mode'),
132 132 _(b'MODE'),
133 133 ),
134 134 (b'', b'traceback', None, _(b'always print a traceback on exception')),
135 135 (b'', b'time', None, _(b'time how long the command takes')),
136 136 (b'', b'profile', None, _(b'print command execution profile')),
137 137 (b'', b'version', None, _(b'output version information and exit')),
138 138 (b'h', b'help', None, _(b'display help and exit')),
139 139 (b'', b'hidden', False, _(b'consider hidden changesets')),
140 140 (
141 141 b'',
142 142 b'pager',
143 143 b'auto',
144 144 _(b"when to paginate (boolean, always, auto, or never)"),
145 145 _(b'TYPE'),
146 146 ),
147 147 ]
148 148
149 149 dryrunopts = cmdutil.dryrunopts
150 150 remoteopts = cmdutil.remoteopts
151 151 walkopts = cmdutil.walkopts
152 152 commitopts = cmdutil.commitopts
153 153 commitopts2 = cmdutil.commitopts2
154 154 commitopts3 = cmdutil.commitopts3
155 155 formatteropts = cmdutil.formatteropts
156 156 templateopts = cmdutil.templateopts
157 157 logopts = cmdutil.logopts
158 158 diffopts = cmdutil.diffopts
159 159 diffwsopts = cmdutil.diffwsopts
160 160 diffopts2 = cmdutil.diffopts2
161 161 mergetoolopts = cmdutil.mergetoolopts
162 162 similarityopts = cmdutil.similarityopts
163 163 subrepoopts = cmdutil.subrepoopts
164 164 debugrevlogopts = cmdutil.debugrevlogopts
165 165
166 166 # Commands start here, listed alphabetically
167 167
168 168
169 169 @command(
170 170 b'abort',
171 171 dryrunopts,
172 172 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
173 173 helpbasic=True,
174 174 )
175 175 def abort(ui, repo, **opts):
176 176 """abort an unfinished operation (EXPERIMENTAL)
177 177
178 178 Aborts a multistep operation like graft, histedit, rebase, merge,
179 179 and unshelve if they are in an unfinished state.
180 180
181 181 use --dry-run/-n to dry run the command.
182 182 """
183 183 dryrun = opts.get('dry_run')
184 184 abortstate = cmdutil.getunfinishedstate(repo)
185 185 if not abortstate:
186 186 raise error.Abort(_(b'no operation in progress'))
187 187 if not abortstate.abortfunc:
188 188 raise error.Abort(
189 189 (
190 190 _(b"%s in progress but does not support 'hg abort'")
191 191 % (abortstate._opname)
192 192 ),
193 193 hint=abortstate.hint(),
194 194 )
195 195 if dryrun:
196 196 ui.status(
197 197 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
198 198 )
199 199 return
200 200 return abortstate.abortfunc(ui, repo)
201 201
202 202
203 203 @command(
204 204 b'add',
205 205 walkopts + subrepoopts + dryrunopts,
206 206 _(b'[OPTION]... [FILE]...'),
207 207 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
208 208 helpbasic=True,
209 209 inferrepo=True,
210 210 )
211 211 def add(ui, repo, *pats, **opts):
212 212 """add the specified files on the next commit
213 213
214 214 Schedule files to be version controlled and added to the
215 215 repository.
216 216
217 217 The files will be added to the repository at the next commit. To
218 218 undo an add before that, see :hg:`forget`.
219 219
220 220 If no names are given, add all files to the repository (except
221 221 files matching ``.hgignore``).
222 222
223 223 .. container:: verbose
224 224
225 225 Examples:
226 226
227 227 - New (unknown) files are added
228 228 automatically by :hg:`add`::
229 229
230 230 $ ls
231 231 foo.c
232 232 $ hg status
233 233 ? foo.c
234 234 $ hg add
235 235 adding foo.c
236 236 $ hg status
237 237 A foo.c
238 238
239 239 - Specific files to be added can be specified::
240 240
241 241 $ ls
242 242 bar.c foo.c
243 243 $ hg status
244 244 ? bar.c
245 245 ? foo.c
246 246 $ hg add bar.c
247 247 $ hg status
248 248 A bar.c
249 249 ? foo.c
250 250
251 251 Returns 0 if all files are successfully added.
252 252 """
253 253
254 254 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
255 255 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
256 256 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
257 257 return rejected and 1 or 0
258 258
259 259
260 260 @command(
261 261 b'addremove',
262 262 similarityopts + subrepoopts + walkopts + dryrunopts,
263 263 _(b'[OPTION]... [FILE]...'),
264 264 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
265 265 inferrepo=True,
266 266 )
267 267 def addremove(ui, repo, *pats, **opts):
268 268 """add all new files, delete all missing files
269 269
270 270 Add all new files and remove all missing files from the
271 271 repository.
272 272
273 273 Unless names are given, new files are ignored if they match any of
274 274 the patterns in ``.hgignore``. As with add, these changes take
275 275 effect at the next commit.
276 276
277 277 Use the -s/--similarity option to detect renamed files. This
278 278 option takes a percentage between 0 (disabled) and 100 (files must
279 279 be identical) as its parameter. With a parameter greater than 0,
280 280 this compares every removed file with every added file and records
281 281 those similar enough as renames. Detecting renamed files this way
282 282 can be expensive. After using this option, :hg:`status -C` can be
283 283 used to check which files were identified as moved or renamed. If
284 284 not specified, -s/--similarity defaults to 100 and only renames of
285 285 identical files are detected.
286 286
287 287 .. container:: verbose
288 288
289 289 Examples:
290 290
291 291 - A number of files (bar.c and foo.c) are new,
292 292 while foobar.c has been removed (without using :hg:`remove`)
293 293 from the repository::
294 294
295 295 $ ls
296 296 bar.c foo.c
297 297 $ hg status
298 298 ! foobar.c
299 299 ? bar.c
300 300 ? foo.c
301 301 $ hg addremove
302 302 adding bar.c
303 303 adding foo.c
304 304 removing foobar.c
305 305 $ hg status
306 306 A bar.c
307 307 A foo.c
308 308 R foobar.c
309 309
310 310 - A file foobar.c was moved to foo.c without using :hg:`rename`.
311 311 Afterwards, it was edited slightly::
312 312
313 313 $ ls
314 314 foo.c
315 315 $ hg status
316 316 ! foobar.c
317 317 ? foo.c
318 318 $ hg addremove --similarity 90
319 319 removing foobar.c
320 320 adding foo.c
321 321 recording removal of foobar.c as rename to foo.c (94% similar)
322 322 $ hg status -C
323 323 A foo.c
324 324 foobar.c
325 325 R foobar.c
326 326
327 327 Returns 0 if all files are successfully added.
328 328 """
329 329 opts = pycompat.byteskwargs(opts)
330 330 if not opts.get(b'similarity'):
331 331 opts[b'similarity'] = b'100'
332 332 matcher = scmutil.match(repo[None], pats, opts)
333 333 relative = scmutil.anypats(pats, opts)
334 334 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
335 335 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
336 336
337 337
338 338 @command(
339 339 b'annotate|blame',
340 340 [
341 341 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
342 342 (
343 343 b'',
344 344 b'follow',
345 345 None,
346 346 _(b'follow copies/renames and list the filename (DEPRECATED)'),
347 347 ),
348 348 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
349 349 (b'a', b'text', None, _(b'treat all files as text')),
350 350 (b'u', b'user', None, _(b'list the author (long with -v)')),
351 351 (b'f', b'file', None, _(b'list the filename')),
352 352 (b'd', b'date', None, _(b'list the date (short with -q)')),
353 353 (b'n', b'number', None, _(b'list the revision number (default)')),
354 354 (b'c', b'changeset', None, _(b'list the changeset')),
355 355 (
356 356 b'l',
357 357 b'line-number',
358 358 None,
359 359 _(b'show line number at the first appearance'),
360 360 ),
361 361 (
362 362 b'',
363 363 b'skip',
364 364 [],
365 365 _(b'revset to not display (EXPERIMENTAL)'),
366 366 _(b'REV'),
367 367 ),
368 368 ]
369 369 + diffwsopts
370 370 + walkopts
371 371 + formatteropts,
372 372 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
373 373 helpcategory=command.CATEGORY_FILE_CONTENTS,
374 374 helpbasic=True,
375 375 inferrepo=True,
376 376 )
377 377 def annotate(ui, repo, *pats, **opts):
378 378 """show changeset information by line for each file
379 379
380 380 List changes in files, showing the revision id responsible for
381 381 each line.
382 382
383 383 This command is useful for discovering when a change was made and
384 384 by whom.
385 385
386 386 If you include --file, --user, or --date, the revision number is
387 387 suppressed unless you also include --number.
388 388
389 389 Without the -a/--text option, annotate will avoid processing files
390 390 it detects as binary. With -a, annotate will annotate the file
391 391 anyway, although the results will probably be neither useful
392 392 nor desirable.
393 393
394 394 .. container:: verbose
395 395
396 396 Template:
397 397
398 398 The following keywords are supported in addition to the common template
399 399 keywords and functions. See also :hg:`help templates`.
400 400
401 401 :lines: List of lines with annotation data.
402 402 :path: String. Repository-absolute path of the specified file.
403 403
404 404 And each entry of ``{lines}`` provides the following sub-keywords in
405 405 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
406 406
407 407 :line: String. Line content.
408 408 :lineno: Integer. Line number at that revision.
409 409 :path: String. Repository-absolute path of the file at that revision.
410 410
411 411 See :hg:`help templates.operators` for the list expansion syntax.
412 412
413 413 Returns 0 on success.
414 414 """
415 415 opts = pycompat.byteskwargs(opts)
416 416 if not pats:
417 417 raise error.Abort(_(b'at least one filename or pattern is required'))
418 418
419 419 if opts.get(b'follow'):
420 420 # --follow is deprecated and now just an alias for -f/--file
421 421 # to mimic the behavior of Mercurial before version 1.5
422 422 opts[b'file'] = True
423 423
424 424 if (
425 425 not opts.get(b'user')
426 426 and not opts.get(b'changeset')
427 427 and not opts.get(b'date')
428 428 and not opts.get(b'file')
429 429 ):
430 430 opts[b'number'] = True
431 431
432 432 linenumber = opts.get(b'line_number') is not None
433 433 if (
434 434 linenumber
435 435 and (not opts.get(b'changeset'))
436 436 and (not opts.get(b'number'))
437 437 ):
438 438 raise error.Abort(_(b'at least one of -n/-c is required for -l'))
439 439
440 440 rev = opts.get(b'rev')
441 441 if rev:
442 442 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
443 443 ctx = scmutil.revsingle(repo, rev)
444 444
445 445 ui.pager(b'annotate')
446 446 rootfm = ui.formatter(b'annotate', opts)
447 447 if ui.debugflag:
448 448 shorthex = pycompat.identity
449 449 else:
450 450
451 451 def shorthex(h):
452 452 return h[:12]
453 453
454 454 if ui.quiet:
455 455 datefunc = dateutil.shortdate
456 456 else:
457 457 datefunc = dateutil.datestr
458 458 if ctx.rev() is None:
459 459 if opts.get(b'changeset'):
460 460 # omit "+" suffix which is appended to node hex
461 461 def formatrev(rev):
462 462 if rev == wdirrev:
463 463 return b'%d' % ctx.p1().rev()
464 464 else:
465 465 return b'%d' % rev
466 466
467 467 else:
468 468
469 469 def formatrev(rev):
470 470 if rev == wdirrev:
471 471 return b'%d+' % ctx.p1().rev()
472 472 else:
473 473 return b'%d ' % rev
474 474
475 475 def formathex(h):
476 476 if h == wdirhex:
477 477 return b'%s+' % shorthex(hex(ctx.p1().node()))
478 478 else:
479 479 return b'%s ' % shorthex(h)
480 480
481 481 else:
482 482 formatrev = b'%d'.__mod__
483 483 formathex = shorthex
484 484
485 485 opmap = [
486 486 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
487 487 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
488 488 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
489 489 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
490 490 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
491 491 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
492 492 ]
493 493 opnamemap = {
494 494 b'rev': b'number',
495 495 b'node': b'changeset',
496 496 b'path': b'file',
497 497 b'lineno': b'line_number',
498 498 }
499 499
500 500 if rootfm.isplain():
501 501
502 502 def makefunc(get, fmt):
503 503 return lambda x: fmt(get(x))
504 504
505 505 else:
506 506
507 507 def makefunc(get, fmt):
508 508 return get
509 509
510 510 datahint = rootfm.datahint()
511 511 funcmap = [
512 512 (makefunc(get, fmt), sep)
513 513 for fn, sep, get, fmt in opmap
514 514 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
515 515 ]
516 516 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
517 517 fields = b' '.join(
518 518 fn
519 519 for fn, sep, get, fmt in opmap
520 520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 521 )
522 522
523 523 def bad(x, y):
524 524 raise error.Abort(b"%s: %s" % (x, y))
525 525
526 526 m = scmutil.match(ctx, pats, opts, badfn=bad)
527 527
528 528 follow = not opts.get(b'no_follow')
529 529 diffopts = patch.difffeatureopts(
530 530 ui, opts, section=b'annotate', whitespace=True
531 531 )
532 532 skiprevs = opts.get(b'skip')
533 533 if skiprevs:
534 534 skiprevs = scmutil.revrange(repo, skiprevs)
535 535
536 536 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
537 537 for abs in ctx.walk(m):
538 538 fctx = ctx[abs]
539 539 rootfm.startitem()
540 540 rootfm.data(path=abs)
541 541 if not opts.get(b'text') and fctx.isbinary():
542 542 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
543 543 continue
544 544
545 545 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
546 546 lines = fctx.annotate(
547 547 follow=follow, skiprevs=skiprevs, diffopts=diffopts
548 548 )
549 549 if not lines:
550 550 fm.end()
551 551 continue
552 552 formats = []
553 553 pieces = []
554 554
555 555 for f, sep in funcmap:
556 556 l = [f(n) for n in lines]
557 557 if fm.isplain():
558 558 sizes = [encoding.colwidth(x) for x in l]
559 559 ml = max(sizes)
560 560 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
561 561 else:
562 562 formats.append([b'%s' for x in l])
563 563 pieces.append(l)
564 564
565 565 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
566 566 fm.startitem()
567 567 fm.context(fctx=n.fctx)
568 568 fm.write(fields, b"".join(f), *p)
569 569 if n.skip:
570 570 fmt = b"* %s"
571 571 else:
572 572 fmt = b": %s"
573 573 fm.write(b'line', fmt, n.text)
574 574
575 575 if not lines[-1].text.endswith(b'\n'):
576 576 fm.plain(b'\n')
577 577 fm.end()
578 578
579 579 rootfm.end()
580 580
581 581
582 582 @command(
583 583 b'archive',
584 584 [
585 585 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
586 586 (
587 587 b'p',
588 588 b'prefix',
589 589 b'',
590 590 _(b'directory prefix for files in archive'),
591 591 _(b'PREFIX'),
592 592 ),
593 593 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
594 594 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
595 595 ]
596 596 + subrepoopts
597 597 + walkopts,
598 598 _(b'[OPTION]... DEST'),
599 599 helpcategory=command.CATEGORY_IMPORT_EXPORT,
600 600 )
601 601 def archive(ui, repo, dest, **opts):
602 602 '''create an unversioned archive of a repository revision
603 603
604 604 By default, the revision used is the parent of the working
605 605 directory; use -r/--rev to specify a different revision.
606 606
607 607 The archive type is automatically detected based on file
608 608 extension (to override, use -t/--type).
609 609
610 610 .. container:: verbose
611 611
612 612 Examples:
613 613
614 614 - create a zip file containing the 1.0 release::
615 615
616 616 hg archive -r 1.0 project-1.0.zip
617 617
618 618 - create a tarball excluding .hg files::
619 619
620 620 hg archive project.tar.gz -X ".hg*"
621 621
622 622 Valid types are:
623 623
624 624 :``files``: a directory full of files (default)
625 625 :``tar``: tar archive, uncompressed
626 626 :``tbz2``: tar archive, compressed using bzip2
627 627 :``tgz``: tar archive, compressed using gzip
628 628 :``txz``: tar archive, compressed using lzma (only in Python 3)
629 629 :``uzip``: zip archive, uncompressed
630 630 :``zip``: zip archive, compressed using deflate
631 631
632 632 The exact name of the destination archive or directory is given
633 633 using a format string; see :hg:`help export` for details.
634 634
635 635 Each member added to an archive file has a directory prefix
636 636 prepended. Use -p/--prefix to specify a format string for the
637 637 prefix. The default is the basename of the archive, with suffixes
638 638 removed.
639 639
640 640 Returns 0 on success.
641 641 '''
642 642
643 643 opts = pycompat.byteskwargs(opts)
644 644 rev = opts.get(b'rev')
645 645 if rev:
646 646 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
647 647 ctx = scmutil.revsingle(repo, rev)
648 648 if not ctx:
649 649 raise error.Abort(_(b'no working directory: please specify a revision'))
650 650 node = ctx.node()
651 651 dest = cmdutil.makefilename(ctx, dest)
652 652 if os.path.realpath(dest) == repo.root:
653 653 raise error.Abort(_(b'repository root cannot be destination'))
654 654
655 655 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
656 656 prefix = opts.get(b'prefix')
657 657
658 658 if dest == b'-':
659 659 if kind == b'files':
660 660 raise error.Abort(_(b'cannot archive plain files to stdout'))
661 661 dest = cmdutil.makefileobj(ctx, dest)
662 662 if not prefix:
663 663 prefix = os.path.basename(repo.root) + b'-%h'
664 664
665 665 prefix = cmdutil.makefilename(ctx, prefix)
666 666 match = scmutil.match(ctx, [], opts)
667 667 archival.archive(
668 668 repo,
669 669 dest,
670 670 node,
671 671 kind,
672 672 not opts.get(b'no_decode'),
673 673 match,
674 674 prefix,
675 675 subrepos=opts.get(b'subrepos'),
676 676 )
677 677
678 678
679 679 @command(
680 680 b'backout',
681 681 [
682 682 (
683 683 b'',
684 684 b'merge',
685 685 None,
686 686 _(b'merge with old dirstate parent after backout'),
687 687 ),
688 688 (
689 689 b'',
690 690 b'commit',
691 691 None,
692 692 _(b'commit if no conflicts were encountered (DEPRECATED)'),
693 693 ),
694 694 (b'', b'no-commit', None, _(b'do not commit')),
695 695 (
696 696 b'',
697 697 b'parent',
698 698 b'',
699 699 _(b'parent to choose when backing out merge (DEPRECATED)'),
700 700 _(b'REV'),
701 701 ),
702 702 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
703 703 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
704 704 ]
705 705 + mergetoolopts
706 706 + walkopts
707 707 + commitopts
708 708 + commitopts2,
709 709 _(b'[OPTION]... [-r] REV'),
710 710 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
711 711 )
712 712 def backout(ui, repo, node=None, rev=None, **opts):
713 713 '''reverse effect of earlier changeset
714 714
715 715 Prepare a new changeset with the effect of REV undone in the
716 716 current working directory. If no conflicts were encountered,
717 717 it will be committed immediately.
718 718
719 719 If REV is the parent of the working directory, then this new changeset
720 720 is committed automatically (unless --no-commit is specified).
721 721
722 722 .. note::
723 723
724 724 :hg:`backout` cannot be used to fix either an unwanted or
725 725 incorrect merge.
726 726
727 727 .. container:: verbose
728 728
729 729 Examples:
730 730
731 731 - Reverse the effect of the parent of the working directory.
732 732 This backout will be committed immediately::
733 733
734 734 hg backout -r .
735 735
736 736 - Reverse the effect of previous bad revision 23::
737 737
738 738 hg backout -r 23
739 739
740 740 - Reverse the effect of previous bad revision 23 and
741 741 leave changes uncommitted::
742 742
743 743 hg backout -r 23 --no-commit
744 744 hg commit -m "Backout revision 23"
745 745
746 746 By default, the pending changeset will have one parent,
747 747 maintaining a linear history. With --merge, the pending
748 748 changeset will instead have two parents: the old parent of the
749 749 working directory and a new child of REV that simply undoes REV.
750 750
751 751 Before version 1.7, the behavior without --merge was equivalent
752 752 to specifying --merge followed by :hg:`update --clean .` to
753 753 cancel the merge and leave the child of REV as a head to be
754 754 merged separately.
755 755
756 756 See :hg:`help dates` for a list of formats valid for -d/--date.
757 757
758 758 See :hg:`help revert` for a way to restore files to the state
759 759 of another revision.
760 760
761 761 Returns 0 on success, 1 if nothing to backout or there are unresolved
762 762 files.
763 763 '''
764 764 with repo.wlock(), repo.lock():
765 765 return _dobackout(ui, repo, node, rev, **opts)
766 766
767 767
768 768 def _dobackout(ui, repo, node=None, rev=None, **opts):
769 769 opts = pycompat.byteskwargs(opts)
770 770 if opts.get(b'commit') and opts.get(b'no_commit'):
771 771 raise error.Abort(_(b"cannot use --commit with --no-commit"))
772 772 if opts.get(b'merge') and opts.get(b'no_commit'):
773 773 raise error.Abort(_(b"cannot use --merge with --no-commit"))
774 774
775 775 if rev and node:
776 776 raise error.Abort(_(b"please specify just one revision"))
777 777
778 778 if not rev:
779 779 rev = node
780 780
781 781 if not rev:
782 782 raise error.Abort(_(b"please specify a revision to backout"))
783 783
784 784 date = opts.get(b'date')
785 785 if date:
786 786 opts[b'date'] = dateutil.parsedate(date)
787 787
788 788 cmdutil.checkunfinished(repo)
789 789 cmdutil.bailifchanged(repo)
790 790 node = scmutil.revsingle(repo, rev).node()
791 791
792 792 op1, op2 = repo.dirstate.parents()
793 793 if not repo.changelog.isancestor(node, op1):
794 794 raise error.Abort(_(b'cannot backout change that is not an ancestor'))
795 795
796 796 p1, p2 = repo.changelog.parents(node)
797 797 if p1 == nullid:
798 798 raise error.Abort(_(b'cannot backout a change with no parents'))
799 799 if p2 != nullid:
800 800 if not opts.get(b'parent'):
801 801 raise error.Abort(_(b'cannot backout a merge changeset'))
802 802 p = repo.lookup(opts[b'parent'])
803 803 if p not in (p1, p2):
804 804 raise error.Abort(
805 805 _(b'%s is not a parent of %s') % (short(p), short(node))
806 806 )
807 807 parent = p
808 808 else:
809 809 if opts.get(b'parent'):
810 810 raise error.Abort(_(b'cannot use --parent on non-merge changeset'))
811 811 parent = p1
812 812
813 813 # the backout should appear on the same branch
814 814 branch = repo.dirstate.branch()
815 815 bheads = repo.branchheads(branch)
816 816 rctx = scmutil.revsingle(repo, hex(parent))
817 817 if not opts.get(b'merge') and op1 != node:
818 818 with dirstateguard.dirstateguard(repo, b'backout'):
819 819 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
820 820 with ui.configoverride(overrides, b'backout'):
821 821 stats = mergemod.update(
822 822 repo,
823 823 parent,
824 824 branchmerge=True,
825 825 force=True,
826 826 ancestor=node,
827 827 mergeancestor=False,
828 828 )
829 829 repo.setparents(op1, op2)
830 830 hg._showstats(repo, stats)
831 831 if stats.unresolvedcount:
832 832 repo.ui.status(
833 833 _(b"use 'hg resolve' to retry unresolved file merges\n")
834 834 )
835 835 return 1
836 836 else:
837 837 hg.clean(repo, node, show_stats=False)
838 838 repo.dirstate.setbranch(branch)
839 839 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
840 840
841 841 if opts.get(b'no_commit'):
842 842 msg = _(b"changeset %s backed out, don't forget to commit.\n")
843 843 ui.status(msg % short(node))
844 844 return 0
845 845
846 846 def commitfunc(ui, repo, message, match, opts):
847 847 editform = b'backout'
848 848 e = cmdutil.getcommiteditor(
849 849 editform=editform, **pycompat.strkwargs(opts)
850 850 )
851 851 if not message:
852 852 # we don't translate commit messages
853 853 message = b"Backed out changeset %s" % short(node)
854 854 e = cmdutil.getcommiteditor(edit=True, editform=editform)
855 855 return repo.commit(
856 856 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
857 857 )
858 858
859 859 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
860 860 if not newnode:
861 861 ui.status(_(b"nothing changed\n"))
862 862 return 1
863 863 cmdutil.commitstatus(repo, newnode, branch, bheads)
864 864
865 865 def nice(node):
866 866 return b'%d:%s' % (repo.changelog.rev(node), short(node))
867 867
868 868 ui.status(
869 869 _(b'changeset %s backs out changeset %s\n')
870 870 % (nice(repo.changelog.tip()), nice(node))
871 871 )
872 872 if opts.get(b'merge') and op1 != node:
873 873 hg.clean(repo, op1, show_stats=False)
874 874 ui.status(
875 875 _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
876 876 )
877 877 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
878 878 with ui.configoverride(overrides, b'backout'):
879 879 return hg.merge(repo, hex(repo.changelog.tip()))
880 880 return 0
881 881
882 882
883 883 @command(
884 884 b'bisect',
885 885 [
886 886 (b'r', b'reset', False, _(b'reset bisect state')),
887 887 (b'g', b'good', False, _(b'mark changeset good')),
888 888 (b'b', b'bad', False, _(b'mark changeset bad')),
889 889 (b's', b'skip', False, _(b'skip testing changeset')),
890 890 (b'e', b'extend', False, _(b'extend the bisect range')),
891 891 (
892 892 b'c',
893 893 b'command',
894 894 b'',
895 895 _(b'use command to check changeset state'),
896 896 _(b'CMD'),
897 897 ),
898 898 (b'U', b'noupdate', False, _(b'do not update to target')),
899 899 ],
900 900 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
901 901 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
902 902 )
903 903 def bisect(
904 904 ui,
905 905 repo,
906 906 rev=None,
907 907 extra=None,
908 908 command=None,
909 909 reset=None,
910 910 good=None,
911 911 bad=None,
912 912 skip=None,
913 913 extend=None,
914 914 noupdate=None,
915 915 ):
916 916 """subdivision search of changesets
917 917
918 918 This command helps to find changesets which introduce problems. To
919 919 use, mark the earliest changeset you know exhibits the problem as
920 920 bad, then mark the latest changeset which is free from the problem
921 921 as good. Bisect will update your working directory to a revision
922 922 for testing (unless the -U/--noupdate option is specified). Once
923 923 you have performed tests, mark the working directory as good or
924 924 bad, and bisect will either update to another candidate changeset
925 925 or announce that it has found the bad revision.
926 926
927 927 As a shortcut, you can also use the revision argument to mark a
928 928 revision as good or bad without checking it out first.
929 929
930 930 If you supply a command, it will be used for automatic bisection.
931 931 The environment variable HG_NODE will contain the ID of the
932 932 changeset being tested. The exit status of the command will be
933 933 used to mark revisions as good or bad: status 0 means good, 125
934 934 means to skip the revision, 127 (command not found) will abort the
935 935 bisection, and any other non-zero exit status means the revision
936 936 is bad.
937 937
938 938 .. container:: verbose
939 939
940 940 Some examples:
941 941
942 942 - start a bisection with known bad revision 34, and good revision 12::
943 943
944 944 hg bisect --bad 34
945 945 hg bisect --good 12
946 946
947 947 - advance the current bisection by marking current revision as good or
948 948 bad::
949 949
950 950 hg bisect --good
951 951 hg bisect --bad
952 952
953 953 - mark the current revision, or a known revision, to be skipped (e.g. if
954 954 that revision is not usable because of another issue)::
955 955
956 956 hg bisect --skip
957 957 hg bisect --skip 23
958 958
959 959 - skip all revisions that do not touch directories ``foo`` or ``bar``::
960 960
961 961 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
962 962
963 963 - forget the current bisection::
964 964
965 965 hg bisect --reset
966 966
967 967 - use 'make && make tests' to automatically find the first broken
968 968 revision::
969 969
970 970 hg bisect --reset
971 971 hg bisect --bad 34
972 972 hg bisect --good 12
973 973 hg bisect --command "make && make tests"
974 974
975 975 - see all changesets whose states are already known in the current
976 976 bisection::
977 977
978 978 hg log -r "bisect(pruned)"
979 979
980 980 - see the changeset currently being bisected (especially useful
981 981 if running with -U/--noupdate)::
982 982
983 983 hg log -r "bisect(current)"
984 984
985 985 - see all changesets that took part in the current bisection::
986 986
987 987 hg log -r "bisect(range)"
988 988
989 989 - you can even get a nice graph::
990 990
991 991 hg log --graph -r "bisect(range)"
992 992
993 993 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
994 994
995 995 Returns 0 on success.
996 996 """
997 997 # backward compatibility
998 998 if rev in b"good bad reset init".split():
999 999 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1000 1000 cmd, rev, extra = rev, extra, None
1001 1001 if cmd == b"good":
1002 1002 good = True
1003 1003 elif cmd == b"bad":
1004 1004 bad = True
1005 1005 else:
1006 1006 reset = True
1007 1007 elif extra:
1008 1008 raise error.Abort(_(b'incompatible arguments'))
1009 1009
1010 1010 incompatibles = {
1011 1011 b'--bad': bad,
1012 1012 b'--command': bool(command),
1013 1013 b'--extend': extend,
1014 1014 b'--good': good,
1015 1015 b'--reset': reset,
1016 1016 b'--skip': skip,
1017 1017 }
1018 1018
1019 1019 enabled = [x for x in incompatibles if incompatibles[x]]
1020 1020
1021 1021 if len(enabled) > 1:
1022 1022 raise error.Abort(
1023 1023 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1024 1024 )
1025 1025
1026 1026 if reset:
1027 1027 hbisect.resetstate(repo)
1028 1028 return
1029 1029
1030 1030 state = hbisect.load_state(repo)
1031 1031
1032 1032 # update state
1033 1033 if good or bad or skip:
1034 1034 if rev:
1035 1035 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
1036 1036 else:
1037 1037 nodes = [repo.lookup(b'.')]
1038 1038 if good:
1039 1039 state[b'good'] += nodes
1040 1040 elif bad:
1041 1041 state[b'bad'] += nodes
1042 1042 elif skip:
1043 1043 state[b'skip'] += nodes
1044 1044 hbisect.save_state(repo, state)
1045 1045 if not (state[b'good'] and state[b'bad']):
1046 1046 return
1047 1047
1048 1048 def mayupdate(repo, node, show_stats=True):
1049 1049 """common used update sequence"""
1050 1050 if noupdate:
1051 1051 return
1052 1052 cmdutil.checkunfinished(repo)
1053 1053 cmdutil.bailifchanged(repo)
1054 1054 return hg.clean(repo, node, show_stats=show_stats)
1055 1055
1056 1056 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1057 1057
1058 1058 if command:
1059 1059 changesets = 1
1060 1060 if noupdate:
1061 1061 try:
1062 1062 node = state[b'current'][0]
1063 1063 except LookupError:
1064 1064 raise error.Abort(
1065 1065 _(
1066 1066 b'current bisect revision is unknown - '
1067 1067 b'start a new bisect to fix'
1068 1068 )
1069 1069 )
1070 1070 else:
1071 1071 node, p2 = repo.dirstate.parents()
1072 1072 if p2 != nullid:
1073 1073 raise error.Abort(_(b'current bisect revision is a merge'))
1074 1074 if rev:
1075 1075 node = repo[scmutil.revsingle(repo, rev, node)].node()
1076 1076 with hbisect.restore_state(repo, state, node):
1077 1077 while changesets:
1078 1078 # update state
1079 1079 state[b'current'] = [node]
1080 1080 hbisect.save_state(repo, state)
1081 1081 status = ui.system(
1082 1082 command,
1083 1083 environ={b'HG_NODE': hex(node)},
1084 1084 blockedtag=b'bisect_check',
1085 1085 )
1086 1086 if status == 125:
1087 1087 transition = b"skip"
1088 1088 elif status == 0:
1089 1089 transition = b"good"
1090 1090 # status < 0 means process was killed
1091 1091 elif status == 127:
1092 1092 raise error.Abort(_(b"failed to execute %s") % command)
1093 1093 elif status < 0:
1094 1094 raise error.Abort(_(b"%s killed") % command)
1095 1095 else:
1096 1096 transition = b"bad"
1097 1097 state[transition].append(node)
1098 1098 ctx = repo[node]
1099 1099 ui.status(
1100 1100 _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
1101 1101 )
1102 1102 hbisect.checkstate(state)
1103 1103 # bisect
1104 1104 nodes, changesets, bgood = hbisect.bisect(repo, state)
1105 1105 # update to next check
1106 1106 node = nodes[0]
1107 1107 mayupdate(repo, node, show_stats=False)
1108 1108 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1109 1109 return
1110 1110
1111 1111 hbisect.checkstate(state)
1112 1112
1113 1113 # actually bisect
1114 1114 nodes, changesets, good = hbisect.bisect(repo, state)
1115 1115 if extend:
1116 1116 if not changesets:
1117 1117 extendnode = hbisect.extendrange(repo, state, nodes, good)
1118 1118 if extendnode is not None:
1119 1119 ui.write(
1120 1120 _(b"Extending search to changeset %d:%s\n")
1121 1121 % (extendnode.rev(), extendnode)
1122 1122 )
1123 1123 state[b'current'] = [extendnode.node()]
1124 1124 hbisect.save_state(repo, state)
1125 1125 return mayupdate(repo, extendnode.node())
1126 1126 raise error.Abort(_(b"nothing to extend"))
1127 1127
1128 1128 if changesets == 0:
1129 1129 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1130 1130 else:
1131 1131 assert len(nodes) == 1 # only a single node can be tested next
1132 1132 node = nodes[0]
1133 1133 # compute the approximate number of remaining tests
1134 1134 tests, size = 0, 2
1135 1135 while size <= changesets:
1136 1136 tests, size = tests + 1, size * 2
1137 1137 rev = repo.changelog.rev(node)
1138 1138 ui.write(
1139 1139 _(
1140 1140 b"Testing changeset %d:%s "
1141 1141 b"(%d changesets remaining, ~%d tests)\n"
1142 1142 )
1143 1143 % (rev, short(node), changesets, tests)
1144 1144 )
1145 1145 state[b'current'] = [node]
1146 1146 hbisect.save_state(repo, state)
1147 1147 return mayupdate(repo, node)
1148 1148
1149 1149
1150 1150 @command(
1151 1151 b'bookmarks|bookmark',
1152 1152 [
1153 1153 (b'f', b'force', False, _(b'force')),
1154 1154 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1155 1155 (b'd', b'delete', False, _(b'delete a given bookmark')),
1156 1156 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1157 1157 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1158 1158 (b'l', b'list', False, _(b'list existing bookmarks')),
1159 1159 ]
1160 1160 + formatteropts,
1161 1161 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1162 1162 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1163 1163 )
1164 1164 def bookmark(ui, repo, *names, **opts):
1165 1165 '''create a new bookmark or list existing bookmarks
1166 1166
1167 1167 Bookmarks are labels on changesets to help track lines of development.
1168 1168 Bookmarks are unversioned and can be moved, renamed and deleted.
1169 1169 Deleting or moving a bookmark has no effect on the associated changesets.
1170 1170
1171 1171 Creating or updating to a bookmark causes it to be marked as 'active'.
1172 1172 The active bookmark is indicated with a '*'.
1173 1173 When a commit is made, the active bookmark will advance to the new commit.
1174 1174 A plain :hg:`update` will also advance an active bookmark, if possible.
1175 1175 Updating away from a bookmark will cause it to be deactivated.
1176 1176
1177 1177 Bookmarks can be pushed and pulled between repositories (see
1178 1178 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1179 1179 diverged, a new 'divergent bookmark' of the form 'name@path' will
1180 1180 be created. Using :hg:`merge` will resolve the divergence.
1181 1181
1182 1182 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1183 1183 the active bookmark's name.
1184 1184
1185 1185 A bookmark named '@' has the special property that :hg:`clone` will
1186 1186 check it out by default if it exists.
1187 1187
1188 1188 .. container:: verbose
1189 1189
1190 1190 Template:
1191 1191
1192 1192 The following keywords are supported in addition to the common template
1193 1193 keywords and functions such as ``{bookmark}``. See also
1194 1194 :hg:`help templates`.
1195 1195
1196 1196 :active: Boolean. True if the bookmark is active.
1197 1197
1198 1198 Examples:
1199 1199
1200 1200 - create an active bookmark for a new line of development::
1201 1201
1202 1202 hg book new-feature
1203 1203
1204 1204 - create an inactive bookmark as a place marker::
1205 1205
1206 1206 hg book -i reviewed
1207 1207
1208 1208 - create an inactive bookmark on another changeset::
1209 1209
1210 1210 hg book -r .^ tested
1211 1211
1212 1212 - rename bookmark turkey to dinner::
1213 1213
1214 1214 hg book -m turkey dinner
1215 1215
1216 1216 - move the '@' bookmark from another branch::
1217 1217
1218 1218 hg book -f @
1219 1219
1220 1220 - print only the active bookmark name::
1221 1221
1222 1222 hg book -ql .
1223 1223 '''
1224 1224 opts = pycompat.byteskwargs(opts)
1225 1225 force = opts.get(b'force')
1226 1226 rev = opts.get(b'rev')
1227 1227 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1228 1228
1229 1229 selactions = [k for k in [b'delete', b'rename', b'list'] if opts.get(k)]
1230 1230 if len(selactions) > 1:
1231 1231 raise error.Abort(
1232 1232 _(b'--%s and --%s are incompatible') % tuple(selactions[:2])
1233 1233 )
1234 1234 if selactions:
1235 1235 action = selactions[0]
1236 1236 elif names or rev:
1237 1237 action = b'add'
1238 1238 elif inactive:
1239 1239 action = b'inactive' # meaning deactivate
1240 1240 else:
1241 1241 action = b'list'
1242 1242
1243 1243 if rev and action in {b'delete', b'rename', b'list'}:
1244 1244 raise error.Abort(_(b"--rev is incompatible with --%s") % action)
1245 1245 if inactive and action in {b'delete', b'list'}:
1246 1246 raise error.Abort(_(b"--inactive is incompatible with --%s") % action)
1247 1247 if not names and action in {b'add', b'delete'}:
1248 1248 raise error.Abort(_(b"bookmark name required"))
1249 1249
1250 1250 if action in {b'add', b'delete', b'rename', b'inactive'}:
1251 1251 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1252 1252 if action == b'delete':
1253 1253 names = pycompat.maplist(repo._bookmarks.expandname, names)
1254 1254 bookmarks.delete(repo, tr, names)
1255 1255 elif action == b'rename':
1256 1256 if not names:
1257 1257 raise error.Abort(_(b"new bookmark name required"))
1258 1258 elif len(names) > 1:
1259 1259 raise error.Abort(_(b"only one new bookmark name allowed"))
1260 1260 oldname = repo._bookmarks.expandname(opts[b'rename'])
1261 1261 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1262 1262 elif action == b'add':
1263 1263 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1264 1264 elif action == b'inactive':
1265 1265 if len(repo._bookmarks) == 0:
1266 1266 ui.status(_(b"no bookmarks set\n"))
1267 1267 elif not repo._activebookmark:
1268 1268 ui.status(_(b"no active bookmark\n"))
1269 1269 else:
1270 1270 bookmarks.deactivate(repo)
1271 1271 elif action == b'list':
1272 1272 names = pycompat.maplist(repo._bookmarks.expandname, names)
1273 1273 with ui.formatter(b'bookmarks', opts) as fm:
1274 1274 bookmarks.printbookmarks(ui, repo, fm, names)
1275 1275 else:
1276 1276 raise error.ProgrammingError(b'invalid action: %s' % action)
1277 1277
1278 1278
1279 1279 @command(
1280 1280 b'branch',
1281 1281 [
1282 1282 (
1283 1283 b'f',
1284 1284 b'force',
1285 1285 None,
1286 1286 _(b'set branch name even if it shadows an existing branch'),
1287 1287 ),
1288 1288 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1289 1289 (
1290 1290 b'r',
1291 1291 b'rev',
1292 1292 [],
1293 1293 _(b'change branches of the given revs (EXPERIMENTAL)'),
1294 1294 ),
1295 1295 ],
1296 1296 _(b'[-fC] [NAME]'),
1297 1297 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1298 1298 )
1299 1299 def branch(ui, repo, label=None, **opts):
1300 1300 """set or show the current branch name
1301 1301
1302 1302 .. note::
1303 1303
1304 1304 Branch names are permanent and global. Use :hg:`bookmark` to create a
1305 1305 light-weight bookmark instead. See :hg:`help glossary` for more
1306 1306 information about named branches and bookmarks.
1307 1307
1308 1308 With no argument, show the current branch name. With one argument,
1309 1309 set the working directory branch name (the branch will not exist
1310 1310 in the repository until the next commit). Standard practice
1311 1311 recommends that primary development take place on the 'default'
1312 1312 branch.
1313 1313
1314 1314 Unless -f/--force is specified, branch will not let you set a
1315 1315 branch name that already exists.
1316 1316
1317 1317 Use -C/--clean to reset the working directory branch to that of
1318 1318 the parent of the working directory, negating a previous branch
1319 1319 change.
1320 1320
1321 1321 Use the command :hg:`update` to switch to an existing branch. Use
1322 1322 :hg:`commit --close-branch` to mark this branch head as closed.
1323 1323 When all heads of a branch are closed, the branch will be
1324 1324 considered closed.
1325 1325
1326 1326 Returns 0 on success.
1327 1327 """
1328 1328 opts = pycompat.byteskwargs(opts)
1329 1329 revs = opts.get(b'rev')
1330 1330 if label:
1331 1331 label = label.strip()
1332 1332
1333 1333 if not opts.get(b'clean') and not label:
1334 1334 if revs:
1335 1335 raise error.Abort(_(b"no branch name specified for the revisions"))
1336 1336 ui.write(b"%s\n" % repo.dirstate.branch())
1337 1337 return
1338 1338
1339 1339 with repo.wlock():
1340 1340 if opts.get(b'clean'):
1341 1341 label = repo[b'.'].branch()
1342 1342 repo.dirstate.setbranch(label)
1343 1343 ui.status(_(b'reset working directory to branch %s\n') % label)
1344 1344 elif label:
1345 1345
1346 1346 scmutil.checknewlabel(repo, label, b'branch')
1347 1347 if revs:
1348 1348 return cmdutil.changebranch(ui, repo, revs, label)
1349 1349
1350 1350 if not opts.get(b'force') and label in repo.branchmap():
1351 1351 if label not in [p.branch() for p in repo[None].parents()]:
1352 1352 raise error.Abort(
1353 1353 _(b'a branch of the same name already exists'),
1354 1354 # i18n: "it" refers to an existing branch
1355 1355 hint=_(b"use 'hg update' to switch to it"),
1356 1356 )
1357 1357
1358 1358 repo.dirstate.setbranch(label)
1359 1359 ui.status(_(b'marked working directory as branch %s\n') % label)
1360 1360
1361 1361 # find any open named branches aside from default
1362 1362 for n, h, t, c in repo.branchmap().iterbranches():
1363 1363 if n != b"default" and not c:
1364 1364 return 0
1365 1365 ui.status(
1366 1366 _(
1367 1367 b'(branches are permanent and global, '
1368 1368 b'did you want a bookmark?)\n'
1369 1369 )
1370 1370 )
1371 1371
1372 1372
1373 1373 @command(
1374 1374 b'branches',
1375 1375 [
1376 1376 (
1377 1377 b'a',
1378 1378 b'active',
1379 1379 False,
1380 1380 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1381 1381 ),
1382 1382 (b'c', b'closed', False, _(b'show normal and closed branches')),
1383 1383 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1384 1384 ]
1385 1385 + formatteropts,
1386 1386 _(b'[-c]'),
1387 1387 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1388 1388 intents={INTENT_READONLY},
1389 1389 )
1390 1390 def branches(ui, repo, active=False, closed=False, **opts):
1391 1391 """list repository named branches
1392 1392
1393 1393 List the repository's named branches, indicating which ones are
1394 1394 inactive. If -c/--closed is specified, also list branches which have
1395 1395 been marked closed (see :hg:`commit --close-branch`).
1396 1396
1397 1397 Use the command :hg:`update` to switch to an existing branch.
1398 1398
1399 1399 .. container:: verbose
1400 1400
1401 1401 Template:
1402 1402
1403 1403 The following keywords are supported in addition to the common template
1404 1404 keywords and functions such as ``{branch}``. See also
1405 1405 :hg:`help templates`.
1406 1406
1407 1407 :active: Boolean. True if the branch is active.
1408 1408 :closed: Boolean. True if the branch is closed.
1409 1409 :current: Boolean. True if it is the current branch.
1410 1410
1411 1411 Returns 0.
1412 1412 """
1413 1413
1414 1414 opts = pycompat.byteskwargs(opts)
1415 1415 revs = opts.get(b'rev')
1416 1416 selectedbranches = None
1417 1417 if revs:
1418 1418 revs = scmutil.revrange(repo, revs)
1419 1419 getbi = repo.revbranchcache().branchinfo
1420 1420 selectedbranches = {getbi(r)[0] for r in revs}
1421 1421
1422 1422 ui.pager(b'branches')
1423 1423 fm = ui.formatter(b'branches', opts)
1424 1424 hexfunc = fm.hexfunc
1425 1425
1426 1426 allheads = set(repo.heads())
1427 1427 branches = []
1428 1428 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1429 1429 if selectedbranches is not None and tag not in selectedbranches:
1430 1430 continue
1431 1431 isactive = False
1432 1432 if not isclosed:
1433 1433 openheads = set(repo.branchmap().iteropen(heads))
1434 1434 isactive = bool(openheads & allheads)
1435 1435 branches.append((tag, repo[tip], isactive, not isclosed))
1436 1436 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1437 1437
1438 1438 for tag, ctx, isactive, isopen in branches:
1439 1439 if active and not isactive:
1440 1440 continue
1441 1441 if isactive:
1442 1442 label = b'branches.active'
1443 1443 notice = b''
1444 1444 elif not isopen:
1445 1445 if not closed:
1446 1446 continue
1447 1447 label = b'branches.closed'
1448 1448 notice = _(b' (closed)')
1449 1449 else:
1450 1450 label = b'branches.inactive'
1451 1451 notice = _(b' (inactive)')
1452 1452 current = tag == repo.dirstate.branch()
1453 1453 if current:
1454 1454 label = b'branches.current'
1455 1455
1456 1456 fm.startitem()
1457 1457 fm.write(b'branch', b'%s', tag, label=label)
1458 1458 rev = ctx.rev()
1459 1459 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1460 1460 fmt = b' ' * padsize + b' %d:%s'
1461 1461 fm.condwrite(
1462 1462 not ui.quiet,
1463 1463 b'rev node',
1464 1464 fmt,
1465 1465 rev,
1466 1466 hexfunc(ctx.node()),
1467 1467 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1468 1468 )
1469 1469 fm.context(ctx=ctx)
1470 1470 fm.data(active=isactive, closed=not isopen, current=current)
1471 1471 if not ui.quiet:
1472 1472 fm.plain(notice)
1473 1473 fm.plain(b'\n')
1474 1474 fm.end()
1475 1475
1476 1476
1477 1477 @command(
1478 1478 b'bundle',
1479 1479 [
1480 1480 (
1481 1481 b'f',
1482 1482 b'force',
1483 1483 None,
1484 1484 _(b'run even when the destination is unrelated'),
1485 1485 ),
1486 1486 (
1487 1487 b'r',
1488 1488 b'rev',
1489 1489 [],
1490 1490 _(b'a changeset intended to be added to the destination'),
1491 1491 _(b'REV'),
1492 1492 ),
1493 1493 (
1494 1494 b'b',
1495 1495 b'branch',
1496 1496 [],
1497 1497 _(b'a specific branch you would like to bundle'),
1498 1498 _(b'BRANCH'),
1499 1499 ),
1500 1500 (
1501 1501 b'',
1502 1502 b'base',
1503 1503 [],
1504 1504 _(b'a base changeset assumed to be available at the destination'),
1505 1505 _(b'REV'),
1506 1506 ),
1507 1507 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1508 1508 (
1509 1509 b't',
1510 1510 b'type',
1511 1511 b'bzip2',
1512 1512 _(b'bundle compression type to use'),
1513 1513 _(b'TYPE'),
1514 1514 ),
1515 1515 ]
1516 1516 + remoteopts,
1517 1517 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1518 1518 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1519 1519 )
1520 1520 def bundle(ui, repo, fname, dest=None, **opts):
1521 1521 """create a bundle file
1522 1522
1523 1523 Generate a bundle file containing data to be transferred to another
1524 1524 repository.
1525 1525
1526 1526 To create a bundle containing all changesets, use -a/--all
1527 1527 (or --base null). Otherwise, hg assumes the destination will have
1528 1528 all the nodes you specify with --base parameters. Otherwise, hg
1529 1529 will assume the repository has all the nodes in destination, or
1530 1530 default-push/default if no destination is specified, where destination
1531 1531 is the repository you provide through DEST option.
1532 1532
1533 1533 You can change bundle format with the -t/--type option. See
1534 1534 :hg:`help bundlespec` for documentation on this format. By default,
1535 1535 the most appropriate format is used and compression defaults to
1536 1536 bzip2.
1537 1537
1538 1538 The bundle file can then be transferred using conventional means
1539 1539 and applied to another repository with the unbundle or pull
1540 1540 command. This is useful when direct push and pull are not
1541 1541 available or when exporting an entire repository is undesirable.
1542 1542
1543 1543 Applying bundles preserves all changeset contents including
1544 1544 permissions, copy/rename information, and revision history.
1545 1545
1546 1546 Returns 0 on success, 1 if no changes found.
1547 1547 """
1548 1548 opts = pycompat.byteskwargs(opts)
1549 1549 revs = None
1550 1550 if b'rev' in opts:
1551 1551 revstrings = opts[b'rev']
1552 1552 revs = scmutil.revrange(repo, revstrings)
1553 1553 if revstrings and not revs:
1554 1554 raise error.Abort(_(b'no commits to bundle'))
1555 1555
1556 1556 bundletype = opts.get(b'type', b'bzip2').lower()
1557 1557 try:
1558 1558 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1559 1559 except error.UnsupportedBundleSpecification as e:
1560 1560 raise error.Abort(
1561 1561 pycompat.bytestr(e),
1562 1562 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1563 1563 )
1564 1564 cgversion = bundlespec.contentopts[b"cg.version"]
1565 1565
1566 1566 # Packed bundles are a pseudo bundle format for now.
1567 1567 if cgversion == b's1':
1568 1568 raise error.Abort(
1569 1569 _(b'packed bundles cannot be produced by "hg bundle"'),
1570 1570 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1571 1571 )
1572 1572
1573 1573 if opts.get(b'all'):
1574 1574 if dest:
1575 1575 raise error.Abort(
1576 1576 _(b"--all is incompatible with specifying a destination")
1577 1577 )
1578 1578 if opts.get(b'base'):
1579 1579 ui.warn(_(b"ignoring --base because --all was specified\n"))
1580 1580 base = [nullrev]
1581 1581 else:
1582 1582 base = scmutil.revrange(repo, opts.get(b'base'))
1583 1583 if cgversion not in changegroup.supportedoutgoingversions(repo):
1584 1584 raise error.Abort(
1585 1585 _(b"repository does not support bundle version %s") % cgversion
1586 1586 )
1587 1587
1588 1588 if base:
1589 1589 if dest:
1590 1590 raise error.Abort(
1591 1591 _(b"--base is incompatible with specifying a destination")
1592 1592 )
1593 1593 common = [repo[rev].node() for rev in base]
1594 1594 heads = [repo[r].node() for r in revs] if revs else None
1595 1595 outgoing = discovery.outgoing(repo, common, heads)
1596 1596 else:
1597 1597 dest = ui.expandpath(dest or b'default-push', dest or b'default')
1598 1598 dest, branches = hg.parseurl(dest, opts.get(b'branch'))
1599 1599 other = hg.peer(repo, opts, dest)
1600 1600 revs = [repo[r].hex() for r in revs]
1601 1601 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1602 1602 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1603 1603 outgoing = discovery.findcommonoutgoing(
1604 1604 repo,
1605 1605 other,
1606 1606 onlyheads=heads,
1607 1607 force=opts.get(b'force'),
1608 1608 portable=True,
1609 1609 )
1610 1610
1611 1611 if not outgoing.missing:
1612 1612 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1613 1613 return 1
1614 1614
1615 1615 if cgversion == b'01': # bundle1
1616 1616 bversion = b'HG10' + bundlespec.wirecompression
1617 1617 bcompression = None
1618 1618 elif cgversion in (b'02', b'03'):
1619 1619 bversion = b'HG20'
1620 1620 bcompression = bundlespec.wirecompression
1621 1621 else:
1622 1622 raise error.ProgrammingError(
1623 1623 b'bundle: unexpected changegroup version %s' % cgversion
1624 1624 )
1625 1625
1626 1626 # TODO compression options should be derived from bundlespec parsing.
1627 1627 # This is a temporary hack to allow adjusting bundle compression
1628 1628 # level without a) formalizing the bundlespec changes to declare it
1629 1629 # b) introducing a command flag.
1630 1630 compopts = {}
1631 1631 complevel = ui.configint(
1632 1632 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1633 1633 )
1634 1634 if complevel is None:
1635 1635 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1636 1636 if complevel is not None:
1637 1637 compopts[b'level'] = complevel
1638 1638
1639 1639 # Allow overriding the bundling of obsmarker in phases through
1640 1640 # configuration while we don't have a bundle version that include them
1641 1641 if repo.ui.configbool(b'experimental', b'evolution.bundle-obsmarker'):
1642 1642 bundlespec.contentopts[b'obsolescence'] = True
1643 1643 if repo.ui.configbool(b'experimental', b'bundle-phases'):
1644 1644 bundlespec.contentopts[b'phases'] = True
1645 1645
1646 1646 bundle2.writenewbundle(
1647 1647 ui,
1648 1648 repo,
1649 1649 b'bundle',
1650 1650 fname,
1651 1651 bversion,
1652 1652 outgoing,
1653 1653 bundlespec.contentopts,
1654 1654 compression=bcompression,
1655 1655 compopts=compopts,
1656 1656 )
1657 1657
1658 1658
1659 1659 @command(
1660 1660 b'cat',
1661 1661 [
1662 1662 (
1663 1663 b'o',
1664 1664 b'output',
1665 1665 b'',
1666 1666 _(b'print output to file with formatted name'),
1667 1667 _(b'FORMAT'),
1668 1668 ),
1669 1669 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1670 1670 (b'', b'decode', None, _(b'apply any matching decode filter')),
1671 1671 ]
1672 1672 + walkopts
1673 1673 + formatteropts,
1674 1674 _(b'[OPTION]... FILE...'),
1675 1675 helpcategory=command.CATEGORY_FILE_CONTENTS,
1676 1676 inferrepo=True,
1677 1677 intents={INTENT_READONLY},
1678 1678 )
1679 1679 def cat(ui, repo, file1, *pats, **opts):
1680 1680 """output the current or given revision of files
1681 1681
1682 1682 Print the specified files as they were at the given revision. If
1683 1683 no revision is given, the parent of the working directory is used.
1684 1684
1685 1685 Output may be to a file, in which case the name of the file is
1686 1686 given using a template string. See :hg:`help templates`. In addition
1687 1687 to the common template keywords, the following formatting rules are
1688 1688 supported:
1689 1689
1690 1690 :``%%``: literal "%" character
1691 1691 :``%s``: basename of file being printed
1692 1692 :``%d``: dirname of file being printed, or '.' if in repository root
1693 1693 :``%p``: root-relative path name of file being printed
1694 1694 :``%H``: changeset hash (40 hexadecimal digits)
1695 1695 :``%R``: changeset revision number
1696 1696 :``%h``: short-form changeset hash (12 hexadecimal digits)
1697 1697 :``%r``: zero-padded changeset revision number
1698 1698 :``%b``: basename of the exporting repository
1699 1699 :``\\``: literal "\\" character
1700 1700
1701 1701 .. container:: verbose
1702 1702
1703 1703 Template:
1704 1704
1705 1705 The following keywords are supported in addition to the common template
1706 1706 keywords and functions. See also :hg:`help templates`.
1707 1707
1708 1708 :data: String. File content.
1709 1709 :path: String. Repository-absolute path of the file.
1710 1710
1711 1711 Returns 0 on success.
1712 1712 """
1713 1713 opts = pycompat.byteskwargs(opts)
1714 1714 rev = opts.get(b'rev')
1715 1715 if rev:
1716 1716 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1717 1717 ctx = scmutil.revsingle(repo, rev)
1718 1718 m = scmutil.match(ctx, (file1,) + pats, opts)
1719 1719 fntemplate = opts.pop(b'output', b'')
1720 1720 if cmdutil.isstdiofilename(fntemplate):
1721 1721 fntemplate = b''
1722 1722
1723 1723 if fntemplate:
1724 1724 fm = formatter.nullformatter(ui, b'cat', opts)
1725 1725 else:
1726 1726 ui.pager(b'cat')
1727 1727 fm = ui.formatter(b'cat', opts)
1728 1728 with fm:
1729 1729 return cmdutil.cat(
1730 1730 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1731 1731 )
1732 1732
1733 1733
1734 1734 @command(
1735 1735 b'clone',
1736 1736 [
1737 1737 (
1738 1738 b'U',
1739 1739 b'noupdate',
1740 1740 None,
1741 1741 _(
1742 1742 b'the clone will include an empty working '
1743 1743 b'directory (only a repository)'
1744 1744 ),
1745 1745 ),
1746 1746 (
1747 1747 b'u',
1748 1748 b'updaterev',
1749 1749 b'',
1750 1750 _(b'revision, tag, or branch to check out'),
1751 1751 _(b'REV'),
1752 1752 ),
1753 1753 (
1754 1754 b'r',
1755 1755 b'rev',
1756 1756 [],
1757 1757 _(
1758 1758 b'do not clone everything, but include this changeset'
1759 1759 b' and its ancestors'
1760 1760 ),
1761 1761 _(b'REV'),
1762 1762 ),
1763 1763 (
1764 1764 b'b',
1765 1765 b'branch',
1766 1766 [],
1767 1767 _(
1768 1768 b'do not clone everything, but include this branch\'s'
1769 1769 b' changesets and their ancestors'
1770 1770 ),
1771 1771 _(b'BRANCH'),
1772 1772 ),
1773 1773 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1774 1774 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1775 1775 (b'', b'stream', None, _(b'clone with minimal data processing')),
1776 1776 ]
1777 1777 + remoteopts,
1778 1778 _(b'[OPTION]... SOURCE [DEST]'),
1779 1779 helpcategory=command.CATEGORY_REPO_CREATION,
1780 1780 helpbasic=True,
1781 1781 norepo=True,
1782 1782 )
1783 1783 def clone(ui, source, dest=None, **opts):
1784 1784 """make a copy of an existing repository
1785 1785
1786 1786 Create a copy of an existing repository in a new directory.
1787 1787
1788 1788 If no destination directory name is specified, it defaults to the
1789 1789 basename of the source.
1790 1790
1791 1791 The location of the source is added to the new repository's
1792 1792 ``.hg/hgrc`` file, as the default to be used for future pulls.
1793 1793
1794 1794 Only local paths and ``ssh://`` URLs are supported as
1795 1795 destinations. For ``ssh://`` destinations, no working directory or
1796 1796 ``.hg/hgrc`` will be created on the remote side.
1797 1797
1798 1798 If the source repository has a bookmark called '@' set, that
1799 1799 revision will be checked out in the new repository by default.
1800 1800
1801 1801 To check out a particular version, use -u/--update, or
1802 1802 -U/--noupdate to create a clone with no working directory.
1803 1803
1804 1804 To pull only a subset of changesets, specify one or more revisions
1805 1805 identifiers with -r/--rev or branches with -b/--branch. The
1806 1806 resulting clone will contain only the specified changesets and
1807 1807 their ancestors. These options (or 'clone src#rev dest') imply
1808 1808 --pull, even for local source repositories.
1809 1809
1810 1810 In normal clone mode, the remote normalizes repository data into a common
1811 1811 exchange format and the receiving end translates this data into its local
1812 1812 storage format. --stream activates a different clone mode that essentially
1813 1813 copies repository files from the remote with minimal data processing. This
1814 1814 significantly reduces the CPU cost of a clone both remotely and locally.
1815 1815 However, it often increases the transferred data size by 30-40%. This can
1816 1816 result in substantially faster clones where I/O throughput is plentiful,
1817 1817 especially for larger repositories. A side-effect of --stream clones is
1818 1818 that storage settings and requirements on the remote are applied locally:
1819 1819 a modern client may inherit legacy or inefficient storage used by the
1820 1820 remote or a legacy Mercurial client may not be able to clone from a
1821 1821 modern Mercurial remote.
1822 1822
1823 1823 .. note::
1824 1824
1825 1825 Specifying a tag will include the tagged changeset but not the
1826 1826 changeset containing the tag.
1827 1827
1828 1828 .. container:: verbose
1829 1829
1830 1830 For efficiency, hardlinks are used for cloning whenever the
1831 1831 source and destination are on the same filesystem (note this
1832 1832 applies only to the repository data, not to the working
1833 1833 directory). Some filesystems, such as AFS, implement hardlinking
1834 1834 incorrectly, but do not report errors. In these cases, use the
1835 1835 --pull option to avoid hardlinking.
1836 1836
1837 1837 Mercurial will update the working directory to the first applicable
1838 1838 revision from this list:
1839 1839
1840 1840 a) null if -U or the source repository has no changesets
1841 1841 b) if -u . and the source repository is local, the first parent of
1842 1842 the source repository's working directory
1843 1843 c) the changeset specified with -u (if a branch name, this means the
1844 1844 latest head of that branch)
1845 1845 d) the changeset specified with -r
1846 1846 e) the tipmost head specified with -b
1847 1847 f) the tipmost head specified with the url#branch source syntax
1848 1848 g) the revision marked with the '@' bookmark, if present
1849 1849 h) the tipmost head of the default branch
1850 1850 i) tip
1851 1851
1852 1852 When cloning from servers that support it, Mercurial may fetch
1853 1853 pre-generated data from a server-advertised URL or inline from the
1854 1854 same stream. When this is done, hooks operating on incoming changesets
1855 1855 and changegroups may fire more than once, once for each pre-generated
1856 1856 bundle and as well as for any additional remaining data. In addition,
1857 1857 if an error occurs, the repository may be rolled back to a partial
1858 1858 clone. This behavior may change in future releases.
1859 1859 See :hg:`help -e clonebundles` for more.
1860 1860
1861 1861 Examples:
1862 1862
1863 1863 - clone a remote repository to a new directory named hg/::
1864 1864
1865 1865 hg clone https://www.mercurial-scm.org/repo/hg/
1866 1866
1867 1867 - create a lightweight local clone::
1868 1868
1869 1869 hg clone project/ project-feature/
1870 1870
1871 1871 - clone from an absolute path on an ssh server (note double-slash)::
1872 1872
1873 1873 hg clone ssh://user@server//home/projects/alpha/
1874 1874
1875 1875 - do a streaming clone while checking out a specified version::
1876 1876
1877 1877 hg clone --stream http://server/repo -u 1.5
1878 1878
1879 1879 - create a repository without changesets after a particular revision::
1880 1880
1881 1881 hg clone -r 04e544 experimental/ good/
1882 1882
1883 1883 - clone (and track) a particular named branch::
1884 1884
1885 1885 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1886 1886
1887 1887 See :hg:`help urls` for details on specifying URLs.
1888 1888
1889 1889 Returns 0 on success.
1890 1890 """
1891 1891 opts = pycompat.byteskwargs(opts)
1892 1892 if opts.get(b'noupdate') and opts.get(b'updaterev'):
1893 1893 raise error.Abort(_(b"cannot specify both --noupdate and --updaterev"))
1894 1894
1895 1895 # --include/--exclude can come from narrow or sparse.
1896 1896 includepats, excludepats = None, None
1897 1897
1898 1898 # hg.clone() differentiates between None and an empty set. So make sure
1899 1899 # patterns are sets if narrow is requested without patterns.
1900 1900 if opts.get(b'narrow'):
1901 1901 includepats = set()
1902 1902 excludepats = set()
1903 1903
1904 1904 if opts.get(b'include'):
1905 1905 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1906 1906 if opts.get(b'exclude'):
1907 1907 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1908 1908
1909 1909 r = hg.clone(
1910 1910 ui,
1911 1911 opts,
1912 1912 source,
1913 1913 dest,
1914 1914 pull=opts.get(b'pull'),
1915 1915 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1916 1916 revs=opts.get(b'rev'),
1917 1917 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1918 1918 branch=opts.get(b'branch'),
1919 1919 shareopts=opts.get(b'shareopts'),
1920 1920 storeincludepats=includepats,
1921 1921 storeexcludepats=excludepats,
1922 1922 depth=opts.get(b'depth') or None,
1923 1923 )
1924 1924
1925 1925 return r is None
1926 1926
1927 1927
1928 1928 @command(
1929 1929 b'commit|ci',
1930 1930 [
1931 1931 (
1932 1932 b'A',
1933 1933 b'addremove',
1934 1934 None,
1935 1935 _(b'mark new/missing files as added/removed before committing'),
1936 1936 ),
1937 1937 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1938 1938 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1939 1939 (b's', b'secret', None, _(b'use the secret phase for committing')),
1940 1940 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1941 1941 (
1942 1942 b'',
1943 1943 b'force-close-branch',
1944 1944 None,
1945 1945 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1946 1946 ),
1947 1947 (b'i', b'interactive', None, _(b'use interactive mode')),
1948 1948 ]
1949 1949 + walkopts
1950 1950 + commitopts
1951 1951 + commitopts2
1952 1952 + subrepoopts,
1953 1953 _(b'[OPTION]... [FILE]...'),
1954 1954 helpcategory=command.CATEGORY_COMMITTING,
1955 1955 helpbasic=True,
1956 1956 inferrepo=True,
1957 1957 )
1958 1958 def commit(ui, repo, *pats, **opts):
1959 1959 """commit the specified files or all outstanding changes
1960 1960
1961 1961 Commit changes to the given files into the repository. Unlike a
1962 1962 centralized SCM, this operation is a local operation. See
1963 1963 :hg:`push` for a way to actively distribute your changes.
1964 1964
1965 1965 If a list of files is omitted, all changes reported by :hg:`status`
1966 1966 will be committed.
1967 1967
1968 1968 If you are committing the result of a merge, do not provide any
1969 1969 filenames or -I/-X filters.
1970 1970
1971 1971 If no commit message is specified, Mercurial starts your
1972 1972 configured editor where you can enter a message. In case your
1973 1973 commit fails, you will find a backup of your message in
1974 1974 ``.hg/last-message.txt``.
1975 1975
1976 1976 The --close-branch flag can be used to mark the current branch
1977 1977 head closed. When all heads of a branch are closed, the branch
1978 1978 will be considered closed and no longer listed.
1979 1979
1980 1980 The --amend flag can be used to amend the parent of the
1981 1981 working directory with a new commit that contains the changes
1982 1982 in the parent in addition to those currently reported by :hg:`status`,
1983 1983 if there are any. The old commit is stored in a backup bundle in
1984 1984 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1985 1985 on how to restore it).
1986 1986
1987 1987 Message, user and date are taken from the amended commit unless
1988 1988 specified. When a message isn't specified on the command line,
1989 1989 the editor will open with the message of the amended commit.
1990 1990
1991 1991 It is not possible to amend public changesets (see :hg:`help phases`)
1992 1992 or changesets that have children.
1993 1993
1994 1994 See :hg:`help dates` for a list of formats valid for -d/--date.
1995 1995
1996 1996 Returns 0 on success, 1 if nothing changed.
1997 1997
1998 1998 .. container:: verbose
1999 1999
2000 2000 Examples:
2001 2001
2002 2002 - commit all files ending in .py::
2003 2003
2004 2004 hg commit --include "set:**.py"
2005 2005
2006 2006 - commit all non-binary files::
2007 2007
2008 2008 hg commit --exclude "set:binary()"
2009 2009
2010 2010 - amend the current commit and set the date to now::
2011 2011
2012 2012 hg commit --amend --date now
2013 2013 """
2014 2014 with repo.wlock(), repo.lock():
2015 2015 return _docommit(ui, repo, *pats, **opts)
2016 2016
2017 2017
2018 2018 def _docommit(ui, repo, *pats, **opts):
2019 2019 if opts.get('interactive'):
2020 2020 opts.pop('interactive')
2021 2021 ret = cmdutil.dorecord(
2022 2022 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2023 2023 )
2024 2024 # ret can be 0 (no changes to record) or the value returned by
2025 2025 # commit(), 1 if nothing changed or None on success.
2026 2026 return 1 if ret == 0 else ret
2027 2027
2028 2028 opts = pycompat.byteskwargs(opts)
2029 2029 if opts.get(b'subrepos'):
2030 2030 if opts.get(b'amend'):
2031 2031 raise error.Abort(_(b'cannot amend with --subrepos'))
2032 2032 # Let --subrepos on the command line override config setting.
2033 2033 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2034 2034
2035 2035 cmdutil.checkunfinished(repo, commit=True)
2036 2036
2037 2037 branch = repo[None].branch()
2038 2038 bheads = repo.branchheads(branch)
2039 2039
2040 2040 extra = {}
2041 2041 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
2042 2042 extra[b'close'] = b'1'
2043 2043
2044 2044 if repo[b'.'].closesbranch():
2045 2045 raise error.Abort(
2046 2046 _(b'current revision is already a branch closing head')
2047 2047 )
2048 2048 elif not bheads:
2049 2049 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
2050 2050 elif (
2051 2051 branch == repo[b'.'].branch()
2052 2052 and repo[b'.'].node() not in bheads
2053 2053 and not opts.get(b'force_close_branch')
2054 2054 ):
2055 2055 hint = _(
2056 2056 b'use --force-close-branch to close branch from a non-head'
2057 2057 b' changeset'
2058 2058 )
2059 2059 raise error.Abort(_(b'can only close branch heads'), hint=hint)
2060 2060 elif opts.get(b'amend'):
2061 2061 if (
2062 2062 repo[b'.'].p1().branch() != branch
2063 2063 and repo[b'.'].p2().branch() != branch
2064 2064 ):
2065 2065 raise error.Abort(_(b'can only close branch heads'))
2066 2066
2067 2067 if opts.get(b'amend'):
2068 2068 if ui.configbool(b'ui', b'commitsubrepos'):
2069 2069 raise error.Abort(_(b'cannot amend with ui.commitsubrepos enabled'))
2070 2070
2071 2071 old = repo[b'.']
2072 2072 rewriteutil.precheck(repo, [old.rev()], b'amend')
2073 2073
2074 2074 # Currently histedit gets confused if an amend happens while histedit
2075 2075 # is in progress. Since we have a checkunfinished command, we are
2076 2076 # temporarily honoring it.
2077 2077 #
2078 2078 # Note: eventually this guard will be removed. Please do not expect
2079 2079 # this behavior to remain.
2080 2080 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2081 2081 cmdutil.checkunfinished(repo)
2082 2082
2083 2083 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2084 2084 if node == old.node():
2085 2085 ui.status(_(b"nothing changed\n"))
2086 2086 return 1
2087 2087 else:
2088 2088
2089 2089 def commitfunc(ui, repo, message, match, opts):
2090 2090 overrides = {}
2091 2091 if opts.get(b'secret'):
2092 2092 overrides[(b'phases', b'new-commit')] = b'secret'
2093 2093
2094 2094 baseui = repo.baseui
2095 2095 with baseui.configoverride(overrides, b'commit'):
2096 2096 with ui.configoverride(overrides, b'commit'):
2097 2097 editform = cmdutil.mergeeditform(
2098 2098 repo[None], b'commit.normal'
2099 2099 )
2100 2100 editor = cmdutil.getcommiteditor(
2101 2101 editform=editform, **pycompat.strkwargs(opts)
2102 2102 )
2103 2103 return repo.commit(
2104 2104 message,
2105 2105 opts.get(b'user'),
2106 2106 opts.get(b'date'),
2107 2107 match,
2108 2108 editor=editor,
2109 2109 extra=extra,
2110 2110 )
2111 2111
2112 2112 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2113 2113
2114 2114 if not node:
2115 2115 stat = cmdutil.postcommitstatus(repo, pats, opts)
2116 2116 if stat.deleted:
2117 2117 ui.status(
2118 2118 _(
2119 2119 b"nothing changed (%d missing files, see "
2120 2120 b"'hg status')\n"
2121 2121 )
2122 2122 % len(stat.deleted)
2123 2123 )
2124 2124 else:
2125 2125 ui.status(_(b"nothing changed\n"))
2126 2126 return 1
2127 2127
2128 2128 cmdutil.commitstatus(repo, node, branch, bheads, opts)
2129 2129
2130 2130 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2131 2131 status(
2132 2132 ui,
2133 2133 repo,
2134 2134 modified=True,
2135 2135 added=True,
2136 2136 removed=True,
2137 2137 deleted=True,
2138 2138 unknown=True,
2139 2139 subrepos=opts.get(b'subrepos'),
2140 2140 )
2141 2141
2142 2142
2143 2143 @command(
2144 2144 b'config|showconfig|debugconfig',
2145 2145 [
2146 2146 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2147 2147 (b'e', b'edit', None, _(b'edit user config')),
2148 2148 (b'l', b'local', None, _(b'edit repository config')),
2149 2149 (b'g', b'global', None, _(b'edit global config')),
2150 2150 ]
2151 2151 + formatteropts,
2152 2152 _(b'[-u] [NAME]...'),
2153 2153 helpcategory=command.CATEGORY_HELP,
2154 2154 optionalrepo=True,
2155 2155 intents={INTENT_READONLY},
2156 2156 )
2157 2157 def config(ui, repo, *values, **opts):
2158 2158 """show combined config settings from all hgrc files
2159 2159
2160 2160 With no arguments, print names and values of all config items.
2161 2161
2162 2162 With one argument of the form section.name, print just the value
2163 2163 of that config item.
2164 2164
2165 2165 With multiple arguments, print names and values of all config
2166 2166 items with matching section names or section.names.
2167 2167
2168 2168 With --edit, start an editor on the user-level config file. With
2169 2169 --global, edit the system-wide config file. With --local, edit the
2170 2170 repository-level config file.
2171 2171
2172 2172 With --debug, the source (filename and line number) is printed
2173 2173 for each config item.
2174 2174
2175 2175 See :hg:`help config` for more information about config files.
2176 2176
2177 2177 .. container:: verbose
2178 2178
2179 2179 Template:
2180 2180
2181 2181 The following keywords are supported. See also :hg:`help templates`.
2182 2182
2183 2183 :name: String. Config name.
2184 2184 :source: String. Filename and line number where the item is defined.
2185 2185 :value: String. Config value.
2186 2186
2187 2187 Returns 0 on success, 1 if NAME does not exist.
2188 2188
2189 2189 """
2190 2190
2191 2191 opts = pycompat.byteskwargs(opts)
2192 2192 if opts.get(b'edit') or opts.get(b'local') or opts.get(b'global'):
2193 2193 if opts.get(b'local') and opts.get(b'global'):
2194 2194 raise error.Abort(_(b"can't use --local and --global together"))
2195 2195
2196 2196 if opts.get(b'local'):
2197 2197 if not repo:
2198 2198 raise error.Abort(_(b"can't use --local outside a repository"))
2199 2199 paths = [repo.vfs.join(b'hgrc')]
2200 2200 elif opts.get(b'global'):
2201 2201 paths = rcutil.systemrcpath()
2202 2202 else:
2203 2203 paths = rcutil.userrcpath()
2204 2204
2205 2205 for f in paths:
2206 2206 if os.path.exists(f):
2207 2207 break
2208 2208 else:
2209 2209 if opts.get(b'global'):
2210 2210 samplehgrc = uimod.samplehgrcs[b'global']
2211 2211 elif opts.get(b'local'):
2212 2212 samplehgrc = uimod.samplehgrcs[b'local']
2213 2213 else:
2214 2214 samplehgrc = uimod.samplehgrcs[b'user']
2215 2215
2216 2216 f = paths[0]
2217 2217 fp = open(f, b"wb")
2218 2218 fp.write(util.tonativeeol(samplehgrc))
2219 2219 fp.close()
2220 2220
2221 2221 editor = ui.geteditor()
2222 2222 ui.system(
2223 2223 b"%s \"%s\"" % (editor, f),
2224 2224 onerr=error.Abort,
2225 2225 errprefix=_(b"edit failed"),
2226 2226 blockedtag=b'config_edit',
2227 2227 )
2228 2228 return
2229 2229 ui.pager(b'config')
2230 2230 fm = ui.formatter(b'config', opts)
2231 2231 for t, f in rcutil.rccomponents():
2232 2232 if t == b'path':
2233 2233 ui.debug(b'read config from: %s\n' % f)
2234 2234 elif t == b'items':
2235 2235 for section, name, value, source in f:
2236 2236 ui.debug(b'set config by: %s\n' % source)
2237 2237 else:
2238 2238 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2239 2239 untrusted = bool(opts.get(b'untrusted'))
2240 2240
2241 2241 selsections = selentries = []
2242 2242 if values:
2243 2243 selsections = [v for v in values if b'.' not in v]
2244 2244 selentries = [v for v in values if b'.' in v]
2245 2245 uniquesel = len(selentries) == 1 and not selsections
2246 2246 selsections = set(selsections)
2247 2247 selentries = set(selentries)
2248 2248
2249 2249 matched = False
2250 2250 for section, name, value in ui.walkconfig(untrusted=untrusted):
2251 2251 source = ui.configsource(section, name, untrusted)
2252 2252 value = pycompat.bytestr(value)
2253 2253 defaultvalue = ui.configdefault(section, name)
2254 2254 if fm.isplain():
2255 2255 source = source or b'none'
2256 2256 value = value.replace(b'\n', b'\\n')
2257 2257 entryname = section + b'.' + name
2258 2258 if values and not (section in selsections or entryname in selentries):
2259 2259 continue
2260 2260 fm.startitem()
2261 2261 fm.condwrite(ui.debugflag, b'source', b'%s: ', source)
2262 2262 if uniquesel:
2263 2263 fm.data(name=entryname)
2264 2264 fm.write(b'value', b'%s\n', value)
2265 2265 else:
2266 2266 fm.write(b'name value', b'%s=%s\n', entryname, value)
2267 2267 if formatter.isprintable(defaultvalue):
2268 2268 fm.data(defaultvalue=defaultvalue)
2269 2269 elif isinstance(defaultvalue, list) and all(
2270 2270 formatter.isprintable(e) for e in defaultvalue
2271 2271 ):
2272 2272 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2273 2273 # TODO: no idea how to process unsupported defaultvalue types
2274 2274 matched = True
2275 2275 fm.end()
2276 2276 if matched:
2277 2277 return 0
2278 2278 return 1
2279 2279
2280 2280
2281 2281 @command(
2282 2282 b'continue',
2283 2283 dryrunopts,
2284 2284 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2285 2285 helpbasic=True,
2286 2286 )
2287 2287 def continuecmd(ui, repo, **opts):
2288 2288 """resumes an interrupted operation (EXPERIMENTAL)
2289 2289
2290 2290 Finishes a multistep operation like graft, histedit, rebase, merge,
2291 2291 and unshelve if they are in an interrupted state.
2292 2292
2293 2293 use --dry-run/-n to dry run the command.
2294 2294 """
2295 2295 dryrun = opts.get('dry_run')
2296 2296 contstate = cmdutil.getunfinishedstate(repo)
2297 2297 if not contstate:
2298 2298 raise error.Abort(_(b'no operation in progress'))
2299 2299 if not contstate.continuefunc:
2300 2300 raise error.Abort(
2301 2301 (
2302 2302 _(b"%s in progress but does not support 'hg continue'")
2303 2303 % (contstate._opname)
2304 2304 ),
2305 2305 hint=contstate.continuemsg(),
2306 2306 )
2307 2307 if dryrun:
2308 2308 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2309 2309 return
2310 2310 return contstate.continuefunc(ui, repo)
2311 2311
2312 2312
2313 2313 @command(
2314 2314 b'copy|cp',
2315 2315 [
2316 2316 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2317 2317 (
2318 2318 b'f',
2319 2319 b'force',
2320 2320 None,
2321 2321 _(b'forcibly copy over an existing managed file'),
2322 2322 ),
2323 2323 ]
2324 2324 + walkopts
2325 2325 + dryrunopts,
2326 2326 _(b'[OPTION]... SOURCE... DEST'),
2327 2327 helpcategory=command.CATEGORY_FILE_CONTENTS,
2328 2328 )
2329 2329 def copy(ui, repo, *pats, **opts):
2330 2330 """mark files as copied for the next commit
2331 2331
2332 2332 Mark dest as having copies of source files. If dest is a
2333 2333 directory, copies are put in that directory. If dest is a file,
2334 2334 the source must be a single file.
2335 2335
2336 2336 By default, this command copies the contents of files as they
2337 2337 exist in the working directory. If invoked with -A/--after, the
2338 2338 operation is recorded, but no copying is performed.
2339 2339
2340 2340 This command takes effect with the next commit. To undo a copy
2341 2341 before that, see :hg:`revert`.
2342 2342
2343 2343 Returns 0 on success, 1 if errors are encountered.
2344 2344 """
2345 2345 opts = pycompat.byteskwargs(opts)
2346 2346 with repo.wlock(False):
2347 2347 return cmdutil.copy(ui, repo, pats, opts)
2348 2348
2349 2349
2350 2350 @command(
2351 2351 b'debugcommands',
2352 2352 [],
2353 2353 _(b'[COMMAND]'),
2354 2354 helpcategory=command.CATEGORY_HELP,
2355 2355 norepo=True,
2356 2356 )
2357 2357 def debugcommands(ui, cmd=b'', *args):
2358 2358 """list all available commands and options"""
2359 2359 for cmd, vals in sorted(pycompat.iteritems(table)):
2360 2360 cmd = cmd.split(b'|')[0]
2361 2361 opts = b', '.join([i[1] for i in vals[1]])
2362 2362 ui.write(b'%s: %s\n' % (cmd, opts))
2363 2363
2364 2364
2365 2365 @command(
2366 2366 b'debugcomplete',
2367 2367 [(b'o', b'options', None, _(b'show the command options'))],
2368 2368 _(b'[-o] CMD'),
2369 2369 helpcategory=command.CATEGORY_HELP,
2370 2370 norepo=True,
2371 2371 )
2372 2372 def debugcomplete(ui, cmd=b'', **opts):
2373 2373 """returns the completion list associated with the given command"""
2374 2374
2375 2375 if opts.get('options'):
2376 2376 options = []
2377 2377 otables = [globalopts]
2378 2378 if cmd:
2379 2379 aliases, entry = cmdutil.findcmd(cmd, table, False)
2380 2380 otables.append(entry[1])
2381 2381 for t in otables:
2382 2382 for o in t:
2383 2383 if b"(DEPRECATED)" in o[3]:
2384 2384 continue
2385 2385 if o[0]:
2386 2386 options.append(b'-%s' % o[0])
2387 2387 options.append(b'--%s' % o[1])
2388 2388 ui.write(b"%s\n" % b"\n".join(options))
2389 2389 return
2390 2390
2391 2391 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2392 2392 if ui.verbose:
2393 2393 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2394 2394 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2395 2395
2396 2396
2397 2397 @command(
2398 2398 b'diff',
2399 2399 [
2400 2400 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2401 2401 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2402 2402 ]
2403 2403 + diffopts
2404 2404 + diffopts2
2405 2405 + walkopts
2406 2406 + subrepoopts,
2407 2407 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2408 2408 helpcategory=command.CATEGORY_FILE_CONTENTS,
2409 2409 helpbasic=True,
2410 2410 inferrepo=True,
2411 2411 intents={INTENT_READONLY},
2412 2412 )
2413 2413 def diff(ui, repo, *pats, **opts):
2414 2414 """diff repository (or selected files)
2415 2415
2416 2416 Show differences between revisions for the specified files.
2417 2417
2418 2418 Differences between files are shown using the unified diff format.
2419 2419
2420 2420 .. note::
2421 2421
2422 2422 :hg:`diff` may generate unexpected results for merges, as it will
2423 2423 default to comparing against the working directory's first
2424 2424 parent changeset if no revisions are specified.
2425 2425
2426 2426 When two revision arguments are given, then changes are shown
2427 2427 between those revisions. If only one revision is specified then
2428 2428 that revision is compared to the working directory, and, when no
2429 2429 revisions are specified, the working directory files are compared
2430 2430 to its first parent.
2431 2431
2432 2432 Alternatively you can specify -c/--change with a revision to see
2433 2433 the changes in that changeset relative to its first parent.
2434 2434
2435 2435 Without the -a/--text option, diff will avoid generating diffs of
2436 2436 files it detects as binary. With -a, diff will generate a diff
2437 2437 anyway, probably with undesirable results.
2438 2438
2439 2439 Use the -g/--git option to generate diffs in the git extended diff
2440 2440 format. For more information, read :hg:`help diffs`.
2441 2441
2442 2442 .. container:: verbose
2443 2443
2444 2444 Examples:
2445 2445
2446 2446 - compare a file in the current working directory to its parent::
2447 2447
2448 2448 hg diff foo.c
2449 2449
2450 2450 - compare two historical versions of a directory, with rename info::
2451 2451
2452 2452 hg diff --git -r 1.0:1.2 lib/
2453 2453
2454 2454 - get change stats relative to the last change on some date::
2455 2455
2456 2456 hg diff --stat -r "date('may 2')"
2457 2457
2458 2458 - diff all newly-added files that contain a keyword::
2459 2459
2460 2460 hg diff "set:added() and grep(GNU)"
2461 2461
2462 2462 - compare a revision and its parents::
2463 2463
2464 2464 hg diff -c 9353 # compare against first parent
2465 2465 hg diff -r 9353^:9353 # same using revset syntax
2466 2466 hg diff -r 9353^2:9353 # compare against the second parent
2467 2467
2468 2468 Returns 0 on success.
2469 2469 """
2470 2470
2471 2471 opts = pycompat.byteskwargs(opts)
2472 2472 revs = opts.get(b'rev')
2473 2473 change = opts.get(b'change')
2474 2474 stat = opts.get(b'stat')
2475 2475 reverse = opts.get(b'reverse')
2476 2476
2477 2477 if revs and change:
2478 2478 msg = _(b'cannot specify --rev and --change at the same time')
2479 2479 raise error.Abort(msg)
2480 2480 elif change:
2481 2481 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2482 2482 ctx2 = scmutil.revsingle(repo, change, None)
2483 2483 ctx1 = ctx2.p1()
2484 2484 else:
2485 2485 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2486 2486 ctx1, ctx2 = scmutil.revpair(repo, revs)
2487 2487 node1, node2 = ctx1.node(), ctx2.node()
2488 2488
2489 2489 if reverse:
2490 2490 node1, node2 = node2, node1
2491 2491
2492 2492 diffopts = patch.diffallopts(ui, opts)
2493 2493 m = scmutil.match(ctx2, pats, opts)
2494 2494 m = repo.narrowmatch(m)
2495 2495 ui.pager(b'diff')
2496 2496 logcmdutil.diffordiffstat(
2497 2497 ui,
2498 2498 repo,
2499 2499 diffopts,
2500 2500 node1,
2501 2501 node2,
2502 2502 m,
2503 2503 stat=stat,
2504 2504 listsubrepos=opts.get(b'subrepos'),
2505 2505 root=opts.get(b'root'),
2506 2506 )
2507 2507
2508 2508
2509 2509 @command(
2510 2510 b'export',
2511 2511 [
2512 2512 (
2513 2513 b'B',
2514 2514 b'bookmark',
2515 2515 b'',
2516 2516 _(b'export changes only reachable by given bookmark'),
2517 2517 _(b'BOOKMARK'),
2518 2518 ),
2519 2519 (
2520 2520 b'o',
2521 2521 b'output',
2522 2522 b'',
2523 2523 _(b'print output to file with formatted name'),
2524 2524 _(b'FORMAT'),
2525 2525 ),
2526 2526 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2527 2527 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2528 2528 ]
2529 2529 + diffopts
2530 2530 + formatteropts,
2531 2531 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2532 2532 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2533 2533 helpbasic=True,
2534 2534 intents={INTENT_READONLY},
2535 2535 )
2536 2536 def export(ui, repo, *changesets, **opts):
2537 2537 """dump the header and diffs for one or more changesets
2538 2538
2539 2539 Print the changeset header and diffs for one or more revisions.
2540 2540 If no revision is given, the parent of the working directory is used.
2541 2541
2542 2542 The information shown in the changeset header is: author, date,
2543 2543 branch name (if non-default), changeset hash, parent(s) and commit
2544 2544 comment.
2545 2545
2546 2546 .. note::
2547 2547
2548 2548 :hg:`export` may generate unexpected diff output for merge
2549 2549 changesets, as it will compare the merge changeset against its
2550 2550 first parent only.
2551 2551
2552 2552 Output may be to a file, in which case the name of the file is
2553 2553 given using a template string. See :hg:`help templates`. In addition
2554 2554 to the common template keywords, the following formatting rules are
2555 2555 supported:
2556 2556
2557 2557 :``%%``: literal "%" character
2558 2558 :``%H``: changeset hash (40 hexadecimal digits)
2559 2559 :``%N``: number of patches being generated
2560 2560 :``%R``: changeset revision number
2561 2561 :``%b``: basename of the exporting repository
2562 2562 :``%h``: short-form changeset hash (12 hexadecimal digits)
2563 2563 :``%m``: first line of the commit message (only alphanumeric characters)
2564 2564 :``%n``: zero-padded sequence number, starting at 1
2565 2565 :``%r``: zero-padded changeset revision number
2566 2566 :``\\``: literal "\\" character
2567 2567
2568 2568 Without the -a/--text option, export will avoid generating diffs
2569 2569 of files it detects as binary. With -a, export will generate a
2570 2570 diff anyway, probably with undesirable results.
2571 2571
2572 2572 With -B/--bookmark changesets reachable by the given bookmark are
2573 2573 selected.
2574 2574
2575 2575 Use the -g/--git option to generate diffs in the git extended diff
2576 2576 format. See :hg:`help diffs` for more information.
2577 2577
2578 2578 With the --switch-parent option, the diff will be against the
2579 2579 second parent. It can be useful to review a merge.
2580 2580
2581 2581 .. container:: verbose
2582 2582
2583 2583 Template:
2584 2584
2585 2585 The following keywords are supported in addition to the common template
2586 2586 keywords and functions. See also :hg:`help templates`.
2587 2587
2588 2588 :diff: String. Diff content.
2589 2589 :parents: List of strings. Parent nodes of the changeset.
2590 2590
2591 2591 Examples:
2592 2592
2593 2593 - use export and import to transplant a bugfix to the current
2594 2594 branch::
2595 2595
2596 2596 hg export -r 9353 | hg import -
2597 2597
2598 2598 - export all the changesets between two revisions to a file with
2599 2599 rename information::
2600 2600
2601 2601 hg export --git -r 123:150 > changes.txt
2602 2602
2603 2603 - split outgoing changes into a series of patches with
2604 2604 descriptive names::
2605 2605
2606 2606 hg export -r "outgoing()" -o "%n-%m.patch"
2607 2607
2608 2608 Returns 0 on success.
2609 2609 """
2610 2610 opts = pycompat.byteskwargs(opts)
2611 2611 bookmark = opts.get(b'bookmark')
2612 2612 changesets += tuple(opts.get(b'rev', []))
2613 2613
2614 2614 if bookmark and changesets:
2615 2615 raise error.Abort(_(b"-r and -B are mutually exclusive"))
2616 2616
2617 2617 if bookmark:
2618 2618 if bookmark not in repo._bookmarks:
2619 2619 raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
2620 2620
2621 2621 revs = scmutil.bookmarkrevs(repo, bookmark)
2622 2622 else:
2623 2623 if not changesets:
2624 2624 changesets = [b'.']
2625 2625
2626 2626 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2627 2627 revs = scmutil.revrange(repo, changesets)
2628 2628
2629 2629 if not revs:
2630 2630 raise error.Abort(_(b"export requires at least one changeset"))
2631 2631 if len(revs) > 1:
2632 2632 ui.note(_(b'exporting patches:\n'))
2633 2633 else:
2634 2634 ui.note(_(b'exporting patch:\n'))
2635 2635
2636 2636 fntemplate = opts.get(b'output')
2637 2637 if cmdutil.isstdiofilename(fntemplate):
2638 2638 fntemplate = b''
2639 2639
2640 2640 if fntemplate:
2641 2641 fm = formatter.nullformatter(ui, b'export', opts)
2642 2642 else:
2643 2643 ui.pager(b'export')
2644 2644 fm = ui.formatter(b'export', opts)
2645 2645 with fm:
2646 2646 cmdutil.export(
2647 2647 repo,
2648 2648 revs,
2649 2649 fm,
2650 2650 fntemplate=fntemplate,
2651 2651 switch_parent=opts.get(b'switch_parent'),
2652 2652 opts=patch.diffallopts(ui, opts),
2653 2653 )
2654 2654
2655 2655
2656 2656 @command(
2657 2657 b'files',
2658 2658 [
2659 2659 (
2660 2660 b'r',
2661 2661 b'rev',
2662 2662 b'',
2663 2663 _(b'search the repository as it is in REV'),
2664 2664 _(b'REV'),
2665 2665 ),
2666 2666 (
2667 2667 b'0',
2668 2668 b'print0',
2669 2669 None,
2670 2670 _(b'end filenames with NUL, for use with xargs'),
2671 2671 ),
2672 2672 ]
2673 2673 + walkopts
2674 2674 + formatteropts
2675 2675 + subrepoopts,
2676 2676 _(b'[OPTION]... [FILE]...'),
2677 2677 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2678 2678 intents={INTENT_READONLY},
2679 2679 )
2680 2680 def files(ui, repo, *pats, **opts):
2681 2681 """list tracked files
2682 2682
2683 2683 Print files under Mercurial control in the working directory or
2684 2684 specified revision for given files (excluding removed files).
2685 2685 Files can be specified as filenames or filesets.
2686 2686
2687 2687 If no files are given to match, this command prints the names
2688 2688 of all files under Mercurial control.
2689 2689
2690 2690 .. container:: verbose
2691 2691
2692 2692 Template:
2693 2693
2694 2694 The following keywords are supported in addition to the common template
2695 2695 keywords and functions. See also :hg:`help templates`.
2696 2696
2697 2697 :flags: String. Character denoting file's symlink and executable bits.
2698 2698 :path: String. Repository-absolute path of the file.
2699 2699 :size: Integer. Size of the file in bytes.
2700 2700
2701 2701 Examples:
2702 2702
2703 2703 - list all files under the current directory::
2704 2704
2705 2705 hg files .
2706 2706
2707 2707 - shows sizes and flags for current revision::
2708 2708
2709 2709 hg files -vr .
2710 2710
2711 2711 - list all files named README::
2712 2712
2713 2713 hg files -I "**/README"
2714 2714
2715 2715 - list all binary files::
2716 2716
2717 2717 hg files "set:binary()"
2718 2718
2719 2719 - find files containing a regular expression::
2720 2720
2721 2721 hg files "set:grep('bob')"
2722 2722
2723 2723 - search tracked file contents with xargs and grep::
2724 2724
2725 2725 hg files -0 | xargs -0 grep foo
2726 2726
2727 2727 See :hg:`help patterns` and :hg:`help filesets` for more information
2728 2728 on specifying file patterns.
2729 2729
2730 2730 Returns 0 if a match is found, 1 otherwise.
2731 2731
2732 2732 """
2733 2733
2734 2734 opts = pycompat.byteskwargs(opts)
2735 2735 rev = opts.get(b'rev')
2736 2736 if rev:
2737 2737 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2738 2738 ctx = scmutil.revsingle(repo, rev, None)
2739 2739
2740 2740 end = b'\n'
2741 2741 if opts.get(b'print0'):
2742 2742 end = b'\0'
2743 2743 fmt = b'%s' + end
2744 2744
2745 2745 m = scmutil.match(ctx, pats, opts)
2746 2746 ui.pager(b'files')
2747 2747 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2748 2748 with ui.formatter(b'files', opts) as fm:
2749 2749 return cmdutil.files(
2750 2750 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2751 2751 )
2752 2752
2753 2753
2754 2754 @command(
2755 2755 b'forget',
2756 2756 [(b'i', b'interactive', None, _(b'use interactive mode')),]
2757 2757 + walkopts
2758 2758 + dryrunopts,
2759 2759 _(b'[OPTION]... FILE...'),
2760 2760 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2761 2761 helpbasic=True,
2762 2762 inferrepo=True,
2763 2763 )
2764 2764 def forget(ui, repo, *pats, **opts):
2765 2765 """forget the specified files on the next commit
2766 2766
2767 2767 Mark the specified files so they will no longer be tracked
2768 2768 after the next commit.
2769 2769
2770 2770 This only removes files from the current branch, not from the
2771 2771 entire project history, and it does not delete them from the
2772 2772 working directory.
2773 2773
2774 2774 To delete the file from the working directory, see :hg:`remove`.
2775 2775
2776 2776 To undo a forget before the next commit, see :hg:`add`.
2777 2777
2778 2778 .. container:: verbose
2779 2779
2780 2780 Examples:
2781 2781
2782 2782 - forget newly-added binary files::
2783 2783
2784 2784 hg forget "set:added() and binary()"
2785 2785
2786 2786 - forget files that would be excluded by .hgignore::
2787 2787
2788 2788 hg forget "set:hgignore()"
2789 2789
2790 2790 Returns 0 on success.
2791 2791 """
2792 2792
2793 2793 opts = pycompat.byteskwargs(opts)
2794 2794 if not pats:
2795 2795 raise error.Abort(_(b'no files specified'))
2796 2796
2797 2797 m = scmutil.match(repo[None], pats, opts)
2798 2798 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2799 2799 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2800 2800 rejected = cmdutil.forget(
2801 2801 ui,
2802 2802 repo,
2803 2803 m,
2804 2804 prefix=b"",
2805 2805 uipathfn=uipathfn,
2806 2806 explicitonly=False,
2807 2807 dryrun=dryrun,
2808 2808 interactive=interactive,
2809 2809 )[0]
2810 2810 return rejected and 1 or 0
2811 2811
2812 2812
2813 2813 @command(
2814 2814 b'graft',
2815 2815 [
2816 2816 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2817 2817 (
2818 2818 b'',
2819 2819 b'base',
2820 2820 b'',
2821 2821 _(b'base revision when doing the graft merge (ADVANCED)'),
2822 2822 _(b'REV'),
2823 2823 ),
2824 2824 (b'c', b'continue', False, _(b'resume interrupted graft')),
2825 2825 (b'', b'stop', False, _(b'stop interrupted graft')),
2826 2826 (b'', b'abort', False, _(b'abort interrupted graft')),
2827 2827 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2828 2828 (b'', b'log', None, _(b'append graft info to log message')),
2829 2829 (
2830 2830 b'',
2831 2831 b'no-commit',
2832 2832 None,
2833 2833 _(b"don't commit, just apply the changes in working directory"),
2834 2834 ),
2835 2835 (b'f', b'force', False, _(b'force graft')),
2836 2836 (
2837 2837 b'D',
2838 2838 b'currentdate',
2839 2839 False,
2840 2840 _(b'record the current date as commit date'),
2841 2841 ),
2842 2842 (
2843 2843 b'U',
2844 2844 b'currentuser',
2845 2845 False,
2846 2846 _(b'record the current user as committer'),
2847 2847 ),
2848 2848 ]
2849 2849 + commitopts2
2850 2850 + mergetoolopts
2851 2851 + dryrunopts,
2852 2852 _(b'[OPTION]... [-r REV]... REV...'),
2853 2853 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2854 2854 )
2855 2855 def graft(ui, repo, *revs, **opts):
2856 2856 '''copy changes from other branches onto the current branch
2857 2857
2858 2858 This command uses Mercurial's merge logic to copy individual
2859 2859 changes from other branches without merging branches in the
2860 2860 history graph. This is sometimes known as 'backporting' or
2861 2861 'cherry-picking'. By default, graft will copy user, date, and
2862 2862 description from the source changesets.
2863 2863
2864 2864 Changesets that are ancestors of the current revision, that have
2865 2865 already been grafted, or that are merges will be skipped.
2866 2866
2867 2867 If --log is specified, log messages will have a comment appended
2868 2868 of the form::
2869 2869
2870 2870 (grafted from CHANGESETHASH)
2871 2871
2872 2872 If --force is specified, revisions will be grafted even if they
2873 2873 are already ancestors of, or have been grafted to, the destination.
2874 2874 This is useful when the revisions have since been backed out.
2875 2875
2876 2876 If a graft merge results in conflicts, the graft process is
2877 2877 interrupted so that the current merge can be manually resolved.
2878 2878 Once all conflicts are addressed, the graft process can be
2879 2879 continued with the -c/--continue option.
2880 2880
2881 2881 The -c/--continue option reapplies all the earlier options.
2882 2882
2883 2883 .. container:: verbose
2884 2884
2885 2885 The --base option exposes more of how graft internally uses merge with a
2886 2886 custom base revision. --base can be used to specify another ancestor than
2887 2887 the first and only parent.
2888 2888
2889 2889 The command::
2890 2890
2891 2891 hg graft -r 345 --base 234
2892 2892
2893 2893 is thus pretty much the same as::
2894 2894
2895 2895 hg diff -r 234 -r 345 | hg import
2896 2896
2897 2897 but using merge to resolve conflicts and track moved files.
2898 2898
2899 2899 The result of a merge can thus be backported as a single commit by
2900 2900 specifying one of the merge parents as base, and thus effectively
2901 2901 grafting the changes from the other side.
2902 2902
2903 2903 It is also possible to collapse multiple changesets and clean up history
2904 2904 by specifying another ancestor as base, much like rebase --collapse
2905 2905 --keep.
2906 2906
2907 2907 The commit message can be tweaked after the fact using commit --amend .
2908 2908
2909 2909 For using non-ancestors as the base to backout changes, see the backout
2910 2910 command and the hidden --parent option.
2911 2911
2912 2912 .. container:: verbose
2913 2913
2914 2914 Examples:
2915 2915
2916 2916 - copy a single change to the stable branch and edit its description::
2917 2917
2918 2918 hg update stable
2919 2919 hg graft --edit 9393
2920 2920
2921 2921 - graft a range of changesets with one exception, updating dates::
2922 2922
2923 2923 hg graft -D "2085::2093 and not 2091"
2924 2924
2925 2925 - continue a graft after resolving conflicts::
2926 2926
2927 2927 hg graft -c
2928 2928
2929 2929 - show the source of a grafted changeset::
2930 2930
2931 2931 hg log --debug -r .
2932 2932
2933 2933 - show revisions sorted by date::
2934 2934
2935 2935 hg log -r "sort(all(), date)"
2936 2936
2937 2937 - backport the result of a merge as a single commit::
2938 2938
2939 2939 hg graft -r 123 --base 123^
2940 2940
2941 2941 - land a feature branch as one changeset::
2942 2942
2943 2943 hg up -cr default
2944 2944 hg graft -r featureX --base "ancestor('featureX', 'default')"
2945 2945
2946 2946 See :hg:`help revisions` for more about specifying revisions.
2947 2947
2948 2948 Returns 0 on successful completion.
2949 2949 '''
2950 2950 with repo.wlock():
2951 2951 return _dograft(ui, repo, *revs, **opts)
2952 2952
2953 2953
2954 2954 def _dograft(ui, repo, *revs, **opts):
2955 2955 opts = pycompat.byteskwargs(opts)
2956 2956 if revs and opts.get(b'rev'):
2957 2957 ui.warn(
2958 2958 _(
2959 2959 b'warning: inconsistent use of --rev might give unexpected '
2960 2960 b'revision ordering!\n'
2961 2961 )
2962 2962 )
2963 2963
2964 2964 revs = list(revs)
2965 2965 revs.extend(opts.get(b'rev'))
2966 2966 basectx = None
2967 2967 if opts.get(b'base'):
2968 2968 basectx = scmutil.revsingle(repo, opts[b'base'], None)
2969 2969 # a dict of data to be stored in state file
2970 2970 statedata = {}
2971 2971 # list of new nodes created by ongoing graft
2972 2972 statedata[b'newnodes'] = []
2973 2973
2974 2974 if opts.get(b'user') and opts.get(b'currentuser'):
2975 2975 raise error.Abort(_(b'--user and --currentuser are mutually exclusive'))
2976 2976 if opts.get(b'date') and opts.get(b'currentdate'):
2977 2977 raise error.Abort(_(b'--date and --currentdate are mutually exclusive'))
2978 2978 if not opts.get(b'user') and opts.get(b'currentuser'):
2979 2979 opts[b'user'] = ui.username()
2980 2980 if not opts.get(b'date') and opts.get(b'currentdate'):
2981 2981 opts[b'date'] = b"%d %d" % dateutil.makedate()
2982 2982
2983 2983 editor = cmdutil.getcommiteditor(
2984 2984 editform=b'graft', **pycompat.strkwargs(opts)
2985 2985 )
2986 2986
2987 2987 cont = False
2988 2988 if opts.get(b'no_commit'):
2989 2989 if opts.get(b'edit'):
2990 2990 raise error.Abort(
2991 2991 _(b"cannot specify --no-commit and --edit together")
2992 2992 )
2993 2993 if opts.get(b'currentuser'):
2994 2994 raise error.Abort(
2995 2995 _(b"cannot specify --no-commit and --currentuser together")
2996 2996 )
2997 2997 if opts.get(b'currentdate'):
2998 2998 raise error.Abort(
2999 2999 _(b"cannot specify --no-commit and --currentdate together")
3000 3000 )
3001 3001 if opts.get(b'log'):
3002 3002 raise error.Abort(
3003 3003 _(b"cannot specify --no-commit and --log together")
3004 3004 )
3005 3005
3006 3006 graftstate = statemod.cmdstate(repo, b'graftstate')
3007 3007
3008 3008 if opts.get(b'stop'):
3009 3009 if opts.get(b'continue'):
3010 3010 raise error.Abort(
3011 3011 _(b"cannot use '--continue' and '--stop' together")
3012 3012 )
3013 3013 if opts.get(b'abort'):
3014 3014 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
3015 3015
3016 3016 if any(
3017 3017 (
3018 3018 opts.get(b'edit'),
3019 3019 opts.get(b'log'),
3020 3020 opts.get(b'user'),
3021 3021 opts.get(b'date'),
3022 3022 opts.get(b'currentdate'),
3023 3023 opts.get(b'currentuser'),
3024 3024 opts.get(b'rev'),
3025 3025 )
3026 3026 ):
3027 3027 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
3028 3028 return _stopgraft(ui, repo, graftstate)
3029 3029 elif opts.get(b'abort'):
3030 3030 if opts.get(b'continue'):
3031 3031 raise error.Abort(
3032 3032 _(b"cannot use '--continue' and '--abort' together")
3033 3033 )
3034 3034 if any(
3035 3035 (
3036 3036 opts.get(b'edit'),
3037 3037 opts.get(b'log'),
3038 3038 opts.get(b'user'),
3039 3039 opts.get(b'date'),
3040 3040 opts.get(b'currentdate'),
3041 3041 opts.get(b'currentuser'),
3042 3042 opts.get(b'rev'),
3043 3043 )
3044 3044 ):
3045 3045 raise error.Abort(
3046 3046 _(b"cannot specify any other flag with '--abort'")
3047 3047 )
3048 3048
3049 3049 return cmdutil.abortgraft(ui, repo, graftstate)
3050 3050 elif opts.get(b'continue'):
3051 3051 cont = True
3052 3052 if revs:
3053 3053 raise error.Abort(_(b"can't specify --continue and revisions"))
3054 3054 # read in unfinished revisions
3055 3055 if graftstate.exists():
3056 3056 statedata = cmdutil.readgraftstate(repo, graftstate)
3057 3057 if statedata.get(b'date'):
3058 3058 opts[b'date'] = statedata[b'date']
3059 3059 if statedata.get(b'user'):
3060 3060 opts[b'user'] = statedata[b'user']
3061 3061 if statedata.get(b'log'):
3062 3062 opts[b'log'] = True
3063 3063 if statedata.get(b'no_commit'):
3064 3064 opts[b'no_commit'] = statedata.get(b'no_commit')
3065 3065 nodes = statedata[b'nodes']
3066 3066 revs = [repo[node].rev() for node in nodes]
3067 3067 else:
3068 3068 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3069 3069 else:
3070 3070 if not revs:
3071 3071 raise error.Abort(_(b'no revisions specified'))
3072 3072 cmdutil.checkunfinished(repo)
3073 3073 cmdutil.bailifchanged(repo)
3074 3074 revs = scmutil.revrange(repo, revs)
3075 3075
3076 3076 skipped = set()
3077 3077 if basectx is None:
3078 3078 # check for merges
3079 3079 for rev in repo.revs(b'%ld and merge()', revs):
3080 3080 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3081 3081 skipped.add(rev)
3082 3082 revs = [r for r in revs if r not in skipped]
3083 3083 if not revs:
3084 3084 return -1
3085 3085 if basectx is not None and len(revs) != 1:
3086 3086 raise error.Abort(_(b'only one revision allowed with --base '))
3087 3087
3088 3088 # Don't check in the --continue case, in effect retaining --force across
3089 3089 # --continues. That's because without --force, any revisions we decided to
3090 3090 # skip would have been filtered out here, so they wouldn't have made their
3091 3091 # way to the graftstate. With --force, any revisions we would have otherwise
3092 3092 # skipped would not have been filtered out, and if they hadn't been applied
3093 3093 # already, they'd have been in the graftstate.
3094 3094 if not (cont or opts.get(b'force')) and basectx is None:
3095 3095 # check for ancestors of dest branch
3096 3096 crev = repo[b'.'].rev()
3097 3097 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3098 3098 # XXX make this lazy in the future
3099 3099 # don't mutate while iterating, create a copy
3100 3100 for rev in list(revs):
3101 3101 if rev in ancestors:
3102 3102 ui.warn(
3103 3103 _(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev])
3104 3104 )
3105 3105 # XXX remove on list is slow
3106 3106 revs.remove(rev)
3107 3107 if not revs:
3108 3108 return -1
3109 3109
3110 3110 # analyze revs for earlier grafts
3111 3111 ids = {}
3112 3112 for ctx in repo.set(b"%ld", revs):
3113 3113 ids[ctx.hex()] = ctx.rev()
3114 3114 n = ctx.extra().get(b'source')
3115 3115 if n:
3116 3116 ids[n] = ctx.rev()
3117 3117
3118 3118 # check ancestors for earlier grafts
3119 3119 ui.debug(b'scanning for duplicate grafts\n')
3120 3120
3121 3121 # The only changesets we can be sure doesn't contain grafts of any
3122 3122 # revs, are the ones that are common ancestors of *all* revs:
3123 3123 for rev in repo.revs(b'only(%d,ancestor(%ld))', crev, revs):
3124 3124 ctx = repo[rev]
3125 3125 n = ctx.extra().get(b'source')
3126 3126 if n in ids:
3127 3127 try:
3128 3128 r = repo[n].rev()
3129 3129 except error.RepoLookupError:
3130 3130 r = None
3131 3131 if r in revs:
3132 3132 ui.warn(
3133 3133 _(
3134 3134 b'skipping revision %d:%s '
3135 3135 b'(already grafted to %d:%s)\n'
3136 3136 )
3137 3137 % (r, repo[r], rev, ctx)
3138 3138 )
3139 3139 revs.remove(r)
3140 3140 elif ids[n] in revs:
3141 3141 if r is None:
3142 3142 ui.warn(
3143 3143 _(
3144 3144 b'skipping already grafted revision %d:%s '
3145 3145 b'(%d:%s also has unknown origin %s)\n'
3146 3146 )
3147 3147 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3148 3148 )
3149 3149 else:
3150 3150 ui.warn(
3151 3151 _(
3152 3152 b'skipping already grafted revision %d:%s '
3153 3153 b'(%d:%s also has origin %d:%s)\n'
3154 3154 )
3155 3155 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3156 3156 )
3157 3157 revs.remove(ids[n])
3158 3158 elif ctx.hex() in ids:
3159 3159 r = ids[ctx.hex()]
3160 3160 if r in revs:
3161 3161 ui.warn(
3162 3162 _(
3163 3163 b'skipping already grafted revision %d:%s '
3164 3164 b'(was grafted from %d:%s)\n'
3165 3165 )
3166 3166 % (r, repo[r], rev, ctx)
3167 3167 )
3168 3168 revs.remove(r)
3169 3169 if not revs:
3170 3170 return -1
3171 3171
3172 3172 if opts.get(b'no_commit'):
3173 3173 statedata[b'no_commit'] = True
3174 3174 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3175 3175 desc = b'%d:%s "%s"' % (
3176 3176 ctx.rev(),
3177 3177 ctx,
3178 3178 ctx.description().split(b'\n', 1)[0],
3179 3179 )
3180 3180 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3181 3181 if names:
3182 3182 desc += b' (%s)' % b' '.join(names)
3183 3183 ui.status(_(b'grafting %s\n') % desc)
3184 3184 if opts.get(b'dry_run'):
3185 3185 continue
3186 3186
3187 3187 source = ctx.extra().get(b'source')
3188 3188 extra = {}
3189 3189 if source:
3190 3190 extra[b'source'] = source
3191 3191 extra[b'intermediate-source'] = ctx.hex()
3192 3192 else:
3193 3193 extra[b'source'] = ctx.hex()
3194 3194 user = ctx.user()
3195 3195 if opts.get(b'user'):
3196 3196 user = opts[b'user']
3197 3197 statedata[b'user'] = user
3198 3198 date = ctx.date()
3199 3199 if opts.get(b'date'):
3200 3200 date = opts[b'date']
3201 3201 statedata[b'date'] = date
3202 3202 message = ctx.description()
3203 3203 if opts.get(b'log'):
3204 3204 message += b'\n(grafted from %s)' % ctx.hex()
3205 3205 statedata[b'log'] = True
3206 3206
3207 3207 # we don't merge the first commit when continuing
3208 3208 if not cont:
3209 3209 # perform the graft merge with p1(rev) as 'ancestor'
3210 3210 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3211 3211 base = ctx.p1() if basectx is None else basectx
3212 3212 with ui.configoverride(overrides, b'graft'):
3213 3213 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3214 3214 # report any conflicts
3215 3215 if stats.unresolvedcount > 0:
3216 3216 # write out state for --continue
3217 3217 nodes = [repo[rev].hex() for rev in revs[pos:]]
3218 3218 statedata[b'nodes'] = nodes
3219 3219 stateversion = 1
3220 3220 graftstate.save(stateversion, statedata)
3221 3221 hint = _(b"use 'hg resolve' and 'hg graft --continue'")
3222 3222 raise error.Abort(
3223 3223 _(b"unresolved conflicts, can't continue"), hint=hint
3224 3224 )
3225 3225 else:
3226 3226 cont = False
3227 3227
3228 3228 # commit if --no-commit is false
3229 3229 if not opts.get(b'no_commit'):
3230 3230 node = repo.commit(
3231 3231 text=message, user=user, date=date, extra=extra, editor=editor
3232 3232 )
3233 3233 if node is None:
3234 3234 ui.warn(
3235 3235 _(b'note: graft of %d:%s created no changes to commit\n')
3236 3236 % (ctx.rev(), ctx)
3237 3237 )
3238 3238 # checking that newnodes exist because old state files won't have it
3239 3239 elif statedata.get(b'newnodes') is not None:
3240 3240 statedata[b'newnodes'].append(node)
3241 3241
3242 3242 # remove state when we complete successfully
3243 3243 if not opts.get(b'dry_run'):
3244 3244 graftstate.delete()
3245 3245
3246 3246 return 0
3247 3247
3248 3248
3249 3249 def _stopgraft(ui, repo, graftstate):
3250 3250 """stop the interrupted graft"""
3251 3251 if not graftstate.exists():
3252 3252 raise error.Abort(_(b"no interrupted graft found"))
3253 3253 pctx = repo[b'.']
3254 3254 hg.updaterepo(repo, pctx.node(), overwrite=True)
3255 3255 graftstate.delete()
3256 3256 ui.status(_(b"stopped the interrupted graft\n"))
3257 3257 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3258 3258 return 0
3259 3259
3260 3260
3261 3261 statemod.addunfinished(
3262 3262 b'graft',
3263 3263 fname=b'graftstate',
3264 3264 clearable=True,
3265 3265 stopflag=True,
3266 3266 continueflag=True,
3267 3267 abortfunc=cmdutil.hgabortgraft,
3268 3268 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3269 3269 )
3270 3270
3271 3271
3272 3272 @command(
3273 3273 b'grep',
3274 3274 [
3275 3275 (b'0', b'print0', None, _(b'end fields with NUL')),
3276 3276 (b'', b'all', None, _(b'print all revisions that match (DEPRECATED) ')),
3277 3277 (
3278 3278 b'',
3279 3279 b'diff',
3280 3280 None,
3281 3281 _(
3282 3282 b'search revision differences for when the pattern was added '
3283 3283 b'or removed'
3284 3284 ),
3285 3285 ),
3286 3286 (b'a', b'text', None, _(b'treat all files as text')),
3287 3287 (
3288 3288 b'f',
3289 3289 b'follow',
3290 3290 None,
3291 3291 _(
3292 3292 b'follow changeset history,'
3293 3293 b' or file history across copies and renames'
3294 3294 ),
3295 3295 ),
3296 3296 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3297 3297 (
3298 3298 b'l',
3299 3299 b'files-with-matches',
3300 3300 None,
3301 3301 _(b'print only filenames and revisions that match'),
3302 3302 ),
3303 3303 (b'n', b'line-number', None, _(b'print matching line numbers')),
3304 3304 (
3305 3305 b'r',
3306 3306 b'rev',
3307 3307 [],
3308 3308 _(b'search files changed within revision range'),
3309 3309 _(b'REV'),
3310 3310 ),
3311 3311 (
3312 3312 b'',
3313 3313 b'all-files',
3314 3314 None,
3315 3315 _(
3316 3316 b'include all files in the changeset while grepping (DEPRECATED)'
3317 3317 ),
3318 3318 ),
3319 3319 (b'u', b'user', None, _(b'list the author (long with -v)')),
3320 3320 (b'd', b'date', None, _(b'list the date (short with -q)')),
3321 3321 ]
3322 3322 + formatteropts
3323 3323 + walkopts,
3324 3324 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3325 3325 helpcategory=command.CATEGORY_FILE_CONTENTS,
3326 3326 inferrepo=True,
3327 3327 intents={INTENT_READONLY},
3328 3328 )
3329 3329 def grep(ui, repo, pattern, *pats, **opts):
3330 3330 """search for a pattern in specified files
3331 3331
3332 3332 Search the working directory or revision history for a regular
3333 3333 expression in the specified files for the entire repository.
3334 3334
3335 3335 By default, grep searches the repository files in the working
3336 3336 directory and prints the files where it finds a match. To specify
3337 3337 historical revisions instead of the working directory, use the
3338 3338 --rev flag.
3339 3339
3340 3340 To search instead historical revision differences that contains a
3341 3341 change in match status ("-" for a match that becomes a non-match,
3342 3342 or "+" for a non-match that becomes a match), use the --diff flag.
3343 3343
3344 3344 PATTERN can be any Python (roughly Perl-compatible) regular
3345 3345 expression.
3346 3346
3347 3347 If no FILEs are specified and the --rev flag isn't supplied, all
3348 3348 files in the working directory are searched. When using the --rev
3349 3349 flag and specifying FILEs, use the --follow argument to also
3350 3350 follow the specified FILEs across renames and copies.
3351 3351
3352 3352 .. container:: verbose
3353 3353
3354 3354 Template:
3355 3355
3356 3356 The following keywords are supported in addition to the common template
3357 3357 keywords and functions. See also :hg:`help templates`.
3358 3358
3359 3359 :change: String. Character denoting insertion ``+`` or removal ``-``.
3360 3360 Available if ``--diff`` is specified.
3361 3361 :lineno: Integer. Line number of the match.
3362 3362 :path: String. Repository-absolute path of the file.
3363 3363 :texts: List of text chunks.
3364 3364
3365 3365 And each entry of ``{texts}`` provides the following sub-keywords.
3366 3366
3367 3367 :matched: Boolean. True if the chunk matches the specified pattern.
3368 3368 :text: String. Chunk content.
3369 3369
3370 3370 See :hg:`help templates.operators` for the list expansion syntax.
3371 3371
3372 3372 Returns 0 if a match is found, 1 otherwise.
3373 3373
3374 3374 """
3375 3375 opts = pycompat.byteskwargs(opts)
3376 3376 diff = opts.get(b'all') or opts.get(b'diff')
3377 3377 if diff and opts.get(b'all_files'):
3378 3378 raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
3379 3379 if opts.get(b'all_files') is None and not diff:
3380 3380 opts[b'all_files'] = True
3381 3381 plaingrep = opts.get(b'all_files') and not opts.get(b'rev')
3382 3382 all_files = opts.get(b'all_files')
3383 3383 if plaingrep:
3384 3384 opts[b'rev'] = [b'wdir()']
3385 3385
3386 3386 reflags = re.M
3387 3387 if opts.get(b'ignore_case'):
3388 3388 reflags |= re.I
3389 3389 try:
3390 3390 regexp = util.re.compile(pattern, reflags)
3391 3391 except re.error as inst:
3392 3392 ui.warn(
3393 3393 _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
3394 3394 )
3395 3395 return 1
3396 3396 sep, eol = b':', b'\n'
3397 3397 if opts.get(b'print0'):
3398 3398 sep = eol = b'\0'
3399 3399
3400 3400 getfile = util.lrucachefunc(repo.file)
3401 3401
3402 3402 def matchlines(body):
3403 3403 begin = 0
3404 3404 linenum = 0
3405 3405 while begin < len(body):
3406 3406 match = regexp.search(body, begin)
3407 3407 if not match:
3408 3408 break
3409 3409 mstart, mend = match.span()
3410 3410 linenum += body.count(b'\n', begin, mstart) + 1
3411 3411 lstart = body.rfind(b'\n', begin, mstart) + 1 or begin
3412 3412 begin = body.find(b'\n', mend) + 1 or len(body) + 1
3413 3413 lend = begin - 1
3414 3414 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3415 3415
3416 3416 class linestate(object):
3417 3417 def __init__(self, line, linenum, colstart, colend):
3418 3418 self.line = line
3419 3419 self.linenum = linenum
3420 3420 self.colstart = colstart
3421 3421 self.colend = colend
3422 3422
3423 3423 def __hash__(self):
3424 3424 return hash((self.linenum, self.line))
3425 3425
3426 3426 def __eq__(self, other):
3427 3427 return self.line == other.line
3428 3428
3429 3429 def findpos(self):
3430 3430 """Iterate all (start, end) indices of matches"""
3431 3431 yield self.colstart, self.colend
3432 3432 p = self.colend
3433 3433 while p < len(self.line):
3434 3434 m = regexp.search(self.line, p)
3435 3435 if not m:
3436 3436 break
3437 3437 yield m.span()
3438 3438 p = m.end()
3439 3439
3440 3440 matches = {}
3441 3441 copies = {}
3442 3442
3443 3443 def grepbody(fn, rev, body):
3444 3444 matches[rev].setdefault(fn, [])
3445 3445 m = matches[rev][fn]
3446 3446 if body is None:
3447 3447 return
3448 3448
3449 3449 for lnum, cstart, cend, line in matchlines(body):
3450 3450 s = linestate(line, lnum, cstart, cend)
3451 3451 m.append(s)
3452 3452
3453 3453 def difflinestates(a, b):
3454 3454 sm = difflib.SequenceMatcher(None, a, b)
3455 3455 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3456 3456 if tag == 'insert':
3457 3457 for i in pycompat.xrange(blo, bhi):
3458 3458 yield (b'+', b[i])
3459 3459 elif tag == 'delete':
3460 3460 for i in pycompat.xrange(alo, ahi):
3461 3461 yield (b'-', a[i])
3462 3462 elif tag == 'replace':
3463 3463 for i in pycompat.xrange(alo, ahi):
3464 3464 yield (b'-', a[i])
3465 3465 for i in pycompat.xrange(blo, bhi):
3466 3466 yield (b'+', b[i])
3467 3467
3468 3468 uipathfn = scmutil.getuipathfn(repo)
3469 3469
3470 3470 def display(fm, fn, ctx, pstates, states):
3471 3471 rev = scmutil.intrev(ctx)
3472 3472 if fm.isplain():
3473 3473 formatuser = ui.shortuser
3474 3474 else:
3475 3475 formatuser = pycompat.bytestr
3476 3476 if ui.quiet:
3477 3477 datefmt = b'%Y-%m-%d'
3478 3478 else:
3479 3479 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3480 3480 found = False
3481 3481
3482 3482 @util.cachefunc
3483 3483 def binary():
3484 3484 flog = getfile(fn)
3485 3485 try:
3486 3486 return stringutil.binary(flog.read(ctx.filenode(fn)))
3487 3487 except error.WdirUnsupported:
3488 3488 return ctx[fn].isbinary()
3489 3489
3490 3490 fieldnamemap = {b'linenumber': b'lineno'}
3491 3491 if diff:
3492 3492 iter = difflinestates(pstates, states)
3493 3493 else:
3494 3494 iter = [(b'', l) for l in states]
3495 3495 for change, l in iter:
3496 3496 fm.startitem()
3497 3497 fm.context(ctx=ctx)
3498 3498 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3499 3499 fm.plain(uipathfn(fn), label=b'grep.filename')
3500 3500
3501 3501 cols = [
3502 3502 (b'rev', b'%d', rev, not plaingrep, b''),
3503 3503 (
3504 3504 b'linenumber',
3505 3505 b'%d',
3506 3506 l.linenum,
3507 3507 opts.get(b'line_number'),
3508 3508 b'',
3509 3509 ),
3510 3510 ]
3511 3511 if diff:
3512 3512 cols.append(
3513 3513 (
3514 3514 b'change',
3515 3515 b'%s',
3516 3516 change,
3517 3517 True,
3518 3518 b'grep.inserted '
3519 3519 if change == b'+'
3520 3520 else b'grep.deleted ',
3521 3521 )
3522 3522 )
3523 3523 cols.extend(
3524 3524 [
3525 3525 (
3526 3526 b'user',
3527 3527 b'%s',
3528 3528 formatuser(ctx.user()),
3529 3529 opts.get(b'user'),
3530 3530 b'',
3531 3531 ),
3532 3532 (
3533 3533 b'date',
3534 3534 b'%s',
3535 3535 fm.formatdate(ctx.date(), datefmt),
3536 3536 opts.get(b'date'),
3537 3537 b'',
3538 3538 ),
3539 3539 ]
3540 3540 )
3541 3541 for name, fmt, data, cond, extra_label in cols:
3542 3542 if cond:
3543 3543 fm.plain(sep, label=b'grep.sep')
3544 3544 field = fieldnamemap.get(name, name)
3545 3545 label = extra_label + (b'grep.%s' % name)
3546 3546 fm.condwrite(cond, field, fmt, data, label=label)
3547 3547 if not opts.get(b'files_with_matches'):
3548 3548 fm.plain(sep, label=b'grep.sep')
3549 3549 if not opts.get(b'text') and binary():
3550 3550 fm.plain(_(b" Binary file matches"))
3551 3551 else:
3552 3552 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3553 3553 fm.plain(eol)
3554 3554 found = True
3555 3555 if opts.get(b'files_with_matches'):
3556 3556 break
3557 3557 return found
3558 3558
3559 3559 def displaymatches(fm, l):
3560 3560 p = 0
3561 3561 for s, e in l.findpos():
3562 3562 if p < s:
3563 3563 fm.startitem()
3564 3564 fm.write(b'text', b'%s', l.line[p:s])
3565 3565 fm.data(matched=False)
3566 3566 fm.startitem()
3567 3567 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3568 3568 fm.data(matched=True)
3569 3569 p = e
3570 3570 if p < len(l.line):
3571 3571 fm.startitem()
3572 3572 fm.write(b'text', b'%s', l.line[p:])
3573 3573 fm.data(matched=False)
3574 3574 fm.end()
3575 3575
3576 3576 skip = set()
3577 3577 revfiles = {}
3578 3578 match = scmutil.match(repo[None], pats, opts)
3579 3579 found = False
3580 3580 follow = opts.get(b'follow')
3581 3581
3582 3582 getrenamed = scmutil.getrenamedfn(repo)
3583 3583
3584 3584 def get_file_content(filename, filelog, filenode, context, revision):
3585 3585 try:
3586 3586 content = filelog.read(filenode)
3587 3587 except error.WdirUnsupported:
3588 3588 content = context[filename].data()
3589 3589 except error.CensoredNodeError:
3590 3590 content = None
3591 3591 ui.warn(
3592 3592 _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
3593 3593 % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
3594 3594 )
3595 3595 return content
3596 3596
3597 3597 def prep(ctx, fns):
3598 3598 rev = ctx.rev()
3599 3599 pctx = ctx.p1()
3600 3600 parent = pctx.rev()
3601 3601 matches.setdefault(rev, {})
3602 3602 matches.setdefault(parent, {})
3603 3603 files = revfiles.setdefault(rev, [])
3604 3604 for fn in fns:
3605 3605 flog = getfile(fn)
3606 3606 try:
3607 3607 fnode = ctx.filenode(fn)
3608 3608 except error.LookupError:
3609 3609 continue
3610 3610
3611 3611 copy = None
3612 3612 if follow:
3613 3613 copy = getrenamed(fn, rev)
3614 3614 if copy:
3615 3615 copies.setdefault(rev, {})[fn] = copy
3616 3616 if fn in skip:
3617 3617 skip.add(copy)
3618 3618 if fn in skip:
3619 3619 continue
3620 3620 files.append(fn)
3621 3621
3622 3622 if fn not in matches[rev]:
3623 3623 content = get_file_content(fn, flog, fnode, ctx, rev)
3624 3624 grepbody(fn, rev, content)
3625 3625
3626 3626 pfn = copy or fn
3627 3627 if pfn not in matches[parent]:
3628 3628 try:
3629 3629 pfnode = pctx.filenode(pfn)
3630 3630 pcontent = get_file_content(pfn, flog, pfnode, pctx, parent)
3631 3631 grepbody(pfn, parent, pcontent)
3632 3632 except error.LookupError:
3633 3633 pass
3634 3634
3635 3635 ui.pager(b'grep')
3636 3636 fm = ui.formatter(b'grep', opts)
3637 3637 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3638 3638 rev = ctx.rev()
3639 3639 parent = ctx.p1().rev()
3640 3640 for fn in sorted(revfiles.get(rev, [])):
3641 3641 states = matches[rev][fn]
3642 3642 copy = copies.get(rev, {}).get(fn)
3643 3643 if fn in skip:
3644 3644 if copy:
3645 3645 skip.add(copy)
3646 3646 continue
3647 3647 pstates = matches.get(parent, {}).get(copy or fn, [])
3648 3648 if pstates or states:
3649 3649 r = display(fm, fn, ctx, pstates, states)
3650 3650 found = found or r
3651 3651 if r and not diff and not all_files:
3652 3652 skip.add(fn)
3653 3653 if copy:
3654 3654 skip.add(copy)
3655 3655 del revfiles[rev]
3656 3656 # We will keep the matches dict for the duration of the window
3657 3657 # clear the matches dict once the window is over
3658 3658 if not revfiles:
3659 3659 matches.clear()
3660 3660 fm.end()
3661 3661
3662 3662 return not found
3663 3663
3664 3664
3665 3665 @command(
3666 3666 b'heads',
3667 3667 [
3668 3668 (
3669 3669 b'r',
3670 3670 b'rev',
3671 3671 b'',
3672 3672 _(b'show only heads which are descendants of STARTREV'),
3673 3673 _(b'STARTREV'),
3674 3674 ),
3675 3675 (b't', b'topo', False, _(b'show topological heads only')),
3676 3676 (
3677 3677 b'a',
3678 3678 b'active',
3679 3679 False,
3680 3680 _(b'show active branchheads only (DEPRECATED)'),
3681 3681 ),
3682 3682 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3683 3683 ]
3684 3684 + templateopts,
3685 3685 _(b'[-ct] [-r STARTREV] [REV]...'),
3686 3686 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3687 3687 intents={INTENT_READONLY},
3688 3688 )
3689 3689 def heads(ui, repo, *branchrevs, **opts):
3690 3690 """show branch heads
3691 3691
3692 3692 With no arguments, show all open branch heads in the repository.
3693 3693 Branch heads are changesets that have no descendants on the
3694 3694 same branch. They are where development generally takes place and
3695 3695 are the usual targets for update and merge operations.
3696 3696
3697 3697 If one or more REVs are given, only open branch heads on the
3698 3698 branches associated with the specified changesets are shown. This
3699 3699 means that you can use :hg:`heads .` to see the heads on the
3700 3700 currently checked-out branch.
3701 3701
3702 3702 If -c/--closed is specified, also show branch heads marked closed
3703 3703 (see :hg:`commit --close-branch`).
3704 3704
3705 3705 If STARTREV is specified, only those heads that are descendants of
3706 3706 STARTREV will be displayed.
3707 3707
3708 3708 If -t/--topo is specified, named branch mechanics will be ignored and only
3709 3709 topological heads (changesets with no children) will be shown.
3710 3710
3711 3711 Returns 0 if matching heads are found, 1 if not.
3712 3712 """
3713 3713
3714 3714 opts = pycompat.byteskwargs(opts)
3715 3715 start = None
3716 3716 rev = opts.get(b'rev')
3717 3717 if rev:
3718 3718 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3719 3719 start = scmutil.revsingle(repo, rev, None).node()
3720 3720
3721 3721 if opts.get(b'topo'):
3722 3722 heads = [repo[h] for h in repo.heads(start)]
3723 3723 else:
3724 3724 heads = []
3725 3725 for branch in repo.branchmap():
3726 3726 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3727 3727 heads = [repo[h] for h in heads]
3728 3728
3729 3729 if branchrevs:
3730 3730 branches = set(
3731 3731 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3732 3732 )
3733 3733 heads = [h for h in heads if h.branch() in branches]
3734 3734
3735 3735 if opts.get(b'active') and branchrevs:
3736 3736 dagheads = repo.heads(start)
3737 3737 heads = [h for h in heads if h.node() in dagheads]
3738 3738
3739 3739 if branchrevs:
3740 3740 haveheads = set(h.branch() for h in heads)
3741 3741 if branches - haveheads:
3742 3742 headless = b', '.join(b for b in branches - haveheads)
3743 3743 msg = _(b'no open branch heads found on branches %s')
3744 3744 if opts.get(b'rev'):
3745 3745 msg += _(b' (started at %s)') % opts[b'rev']
3746 3746 ui.warn((msg + b'\n') % headless)
3747 3747
3748 3748 if not heads:
3749 3749 return 1
3750 3750
3751 3751 ui.pager(b'heads')
3752 3752 heads = sorted(heads, key=lambda x: -(x.rev()))
3753 3753 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3754 3754 for ctx in heads:
3755 3755 displayer.show(ctx)
3756 3756 displayer.close()
3757 3757
3758 3758
3759 3759 @command(
3760 3760 b'help',
3761 3761 [
3762 3762 (b'e', b'extension', None, _(b'show only help for extensions')),
3763 3763 (b'c', b'command', None, _(b'show only help for commands')),
3764 3764 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3765 3765 (
3766 3766 b's',
3767 3767 b'system',
3768 3768 [],
3769 3769 _(b'show help for specific platform(s)'),
3770 3770 _(b'PLATFORM'),
3771 3771 ),
3772 3772 ],
3773 3773 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3774 3774 helpcategory=command.CATEGORY_HELP,
3775 3775 norepo=True,
3776 3776 intents={INTENT_READONLY},
3777 3777 )
3778 3778 def help_(ui, name=None, **opts):
3779 3779 """show help for a given topic or a help overview
3780 3780
3781 3781 With no arguments, print a list of commands with short help messages.
3782 3782
3783 3783 Given a topic, extension, or command name, print help for that
3784 3784 topic.
3785 3785
3786 3786 Returns 0 if successful.
3787 3787 """
3788 3788
3789 3789 keep = opts.get('system') or []
3790 3790 if len(keep) == 0:
3791 3791 if pycompat.sysplatform.startswith(b'win'):
3792 3792 keep.append(b'windows')
3793 3793 elif pycompat.sysplatform == b'OpenVMS':
3794 3794 keep.append(b'vms')
3795 3795 elif pycompat.sysplatform == b'plan9':
3796 3796 keep.append(b'plan9')
3797 3797 else:
3798 3798 keep.append(b'unix')
3799 3799 keep.append(pycompat.sysplatform.lower())
3800 3800 if ui.verbose:
3801 3801 keep.append(b'verbose')
3802 3802
3803 3803 commands = sys.modules[__name__]
3804 3804 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3805 3805 ui.pager(b'help')
3806 3806 ui.write(formatted)
3807 3807
3808 3808
3809 3809 @command(
3810 3810 b'identify|id',
3811 3811 [
3812 3812 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3813 3813 (b'n', b'num', None, _(b'show local revision number')),
3814 3814 (b'i', b'id', None, _(b'show global revision id')),
3815 3815 (b'b', b'branch', None, _(b'show branch')),
3816 3816 (b't', b'tags', None, _(b'show tags')),
3817 3817 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3818 3818 ]
3819 3819 + remoteopts
3820 3820 + formatteropts,
3821 3821 _(b'[-nibtB] [-r REV] [SOURCE]'),
3822 3822 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3823 3823 optionalrepo=True,
3824 3824 intents={INTENT_READONLY},
3825 3825 )
3826 3826 def identify(
3827 3827 ui,
3828 3828 repo,
3829 3829 source=None,
3830 3830 rev=None,
3831 3831 num=None,
3832 3832 id=None,
3833 3833 branch=None,
3834 3834 tags=None,
3835 3835 bookmarks=None,
3836 3836 **opts
3837 3837 ):
3838 3838 """identify the working directory or specified revision
3839 3839
3840 3840 Print a summary identifying the repository state at REV using one or
3841 3841 two parent hash identifiers, followed by a "+" if the working
3842 3842 directory has uncommitted changes, the branch name (if not default),
3843 3843 a list of tags, and a list of bookmarks.
3844 3844
3845 3845 When REV is not given, print a summary of the current state of the
3846 3846 repository including the working directory. Specify -r. to get information
3847 3847 of the working directory parent without scanning uncommitted changes.
3848 3848
3849 3849 Specifying a path to a repository root or Mercurial bundle will
3850 3850 cause lookup to operate on that repository/bundle.
3851 3851
3852 3852 .. container:: verbose
3853 3853
3854 3854 Template:
3855 3855
3856 3856 The following keywords are supported in addition to the common template
3857 3857 keywords and functions. See also :hg:`help templates`.
3858 3858
3859 3859 :dirty: String. Character ``+`` denoting if the working directory has
3860 3860 uncommitted changes.
3861 3861 :id: String. One or two nodes, optionally followed by ``+``.
3862 3862 :parents: List of strings. Parent nodes of the changeset.
3863 3863
3864 3864 Examples:
3865 3865
3866 3866 - generate a build identifier for the working directory::
3867 3867
3868 3868 hg id --id > build-id.dat
3869 3869
3870 3870 - find the revision corresponding to a tag::
3871 3871
3872 3872 hg id -n -r 1.3
3873 3873
3874 3874 - check the most recent revision of a remote repository::
3875 3875
3876 3876 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3877 3877
3878 3878 See :hg:`log` for generating more information about specific revisions,
3879 3879 including full hash identifiers.
3880 3880
3881 3881 Returns 0 if successful.
3882 3882 """
3883 3883
3884 3884 opts = pycompat.byteskwargs(opts)
3885 3885 if not repo and not source:
3886 3886 raise error.Abort(
3887 3887 _(b"there is no Mercurial repository here (.hg not found)")
3888 3888 )
3889 3889
3890 3890 default = not (num or id or branch or tags or bookmarks)
3891 3891 output = []
3892 3892 revs = []
3893 3893
3894 3894 if source:
3895 3895 source, branches = hg.parseurl(ui.expandpath(source))
3896 3896 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3897 3897 repo = peer.local()
3898 3898 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3899 3899
3900 3900 fm = ui.formatter(b'identify', opts)
3901 3901 fm.startitem()
3902 3902
3903 3903 if not repo:
3904 3904 if num or branch or tags:
3905 3905 raise error.Abort(
3906 3906 _(b"can't query remote revision number, branch, or tags")
3907 3907 )
3908 3908 if not rev and revs:
3909 3909 rev = revs[0]
3910 3910 if not rev:
3911 3911 rev = b"tip"
3912 3912
3913 3913 remoterev = peer.lookup(rev)
3914 3914 hexrev = fm.hexfunc(remoterev)
3915 3915 if default or id:
3916 3916 output = [hexrev]
3917 3917 fm.data(id=hexrev)
3918 3918
3919 3919 @util.cachefunc
3920 3920 def getbms():
3921 3921 bms = []
3922 3922
3923 3923 if b'bookmarks' in peer.listkeys(b'namespaces'):
3924 3924 hexremoterev = hex(remoterev)
3925 3925 bms = [
3926 3926 bm
3927 3927 for bm, bmr in pycompat.iteritems(
3928 3928 peer.listkeys(b'bookmarks')
3929 3929 )
3930 3930 if bmr == hexremoterev
3931 3931 ]
3932 3932
3933 3933 return sorted(bms)
3934 3934
3935 3935 if fm.isplain():
3936 3936 if bookmarks:
3937 3937 output.extend(getbms())
3938 3938 elif default and not ui.quiet:
3939 3939 # multiple bookmarks for a single parent separated by '/'
3940 3940 bm = b'/'.join(getbms())
3941 3941 if bm:
3942 3942 output.append(bm)
3943 3943 else:
3944 3944 fm.data(node=hex(remoterev))
3945 3945 if bookmarks or b'bookmarks' in fm.datahint():
3946 3946 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3947 3947 else:
3948 3948 if rev:
3949 3949 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3950 3950 ctx = scmutil.revsingle(repo, rev, None)
3951 3951
3952 3952 if ctx.rev() is None:
3953 3953 ctx = repo[None]
3954 3954 parents = ctx.parents()
3955 3955 taglist = []
3956 3956 for p in parents:
3957 3957 taglist.extend(p.tags())
3958 3958
3959 3959 dirty = b""
3960 3960 if ctx.dirty(missing=True, merge=False, branch=False):
3961 3961 dirty = b'+'
3962 3962 fm.data(dirty=dirty)
3963 3963
3964 3964 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3965 3965 if default or id:
3966 3966 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3967 3967 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3968 3968
3969 3969 if num:
3970 3970 numoutput = [b"%d" % p.rev() for p in parents]
3971 3971 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3972 3972
3973 3973 fm.data(
3974 3974 parents=fm.formatlist(
3975 3975 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3976 3976 )
3977 3977 )
3978 3978 else:
3979 3979 hexoutput = fm.hexfunc(ctx.node())
3980 3980 if default or id:
3981 3981 output = [hexoutput]
3982 3982 fm.data(id=hexoutput)
3983 3983
3984 3984 if num:
3985 3985 output.append(pycompat.bytestr(ctx.rev()))
3986 3986 taglist = ctx.tags()
3987 3987
3988 3988 if default and not ui.quiet:
3989 3989 b = ctx.branch()
3990 3990 if b != b'default':
3991 3991 output.append(b"(%s)" % b)
3992 3992
3993 3993 # multiple tags for a single parent separated by '/'
3994 3994 t = b'/'.join(taglist)
3995 3995 if t:
3996 3996 output.append(t)
3997 3997
3998 3998 # multiple bookmarks for a single parent separated by '/'
3999 3999 bm = b'/'.join(ctx.bookmarks())
4000 4000 if bm:
4001 4001 output.append(bm)
4002 4002 else:
4003 4003 if branch:
4004 4004 output.append(ctx.branch())
4005 4005
4006 4006 if tags:
4007 4007 output.extend(taglist)
4008 4008
4009 4009 if bookmarks:
4010 4010 output.extend(ctx.bookmarks())
4011 4011
4012 4012 fm.data(node=ctx.hex())
4013 4013 fm.data(branch=ctx.branch())
4014 4014 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4015 4015 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4016 4016 fm.context(ctx=ctx)
4017 4017
4018 4018 fm.plain(b"%s\n" % b' '.join(output))
4019 4019 fm.end()
4020 4020
4021 4021
4022 4022 @command(
4023 4023 b'import|patch',
4024 4024 [
4025 4025 (
4026 4026 b'p',
4027 4027 b'strip',
4028 4028 1,
4029 4029 _(
4030 4030 b'directory strip option for patch. This has the same '
4031 4031 b'meaning as the corresponding patch option'
4032 4032 ),
4033 4033 _(b'NUM'),
4034 4034 ),
4035 4035 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4036 4036 (b'', b'secret', None, _(b'use the secret phase for committing')),
4037 4037 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4038 4038 (
4039 4039 b'f',
4040 4040 b'force',
4041 4041 None,
4042 4042 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4043 4043 ),
4044 4044 (
4045 4045 b'',
4046 4046 b'no-commit',
4047 4047 None,
4048 4048 _(b"don't commit, just update the working directory"),
4049 4049 ),
4050 4050 (
4051 4051 b'',
4052 4052 b'bypass',
4053 4053 None,
4054 4054 _(b"apply patch without touching the working directory"),
4055 4055 ),
4056 4056 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4057 4057 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4058 4058 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4059 4059 (
4060 4060 b'',
4061 4061 b'import-branch',
4062 4062 None,
4063 4063 _(b'use any branch information in patch (implied by --exact)'),
4064 4064 ),
4065 4065 ]
4066 4066 + commitopts
4067 4067 + commitopts2
4068 4068 + similarityopts,
4069 4069 _(b'[OPTION]... PATCH...'),
4070 4070 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4071 4071 )
4072 4072 def import_(ui, repo, patch1=None, *patches, **opts):
4073 4073 """import an ordered set of patches
4074 4074
4075 4075 Import a list of patches and commit them individually (unless
4076 4076 --no-commit is specified).
4077 4077
4078 4078 To read a patch from standard input (stdin), use "-" as the patch
4079 4079 name. If a URL is specified, the patch will be downloaded from
4080 4080 there.
4081 4081
4082 4082 Import first applies changes to the working directory (unless
4083 4083 --bypass is specified), import will abort if there are outstanding
4084 4084 changes.
4085 4085
4086 4086 Use --bypass to apply and commit patches directly to the
4087 4087 repository, without affecting the working directory. Without
4088 4088 --exact, patches will be applied on top of the working directory
4089 4089 parent revision.
4090 4090
4091 4091 You can import a patch straight from a mail message. Even patches
4092 4092 as attachments work (to use the body part, it must have type
4093 4093 text/plain or text/x-patch). From and Subject headers of email
4094 4094 message are used as default committer and commit message. All
4095 4095 text/plain body parts before first diff are added to the commit
4096 4096 message.
4097 4097
4098 4098 If the imported patch was generated by :hg:`export`, user and
4099 4099 description from patch override values from message headers and
4100 4100 body. Values given on command line with -m/--message and -u/--user
4101 4101 override these.
4102 4102
4103 4103 If --exact is specified, import will set the working directory to
4104 4104 the parent of each patch before applying it, and will abort if the
4105 4105 resulting changeset has a different ID than the one recorded in
4106 4106 the patch. This will guard against various ways that portable
4107 4107 patch formats and mail systems might fail to transfer Mercurial
4108 4108 data or metadata. See :hg:`bundle` for lossless transmission.
4109 4109
4110 4110 Use --partial to ensure a changeset will be created from the patch
4111 4111 even if some hunks fail to apply. Hunks that fail to apply will be
4112 4112 written to a <target-file>.rej file. Conflicts can then be resolved
4113 4113 by hand before :hg:`commit --amend` is run to update the created
4114 4114 changeset. This flag exists to let people import patches that
4115 4115 partially apply without losing the associated metadata (author,
4116 4116 date, description, ...).
4117 4117
4118 4118 .. note::
4119 4119
4120 4120 When no hunks apply cleanly, :hg:`import --partial` will create
4121 4121 an empty changeset, importing only the patch metadata.
4122 4122
4123 4123 With -s/--similarity, hg will attempt to discover renames and
4124 4124 copies in the patch in the same way as :hg:`addremove`.
4125 4125
4126 4126 It is possible to use external patch programs to perform the patch
4127 4127 by setting the ``ui.patch`` configuration option. For the default
4128 4128 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4129 4129 See :hg:`help config` for more information about configuration
4130 4130 files and how to use these options.
4131 4131
4132 4132 See :hg:`help dates` for a list of formats valid for -d/--date.
4133 4133
4134 4134 .. container:: verbose
4135 4135
4136 4136 Examples:
4137 4137
4138 4138 - import a traditional patch from a website and detect renames::
4139 4139
4140 4140 hg import -s 80 http://example.com/bugfix.patch
4141 4141
4142 4142 - import a changeset from an hgweb server::
4143 4143
4144 4144 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4145 4145
4146 4146 - import all the patches in an Unix-style mbox::
4147 4147
4148 4148 hg import incoming-patches.mbox
4149 4149
4150 4150 - import patches from stdin::
4151 4151
4152 4152 hg import -
4153 4153
4154 4154 - attempt to exactly restore an exported changeset (not always
4155 4155 possible)::
4156 4156
4157 4157 hg import --exact proposed-fix.patch
4158 4158
4159 4159 - use an external tool to apply a patch which is too fuzzy for
4160 4160 the default internal tool.
4161 4161
4162 4162 hg import --config ui.patch="patch --merge" fuzzy.patch
4163 4163
4164 4164 - change the default fuzzing from 2 to a less strict 7
4165 4165
4166 4166 hg import --config ui.fuzz=7 fuzz.patch
4167 4167
4168 4168 Returns 0 on success, 1 on partial success (see --partial).
4169 4169 """
4170 4170
4171 4171 opts = pycompat.byteskwargs(opts)
4172 4172 if not patch1:
4173 4173 raise error.Abort(_(b'need at least one patch to import'))
4174 4174
4175 4175 patches = (patch1,) + patches
4176 4176
4177 4177 date = opts.get(b'date')
4178 4178 if date:
4179 4179 opts[b'date'] = dateutil.parsedate(date)
4180 4180
4181 4181 exact = opts.get(b'exact')
4182 4182 update = not opts.get(b'bypass')
4183 4183 if not update and opts.get(b'no_commit'):
4184 4184 raise error.Abort(_(b'cannot use --no-commit with --bypass'))
4185 4185 if opts.get(b'secret') and opts.get(b'no_commit'):
4186 4186 raise error.Abort(_(b'cannot use --no-commit with --secret'))
4187 4187 try:
4188 4188 sim = float(opts.get(b'similarity') or 0)
4189 4189 except ValueError:
4190 4190 raise error.Abort(_(b'similarity must be a number'))
4191 4191 if sim < 0 or sim > 100:
4192 4192 raise error.Abort(_(b'similarity must be between 0 and 100'))
4193 4193 if sim and not update:
4194 4194 raise error.Abort(_(b'cannot use --similarity with --bypass'))
4195 4195 if exact:
4196 4196 if opts.get(b'edit'):
4197 4197 raise error.Abort(_(b'cannot use --exact with --edit'))
4198 4198 if opts.get(b'prefix'):
4199 4199 raise error.Abort(_(b'cannot use --exact with --prefix'))
4200 4200
4201 4201 base = opts[b"base"]
4202 4202 msgs = []
4203 4203 ret = 0
4204 4204
4205 4205 with repo.wlock():
4206 4206 if update:
4207 4207 cmdutil.checkunfinished(repo)
4208 4208 if exact or not opts.get(b'force'):
4209 4209 cmdutil.bailifchanged(repo)
4210 4210
4211 4211 if not opts.get(b'no_commit'):
4212 4212 lock = repo.lock
4213 4213 tr = lambda: repo.transaction(b'import')
4214 4214 dsguard = util.nullcontextmanager
4215 4215 else:
4216 4216 lock = util.nullcontextmanager
4217 4217 tr = util.nullcontextmanager
4218 4218 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4219 4219 with lock(), tr(), dsguard():
4220 4220 parents = repo[None].parents()
4221 4221 for patchurl in patches:
4222 4222 if patchurl == b'-':
4223 4223 ui.status(_(b'applying patch from stdin\n'))
4224 4224 patchfile = ui.fin
4225 4225 patchurl = b'stdin' # for error message
4226 4226 else:
4227 4227 patchurl = os.path.join(base, patchurl)
4228 4228 ui.status(_(b'applying %s\n') % patchurl)
4229 4229 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4230 4230
4231 4231 haspatch = False
4232 4232 for hunk in patch.split(patchfile):
4233 4233 with patch.extract(ui, hunk) as patchdata:
4234 4234 msg, node, rej = cmdutil.tryimportone(
4235 4235 ui, repo, patchdata, parents, opts, msgs, hg.clean
4236 4236 )
4237 4237 if msg:
4238 4238 haspatch = True
4239 4239 ui.note(msg + b'\n')
4240 4240 if update or exact:
4241 4241 parents = repo[None].parents()
4242 4242 else:
4243 4243 parents = [repo[node]]
4244 4244 if rej:
4245 4245 ui.write_err(_(b"patch applied partially\n"))
4246 4246 ui.write_err(
4247 4247 _(
4248 4248 b"(fix the .rej files and run "
4249 4249 b"`hg commit --amend`)\n"
4250 4250 )
4251 4251 )
4252 4252 ret = 1
4253 4253 break
4254 4254
4255 4255 if not haspatch:
4256 4256 raise error.Abort(_(b'%s: no diffs found') % patchurl)
4257 4257
4258 4258 if msgs:
4259 4259 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4260 4260 return ret
4261 4261
4262 4262
4263 4263 @command(
4264 4264 b'incoming|in',
4265 4265 [
4266 4266 (
4267 4267 b'f',
4268 4268 b'force',
4269 4269 None,
4270 4270 _(b'run even if remote repository is unrelated'),
4271 4271 ),
4272 4272 (b'n', b'newest-first', None, _(b'show newest record first')),
4273 4273 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4274 4274 (
4275 4275 b'r',
4276 4276 b'rev',
4277 4277 [],
4278 4278 _(b'a remote changeset intended to be added'),
4279 4279 _(b'REV'),
4280 4280 ),
4281 4281 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4282 4282 (
4283 4283 b'b',
4284 4284 b'branch',
4285 4285 [],
4286 4286 _(b'a specific branch you would like to pull'),
4287 4287 _(b'BRANCH'),
4288 4288 ),
4289 4289 ]
4290 4290 + logopts
4291 4291 + remoteopts
4292 4292 + subrepoopts,
4293 4293 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4294 4294 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4295 4295 )
4296 4296 def incoming(ui, repo, source=b"default", **opts):
4297 4297 """show new changesets found in source
4298 4298
4299 4299 Show new changesets found in the specified path/URL or the default
4300 4300 pull location. These are the changesets that would have been pulled
4301 4301 by :hg:`pull` at the time you issued this command.
4302 4302
4303 4303 See pull for valid source format details.
4304 4304
4305 4305 .. container:: verbose
4306 4306
4307 4307 With -B/--bookmarks, the result of bookmark comparison between
4308 4308 local and remote repositories is displayed. With -v/--verbose,
4309 4309 status is also displayed for each bookmark like below::
4310 4310
4311 4311 BM1 01234567890a added
4312 4312 BM2 1234567890ab advanced
4313 4313 BM3 234567890abc diverged
4314 4314 BM4 34567890abcd changed
4315 4315
4316 4316 The action taken locally when pulling depends on the
4317 4317 status of each bookmark:
4318 4318
4319 4319 :``added``: pull will create it
4320 4320 :``advanced``: pull will update it
4321 4321 :``diverged``: pull will create a divergent bookmark
4322 4322 :``changed``: result depends on remote changesets
4323 4323
4324 4324 From the point of view of pulling behavior, bookmark
4325 4325 existing only in the remote repository are treated as ``added``,
4326 4326 even if it is in fact locally deleted.
4327 4327
4328 4328 .. container:: verbose
4329 4329
4330 4330 For remote repository, using --bundle avoids downloading the
4331 4331 changesets twice if the incoming is followed by a pull.
4332 4332
4333 4333 Examples:
4334 4334
4335 4335 - show incoming changes with patches and full description::
4336 4336
4337 4337 hg incoming -vp
4338 4338
4339 4339 - show incoming changes excluding merges, store a bundle::
4340 4340
4341 4341 hg in -vpM --bundle incoming.hg
4342 4342 hg pull incoming.hg
4343 4343
4344 4344 - briefly list changes inside a bundle::
4345 4345
4346 4346 hg in changes.hg -T "{desc|firstline}\\n"
4347 4347
4348 4348 Returns 0 if there are incoming changes, 1 otherwise.
4349 4349 """
4350 4350 opts = pycompat.byteskwargs(opts)
4351 4351 if opts.get(b'graph'):
4352 4352 logcmdutil.checkunsupportedgraphflags([], opts)
4353 4353
4354 4354 def display(other, chlist, displayer):
4355 4355 revdag = logcmdutil.graphrevs(other, chlist, opts)
4356 4356 logcmdutil.displaygraph(
4357 4357 ui, repo, revdag, displayer, graphmod.asciiedges
4358 4358 )
4359 4359
4360 4360 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4361 4361 return 0
4362 4362
4363 4363 if opts.get(b'bundle') and opts.get(b'subrepos'):
4364 4364 raise error.Abort(_(b'cannot combine --bundle and --subrepos'))
4365 4365
4366 4366 if opts.get(b'bookmarks'):
4367 4367 source, branches = hg.parseurl(
4368 4368 ui.expandpath(source), opts.get(b'branch')
4369 4369 )
4370 4370 other = hg.peer(repo, opts, source)
4371 4371 if b'bookmarks' not in other.listkeys(b'namespaces'):
4372 4372 ui.warn(_(b"remote doesn't support bookmarks\n"))
4373 4373 return 0
4374 4374 ui.pager(b'incoming')
4375 4375 ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
4376 4376 return bookmarks.incoming(ui, repo, other)
4377 4377
4378 4378 repo._subtoppath = ui.expandpath(source)
4379 4379 try:
4380 4380 return hg.incoming(ui, repo, source, opts)
4381 4381 finally:
4382 4382 del repo._subtoppath
4383 4383
4384 4384
4385 4385 @command(
4386 4386 b'init',
4387 4387 remoteopts,
4388 4388 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4389 4389 helpcategory=command.CATEGORY_REPO_CREATION,
4390 4390 helpbasic=True,
4391 4391 norepo=True,
4392 4392 )
4393 4393 def init(ui, dest=b".", **opts):
4394 4394 """create a new repository in the given directory
4395 4395
4396 4396 Initialize a new repository in the given directory. If the given
4397 4397 directory does not exist, it will be created.
4398 4398
4399 4399 If no directory is given, the current directory is used.
4400 4400
4401 4401 It is possible to specify an ``ssh://`` URL as the destination.
4402 4402 See :hg:`help urls` for more information.
4403 4403
4404 4404 Returns 0 on success.
4405 4405 """
4406 4406 opts = pycompat.byteskwargs(opts)
4407 4407 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4408 4408
4409 4409
4410 4410 @command(
4411 4411 b'locate',
4412 4412 [
4413 4413 (
4414 4414 b'r',
4415 4415 b'rev',
4416 4416 b'',
4417 4417 _(b'search the repository as it is in REV'),
4418 4418 _(b'REV'),
4419 4419 ),
4420 4420 (
4421 4421 b'0',
4422 4422 b'print0',
4423 4423 None,
4424 4424 _(b'end filenames with NUL, for use with xargs'),
4425 4425 ),
4426 4426 (
4427 4427 b'f',
4428 4428 b'fullpath',
4429 4429 None,
4430 4430 _(b'print complete paths from the filesystem root'),
4431 4431 ),
4432 4432 ]
4433 4433 + walkopts,
4434 4434 _(b'[OPTION]... [PATTERN]...'),
4435 4435 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4436 4436 )
4437 4437 def locate(ui, repo, *pats, **opts):
4438 4438 """locate files matching specific patterns (DEPRECATED)
4439 4439
4440 4440 Print files under Mercurial control in the working directory whose
4441 4441 names match the given patterns.
4442 4442
4443 4443 By default, this command searches all directories in the working
4444 4444 directory. To search just the current directory and its
4445 4445 subdirectories, use "--include .".
4446 4446
4447 4447 If no patterns are given to match, this command prints the names
4448 4448 of all files under Mercurial control in the working directory.
4449 4449
4450 4450 If you want to feed the output of this command into the "xargs"
4451 4451 command, use the -0 option to both this command and "xargs". This
4452 4452 will avoid the problem of "xargs" treating single filenames that
4453 4453 contain whitespace as multiple filenames.
4454 4454
4455 4455 See :hg:`help files` for a more versatile command.
4456 4456
4457 4457 Returns 0 if a match is found, 1 otherwise.
4458 4458 """
4459 4459 opts = pycompat.byteskwargs(opts)
4460 4460 if opts.get(b'print0'):
4461 4461 end = b'\0'
4462 4462 else:
4463 4463 end = b'\n'
4464 4464 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4465 4465
4466 4466 ret = 1
4467 4467 m = scmutil.match(
4468 4468 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4469 4469 )
4470 4470
4471 4471 ui.pager(b'locate')
4472 4472 if ctx.rev() is None:
4473 4473 # When run on the working copy, "locate" includes removed files, so
4474 4474 # we get the list of files from the dirstate.
4475 4475 filesgen = sorted(repo.dirstate.matches(m))
4476 4476 else:
4477 4477 filesgen = ctx.matches(m)
4478 4478 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4479 4479 for abs in filesgen:
4480 4480 if opts.get(b'fullpath'):
4481 4481 ui.write(repo.wjoin(abs), end)
4482 4482 else:
4483 4483 ui.write(uipathfn(abs), end)
4484 4484 ret = 0
4485 4485
4486 4486 return ret
4487 4487
4488 4488
4489 4489 @command(
4490 4490 b'log|history',
4491 4491 [
4492 4492 (
4493 4493 b'f',
4494 4494 b'follow',
4495 4495 None,
4496 4496 _(
4497 4497 b'follow changeset history, or file history across copies and renames'
4498 4498 ),
4499 4499 ),
4500 4500 (
4501 4501 b'',
4502 4502 b'follow-first',
4503 4503 None,
4504 4504 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4505 4505 ),
4506 4506 (
4507 4507 b'd',
4508 4508 b'date',
4509 4509 b'',
4510 4510 _(b'show revisions matching date spec'),
4511 4511 _(b'DATE'),
4512 4512 ),
4513 4513 (b'C', b'copies', None, _(b'show copied files')),
4514 4514 (
4515 4515 b'k',
4516 4516 b'keyword',
4517 4517 [],
4518 4518 _(b'do case-insensitive search for a given text'),
4519 4519 _(b'TEXT'),
4520 4520 ),
4521 4521 (
4522 4522 b'r',
4523 4523 b'rev',
4524 4524 [],
4525 4525 _(b'show the specified revision or revset'),
4526 4526 _(b'REV'),
4527 4527 ),
4528 4528 (
4529 4529 b'L',
4530 4530 b'line-range',
4531 4531 [],
4532 4532 _(b'follow line range of specified file (EXPERIMENTAL)'),
4533 4533 _(b'FILE,RANGE'),
4534 4534 ),
4535 4535 (
4536 4536 b'',
4537 4537 b'removed',
4538 4538 None,
4539 4539 _(b'include revisions where files were removed'),
4540 4540 ),
4541 4541 (
4542 4542 b'm',
4543 4543 b'only-merges',
4544 4544 None,
4545 4545 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4546 4546 ),
4547 4547 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4548 4548 (
4549 4549 b'',
4550 4550 b'only-branch',
4551 4551 [],
4552 4552 _(
4553 4553 b'show only changesets within the given named branch (DEPRECATED)'
4554 4554 ),
4555 4555 _(b'BRANCH'),
4556 4556 ),
4557 4557 (
4558 4558 b'b',
4559 4559 b'branch',
4560 4560 [],
4561 4561 _(b'show changesets within the given named branch'),
4562 4562 _(b'BRANCH'),
4563 4563 ),
4564 4564 (
4565 4565 b'P',
4566 4566 b'prune',
4567 4567 [],
4568 4568 _(b'do not display revision or any of its ancestors'),
4569 4569 _(b'REV'),
4570 4570 ),
4571 4571 ]
4572 4572 + logopts
4573 4573 + walkopts,
4574 4574 _(b'[OPTION]... [FILE]'),
4575 4575 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4576 4576 helpbasic=True,
4577 4577 inferrepo=True,
4578 4578 intents={INTENT_READONLY},
4579 4579 )
4580 4580 def log(ui, repo, *pats, **opts):
4581 4581 """show revision history of entire repository or files
4582 4582
4583 4583 Print the revision history of the specified files or the entire
4584 4584 project.
4585 4585
4586 4586 If no revision range is specified, the default is ``tip:0`` unless
4587 4587 --follow is set, in which case the working directory parent is
4588 4588 used as the starting revision.
4589 4589
4590 4590 File history is shown without following rename or copy history of
4591 4591 files. Use -f/--follow with a filename to follow history across
4592 4592 renames and copies. --follow without a filename will only show
4593 4593 ancestors of the starting revision.
4594 4594
4595 4595 By default this command prints revision number and changeset id,
4596 4596 tags, non-trivial parents, user, date and time, and a summary for
4597 4597 each commit. When the -v/--verbose switch is used, the list of
4598 4598 changed files and full commit message are shown.
4599 4599
4600 4600 With --graph the revisions are shown as an ASCII art DAG with the most
4601 4601 recent changeset at the top.
4602 4602 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
4603 4603 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4604 4604 changeset from the lines below is a parent of the 'o' merge on the same
4605 4605 line.
4606 4606 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4607 4607 of a '|' indicates one or more revisions in a path are omitted.
4608 4608
4609 4609 .. container:: verbose
4610 4610
4611 4611 Use -L/--line-range FILE,M:N options to follow the history of lines
4612 4612 from M to N in FILE. With -p/--patch only diff hunks affecting
4613 4613 specified line range will be shown. This option requires --follow;
4614 4614 it can be specified multiple times. Currently, this option is not
4615 4615 compatible with --graph. This option is experimental.
4616 4616
4617 4617 .. note::
4618 4618
4619 4619 :hg:`log --patch` may generate unexpected diff output for merge
4620 4620 changesets, as it will only compare the merge changeset against
4621 4621 its first parent. Also, only files different from BOTH parents
4622 4622 will appear in files:.
4623 4623
4624 4624 .. note::
4625 4625
4626 4626 For performance reasons, :hg:`log FILE` may omit duplicate changes
4627 4627 made on branches and will not show removals or mode changes. To
4628 4628 see all such changes, use the --removed switch.
4629 4629
4630 4630 .. container:: verbose
4631 4631
4632 4632 .. note::
4633 4633
4634 4634 The history resulting from -L/--line-range options depends on diff
4635 4635 options; for instance if white-spaces are ignored, respective changes
4636 4636 with only white-spaces in specified line range will not be listed.
4637 4637
4638 4638 .. container:: verbose
4639 4639
4640 4640 Some examples:
4641 4641
4642 4642 - changesets with full descriptions and file lists::
4643 4643
4644 4644 hg log -v
4645 4645
4646 4646 - changesets ancestral to the working directory::
4647 4647
4648 4648 hg log -f
4649 4649
4650 4650 - last 10 commits on the current branch::
4651 4651
4652 4652 hg log -l 10 -b .
4653 4653
4654 4654 - changesets showing all modifications of a file, including removals::
4655 4655
4656 4656 hg log --removed file.c
4657 4657
4658 4658 - all changesets that touch a directory, with diffs, excluding merges::
4659 4659
4660 4660 hg log -Mp lib/
4661 4661
4662 4662 - all revision numbers that match a keyword::
4663 4663
4664 4664 hg log -k bug --template "{rev}\\n"
4665 4665
4666 4666 - the full hash identifier of the working directory parent::
4667 4667
4668 4668 hg log -r . --template "{node}\\n"
4669 4669
4670 4670 - list available log templates::
4671 4671
4672 4672 hg log -T list
4673 4673
4674 4674 - check if a given changeset is included in a tagged release::
4675 4675
4676 4676 hg log -r "a21ccf and ancestor(1.9)"
4677 4677
4678 4678 - find all changesets by some user in a date range::
4679 4679
4680 4680 hg log -k alice -d "may 2008 to jul 2008"
4681 4681
4682 4682 - summary of all changesets after the last tag::
4683 4683
4684 4684 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4685 4685
4686 4686 - changesets touching lines 13 to 23 for file.c::
4687 4687
4688 4688 hg log -L file.c,13:23
4689 4689
4690 4690 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4691 4691 main.c with patch::
4692 4692
4693 4693 hg log -L file.c,13:23 -L main.c,2:6 -p
4694 4694
4695 4695 See :hg:`help dates` for a list of formats valid for -d/--date.
4696 4696
4697 4697 See :hg:`help revisions` for more about specifying and ordering
4698 4698 revisions.
4699 4699
4700 4700 See :hg:`help templates` for more about pre-packaged styles and
4701 4701 specifying custom templates. The default template used by the log
4702 4702 command can be customized via the ``ui.logtemplate`` configuration
4703 4703 setting.
4704 4704
4705 4705 Returns 0 on success.
4706 4706
4707 4707 """
4708 4708 opts = pycompat.byteskwargs(opts)
4709 4709 linerange = opts.get(b'line_range')
4710 4710
4711 4711 if linerange and not opts.get(b'follow'):
4712 4712 raise error.Abort(_(b'--line-range requires --follow'))
4713 4713
4714 4714 if linerange and pats:
4715 4715 # TODO: take pats as patterns with no line-range filter
4716 4716 raise error.Abort(
4717 4717 _(b'FILE arguments are not compatible with --line-range option')
4718 4718 )
4719 4719
4720 4720 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4721 4721 revs, differ = logcmdutil.getrevs(repo, pats, opts)
4722 4722 if linerange:
4723 4723 # TODO: should follow file history from logcmdutil._initialrevs(),
4724 4724 # then filter the result by logcmdutil._makerevset() and --limit
4725 4725 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4726 4726
4727 4727 getcopies = None
4728 4728 if opts.get(b'copies'):
4729 4729 endrev = None
4730 4730 if revs:
4731 4731 endrev = revs.max() + 1
4732 4732 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4733 4733
4734 4734 ui.pager(b'log')
4735 4735 displayer = logcmdutil.changesetdisplayer(
4736 4736 ui, repo, opts, differ, buffered=True
4737 4737 )
4738 4738 if opts.get(b'graph'):
4739 4739 displayfn = logcmdutil.displaygraphrevs
4740 4740 else:
4741 4741 displayfn = logcmdutil.displayrevs
4742 4742 displayfn(ui, repo, revs, displayer, getcopies)
4743 4743
4744 4744
4745 4745 @command(
4746 4746 b'manifest',
4747 4747 [
4748 4748 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4749 4749 (b'', b'all', False, _(b"list files from all revisions")),
4750 4750 ]
4751 4751 + formatteropts,
4752 4752 _(b'[-r REV]'),
4753 4753 helpcategory=command.CATEGORY_MAINTENANCE,
4754 4754 intents={INTENT_READONLY},
4755 4755 )
4756 4756 def manifest(ui, repo, node=None, rev=None, **opts):
4757 4757 """output the current or given revision of the project manifest
4758 4758
4759 4759 Print a list of version controlled files for the given revision.
4760 4760 If no revision is given, the first parent of the working directory
4761 4761 is used, or the null revision if no revision is checked out.
4762 4762
4763 4763 With -v, print file permissions, symlink and executable bits.
4764 4764 With --debug, print file revision hashes.
4765 4765
4766 4766 If option --all is specified, the list of all files from all revisions
4767 4767 is printed. This includes deleted and renamed files.
4768 4768
4769 4769 Returns 0 on success.
4770 4770 """
4771 4771 opts = pycompat.byteskwargs(opts)
4772 4772 fm = ui.formatter(b'manifest', opts)
4773 4773
4774 4774 if opts.get(b'all'):
4775 4775 if rev or node:
4776 4776 raise error.Abort(_(b"can't specify a revision with --all"))
4777 4777
4778 4778 res = set()
4779 4779 for rev in repo:
4780 4780 ctx = repo[rev]
4781 4781 res |= set(ctx.files())
4782 4782
4783 4783 ui.pager(b'manifest')
4784 4784 for f in sorted(res):
4785 4785 fm.startitem()
4786 4786 fm.write(b"path", b'%s\n', f)
4787 4787 fm.end()
4788 4788 return
4789 4789
4790 4790 if rev and node:
4791 4791 raise error.Abort(_(b"please specify just one revision"))
4792 4792
4793 4793 if not node:
4794 4794 node = rev
4795 4795
4796 4796 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4797 4797 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4798 4798 if node:
4799 4799 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4800 4800 ctx = scmutil.revsingle(repo, node)
4801 4801 mf = ctx.manifest()
4802 4802 ui.pager(b'manifest')
4803 4803 for f in ctx:
4804 4804 fm.startitem()
4805 4805 fm.context(ctx=ctx)
4806 4806 fl = ctx[f].flags()
4807 4807 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4808 4808 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4809 4809 fm.write(b'path', b'%s\n', f)
4810 4810 fm.end()
4811 4811
4812 4812
4813 4813 @command(
4814 4814 b'merge',
4815 4815 [
4816 4816 (
4817 4817 b'f',
4818 4818 b'force',
4819 4819 None,
4820 4820 _(b'force a merge including outstanding changes (DEPRECATED)'),
4821 4821 ),
4822 4822 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4823 4823 (
4824 4824 b'P',
4825 4825 b'preview',
4826 4826 None,
4827 4827 _(b'review revisions to merge (no merge is performed)'),
4828 4828 ),
4829 4829 (b'', b'abort', None, _(b'abort the ongoing merge')),
4830 4830 ]
4831 4831 + mergetoolopts,
4832 4832 _(b'[-P] [[-r] REV]'),
4833 4833 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4834 4834 helpbasic=True,
4835 4835 )
4836 4836 def merge(ui, repo, node=None, **opts):
4837 4837 """merge another revision into working directory
4838 4838
4839 4839 The current working directory is updated with all changes made in
4840 4840 the requested revision since the last common predecessor revision.
4841 4841
4842 4842 Files that changed between either parent are marked as changed for
4843 4843 the next commit and a commit must be performed before any further
4844 4844 updates to the repository are allowed. The next commit will have
4845 4845 two parents.
4846 4846
4847 4847 ``--tool`` can be used to specify the merge tool used for file
4848 4848 merges. It overrides the HGMERGE environment variable and your
4849 4849 configuration files. See :hg:`help merge-tools` for options.
4850 4850
4851 4851 If no revision is specified, the working directory's parent is a
4852 4852 head revision, and the current branch contains exactly one other
4853 4853 head, the other head is merged with by default. Otherwise, an
4854 4854 explicit revision with which to merge must be provided.
4855 4855
4856 4856 See :hg:`help resolve` for information on handling file conflicts.
4857 4857
4858 4858 To undo an uncommitted merge, use :hg:`merge --abort` which
4859 4859 will check out a clean copy of the original merge parent, losing
4860 4860 all changes.
4861 4861
4862 4862 Returns 0 on success, 1 if there are unresolved files.
4863 4863 """
4864 4864
4865 4865 opts = pycompat.byteskwargs(opts)
4866 4866 abort = opts.get(b'abort')
4867 4867 if abort and repo.dirstate.p2() == nullid:
4868 4868 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4869 4869 if abort:
4870 4870 state = cmdutil.getunfinishedstate(repo)
4871 4871 if state and state._opname != b'merge':
4872 4872 raise error.Abort(
4873 4873 _(b'cannot abort merge with %s in progress') % (state._opname),
4874 4874 hint=state.hint(),
4875 4875 )
4876 4876 if node:
4877 4877 raise error.Abort(_(b"cannot specify a node with --abort"))
4878 4878 if opts.get(b'rev'):
4879 4879 raise error.Abort(_(b"cannot specify both --rev and --abort"))
4880 4880 if opts.get(b'preview'):
4881 4881 raise error.Abort(_(b"cannot specify --preview with --abort"))
4882 4882 if opts.get(b'rev') and node:
4883 4883 raise error.Abort(_(b"please specify just one revision"))
4884 4884 if not node:
4885 4885 node = opts.get(b'rev')
4886 4886
4887 4887 if node:
4888 4888 node = scmutil.revsingle(repo, node).node()
4889 4889
4890 4890 if not node and not abort:
4891 4891 node = repo[destutil.destmerge(repo)].node()
4892 4892
4893 4893 if opts.get(b'preview'):
4894 4894 # find nodes that are ancestors of p2 but not of p1
4895 4895 p1 = repo.lookup(b'.')
4896 4896 p2 = node
4897 4897 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4898 4898
4899 4899 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4900 4900 for node in nodes:
4901 4901 displayer.show(repo[node])
4902 4902 displayer.close()
4903 4903 return 0
4904 4904
4905 4905 # ui.forcemerge is an internal variable, do not document
4906 4906 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4907 4907 with ui.configoverride(overrides, b'merge'):
4908 4908 force = opts.get(b'force')
4909 4909 labels = [b'working copy', b'merge rev']
4910 4910 return hg.merge(
4911 4911 repo,
4912 4912 node,
4913 4913 force=force,
4914 4914 mergeforce=force,
4915 4915 labels=labels,
4916 4916 abort=abort,
4917 4917 )
4918 4918
4919 4919
4920 4920 statemod.addunfinished(
4921 4921 b'merge',
4922 4922 fname=None,
4923 4923 clearable=True,
4924 4924 allowcommit=True,
4925 4925 cmdmsg=_(b'outstanding uncommitted merge'),
4926 4926 abortfunc=hg.abortmerge,
4927 4927 statushint=_(
4928 4928 b'To continue: hg commit\nTo abort: hg merge --abort'
4929 4929 ),
4930 4930 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4931 4931 )
4932 4932
4933 4933
4934 4934 @command(
4935 4935 b'outgoing|out',
4936 4936 [
4937 4937 (
4938 4938 b'f',
4939 4939 b'force',
4940 4940 None,
4941 4941 _(b'run even when the destination is unrelated'),
4942 4942 ),
4943 4943 (
4944 4944 b'r',
4945 4945 b'rev',
4946 4946 [],
4947 4947 _(b'a changeset intended to be included in the destination'),
4948 4948 _(b'REV'),
4949 4949 ),
4950 4950 (b'n', b'newest-first', None, _(b'show newest record first')),
4951 4951 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4952 4952 (
4953 4953 b'b',
4954 4954 b'branch',
4955 4955 [],
4956 4956 _(b'a specific branch you would like to push'),
4957 4957 _(b'BRANCH'),
4958 4958 ),
4959 4959 ]
4960 4960 + logopts
4961 4961 + remoteopts
4962 4962 + subrepoopts,
4963 4963 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4964 4964 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4965 4965 )
4966 4966 def outgoing(ui, repo, dest=None, **opts):
4967 4967 """show changesets not found in the destination
4968 4968
4969 4969 Show changesets not found in the specified destination repository
4970 4970 or the default push location. These are the changesets that would
4971 4971 be pushed if a push was requested.
4972 4972
4973 4973 See pull for details of valid destination formats.
4974 4974
4975 4975 .. container:: verbose
4976 4976
4977 4977 With -B/--bookmarks, the result of bookmark comparison between
4978 4978 local and remote repositories is displayed. With -v/--verbose,
4979 4979 status is also displayed for each bookmark like below::
4980 4980
4981 4981 BM1 01234567890a added
4982 4982 BM2 deleted
4983 4983 BM3 234567890abc advanced
4984 4984 BM4 34567890abcd diverged
4985 4985 BM5 4567890abcde changed
4986 4986
4987 4987 The action taken when pushing depends on the
4988 4988 status of each bookmark:
4989 4989
4990 4990 :``added``: push with ``-B`` will create it
4991 4991 :``deleted``: push with ``-B`` will delete it
4992 4992 :``advanced``: push will update it
4993 4993 :``diverged``: push with ``-B`` will update it
4994 4994 :``changed``: push with ``-B`` will update it
4995 4995
4996 4996 From the point of view of pushing behavior, bookmarks
4997 4997 existing only in the remote repository are treated as
4998 4998 ``deleted``, even if it is in fact added remotely.
4999 4999
5000 5000 Returns 0 if there are outgoing changes, 1 otherwise.
5001 5001 """
5002 5002 # hg._outgoing() needs to re-resolve the path in order to handle #branch
5003 5003 # style URLs, so don't overwrite dest.
5004 5004 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5005 5005 if not path:
5006 5006 raise error.Abort(
5007 5007 _(b'default repository not configured!'),
5008 5008 hint=_(b"see 'hg help config.paths'"),
5009 5009 )
5010 5010
5011 5011 opts = pycompat.byteskwargs(opts)
5012 5012 if opts.get(b'graph'):
5013 5013 logcmdutil.checkunsupportedgraphflags([], opts)
5014 5014 o, other = hg._outgoing(ui, repo, dest, opts)
5015 5015 if not o:
5016 5016 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5017 5017 return
5018 5018
5019 5019 revdag = logcmdutil.graphrevs(repo, o, opts)
5020 5020 ui.pager(b'outgoing')
5021 5021 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
5022 5022 logcmdutil.displaygraph(
5023 5023 ui, repo, revdag, displayer, graphmod.asciiedges
5024 5024 )
5025 5025 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5026 5026 return 0
5027 5027
5028 5028 if opts.get(b'bookmarks'):
5029 5029 dest = path.pushloc or path.loc
5030 5030 other = hg.peer(repo, opts, dest)
5031 5031 if b'bookmarks' not in other.listkeys(b'namespaces'):
5032 5032 ui.warn(_(b"remote doesn't support bookmarks\n"))
5033 5033 return 0
5034 5034 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
5035 5035 ui.pager(b'outgoing')
5036 5036 return bookmarks.outgoing(ui, repo, other)
5037 5037
5038 5038 repo._subtoppath = path.pushloc or path.loc
5039 5039 try:
5040 5040 return hg.outgoing(ui, repo, dest, opts)
5041 5041 finally:
5042 5042 del repo._subtoppath
5043 5043
5044 5044
5045 5045 @command(
5046 5046 b'parents',
5047 5047 [
5048 5048 (
5049 5049 b'r',
5050 5050 b'rev',
5051 5051 b'',
5052 5052 _(b'show parents of the specified revision'),
5053 5053 _(b'REV'),
5054 5054 ),
5055 5055 ]
5056 5056 + templateopts,
5057 5057 _(b'[-r REV] [FILE]'),
5058 5058 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5059 5059 inferrepo=True,
5060 5060 )
5061 5061 def parents(ui, repo, file_=None, **opts):
5062 5062 """show the parents of the working directory or revision (DEPRECATED)
5063 5063
5064 5064 Print the working directory's parent revisions. If a revision is
5065 5065 given via -r/--rev, the parent of that revision will be printed.
5066 5066 If a file argument is given, the revision in which the file was
5067 5067 last changed (before the working directory revision or the
5068 5068 argument to --rev if given) is printed.
5069 5069
5070 5070 This command is equivalent to::
5071 5071
5072 5072 hg log -r "p1()+p2()" or
5073 5073 hg log -r "p1(REV)+p2(REV)" or
5074 5074 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5075 5075 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5076 5076
5077 5077 See :hg:`summary` and :hg:`help revsets` for related information.
5078 5078
5079 5079 Returns 0 on success.
5080 5080 """
5081 5081
5082 5082 opts = pycompat.byteskwargs(opts)
5083 5083 rev = opts.get(b'rev')
5084 5084 if rev:
5085 5085 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5086 5086 ctx = scmutil.revsingle(repo, rev, None)
5087 5087
5088 5088 if file_:
5089 5089 m = scmutil.match(ctx, (file_,), opts)
5090 5090 if m.anypats() or len(m.files()) != 1:
5091 5091 raise error.Abort(_(b'can only specify an explicit filename'))
5092 5092 file_ = m.files()[0]
5093 5093 filenodes = []
5094 5094 for cp in ctx.parents():
5095 5095 if not cp:
5096 5096 continue
5097 5097 try:
5098 5098 filenodes.append(cp.filenode(file_))
5099 5099 except error.LookupError:
5100 5100 pass
5101 5101 if not filenodes:
5102 5102 raise error.Abort(_(b"'%s' not found in manifest!") % file_)
5103 5103 p = []
5104 5104 for fn in filenodes:
5105 5105 fctx = repo.filectx(file_, fileid=fn)
5106 5106 p.append(fctx.node())
5107 5107 else:
5108 5108 p = [cp.node() for cp in ctx.parents()]
5109 5109
5110 5110 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5111 5111 for n in p:
5112 5112 if n != nullid:
5113 5113 displayer.show(repo[n])
5114 5114 displayer.close()
5115 5115
5116 5116
5117 5117 @command(
5118 5118 b'paths',
5119 5119 formatteropts,
5120 5120 _(b'[NAME]'),
5121 5121 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5122 5122 optionalrepo=True,
5123 5123 intents={INTENT_READONLY},
5124 5124 )
5125 5125 def paths(ui, repo, search=None, **opts):
5126 5126 """show aliases for remote repositories
5127 5127
5128 5128 Show definition of symbolic path name NAME. If no name is given,
5129 5129 show definition of all available names.
5130 5130
5131 5131 Option -q/--quiet suppresses all output when searching for NAME
5132 5132 and shows only the path names when listing all definitions.
5133 5133
5134 5134 Path names are defined in the [paths] section of your
5135 5135 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5136 5136 repository, ``.hg/hgrc`` is used, too.
5137 5137
5138 5138 The path names ``default`` and ``default-push`` have a special
5139 5139 meaning. When performing a push or pull operation, they are used
5140 5140 as fallbacks if no location is specified on the command-line.
5141 5141 When ``default-push`` is set, it will be used for push and
5142 5142 ``default`` will be used for pull; otherwise ``default`` is used
5143 5143 as the fallback for both. When cloning a repository, the clone
5144 5144 source is written as ``default`` in ``.hg/hgrc``.
5145 5145
5146 5146 .. note::
5147 5147
5148 5148 ``default`` and ``default-push`` apply to all inbound (e.g.
5149 5149 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5150 5150 and :hg:`bundle`) operations.
5151 5151
5152 5152 See :hg:`help urls` for more information.
5153 5153
5154 5154 .. container:: verbose
5155 5155
5156 5156 Template:
5157 5157
5158 5158 The following keywords are supported. See also :hg:`help templates`.
5159 5159
5160 5160 :name: String. Symbolic name of the path alias.
5161 5161 :pushurl: String. URL for push operations.
5162 5162 :url: String. URL or directory path for the other operations.
5163 5163
5164 5164 Returns 0 on success.
5165 5165 """
5166 5166
5167 5167 opts = pycompat.byteskwargs(opts)
5168 5168 ui.pager(b'paths')
5169 5169 if search:
5170 5170 pathitems = [
5171 5171 (name, path)
5172 5172 for name, path in pycompat.iteritems(ui.paths)
5173 5173 if name == search
5174 5174 ]
5175 5175 else:
5176 5176 pathitems = sorted(pycompat.iteritems(ui.paths))
5177 5177
5178 5178 fm = ui.formatter(b'paths', opts)
5179 5179 if fm.isplain():
5180 5180 hidepassword = util.hidepassword
5181 5181 else:
5182 5182 hidepassword = bytes
5183 5183 if ui.quiet:
5184 5184 namefmt = b'%s\n'
5185 5185 else:
5186 5186 namefmt = b'%s = '
5187 5187 showsubopts = not search and not ui.quiet
5188 5188
5189 5189 for name, path in pathitems:
5190 5190 fm.startitem()
5191 5191 fm.condwrite(not search, b'name', namefmt, name)
5192 5192 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5193 5193 for subopt, value in sorted(path.suboptions.items()):
5194 5194 assert subopt not in (b'name', b'url')
5195 5195 if showsubopts:
5196 5196 fm.plain(b'%s:%s = ' % (name, subopt))
5197 5197 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5198 5198
5199 5199 fm.end()
5200 5200
5201 5201 if search and not pathitems:
5202 5202 if not ui.quiet:
5203 5203 ui.warn(_(b"not found!\n"))
5204 5204 return 1
5205 5205 else:
5206 5206 return 0
5207 5207
5208 5208
5209 5209 @command(
5210 5210 b'phase',
5211 5211 [
5212 5212 (b'p', b'public', False, _(b'set changeset phase to public')),
5213 5213 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5214 5214 (b's', b'secret', False, _(b'set changeset phase to secret')),
5215 5215 (b'f', b'force', False, _(b'allow to move boundary backward')),
5216 5216 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5217 5217 ],
5218 5218 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5219 5219 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5220 5220 )
5221 5221 def phase(ui, repo, *revs, **opts):
5222 5222 """set or show the current phase name
5223 5223
5224 5224 With no argument, show the phase name of the current revision(s).
5225 5225
5226 5226 With one of -p/--public, -d/--draft or -s/--secret, change the
5227 5227 phase value of the specified revisions.
5228 5228
5229 5229 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5230 5230 lower phase to a higher phase. Phases are ordered as follows::
5231 5231
5232 5232 public < draft < secret
5233 5233
5234 5234 Returns 0 on success, 1 if some phases could not be changed.
5235 5235
5236 5236 (For more information about the phases concept, see :hg:`help phases`.)
5237 5237 """
5238 5238 opts = pycompat.byteskwargs(opts)
5239 5239 # search for a unique phase argument
5240 5240 targetphase = None
5241 5241 for idx, name in enumerate(phases.cmdphasenames):
5242 5242 if opts[name]:
5243 5243 if targetphase is not None:
5244 5244 raise error.Abort(_(b'only one phase can be specified'))
5245 5245 targetphase = idx
5246 5246
5247 5247 # look for specified revision
5248 5248 revs = list(revs)
5249 5249 revs.extend(opts[b'rev'])
5250 5250 if not revs:
5251 5251 # display both parents as the second parent phase can influence
5252 5252 # the phase of a merge commit
5253 5253 revs = [c.rev() for c in repo[None].parents()]
5254 5254
5255 5255 revs = scmutil.revrange(repo, revs)
5256 5256
5257 5257 ret = 0
5258 5258 if targetphase is None:
5259 5259 # display
5260 5260 for r in revs:
5261 5261 ctx = repo[r]
5262 5262 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5263 5263 else:
5264 5264 with repo.lock(), repo.transaction(b"phase") as tr:
5265 5265 # set phase
5266 5266 if not revs:
5267 5267 raise error.Abort(_(b'empty revision set'))
5268 5268 nodes = [repo[r].node() for r in revs]
5269 5269 # moving revision from public to draft may hide them
5270 5270 # We have to check result on an unfiltered repository
5271 5271 unfi = repo.unfiltered()
5272 5272 getphase = unfi._phasecache.phase
5273 5273 olddata = [getphase(unfi, r) for r in unfi]
5274 5274 phases.advanceboundary(repo, tr, targetphase, nodes)
5275 5275 if opts[b'force']:
5276 5276 phases.retractboundary(repo, tr, targetphase, nodes)
5277 5277 getphase = unfi._phasecache.phase
5278 5278 newdata = [getphase(unfi, r) for r in unfi]
5279 5279 changes = sum(newdata[r] != olddata[r] for r in unfi)
5280 5280 cl = unfi.changelog
5281 5281 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5282 5282 if rejected:
5283 5283 ui.warn(
5284 5284 _(
5285 5285 b'cannot move %i changesets to a higher '
5286 5286 b'phase, use --force\n'
5287 5287 )
5288 5288 % len(rejected)
5289 5289 )
5290 5290 ret = 1
5291 5291 if changes:
5292 5292 msg = _(b'phase changed for %i changesets\n') % changes
5293 5293 if ret:
5294 5294 ui.status(msg)
5295 5295 else:
5296 5296 ui.note(msg)
5297 5297 else:
5298 5298 ui.warn(_(b'no phases changed\n'))
5299 5299 return ret
5300 5300
5301 5301
5302 5302 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5303 5303 """Run after a changegroup has been added via pull/unbundle
5304 5304
5305 5305 This takes arguments below:
5306 5306
5307 5307 :modheads: change of heads by pull/unbundle
5308 5308 :optupdate: updating working directory is needed or not
5309 5309 :checkout: update destination revision (or None to default destination)
5310 5310 :brev: a name, which might be a bookmark to be activated after updating
5311 5311 """
5312 5312 if modheads == 0:
5313 5313 return
5314 5314 if optupdate:
5315 5315 try:
5316 5316 return hg.updatetotally(ui, repo, checkout, brev)
5317 5317 except error.UpdateAbort as inst:
5318 5318 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5319 5319 hint = inst.hint
5320 5320 raise error.UpdateAbort(msg, hint=hint)
5321 5321 if modheads is not None and modheads > 1:
5322 5322 currentbranchheads = len(repo.branchheads())
5323 5323 if currentbranchheads == modheads:
5324 5324 ui.status(
5325 5325 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5326 5326 )
5327 5327 elif currentbranchheads > 1:
5328 5328 ui.status(
5329 5329 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5330 5330 )
5331 5331 else:
5332 5332 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5333 5333 elif not ui.configbool(b'commands', b'update.requiredest'):
5334 5334 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5335 5335
5336 5336
5337 5337 @command(
5338 5338 b'pull',
5339 5339 [
5340 5340 (
5341 5341 b'u',
5342 5342 b'update',
5343 5343 None,
5344 5344 _(b'update to new branch head if new descendants were pulled'),
5345 5345 ),
5346 5346 (
5347 5347 b'f',
5348 5348 b'force',
5349 5349 None,
5350 5350 _(b'run even when remote repository is unrelated'),
5351 5351 ),
5352 5352 (
5353 5353 b'r',
5354 5354 b'rev',
5355 5355 [],
5356 5356 _(b'a remote changeset intended to be added'),
5357 5357 _(b'REV'),
5358 5358 ),
5359 5359 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5360 5360 (
5361 5361 b'b',
5362 5362 b'branch',
5363 5363 [],
5364 5364 _(b'a specific branch you would like to pull'),
5365 5365 _(b'BRANCH'),
5366 5366 ),
5367 5367 ]
5368 5368 + remoteopts,
5369 5369 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
5370 5370 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5371 5371 helpbasic=True,
5372 5372 )
5373 5373 def pull(ui, repo, source=b"default", **opts):
5374 5374 """pull changes from the specified source
5375 5375
5376 5376 Pull changes from a remote repository to a local one.
5377 5377
5378 5378 This finds all changes from the repository at the specified path
5379 5379 or URL and adds them to a local repository (the current one unless
5380 5380 -R is specified). By default, this does not update the copy of the
5381 5381 project in the working directory.
5382 5382
5383 5383 When cloning from servers that support it, Mercurial may fetch
5384 5384 pre-generated data. When this is done, hooks operating on incoming
5385 5385 changesets and changegroups may fire more than once, once for each
5386 5386 pre-generated bundle and as well as for any additional remaining
5387 5387 data. See :hg:`help -e clonebundles` for more.
5388 5388
5389 5389 Use :hg:`incoming` if you want to see what would have been added
5390 5390 by a pull at the time you issued this command. If you then decide
5391 5391 to add those changes to the repository, you should use :hg:`pull
5392 5392 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5393 5393
5394 5394 If SOURCE is omitted, the 'default' path will be used.
5395 5395 See :hg:`help urls` for more information.
5396 5396
5397 5397 Specifying bookmark as ``.`` is equivalent to specifying the active
5398 5398 bookmark's name.
5399 5399
5400 5400 Returns 0 on success, 1 if an update had unresolved files.
5401 5401 """
5402 5402
5403 5403 opts = pycompat.byteskwargs(opts)
5404 5404 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5405 5405 b'update'
5406 5406 ):
5407 5407 msg = _(b'update destination required by configuration')
5408 5408 hint = _(b'use hg pull followed by hg update DEST')
5409 5409 raise error.Abort(msg, hint=hint)
5410 5410
5411 5411 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
5412 5412 ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
5413 5413 other = hg.peer(repo, opts, source)
5414 5414 try:
5415 5415 revs, checkout = hg.addbranchrevs(
5416 5416 repo, other, branches, opts.get(b'rev')
5417 5417 )
5418 5418
5419 5419 pullopargs = {}
5420 5420
5421 5421 nodes = None
5422 5422 if opts.get(b'bookmark') or revs:
5423 5423 # The list of bookmark used here is the same used to actually update
5424 5424 # the bookmark names, to avoid the race from issue 4689 and we do
5425 5425 # all lookup and bookmark queries in one go so they see the same
5426 5426 # version of the server state (issue 4700).
5427 5427 nodes = []
5428 5428 fnodes = []
5429 5429 revs = revs or []
5430 5430 if revs and not other.capable(b'lookup'):
5431 5431 err = _(
5432 5432 b"other repository doesn't support revision lookup, "
5433 5433 b"so a rev cannot be specified."
5434 5434 )
5435 5435 raise error.Abort(err)
5436 5436 with other.commandexecutor() as e:
5437 5437 fremotebookmarks = e.callcommand(
5438 5438 b'listkeys', {b'namespace': b'bookmarks'}
5439 5439 )
5440 5440 for r in revs:
5441 5441 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5442 5442 remotebookmarks = fremotebookmarks.result()
5443 5443 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5444 5444 pullopargs[b'remotebookmarks'] = remotebookmarks
5445 5445 for b in opts.get(b'bookmark', []):
5446 5446 b = repo._bookmarks.expandname(b)
5447 5447 if b not in remotebookmarks:
5448 5448 raise error.Abort(_(b'remote bookmark %s not found!') % b)
5449 5449 nodes.append(remotebookmarks[b])
5450 5450 for i, rev in enumerate(revs):
5451 5451 node = fnodes[i].result()
5452 5452 nodes.append(node)
5453 5453 if rev == checkout:
5454 5454 checkout = node
5455 5455
5456 5456 wlock = util.nullcontextmanager()
5457 5457 if opts.get(b'update'):
5458 5458 wlock = repo.wlock()
5459 5459 with wlock:
5460 5460 pullopargs.update(opts.get(b'opargs', {}))
5461 5461 modheads = exchange.pull(
5462 5462 repo,
5463 5463 other,
5464 5464 heads=nodes,
5465 5465 force=opts.get(b'force'),
5466 5466 bookmarks=opts.get(b'bookmark', ()),
5467 5467 opargs=pullopargs,
5468 5468 ).cgresult
5469 5469
5470 5470 # brev is a name, which might be a bookmark to be activated at
5471 5471 # the end of the update. In other words, it is an explicit
5472 5472 # destination of the update
5473 5473 brev = None
5474 5474
5475 5475 if checkout:
5476 5476 checkout = repo.unfiltered().changelog.rev(checkout)
5477 5477
5478 5478 # order below depends on implementation of
5479 5479 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5480 5480 # because 'checkout' is determined without it.
5481 5481 if opts.get(b'rev'):
5482 5482 brev = opts[b'rev'][0]
5483 5483 elif opts.get(b'branch'):
5484 5484 brev = opts[b'branch'][0]
5485 5485 else:
5486 5486 brev = branches[0]
5487 5487 repo._subtoppath = source
5488 5488 try:
5489 5489 ret = postincoming(
5490 5490 ui, repo, modheads, opts.get(b'update'), checkout, brev
5491 5491 )
5492 5492 except error.FilteredRepoLookupError as exc:
5493 5493 msg = _(b'cannot update to target: %s') % exc.args[0]
5494 5494 exc.args = (msg,) + exc.args[1:]
5495 5495 raise
5496 5496 finally:
5497 5497 del repo._subtoppath
5498 5498
5499 5499 finally:
5500 5500 other.close()
5501 5501 return ret
5502 5502
5503 5503
5504 5504 @command(
5505 5505 b'push',
5506 5506 [
5507 5507 (b'f', b'force', None, _(b'force push')),
5508 5508 (
5509 5509 b'r',
5510 5510 b'rev',
5511 5511 [],
5512 5512 _(b'a changeset intended to be included in the destination'),
5513 5513 _(b'REV'),
5514 5514 ),
5515 5515 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5516 5516 (
5517 5517 b'b',
5518 5518 b'branch',
5519 5519 [],
5520 5520 _(b'a specific branch you would like to push'),
5521 5521 _(b'BRANCH'),
5522 5522 ),
5523 5523 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5524 5524 (
5525 5525 b'',
5526 5526 b'pushvars',
5527 5527 [],
5528 5528 _(b'variables that can be sent to server (ADVANCED)'),
5529 5529 ),
5530 5530 (
5531 5531 b'',
5532 5532 b'publish',
5533 5533 False,
5534 5534 _(b'push the changeset as public (EXPERIMENTAL)'),
5535 5535 ),
5536 5536 ]
5537 5537 + remoteopts,
5538 5538 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
5539 5539 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5540 5540 helpbasic=True,
5541 5541 )
5542 5542 def push(ui, repo, dest=None, **opts):
5543 5543 """push changes to the specified destination
5544 5544
5545 5545 Push changesets from the local repository to the specified
5546 5546 destination.
5547 5547
5548 5548 This operation is symmetrical to pull: it is identical to a pull
5549 5549 in the destination repository from the current one.
5550 5550
5551 5551 By default, push will not allow creation of new heads at the
5552 5552 destination, since multiple heads would make it unclear which head
5553 5553 to use. In this situation, it is recommended to pull and merge
5554 5554 before pushing.
5555 5555
5556 5556 Use --new-branch if you want to allow push to create a new named
5557 5557 branch that is not present at the destination. This allows you to
5558 5558 only create a new branch without forcing other changes.
5559 5559
5560 5560 .. note::
5561 5561
5562 5562 Extra care should be taken with the -f/--force option,
5563 5563 which will push all new heads on all branches, an action which will
5564 5564 almost always cause confusion for collaborators.
5565 5565
5566 5566 If -r/--rev is used, the specified revision and all its ancestors
5567 5567 will be pushed to the remote repository.
5568 5568
5569 5569 If -B/--bookmark is used, the specified bookmarked revision, its
5570 5570 ancestors, and the bookmark will be pushed to the remote
5571 5571 repository. Specifying ``.`` is equivalent to specifying the active
5572 5572 bookmark's name.
5573 5573
5574 5574 Please see :hg:`help urls` for important details about ``ssh://``
5575 5575 URLs. If DESTINATION is omitted, a default path will be used.
5576 5576
5577 5577 .. container:: verbose
5578 5578
5579 5579 The --pushvars option sends strings to the server that become
5580 5580 environment variables prepended with ``HG_USERVAR_``. For example,
5581 5581 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5582 5582 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5583 5583
5584 5584 pushvars can provide for user-overridable hooks as well as set debug
5585 5585 levels. One example is having a hook that blocks commits containing
5586 5586 conflict markers, but enables the user to override the hook if the file
5587 5587 is using conflict markers for testing purposes or the file format has
5588 5588 strings that look like conflict markers.
5589 5589
5590 5590 By default, servers will ignore `--pushvars`. To enable it add the
5591 5591 following to your configuration file::
5592 5592
5593 5593 [push]
5594 5594 pushvars.server = true
5595 5595
5596 5596 Returns 0 if push was successful, 1 if nothing to push.
5597 5597 """
5598 5598
5599 5599 opts = pycompat.byteskwargs(opts)
5600 5600 if opts.get(b'bookmark'):
5601 5601 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5602 5602 for b in opts[b'bookmark']:
5603 5603 # translate -B options to -r so changesets get pushed
5604 5604 b = repo._bookmarks.expandname(b)
5605 5605 if b in repo._bookmarks:
5606 5606 opts.setdefault(b'rev', []).append(b)
5607 5607 else:
5608 5608 # if we try to push a deleted bookmark, translate it to null
5609 5609 # this lets simultaneous -r, -b options continue working
5610 5610 opts.setdefault(b'rev', []).append(b"null")
5611 5611
5612 5612 path = ui.paths.getpath(dest, default=(b'default-push', b'default'))
5613 5613 if not path:
5614 5614 raise error.Abort(
5615 5615 _(b'default repository not configured!'),
5616 5616 hint=_(b"see 'hg help config.paths'"),
5617 5617 )
5618 5618 dest = path.pushloc or path.loc
5619 5619 branches = (path.branch, opts.get(b'branch') or [])
5620 5620 ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
5621 5621 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
5622 5622 other = hg.peer(repo, opts, dest)
5623 5623
5624 5624 if revs:
5625 5625 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5626 5626 if not revs:
5627 5627 raise error.Abort(
5628 5628 _(b"specified revisions evaluate to an empty set"),
5629 5629 hint=_(b"use different revision arguments"),
5630 5630 )
5631 5631 elif path.pushrev:
5632 5632 # It doesn't make any sense to specify ancestor revisions. So limit
5633 5633 # to DAG heads to make discovery simpler.
5634 5634 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5635 5635 revs = scmutil.revrange(repo, [expr])
5636 5636 revs = [repo[rev].node() for rev in revs]
5637 5637 if not revs:
5638 5638 raise error.Abort(
5639 5639 _(b'default push revset for path evaluates to an empty set')
5640 5640 )
5641 5641 elif ui.configbool(b'commands', b'push.require-revs'):
5642 5642 raise error.Abort(
5643 5643 _(b'no revisions specified to push'),
5644 5644 hint=_(b'did you mean "hg push -r ."?'),
5645 5645 )
5646 5646
5647 5647 repo._subtoppath = dest
5648 5648 try:
5649 5649 # push subrepos depth-first for coherent ordering
5650 5650 c = repo[b'.']
5651 5651 subs = c.substate # only repos that are committed
5652 5652 for s in sorted(subs):
5653 5653 result = c.sub(s).push(opts)
5654 5654 if result == 0:
5655 5655 return not result
5656 5656 finally:
5657 5657 del repo._subtoppath
5658 5658
5659 5659 opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it
5660 5660 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5661 5661
5662 5662 pushop = exchange.push(
5663 5663 repo,
5664 5664 other,
5665 5665 opts.get(b'force'),
5666 5666 revs=revs,
5667 5667 newbranch=opts.get(b'new_branch'),
5668 5668 bookmarks=opts.get(b'bookmark', ()),
5669 5669 publish=opts.get(b'publish'),
5670 5670 opargs=opargs,
5671 5671 )
5672 5672
5673 5673 result = not pushop.cgresult
5674 5674
5675 5675 if pushop.bkresult is not None:
5676 5676 if pushop.bkresult == 2:
5677 5677 result = 2
5678 5678 elif not result and pushop.bkresult:
5679 5679 result = 2
5680 5680
5681 5681 return result
5682 5682
5683 5683
5684 5684 @command(
5685 5685 b'recover',
5686 5686 [(b'', b'verify', True, b"run `hg verify` after succesful recover"),],
5687 5687 helpcategory=command.CATEGORY_MAINTENANCE,
5688 5688 )
5689 5689 def recover(ui, repo, **opts):
5690 5690 """roll back an interrupted transaction
5691 5691
5692 5692 Recover from an interrupted commit or pull.
5693 5693
5694 5694 This command tries to fix the repository status after an
5695 5695 interrupted operation. It should only be necessary when Mercurial
5696 5696 suggests it.
5697 5697
5698 5698 Returns 0 if successful, 1 if nothing to recover or verify fails.
5699 5699 """
5700 5700 ret = repo.recover()
5701 5701 if ret:
5702 5702 if opts['verify']:
5703 5703 return hg.verify(repo)
5704 5704 else:
5705 5705 msg = _(
5706 5706 b"(verify step skipped, run `hg verify` to check your "
5707 5707 b"repository content)\n"
5708 5708 )
5709 5709 ui.warn(msg)
5710 5710 return 0
5711 5711 return 1
5712 5712
5713 5713
5714 5714 @command(
5715 5715 b'remove|rm',
5716 5716 [
5717 5717 (b'A', b'after', None, _(b'record delete for missing files')),
5718 5718 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5719 5719 ]
5720 5720 + subrepoopts
5721 5721 + walkopts
5722 5722 + dryrunopts,
5723 5723 _(b'[OPTION]... FILE...'),
5724 5724 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5725 5725 helpbasic=True,
5726 5726 inferrepo=True,
5727 5727 )
5728 5728 def remove(ui, repo, *pats, **opts):
5729 5729 """remove the specified files on the next commit
5730 5730
5731 5731 Schedule the indicated files for removal from the current branch.
5732 5732
5733 5733 This command schedules the files to be removed at the next commit.
5734 5734 To undo a remove before that, see :hg:`revert`. To undo added
5735 5735 files, see :hg:`forget`.
5736 5736
5737 5737 .. container:: verbose
5738 5738
5739 5739 -A/--after can be used to remove only files that have already
5740 5740 been deleted, -f/--force can be used to force deletion, and -Af
5741 5741 can be used to remove files from the next revision without
5742 5742 deleting them from the working directory.
5743 5743
5744 5744 The following table details the behavior of remove for different
5745 5745 file states (columns) and option combinations (rows). The file
5746 5746 states are Added [A], Clean [C], Modified [M] and Missing [!]
5747 5747 (as reported by :hg:`status`). The actions are Warn, Remove
5748 5748 (from branch) and Delete (from disk):
5749 5749
5750 5750 ========= == == == ==
5751 5751 opt/state A C M !
5752 5752 ========= == == == ==
5753 5753 none W RD W R
5754 5754 -f R RD RD R
5755 5755 -A W W W R
5756 5756 -Af R R R R
5757 5757 ========= == == == ==
5758 5758
5759 5759 .. note::
5760 5760
5761 5761 :hg:`remove` never deletes files in Added [A] state from the
5762 5762 working directory, not even if ``--force`` is specified.
5763 5763
5764 5764 Returns 0 on success, 1 if any warnings encountered.
5765 5765 """
5766 5766
5767 5767 opts = pycompat.byteskwargs(opts)
5768 5768 after, force = opts.get(b'after'), opts.get(b'force')
5769 5769 dryrun = opts.get(b'dry_run')
5770 5770 if not pats and not after:
5771 5771 raise error.Abort(_(b'no files specified'))
5772 5772
5773 5773 m = scmutil.match(repo[None], pats, opts)
5774 5774 subrepos = opts.get(b'subrepos')
5775 5775 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5776 5776 return cmdutil.remove(
5777 5777 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5778 5778 )
5779 5779
5780 5780
5781 5781 @command(
5782 5782 b'rename|move|mv',
5783 5783 [
5784 5784 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5785 5785 (
5786 5786 b'f',
5787 5787 b'force',
5788 5788 None,
5789 5789 _(b'forcibly move over an existing managed file'),
5790 5790 ),
5791 5791 ]
5792 5792 + walkopts
5793 5793 + dryrunopts,
5794 5794 _(b'[OPTION]... SOURCE... DEST'),
5795 5795 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5796 5796 )
5797 5797 def rename(ui, repo, *pats, **opts):
5798 5798 """rename files; equivalent of copy + remove
5799 5799
5800 5800 Mark dest as copies of sources; mark sources for deletion. If dest
5801 5801 is a directory, copies are put in that directory. If dest is a
5802 5802 file, there can only be one source.
5803 5803
5804 5804 By default, this command copies the contents of files as they
5805 5805 exist in the working directory. If invoked with -A/--after, the
5806 5806 operation is recorded, but no copying is performed.
5807 5807
5808 5808 This command takes effect at the next commit. To undo a rename
5809 5809 before that, see :hg:`revert`.
5810 5810
5811 5811 Returns 0 on success, 1 if errors are encountered.
5812 5812 """
5813 5813 opts = pycompat.byteskwargs(opts)
5814 5814 with repo.wlock(False):
5815 5815 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5816 5816
5817 5817
5818 5818 @command(
5819 5819 b'resolve',
5820 5820 [
5821 5821 (b'a', b'all', None, _(b'select all unresolved files')),
5822 5822 (b'l', b'list', None, _(b'list state of files needing merge')),
5823 5823 (b'm', b'mark', None, _(b'mark files as resolved')),
5824 5824 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5825 5825 (b'n', b'no-status', None, _(b'hide status prefix')),
5826 5826 (b'', b're-merge', None, _(b're-merge files')),
5827 5827 ]
5828 5828 + mergetoolopts
5829 5829 + walkopts
5830 5830 + formatteropts,
5831 5831 _(b'[OPTION]... [FILE]...'),
5832 5832 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5833 5833 inferrepo=True,
5834 5834 )
5835 5835 def resolve(ui, repo, *pats, **opts):
5836 5836 """redo merges or set/view the merge status of files
5837 5837
5838 5838 Merges with unresolved conflicts are often the result of
5839 5839 non-interactive merging using the ``internal:merge`` configuration
5840 5840 setting, or a command-line merge tool like ``diff3``. The resolve
5841 5841 command is used to manage the files involved in a merge, after
5842 5842 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5843 5843 working directory must have two parents). See :hg:`help
5844 5844 merge-tools` for information on configuring merge tools.
5845 5845
5846 5846 The resolve command can be used in the following ways:
5847 5847
5848 5848 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5849 5849 the specified files, discarding any previous merge attempts. Re-merging
5850 5850 is not performed for files already marked as resolved. Use ``--all/-a``
5851 5851 to select all unresolved files. ``--tool`` can be used to specify
5852 5852 the merge tool used for the given files. It overrides the HGMERGE
5853 5853 environment variable and your configuration files. Previous file
5854 5854 contents are saved with a ``.orig`` suffix.
5855 5855
5856 5856 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5857 5857 (e.g. after having manually fixed-up the files). The default is
5858 5858 to mark all unresolved files.
5859 5859
5860 5860 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5861 5861 default is to mark all resolved files.
5862 5862
5863 5863 - :hg:`resolve -l`: list files which had or still have conflicts.
5864 5864 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5865 5865 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
5866 5866 the list. See :hg:`help filesets` for details.
5867 5867
5868 5868 .. note::
5869 5869
5870 5870 Mercurial will not let you commit files with unresolved merge
5871 5871 conflicts. You must use :hg:`resolve -m ...` before you can
5872 5872 commit after a conflicting merge.
5873 5873
5874 5874 .. container:: verbose
5875 5875
5876 5876 Template:
5877 5877
5878 5878 The following keywords are supported in addition to the common template
5879 5879 keywords and functions. See also :hg:`help templates`.
5880 5880
5881 5881 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
5882 5882 :path: String. Repository-absolute path of the file.
5883 5883
5884 5884 Returns 0 on success, 1 if any files fail a resolve attempt.
5885 5885 """
5886 5886
5887 5887 opts = pycompat.byteskwargs(opts)
5888 5888 confirm = ui.configbool(b'commands', b'resolve.confirm')
5889 5889 flaglist = b'all mark unmark list no_status re_merge'.split()
5890 5890 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
5891 5891
5892 5892 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
5893 5893 if actioncount > 1:
5894 5894 raise error.Abort(_(b"too many actions specified"))
5895 5895 elif actioncount == 0 and ui.configbool(
5896 5896 b'commands', b'resolve.explicit-re-merge'
5897 5897 ):
5898 5898 hint = _(b'use --mark, --unmark, --list or --re-merge')
5899 5899 raise error.Abort(_(b'no action specified'), hint=hint)
5900 5900 if pats and all:
5901 5901 raise error.Abort(_(b"can't specify --all and patterns"))
5902 5902 if not (all or pats or show or mark or unmark):
5903 5903 raise error.Abort(
5904 5904 _(b'no files or directories specified'),
5905 5905 hint=b'use --all to re-merge all unresolved files',
5906 5906 )
5907 5907
5908 5908 if confirm:
5909 5909 if all:
5910 5910 if ui.promptchoice(
5911 5911 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
5912 5912 ):
5913 5913 raise error.Abort(_(b'user quit'))
5914 5914 if mark and not pats:
5915 5915 if ui.promptchoice(
5916 5916 _(
5917 5917 b'mark all unresolved files as resolved (yn)?'
5918 5918 b'$$ &Yes $$ &No'
5919 5919 )
5920 5920 ):
5921 5921 raise error.Abort(_(b'user quit'))
5922 5922 if unmark and not pats:
5923 5923 if ui.promptchoice(
5924 5924 _(
5925 5925 b'mark all resolved files as unresolved (yn)?'
5926 5926 b'$$ &Yes $$ &No'
5927 5927 )
5928 5928 ):
5929 5929 raise error.Abort(_(b'user quit'))
5930 5930
5931 5931 uipathfn = scmutil.getuipathfn(repo)
5932 5932
5933 5933 if show:
5934 5934 ui.pager(b'resolve')
5935 5935 fm = ui.formatter(b'resolve', opts)
5936 5936 ms = mergemod.mergestate.read(repo)
5937 5937 wctx = repo[None]
5938 5938 m = scmutil.match(wctx, pats, opts)
5939 5939
5940 5940 # Labels and keys based on merge state. Unresolved path conflicts show
5941 5941 # as 'P'. Resolved path conflicts show as 'R', the same as normal
5942 5942 # resolved conflicts.
5943 5943 mergestateinfo = {
5944 5944 mergemod.MERGE_RECORD_UNRESOLVED: (b'resolve.unresolved', b'U'),
5945 5945 mergemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
5946 5946 mergemod.MERGE_RECORD_UNRESOLVED_PATH: (
5947 5947 b'resolve.unresolved',
5948 5948 b'P',
5949 5949 ),
5950 5950 mergemod.MERGE_RECORD_RESOLVED_PATH: (b'resolve.resolved', b'R'),
5951 5951 mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
5952 5952 b'resolve.driverresolved',
5953 5953 b'D',
5954 5954 ),
5955 5955 }
5956 5956
5957 5957 for f in ms:
5958 5958 if not m(f):
5959 5959 continue
5960 5960
5961 5961 label, key = mergestateinfo[ms[f]]
5962 5962 fm.startitem()
5963 5963 fm.context(ctx=wctx)
5964 5964 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
5965 5965 fm.data(path=f)
5966 5966 fm.plain(b'%s\n' % uipathfn(f), label=label)
5967 5967 fm.end()
5968 5968 return 0
5969 5969
5970 5970 with repo.wlock():
5971 5971 ms = mergemod.mergestate.read(repo)
5972 5972
5973 5973 if not (ms.active() or repo.dirstate.p2() != nullid):
5974 5974 raise error.Abort(
5975 5975 _(b'resolve command not applicable when not merging')
5976 5976 )
5977 5977
5978 5978 wctx = repo[None]
5979 5979
5980 5980 if (
5981 5981 ms.mergedriver
5982 5982 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
5983 5983 ):
5984 5984 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5985 5985 ms.commit()
5986 5986 # allow mark and unmark to go through
5987 5987 if not mark and not unmark and not proceed:
5988 5988 return 1
5989 5989
5990 5990 m = scmutil.match(wctx, pats, opts)
5991 5991 ret = 0
5992 5992 didwork = False
5993 5993 runconclude = False
5994 5994
5995 5995 tocomplete = []
5996 5996 hasconflictmarkers = []
5997 5997 if mark:
5998 5998 markcheck = ui.config(b'commands', b'resolve.mark-check')
5999 5999 if markcheck not in [b'warn', b'abort']:
6000 6000 # Treat all invalid / unrecognized values as 'none'.
6001 6001 markcheck = False
6002 6002 for f in ms:
6003 6003 if not m(f):
6004 6004 continue
6005 6005
6006 6006 didwork = True
6007 6007
6008 6008 # don't let driver-resolved files be marked, and run the conclude
6009 6009 # step if asked to resolve
6010 6010 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
6011 6011 exact = m.exact(f)
6012 6012 if mark:
6013 6013 if exact:
6014 6014 ui.warn(
6015 6015 _(b'not marking %s as it is driver-resolved\n')
6016 6016 % uipathfn(f)
6017 6017 )
6018 6018 elif unmark:
6019 6019 if exact:
6020 6020 ui.warn(
6021 6021 _(b'not unmarking %s as it is driver-resolved\n')
6022 6022 % uipathfn(f)
6023 6023 )
6024 6024 else:
6025 6025 runconclude = True
6026 6026 continue
6027 6027
6028 6028 # path conflicts must be resolved manually
6029 6029 if ms[f] in (
6030 6030 mergemod.MERGE_RECORD_UNRESOLVED_PATH,
6031 6031 mergemod.MERGE_RECORD_RESOLVED_PATH,
6032 6032 ):
6033 6033 if mark:
6034 6034 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
6035 6035 elif unmark:
6036 6036 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
6037 6037 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
6038 6038 ui.warn(
6039 6039 _(b'%s: path conflict must be resolved manually\n')
6040 6040 % uipathfn(f)
6041 6041 )
6042 6042 continue
6043 6043
6044 6044 if mark:
6045 6045 if markcheck:
6046 6046 fdata = repo.wvfs.tryread(f)
6047 6047 if (
6048 6048 filemerge.hasconflictmarkers(fdata)
6049 6049 and ms[f] != mergemod.MERGE_RECORD_RESOLVED
6050 6050 ):
6051 6051 hasconflictmarkers.append(f)
6052 6052 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
6053 6053 elif unmark:
6054 6054 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
6055 6055 else:
6056 6056 # backup pre-resolve (merge uses .orig for its own purposes)
6057 6057 a = repo.wjoin(f)
6058 6058 try:
6059 6059 util.copyfile(a, a + b".resolve")
6060 6060 except (IOError, OSError) as inst:
6061 6061 if inst.errno != errno.ENOENT:
6062 6062 raise
6063 6063
6064 6064 try:
6065 6065 # preresolve file
6066 6066 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6067 6067 with ui.configoverride(overrides, b'resolve'):
6068 6068 complete, r = ms.preresolve(f, wctx)
6069 6069 if not complete:
6070 6070 tocomplete.append(f)
6071 6071 elif r:
6072 6072 ret = 1
6073 6073 finally:
6074 6074 ms.commit()
6075 6075
6076 6076 # replace filemerge's .orig file with our resolve file, but only
6077 6077 # for merges that are complete
6078 6078 if complete:
6079 6079 try:
6080 6080 util.rename(
6081 6081 a + b".resolve", scmutil.backuppath(ui, repo, f)
6082 6082 )
6083 6083 except OSError as inst:
6084 6084 if inst.errno != errno.ENOENT:
6085 6085 raise
6086 6086
6087 6087 if hasconflictmarkers:
6088 6088 ui.warn(
6089 6089 _(
6090 6090 b'warning: the following files still have conflict '
6091 6091 b'markers:\n'
6092 6092 )
6093 6093 + b''.join(
6094 6094 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6095 6095 )
6096 6096 )
6097 6097 if markcheck == b'abort' and not all and not pats:
6098 6098 raise error.Abort(
6099 6099 _(b'conflict markers detected'),
6100 6100 hint=_(b'use --all to mark anyway'),
6101 6101 )
6102 6102
6103 6103 for f in tocomplete:
6104 6104 try:
6105 6105 # resolve file
6106 6106 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6107 6107 with ui.configoverride(overrides, b'resolve'):
6108 6108 r = ms.resolve(f, wctx)
6109 6109 if r:
6110 6110 ret = 1
6111 6111 finally:
6112 6112 ms.commit()
6113 6113
6114 6114 # replace filemerge's .orig file with our resolve file
6115 6115 a = repo.wjoin(f)
6116 6116 try:
6117 6117 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6118 6118 except OSError as inst:
6119 6119 if inst.errno != errno.ENOENT:
6120 6120 raise
6121 6121
6122 6122 ms.commit()
6123 6123 ms.recordactions()
6124 6124
6125 6125 if not didwork and pats:
6126 6126 hint = None
6127 6127 if not any([p for p in pats if p.find(b':') >= 0]):
6128 6128 pats = [b'path:%s' % p for p in pats]
6129 6129 m = scmutil.match(wctx, pats, opts)
6130 6130 for f in ms:
6131 6131 if not m(f):
6132 6132 continue
6133 6133
6134 6134 def flag(o):
6135 6135 if o == b're_merge':
6136 6136 return b'--re-merge '
6137 6137 return b'-%s ' % o[0:1]
6138 6138
6139 6139 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6140 6140 hint = _(b"(try: hg resolve %s%s)\n") % (
6141 6141 flags,
6142 6142 b' '.join(pats),
6143 6143 )
6144 6144 break
6145 6145 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6146 6146 if hint:
6147 6147 ui.warn(hint)
6148 6148 elif ms.mergedriver and ms.mdstate() != b's':
6149 6149 # run conclude step when either a driver-resolved file is requested
6150 6150 # or there are no driver-resolved files
6151 6151 # we can't use 'ret' to determine whether any files are unresolved
6152 6152 # because we might not have tried to resolve some
6153 6153 if (runconclude or not list(ms.driverresolved())) and not list(
6154 6154 ms.unresolved()
6155 6155 ):
6156 6156 proceed = mergemod.driverconclude(repo, ms, wctx)
6157 6157 ms.commit()
6158 6158 if not proceed:
6159 6159 return 1
6160 6160
6161 6161 # Nudge users into finishing an unfinished operation
6162 6162 unresolvedf = list(ms.unresolved())
6163 6163 driverresolvedf = list(ms.driverresolved())
6164 6164 if not unresolvedf and not driverresolvedf:
6165 6165 ui.status(_(b'(no more unresolved files)\n'))
6166 6166 cmdutil.checkafterresolved(repo)
6167 6167 elif not unresolvedf:
6168 6168 ui.status(
6169 6169 _(
6170 6170 b'(no more unresolved files -- '
6171 6171 b'run "hg resolve --all" to conclude)\n'
6172 6172 )
6173 6173 )
6174 6174
6175 6175 return ret
6176 6176
6177 6177
6178 6178 @command(
6179 6179 b'revert',
6180 6180 [
6181 6181 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6182 6182 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6183 6183 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6184 6184 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6185 6185 (b'i', b'interactive', None, _(b'interactively select the changes')),
6186 6186 ]
6187 6187 + walkopts
6188 6188 + dryrunopts,
6189 6189 _(b'[OPTION]... [-r REV] [NAME]...'),
6190 6190 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6191 6191 )
6192 6192 def revert(ui, repo, *pats, **opts):
6193 6193 """restore files to their checkout state
6194 6194
6195 6195 .. note::
6196 6196
6197 6197 To check out earlier revisions, you should use :hg:`update REV`.
6198 6198 To cancel an uncommitted merge (and lose your changes),
6199 6199 use :hg:`merge --abort`.
6200 6200
6201 6201 With no revision specified, revert the specified files or directories
6202 6202 to the contents they had in the parent of the working directory.
6203 6203 This restores the contents of files to an unmodified
6204 6204 state and unschedules adds, removes, copies, and renames. If the
6205 6205 working directory has two parents, you must explicitly specify a
6206 6206 revision.
6207 6207
6208 6208 Using the -r/--rev or -d/--date options, revert the given files or
6209 6209 directories to their states as of a specific revision. Because
6210 6210 revert does not change the working directory parents, this will
6211 6211 cause these files to appear modified. This can be helpful to "back
6212 6212 out" some or all of an earlier change. See :hg:`backout` for a
6213 6213 related method.
6214 6214
6215 6215 Modified files are saved with a .orig suffix before reverting.
6216 6216 To disable these backups, use --no-backup. It is possible to store
6217 6217 the backup files in a custom directory relative to the root of the
6218 6218 repository by setting the ``ui.origbackuppath`` configuration
6219 6219 option.
6220 6220
6221 6221 See :hg:`help dates` for a list of formats valid for -d/--date.
6222 6222
6223 6223 See :hg:`help backout` for a way to reverse the effect of an
6224 6224 earlier changeset.
6225 6225
6226 6226 Returns 0 on success.
6227 6227 """
6228 6228
6229 6229 opts = pycompat.byteskwargs(opts)
6230 6230 if opts.get(b"date"):
6231 6231 if opts.get(b"rev"):
6232 6232 raise error.Abort(_(b"you can't specify a revision and a date"))
6233 6233 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6234 6234
6235 6235 parent, p2 = repo.dirstate.parents()
6236 6236 if not opts.get(b'rev') and p2 != nullid:
6237 6237 # revert after merge is a trap for new users (issue2915)
6238 6238 raise error.Abort(
6239 6239 _(b'uncommitted merge with no revision specified'),
6240 6240 hint=_(b"use 'hg update' or see 'hg help revert'"),
6241 6241 )
6242 6242
6243 6243 rev = opts.get(b'rev')
6244 6244 if rev:
6245 6245 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6246 6246 ctx = scmutil.revsingle(repo, rev)
6247 6247
6248 6248 if not (
6249 6249 pats
6250 6250 or opts.get(b'include')
6251 6251 or opts.get(b'exclude')
6252 6252 or opts.get(b'all')
6253 6253 or opts.get(b'interactive')
6254 6254 ):
6255 6255 msg = _(b"no files or directories specified")
6256 6256 if p2 != nullid:
6257 6257 hint = _(
6258 6258 b"uncommitted merge, use --all to discard all changes,"
6259 6259 b" or 'hg update -C .' to abort the merge"
6260 6260 )
6261 6261 raise error.Abort(msg, hint=hint)
6262 6262 dirty = any(repo.status())
6263 6263 node = ctx.node()
6264 6264 if node != parent:
6265 6265 if dirty:
6266 6266 hint = (
6267 6267 _(
6268 6268 b"uncommitted changes, use --all to discard all"
6269 6269 b" changes, or 'hg update %d' to update"
6270 6270 )
6271 6271 % ctx.rev()
6272 6272 )
6273 6273 else:
6274 6274 hint = (
6275 6275 _(
6276 6276 b"use --all to revert all files,"
6277 6277 b" or 'hg update %d' to update"
6278 6278 )
6279 6279 % ctx.rev()
6280 6280 )
6281 6281 elif dirty:
6282 6282 hint = _(b"uncommitted changes, use --all to discard all changes")
6283 6283 else:
6284 6284 hint = _(b"use --all to revert all files")
6285 6285 raise error.Abort(msg, hint=hint)
6286 6286
6287 6287 return cmdutil.revert(
6288 6288 ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
6289 6289 )
6290 6290
6291 6291
6292 6292 @command(
6293 6293 b'rollback',
6294 6294 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6295 6295 helpcategory=command.CATEGORY_MAINTENANCE,
6296 6296 )
6297 6297 def rollback(ui, repo, **opts):
6298 6298 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6299 6299
6300 6300 Please use :hg:`commit --amend` instead of rollback to correct
6301 6301 mistakes in the last commit.
6302 6302
6303 6303 This command should be used with care. There is only one level of
6304 6304 rollback, and there is no way to undo a rollback. It will also
6305 6305 restore the dirstate at the time of the last transaction, losing
6306 6306 any dirstate changes since that time. This command does not alter
6307 6307 the working directory.
6308 6308
6309 6309 Transactions are used to encapsulate the effects of all commands
6310 6310 that create new changesets or propagate existing changesets into a
6311 6311 repository.
6312 6312
6313 6313 .. container:: verbose
6314 6314
6315 6315 For example, the following commands are transactional, and their
6316 6316 effects can be rolled back:
6317 6317
6318 6318 - commit
6319 6319 - import
6320 6320 - pull
6321 6321 - push (with this repository as the destination)
6322 6322 - unbundle
6323 6323
6324 6324 To avoid permanent data loss, rollback will refuse to rollback a
6325 6325 commit transaction if it isn't checked out. Use --force to
6326 6326 override this protection.
6327 6327
6328 6328 The rollback command can be entirely disabled by setting the
6329 6329 ``ui.rollback`` configuration setting to false. If you're here
6330 6330 because you want to use rollback and it's disabled, you can
6331 6331 re-enable the command by setting ``ui.rollback`` to true.
6332 6332
6333 6333 This command is not intended for use on public repositories. Once
6334 6334 changes are visible for pull by other users, rolling a transaction
6335 6335 back locally is ineffective (someone else may already have pulled
6336 6336 the changes). Furthermore, a race is possible with readers of the
6337 6337 repository; for example an in-progress pull from the repository
6338 6338 may fail if a rollback is performed.
6339 6339
6340 6340 Returns 0 on success, 1 if no rollback data is available.
6341 6341 """
6342 6342 if not ui.configbool(b'ui', b'rollback'):
6343 6343 raise error.Abort(
6344 6344 _(b'rollback is disabled because it is unsafe'),
6345 6345 hint=b'see `hg help -v rollback` for information',
6346 6346 )
6347 6347 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6348 6348
6349 6349
6350 6350 @command(
6351 6351 b'root',
6352 6352 [] + formatteropts,
6353 6353 intents={INTENT_READONLY},
6354 6354 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6355 6355 )
6356 6356 def root(ui, repo, **opts):
6357 6357 """print the root (top) of the current working directory
6358 6358
6359 6359 Print the root directory of the current repository.
6360 6360
6361 6361 .. container:: verbose
6362 6362
6363 6363 Template:
6364 6364
6365 6365 The following keywords are supported in addition to the common template
6366 6366 keywords and functions. See also :hg:`help templates`.
6367 6367
6368 6368 :hgpath: String. Path to the .hg directory.
6369 6369 :storepath: String. Path to the directory holding versioned data.
6370 6370
6371 6371 Returns 0 on success.
6372 6372 """
6373 6373 opts = pycompat.byteskwargs(opts)
6374 6374 with ui.formatter(b'root', opts) as fm:
6375 6375 fm.startitem()
6376 6376 fm.write(b'reporoot', b'%s\n', repo.root)
6377 6377 fm.data(hgpath=repo.path, storepath=repo.spath)
6378 6378
6379 6379
6380 6380 @command(
6381 6381 b'serve',
6382 6382 [
6383 6383 (
6384 6384 b'A',
6385 6385 b'accesslog',
6386 6386 b'',
6387 6387 _(b'name of access log file to write to'),
6388 6388 _(b'FILE'),
6389 6389 ),
6390 6390 (b'd', b'daemon', None, _(b'run server in background')),
6391 6391 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6392 6392 (
6393 6393 b'E',
6394 6394 b'errorlog',
6395 6395 b'',
6396 6396 _(b'name of error log file to write to'),
6397 6397 _(b'FILE'),
6398 6398 ),
6399 6399 # use string type, then we can check if something was passed
6400 6400 (
6401 6401 b'p',
6402 6402 b'port',
6403 6403 b'',
6404 6404 _(b'port to listen on (default: 8000)'),
6405 6405 _(b'PORT'),
6406 6406 ),
6407 6407 (
6408 6408 b'a',
6409 6409 b'address',
6410 6410 b'',
6411 6411 _(b'address to listen on (default: all interfaces)'),
6412 6412 _(b'ADDR'),
6413 6413 ),
6414 6414 (
6415 6415 b'',
6416 6416 b'prefix',
6417 6417 b'',
6418 6418 _(b'prefix path to serve from (default: server root)'),
6419 6419 _(b'PREFIX'),
6420 6420 ),
6421 6421 (
6422 6422 b'n',
6423 6423 b'name',
6424 6424 b'',
6425 6425 _(b'name to show in web pages (default: working directory)'),
6426 6426 _(b'NAME'),
6427 6427 ),
6428 6428 (
6429 6429 b'',
6430 6430 b'web-conf',
6431 6431 b'',
6432 6432 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6433 6433 _(b'FILE'),
6434 6434 ),
6435 6435 (
6436 6436 b'',
6437 6437 b'webdir-conf',
6438 6438 b'',
6439 6439 _(b'name of the hgweb config file (DEPRECATED)'),
6440 6440 _(b'FILE'),
6441 6441 ),
6442 6442 (
6443 6443 b'',
6444 6444 b'pid-file',
6445 6445 b'',
6446 6446 _(b'name of file to write process ID to'),
6447 6447 _(b'FILE'),
6448 6448 ),
6449 6449 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6450 6450 (
6451 6451 b'',
6452 6452 b'cmdserver',
6453 6453 b'',
6454 6454 _(b'for remote clients (ADVANCED)'),
6455 6455 _(b'MODE'),
6456 6456 ),
6457 6457 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6458 6458 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6459 6459 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6460 6460 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6461 6461 (b'', b'print-url', None, _(b'start and print only the URL')),
6462 6462 ]
6463 6463 + subrepoopts,
6464 6464 _(b'[OPTION]...'),
6465 6465 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6466 6466 helpbasic=True,
6467 6467 optionalrepo=True,
6468 6468 )
6469 6469 def serve(ui, repo, **opts):
6470 6470 """start stand-alone webserver
6471 6471
6472 6472 Start a local HTTP repository browser and pull server. You can use
6473 6473 this for ad-hoc sharing and browsing of repositories. It is
6474 6474 recommended to use a real web server to serve a repository for
6475 6475 longer periods of time.
6476 6476
6477 6477 Please note that the server does not implement access control.
6478 6478 This means that, by default, anybody can read from the server and
6479 6479 nobody can write to it by default. Set the ``web.allow-push``
6480 6480 option to ``*`` to allow everybody to push to the server. You
6481 6481 should use a real web server if you need to authenticate users.
6482 6482
6483 6483 By default, the server logs accesses to stdout and errors to
6484 6484 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6485 6485 files.
6486 6486
6487 6487 To have the server choose a free port number to listen on, specify
6488 6488 a port number of 0; in this case, the server will print the port
6489 6489 number it uses.
6490 6490
6491 6491 Returns 0 on success.
6492 6492 """
6493 6493
6494 6494 opts = pycompat.byteskwargs(opts)
6495 6495 if opts[b"stdio"] and opts[b"cmdserver"]:
6496 6496 raise error.Abort(_(b"cannot use --stdio with --cmdserver"))
6497 6497 if opts[b"print_url"] and ui.verbose:
6498 6498 raise error.Abort(_(b"cannot use --print-url with --verbose"))
6499 6499
6500 6500 if opts[b"stdio"]:
6501 6501 if repo is None:
6502 6502 raise error.RepoError(
6503 6503 _(b"there is no Mercurial repository here (.hg not found)")
6504 6504 )
6505 6505 s = wireprotoserver.sshserver(ui, repo)
6506 6506 s.serve_forever()
6507 6507
6508 6508 service = server.createservice(ui, repo, opts)
6509 6509 return server.runservice(opts, initfn=service.init, runfn=service.run)
6510 6510
6511 6511
6512 6512 @command(
6513 6513 b'shelve',
6514 6514 [
6515 6515 (
6516 6516 b'A',
6517 6517 b'addremove',
6518 6518 None,
6519 6519 _(b'mark new/missing files as added/removed before shelving'),
6520 6520 ),
6521 6521 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6522 6522 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6523 6523 (
6524 6524 b'',
6525 6525 b'date',
6526 6526 b'',
6527 6527 _(b'shelve with the specified commit date'),
6528 6528 _(b'DATE'),
6529 6529 ),
6530 6530 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6531 6531 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6532 6532 (
6533 6533 b'k',
6534 6534 b'keep',
6535 6535 False,
6536 6536 _(b'shelve, but keep changes in the working directory'),
6537 6537 ),
6538 6538 (b'l', b'list', None, _(b'list current shelves')),
6539 6539 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6540 6540 (
6541 6541 b'n',
6542 6542 b'name',
6543 6543 b'',
6544 6544 _(b'use the given name for the shelved commit'),
6545 6545 _(b'NAME'),
6546 6546 ),
6547 6547 (
6548 6548 b'p',
6549 6549 b'patch',
6550 6550 None,
6551 6551 _(
6552 6552 b'output patches for changes (provide the names of the shelved '
6553 6553 b'changes as positional arguments)'
6554 6554 ),
6555 6555 ),
6556 6556 (b'i', b'interactive', None, _(b'interactive mode')),
6557 6557 (
6558 6558 b'',
6559 6559 b'stat',
6560 6560 None,
6561 6561 _(
6562 6562 b'output diffstat-style summary of changes (provide the names of '
6563 6563 b'the shelved changes as positional arguments)'
6564 6564 ),
6565 6565 ),
6566 6566 ]
6567 6567 + cmdutil.walkopts,
6568 6568 _(b'hg shelve [OPTION]... [FILE]...'),
6569 6569 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6570 6570 )
6571 6571 def shelve(ui, repo, *pats, **opts):
6572 6572 '''save and set aside changes from the working directory
6573 6573
6574 6574 Shelving takes files that "hg status" reports as not clean, saves
6575 6575 the modifications to a bundle (a shelved change), and reverts the
6576 6576 files so that their state in the working directory becomes clean.
6577 6577
6578 6578 To restore these changes to the working directory, using "hg
6579 6579 unshelve"; this will work even if you switch to a different
6580 6580 commit.
6581 6581
6582 6582 When no files are specified, "hg shelve" saves all not-clean
6583 6583 files. If specific files or directories are named, only changes to
6584 6584 those files are shelved.
6585 6585
6586 6586 In bare shelve (when no files are specified, without interactive,
6587 6587 include and exclude option), shelving remembers information if the
6588 6588 working directory was on newly created branch, in other words working
6589 6589 directory was on different branch than its first parent. In this
6590 6590 situation unshelving restores branch information to the working directory.
6591 6591
6592 6592 Each shelved change has a name that makes it easier to find later.
6593 6593 The name of a shelved change defaults to being based on the active
6594 6594 bookmark, or if there is no active bookmark, the current named
6595 6595 branch. To specify a different name, use ``--name``.
6596 6596
6597 6597 To see a list of existing shelved changes, use the ``--list``
6598 6598 option. For each shelved change, this will print its name, age,
6599 6599 and description; use ``--patch`` or ``--stat`` for more details.
6600 6600
6601 6601 To delete specific shelved changes, use ``--delete``. To delete
6602 6602 all shelved changes, use ``--cleanup``.
6603 6603 '''
6604 6604 opts = pycompat.byteskwargs(opts)
6605 6605 allowables = [
6606 6606 (b'addremove', {b'create'}), # 'create' is pseudo action
6607 6607 (b'unknown', {b'create'}),
6608 6608 (b'cleanup', {b'cleanup'}),
6609 6609 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6610 6610 (b'delete', {b'delete'}),
6611 6611 (b'edit', {b'create'}),
6612 6612 (b'keep', {b'create'}),
6613 6613 (b'list', {b'list'}),
6614 6614 (b'message', {b'create'}),
6615 6615 (b'name', {b'create'}),
6616 6616 (b'patch', {b'patch', b'list'}),
6617 6617 (b'stat', {b'stat', b'list'}),
6618 6618 ]
6619 6619
6620 6620 def checkopt(opt):
6621 6621 if opts.get(opt):
6622 6622 for i, allowable in allowables:
6623 6623 if opts[i] and opt not in allowable:
6624 6624 raise error.Abort(
6625 6625 _(
6626 6626 b"options '--%s' and '--%s' may not be "
6627 6627 b"used together"
6628 6628 )
6629 6629 % (opt, i)
6630 6630 )
6631 6631 return True
6632 6632
6633 6633 if checkopt(b'cleanup'):
6634 6634 if pats:
6635 6635 raise error.Abort(_(b"cannot specify names when using '--cleanup'"))
6636 6636 return shelvemod.cleanupcmd(ui, repo)
6637 6637 elif checkopt(b'delete'):
6638 6638 return shelvemod.deletecmd(ui, repo, pats)
6639 6639 elif checkopt(b'list'):
6640 6640 return shelvemod.listcmd(ui, repo, pats, opts)
6641 6641 elif checkopt(b'patch') or checkopt(b'stat'):
6642 6642 return shelvemod.patchcmds(ui, repo, pats, opts)
6643 6643 else:
6644 6644 return shelvemod.createcmd(ui, repo, pats, opts)
6645 6645
6646 6646
6647 6647 _NOTTERSE = b'nothing'
6648 6648
6649 6649
6650 6650 @command(
6651 6651 b'status|st',
6652 6652 [
6653 6653 (b'A', b'all', None, _(b'show status of all files')),
6654 6654 (b'm', b'modified', None, _(b'show only modified files')),
6655 6655 (b'a', b'added', None, _(b'show only added files')),
6656 6656 (b'r', b'removed', None, _(b'show only removed files')),
6657 6657 (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
6658 6658 (b'c', b'clean', None, _(b'show only files without changes')),
6659 6659 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6660 6660 (b'i', b'ignored', None, _(b'show only ignored files')),
6661 6661 (b'n', b'no-status', None, _(b'hide status prefix')),
6662 6662 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6663 6663 (b'C', b'copies', None, _(b'show source of copied files')),
6664 6664 (
6665 6665 b'0',
6666 6666 b'print0',
6667 6667 None,
6668 6668 _(b'end filenames with NUL, for use with xargs'),
6669 6669 ),
6670 6670 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6671 6671 (
6672 6672 b'',
6673 6673 b'change',
6674 6674 b'',
6675 6675 _(b'list the changed files of a revision'),
6676 6676 _(b'REV'),
6677 6677 ),
6678 6678 ]
6679 6679 + walkopts
6680 6680 + subrepoopts
6681 6681 + formatteropts,
6682 6682 _(b'[OPTION]... [FILE]...'),
6683 6683 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6684 6684 helpbasic=True,
6685 6685 inferrepo=True,
6686 6686 intents={INTENT_READONLY},
6687 6687 )
6688 6688 def status(ui, repo, *pats, **opts):
6689 6689 """show changed files in the working directory
6690 6690
6691 6691 Show status of files in the repository. If names are given, only
6692 6692 files that match are shown. Files that are clean or ignored or
6693 6693 the source of a copy/move operation, are not listed unless
6694 6694 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6695 6695 Unless options described with "show only ..." are given, the
6696 6696 options -mardu are used.
6697 6697
6698 6698 Option -q/--quiet hides untracked (unknown and ignored) files
6699 6699 unless explicitly requested with -u/--unknown or -i/--ignored.
6700 6700
6701 6701 .. note::
6702 6702
6703 6703 :hg:`status` may appear to disagree with diff if permissions have
6704 6704 changed or a merge has occurred. The standard diff format does
6705 6705 not report permission changes and diff only reports changes
6706 6706 relative to one merge parent.
6707 6707
6708 6708 If one revision is given, it is used as the base revision.
6709 6709 If two revisions are given, the differences between them are
6710 6710 shown. The --change option can also be used as a shortcut to list
6711 6711 the changed files of a revision from its first parent.
6712 6712
6713 6713 The codes used to show the status of files are::
6714 6714
6715 6715 M = modified
6716 6716 A = added
6717 6717 R = removed
6718 6718 C = clean
6719 6719 ! = missing (deleted by non-hg command, but still tracked)
6720 6720 ? = not tracked
6721 6721 I = ignored
6722 6722 = origin of the previous file (with --copies)
6723 6723
6724 6724 .. container:: verbose
6725 6725
6726 6726 The -t/--terse option abbreviates the output by showing only the directory
6727 6727 name if all the files in it share the same status. The option takes an
6728 6728 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6729 6729 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6730 6730 for 'ignored' and 'c' for clean.
6731 6731
6732 6732 It abbreviates only those statuses which are passed. Note that clean and
6733 6733 ignored files are not displayed with '--terse ic' unless the -c/--clean
6734 6734 and -i/--ignored options are also used.
6735 6735
6736 6736 The -v/--verbose option shows information when the repository is in an
6737 6737 unfinished merge, shelve, rebase state etc. You can have this behavior
6738 6738 turned on by default by enabling the ``commands.status.verbose`` option.
6739 6739
6740 6740 You can skip displaying some of these states by setting
6741 6741 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6742 6742 'histedit', 'merge', 'rebase', or 'unshelve'.
6743 6743
6744 6744 Template:
6745 6745
6746 6746 The following keywords are supported in addition to the common template
6747 6747 keywords and functions. See also :hg:`help templates`.
6748 6748
6749 6749 :path: String. Repository-absolute path of the file.
6750 6750 :source: String. Repository-absolute path of the file originated from.
6751 6751 Available if ``--copies`` is specified.
6752 6752 :status: String. Character denoting file's status.
6753 6753
6754 6754 Examples:
6755 6755
6756 6756 - show changes in the working directory relative to a
6757 6757 changeset::
6758 6758
6759 6759 hg status --rev 9353
6760 6760
6761 6761 - show changes in the working directory relative to the
6762 6762 current directory (see :hg:`help patterns` for more information)::
6763 6763
6764 6764 hg status re:
6765 6765
6766 6766 - show all changes including copies in an existing changeset::
6767 6767
6768 6768 hg status --copies --change 9353
6769 6769
6770 6770 - get a NUL separated list of added files, suitable for xargs::
6771 6771
6772 6772 hg status -an0
6773 6773
6774 6774 - show more information about the repository status, abbreviating
6775 6775 added, removed, modified, deleted, and untracked paths::
6776 6776
6777 6777 hg status -v -t mardu
6778 6778
6779 6779 Returns 0 on success.
6780 6780
6781 6781 """
6782 6782
6783 6783 opts = pycompat.byteskwargs(opts)
6784 6784 revs = opts.get(b'rev')
6785 6785 change = opts.get(b'change')
6786 6786 terse = opts.get(b'terse')
6787 6787 if terse is _NOTTERSE:
6788 6788 if revs:
6789 6789 terse = b''
6790 6790 else:
6791 6791 terse = ui.config(b'commands', b'status.terse')
6792 6792
6793 6793 if revs and change:
6794 6794 msg = _(b'cannot specify --rev and --change at the same time')
6795 6795 raise error.Abort(msg)
6796 6796 elif revs and terse:
6797 6797 msg = _(b'cannot use --terse with --rev')
6798 6798 raise error.Abort(msg)
6799 6799 elif change:
6800 6800 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6801 6801 ctx2 = scmutil.revsingle(repo, change, None)
6802 6802 ctx1 = ctx2.p1()
6803 6803 else:
6804 6804 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6805 6805 ctx1, ctx2 = scmutil.revpair(repo, revs)
6806 6806
6807 6807 forcerelativevalue = None
6808 6808 if ui.hasconfig(b'commands', b'status.relative'):
6809 6809 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6810 6810 uipathfn = scmutil.getuipathfn(
6811 6811 repo,
6812 6812 legacyrelativevalue=bool(pats),
6813 6813 forcerelativevalue=forcerelativevalue,
6814 6814 )
6815 6815
6816 6816 if opts.get(b'print0'):
6817 6817 end = b'\0'
6818 6818 else:
6819 6819 end = b'\n'
6820 6820 states = b'modified added removed deleted unknown ignored clean'.split()
6821 6821 show = [k for k in states if opts.get(k)]
6822 6822 if opts.get(b'all'):
6823 6823 show += ui.quiet and (states[:4] + [b'clean']) or states
6824 6824
6825 6825 if not show:
6826 6826 if ui.quiet:
6827 6827 show = states[:4]
6828 6828 else:
6829 6829 show = states[:5]
6830 6830
6831 6831 m = scmutil.match(ctx2, pats, opts)
6832 6832 if terse:
6833 6833 # we need to compute clean and unknown to terse
6834 6834 stat = repo.status(
6835 6835 ctx1.node(),
6836 6836 ctx2.node(),
6837 6837 m,
6838 6838 b'ignored' in show or b'i' in terse,
6839 6839 clean=True,
6840 6840 unknown=True,
6841 6841 listsubrepos=opts.get(b'subrepos'),
6842 6842 )
6843 6843
6844 6844 stat = cmdutil.tersedir(stat, terse)
6845 6845 else:
6846 6846 stat = repo.status(
6847 6847 ctx1.node(),
6848 6848 ctx2.node(),
6849 6849 m,
6850 6850 b'ignored' in show,
6851 6851 b'clean' in show,
6852 6852 b'unknown' in show,
6853 6853 opts.get(b'subrepos'),
6854 6854 )
6855 6855
6856 6856 changestates = zip(
6857 6857 states,
6858 6858 pycompat.iterbytestr(b'MAR!?IC'),
6859 6859 [getattr(stat, s.decode('utf8')) for s in states],
6860 6860 )
6861 6861
6862 6862 copy = {}
6863 6863 if (
6864 6864 opts.get(b'all')
6865 6865 or opts.get(b'copies')
6866 6866 or ui.configbool(b'ui', b'statuscopies')
6867 6867 ) and not opts.get(b'no_status'):
6868 6868 copy = copies.pathcopies(ctx1, ctx2, m)
6869 6869
6870 6870 morestatus = None
6871 6871 if (
6872 6872 ui.verbose or ui.configbool(b'commands', b'status.verbose')
6873 6873 ) and not ui.plain():
6874 6874 morestatus = cmdutil.readmorestatus(repo)
6875 6875
6876 6876 ui.pager(b'status')
6877 6877 fm = ui.formatter(b'status', opts)
6878 6878 fmt = b'%s' + end
6879 6879 showchar = not opts.get(b'no_status')
6880 6880
6881 6881 for state, char, files in changestates:
6882 6882 if state in show:
6883 6883 label = b'status.' + state
6884 6884 for f in files:
6885 6885 fm.startitem()
6886 6886 fm.context(ctx=ctx2)
6887 fm.data(path=f)
6887 fm.data(itemtype=b'file', path=f)
6888 6888 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6889 6889 fm.plain(fmt % uipathfn(f), label=label)
6890 6890 if f in copy:
6891 6891 fm.data(source=copy[f])
6892 6892 fm.plain(
6893 6893 (b' %s' + end) % uipathfn(copy[f]),
6894 6894 label=b'status.copied',
6895 6895 )
6896 6896 if morestatus:
6897 6897 morestatus.formatfile(f, fm)
6898 6898
6899 6899 if morestatus:
6900 6900 morestatus.formatfooter(fm)
6901 6901 fm.end()
6902 6902
6903 6903
6904 6904 @command(
6905 6905 b'summary|sum',
6906 6906 [(b'', b'remote', None, _(b'check for push and pull'))],
6907 6907 b'[--remote]',
6908 6908 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6909 6909 helpbasic=True,
6910 6910 intents={INTENT_READONLY},
6911 6911 )
6912 6912 def summary(ui, repo, **opts):
6913 6913 """summarize working directory state
6914 6914
6915 6915 This generates a brief summary of the working directory state,
6916 6916 including parents, branch, commit status, phase and available updates.
6917 6917
6918 6918 With the --remote option, this will check the default paths for
6919 6919 incoming and outgoing changes. This can be time-consuming.
6920 6920
6921 6921 Returns 0 on success.
6922 6922 """
6923 6923
6924 6924 opts = pycompat.byteskwargs(opts)
6925 6925 ui.pager(b'summary')
6926 6926 ctx = repo[None]
6927 6927 parents = ctx.parents()
6928 6928 pnode = parents[0].node()
6929 6929 marks = []
6930 6930
6931 6931 try:
6932 6932 ms = mergemod.mergestate.read(repo)
6933 6933 except error.UnsupportedMergeRecords as e:
6934 6934 s = b' '.join(e.recordtypes)
6935 6935 ui.warn(
6936 6936 _(b'warning: merge state has unsupported record types: %s\n') % s
6937 6937 )
6938 6938 unresolved = []
6939 6939 else:
6940 6940 unresolved = list(ms.unresolved())
6941 6941
6942 6942 for p in parents:
6943 6943 # label with log.changeset (instead of log.parent) since this
6944 6944 # shows a working directory parent *changeset*:
6945 6945 # i18n: column positioning for "hg summary"
6946 6946 ui.write(
6947 6947 _(b'parent: %d:%s ') % (p.rev(), p),
6948 6948 label=logcmdutil.changesetlabels(p),
6949 6949 )
6950 6950 ui.write(b' '.join(p.tags()), label=b'log.tag')
6951 6951 if p.bookmarks():
6952 6952 marks.extend(p.bookmarks())
6953 6953 if p.rev() == -1:
6954 6954 if not len(repo):
6955 6955 ui.write(_(b' (empty repository)'))
6956 6956 else:
6957 6957 ui.write(_(b' (no revision checked out)'))
6958 6958 if p.obsolete():
6959 6959 ui.write(_(b' (obsolete)'))
6960 6960 if p.isunstable():
6961 6961 instabilities = (
6962 6962 ui.label(instability, b'trouble.%s' % instability)
6963 6963 for instability in p.instabilities()
6964 6964 )
6965 6965 ui.write(b' (' + b', '.join(instabilities) + b')')
6966 6966 ui.write(b'\n')
6967 6967 if p.description():
6968 6968 ui.status(
6969 6969 b' ' + p.description().splitlines()[0].strip() + b'\n',
6970 6970 label=b'log.summary',
6971 6971 )
6972 6972
6973 6973 branch = ctx.branch()
6974 6974 bheads = repo.branchheads(branch)
6975 6975 # i18n: column positioning for "hg summary"
6976 6976 m = _(b'branch: %s\n') % branch
6977 6977 if branch != b'default':
6978 6978 ui.write(m, label=b'log.branch')
6979 6979 else:
6980 6980 ui.status(m, label=b'log.branch')
6981 6981
6982 6982 if marks:
6983 6983 active = repo._activebookmark
6984 6984 # i18n: column positioning for "hg summary"
6985 6985 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
6986 6986 if active is not None:
6987 6987 if active in marks:
6988 6988 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
6989 6989 marks.remove(active)
6990 6990 else:
6991 6991 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
6992 6992 for m in marks:
6993 6993 ui.write(b' ' + m, label=b'log.bookmark')
6994 6994 ui.write(b'\n', label=b'log.bookmark')
6995 6995
6996 6996 status = repo.status(unknown=True)
6997 6997
6998 6998 c = repo.dirstate.copies()
6999 6999 copied, renamed = [], []
7000 7000 for d, s in pycompat.iteritems(c):
7001 7001 if s in status.removed:
7002 7002 status.removed.remove(s)
7003 7003 renamed.append(d)
7004 7004 else:
7005 7005 copied.append(d)
7006 7006 if d in status.added:
7007 7007 status.added.remove(d)
7008 7008
7009 7009 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7010 7010
7011 7011 labels = [
7012 7012 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7013 7013 (ui.label(_(b'%d added'), b'status.added'), status.added),
7014 7014 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7015 7015 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7016 7016 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7017 7017 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7018 7018 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7019 7019 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7020 7020 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7021 7021 ]
7022 7022 t = []
7023 7023 for l, s in labels:
7024 7024 if s:
7025 7025 t.append(l % len(s))
7026 7026
7027 7027 t = b', '.join(t)
7028 7028 cleanworkdir = False
7029 7029
7030 7030 if repo.vfs.exists(b'graftstate'):
7031 7031 t += _(b' (graft in progress)')
7032 7032 if repo.vfs.exists(b'updatestate'):
7033 7033 t += _(b' (interrupted update)')
7034 7034 elif len(parents) > 1:
7035 7035 t += _(b' (merge)')
7036 7036 elif branch != parents[0].branch():
7037 7037 t += _(b' (new branch)')
7038 7038 elif parents[0].closesbranch() and pnode in repo.branchheads(
7039 7039 branch, closed=True
7040 7040 ):
7041 7041 t += _(b' (head closed)')
7042 7042 elif not (
7043 7043 status.modified
7044 7044 or status.added
7045 7045 or status.removed
7046 7046 or renamed
7047 7047 or copied
7048 7048 or subs
7049 7049 ):
7050 7050 t += _(b' (clean)')
7051 7051 cleanworkdir = True
7052 7052 elif pnode not in bheads:
7053 7053 t += _(b' (new branch head)')
7054 7054
7055 7055 if parents:
7056 7056 pendingphase = max(p.phase() for p in parents)
7057 7057 else:
7058 7058 pendingphase = phases.public
7059 7059
7060 7060 if pendingphase > phases.newcommitphase(ui):
7061 7061 t += b' (%s)' % phases.phasenames[pendingphase]
7062 7062
7063 7063 if cleanworkdir:
7064 7064 # i18n: column positioning for "hg summary"
7065 7065 ui.status(_(b'commit: %s\n') % t.strip())
7066 7066 else:
7067 7067 # i18n: column positioning for "hg summary"
7068 7068 ui.write(_(b'commit: %s\n') % t.strip())
7069 7069
7070 7070 # all ancestors of branch heads - all ancestors of parent = new csets
7071 7071 new = len(
7072 7072 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7073 7073 )
7074 7074
7075 7075 if new == 0:
7076 7076 # i18n: column positioning for "hg summary"
7077 7077 ui.status(_(b'update: (current)\n'))
7078 7078 elif pnode not in bheads:
7079 7079 # i18n: column positioning for "hg summary"
7080 7080 ui.write(_(b'update: %d new changesets (update)\n') % new)
7081 7081 else:
7082 7082 # i18n: column positioning for "hg summary"
7083 7083 ui.write(
7084 7084 _(b'update: %d new changesets, %d branch heads (merge)\n')
7085 7085 % (new, len(bheads))
7086 7086 )
7087 7087
7088 7088 t = []
7089 7089 draft = len(repo.revs(b'draft()'))
7090 7090 if draft:
7091 7091 t.append(_(b'%d draft') % draft)
7092 7092 secret = len(repo.revs(b'secret()'))
7093 7093 if secret:
7094 7094 t.append(_(b'%d secret') % secret)
7095 7095
7096 7096 if draft or secret:
7097 7097 ui.status(_(b'phases: %s\n') % b', '.join(t))
7098 7098
7099 7099 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7100 7100 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7101 7101 numtrouble = len(repo.revs(trouble + b"()"))
7102 7102 # We write all the possibilities to ease translation
7103 7103 troublemsg = {
7104 7104 b"orphan": _(b"orphan: %d changesets"),
7105 7105 b"contentdivergent": _(b"content-divergent: %d changesets"),
7106 7106 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7107 7107 }
7108 7108 if numtrouble > 0:
7109 7109 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7110 7110
7111 7111 cmdutil.summaryhooks(ui, repo)
7112 7112
7113 7113 if opts.get(b'remote'):
7114 7114 needsincoming, needsoutgoing = True, True
7115 7115 else:
7116 7116 needsincoming, needsoutgoing = False, False
7117 7117 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7118 7118 if i:
7119 7119 needsincoming = True
7120 7120 if o:
7121 7121 needsoutgoing = True
7122 7122 if not needsincoming and not needsoutgoing:
7123 7123 return
7124 7124
7125 7125 def getincoming():
7126 7126 source, branches = hg.parseurl(ui.expandpath(b'default'))
7127 7127 sbranch = branches[0]
7128 7128 try:
7129 7129 other = hg.peer(repo, {}, source)
7130 7130 except error.RepoError:
7131 7131 if opts.get(b'remote'):
7132 7132 raise
7133 7133 return source, sbranch, None, None, None
7134 7134 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7135 7135 if revs:
7136 7136 revs = [other.lookup(rev) for rev in revs]
7137 7137 ui.debug(b'comparing with %s\n' % util.hidepassword(source))
7138 7138 repo.ui.pushbuffer()
7139 7139 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7140 7140 repo.ui.popbuffer()
7141 7141 return source, sbranch, other, commoninc, commoninc[1]
7142 7142
7143 7143 if needsincoming:
7144 7144 source, sbranch, sother, commoninc, incoming = getincoming()
7145 7145 else:
7146 7146 source = sbranch = sother = commoninc = incoming = None
7147 7147
7148 7148 def getoutgoing():
7149 7149 dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default'))
7150 7150 dbranch = branches[0]
7151 7151 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7152 7152 if source != dest:
7153 7153 try:
7154 7154 dother = hg.peer(repo, {}, dest)
7155 7155 except error.RepoError:
7156 7156 if opts.get(b'remote'):
7157 7157 raise
7158 7158 return dest, dbranch, None, None
7159 7159 ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
7160 7160 elif sother is None:
7161 7161 # there is no explicit destination peer, but source one is invalid
7162 7162 return dest, dbranch, None, None
7163 7163 else:
7164 7164 dother = sother
7165 7165 if source != dest or (sbranch is not None and sbranch != dbranch):
7166 7166 common = None
7167 7167 else:
7168 7168 common = commoninc
7169 7169 if revs:
7170 7170 revs = [repo.lookup(rev) for rev in revs]
7171 7171 repo.ui.pushbuffer()
7172 7172 outgoing = discovery.findcommonoutgoing(
7173 7173 repo, dother, onlyheads=revs, commoninc=common
7174 7174 )
7175 7175 repo.ui.popbuffer()
7176 7176 return dest, dbranch, dother, outgoing
7177 7177
7178 7178 if needsoutgoing:
7179 7179 dest, dbranch, dother, outgoing = getoutgoing()
7180 7180 else:
7181 7181 dest = dbranch = dother = outgoing = None
7182 7182
7183 7183 if opts.get(b'remote'):
7184 7184 t = []
7185 7185 if incoming:
7186 7186 t.append(_(b'1 or more incoming'))
7187 7187 o = outgoing.missing
7188 7188 if o:
7189 7189 t.append(_(b'%d outgoing') % len(o))
7190 7190 other = dother or sother
7191 7191 if b'bookmarks' in other.listkeys(b'namespaces'):
7192 7192 counts = bookmarks.summary(repo, other)
7193 7193 if counts[0] > 0:
7194 7194 t.append(_(b'%d incoming bookmarks') % counts[0])
7195 7195 if counts[1] > 0:
7196 7196 t.append(_(b'%d outgoing bookmarks') % counts[1])
7197 7197
7198 7198 if t:
7199 7199 # i18n: column positioning for "hg summary"
7200 7200 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7201 7201 else:
7202 7202 # i18n: column positioning for "hg summary"
7203 7203 ui.status(_(b'remote: (synced)\n'))
7204 7204
7205 7205 cmdutil.summaryremotehooks(
7206 7206 ui,
7207 7207 repo,
7208 7208 opts,
7209 7209 (
7210 7210 (source, sbranch, sother, commoninc),
7211 7211 (dest, dbranch, dother, outgoing),
7212 7212 ),
7213 7213 )
7214 7214
7215 7215
7216 7216 @command(
7217 7217 b'tag',
7218 7218 [
7219 7219 (b'f', b'force', None, _(b'force tag')),
7220 7220 (b'l', b'local', None, _(b'make the tag local')),
7221 7221 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7222 7222 (b'', b'remove', None, _(b'remove a tag')),
7223 7223 # -l/--local is already there, commitopts cannot be used
7224 7224 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7225 7225 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7226 7226 ]
7227 7227 + commitopts2,
7228 7228 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7229 7229 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7230 7230 )
7231 7231 def tag(ui, repo, name1, *names, **opts):
7232 7232 """add one or more tags for the current or given revision
7233 7233
7234 7234 Name a particular revision using <name>.
7235 7235
7236 7236 Tags are used to name particular revisions of the repository and are
7237 7237 very useful to compare different revisions, to go back to significant
7238 7238 earlier versions or to mark branch points as releases, etc. Changing
7239 7239 an existing tag is normally disallowed; use -f/--force to override.
7240 7240
7241 7241 If no revision is given, the parent of the working directory is
7242 7242 used.
7243 7243
7244 7244 To facilitate version control, distribution, and merging of tags,
7245 7245 they are stored as a file named ".hgtags" which is managed similarly
7246 7246 to other project files and can be hand-edited if necessary. This
7247 7247 also means that tagging creates a new commit. The file
7248 7248 ".hg/localtags" is used for local tags (not shared among
7249 7249 repositories).
7250 7250
7251 7251 Tag commits are usually made at the head of a branch. If the parent
7252 7252 of the working directory is not a branch head, :hg:`tag` aborts; use
7253 7253 -f/--force to force the tag commit to be based on a non-head
7254 7254 changeset.
7255 7255
7256 7256 See :hg:`help dates` for a list of formats valid for -d/--date.
7257 7257
7258 7258 Since tag names have priority over branch names during revision
7259 7259 lookup, using an existing branch name as a tag name is discouraged.
7260 7260
7261 7261 Returns 0 on success.
7262 7262 """
7263 7263 opts = pycompat.byteskwargs(opts)
7264 7264 with repo.wlock(), repo.lock():
7265 7265 rev_ = b"."
7266 7266 names = [t.strip() for t in (name1,) + names]
7267 7267 if len(names) != len(set(names)):
7268 7268 raise error.Abort(_(b'tag names must be unique'))
7269 7269 for n in names:
7270 7270 scmutil.checknewlabel(repo, n, b'tag')
7271 7271 if not n:
7272 7272 raise error.Abort(
7273 7273 _(b'tag names cannot consist entirely of whitespace')
7274 7274 )
7275 7275 if opts.get(b'rev') and opts.get(b'remove'):
7276 7276 raise error.Abort(_(b"--rev and --remove are incompatible"))
7277 7277 if opts.get(b'rev'):
7278 7278 rev_ = opts[b'rev']
7279 7279 message = opts.get(b'message')
7280 7280 if opts.get(b'remove'):
7281 7281 if opts.get(b'local'):
7282 7282 expectedtype = b'local'
7283 7283 else:
7284 7284 expectedtype = b'global'
7285 7285
7286 7286 for n in names:
7287 7287 if repo.tagtype(n) == b'global':
7288 7288 alltags = tagsmod.findglobaltags(ui, repo)
7289 7289 if alltags[n][0] == nullid:
7290 7290 raise error.Abort(_(b"tag '%s' is already removed") % n)
7291 7291 if not repo.tagtype(n):
7292 7292 raise error.Abort(_(b"tag '%s' does not exist") % n)
7293 7293 if repo.tagtype(n) != expectedtype:
7294 7294 if expectedtype == b'global':
7295 7295 raise error.Abort(
7296 7296 _(b"tag '%s' is not a global tag") % n
7297 7297 )
7298 7298 else:
7299 7299 raise error.Abort(_(b"tag '%s' is not a local tag") % n)
7300 7300 rev_ = b'null'
7301 7301 if not message:
7302 7302 # we don't translate commit messages
7303 7303 message = b'Removed tag %s' % b', '.join(names)
7304 7304 elif not opts.get(b'force'):
7305 7305 for n in names:
7306 7306 if n in repo.tags():
7307 7307 raise error.Abort(
7308 7308 _(b"tag '%s' already exists (use -f to force)") % n
7309 7309 )
7310 7310 if not opts.get(b'local'):
7311 7311 p1, p2 = repo.dirstate.parents()
7312 7312 if p2 != nullid:
7313 7313 raise error.Abort(_(b'uncommitted merge'))
7314 7314 bheads = repo.branchheads()
7315 7315 if not opts.get(b'force') and bheads and p1 not in bheads:
7316 7316 raise error.Abort(
7317 7317 _(
7318 7318 b'working directory is not at a branch head '
7319 7319 b'(use -f to force)'
7320 7320 )
7321 7321 )
7322 7322 node = scmutil.revsingle(repo, rev_).node()
7323 7323
7324 7324 if not message:
7325 7325 # we don't translate commit messages
7326 7326 message = b'Added tag %s for changeset %s' % (
7327 7327 b', '.join(names),
7328 7328 short(node),
7329 7329 )
7330 7330
7331 7331 date = opts.get(b'date')
7332 7332 if date:
7333 7333 date = dateutil.parsedate(date)
7334 7334
7335 7335 if opts.get(b'remove'):
7336 7336 editform = b'tag.remove'
7337 7337 else:
7338 7338 editform = b'tag.add'
7339 7339 editor = cmdutil.getcommiteditor(
7340 7340 editform=editform, **pycompat.strkwargs(opts)
7341 7341 )
7342 7342
7343 7343 # don't allow tagging the null rev
7344 7344 if (
7345 7345 not opts.get(b'remove')
7346 7346 and scmutil.revsingle(repo, rev_).rev() == nullrev
7347 7347 ):
7348 7348 raise error.Abort(_(b"cannot tag null revision"))
7349 7349
7350 7350 tagsmod.tag(
7351 7351 repo,
7352 7352 names,
7353 7353 node,
7354 7354 message,
7355 7355 opts.get(b'local'),
7356 7356 opts.get(b'user'),
7357 7357 date,
7358 7358 editor=editor,
7359 7359 )
7360 7360
7361 7361
7362 7362 @command(
7363 7363 b'tags',
7364 7364 formatteropts,
7365 7365 b'',
7366 7366 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7367 7367 intents={INTENT_READONLY},
7368 7368 )
7369 7369 def tags(ui, repo, **opts):
7370 7370 """list repository tags
7371 7371
7372 7372 This lists both regular and local tags. When the -v/--verbose
7373 7373 switch is used, a third column "local" is printed for local tags.
7374 7374 When the -q/--quiet switch is used, only the tag name is printed.
7375 7375
7376 7376 .. container:: verbose
7377 7377
7378 7378 Template:
7379 7379
7380 7380 The following keywords are supported in addition to the common template
7381 7381 keywords and functions such as ``{tag}``. See also
7382 7382 :hg:`help templates`.
7383 7383
7384 7384 :type: String. ``local`` for local tags.
7385 7385
7386 7386 Returns 0 on success.
7387 7387 """
7388 7388
7389 7389 opts = pycompat.byteskwargs(opts)
7390 7390 ui.pager(b'tags')
7391 7391 fm = ui.formatter(b'tags', opts)
7392 7392 hexfunc = fm.hexfunc
7393 7393
7394 7394 for t, n in reversed(repo.tagslist()):
7395 7395 hn = hexfunc(n)
7396 7396 label = b'tags.normal'
7397 7397 tagtype = b''
7398 7398 if repo.tagtype(t) == b'local':
7399 7399 label = b'tags.local'
7400 7400 tagtype = b'local'
7401 7401
7402 7402 fm.startitem()
7403 7403 fm.context(repo=repo)
7404 7404 fm.write(b'tag', b'%s', t, label=label)
7405 7405 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7406 7406 fm.condwrite(
7407 7407 not ui.quiet,
7408 7408 b'rev node',
7409 7409 fmt,
7410 7410 repo.changelog.rev(n),
7411 7411 hn,
7412 7412 label=label,
7413 7413 )
7414 7414 fm.condwrite(
7415 7415 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7416 7416 )
7417 7417 fm.plain(b'\n')
7418 7418 fm.end()
7419 7419
7420 7420
7421 7421 @command(
7422 7422 b'tip',
7423 7423 [
7424 7424 (b'p', b'patch', None, _(b'show patch')),
7425 7425 (b'g', b'git', None, _(b'use git extended diff format')),
7426 7426 ]
7427 7427 + templateopts,
7428 7428 _(b'[-p] [-g]'),
7429 7429 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7430 7430 )
7431 7431 def tip(ui, repo, **opts):
7432 7432 """show the tip revision (DEPRECATED)
7433 7433
7434 7434 The tip revision (usually just called the tip) is the changeset
7435 7435 most recently added to the repository (and therefore the most
7436 7436 recently changed head).
7437 7437
7438 7438 If you have just made a commit, that commit will be the tip. If
7439 7439 you have just pulled changes from another repository, the tip of
7440 7440 that repository becomes the current tip. The "tip" tag is special
7441 7441 and cannot be renamed or assigned to a different changeset.
7442 7442
7443 7443 This command is deprecated, please use :hg:`heads` instead.
7444 7444
7445 7445 Returns 0 on success.
7446 7446 """
7447 7447 opts = pycompat.byteskwargs(opts)
7448 7448 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7449 7449 displayer.show(repo[b'tip'])
7450 7450 displayer.close()
7451 7451
7452 7452
7453 7453 @command(
7454 7454 b'unbundle',
7455 7455 [
7456 7456 (
7457 7457 b'u',
7458 7458 b'update',
7459 7459 None,
7460 7460 _(b'update to new branch head if changesets were unbundled'),
7461 7461 )
7462 7462 ],
7463 7463 _(b'[-u] FILE...'),
7464 7464 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7465 7465 )
7466 7466 def unbundle(ui, repo, fname1, *fnames, **opts):
7467 7467 """apply one or more bundle files
7468 7468
7469 7469 Apply one or more bundle files generated by :hg:`bundle`.
7470 7470
7471 7471 Returns 0 on success, 1 if an update has unresolved files.
7472 7472 """
7473 7473 fnames = (fname1,) + fnames
7474 7474
7475 7475 with repo.lock():
7476 7476 for fname in fnames:
7477 7477 f = hg.openpath(ui, fname)
7478 7478 gen = exchange.readbundle(ui, f, fname)
7479 7479 if isinstance(gen, streamclone.streamcloneapplier):
7480 7480 raise error.Abort(
7481 7481 _(
7482 7482 b'packed bundles cannot be applied with '
7483 7483 b'"hg unbundle"'
7484 7484 ),
7485 7485 hint=_(b'use "hg debugapplystreamclonebundle"'),
7486 7486 )
7487 7487 url = b'bundle:' + fname
7488 7488 try:
7489 7489 txnname = b'unbundle'
7490 7490 if not isinstance(gen, bundle2.unbundle20):
7491 7491 txnname = b'unbundle\n%s' % util.hidepassword(url)
7492 7492 with repo.transaction(txnname) as tr:
7493 7493 op = bundle2.applybundle(
7494 7494 repo, gen, tr, source=b'unbundle', url=url
7495 7495 )
7496 7496 except error.BundleUnknownFeatureError as exc:
7497 7497 raise error.Abort(
7498 7498 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7499 7499 hint=_(
7500 7500 b"see https://mercurial-scm.org/"
7501 7501 b"wiki/BundleFeature for more "
7502 7502 b"information"
7503 7503 ),
7504 7504 )
7505 7505 modheads = bundle2.combinechangegroupresults(op)
7506 7506
7507 7507 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7508 7508
7509 7509
7510 7510 @command(
7511 7511 b'unshelve',
7512 7512 [
7513 7513 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7514 7514 (
7515 7515 b'c',
7516 7516 b'continue',
7517 7517 None,
7518 7518 _(b'continue an incomplete unshelve operation'),
7519 7519 ),
7520 7520 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7521 7521 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7522 7522 (
7523 7523 b'n',
7524 7524 b'name',
7525 7525 b'',
7526 7526 _(b'restore shelved change with given name'),
7527 7527 _(b'NAME'),
7528 7528 ),
7529 7529 (b't', b'tool', b'', _(b'specify merge tool')),
7530 7530 (
7531 7531 b'',
7532 7532 b'date',
7533 7533 b'',
7534 7534 _(b'set date for temporary commits (DEPRECATED)'),
7535 7535 _(b'DATE'),
7536 7536 ),
7537 7537 ],
7538 7538 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7539 7539 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7540 7540 )
7541 7541 def unshelve(ui, repo, *shelved, **opts):
7542 7542 """restore a shelved change to the working directory
7543 7543
7544 7544 This command accepts an optional name of a shelved change to
7545 7545 restore. If none is given, the most recent shelved change is used.
7546 7546
7547 7547 If a shelved change is applied successfully, the bundle that
7548 7548 contains the shelved changes is moved to a backup location
7549 7549 (.hg/shelve-backup).
7550 7550
7551 7551 Since you can restore a shelved change on top of an arbitrary
7552 7552 commit, it is possible that unshelving will result in a conflict
7553 7553 between your changes and the commits you are unshelving onto. If
7554 7554 this occurs, you must resolve the conflict, then use
7555 7555 ``--continue`` to complete the unshelve operation. (The bundle
7556 7556 will not be moved until you successfully complete the unshelve.)
7557 7557
7558 7558 (Alternatively, you can use ``--abort`` to abandon an unshelve
7559 7559 that causes a conflict. This reverts the unshelved changes, and
7560 7560 leaves the bundle in place.)
7561 7561
7562 7562 If bare shelved change (without interactive, include and exclude
7563 7563 option) was done on newly created branch it would restore branch
7564 7564 information to the working directory.
7565 7565
7566 7566 After a successful unshelve, the shelved changes are stored in a
7567 7567 backup directory. Only the N most recent backups are kept. N
7568 7568 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7569 7569 configuration option.
7570 7570
7571 7571 .. container:: verbose
7572 7572
7573 7573 Timestamp in seconds is used to decide order of backups. More
7574 7574 than ``maxbackups`` backups are kept, if same timestamp
7575 7575 prevents from deciding exact order of them, for safety.
7576 7576
7577 7577 Selected changes can be unshelved with ``--interactive`` flag.
7578 7578 The working directory is updated with the selected changes, and
7579 7579 only the unselected changes remain shelved.
7580 7580 Note: The whole shelve is applied to working directory first before
7581 7581 running interactively. So, this will bring up all the conflicts between
7582 7582 working directory and the shelve, irrespective of which changes will be
7583 7583 unshelved.
7584 7584 """
7585 7585 with repo.wlock():
7586 7586 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
7587 7587
7588 7588
7589 7589 statemod.addunfinished(
7590 7590 b'unshelve',
7591 7591 fname=b'shelvedstate',
7592 7592 continueflag=True,
7593 7593 abortfunc=shelvemod.hgabortunshelve,
7594 7594 continuefunc=shelvemod.hgcontinueunshelve,
7595 7595 cmdmsg=_(b'unshelve already in progress'),
7596 7596 )
7597 7597
7598 7598
7599 7599 @command(
7600 7600 b'update|up|checkout|co',
7601 7601 [
7602 7602 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7603 7603 (b'c', b'check', None, _(b'require clean working directory')),
7604 7604 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7605 7605 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7606 7606 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7607 7607 ]
7608 7608 + mergetoolopts,
7609 7609 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7610 7610 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7611 7611 helpbasic=True,
7612 7612 )
7613 7613 def update(ui, repo, node=None, **opts):
7614 7614 """update working directory (or switch revisions)
7615 7615
7616 7616 Update the repository's working directory to the specified
7617 7617 changeset. If no changeset is specified, update to the tip of the
7618 7618 current named branch and move the active bookmark (see :hg:`help
7619 7619 bookmarks`).
7620 7620
7621 7621 Update sets the working directory's parent revision to the specified
7622 7622 changeset (see :hg:`help parents`).
7623 7623
7624 7624 If the changeset is not a descendant or ancestor of the working
7625 7625 directory's parent and there are uncommitted changes, the update is
7626 7626 aborted. With the -c/--check option, the working directory is checked
7627 7627 for uncommitted changes; if none are found, the working directory is
7628 7628 updated to the specified changeset.
7629 7629
7630 7630 .. container:: verbose
7631 7631
7632 7632 The -C/--clean, -c/--check, and -m/--merge options control what
7633 7633 happens if the working directory contains uncommitted changes.
7634 7634 At most of one of them can be specified.
7635 7635
7636 7636 1. If no option is specified, and if
7637 7637 the requested changeset is an ancestor or descendant of
7638 7638 the working directory's parent, the uncommitted changes
7639 7639 are merged into the requested changeset and the merged
7640 7640 result is left uncommitted. If the requested changeset is
7641 7641 not an ancestor or descendant (that is, it is on another
7642 7642 branch), the update is aborted and the uncommitted changes
7643 7643 are preserved.
7644 7644
7645 7645 2. With the -m/--merge option, the update is allowed even if the
7646 7646 requested changeset is not an ancestor or descendant of
7647 7647 the working directory's parent.
7648 7648
7649 7649 3. With the -c/--check option, the update is aborted and the
7650 7650 uncommitted changes are preserved.
7651 7651
7652 7652 4. With the -C/--clean option, uncommitted changes are discarded and
7653 7653 the working directory is updated to the requested changeset.
7654 7654
7655 7655 To cancel an uncommitted merge (and lose your changes), use
7656 7656 :hg:`merge --abort`.
7657 7657
7658 7658 Use null as the changeset to remove the working directory (like
7659 7659 :hg:`clone -U`).
7660 7660
7661 7661 If you want to revert just one file to an older revision, use
7662 7662 :hg:`revert [-r REV] NAME`.
7663 7663
7664 7664 See :hg:`help dates` for a list of formats valid for -d/--date.
7665 7665
7666 7666 Returns 0 on success, 1 if there are unresolved files.
7667 7667 """
7668 7668 rev = opts.get('rev')
7669 7669 date = opts.get('date')
7670 7670 clean = opts.get('clean')
7671 7671 check = opts.get('check')
7672 7672 merge = opts.get('merge')
7673 7673 if rev and node:
7674 7674 raise error.Abort(_(b"please specify just one revision"))
7675 7675
7676 7676 if ui.configbool(b'commands', b'update.requiredest'):
7677 7677 if not node and not rev and not date:
7678 7678 raise error.Abort(
7679 7679 _(b'you must specify a destination'),
7680 7680 hint=_(b'for example: hg update ".::"'),
7681 7681 )
7682 7682
7683 7683 if rev is None or rev == b'':
7684 7684 rev = node
7685 7685
7686 7686 if date and rev is not None:
7687 7687 raise error.Abort(_(b"you can't specify a revision and a date"))
7688 7688
7689 7689 if len([x for x in (clean, check, merge) if x]) > 1:
7690 7690 raise error.Abort(
7691 7691 _(
7692 7692 b"can only specify one of -C/--clean, -c/--check, "
7693 7693 b"or -m/--merge"
7694 7694 )
7695 7695 )
7696 7696
7697 7697 updatecheck = None
7698 7698 if check:
7699 7699 updatecheck = b'abort'
7700 7700 elif merge:
7701 7701 updatecheck = b'none'
7702 7702
7703 7703 with repo.wlock():
7704 7704 cmdutil.clearunfinished(repo)
7705 7705 if date:
7706 7706 rev = cmdutil.finddate(ui, repo, date)
7707 7707
7708 7708 # if we defined a bookmark, we have to remember the original name
7709 7709 brev = rev
7710 7710 if rev:
7711 7711 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7712 7712 ctx = scmutil.revsingle(repo, rev, default=None)
7713 7713 rev = ctx.rev()
7714 7714 hidden = ctx.hidden()
7715 7715 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7716 7716 with ui.configoverride(overrides, b'update'):
7717 7717 ret = hg.updatetotally(
7718 7718 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7719 7719 )
7720 7720 if hidden:
7721 7721 ctxstr = ctx.hex()[:12]
7722 7722 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7723 7723
7724 7724 if ctx.obsolete():
7725 7725 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7726 7726 ui.warn(b"(%s)\n" % obsfatemsg)
7727 7727 return ret
7728 7728
7729 7729
7730 7730 @command(
7731 7731 b'verify',
7732 7732 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7733 7733 helpcategory=command.CATEGORY_MAINTENANCE,
7734 7734 )
7735 7735 def verify(ui, repo, **opts):
7736 7736 """verify the integrity of the repository
7737 7737
7738 7738 Verify the integrity of the current repository.
7739 7739
7740 7740 This will perform an extensive check of the repository's
7741 7741 integrity, validating the hashes and checksums of each entry in
7742 7742 the changelog, manifest, and tracked files, as well as the
7743 7743 integrity of their crosslinks and indices.
7744 7744
7745 7745 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7746 7746 for more information about recovery from corruption of the
7747 7747 repository.
7748 7748
7749 7749 Returns 0 on success, 1 if errors are encountered.
7750 7750 """
7751 7751 opts = pycompat.byteskwargs(opts)
7752 7752
7753 7753 level = None
7754 7754 if opts[b'full']:
7755 7755 level = verifymod.VERIFY_FULL
7756 7756 return hg.verify(repo, level)
7757 7757
7758 7758
7759 7759 @command(
7760 7760 b'version',
7761 7761 [] + formatteropts,
7762 7762 helpcategory=command.CATEGORY_HELP,
7763 7763 norepo=True,
7764 7764 intents={INTENT_READONLY},
7765 7765 )
7766 7766 def version_(ui, **opts):
7767 7767 """output version and copyright information
7768 7768
7769 7769 .. container:: verbose
7770 7770
7771 7771 Template:
7772 7772
7773 7773 The following keywords are supported. See also :hg:`help templates`.
7774 7774
7775 7775 :extensions: List of extensions.
7776 7776 :ver: String. Version number.
7777 7777
7778 7778 And each entry of ``{extensions}`` provides the following sub-keywords
7779 7779 in addition to ``{ver}``.
7780 7780
7781 7781 :bundled: Boolean. True if included in the release.
7782 7782 :name: String. Extension name.
7783 7783 """
7784 7784 opts = pycompat.byteskwargs(opts)
7785 7785 if ui.verbose:
7786 7786 ui.pager(b'version')
7787 7787 fm = ui.formatter(b"version", opts)
7788 7788 fm.startitem()
7789 7789 fm.write(
7790 7790 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7791 7791 )
7792 7792 license = _(
7793 7793 b"(see https://mercurial-scm.org for more information)\n"
7794 7794 b"\nCopyright (C) 2005-2019 Matt Mackall and others\n"
7795 7795 b"This is free software; see the source for copying conditions. "
7796 7796 b"There is NO\nwarranty; "
7797 7797 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7798 7798 )
7799 7799 if not ui.quiet:
7800 7800 fm.plain(license)
7801 7801
7802 7802 if ui.verbose:
7803 7803 fm.plain(_(b"\nEnabled extensions:\n\n"))
7804 7804 # format names and versions into columns
7805 7805 names = []
7806 7806 vers = []
7807 7807 isinternals = []
7808 7808 for name, module in extensions.extensions():
7809 7809 names.append(name)
7810 7810 vers.append(extensions.moduleversion(module) or None)
7811 7811 isinternals.append(extensions.ismoduleinternal(module))
7812 7812 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7813 7813 if names:
7814 7814 namefmt = b" %%-%ds " % max(len(n) for n in names)
7815 7815 places = [_(b"external"), _(b"internal")]
7816 7816 for n, v, p in zip(names, vers, isinternals):
7817 7817 fn.startitem()
7818 7818 fn.condwrite(ui.verbose, b"name", namefmt, n)
7819 7819 if ui.verbose:
7820 7820 fn.plain(b"%s " % places[p])
7821 7821 fn.data(bundled=p)
7822 7822 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7823 7823 if ui.verbose:
7824 7824 fn.plain(b"\n")
7825 7825 fn.end()
7826 7826 fm.end()
7827 7827
7828 7828
7829 7829 def loadcmdtable(ui, name, cmdtable):
7830 7830 """Load command functions from specified cmdtable
7831 7831 """
7832 7832 overrides = [cmd for cmd in cmdtable if cmd in table]
7833 7833 if overrides:
7834 7834 ui.warn(
7835 7835 _(b"extension '%s' overrides commands: %s\n")
7836 7836 % (name, b" ".join(overrides))
7837 7837 )
7838 7838 table.update(cmdtable)
@@ -1,310 +1,317 b''
1 1 $ hg init
2 2 $ cat << EOF > a
3 3 > Small Mathematical Series.
4 4 > One
5 5 > Two
6 6 > Three
7 7 > Four
8 8 > Five
9 9 > Hop we are done.
10 10 > EOF
11 11 $ hg add a
12 12 $ hg commit -m ancestor
13 13 $ cat << EOF > a
14 14 > Small Mathematical Series.
15 15 > 1
16 16 > 2
17 17 > 3
18 18 > 4
19 19 > 5
20 20 > Hop we are done.
21 21 > EOF
22 22 $ hg commit -m branch1
23 23 $ hg co 0
24 24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
25 25 $ cat << EOF > a
26 26 > Small Mathematical Series.
27 27 > 1
28 28 > 2
29 29 > 3
30 30 > 6
31 31 > 8
32 32 > Hop we are done.
33 33 > EOF
34 34 $ hg commit -m branch2
35 35 created new head
36 36
37 37 $ hg merge 1
38 38 merging a
39 39 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
40 40 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
41 41 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
42 42 [1]
43 43
44 44 $ hg id
45 45 618808747361+c0c68e4fe667+ tip
46 46
47 47 $ echo "[commands]" >> $HGRCPATH
48 48 $ echo "status.verbose=true" >> $HGRCPATH
49 49 $ hg status
50 50 M a
51 51 ? a.orig
52 52 # The repository is in an unfinished *merge* state.
53 53
54 54 # Unresolved merge conflicts:
55 55 #
56 56 # a
57 57 #
58 58 # To mark files as resolved: hg resolve --mark FILE
59 59
60 60 # To continue: hg commit
61 61 # To abort: hg merge --abort
62 62
63 63 $ hg status -Tjson
64 64 [
65 65 {
66 "itemtype": "file",
66 67 "path": "a",
67 68 "status": "M",
68 69 "unresolved": true
69 70 },
70 71 {
72 "itemtype": "file",
71 73 "path": "a.orig",
72 74 "status": "?"
75 },
76 {
77 "itemtype": "morestatus",
78 "unfinished": "merge",
79 "unfinishedmsg": "To continue: hg commit\nTo abort: hg merge --abort"
73 80 }
74 81 ]
75 82
76 83 $ cat a
77 84 Small Mathematical Series.
78 85 1
79 86 2
80 87 3
81 88 <<<<<<< working copy: 618808747361 - test: branch2
82 89 6
83 90 8
84 91 =======
85 92 4
86 93 5
87 94 >>>>>>> merge rev: c0c68e4fe667 - test: branch1
88 95 Hop we are done.
89 96
90 97 $ hg status --config commands.status.verbose=0
91 98 M a
92 99 ? a.orig
93 100
94 101 Verify custom conflict markers
95 102
96 103 $ hg up -q --clean .
97 104 $ cat <<EOF >> .hg/hgrc
98 105 > [ui]
99 106 > mergemarkertemplate = '{author} {rev}'
100 107 > EOF
101 108
102 109 $ hg merge 1
103 110 merging a
104 111 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
105 112 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
106 113 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
107 114 [1]
108 115
109 116 $ cat a
110 117 Small Mathematical Series.
111 118 1
112 119 2
113 120 3
114 121 <<<<<<< working copy: test 2
115 122 6
116 123 8
117 124 =======
118 125 4
119 126 5
120 127 >>>>>>> merge rev: test 1
121 128 Hop we are done.
122 129
123 130 Verify line splitting of custom conflict marker which causes multiple lines
124 131
125 132 $ hg up -q --clean .
126 133 $ cat >> .hg/hgrc <<EOF
127 134 > [ui]
128 135 > mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz
129 136 > EOF
130 137
131 138 $ hg -q merge 1
132 139 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
133 140 [1]
134 141
135 142 $ cat a
136 143 Small Mathematical Series.
137 144 1
138 145 2
139 146 3
140 147 <<<<<<< working copy: test 2
141 148 6
142 149 8
143 150 =======
144 151 4
145 152 5
146 153 >>>>>>> merge rev: test 1
147 154 Hop we are done.
148 155
149 156 Verify line trimming of custom conflict marker using multi-byte characters
150 157
151 158 $ hg up -q --clean .
152 159 $ "$PYTHON" <<EOF
153 160 > fp = open('logfile', 'wb')
154 161 > fp.write(b'12345678901234567890123456789012345678901234567890' +
155 162 > b'1234567890') # there are 5 more columns for 80 columns
156 163 >
157 164 > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes
158 165 > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))
159 166 >
160 167 > fp.close()
161 168 > EOF
162 169 $ hg add logfile
163 170 $ hg --encoding utf-8 commit --logfile logfile
164 171
165 172 $ cat >> .hg/hgrc <<EOF
166 173 > [ui]
167 174 > mergemarkertemplate={desc|firstline}
168 175 > EOF
169 176
170 177 $ hg -q --encoding utf-8 merge 1
171 178 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
172 179 [1]
173 180
174 181 $ cat a
175 182 Small Mathematical Series.
176 183 1
177 184 2
178 185 3
179 186 <<<<<<< working copy: 1234567890123456789012345678901234567890123456789012345...
180 187 6
181 188 8
182 189 =======
183 190 4
184 191 5
185 192 >>>>>>> merge rev: branch1
186 193 Hop we are done.
187 194
188 195 Verify basic conflict markers
189 196
190 197 $ hg up -q --clean 2
191 198 $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc
192 199
193 200 $ hg merge 1
194 201 merging a
195 202 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
196 203 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
197 204 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
198 205 [1]
199 206
200 207 $ cat a
201 208 Small Mathematical Series.
202 209 1
203 210 2
204 211 3
205 212 <<<<<<< working copy
206 213 6
207 214 8
208 215 =======
209 216 4
210 217 5
211 218 >>>>>>> merge rev
212 219 Hop we are done.
213 220
214 221 internal:merge3
215 222
216 223 $ hg up -q --clean .
217 224
218 225 $ hg merge 1 --tool internal:merge3
219 226 merging a
220 227 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
221 228 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
222 229 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
223 230 [1]
224 231 $ cat a
225 232 Small Mathematical Series.
226 233 <<<<<<< working copy
227 234 1
228 235 2
229 236 3
230 237 6
231 238 8
232 239 ||||||| base
233 240 One
234 241 Two
235 242 Three
236 243 Four
237 244 Five
238 245 =======
239 246 1
240 247 2
241 248 3
242 249 4
243 250 5
244 251 >>>>>>> merge rev
245 252 Hop we are done.
246 253
247 254 Add some unconflicting changes on each head, to make sure we really
248 255 are merging, unlike :local and :other
249 256
250 257 $ hg up -C
251 258 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
252 259 updated to "e0693e20f496: 123456789012345678901234567890123456789012345678901234567890????"
253 260 1 other heads for branch "default"
254 261 $ printf "\n\nEnd of file\n" >> a
255 262 $ hg ci -m "Add some stuff at the end"
256 263 $ hg up -r 1
257 264 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
258 265 $ printf "Start of file\n\n\n" > tmp
259 266 $ cat a >> tmp
260 267 $ mv tmp a
261 268 $ hg ci -m "Add some stuff at the beginning"
262 269
263 270 Now test :merge-other and :merge-local
264 271
265 272 $ hg merge
266 273 merging a
267 274 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
268 275 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
269 276 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
270 277 [1]
271 278 $ hg resolve --tool :merge-other a
272 279 merging a
273 280 (no more unresolved files)
274 281 $ cat a
275 282 Start of file
276 283
277 284
278 285 Small Mathematical Series.
279 286 1
280 287 2
281 288 3
282 289 6
283 290 8
284 291 Hop we are done.
285 292
286 293
287 294 End of file
288 295
289 296 $ hg up -C
290 297 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
291 298 updated to "18b51d585961: Add some stuff at the beginning"
292 299 1 other heads for branch "default"
293 300 $ hg merge --tool :merge-local
294 301 merging a
295 302 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
296 303 (branch merge, don't forget to commit)
297 304 $ cat a
298 305 Start of file
299 306
300 307
301 308 Small Mathematical Series.
302 309 1
303 310 2
304 311 3
305 312 4
306 313 5
307 314 Hop we are done.
308 315
309 316
310 317 End of file
@@ -1,665 +1,674 b''
1 1 $ hg init repo1
2 2 $ cd repo1
3 3 $ mkdir a b a/1 b/1 b/2
4 4 $ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2
5 5
6 6 hg status in repo root:
7 7
8 8 $ hg status
9 9 ? a/1/in_a_1
10 10 ? a/in_a
11 11 ? b/1/in_b_1
12 12 ? b/2/in_b_2
13 13 ? b/in_b
14 14 ? in_root
15 15
16 16 hg status . in repo root:
17 17
18 18 $ hg status .
19 19 ? a/1/in_a_1
20 20 ? a/in_a
21 21 ? b/1/in_b_1
22 22 ? b/2/in_b_2
23 23 ? b/in_b
24 24 ? in_root
25 25
26 26 $ hg status --cwd a
27 27 ? a/1/in_a_1
28 28 ? a/in_a
29 29 ? b/1/in_b_1
30 30 ? b/2/in_b_2
31 31 ? b/in_b
32 32 ? in_root
33 33 $ hg status --cwd a .
34 34 ? 1/in_a_1
35 35 ? in_a
36 36 $ hg status --cwd a ..
37 37 ? 1/in_a_1
38 38 ? in_a
39 39 ? ../b/1/in_b_1
40 40 ? ../b/2/in_b_2
41 41 ? ../b/in_b
42 42 ? ../in_root
43 43
44 44 $ hg status --cwd b
45 45 ? a/1/in_a_1
46 46 ? a/in_a
47 47 ? b/1/in_b_1
48 48 ? b/2/in_b_2
49 49 ? b/in_b
50 50 ? in_root
51 51 $ hg status --cwd b .
52 52 ? 1/in_b_1
53 53 ? 2/in_b_2
54 54 ? in_b
55 55 $ hg status --cwd b ..
56 56 ? ../a/1/in_a_1
57 57 ? ../a/in_a
58 58 ? 1/in_b_1
59 59 ? 2/in_b_2
60 60 ? in_b
61 61 ? ../in_root
62 62
63 63 $ hg status --cwd a/1
64 64 ? a/1/in_a_1
65 65 ? a/in_a
66 66 ? b/1/in_b_1
67 67 ? b/2/in_b_2
68 68 ? b/in_b
69 69 ? in_root
70 70 $ hg status --cwd a/1 .
71 71 ? in_a_1
72 72 $ hg status --cwd a/1 ..
73 73 ? in_a_1
74 74 ? ../in_a
75 75
76 76 $ hg status --cwd b/1
77 77 ? a/1/in_a_1
78 78 ? a/in_a
79 79 ? b/1/in_b_1
80 80 ? b/2/in_b_2
81 81 ? b/in_b
82 82 ? in_root
83 83 $ hg status --cwd b/1 .
84 84 ? in_b_1
85 85 $ hg status --cwd b/1 ..
86 86 ? in_b_1
87 87 ? ../2/in_b_2
88 88 ? ../in_b
89 89
90 90 $ hg status --cwd b/2
91 91 ? a/1/in_a_1
92 92 ? a/in_a
93 93 ? b/1/in_b_1
94 94 ? b/2/in_b_2
95 95 ? b/in_b
96 96 ? in_root
97 97 $ hg status --cwd b/2 .
98 98 ? in_b_2
99 99 $ hg status --cwd b/2 ..
100 100 ? ../1/in_b_1
101 101 ? in_b_2
102 102 ? ../in_b
103 103
104 104 combining patterns with root and patterns without a root works
105 105
106 106 $ hg st a/in_a re:.*b$
107 107 ? a/in_a
108 108 ? b/in_b
109 109
110 110 tweaking defaults works
111 111 $ hg status --cwd a --config ui.tweakdefaults=yes
112 112 ? 1/in_a_1
113 113 ? in_a
114 114 ? ../b/1/in_b_1
115 115 ? ../b/2/in_b_2
116 116 ? ../b/in_b
117 117 ? ../in_root
118 118 $ HGPLAIN=1 hg status --cwd a --config ui.tweakdefaults=yes
119 119 ? a/1/in_a_1 (glob)
120 120 ? a/in_a (glob)
121 121 ? b/1/in_b_1 (glob)
122 122 ? b/2/in_b_2 (glob)
123 123 ? b/in_b (glob)
124 124 ? in_root
125 125 $ HGPLAINEXCEPT=tweakdefaults hg status --cwd a --config ui.tweakdefaults=yes
126 126 ? 1/in_a_1
127 127 ? in_a
128 128 ? ../b/1/in_b_1
129 129 ? ../b/2/in_b_2
130 130 ? ../b/in_b
131 131 ? ../in_root (glob)
132 132
133 133 relative paths can be requested
134 134
135 135 $ hg status --cwd a --config ui.relative-paths=yes
136 136 ? 1/in_a_1
137 137 ? in_a
138 138 ? ../b/1/in_b_1
139 139 ? ../b/2/in_b_2
140 140 ? ../b/in_b
141 141 ? ../in_root
142 142
143 143 $ hg status --cwd a . --config ui.relative-paths=legacy
144 144 ? 1/in_a_1
145 145 ? in_a
146 146 $ hg status --cwd a . --config ui.relative-paths=no
147 147 ? a/1/in_a_1
148 148 ? a/in_a
149 149
150 150 commands.status.relative overrides ui.relative-paths
151 151
152 152 $ cat >> $HGRCPATH <<EOF
153 153 > [ui]
154 154 > relative-paths = False
155 155 > [commands]
156 156 > status.relative = True
157 157 > EOF
158 158 $ hg status --cwd a
159 159 ? 1/in_a_1
160 160 ? in_a
161 161 ? ../b/1/in_b_1
162 162 ? ../b/2/in_b_2
163 163 ? ../b/in_b
164 164 ? ../in_root
165 165 $ HGPLAIN=1 hg status --cwd a
166 166 ? a/1/in_a_1 (glob)
167 167 ? a/in_a (glob)
168 168 ? b/1/in_b_1 (glob)
169 169 ? b/2/in_b_2 (glob)
170 170 ? b/in_b (glob)
171 171 ? in_root
172 172
173 173 if relative paths are explicitly off, tweakdefaults doesn't change it
174 174 $ cat >> $HGRCPATH <<EOF
175 175 > [commands]
176 176 > status.relative = False
177 177 > EOF
178 178 $ hg status --cwd a --config ui.tweakdefaults=yes
179 179 ? a/1/in_a_1
180 180 ? a/in_a
181 181 ? b/1/in_b_1
182 182 ? b/2/in_b_2
183 183 ? b/in_b
184 184 ? in_root
185 185
186 186 $ cd ..
187 187
188 188 $ hg init repo2
189 189 $ cd repo2
190 190 $ touch modified removed deleted ignored
191 191 $ echo "^ignored$" > .hgignore
192 192 $ hg ci -A -m 'initial checkin'
193 193 adding .hgignore
194 194 adding deleted
195 195 adding modified
196 196 adding removed
197 197 $ touch modified added unknown ignored
198 198 $ hg add added
199 199 $ hg remove removed
200 200 $ rm deleted
201 201
202 202 hg status:
203 203
204 204 $ hg status
205 205 A added
206 206 R removed
207 207 ! deleted
208 208 ? unknown
209 209
210 210 hg status modified added removed deleted unknown never-existed ignored:
211 211
212 212 $ hg status modified added removed deleted unknown never-existed ignored
213 213 never-existed: * (glob)
214 214 A added
215 215 R removed
216 216 ! deleted
217 217 ? unknown
218 218
219 219 $ hg copy modified copied
220 220
221 221 hg status -C:
222 222
223 223 $ hg status -C
224 224 A added
225 225 A copied
226 226 modified
227 227 R removed
228 228 ! deleted
229 229 ? unknown
230 230
231 231 hg status -A:
232 232
233 233 $ hg status -A
234 234 A added
235 235 A copied
236 236 modified
237 237 R removed
238 238 ! deleted
239 239 ? unknown
240 240 I ignored
241 241 C .hgignore
242 242 C modified
243 243
244 244 $ hg status -A -T '{status} {path} {node|shortest}\n'
245 245 A added ffff
246 246 A copied ffff
247 247 R removed ffff
248 248 ! deleted ffff
249 249 ? unknown ffff
250 250 I ignored ffff
251 251 C .hgignore ffff
252 252 C modified ffff
253 253
254 254 $ hg status -A -Tjson
255 255 [
256 256 {
257 "itemtype": "file",
257 258 "path": "added",
258 259 "status": "A"
259 260 },
260 261 {
262 "itemtype": "file",
261 263 "path": "copied",
262 264 "source": "modified",
263 265 "status": "A"
264 266 },
265 267 {
268 "itemtype": "file",
266 269 "path": "removed",
267 270 "status": "R"
268 271 },
269 272 {
273 "itemtype": "file",
270 274 "path": "deleted",
271 275 "status": "!"
272 276 },
273 277 {
278 "itemtype": "file",
274 279 "path": "unknown",
275 280 "status": "?"
276 281 },
277 282 {
283 "itemtype": "file",
278 284 "path": "ignored",
279 285 "status": "I"
280 286 },
281 287 {
288 "itemtype": "file",
282 289 "path": ".hgignore",
283 290 "status": "C"
284 291 },
285 292 {
293 "itemtype": "file",
286 294 "path": "modified",
287 295 "status": "C"
288 296 }
289 297 ]
290 298
291 299 $ hg status -A -Tpickle > pickle
292 300 >>> from __future__ import print_function
293 301 >>> from mercurial import util
294 302 >>> pickle = util.pickle
295 303 >>> data = sorted((x[b'status'].decode(), x[b'path'].decode()) for x in pickle.load(open("pickle", r"rb")))
296 304 >>> for s, p in data: print("%s %s" % (s, p))
297 305 ! deleted
298 306 ? pickle
299 307 ? unknown
300 308 A added
301 309 A copied
302 310 C .hgignore
303 311 C modified
304 312 I ignored
305 313 R removed
306 314 $ rm pickle
307 315
308 316 $ echo "^ignoreddir$" > .hgignore
309 317 $ mkdir ignoreddir
310 318 $ touch ignoreddir/file
311 319
312 320 Test templater support:
313 321
314 322 $ hg status -AT "[{status}]\t{if(source, '{source} -> ')}{path}\n"
315 323 [M] .hgignore
316 324 [A] added
317 325 [A] modified -> copied
318 326 [R] removed
319 327 [!] deleted
320 328 [?] ignored
321 329 [?] unknown
322 330 [I] ignoreddir/file
323 331 [C] modified
324 332 $ hg status -AT default
325 333 M .hgignore
326 334 A added
327 335 A copied
328 336 modified
329 337 R removed
330 338 ! deleted
331 339 ? ignored
332 340 ? unknown
333 341 I ignoreddir/file
334 342 C modified
335 343 $ hg status -T compact
336 344 abort: "status" not in template map
337 345 [255]
338 346
339 347 hg status ignoreddir/file:
340 348
341 349 $ hg status ignoreddir/file
342 350
343 351 hg status -i ignoreddir/file:
344 352
345 353 $ hg status -i ignoreddir/file
346 354 I ignoreddir/file
347 355 $ cd ..
348 356
349 357 Check 'status -q' and some combinations
350 358
351 359 $ hg init repo3
352 360 $ cd repo3
353 361 $ touch modified removed deleted ignored
354 362 $ echo "^ignored$" > .hgignore
355 363 $ hg commit -A -m 'initial checkin'
356 364 adding .hgignore
357 365 adding deleted
358 366 adding modified
359 367 adding removed
360 368 $ touch added unknown ignored
361 369 $ hg add added
362 370 $ echo "test" >> modified
363 371 $ hg remove removed
364 372 $ rm deleted
365 373 $ hg copy modified copied
366 374
367 375 Specify working directory revision explicitly, that should be the same as
368 376 "hg status"
369 377
370 378 $ hg status --change "wdir()"
371 379 M modified
372 380 A added
373 381 A copied
374 382 R removed
375 383 ! deleted
376 384 ? unknown
377 385
378 386 Run status with 2 different flags.
379 387 Check if result is the same or different.
380 388 If result is not as expected, raise error
381 389
382 390 $ assert() {
383 391 > hg status $1 > ../a
384 392 > hg status $2 > ../b
385 393 > if diff ../a ../b > /dev/null; then
386 394 > out=0
387 395 > else
388 396 > out=1
389 397 > fi
390 398 > if [ $3 -eq 0 ]; then
391 399 > df="same"
392 400 > else
393 401 > df="different"
394 402 > fi
395 403 > if [ $out -ne $3 ]; then
396 404 > echo "Error on $1 and $2, should be $df."
397 405 > fi
398 406 > }
399 407
400 408 Assert flag1 flag2 [0-same | 1-different]
401 409
402 410 $ assert "-q" "-mard" 0
403 411 $ assert "-A" "-marduicC" 0
404 412 $ assert "-qA" "-mardcC" 0
405 413 $ assert "-qAui" "-A" 0
406 414 $ assert "-qAu" "-marducC" 0
407 415 $ assert "-qAi" "-mardicC" 0
408 416 $ assert "-qu" "-u" 0
409 417 $ assert "-q" "-u" 1
410 418 $ assert "-m" "-a" 1
411 419 $ assert "-r" "-d" 1
412 420 $ cd ..
413 421
414 422 $ hg init repo4
415 423 $ cd repo4
416 424 $ touch modified removed deleted
417 425 $ hg ci -q -A -m 'initial checkin'
418 426 $ touch added unknown
419 427 $ hg add added
420 428 $ hg remove removed
421 429 $ rm deleted
422 430 $ echo x > modified
423 431 $ hg copy modified copied
424 432 $ hg ci -m 'test checkin' -d "1000001 0"
425 433 $ rm *
426 434 $ touch unrelated
427 435 $ hg ci -q -A -m 'unrelated checkin' -d "1000002 0"
428 436
429 437 hg status --change 1:
430 438
431 439 $ hg status --change 1
432 440 M modified
433 441 A added
434 442 A copied
435 443 R removed
436 444
437 445 hg status --change 1 unrelated:
438 446
439 447 $ hg status --change 1 unrelated
440 448
441 449 hg status -C --change 1 added modified copied removed deleted:
442 450
443 451 $ hg status -C --change 1 added modified copied removed deleted
444 452 M modified
445 453 A added
446 454 A copied
447 455 modified
448 456 R removed
449 457
450 458 hg status -A --change 1 and revset:
451 459
452 460 $ hg status -A --change '1|1'
453 461 M modified
454 462 A added
455 463 A copied
456 464 modified
457 465 R removed
458 466 C deleted
459 467
460 468 $ cd ..
461 469
462 470 hg status with --rev and reverted changes:
463 471
464 472 $ hg init reverted-changes-repo
465 473 $ cd reverted-changes-repo
466 474 $ echo a > file
467 475 $ hg add file
468 476 $ hg ci -m a
469 477 $ echo b > file
470 478 $ hg ci -m b
471 479
472 480 reverted file should appear clean
473 481
474 482 $ hg revert -r 0 .
475 483 reverting file
476 484 $ hg status -A --rev 0
477 485 C file
478 486
479 487 #if execbit
480 488 reverted file with changed flag should appear modified
481 489
482 490 $ chmod +x file
483 491 $ hg status -A --rev 0
484 492 M file
485 493
486 494 $ hg revert -r 0 .
487 495 reverting file
488 496
489 497 reverted and committed file with changed flag should appear modified
490 498
491 499 $ hg co -C .
492 500 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
493 501 $ chmod +x file
494 502 $ hg ci -m 'change flag'
495 503 $ hg status -A --rev 1 --rev 2
496 504 M file
497 505 $ hg diff -r 1 -r 2
498 506
499 507 #endif
500 508
501 509 $ cd ..
502 510
503 511 hg status of binary file starting with '\1\n', a separator for metadata:
504 512
505 513 $ hg init repo5
506 514 $ cd repo5
507 515 >>> open("010a", r"wb").write(b"\1\nfoo") and None
508 516 $ hg ci -q -A -m 'initial checkin'
509 517 $ hg status -A
510 518 C 010a
511 519
512 520 >>> open("010a", r"wb").write(b"\1\nbar") and None
513 521 $ hg status -A
514 522 M 010a
515 523 $ hg ci -q -m 'modify 010a'
516 524 $ hg status -A --rev 0:1
517 525 M 010a
518 526
519 527 $ touch empty
520 528 $ hg ci -q -A -m 'add another file'
521 529 $ hg status -A --rev 1:2 010a
522 530 C 010a
523 531
524 532 $ cd ..
525 533
526 534 test "hg status" with "directory pattern" which matches against files
527 535 only known on target revision.
528 536
529 537 $ hg init repo6
530 538 $ cd repo6
531 539
532 540 $ echo a > a.txt
533 541 $ hg add a.txt
534 542 $ hg commit -m '#0'
535 543 $ mkdir -p 1/2/3/4/5
536 544 $ echo b > 1/2/3/4/5/b.txt
537 545 $ hg add 1/2/3/4/5/b.txt
538 546 $ hg commit -m '#1'
539 547
540 548 $ hg update -C 0 > /dev/null
541 549 $ hg status -A
542 550 C a.txt
543 551
544 552 the directory matching against specified pattern should be removed,
545 553 because directory existence prevents 'dirstate.walk()' from showing
546 554 warning message about such pattern.
547 555
548 556 $ test ! -d 1
549 557 $ hg status -A --rev 1 1/2/3/4/5/b.txt
550 558 R 1/2/3/4/5/b.txt
551 559 $ hg status -A --rev 1 1/2/3/4/5
552 560 R 1/2/3/4/5/b.txt
553 561 $ hg status -A --rev 1 1/2/3
554 562 R 1/2/3/4/5/b.txt
555 563 $ hg status -A --rev 1 1
556 564 R 1/2/3/4/5/b.txt
557 565
558 566 $ hg status --config ui.formatdebug=True --rev 1 1
559 567 status = [
560 568 {
569 'itemtype': 'file',
561 570 'path': '1/2/3/4/5/b.txt',
562 571 'status': 'R'
563 572 },
564 573 ]
565 574
566 575 #if windows
567 576 $ hg --config ui.slash=false status -A --rev 1 1
568 577 R 1\2\3\4\5\b.txt
569 578 #endif
570 579
571 580 $ cd ..
572 581
573 582 Status after move overwriting a file (issue4458)
574 583 =================================================
575 584
576 585
577 586 $ hg init issue4458
578 587 $ cd issue4458
579 588 $ echo a > a
580 589 $ echo b > b
581 590 $ hg commit -Am base
582 591 adding a
583 592 adding b
584 593
585 594
586 595 with --force
587 596
588 597 $ hg mv b --force a
589 598 $ hg st --copies
590 599 M a
591 600 b
592 601 R b
593 602 $ hg revert --all
594 603 reverting a
595 604 undeleting b
596 605 $ rm *.orig
597 606
598 607 without force
599 608
600 609 $ hg rm a
601 610 $ hg st --copies
602 611 R a
603 612 $ hg mv b a
604 613 $ hg st --copies
605 614 M a
606 615 b
607 616 R b
608 617
609 618 using ui.statuscopies setting
610 619 $ hg st --config ui.statuscopies=true
611 620 M a
612 621 b
613 622 R b
614 623 $ hg st --config ui.statuscopies=false
615 624 M a
616 625 R b
617 626 $ hg st --config ui.tweakdefaults=yes
618 627 M a
619 628 b
620 629 R b
621 630
622 631 using log status template (issue5155)
623 632 $ hg log -Tstatus -r 'wdir()' -C
624 633 changeset: 2147483647:ffffffffffff
625 634 parent: 0:8c55c58b4c0e
626 635 user: test
627 636 date: * (glob)
628 637 files:
629 638 M a
630 639 b
631 640 R b
632 641
633 642 $ hg log -GTstatus -r 'wdir()' -C
634 643 o changeset: 2147483647:ffffffffffff
635 644 | parent: 0:8c55c58b4c0e
636 645 ~ user: test
637 646 date: * (glob)
638 647 files:
639 648 M a
640 649 b
641 650 R b
642 651
643 652
644 653 Other "bug" highlight, the revision status does not report the copy information.
645 654 This is buggy behavior.
646 655
647 656 $ hg commit -m 'blah'
648 657 $ hg st --copies --change .
649 658 M a
650 659 R b
651 660
652 661 using log status template, the copy information is displayed correctly.
653 662 $ hg log -Tstatus -r. -C
654 663 changeset: 1:6685fde43d21
655 664 tag: tip
656 665 user: test
657 666 date: * (glob)
658 667 summary: blah
659 668 files:
660 669 M a
661 670 b
662 671 R b
663 672
664 673
665 674 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now