##// END OF EJS Templates
sshpeer: enable+fix warning about sshpeers not being closed explicitly...
Valentin Gatien-Baron -
r47419:a4c19a16 default
parent child Browse files
Show More

The requested changes are too big and content was truncated. Show full diff

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