##// END OF EJS Templates
ui: add a context manager for silencing the ui (pushbuffer+popbuffer)...
Martin von Zweigbergk -
r48230:7a430116 default
parent child Browse files
Show More

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

@@ -1,126 +1,125
1 1 # __init__.py - asv benchmark suite
2 2 #
3 3 # Copyright 2016 Logilab SA <contact@logilab.fr>
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 # "historical portability" policy of contrib/benchmarks:
9 9 #
10 10 # We have to make this code work correctly with current mercurial stable branch
11 11 # and if possible with reasonable cost with early Mercurial versions.
12 12
13 13 '''ASV (https://asv.readthedocs.io) benchmark suite
14 14
15 15 Benchmark are parameterized against reference repositories found in the
16 16 directory pointed by the REPOS_DIR environment variable.
17 17
18 18 Invocation example:
19 19
20 20 $ export REPOS_DIR=~/hgperf/repos
21 21 # run suite on given revision
22 22 $ asv --config contrib/asv.conf.json run REV
23 23 # run suite on new changesets found in stable and default branch
24 24 $ asv --config contrib/asv.conf.json run NEW
25 25 # display a comparative result table of benchmark results between two given
26 26 # revisions
27 27 $ asv --config contrib/asv.conf.json compare REV1 REV2
28 28 # compute regression detection and generate ASV static website
29 29 $ asv --config contrib/asv.conf.json publish
30 30 # serve the static website
31 31 $ asv --config contrib/asv.conf.json preview
32 32 '''
33 33
34 34 from __future__ import absolute_import
35 35
36 36 import functools
37 37 import os
38 38 import re
39 39
40 40 from mercurial import (
41 41 extensions,
42 42 hg,
43 43 ui as uimod,
44 44 util,
45 45 )
46 46
47 47 basedir = os.path.abspath(
48 48 os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir)
49 49 )
50 50 reposdir = os.environ['REPOS_DIR']
51 51 reposnames = [
52 52 name
53 53 for name in os.listdir(reposdir)
54 54 if os.path.isdir(os.path.join(reposdir, name, ".hg"))
55 55 ]
56 56 if not reposnames:
57 57 raise ValueError("No repositories found in $REPO_DIR")
58 58 outputre = re.compile(
59 59 (
60 60 r'! wall (\d+.\d+) comb \d+.\d+ user \d+.\d+ sys '
61 61 r'\d+.\d+ \(best of \d+\)'
62 62 )
63 63 )
64 64
65 65
66 66 def runperfcommand(reponame, command, *args, **kwargs):
67 67 os.environ["HGRCPATH"] = os.environ.get("ASVHGRCPATH", "")
68 68 # for "historical portability"
69 69 # ui.load() has been available since d83ca85
70 70 if util.safehasattr(uimod.ui, "load"):
71 71 ui = uimod.ui.load()
72 72 else:
73 73 ui = uimod.ui()
74 74 repo = hg.repository(ui, os.path.join(reposdir, reponame))
75 75 perfext = extensions.load(
76 76 ui, 'perfext', os.path.join(basedir, 'contrib', 'perf.py')
77 77 )
78 78 cmd = getattr(perfext, command)
79 ui.pushbuffer()
80 cmd(ui, repo, *args, **kwargs)
81 output = ui.popbuffer()
79 with ui.silent():
80 cmd(ui, repo, *args, **kwargs)
82 81 match = outputre.search(output)
83 82 if not match:
84 83 raise ValueError("Invalid output {}".format(output))
85 84 return float(match.group(1))
86 85
87 86
88 87 def perfbench(repos=reposnames, name=None, params=None):
89 88 """decorator to declare ASV benchmark based on contrib/perf.py extension
90 89
91 90 An ASV benchmark is a python function with the given attributes:
92 91
93 92 __name__: should start with track_, time_ or mem_ to be collected by ASV
94 93 params and param_name: parameter matrix to display multiple graphs on the
95 94 same page.
96 95 pretty_name: If defined it's displayed in web-ui instead of __name__
97 96 (useful for revsets)
98 97 the module name is prepended to the benchmark name and displayed as
99 98 "category" in webui.
100 99
101 100 Benchmarks are automatically parameterized with repositories found in the
102 101 REPOS_DIR environment variable.
103 102
104 103 `params` is the param matrix in the form of a list of tuple
105 104 (param_name, [value0, value1])
106 105
107 106 For example [(x, [a, b]), (y, [c, d])] declare benchmarks for
108 107 (a, c), (a, d), (b, c) and (b, d).
109 108 """
110 109 params = list(params or [])
111 110 params.insert(0, ("repo", repos))
112 111
113 112 def decorator(func):
114 113 @functools.wraps(func)
115 114 def wrapped(repo, *args):
116 115 def perf(command, *a, **kw):
117 116 return runperfcommand(repo, command, *a, **kw)
118 117
119 118 return func(perf, *args)
120 119
121 120 wrapped.params = [p[1] for p in params]
122 121 wrapped.param_names = [p[0] for p in params]
123 122 wrapped.pretty_name = name
124 123 return wrapped
125 124
126 125 return decorator
@@ -1,2667 +1,2665
1 1 # histedit.py - interactive history editing for mercurial
2 2 #
3 3 # Copyright 2009 Augie Fackler <raf@durin42.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 """interactive history editing
8 8
9 9 With this extension installed, Mercurial gains one new command: histedit. Usage
10 10 is as follows, assuming the following history::
11 11
12 12 @ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42
13 13 | Add delta
14 14 |
15 15 o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42
16 16 | Add gamma
17 17 |
18 18 o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42
19 19 | Add beta
20 20 |
21 21 o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
22 22 Add alpha
23 23
24 24 If you were to run ``hg histedit c561b4e977df``, you would see the following
25 25 file open in your editor::
26 26
27 27 pick c561b4e977df Add beta
28 28 pick 030b686bedc4 Add gamma
29 29 pick 7c2fd3b9020c Add delta
30 30
31 31 # Edit history between c561b4e977df and 7c2fd3b9020c
32 32 #
33 33 # Commits are listed from least to most recent
34 34 #
35 35 # Commands:
36 36 # p, pick = use commit
37 37 # e, edit = use commit, but allow edits before making new commit
38 38 # f, fold = use commit, but combine it with the one above
39 39 # r, roll = like fold, but discard this commit's description and date
40 40 # d, drop = remove commit from history
41 41 # m, mess = edit commit message without changing commit content
42 42 # b, base = checkout changeset and apply further changesets from there
43 43 #
44 44
45 45 In this file, lines beginning with ``#`` are ignored. You must specify a rule
46 46 for each revision in your history. For example, if you had meant to add gamma
47 47 before beta, and then wanted to add delta in the same revision as beta, you
48 48 would reorganize the file to look like this::
49 49
50 50 pick 030b686bedc4 Add gamma
51 51 pick c561b4e977df Add beta
52 52 fold 7c2fd3b9020c Add delta
53 53
54 54 # Edit history between c561b4e977df and 7c2fd3b9020c
55 55 #
56 56 # Commits are listed from least to most recent
57 57 #
58 58 # Commands:
59 59 # p, pick = use commit
60 60 # e, edit = use commit, but allow edits before making new commit
61 61 # f, fold = use commit, but combine it with the one above
62 62 # r, roll = like fold, but discard this commit's description and date
63 63 # d, drop = remove commit from history
64 64 # m, mess = edit commit message without changing commit content
65 65 # b, base = checkout changeset and apply further changesets from there
66 66 #
67 67
68 68 At which point you close the editor and ``histedit`` starts working. When you
69 69 specify a ``fold`` operation, ``histedit`` will open an editor when it folds
70 70 those revisions together, offering you a chance to clean up the commit message::
71 71
72 72 Add beta
73 73 ***
74 74 Add delta
75 75
76 76 Edit the commit message to your liking, then close the editor. The date used
77 77 for the commit will be the later of the two commits' dates. For this example,
78 78 let's assume that the commit message was changed to ``Add beta and delta.``
79 79 After histedit has run and had a chance to remove any old or temporary
80 80 revisions it needed, the history looks like this::
81 81
82 82 @ 2[tip] 989b4d060121 2009-04-27 18:04 -0500 durin42
83 83 | Add beta and delta.
84 84 |
85 85 o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
86 86 | Add gamma
87 87 |
88 88 o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
89 89 Add alpha
90 90
91 91 Note that ``histedit`` does *not* remove any revisions (even its own temporary
92 92 ones) until after it has completed all the editing operations, so it will
93 93 probably perform several strip operations when it's done. For the above example,
94 94 it had to run strip twice. Strip can be slow depending on a variety of factors,
95 95 so you might need to be a little patient. You can choose to keep the original
96 96 revisions by passing the ``--keep`` flag.
97 97
98 98 The ``edit`` operation will drop you back to a command prompt,
99 99 allowing you to edit files freely, or even use ``hg record`` to commit
100 100 some changes as a separate commit. When you're done, any remaining
101 101 uncommitted changes will be committed as well. When done, run ``hg
102 102 histedit --continue`` to finish this step. If there are uncommitted
103 103 changes, you'll be prompted for a new commit message, but the default
104 104 commit message will be the original message for the ``edit`` ed
105 105 revision, and the date of the original commit will be preserved.
106 106
107 107 The ``message`` operation will give you a chance to revise a commit
108 108 message without changing the contents. It's a shortcut for doing
109 109 ``edit`` immediately followed by `hg histedit --continue``.
110 110
111 111 If ``histedit`` encounters a conflict when moving a revision (while
112 112 handling ``pick`` or ``fold``), it'll stop in a similar manner to
113 113 ``edit`` with the difference that it won't prompt you for a commit
114 114 message when done. If you decide at this point that you don't like how
115 115 much work it will be to rearrange history, or that you made a mistake,
116 116 you can use ``hg histedit --abort`` to abandon the new changes you
117 117 have made and return to the state before you attempted to edit your
118 118 history.
119 119
120 120 If we clone the histedit-ed example repository above and add four more
121 121 changes, such that we have the following history::
122 122
123 123 @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan
124 124 | Add theta
125 125 |
126 126 o 5 140988835471 2009-04-27 18:04 -0500 stefan
127 127 | Add eta
128 128 |
129 129 o 4 122930637314 2009-04-27 18:04 -0500 stefan
130 130 | Add zeta
131 131 |
132 132 o 3 836302820282 2009-04-27 18:04 -0500 stefan
133 133 | Add epsilon
134 134 |
135 135 o 2 989b4d060121 2009-04-27 18:04 -0500 durin42
136 136 | Add beta and delta.
137 137 |
138 138 o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
139 139 | Add gamma
140 140 |
141 141 o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
142 142 Add alpha
143 143
144 144 If you run ``hg histedit --outgoing`` on the clone then it is the same
145 145 as running ``hg histedit 836302820282``. If you need plan to push to a
146 146 repository that Mercurial does not detect to be related to the source
147 147 repo, you can add a ``--force`` option.
148 148
149 149 Config
150 150 ------
151 151
152 152 Histedit rule lines are truncated to 80 characters by default. You
153 153 can customize this behavior by setting a different length in your
154 154 configuration file::
155 155
156 156 [histedit]
157 157 linelen = 120 # truncate rule lines at 120 characters
158 158
159 159 The summary of a change can be customized as well::
160 160
161 161 [histedit]
162 162 summary-template = '{rev} {bookmarks} {desc|firstline}'
163 163
164 164 The customized summary should be kept short enough that rule lines
165 165 will fit in the configured line length. See above if that requires
166 166 customization.
167 167
168 168 ``hg histedit`` attempts to automatically choose an appropriate base
169 169 revision to use. To change which base revision is used, define a
170 170 revset in your configuration file::
171 171
172 172 [histedit]
173 173 defaultrev = only(.) & draft()
174 174
175 175 By default each edited revision needs to be present in histedit commands.
176 176 To remove revision you need to use ``drop`` operation. You can configure
177 177 the drop to be implicit for missing commits by adding::
178 178
179 179 [histedit]
180 180 dropmissing = True
181 181
182 182 By default, histedit will close the transaction after each action. For
183 183 performance purposes, you can configure histedit to use a single transaction
184 184 across the entire histedit. WARNING: This setting introduces a significant risk
185 185 of losing the work you've done in a histedit if the histedit aborts
186 186 unexpectedly::
187 187
188 188 [histedit]
189 189 singletransaction = True
190 190
191 191 """
192 192
193 193 from __future__ import absolute_import
194 194
195 195 # chistedit dependencies that are not available everywhere
196 196 try:
197 197 import fcntl
198 198 import termios
199 199 except ImportError:
200 200 fcntl = None
201 201 termios = None
202 202
203 203 import functools
204 204 import os
205 205 import struct
206 206
207 207 from mercurial.i18n import _
208 208 from mercurial.pycompat import (
209 209 getattr,
210 210 open,
211 211 )
212 212 from mercurial.node import (
213 213 bin,
214 214 hex,
215 215 short,
216 216 )
217 217 from mercurial import (
218 218 bundle2,
219 219 cmdutil,
220 220 context,
221 221 copies,
222 222 destutil,
223 223 discovery,
224 224 encoding,
225 225 error,
226 226 exchange,
227 227 extensions,
228 228 hg,
229 229 logcmdutil,
230 230 merge as mergemod,
231 231 mergestate as mergestatemod,
232 232 mergeutil,
233 233 obsolete,
234 234 pycompat,
235 235 registrar,
236 236 repair,
237 237 rewriteutil,
238 238 scmutil,
239 239 state as statemod,
240 240 util,
241 241 )
242 242 from mercurial.utils import (
243 243 dateutil,
244 244 stringutil,
245 245 urlutil,
246 246 )
247 247
248 248 pickle = util.pickle
249 249 cmdtable = {}
250 250 command = registrar.command(cmdtable)
251 251
252 252 configtable = {}
253 253 configitem = registrar.configitem(configtable)
254 254 configitem(
255 255 b'experimental',
256 256 b'histedit.autoverb',
257 257 default=False,
258 258 )
259 259 configitem(
260 260 b'histedit',
261 261 b'defaultrev',
262 262 default=None,
263 263 )
264 264 configitem(
265 265 b'histedit',
266 266 b'dropmissing',
267 267 default=False,
268 268 )
269 269 configitem(
270 270 b'histedit',
271 271 b'linelen',
272 272 default=80,
273 273 )
274 274 configitem(
275 275 b'histedit',
276 276 b'singletransaction',
277 277 default=False,
278 278 )
279 279 configitem(
280 280 b'ui',
281 281 b'interface.histedit',
282 282 default=None,
283 283 )
284 284 configitem(b'histedit', b'summary-template', default=b'{rev} {desc|firstline}')
285 285
286 286 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
287 287 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
288 288 # be specifying the version(s) of Mercurial they are tested with, or
289 289 # leave the attribute unspecified.
290 290 testedwith = b'ships-with-hg-core'
291 291
292 292 actiontable = {}
293 293 primaryactions = set()
294 294 secondaryactions = set()
295 295 tertiaryactions = set()
296 296 internalactions = set()
297 297
298 298
299 299 def geteditcomment(ui, first, last):
300 300 """construct the editor comment
301 301 The comment includes::
302 302 - an intro
303 303 - sorted primary commands
304 304 - sorted short commands
305 305 - sorted long commands
306 306 - additional hints
307 307
308 308 Commands are only included once.
309 309 """
310 310 intro = _(
311 311 b"""Edit history between %s and %s
312 312
313 313 Commits are listed from least to most recent
314 314
315 315 You can reorder changesets by reordering the lines
316 316
317 317 Commands:
318 318 """
319 319 )
320 320 actions = []
321 321
322 322 def addverb(v):
323 323 a = actiontable[v]
324 324 lines = a.message.split(b"\n")
325 325 if len(a.verbs):
326 326 v = b', '.join(sorted(a.verbs, key=lambda v: len(v)))
327 327 actions.append(b" %s = %s" % (v, lines[0]))
328 328 actions.extend([b' %s'] * (len(lines) - 1))
329 329
330 330 for v in (
331 331 sorted(primaryactions)
332 332 + sorted(secondaryactions)
333 333 + sorted(tertiaryactions)
334 334 ):
335 335 addverb(v)
336 336 actions.append(b'')
337 337
338 338 hints = []
339 339 if ui.configbool(b'histedit', b'dropmissing'):
340 340 hints.append(
341 341 b"Deleting a changeset from the list "
342 342 b"will DISCARD it from the edited history!"
343 343 )
344 344
345 345 lines = (intro % (first, last)).split(b'\n') + actions + hints
346 346
347 347 return b''.join([b'# %s\n' % l if l else b'#\n' for l in lines])
348 348
349 349
350 350 class histeditstate(object):
351 351 def __init__(self, repo):
352 352 self.repo = repo
353 353 self.actions = None
354 354 self.keep = None
355 355 self.topmost = None
356 356 self.parentctxnode = None
357 357 self.lock = None
358 358 self.wlock = None
359 359 self.backupfile = None
360 360 self.stateobj = statemod.cmdstate(repo, b'histedit-state')
361 361 self.replacements = []
362 362
363 363 def read(self):
364 364 """Load histedit state from disk and set fields appropriately."""
365 365 if not self.stateobj.exists():
366 366 cmdutil.wrongtooltocontinue(self.repo, _(b'histedit'))
367 367
368 368 data = self._read()
369 369
370 370 self.parentctxnode = data[b'parentctxnode']
371 371 actions = parserules(data[b'rules'], self)
372 372 self.actions = actions
373 373 self.keep = data[b'keep']
374 374 self.topmost = data[b'topmost']
375 375 self.replacements = data[b'replacements']
376 376 self.backupfile = data[b'backupfile']
377 377
378 378 def _read(self):
379 379 fp = self.repo.vfs.read(b'histedit-state')
380 380 if fp.startswith(b'v1\n'):
381 381 data = self._load()
382 382 parentctxnode, rules, keep, topmost, replacements, backupfile = data
383 383 else:
384 384 data = pickle.loads(fp)
385 385 parentctxnode, rules, keep, topmost, replacements = data
386 386 backupfile = None
387 387 rules = b"\n".join([b"%s %s" % (verb, rest) for [verb, rest] in rules])
388 388
389 389 return {
390 390 b'parentctxnode': parentctxnode,
391 391 b"rules": rules,
392 392 b"keep": keep,
393 393 b"topmost": topmost,
394 394 b"replacements": replacements,
395 395 b"backupfile": backupfile,
396 396 }
397 397
398 398 def write(self, tr=None):
399 399 if tr:
400 400 tr.addfilegenerator(
401 401 b'histedit-state',
402 402 (b'histedit-state',),
403 403 self._write,
404 404 location=b'plain',
405 405 )
406 406 else:
407 407 with self.repo.vfs(b"histedit-state", b"w") as f:
408 408 self._write(f)
409 409
410 410 def _write(self, fp):
411 411 fp.write(b'v1\n')
412 412 fp.write(b'%s\n' % hex(self.parentctxnode))
413 413 fp.write(b'%s\n' % hex(self.topmost))
414 414 fp.write(b'%s\n' % (b'True' if self.keep else b'False'))
415 415 fp.write(b'%d\n' % len(self.actions))
416 416 for action in self.actions:
417 417 fp.write(b'%s\n' % action.tostate())
418 418 fp.write(b'%d\n' % len(self.replacements))
419 419 for replacement in self.replacements:
420 420 fp.write(
421 421 b'%s%s\n'
422 422 % (
423 423 hex(replacement[0]),
424 424 b''.join(hex(r) for r in replacement[1]),
425 425 )
426 426 )
427 427 backupfile = self.backupfile
428 428 if not backupfile:
429 429 backupfile = b''
430 430 fp.write(b'%s\n' % backupfile)
431 431
432 432 def _load(self):
433 433 fp = self.repo.vfs(b'histedit-state', b'r')
434 434 lines = [l[:-1] for l in fp.readlines()]
435 435
436 436 index = 0
437 437 lines[index] # version number
438 438 index += 1
439 439
440 440 parentctxnode = bin(lines[index])
441 441 index += 1
442 442
443 443 topmost = bin(lines[index])
444 444 index += 1
445 445
446 446 keep = lines[index] == b'True'
447 447 index += 1
448 448
449 449 # Rules
450 450 rules = []
451 451 rulelen = int(lines[index])
452 452 index += 1
453 453 for i in pycompat.xrange(rulelen):
454 454 ruleaction = lines[index]
455 455 index += 1
456 456 rule = lines[index]
457 457 index += 1
458 458 rules.append((ruleaction, rule))
459 459
460 460 # Replacements
461 461 replacements = []
462 462 replacementlen = int(lines[index])
463 463 index += 1
464 464 for i in pycompat.xrange(replacementlen):
465 465 replacement = lines[index]
466 466 original = bin(replacement[:40])
467 467 succ = [
468 468 bin(replacement[i : i + 40])
469 469 for i in range(40, len(replacement), 40)
470 470 ]
471 471 replacements.append((original, succ))
472 472 index += 1
473 473
474 474 backupfile = lines[index]
475 475 index += 1
476 476
477 477 fp.close()
478 478
479 479 return parentctxnode, rules, keep, topmost, replacements, backupfile
480 480
481 481 def clear(self):
482 482 if self.inprogress():
483 483 self.repo.vfs.unlink(b'histedit-state')
484 484
485 485 def inprogress(self):
486 486 return self.repo.vfs.exists(b'histedit-state')
487 487
488 488
489 489 class histeditaction(object):
490 490 def __init__(self, state, node):
491 491 self.state = state
492 492 self.repo = state.repo
493 493 self.node = node
494 494
495 495 @classmethod
496 496 def fromrule(cls, state, rule):
497 497 """Parses the given rule, returning an instance of the histeditaction."""
498 498 ruleid = rule.strip().split(b' ', 1)[0]
499 499 # ruleid can be anything from rev numbers, hashes, "bookmarks" etc
500 500 # Check for validation of rule ids and get the rulehash
501 501 try:
502 502 rev = bin(ruleid)
503 503 except TypeError:
504 504 try:
505 505 _ctx = scmutil.revsingle(state.repo, ruleid)
506 506 rulehash = _ctx.hex()
507 507 rev = bin(rulehash)
508 508 except error.RepoLookupError:
509 509 raise error.ParseError(_(b"invalid changeset %s") % ruleid)
510 510 return cls(state, rev)
511 511
512 512 def verify(self, prev, expected, seen):
513 513 """Verifies semantic correctness of the rule"""
514 514 repo = self.repo
515 515 ha = hex(self.node)
516 516 self.node = scmutil.resolvehexnodeidprefix(repo, ha)
517 517 if self.node is None:
518 518 raise error.ParseError(_(b'unknown changeset %s listed') % ha[:12])
519 519 self._verifynodeconstraints(prev, expected, seen)
520 520
521 521 def _verifynodeconstraints(self, prev, expected, seen):
522 522 # by default command need a node in the edited list
523 523 if self.node not in expected:
524 524 raise error.ParseError(
525 525 _(b'%s "%s" changeset was not a candidate')
526 526 % (self.verb, short(self.node)),
527 527 hint=_(b'only use listed changesets'),
528 528 )
529 529 # and only one command per node
530 530 if self.node in seen:
531 531 raise error.ParseError(
532 532 _(b'duplicated command for changeset %s') % short(self.node)
533 533 )
534 534
535 535 def torule(self):
536 536 """build a histedit rule line for an action
537 537
538 538 by default lines are in the form:
539 539 <hash> <rev> <summary>
540 540 """
541 541 ctx = self.repo[self.node]
542 542 ui = self.repo.ui
543 543 # We don't want color codes in the commit message template, so
544 544 # disable the label() template function while we render it.
545 545 with ui.configoverride(
546 546 {(b'templatealias', b'label(l,x)'): b"x"}, b'histedit'
547 547 ):
548 548 summary = cmdutil.rendertemplate(
549 549 ctx, ui.config(b'histedit', b'summary-template')
550 550 )
551 551 # Handle the fact that `''.splitlines() => []`
552 552 summary = summary.splitlines()[0] if summary else b''
553 553 line = b'%s %s %s' % (self.verb, ctx, summary)
554 554 # trim to 75 columns by default so it's not stupidly wide in my editor
555 555 # (the 5 more are left for verb)
556 556 maxlen = self.repo.ui.configint(b'histedit', b'linelen')
557 557 maxlen = max(maxlen, 22) # avoid truncating hash
558 558 return stringutil.ellipsis(line, maxlen)
559 559
560 560 def tostate(self):
561 561 """Print an action in format used by histedit state files
562 562 (the first line is a verb, the remainder is the second)
563 563 """
564 564 return b"%s\n%s" % (self.verb, hex(self.node))
565 565
566 566 def run(self):
567 567 """Runs the action. The default behavior is simply apply the action's
568 568 rulectx onto the current parentctx."""
569 569 self.applychange()
570 570 self.continuedirty()
571 571 return self.continueclean()
572 572
573 573 def applychange(self):
574 574 """Applies the changes from this action's rulectx onto the current
575 575 parentctx, but does not commit them."""
576 576 repo = self.repo
577 577 rulectx = repo[self.node]
578 repo.ui.pushbuffer()
579 hg.update(repo, self.state.parentctxnode, quietempty=True)
580 repo.ui.popbuffer()
578 with repo.ui.silent():
579 hg.update(repo, self.state.parentctxnode, quietempty=True)
581 580 stats = applychanges(repo.ui, repo, rulectx, {})
582 581 repo.dirstate.setbranch(rulectx.branch())
583 582 if stats.unresolvedcount:
584 583 raise error.InterventionRequired(
585 584 _(b'Fix up the change (%s %s)') % (self.verb, short(self.node)),
586 585 hint=_(b'hg histedit --continue to resume'),
587 586 )
588 587
589 588 def continuedirty(self):
590 589 """Continues the action when changes have been applied to the working
591 590 copy. The default behavior is to commit the dirty changes."""
592 591 repo = self.repo
593 592 rulectx = repo[self.node]
594 593
595 594 editor = self.commiteditor()
596 595 commit = commitfuncfor(repo, rulectx)
597 596 if repo.ui.configbool(b'rewrite', b'update-timestamp'):
598 597 date = dateutil.makedate()
599 598 else:
600 599 date = rulectx.date()
601 600 commit(
602 601 text=rulectx.description(),
603 602 user=rulectx.user(),
604 603 date=date,
605 604 extra=rulectx.extra(),
606 605 editor=editor,
607 606 )
608 607
609 608 def commiteditor(self):
610 609 """The editor to be used to edit the commit message."""
611 610 return False
612 611
613 612 def continueclean(self):
614 613 """Continues the action when the working copy is clean. The default
615 614 behavior is to accept the current commit as the new version of the
616 615 rulectx."""
617 616 ctx = self.repo[b'.']
618 617 if ctx.node() == self.state.parentctxnode:
619 618 self.repo.ui.warn(
620 619 _(b'%s: skipping changeset (no changes)\n') % short(self.node)
621 620 )
622 621 return ctx, [(self.node, tuple())]
623 622 if ctx.node() == self.node:
624 623 # Nothing changed
625 624 return ctx, []
626 625 return ctx, [(self.node, (ctx.node(),))]
627 626
628 627
629 628 def commitfuncfor(repo, src):
630 629 """Build a commit function for the replacement of <src>
631 630
632 631 This function ensure we apply the same treatment to all changesets.
633 632
634 633 - Add a 'histedit_source' entry in extra.
635 634
636 635 Note that fold has its own separated logic because its handling is a bit
637 636 different and not easily factored out of the fold method.
638 637 """
639 638 phasemin = src.phase()
640 639
641 640 def commitfunc(**kwargs):
642 641 overrides = {(b'phases', b'new-commit'): phasemin}
643 642 with repo.ui.configoverride(overrides, b'histedit'):
644 643 extra = kwargs.get('extra', {}).copy()
645 644 extra[b'histedit_source'] = src.hex()
646 645 kwargs['extra'] = extra
647 646 return repo.commit(**kwargs)
648 647
649 648 return commitfunc
650 649
651 650
652 651 def applychanges(ui, repo, ctx, opts):
653 652 """Merge changeset from ctx (only) in the current working directory"""
654 653 if ctx.p1().node() == repo.dirstate.p1():
655 654 # edits are "in place" we do not need to make any merge,
656 655 # just applies changes on parent for editing
657 ui.pushbuffer()
658 cmdutil.revert(ui, repo, ctx, all=True)
659 stats = mergemod.updateresult(0, 0, 0, 0)
660 ui.popbuffer()
656 with ui.silent():
657 cmdutil.revert(ui, repo, ctx, all=True)
658 stats = mergemod.updateresult(0, 0, 0, 0)
661 659 else:
662 660 try:
663 661 # ui.forcemerge is an internal variable, do not document
664 662 repo.ui.setconfig(
665 663 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
666 664 )
667 665 stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit'])
668 666 finally:
669 667 repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
670 668 return stats
671 669
672 670
673 671 def collapse(repo, firstctx, lastctx, commitopts, skipprompt=False):
674 672 """collapse the set of revisions from first to last as new one.
675 673
676 674 Expected commit options are:
677 675 - message
678 676 - date
679 677 - username
680 678 Commit message is edited in all cases.
681 679
682 680 This function works in memory."""
683 681 ctxs = list(repo.set(b'%d::%d', firstctx.rev(), lastctx.rev()))
684 682 if not ctxs:
685 683 return None
686 684 for c in ctxs:
687 685 if not c.mutable():
688 686 raise error.ParseError(
689 687 _(b"cannot fold into public change %s") % short(c.node())
690 688 )
691 689 base = firstctx.p1()
692 690
693 691 # commit a new version of the old changeset, including the update
694 692 # collect all files which might be affected
695 693 files = set()
696 694 for ctx in ctxs:
697 695 files.update(ctx.files())
698 696
699 697 # Recompute copies (avoid recording a -> b -> a)
700 698 copied = copies.pathcopies(base, lastctx)
701 699
702 700 # prune files which were reverted by the updates
703 701 files = [f for f in files if not cmdutil.samefile(f, lastctx, base)]
704 702 # commit version of these files as defined by head
705 703 headmf = lastctx.manifest()
706 704
707 705 def filectxfn(repo, ctx, path):
708 706 if path in headmf:
709 707 fctx = lastctx[path]
710 708 flags = fctx.flags()
711 709 mctx = context.memfilectx(
712 710 repo,
713 711 ctx,
714 712 fctx.path(),
715 713 fctx.data(),
716 714 islink=b'l' in flags,
717 715 isexec=b'x' in flags,
718 716 copysource=copied.get(path),
719 717 )
720 718 return mctx
721 719 return None
722 720
723 721 if commitopts.get(b'message'):
724 722 message = commitopts[b'message']
725 723 else:
726 724 message = firstctx.description()
727 725 user = commitopts.get(b'user')
728 726 date = commitopts.get(b'date')
729 727 extra = commitopts.get(b'extra')
730 728
731 729 parents = (firstctx.p1().node(), firstctx.p2().node())
732 730 editor = None
733 731 if not skipprompt:
734 732 editor = cmdutil.getcommiteditor(edit=True, editform=b'histedit.fold')
735 733 new = context.memctx(
736 734 repo,
737 735 parents=parents,
738 736 text=message,
739 737 files=files,
740 738 filectxfn=filectxfn,
741 739 user=user,
742 740 date=date,
743 741 extra=extra,
744 742 editor=editor,
745 743 )
746 744 return repo.commitctx(new)
747 745
748 746
749 747 def _isdirtywc(repo):
750 748 return repo[None].dirty(missing=True)
751 749
752 750
753 751 def abortdirty():
754 752 raise error.Abort(
755 753 _(b'working copy has pending changes'),
756 754 hint=_(
757 755 b'amend, commit, or revert them and run histedit '
758 756 b'--continue, or abort with histedit --abort'
759 757 ),
760 758 )
761 759
762 760
763 761 def action(verbs, message, priority=False, internal=False):
764 762 def wrap(cls):
765 763 assert not priority or not internal
766 764 verb = verbs[0]
767 765 if priority:
768 766 primaryactions.add(verb)
769 767 elif internal:
770 768 internalactions.add(verb)
771 769 elif len(verbs) > 1:
772 770 secondaryactions.add(verb)
773 771 else:
774 772 tertiaryactions.add(verb)
775 773
776 774 cls.verb = verb
777 775 cls.verbs = verbs
778 776 cls.message = message
779 777 for verb in verbs:
780 778 actiontable[verb] = cls
781 779 return cls
782 780
783 781 return wrap
784 782
785 783
786 784 @action([b'pick', b'p'], _(b'use commit'), priority=True)
787 785 class pick(histeditaction):
788 786 def run(self):
789 787 rulectx = self.repo[self.node]
790 788 if rulectx.p1().node() == self.state.parentctxnode:
791 789 self.repo.ui.debug(b'node %s unchanged\n' % short(self.node))
792 790 return rulectx, []
793 791
794 792 return super(pick, self).run()
795 793
796 794
797 795 @action(
798 796 [b'edit', b'e'],
799 797 _(b'use commit, but allow edits before making new commit'),
800 798 priority=True,
801 799 )
802 800 class edit(histeditaction):
803 801 def run(self):
804 802 repo = self.repo
805 803 rulectx = repo[self.node]
806 804 hg.update(repo, self.state.parentctxnode, quietempty=True)
807 805 applychanges(repo.ui, repo, rulectx, {})
808 806 hint = _(b'to edit %s, `hg histedit --continue` after making changes')
809 807 raise error.InterventionRequired(
810 808 _(b'Editing (%s), commit as needed now to split the change')
811 809 % short(self.node),
812 810 hint=hint % short(self.node),
813 811 )
814 812
815 813 def commiteditor(self):
816 814 return cmdutil.getcommiteditor(edit=True, editform=b'histedit.edit')
817 815
818 816
819 817 @action([b'fold', b'f'], _(b'use commit, but combine it with the one above'))
820 818 class fold(histeditaction):
821 819 def verify(self, prev, expected, seen):
822 820 """Verifies semantic correctness of the fold rule"""
823 821 super(fold, self).verify(prev, expected, seen)
824 822 repo = self.repo
825 823 if not prev:
826 824 c = repo[self.node].p1()
827 825 elif not prev.verb in (b'pick', b'base'):
828 826 return
829 827 else:
830 828 c = repo[prev.node]
831 829 if not c.mutable():
832 830 raise error.ParseError(
833 831 _(b"cannot fold into public change %s") % short(c.node())
834 832 )
835 833
836 834 def continuedirty(self):
837 835 repo = self.repo
838 836 rulectx = repo[self.node]
839 837
840 838 commit = commitfuncfor(repo, rulectx)
841 839 commit(
842 840 text=b'fold-temp-revision %s' % short(self.node),
843 841 user=rulectx.user(),
844 842 date=rulectx.date(),
845 843 extra=rulectx.extra(),
846 844 )
847 845
848 846 def continueclean(self):
849 847 repo = self.repo
850 848 ctx = repo[b'.']
851 849 rulectx = repo[self.node]
852 850 parentctxnode = self.state.parentctxnode
853 851 if ctx.node() == parentctxnode:
854 852 repo.ui.warn(_(b'%s: empty changeset\n') % short(self.node))
855 853 return ctx, [(self.node, (parentctxnode,))]
856 854
857 855 parentctx = repo[parentctxnode]
858 856 newcommits = {
859 857 c.node()
860 858 for c in repo.set(b'(%d::. - %d)', parentctx.rev(), parentctx.rev())
861 859 }
862 860 if not newcommits:
863 861 repo.ui.warn(
864 862 _(
865 863 b'%s: cannot fold - working copy is not a '
866 864 b'descendant of previous commit %s\n'
867 865 )
868 866 % (short(self.node), short(parentctxnode))
869 867 )
870 868 return ctx, [(self.node, (ctx.node(),))]
871 869
872 870 middlecommits = newcommits.copy()
873 871 middlecommits.discard(ctx.node())
874 872
875 873 return self.finishfold(
876 874 repo.ui, repo, parentctx, rulectx, ctx.node(), middlecommits
877 875 )
878 876
879 877 def skipprompt(self):
880 878 """Returns true if the rule should skip the message editor.
881 879
882 880 For example, 'fold' wants to show an editor, but 'rollup'
883 881 doesn't want to.
884 882 """
885 883 return False
886 884
887 885 def mergedescs(self):
888 886 """Returns true if the rule should merge messages of multiple changes.
889 887
890 888 This exists mainly so that 'rollup' rules can be a subclass of
891 889 'fold'.
892 890 """
893 891 return True
894 892
895 893 def firstdate(self):
896 894 """Returns true if the rule should preserve the date of the first
897 895 change.
898 896
899 897 This exists mainly so that 'rollup' rules can be a subclass of
900 898 'fold'.
901 899 """
902 900 return False
903 901
904 902 def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
905 903 mergemod.update(ctx.p1())
906 904 ### prepare new commit data
907 905 commitopts = {}
908 906 commitopts[b'user'] = ctx.user()
909 907 # commit message
910 908 if not self.mergedescs():
911 909 newmessage = ctx.description()
912 910 else:
913 911 newmessage = (
914 912 b'\n***\n'.join(
915 913 [ctx.description()]
916 914 + [repo[r].description() for r in internalchanges]
917 915 + [oldctx.description()]
918 916 )
919 917 + b'\n'
920 918 )
921 919 commitopts[b'message'] = newmessage
922 920 # date
923 921 if self.firstdate():
924 922 commitopts[b'date'] = ctx.date()
925 923 else:
926 924 commitopts[b'date'] = max(ctx.date(), oldctx.date())
927 925 # if date is to be updated to current
928 926 if ui.configbool(b'rewrite', b'update-timestamp'):
929 927 commitopts[b'date'] = dateutil.makedate()
930 928
931 929 extra = ctx.extra().copy()
932 930 # histedit_source
933 931 # note: ctx is likely a temporary commit but that the best we can do
934 932 # here. This is sufficient to solve issue3681 anyway.
935 933 extra[b'histedit_source'] = b'%s,%s' % (ctx.hex(), oldctx.hex())
936 934 commitopts[b'extra'] = extra
937 935 phasemin = max(ctx.phase(), oldctx.phase())
938 936 overrides = {(b'phases', b'new-commit'): phasemin}
939 937 with repo.ui.configoverride(overrides, b'histedit'):
940 938 n = collapse(
941 939 repo,
942 940 ctx,
943 941 repo[newnode],
944 942 commitopts,
945 943 skipprompt=self.skipprompt(),
946 944 )
947 945 if n is None:
948 946 return ctx, []
949 947 mergemod.update(repo[n])
950 948 replacements = [
951 949 (oldctx.node(), (newnode,)),
952 950 (ctx.node(), (n,)),
953 951 (newnode, (n,)),
954 952 ]
955 953 for ich in internalchanges:
956 954 replacements.append((ich, (n,)))
957 955 return repo[n], replacements
958 956
959 957
960 958 @action(
961 959 [b'base', b'b'],
962 960 _(b'checkout changeset and apply further changesets from there'),
963 961 )
964 962 class base(histeditaction):
965 963 def run(self):
966 964 if self.repo[b'.'].node() != self.node:
967 965 mergemod.clean_update(self.repo[self.node])
968 966 return self.continueclean()
969 967
970 968 def continuedirty(self):
971 969 abortdirty()
972 970
973 971 def continueclean(self):
974 972 basectx = self.repo[b'.']
975 973 return basectx, []
976 974
977 975 def _verifynodeconstraints(self, prev, expected, seen):
978 976 # base can only be use with a node not in the edited set
979 977 if self.node in expected:
980 978 msg = _(b'%s "%s" changeset was an edited list candidate')
981 979 raise error.ParseError(
982 980 msg % (self.verb, short(self.node)),
983 981 hint=_(b'base must only use unlisted changesets'),
984 982 )
985 983
986 984
987 985 @action(
988 986 [b'_multifold'],
989 987 _(
990 988 """fold subclass used for when multiple folds happen in a row
991 989
992 990 We only want to fire the editor for the folded message once when
993 991 (say) four changes are folded down into a single change. This is
994 992 similar to rollup, but we should preserve both messages so that
995 993 when the last fold operation runs we can show the user all the
996 994 commit messages in their editor.
997 995 """
998 996 ),
999 997 internal=True,
1000 998 )
1001 999 class _multifold(fold):
1002 1000 def skipprompt(self):
1003 1001 return True
1004 1002
1005 1003
1006 1004 @action(
1007 1005 [b"roll", b"r"],
1008 1006 _(b"like fold, but discard this commit's description and date"),
1009 1007 )
1010 1008 class rollup(fold):
1011 1009 def mergedescs(self):
1012 1010 return False
1013 1011
1014 1012 def skipprompt(self):
1015 1013 return True
1016 1014
1017 1015 def firstdate(self):
1018 1016 return True
1019 1017
1020 1018
1021 1019 @action([b"drop", b"d"], _(b'remove commit from history'))
1022 1020 class drop(histeditaction):
1023 1021 def run(self):
1024 1022 parentctx = self.repo[self.state.parentctxnode]
1025 1023 return parentctx, [(self.node, tuple())]
1026 1024
1027 1025
1028 1026 @action(
1029 1027 [b"mess", b"m"],
1030 1028 _(b'edit commit message without changing commit content'),
1031 1029 priority=True,
1032 1030 )
1033 1031 class message(histeditaction):
1034 1032 def commiteditor(self):
1035 1033 return cmdutil.getcommiteditor(edit=True, editform=b'histedit.mess')
1036 1034
1037 1035
1038 1036 def findoutgoing(ui, repo, remote=None, force=False, opts=None):
1039 1037 """utility function to find the first outgoing changeset
1040 1038
1041 1039 Used by initialization code"""
1042 1040 if opts is None:
1043 1041 opts = {}
1044 1042 path = urlutil.get_unique_push_path(b'histedit', repo, ui, remote)
1045 1043 dest = path.pushloc or path.loc
1046 1044
1047 1045 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
1048 1046
1049 1047 revs, checkout = hg.addbranchrevs(repo, repo, (path.branch, []), None)
1050 1048 other = hg.peer(repo, opts, dest)
1051 1049
1052 1050 if revs:
1053 1051 revs = [repo.lookup(rev) for rev in revs]
1054 1052
1055 1053 outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force)
1056 1054 if not outgoing.missing:
1057 1055 raise error.Abort(_(b'no outgoing ancestors'))
1058 1056 roots = list(repo.revs(b"roots(%ln)", outgoing.missing))
1059 1057 if len(roots) > 1:
1060 1058 msg = _(b'there are ambiguous outgoing revisions')
1061 1059 hint = _(b"see 'hg help histedit' for more detail")
1062 1060 raise error.Abort(msg, hint=hint)
1063 1061 return repo[roots[0]].node()
1064 1062
1065 1063
1066 1064 # Curses Support
1067 1065 try:
1068 1066 import curses
1069 1067 except ImportError:
1070 1068 curses = None
1071 1069
1072 1070 KEY_LIST = [b'pick', b'edit', b'fold', b'drop', b'mess', b'roll']
1073 1071 ACTION_LABELS = {
1074 1072 b'fold': b'^fold',
1075 1073 b'roll': b'^roll',
1076 1074 }
1077 1075
1078 1076 COLOR_HELP, COLOR_SELECTED, COLOR_OK, COLOR_WARN, COLOR_CURRENT = 1, 2, 3, 4, 5
1079 1077 COLOR_DIFF_ADD_LINE, COLOR_DIFF_DEL_LINE, COLOR_DIFF_OFFSET = 6, 7, 8
1080 1078 COLOR_ROLL, COLOR_ROLL_CURRENT, COLOR_ROLL_SELECTED = 9, 10, 11
1081 1079
1082 1080 E_QUIT, E_HISTEDIT = 1, 2
1083 1081 E_PAGEDOWN, E_PAGEUP, E_LINEUP, E_LINEDOWN, E_RESIZE = 3, 4, 5, 6, 7
1084 1082 MODE_INIT, MODE_PATCH, MODE_RULES, MODE_HELP = 0, 1, 2, 3
1085 1083
1086 1084 KEYTABLE = {
1087 1085 b'global': {
1088 1086 b'h': b'next-action',
1089 1087 b'KEY_RIGHT': b'next-action',
1090 1088 b'l': b'prev-action',
1091 1089 b'KEY_LEFT': b'prev-action',
1092 1090 b'q': b'quit',
1093 1091 b'c': b'histedit',
1094 1092 b'C': b'histedit',
1095 1093 b'v': b'showpatch',
1096 1094 b'?': b'help',
1097 1095 },
1098 1096 MODE_RULES: {
1099 1097 b'd': b'action-drop',
1100 1098 b'e': b'action-edit',
1101 1099 b'f': b'action-fold',
1102 1100 b'm': b'action-mess',
1103 1101 b'p': b'action-pick',
1104 1102 b'r': b'action-roll',
1105 1103 b' ': b'select',
1106 1104 b'j': b'down',
1107 1105 b'k': b'up',
1108 1106 b'KEY_DOWN': b'down',
1109 1107 b'KEY_UP': b'up',
1110 1108 b'J': b'move-down',
1111 1109 b'K': b'move-up',
1112 1110 b'KEY_NPAGE': b'move-down',
1113 1111 b'KEY_PPAGE': b'move-up',
1114 1112 b'0': b'goto', # Used for 0..9
1115 1113 },
1116 1114 MODE_PATCH: {
1117 1115 b' ': b'page-down',
1118 1116 b'KEY_NPAGE': b'page-down',
1119 1117 b'KEY_PPAGE': b'page-up',
1120 1118 b'j': b'line-down',
1121 1119 b'k': b'line-up',
1122 1120 b'KEY_DOWN': b'line-down',
1123 1121 b'KEY_UP': b'line-up',
1124 1122 b'J': b'down',
1125 1123 b'K': b'up',
1126 1124 },
1127 1125 MODE_HELP: {},
1128 1126 }
1129 1127
1130 1128
1131 1129 def screen_size():
1132 1130 return struct.unpack(b'hh', fcntl.ioctl(1, termios.TIOCGWINSZ, b' '))
1133 1131
1134 1132
1135 1133 class histeditrule(object):
1136 1134 def __init__(self, ui, ctx, pos, action=b'pick'):
1137 1135 self.ui = ui
1138 1136 self.ctx = ctx
1139 1137 self.action = action
1140 1138 self.origpos = pos
1141 1139 self.pos = pos
1142 1140 self.conflicts = []
1143 1141
1144 1142 def __bytes__(self):
1145 1143 # Example display of several histeditrules:
1146 1144 #
1147 1145 # #10 pick 316392:06a16c25c053 add option to skip tests
1148 1146 # #11 ^roll 316393:71313c964cc5 <RED>oops a fixup commit</RED>
1149 1147 # #12 pick 316394:ab31f3973b0d include mfbt for mozilla-config.h
1150 1148 # #13 ^fold 316395:14ce5803f4c3 fix warnings
1151 1149 #
1152 1150 # The carets point to the changeset being folded into ("roll this
1153 1151 # changeset into the changeset above").
1154 1152 return b'%s%s' % (self.prefix, self.desc)
1155 1153
1156 1154 __str__ = encoding.strmethod(__bytes__)
1157 1155
1158 1156 @property
1159 1157 def prefix(self):
1160 1158 # Some actions ('fold' and 'roll') combine a patch with a
1161 1159 # previous one. Add a marker showing which patch they apply
1162 1160 # to.
1163 1161 action = ACTION_LABELS.get(self.action, self.action)
1164 1162
1165 1163 h = self.ctx.hex()[0:12]
1166 1164 r = self.ctx.rev()
1167 1165
1168 1166 return b"#%s %s %d:%s " % (
1169 1167 (b'%d' % self.origpos).ljust(2),
1170 1168 action.ljust(6),
1171 1169 r,
1172 1170 h,
1173 1171 )
1174 1172
1175 1173 @util.propertycache
1176 1174 def desc(self):
1177 1175 summary = cmdutil.rendertemplate(
1178 1176 self.ctx, self.ui.config(b'histedit', b'summary-template')
1179 1177 )
1180 1178 if summary:
1181 1179 return summary
1182 1180 # This is split off from the prefix property so that we can
1183 1181 # separately make the description for 'roll' red (since it
1184 1182 # will get discarded).
1185 1183 return self.ctx.description().splitlines()[0].strip()
1186 1184
1187 1185 def checkconflicts(self, other):
1188 1186 if other.pos > self.pos and other.origpos <= self.origpos:
1189 1187 if set(other.ctx.files()) & set(self.ctx.files()) != set():
1190 1188 self.conflicts.append(other)
1191 1189 return self.conflicts
1192 1190
1193 1191 if other in self.conflicts:
1194 1192 self.conflicts.remove(other)
1195 1193 return self.conflicts
1196 1194
1197 1195
1198 1196 # ============ EVENTS ===============
1199 1197 def movecursor(state, oldpos, newpos):
1200 1198 """Change the rule/changeset that the cursor is pointing to, regardless of
1201 1199 current mode (you can switch between patches from the view patch window)."""
1202 1200 state[b'pos'] = newpos
1203 1201
1204 1202 mode, _ = state[b'mode']
1205 1203 if mode == MODE_RULES:
1206 1204 # Scroll through the list by updating the view for MODE_RULES, so that
1207 1205 # even if we are not currently viewing the rules, switching back will
1208 1206 # result in the cursor's rule being visible.
1209 1207 modestate = state[b'modes'][MODE_RULES]
1210 1208 if newpos < modestate[b'line_offset']:
1211 1209 modestate[b'line_offset'] = newpos
1212 1210 elif newpos > modestate[b'line_offset'] + state[b'page_height'] - 1:
1213 1211 modestate[b'line_offset'] = newpos - state[b'page_height'] + 1
1214 1212
1215 1213 # Reset the patch view region to the top of the new patch.
1216 1214 state[b'modes'][MODE_PATCH][b'line_offset'] = 0
1217 1215
1218 1216
1219 1217 def changemode(state, mode):
1220 1218 curmode, _ = state[b'mode']
1221 1219 state[b'mode'] = (mode, curmode)
1222 1220 if mode == MODE_PATCH:
1223 1221 state[b'modes'][MODE_PATCH][b'patchcontents'] = patchcontents(state)
1224 1222
1225 1223
1226 1224 def makeselection(state, pos):
1227 1225 state[b'selected'] = pos
1228 1226
1229 1227
1230 1228 def swap(state, oldpos, newpos):
1231 1229 """Swap two positions and calculate necessary conflicts in
1232 1230 O(|newpos-oldpos|) time"""
1233 1231
1234 1232 rules = state[b'rules']
1235 1233 assert 0 <= oldpos < len(rules) and 0 <= newpos < len(rules)
1236 1234
1237 1235 rules[oldpos], rules[newpos] = rules[newpos], rules[oldpos]
1238 1236
1239 1237 # TODO: swap should not know about histeditrule's internals
1240 1238 rules[newpos].pos = newpos
1241 1239 rules[oldpos].pos = oldpos
1242 1240
1243 1241 start = min(oldpos, newpos)
1244 1242 end = max(oldpos, newpos)
1245 1243 for r in pycompat.xrange(start, end + 1):
1246 1244 rules[newpos].checkconflicts(rules[r])
1247 1245 rules[oldpos].checkconflicts(rules[r])
1248 1246
1249 1247 if state[b'selected']:
1250 1248 makeselection(state, newpos)
1251 1249
1252 1250
1253 1251 def changeaction(state, pos, action):
1254 1252 """Change the action state on the given position to the new action"""
1255 1253 rules = state[b'rules']
1256 1254 assert 0 <= pos < len(rules)
1257 1255 rules[pos].action = action
1258 1256
1259 1257
1260 1258 def cycleaction(state, pos, next=False):
1261 1259 """Changes the action state the next or the previous action from
1262 1260 the action list"""
1263 1261 rules = state[b'rules']
1264 1262 assert 0 <= pos < len(rules)
1265 1263 current = rules[pos].action
1266 1264
1267 1265 assert current in KEY_LIST
1268 1266
1269 1267 index = KEY_LIST.index(current)
1270 1268 if next:
1271 1269 index += 1
1272 1270 else:
1273 1271 index -= 1
1274 1272 changeaction(state, pos, KEY_LIST[index % len(KEY_LIST)])
1275 1273
1276 1274
1277 1275 def changeview(state, delta, unit):
1278 1276 """Change the region of whatever is being viewed (a patch or the list of
1279 1277 changesets). 'delta' is an amount (+/- 1) and 'unit' is 'page' or 'line'."""
1280 1278 mode, _ = state[b'mode']
1281 1279 if mode != MODE_PATCH:
1282 1280 return
1283 1281 mode_state = state[b'modes'][mode]
1284 1282 num_lines = len(mode_state[b'patchcontents'])
1285 1283 page_height = state[b'page_height']
1286 1284 unit = page_height if unit == b'page' else 1
1287 1285 num_pages = 1 + (num_lines - 1) // page_height
1288 1286 max_offset = (num_pages - 1) * page_height
1289 1287 newline = mode_state[b'line_offset'] + delta * unit
1290 1288 mode_state[b'line_offset'] = max(0, min(max_offset, newline))
1291 1289
1292 1290
1293 1291 def event(state, ch):
1294 1292 """Change state based on the current character input
1295 1293
1296 1294 This takes the current state and based on the current character input from
1297 1295 the user we change the state.
1298 1296 """
1299 1297 selected = state[b'selected']
1300 1298 oldpos = state[b'pos']
1301 1299 rules = state[b'rules']
1302 1300
1303 1301 if ch in (curses.KEY_RESIZE, b"KEY_RESIZE"):
1304 1302 return E_RESIZE
1305 1303
1306 1304 lookup_ch = ch
1307 1305 if ch is not None and b'0' <= ch <= b'9':
1308 1306 lookup_ch = b'0'
1309 1307
1310 1308 curmode, prevmode = state[b'mode']
1311 1309 action = KEYTABLE[curmode].get(
1312 1310 lookup_ch, KEYTABLE[b'global'].get(lookup_ch)
1313 1311 )
1314 1312 if action is None:
1315 1313 return
1316 1314 if action in (b'down', b'move-down'):
1317 1315 newpos = min(oldpos + 1, len(rules) - 1)
1318 1316 movecursor(state, oldpos, newpos)
1319 1317 if selected is not None or action == b'move-down':
1320 1318 swap(state, oldpos, newpos)
1321 1319 elif action in (b'up', b'move-up'):
1322 1320 newpos = max(0, oldpos - 1)
1323 1321 movecursor(state, oldpos, newpos)
1324 1322 if selected is not None or action == b'move-up':
1325 1323 swap(state, oldpos, newpos)
1326 1324 elif action == b'next-action':
1327 1325 cycleaction(state, oldpos, next=True)
1328 1326 elif action == b'prev-action':
1329 1327 cycleaction(state, oldpos, next=False)
1330 1328 elif action == b'select':
1331 1329 selected = oldpos if selected is None else None
1332 1330 makeselection(state, selected)
1333 1331 elif action == b'goto' and int(ch) < len(rules) and len(rules) <= 10:
1334 1332 newrule = next((r for r in rules if r.origpos == int(ch)))
1335 1333 movecursor(state, oldpos, newrule.pos)
1336 1334 if selected is not None:
1337 1335 swap(state, oldpos, newrule.pos)
1338 1336 elif action.startswith(b'action-'):
1339 1337 changeaction(state, oldpos, action[7:])
1340 1338 elif action == b'showpatch':
1341 1339 changemode(state, MODE_PATCH if curmode != MODE_PATCH else prevmode)
1342 1340 elif action == b'help':
1343 1341 changemode(state, MODE_HELP if curmode != MODE_HELP else prevmode)
1344 1342 elif action == b'quit':
1345 1343 return E_QUIT
1346 1344 elif action == b'histedit':
1347 1345 return E_HISTEDIT
1348 1346 elif action == b'page-down':
1349 1347 return E_PAGEDOWN
1350 1348 elif action == b'page-up':
1351 1349 return E_PAGEUP
1352 1350 elif action == b'line-down':
1353 1351 return E_LINEDOWN
1354 1352 elif action == b'line-up':
1355 1353 return E_LINEUP
1356 1354
1357 1355
1358 1356 def makecommands(rules):
1359 1357 """Returns a list of commands consumable by histedit --commands based on
1360 1358 our list of rules"""
1361 1359 commands = []
1362 1360 for rules in rules:
1363 1361 commands.append(b'%s %s\n' % (rules.action, rules.ctx))
1364 1362 return commands
1365 1363
1366 1364
1367 1365 def addln(win, y, x, line, color=None):
1368 1366 """Add a line to the given window left padding but 100% filled with
1369 1367 whitespace characters, so that the color appears on the whole line"""
1370 1368 maxy, maxx = win.getmaxyx()
1371 1369 length = maxx - 1 - x
1372 1370 line = bytes(line).ljust(length)[:length]
1373 1371 if y < 0:
1374 1372 y = maxy + y
1375 1373 if x < 0:
1376 1374 x = maxx + x
1377 1375 if color:
1378 1376 win.addstr(y, x, line, color)
1379 1377 else:
1380 1378 win.addstr(y, x, line)
1381 1379
1382 1380
1383 1381 def _trunc_head(line, n):
1384 1382 if len(line) <= n:
1385 1383 return line
1386 1384 return b'> ' + line[-(n - 2) :]
1387 1385
1388 1386
1389 1387 def _trunc_tail(line, n):
1390 1388 if len(line) <= n:
1391 1389 return line
1392 1390 return line[: n - 2] + b' >'
1393 1391
1394 1392
1395 1393 def patchcontents(state):
1396 1394 repo = state[b'repo']
1397 1395 rule = state[b'rules'][state[b'pos']]
1398 1396 displayer = logcmdutil.changesetdisplayer(
1399 1397 repo.ui, repo, {b"patch": True, b"template": b"status"}, buffered=True
1400 1398 )
1401 1399 overrides = {(b'ui', b'verbose'): True}
1402 1400 with repo.ui.configoverride(overrides, source=b'histedit'):
1403 1401 displayer.show(rule.ctx)
1404 1402 displayer.close()
1405 1403 return displayer.hunk[rule.ctx.rev()].splitlines()
1406 1404
1407 1405
1408 1406 def _chisteditmain(repo, rules, stdscr):
1409 1407 try:
1410 1408 curses.use_default_colors()
1411 1409 except curses.error:
1412 1410 pass
1413 1411
1414 1412 # initialize color pattern
1415 1413 curses.init_pair(COLOR_HELP, curses.COLOR_WHITE, curses.COLOR_BLUE)
1416 1414 curses.init_pair(COLOR_SELECTED, curses.COLOR_BLACK, curses.COLOR_WHITE)
1417 1415 curses.init_pair(COLOR_WARN, curses.COLOR_BLACK, curses.COLOR_YELLOW)
1418 1416 curses.init_pair(COLOR_OK, curses.COLOR_BLACK, curses.COLOR_GREEN)
1419 1417 curses.init_pair(COLOR_CURRENT, curses.COLOR_WHITE, curses.COLOR_MAGENTA)
1420 1418 curses.init_pair(COLOR_DIFF_ADD_LINE, curses.COLOR_GREEN, -1)
1421 1419 curses.init_pair(COLOR_DIFF_DEL_LINE, curses.COLOR_RED, -1)
1422 1420 curses.init_pair(COLOR_DIFF_OFFSET, curses.COLOR_MAGENTA, -1)
1423 1421 curses.init_pair(COLOR_ROLL, curses.COLOR_RED, -1)
1424 1422 curses.init_pair(
1425 1423 COLOR_ROLL_CURRENT, curses.COLOR_BLACK, curses.COLOR_MAGENTA
1426 1424 )
1427 1425 curses.init_pair(COLOR_ROLL_SELECTED, curses.COLOR_RED, curses.COLOR_WHITE)
1428 1426
1429 1427 # don't display the cursor
1430 1428 try:
1431 1429 curses.curs_set(0)
1432 1430 except curses.error:
1433 1431 pass
1434 1432
1435 1433 def rendercommit(win, state):
1436 1434 """Renders the commit window that shows the log of the current selected
1437 1435 commit"""
1438 1436 pos = state[b'pos']
1439 1437 rules = state[b'rules']
1440 1438 rule = rules[pos]
1441 1439
1442 1440 ctx = rule.ctx
1443 1441 win.box()
1444 1442
1445 1443 maxy, maxx = win.getmaxyx()
1446 1444 length = maxx - 3
1447 1445
1448 1446 line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex()[:12])
1449 1447 win.addstr(1, 1, line[:length])
1450 1448
1451 1449 line = b"user: %s" % ctx.user()
1452 1450 win.addstr(2, 1, line[:length])
1453 1451
1454 1452 bms = repo.nodebookmarks(ctx.node())
1455 1453 line = b"bookmark: %s" % b' '.join(bms)
1456 1454 win.addstr(3, 1, line[:length])
1457 1455
1458 1456 line = b"summary: %s" % (ctx.description().splitlines()[0])
1459 1457 win.addstr(4, 1, line[:length])
1460 1458
1461 1459 line = b"files: "
1462 1460 win.addstr(5, 1, line)
1463 1461 fnx = 1 + len(line)
1464 1462 fnmaxx = length - fnx + 1
1465 1463 y = 5
1466 1464 fnmaxn = maxy - (1 + y) - 1
1467 1465 files = ctx.files()
1468 1466 for i, line1 in enumerate(files):
1469 1467 if len(files) > fnmaxn and i == fnmaxn - 1:
1470 1468 win.addstr(y, fnx, _trunc_tail(b','.join(files[i:]), fnmaxx))
1471 1469 y = y + 1
1472 1470 break
1473 1471 win.addstr(y, fnx, _trunc_head(line1, fnmaxx))
1474 1472 y = y + 1
1475 1473
1476 1474 conflicts = rule.conflicts
1477 1475 if len(conflicts) > 0:
1478 1476 conflictstr = b','.join(map(lambda r: r.ctx.hex()[:12], conflicts))
1479 1477 conflictstr = b"changed files overlap with %s" % conflictstr
1480 1478 else:
1481 1479 conflictstr = b'no overlap'
1482 1480
1483 1481 win.addstr(y, 1, conflictstr[:length])
1484 1482 win.noutrefresh()
1485 1483
1486 1484 def helplines(mode):
1487 1485 if mode == MODE_PATCH:
1488 1486 help = b"""\
1489 1487 ?: help, k/up: line up, j/down: line down, v: stop viewing patch
1490 1488 pgup: prev page, space/pgdn: next page, c: commit, q: abort
1491 1489 """
1492 1490 else:
1493 1491 help = b"""\
1494 1492 ?: help, k/up: move up, j/down: move down, space: select, v: view patch
1495 1493 d: drop, e: edit, f: fold, m: mess, p: pick, r: roll
1496 1494 pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort
1497 1495 """
1498 1496 return help.splitlines()
1499 1497
1500 1498 def renderhelp(win, state):
1501 1499 maxy, maxx = win.getmaxyx()
1502 1500 mode, _ = state[b'mode']
1503 1501 for y, line in enumerate(helplines(mode)):
1504 1502 if y >= maxy:
1505 1503 break
1506 1504 addln(win, y, 0, line, curses.color_pair(COLOR_HELP))
1507 1505 win.noutrefresh()
1508 1506
1509 1507 def renderrules(rulesscr, state):
1510 1508 rules = state[b'rules']
1511 1509 pos = state[b'pos']
1512 1510 selected = state[b'selected']
1513 1511 start = state[b'modes'][MODE_RULES][b'line_offset']
1514 1512
1515 1513 conflicts = [r.ctx for r in rules if r.conflicts]
1516 1514 if len(conflicts) > 0:
1517 1515 line = b"potential conflict in %s" % b','.join(
1518 1516 map(pycompat.bytestr, conflicts)
1519 1517 )
1520 1518 addln(rulesscr, -1, 0, line, curses.color_pair(COLOR_WARN))
1521 1519
1522 1520 for y, rule in enumerate(rules[start:]):
1523 1521 if y >= state[b'page_height']:
1524 1522 break
1525 1523 if len(rule.conflicts) > 0:
1526 1524 rulesscr.addstr(y, 0, b" ", curses.color_pair(COLOR_WARN))
1527 1525 else:
1528 1526 rulesscr.addstr(y, 0, b" ", curses.COLOR_BLACK)
1529 1527
1530 1528 if y + start == selected:
1531 1529 rollcolor = COLOR_ROLL_SELECTED
1532 1530 addln(rulesscr, y, 2, rule, curses.color_pair(COLOR_SELECTED))
1533 1531 elif y + start == pos:
1534 1532 rollcolor = COLOR_ROLL_CURRENT
1535 1533 addln(
1536 1534 rulesscr,
1537 1535 y,
1538 1536 2,
1539 1537 rule,
1540 1538 curses.color_pair(COLOR_CURRENT) | curses.A_BOLD,
1541 1539 )
1542 1540 else:
1543 1541 rollcolor = COLOR_ROLL
1544 1542 addln(rulesscr, y, 2, rule)
1545 1543
1546 1544 if rule.action == b'roll':
1547 1545 rulesscr.addstr(
1548 1546 y,
1549 1547 2 + len(rule.prefix),
1550 1548 rule.desc,
1551 1549 curses.color_pair(rollcolor),
1552 1550 )
1553 1551
1554 1552 rulesscr.noutrefresh()
1555 1553
1556 1554 def renderstring(win, state, output, diffcolors=False):
1557 1555 maxy, maxx = win.getmaxyx()
1558 1556 length = min(maxy - 1, len(output))
1559 1557 for y in range(0, length):
1560 1558 line = output[y]
1561 1559 if diffcolors:
1562 1560 if line and line[0] == b'+':
1563 1561 win.addstr(
1564 1562 y, 0, line, curses.color_pair(COLOR_DIFF_ADD_LINE)
1565 1563 )
1566 1564 elif line and line[0] == b'-':
1567 1565 win.addstr(
1568 1566 y, 0, line, curses.color_pair(COLOR_DIFF_DEL_LINE)
1569 1567 )
1570 1568 elif line.startswith(b'@@ '):
1571 1569 win.addstr(y, 0, line, curses.color_pair(COLOR_DIFF_OFFSET))
1572 1570 else:
1573 1571 win.addstr(y, 0, line)
1574 1572 else:
1575 1573 win.addstr(y, 0, line)
1576 1574 win.noutrefresh()
1577 1575
1578 1576 def renderpatch(win, state):
1579 1577 start = state[b'modes'][MODE_PATCH][b'line_offset']
1580 1578 content = state[b'modes'][MODE_PATCH][b'patchcontents']
1581 1579 renderstring(win, state, content[start:], diffcolors=True)
1582 1580
1583 1581 def layout(mode):
1584 1582 maxy, maxx = stdscr.getmaxyx()
1585 1583 helplen = len(helplines(mode))
1586 1584 mainlen = maxy - helplen - 12
1587 1585 if mainlen < 1:
1588 1586 raise error.Abort(
1589 1587 _(b"terminal dimensions %d by %d too small for curses histedit")
1590 1588 % (maxy, maxx),
1591 1589 hint=_(
1592 1590 b"enlarge your terminal or use --config ui.interface=text"
1593 1591 ),
1594 1592 )
1595 1593 return {
1596 1594 b'commit': (12, maxx),
1597 1595 b'help': (helplen, maxx),
1598 1596 b'main': (mainlen, maxx),
1599 1597 }
1600 1598
1601 1599 def drawvertwin(size, y, x):
1602 1600 win = curses.newwin(size[0], size[1], y, x)
1603 1601 y += size[0]
1604 1602 return win, y, x
1605 1603
1606 1604 state = {
1607 1605 b'pos': 0,
1608 1606 b'rules': rules,
1609 1607 b'selected': None,
1610 1608 b'mode': (MODE_INIT, MODE_INIT),
1611 1609 b'page_height': None,
1612 1610 b'modes': {
1613 1611 MODE_RULES: {
1614 1612 b'line_offset': 0,
1615 1613 },
1616 1614 MODE_PATCH: {
1617 1615 b'line_offset': 0,
1618 1616 },
1619 1617 },
1620 1618 b'repo': repo,
1621 1619 }
1622 1620
1623 1621 # eventloop
1624 1622 ch = None
1625 1623 stdscr.clear()
1626 1624 stdscr.refresh()
1627 1625 while True:
1628 1626 oldmode, unused = state[b'mode']
1629 1627 if oldmode == MODE_INIT:
1630 1628 changemode(state, MODE_RULES)
1631 1629 e = event(state, ch)
1632 1630
1633 1631 if e == E_QUIT:
1634 1632 return False
1635 1633 if e == E_HISTEDIT:
1636 1634 return state[b'rules']
1637 1635 else:
1638 1636 if e == E_RESIZE:
1639 1637 size = screen_size()
1640 1638 if size != stdscr.getmaxyx():
1641 1639 curses.resizeterm(*size)
1642 1640
1643 1641 curmode, unused = state[b'mode']
1644 1642 sizes = layout(curmode)
1645 1643 if curmode != oldmode:
1646 1644 state[b'page_height'] = sizes[b'main'][0]
1647 1645 # Adjust the view to fit the current screen size.
1648 1646 movecursor(state, state[b'pos'], state[b'pos'])
1649 1647
1650 1648 # Pack the windows against the top, each pane spread across the
1651 1649 # full width of the screen.
1652 1650 y, x = (0, 0)
1653 1651 helpwin, y, x = drawvertwin(sizes[b'help'], y, x)
1654 1652 mainwin, y, x = drawvertwin(sizes[b'main'], y, x)
1655 1653 commitwin, y, x = drawvertwin(sizes[b'commit'], y, x)
1656 1654
1657 1655 if e in (E_PAGEDOWN, E_PAGEUP, E_LINEDOWN, E_LINEUP):
1658 1656 if e == E_PAGEDOWN:
1659 1657 changeview(state, +1, b'page')
1660 1658 elif e == E_PAGEUP:
1661 1659 changeview(state, -1, b'page')
1662 1660 elif e == E_LINEDOWN:
1663 1661 changeview(state, +1, b'line')
1664 1662 elif e == E_LINEUP:
1665 1663 changeview(state, -1, b'line')
1666 1664
1667 1665 # start rendering
1668 1666 commitwin.erase()
1669 1667 helpwin.erase()
1670 1668 mainwin.erase()
1671 1669 if curmode == MODE_PATCH:
1672 1670 renderpatch(mainwin, state)
1673 1671 elif curmode == MODE_HELP:
1674 1672 renderstring(mainwin, state, __doc__.strip().splitlines())
1675 1673 else:
1676 1674 renderrules(mainwin, state)
1677 1675 rendercommit(commitwin, state)
1678 1676 renderhelp(helpwin, state)
1679 1677 curses.doupdate()
1680 1678 # done rendering
1681 1679 ch = encoding.strtolocal(stdscr.getkey())
1682 1680
1683 1681
1684 1682 def _chistedit(ui, repo, freeargs, opts):
1685 1683 """interactively edit changeset history via a curses interface
1686 1684
1687 1685 Provides a ncurses interface to histedit. Press ? in chistedit mode
1688 1686 to see an extensive help. Requires python-curses to be installed."""
1689 1687
1690 1688 if curses is None:
1691 1689 raise error.Abort(_(b"Python curses library required"))
1692 1690
1693 1691 # disable color
1694 1692 ui._colormode = None
1695 1693
1696 1694 try:
1697 1695 keep = opts.get(b'keep')
1698 1696 revs = opts.get(b'rev', [])[:]
1699 1697 cmdutil.checkunfinished(repo)
1700 1698 cmdutil.bailifchanged(repo)
1701 1699
1702 1700 if os.path.exists(os.path.join(repo.path, b'histedit-state')):
1703 1701 raise error.Abort(
1704 1702 _(
1705 1703 b'history edit already in progress, try '
1706 1704 b'--continue or --abort'
1707 1705 )
1708 1706 )
1709 1707 revs.extend(freeargs)
1710 1708 if not revs:
1711 1709 defaultrev = destutil.desthistedit(ui, repo)
1712 1710 if defaultrev is not None:
1713 1711 revs.append(defaultrev)
1714 1712 if len(revs) != 1:
1715 1713 raise error.Abort(
1716 1714 _(b'histedit requires exactly one ancestor revision')
1717 1715 )
1718 1716
1719 1717 rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs)))
1720 1718 if len(rr) != 1:
1721 1719 raise error.Abort(
1722 1720 _(
1723 1721 b'The specified revisions must have '
1724 1722 b'exactly one common root'
1725 1723 )
1726 1724 )
1727 1725 root = rr[0].node()
1728 1726
1729 1727 topmost = repo.dirstate.p1()
1730 1728 revs = between(repo, root, topmost, keep)
1731 1729 if not revs:
1732 1730 raise error.Abort(
1733 1731 _(b'%s is not an ancestor of working directory') % short(root)
1734 1732 )
1735 1733
1736 1734 ctxs = []
1737 1735 for i, r in enumerate(revs):
1738 1736 ctxs.append(histeditrule(ui, repo[r], i))
1739 1737 with util.with_lc_ctype():
1740 1738 rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs))
1741 1739 curses.echo()
1742 1740 curses.endwin()
1743 1741 if rc is False:
1744 1742 ui.write(_(b"histedit aborted\n"))
1745 1743 return 0
1746 1744 if type(rc) is list:
1747 1745 ui.status(_(b"performing changes\n"))
1748 1746 rules = makecommands(rc)
1749 1747 with repo.vfs(b'chistedit', b'w+') as fp:
1750 1748 for r in rules:
1751 1749 fp.write(r)
1752 1750 opts[b'commands'] = fp.name
1753 1751 return _texthistedit(ui, repo, freeargs, opts)
1754 1752 except KeyboardInterrupt:
1755 1753 pass
1756 1754 return -1
1757 1755
1758 1756
1759 1757 @command(
1760 1758 b'histedit',
1761 1759 [
1762 1760 (
1763 1761 b'',
1764 1762 b'commands',
1765 1763 b'',
1766 1764 _(b'read history edits from the specified file'),
1767 1765 _(b'FILE'),
1768 1766 ),
1769 1767 (b'c', b'continue', False, _(b'continue an edit already in progress')),
1770 1768 (b'', b'edit-plan', False, _(b'edit remaining actions list')),
1771 1769 (
1772 1770 b'k',
1773 1771 b'keep',
1774 1772 False,
1775 1773 _(b"don't strip old nodes after edit is complete"),
1776 1774 ),
1777 1775 (b'', b'abort', False, _(b'abort an edit in progress')),
1778 1776 (b'o', b'outgoing', False, _(b'changesets not found in destination')),
1779 1777 (
1780 1778 b'f',
1781 1779 b'force',
1782 1780 False,
1783 1781 _(b'force outgoing even for unrelated repositories'),
1784 1782 ),
1785 1783 (b'r', b'rev', [], _(b'first revision to be edited'), _(b'REV')),
1786 1784 ]
1787 1785 + cmdutil.formatteropts,
1788 1786 _(b"[OPTIONS] ([ANCESTOR] | --outgoing [URL])"),
1789 1787 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
1790 1788 )
1791 1789 def histedit(ui, repo, *freeargs, **opts):
1792 1790 """interactively edit changeset history
1793 1791
1794 1792 This command lets you edit a linear series of changesets (up to
1795 1793 and including the working directory, which should be clean).
1796 1794 You can:
1797 1795
1798 1796 - `pick` to [re]order a changeset
1799 1797
1800 1798 - `drop` to omit changeset
1801 1799
1802 1800 - `mess` to reword the changeset commit message
1803 1801
1804 1802 - `fold` to combine it with the preceding changeset (using the later date)
1805 1803
1806 1804 - `roll` like fold, but discarding this commit's description and date
1807 1805
1808 1806 - `edit` to edit this changeset (preserving date)
1809 1807
1810 1808 - `base` to checkout changeset and apply further changesets from there
1811 1809
1812 1810 There are a number of ways to select the root changeset:
1813 1811
1814 1812 - Specify ANCESTOR directly
1815 1813
1816 1814 - Use --outgoing -- it will be the first linear changeset not
1817 1815 included in destination. (See :hg:`help config.paths.default-push`)
1818 1816
1819 1817 - Otherwise, the value from the "histedit.defaultrev" config option
1820 1818 is used as a revset to select the base revision when ANCESTOR is not
1821 1819 specified. The first revision returned by the revset is used. By
1822 1820 default, this selects the editable history that is unique to the
1823 1821 ancestry of the working directory.
1824 1822
1825 1823 .. container:: verbose
1826 1824
1827 1825 If you use --outgoing, this command will abort if there are ambiguous
1828 1826 outgoing revisions. For example, if there are multiple branches
1829 1827 containing outgoing revisions.
1830 1828
1831 1829 Use "min(outgoing() and ::.)" or similar revset specification
1832 1830 instead of --outgoing to specify edit target revision exactly in
1833 1831 such ambiguous situation. See :hg:`help revsets` for detail about
1834 1832 selecting revisions.
1835 1833
1836 1834 .. container:: verbose
1837 1835
1838 1836 Examples:
1839 1837
1840 1838 - A number of changes have been made.
1841 1839 Revision 3 is no longer needed.
1842 1840
1843 1841 Start history editing from revision 3::
1844 1842
1845 1843 hg histedit -r 3
1846 1844
1847 1845 An editor opens, containing the list of revisions,
1848 1846 with specific actions specified::
1849 1847
1850 1848 pick 5339bf82f0ca 3 Zworgle the foobar
1851 1849 pick 8ef592ce7cc4 4 Bedazzle the zerlog
1852 1850 pick 0a9639fcda9d 5 Morgify the cromulancy
1853 1851
1854 1852 Additional information about the possible actions
1855 1853 to take appears below the list of revisions.
1856 1854
1857 1855 To remove revision 3 from the history,
1858 1856 its action (at the beginning of the relevant line)
1859 1857 is changed to 'drop'::
1860 1858
1861 1859 drop 5339bf82f0ca 3 Zworgle the foobar
1862 1860 pick 8ef592ce7cc4 4 Bedazzle the zerlog
1863 1861 pick 0a9639fcda9d 5 Morgify the cromulancy
1864 1862
1865 1863 - A number of changes have been made.
1866 1864 Revision 2 and 4 need to be swapped.
1867 1865
1868 1866 Start history editing from revision 2::
1869 1867
1870 1868 hg histedit -r 2
1871 1869
1872 1870 An editor opens, containing the list of revisions,
1873 1871 with specific actions specified::
1874 1872
1875 1873 pick 252a1af424ad 2 Blorb a morgwazzle
1876 1874 pick 5339bf82f0ca 3 Zworgle the foobar
1877 1875 pick 8ef592ce7cc4 4 Bedazzle the zerlog
1878 1876
1879 1877 To swap revision 2 and 4, its lines are swapped
1880 1878 in the editor::
1881 1879
1882 1880 pick 8ef592ce7cc4 4 Bedazzle the zerlog
1883 1881 pick 5339bf82f0ca 3 Zworgle the foobar
1884 1882 pick 252a1af424ad 2 Blorb a morgwazzle
1885 1883
1886 1884 Returns 0 on success, 1 if user intervention is required (not only
1887 1885 for intentional "edit" command, but also for resolving unexpected
1888 1886 conflicts).
1889 1887 """
1890 1888 opts = pycompat.byteskwargs(opts)
1891 1889
1892 1890 # kludge: _chistedit only works for starting an edit, not aborting
1893 1891 # or continuing, so fall back to regular _texthistedit for those
1894 1892 # operations.
1895 1893 if ui.interface(b'histedit') == b'curses' and _getgoal(opts) == goalnew:
1896 1894 return _chistedit(ui, repo, freeargs, opts)
1897 1895 return _texthistedit(ui, repo, freeargs, opts)
1898 1896
1899 1897
1900 1898 def _texthistedit(ui, repo, freeargs, opts):
1901 1899 state = histeditstate(repo)
1902 1900 with repo.wlock() as wlock, repo.lock() as lock:
1903 1901 state.wlock = wlock
1904 1902 state.lock = lock
1905 1903 _histedit(ui, repo, state, freeargs, opts)
1906 1904
1907 1905
1908 1906 goalcontinue = b'continue'
1909 1907 goalabort = b'abort'
1910 1908 goaleditplan = b'edit-plan'
1911 1909 goalnew = b'new'
1912 1910
1913 1911
1914 1912 def _getgoal(opts):
1915 1913 if opts.get(b'continue'):
1916 1914 return goalcontinue
1917 1915 if opts.get(b'abort'):
1918 1916 return goalabort
1919 1917 if opts.get(b'edit_plan'):
1920 1918 return goaleditplan
1921 1919 return goalnew
1922 1920
1923 1921
1924 1922 def _readfile(ui, path):
1925 1923 if path == b'-':
1926 1924 with ui.timeblockedsection(b'histedit'):
1927 1925 return ui.fin.read()
1928 1926 else:
1929 1927 with open(path, b'rb') as f:
1930 1928 return f.read()
1931 1929
1932 1930
1933 1931 def _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs):
1934 1932 # TODO only abort if we try to histedit mq patches, not just
1935 1933 # blanket if mq patches are applied somewhere
1936 1934 mq = getattr(repo, 'mq', None)
1937 1935 if mq and mq.applied:
1938 1936 raise error.Abort(_(b'source has mq patches applied'))
1939 1937
1940 1938 # basic argument incompatibility processing
1941 1939 outg = opts.get(b'outgoing')
1942 1940 editplan = opts.get(b'edit_plan')
1943 1941 abort = opts.get(b'abort')
1944 1942 force = opts.get(b'force')
1945 1943 if force and not outg:
1946 1944 raise error.Abort(_(b'--force only allowed with --outgoing'))
1947 1945 if goal == b'continue':
1948 1946 if any((outg, abort, revs, freeargs, rules, editplan)):
1949 1947 raise error.Abort(_(b'no arguments allowed with --continue'))
1950 1948 elif goal == b'abort':
1951 1949 if any((outg, revs, freeargs, rules, editplan)):
1952 1950 raise error.Abort(_(b'no arguments allowed with --abort'))
1953 1951 elif goal == b'edit-plan':
1954 1952 if any((outg, revs, freeargs)):
1955 1953 raise error.Abort(
1956 1954 _(b'only --commands argument allowed with --edit-plan')
1957 1955 )
1958 1956 else:
1959 1957 if state.inprogress():
1960 1958 raise error.Abort(
1961 1959 _(
1962 1960 b'history edit already in progress, try '
1963 1961 b'--continue or --abort'
1964 1962 )
1965 1963 )
1966 1964 if outg:
1967 1965 if revs:
1968 1966 raise error.Abort(_(b'no revisions allowed with --outgoing'))
1969 1967 if len(freeargs) > 1:
1970 1968 raise error.Abort(
1971 1969 _(b'only one repo argument allowed with --outgoing')
1972 1970 )
1973 1971 else:
1974 1972 revs.extend(freeargs)
1975 1973 if len(revs) == 0:
1976 1974 defaultrev = destutil.desthistedit(ui, repo)
1977 1975 if defaultrev is not None:
1978 1976 revs.append(defaultrev)
1979 1977
1980 1978 if len(revs) != 1:
1981 1979 raise error.Abort(
1982 1980 _(b'histedit requires exactly one ancestor revision')
1983 1981 )
1984 1982
1985 1983
1986 1984 def _histedit(ui, repo, state, freeargs, opts):
1987 1985 fm = ui.formatter(b'histedit', opts)
1988 1986 fm.startitem()
1989 1987 goal = _getgoal(opts)
1990 1988 revs = opts.get(b'rev', [])
1991 1989 nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
1992 1990 rules = opts.get(b'commands', b'')
1993 1991 state.keep = opts.get(b'keep', False)
1994 1992
1995 1993 _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs)
1996 1994
1997 1995 hastags = False
1998 1996 if revs:
1999 1997 revs = scmutil.revrange(repo, revs)
2000 1998 ctxs = [repo[rev] for rev in revs]
2001 1999 for ctx in ctxs:
2002 2000 tags = [tag for tag in ctx.tags() if tag != b'tip']
2003 2001 if not hastags:
2004 2002 hastags = len(tags)
2005 2003 if hastags:
2006 2004 if ui.promptchoice(
2007 2005 _(
2008 2006 b'warning: tags associated with the given'
2009 2007 b' changeset will be lost after histedit.\n'
2010 2008 b'do you want to continue (yN)? $$ &Yes $$ &No'
2011 2009 ),
2012 2010 default=1,
2013 2011 ):
2014 2012 raise error.Abort(_(b'histedit cancelled\n'))
2015 2013 # rebuild state
2016 2014 if goal == goalcontinue:
2017 2015 state.read()
2018 2016 state = bootstrapcontinue(ui, state, opts)
2019 2017 elif goal == goaleditplan:
2020 2018 _edithisteditplan(ui, repo, state, rules)
2021 2019 return
2022 2020 elif goal == goalabort:
2023 2021 _aborthistedit(ui, repo, state, nobackup=nobackup)
2024 2022 return
2025 2023 else:
2026 2024 # goal == goalnew
2027 2025 _newhistedit(ui, repo, state, revs, freeargs, opts)
2028 2026
2029 2027 _continuehistedit(ui, repo, state)
2030 2028 _finishhistedit(ui, repo, state, fm)
2031 2029 fm.end()
2032 2030
2033 2031
2034 2032 def _continuehistedit(ui, repo, state):
2035 2033 """This function runs after either:
2036 2034 - bootstrapcontinue (if the goal is 'continue')
2037 2035 - _newhistedit (if the goal is 'new')
2038 2036 """
2039 2037 # preprocess rules so that we can hide inner folds from the user
2040 2038 # and only show one editor
2041 2039 actions = state.actions[:]
2042 2040 for idx, (action, nextact) in enumerate(zip(actions, actions[1:] + [None])):
2043 2041 if action.verb == b'fold' and nextact and nextact.verb == b'fold':
2044 2042 state.actions[idx].__class__ = _multifold
2045 2043
2046 2044 # Force an initial state file write, so the user can run --abort/continue
2047 2045 # even if there's an exception before the first transaction serialize.
2048 2046 state.write()
2049 2047
2050 2048 tr = None
2051 2049 # Don't use singletransaction by default since it rolls the entire
2052 2050 # transaction back if an unexpected exception happens (like a
2053 2051 # pretxncommit hook throws, or the user aborts the commit msg editor).
2054 2052 if ui.configbool(b"histedit", b"singletransaction"):
2055 2053 # Don't use a 'with' for the transaction, since actions may close
2056 2054 # and reopen a transaction. For example, if the action executes an
2057 2055 # external process it may choose to commit the transaction first.
2058 2056 tr = repo.transaction(b'histedit')
2059 2057 progress = ui.makeprogress(
2060 2058 _(b"editing"), unit=_(b'changes'), total=len(state.actions)
2061 2059 )
2062 2060 with progress, util.acceptintervention(tr):
2063 2061 while state.actions:
2064 2062 state.write(tr=tr)
2065 2063 actobj = state.actions[0]
2066 2064 progress.increment(item=actobj.torule())
2067 2065 ui.debug(
2068 2066 b'histedit: processing %s %s\n' % (actobj.verb, actobj.torule())
2069 2067 )
2070 2068 parentctx, replacement_ = actobj.run()
2071 2069 state.parentctxnode = parentctx.node()
2072 2070 state.replacements.extend(replacement_)
2073 2071 state.actions.pop(0)
2074 2072
2075 2073 state.write()
2076 2074
2077 2075
2078 2076 def _finishhistedit(ui, repo, state, fm):
2079 2077 """This action runs when histedit is finishing its session"""
2080 2078 mergemod.update(repo[state.parentctxnode])
2081 2079
2082 2080 mapping, tmpnodes, created, ntm = processreplacement(state)
2083 2081 if mapping:
2084 2082 for prec, succs in pycompat.iteritems(mapping):
2085 2083 if not succs:
2086 2084 ui.debug(b'histedit: %s is dropped\n' % short(prec))
2087 2085 else:
2088 2086 ui.debug(
2089 2087 b'histedit: %s is replaced by %s\n'
2090 2088 % (short(prec), short(succs[0]))
2091 2089 )
2092 2090 if len(succs) > 1:
2093 2091 m = b'histedit: %s'
2094 2092 for n in succs[1:]:
2095 2093 ui.debug(m % short(n))
2096 2094
2097 2095 if not state.keep:
2098 2096 if mapping:
2099 2097 movetopmostbookmarks(repo, state.topmost, ntm)
2100 2098 # TODO update mq state
2101 2099 else:
2102 2100 mapping = {}
2103 2101
2104 2102 for n in tmpnodes:
2105 2103 if n in repo:
2106 2104 mapping[n] = ()
2107 2105
2108 2106 # remove entries about unknown nodes
2109 2107 has_node = repo.unfiltered().changelog.index.has_node
2110 2108 mapping = {
2111 2109 k: v
2112 2110 for k, v in mapping.items()
2113 2111 if has_node(k) and all(has_node(n) for n in v)
2114 2112 }
2115 2113 scmutil.cleanupnodes(repo, mapping, b'histedit')
2116 2114 hf = fm.hexfunc
2117 2115 fl = fm.formatlist
2118 2116 fd = fm.formatdict
2119 2117 nodechanges = fd(
2120 2118 {
2121 2119 hf(oldn): fl([hf(n) for n in newn], name=b'node')
2122 2120 for oldn, newn in pycompat.iteritems(mapping)
2123 2121 },
2124 2122 key=b"oldnode",
2125 2123 value=b"newnodes",
2126 2124 )
2127 2125 fm.data(nodechanges=nodechanges)
2128 2126
2129 2127 state.clear()
2130 2128 if os.path.exists(repo.sjoin(b'undo')):
2131 2129 os.unlink(repo.sjoin(b'undo'))
2132 2130 if repo.vfs.exists(b'histedit-last-edit.txt'):
2133 2131 repo.vfs.unlink(b'histedit-last-edit.txt')
2134 2132
2135 2133
2136 2134 def _aborthistedit(ui, repo, state, nobackup=False):
2137 2135 try:
2138 2136 state.read()
2139 2137 __, leafs, tmpnodes, __ = processreplacement(state)
2140 2138 ui.debug(b'restore wc to old parent %s\n' % short(state.topmost))
2141 2139
2142 2140 # Recover our old commits if necessary
2143 2141 if not state.topmost in repo and state.backupfile:
2144 2142 backupfile = repo.vfs.join(state.backupfile)
2145 2143 f = hg.openpath(ui, backupfile)
2146 2144 gen = exchange.readbundle(ui, f, backupfile)
2147 2145 with repo.transaction(b'histedit.abort') as tr:
2148 2146 bundle2.applybundle(
2149 2147 repo,
2150 2148 gen,
2151 2149 tr,
2152 2150 source=b'histedit',
2153 2151 url=b'bundle:' + backupfile,
2154 2152 )
2155 2153
2156 2154 os.remove(backupfile)
2157 2155
2158 2156 # check whether we should update away
2159 2157 if repo.unfiltered().revs(
2160 2158 b'parents() and (%n or %ln::)',
2161 2159 state.parentctxnode,
2162 2160 leafs | tmpnodes,
2163 2161 ):
2164 2162 hg.clean(repo, state.topmost, show_stats=True, quietempty=True)
2165 2163 cleanupnode(ui, repo, tmpnodes, nobackup=nobackup)
2166 2164 cleanupnode(ui, repo, leafs, nobackup=nobackup)
2167 2165 except Exception:
2168 2166 if state.inprogress():
2169 2167 ui.warn(
2170 2168 _(
2171 2169 b'warning: encountered an exception during histedit '
2172 2170 b'--abort; the repository may not have been completely '
2173 2171 b'cleaned up\n'
2174 2172 )
2175 2173 )
2176 2174 raise
2177 2175 finally:
2178 2176 state.clear()
2179 2177
2180 2178
2181 2179 def hgaborthistedit(ui, repo):
2182 2180 state = histeditstate(repo)
2183 2181 nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
2184 2182 with repo.wlock() as wlock, repo.lock() as lock:
2185 2183 state.wlock = wlock
2186 2184 state.lock = lock
2187 2185 _aborthistedit(ui, repo, state, nobackup=nobackup)
2188 2186
2189 2187
2190 2188 def _edithisteditplan(ui, repo, state, rules):
2191 2189 state.read()
2192 2190 if not rules:
2193 2191 comment = geteditcomment(
2194 2192 ui, short(state.parentctxnode), short(state.topmost)
2195 2193 )
2196 2194 rules = ruleeditor(repo, ui, state.actions, comment)
2197 2195 else:
2198 2196 rules = _readfile(ui, rules)
2199 2197 actions = parserules(rules, state)
2200 2198 ctxs = [repo[act.node] for act in state.actions if act.node]
2201 2199 warnverifyactions(ui, repo, actions, state, ctxs)
2202 2200 state.actions = actions
2203 2201 state.write()
2204 2202
2205 2203
2206 2204 def _newhistedit(ui, repo, state, revs, freeargs, opts):
2207 2205 outg = opts.get(b'outgoing')
2208 2206 rules = opts.get(b'commands', b'')
2209 2207 force = opts.get(b'force')
2210 2208
2211 2209 cmdutil.checkunfinished(repo)
2212 2210 cmdutil.bailifchanged(repo)
2213 2211
2214 2212 topmost = repo.dirstate.p1()
2215 2213 if outg:
2216 2214 if freeargs:
2217 2215 remote = freeargs[0]
2218 2216 else:
2219 2217 remote = None
2220 2218 root = findoutgoing(ui, repo, remote, force, opts)
2221 2219 else:
2222 2220 rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs)))
2223 2221 if len(rr) != 1:
2224 2222 raise error.Abort(
2225 2223 _(
2226 2224 b'The specified revisions must have '
2227 2225 b'exactly one common root'
2228 2226 )
2229 2227 )
2230 2228 root = rr[0].node()
2231 2229
2232 2230 revs = between(repo, root, topmost, state.keep)
2233 2231 if not revs:
2234 2232 raise error.Abort(
2235 2233 _(b'%s is not an ancestor of working directory') % short(root)
2236 2234 )
2237 2235
2238 2236 ctxs = [repo[r] for r in revs]
2239 2237
2240 2238 wctx = repo[None]
2241 2239 # Please don't ask me why `ancestors` is this value. I figured it
2242 2240 # out with print-debugging, not by actually understanding what the
2243 2241 # merge code is doing. :(
2244 2242 ancs = [repo[b'.']]
2245 2243 # Sniff-test to make sure we won't collide with untracked files in
2246 2244 # the working directory. If we don't do this, we can get a
2247 2245 # collision after we've started histedit and backing out gets ugly
2248 2246 # for everyone, especially the user.
2249 2247 for c in [ctxs[0].p1()] + ctxs:
2250 2248 try:
2251 2249 mergemod.calculateupdates(
2252 2250 repo,
2253 2251 wctx,
2254 2252 c,
2255 2253 ancs,
2256 2254 # These parameters were determined by print-debugging
2257 2255 # what happens later on inside histedit.
2258 2256 branchmerge=False,
2259 2257 force=False,
2260 2258 acceptremote=False,
2261 2259 followcopies=False,
2262 2260 )
2263 2261 except error.Abort:
2264 2262 raise error.Abort(
2265 2263 _(
2266 2264 b"untracked files in working directory conflict with files in %s"
2267 2265 )
2268 2266 % c
2269 2267 )
2270 2268
2271 2269 if not rules:
2272 2270 comment = geteditcomment(ui, short(root), short(topmost))
2273 2271 actions = [pick(state, r) for r in revs]
2274 2272 rules = ruleeditor(repo, ui, actions, comment)
2275 2273 else:
2276 2274 rules = _readfile(ui, rules)
2277 2275 actions = parserules(rules, state)
2278 2276 warnverifyactions(ui, repo, actions, state, ctxs)
2279 2277
2280 2278 parentctxnode = repo[root].p1().node()
2281 2279
2282 2280 state.parentctxnode = parentctxnode
2283 2281 state.actions = actions
2284 2282 state.topmost = topmost
2285 2283 state.replacements = []
2286 2284
2287 2285 ui.log(
2288 2286 b"histedit",
2289 2287 b"%d actions to histedit\n",
2290 2288 len(actions),
2291 2289 histedit_num_actions=len(actions),
2292 2290 )
2293 2291
2294 2292 # Create a backup so we can always abort completely.
2295 2293 backupfile = None
2296 2294 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2297 2295 backupfile = repair.backupbundle(
2298 2296 repo, [parentctxnode], [topmost], root, b'histedit'
2299 2297 )
2300 2298 state.backupfile = backupfile
2301 2299
2302 2300
2303 2301 def _getsummary(ctx):
2304 2302 # a common pattern is to extract the summary but default to the empty
2305 2303 # string
2306 2304 summary = ctx.description() or b''
2307 2305 if summary:
2308 2306 summary = summary.splitlines()[0]
2309 2307 return summary
2310 2308
2311 2309
2312 2310 def bootstrapcontinue(ui, state, opts):
2313 2311 repo = state.repo
2314 2312
2315 2313 ms = mergestatemod.mergestate.read(repo)
2316 2314 mergeutil.checkunresolved(ms)
2317 2315
2318 2316 if state.actions:
2319 2317 actobj = state.actions.pop(0)
2320 2318
2321 2319 if _isdirtywc(repo):
2322 2320 actobj.continuedirty()
2323 2321 if _isdirtywc(repo):
2324 2322 abortdirty()
2325 2323
2326 2324 parentctx, replacements = actobj.continueclean()
2327 2325
2328 2326 state.parentctxnode = parentctx.node()
2329 2327 state.replacements.extend(replacements)
2330 2328
2331 2329 return state
2332 2330
2333 2331
2334 2332 def between(repo, old, new, keep):
2335 2333 """select and validate the set of revision to edit
2336 2334
2337 2335 When keep is false, the specified set can't have children."""
2338 2336 revs = repo.revs(b'%n::%n', old, new)
2339 2337 if revs and not keep:
2340 2338 rewriteutil.precheck(repo, revs, b'edit')
2341 2339 if repo.revs(b'(%ld) and merge()', revs):
2342 2340 raise error.Abort(_(b'cannot edit history that contains merges'))
2343 2341 return pycompat.maplist(repo.changelog.node, revs)
2344 2342
2345 2343
2346 2344 def ruleeditor(repo, ui, actions, editcomment=b""):
2347 2345 """open an editor to edit rules
2348 2346
2349 2347 rules are in the format [ [act, ctx], ...] like in state.rules
2350 2348 """
2351 2349 if repo.ui.configbool(b"experimental", b"histedit.autoverb"):
2352 2350 newact = util.sortdict()
2353 2351 for act in actions:
2354 2352 ctx = repo[act.node]
2355 2353 summary = _getsummary(ctx)
2356 2354 fword = summary.split(b' ', 1)[0].lower()
2357 2355 added = False
2358 2356
2359 2357 # if it doesn't end with the special character '!' just skip this
2360 2358 if fword.endswith(b'!'):
2361 2359 fword = fword[:-1]
2362 2360 if fword in primaryactions | secondaryactions | tertiaryactions:
2363 2361 act.verb = fword
2364 2362 # get the target summary
2365 2363 tsum = summary[len(fword) + 1 :].lstrip()
2366 2364 # safe but slow: reverse iterate over the actions so we
2367 2365 # don't clash on two commits having the same summary
2368 2366 for na, l in reversed(list(pycompat.iteritems(newact))):
2369 2367 actx = repo[na.node]
2370 2368 asum = _getsummary(actx)
2371 2369 if asum == tsum:
2372 2370 added = True
2373 2371 l.append(act)
2374 2372 break
2375 2373
2376 2374 if not added:
2377 2375 newact[act] = []
2378 2376
2379 2377 # copy over and flatten the new list
2380 2378 actions = []
2381 2379 for na, l in pycompat.iteritems(newact):
2382 2380 actions.append(na)
2383 2381 actions += l
2384 2382
2385 2383 rules = b'\n'.join([act.torule() for act in actions])
2386 2384 rules += b'\n\n'
2387 2385 rules += editcomment
2388 2386 rules = ui.edit(
2389 2387 rules,
2390 2388 ui.username(),
2391 2389 {b'prefix': b'histedit'},
2392 2390 repopath=repo.path,
2393 2391 action=b'histedit',
2394 2392 )
2395 2393
2396 2394 # Save edit rules in .hg/histedit-last-edit.txt in case
2397 2395 # the user needs to ask for help after something
2398 2396 # surprising happens.
2399 2397 with repo.vfs(b'histedit-last-edit.txt', b'wb') as f:
2400 2398 f.write(rules)
2401 2399
2402 2400 return rules
2403 2401
2404 2402
2405 2403 def parserules(rules, state):
2406 2404 """Read the histedit rules string and return list of action objects"""
2407 2405 rules = [
2408 2406 l
2409 2407 for l in (r.strip() for r in rules.splitlines())
2410 2408 if l and not l.startswith(b'#')
2411 2409 ]
2412 2410 actions = []
2413 2411 for r in rules:
2414 2412 if b' ' not in r:
2415 2413 raise error.ParseError(_(b'malformed line "%s"') % r)
2416 2414 verb, rest = r.split(b' ', 1)
2417 2415
2418 2416 if verb not in actiontable:
2419 2417 raise error.ParseError(_(b'unknown action "%s"') % verb)
2420 2418
2421 2419 action = actiontable[verb].fromrule(state, rest)
2422 2420 actions.append(action)
2423 2421 return actions
2424 2422
2425 2423
2426 2424 def warnverifyactions(ui, repo, actions, state, ctxs):
2427 2425 try:
2428 2426 verifyactions(actions, state, ctxs)
2429 2427 except error.ParseError:
2430 2428 if repo.vfs.exists(b'histedit-last-edit.txt'):
2431 2429 ui.warn(
2432 2430 _(
2433 2431 b'warning: histedit rules saved '
2434 2432 b'to: .hg/histedit-last-edit.txt\n'
2435 2433 )
2436 2434 )
2437 2435 raise
2438 2436
2439 2437
2440 2438 def verifyactions(actions, state, ctxs):
2441 2439 """Verify that there exists exactly one action per given changeset and
2442 2440 other constraints.
2443 2441
2444 2442 Will abort if there are to many or too few rules, a malformed rule,
2445 2443 or a rule on a changeset outside of the user-given range.
2446 2444 """
2447 2445 expected = {c.node() for c in ctxs}
2448 2446 seen = set()
2449 2447 prev = None
2450 2448
2451 2449 if actions and actions[0].verb in [b'roll', b'fold']:
2452 2450 raise error.ParseError(
2453 2451 _(b'first changeset cannot use verb "%s"') % actions[0].verb
2454 2452 )
2455 2453
2456 2454 for action in actions:
2457 2455 action.verify(prev, expected, seen)
2458 2456 prev = action
2459 2457 if action.node is not None:
2460 2458 seen.add(action.node)
2461 2459 missing = sorted(expected - seen) # sort to stabilize output
2462 2460
2463 2461 if state.repo.ui.configbool(b'histedit', b'dropmissing'):
2464 2462 if len(actions) == 0:
2465 2463 raise error.ParseError(
2466 2464 _(b'no rules provided'),
2467 2465 hint=_(b'use strip extension to remove commits'),
2468 2466 )
2469 2467
2470 2468 drops = [drop(state, n) for n in missing]
2471 2469 # put the in the beginning so they execute immediately and
2472 2470 # don't show in the edit-plan in the future
2473 2471 actions[:0] = drops
2474 2472 elif missing:
2475 2473 raise error.ParseError(
2476 2474 _(b'missing rules for changeset %s') % short(missing[0]),
2477 2475 hint=_(
2478 2476 b'use "drop %s" to discard, see also: '
2479 2477 b"'hg help -e histedit.config'"
2480 2478 )
2481 2479 % short(missing[0]),
2482 2480 )
2483 2481
2484 2482
2485 2483 def adjustreplacementsfrommarkers(repo, oldreplacements):
2486 2484 """Adjust replacements from obsolescence markers
2487 2485
2488 2486 Replacements structure is originally generated based on
2489 2487 histedit's state and does not account for changes that are
2490 2488 not recorded there. This function fixes that by adding
2491 2489 data read from obsolescence markers"""
2492 2490 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2493 2491 return oldreplacements
2494 2492
2495 2493 unfi = repo.unfiltered()
2496 2494 get_rev = unfi.changelog.index.get_rev
2497 2495 obsstore = repo.obsstore
2498 2496 newreplacements = list(oldreplacements)
2499 2497 oldsuccs = [r[1] for r in oldreplacements]
2500 2498 # successors that have already been added to succstocheck once
2501 2499 seensuccs = set().union(
2502 2500 *oldsuccs
2503 2501 ) # create a set from an iterable of tuples
2504 2502 succstocheck = list(seensuccs)
2505 2503 while succstocheck:
2506 2504 n = succstocheck.pop()
2507 2505 missing = get_rev(n) is None
2508 2506 markers = obsstore.successors.get(n, ())
2509 2507 if missing and not markers:
2510 2508 # dead end, mark it as such
2511 2509 newreplacements.append((n, ()))
2512 2510 for marker in markers:
2513 2511 nsuccs = marker[1]
2514 2512 newreplacements.append((n, nsuccs))
2515 2513 for nsucc in nsuccs:
2516 2514 if nsucc not in seensuccs:
2517 2515 seensuccs.add(nsucc)
2518 2516 succstocheck.append(nsucc)
2519 2517
2520 2518 return newreplacements
2521 2519
2522 2520
2523 2521 def processreplacement(state):
2524 2522 """process the list of replacements to return
2525 2523
2526 2524 1) the final mapping between original and created nodes
2527 2525 2) the list of temporary node created by histedit
2528 2526 3) the list of new commit created by histedit"""
2529 2527 replacements = adjustreplacementsfrommarkers(state.repo, state.replacements)
2530 2528 allsuccs = set()
2531 2529 replaced = set()
2532 2530 fullmapping = {}
2533 2531 # initialize basic set
2534 2532 # fullmapping records all operations recorded in replacement
2535 2533 for rep in replacements:
2536 2534 allsuccs.update(rep[1])
2537 2535 replaced.add(rep[0])
2538 2536 fullmapping.setdefault(rep[0], set()).update(rep[1])
2539 2537 new = allsuccs - replaced
2540 2538 tmpnodes = allsuccs & replaced
2541 2539 # Reduce content fullmapping into direct relation between original nodes
2542 2540 # and final node created during history edition
2543 2541 # Dropped changeset are replaced by an empty list
2544 2542 toproceed = set(fullmapping)
2545 2543 final = {}
2546 2544 while toproceed:
2547 2545 for x in list(toproceed):
2548 2546 succs = fullmapping[x]
2549 2547 for s in list(succs):
2550 2548 if s in toproceed:
2551 2549 # non final node with unknown closure
2552 2550 # We can't process this now
2553 2551 break
2554 2552 elif s in final:
2555 2553 # non final node, replace with closure
2556 2554 succs.remove(s)
2557 2555 succs.update(final[s])
2558 2556 else:
2559 2557 final[x] = succs
2560 2558 toproceed.remove(x)
2561 2559 # remove tmpnodes from final mapping
2562 2560 for n in tmpnodes:
2563 2561 del final[n]
2564 2562 # we expect all changes involved in final to exist in the repo
2565 2563 # turn `final` into list (topologically sorted)
2566 2564 get_rev = state.repo.changelog.index.get_rev
2567 2565 for prec, succs in final.items():
2568 2566 final[prec] = sorted(succs, key=get_rev)
2569 2567
2570 2568 # computed topmost element (necessary for bookmark)
2571 2569 if new:
2572 2570 newtopmost = sorted(new, key=state.repo.changelog.rev)[-1]
2573 2571 elif not final:
2574 2572 # Nothing rewritten at all. we won't need `newtopmost`
2575 2573 # It is the same as `oldtopmost` and `processreplacement` know it
2576 2574 newtopmost = None
2577 2575 else:
2578 2576 # every body died. The newtopmost is the parent of the root.
2579 2577 r = state.repo.changelog.rev
2580 2578 newtopmost = state.repo[sorted(final, key=r)[0]].p1().node()
2581 2579
2582 2580 return final, tmpnodes, new, newtopmost
2583 2581
2584 2582
2585 2583 def movetopmostbookmarks(repo, oldtopmost, newtopmost):
2586 2584 """Move bookmark from oldtopmost to newly created topmost
2587 2585
2588 2586 This is arguably a feature and we may only want that for the active
2589 2587 bookmark. But the behavior is kept compatible with the old version for now.
2590 2588 """
2591 2589 if not oldtopmost or not newtopmost:
2592 2590 return
2593 2591 oldbmarks = repo.nodebookmarks(oldtopmost)
2594 2592 if oldbmarks:
2595 2593 with repo.lock(), repo.transaction(b'histedit') as tr:
2596 2594 marks = repo._bookmarks
2597 2595 changes = []
2598 2596 for name in oldbmarks:
2599 2597 changes.append((name, newtopmost))
2600 2598 marks.applychanges(repo, tr, changes)
2601 2599
2602 2600
2603 2601 def cleanupnode(ui, repo, nodes, nobackup=False):
2604 2602 """strip a group of nodes from the repository
2605 2603
2606 2604 The set of node to strip may contains unknown nodes."""
2607 2605 with repo.lock():
2608 2606 # do not let filtering get in the way of the cleanse
2609 2607 # we should probably get rid of obsolescence marker created during the
2610 2608 # histedit, but we currently do not have such information.
2611 2609 repo = repo.unfiltered()
2612 2610 # Find all nodes that need to be stripped
2613 2611 # (we use %lr instead of %ln to silently ignore unknown items)
2614 2612 has_node = repo.changelog.index.has_node
2615 2613 nodes = sorted(n for n in nodes if has_node(n))
2616 2614 roots = [c.node() for c in repo.set(b"roots(%ln)", nodes)]
2617 2615 if roots:
2618 2616 backup = not nobackup
2619 2617 repair.strip(ui, repo, roots, backup=backup)
2620 2618
2621 2619
2622 2620 def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs):
2623 2621 if isinstance(nodelist, bytes):
2624 2622 nodelist = [nodelist]
2625 2623 state = histeditstate(repo)
2626 2624 if state.inprogress():
2627 2625 state.read()
2628 2626 histedit_nodes = {
2629 2627 action.node for action in state.actions if action.node
2630 2628 }
2631 2629 common_nodes = histedit_nodes & set(nodelist)
2632 2630 if common_nodes:
2633 2631 raise error.Abort(
2634 2632 _(b"histedit in progress, can't strip %s")
2635 2633 % b', '.join(short(x) for x in common_nodes)
2636 2634 )
2637 2635 return orig(ui, repo, nodelist, *args, **kwargs)
2638 2636
2639 2637
2640 2638 extensions.wrapfunction(repair, b'strip', stripwrapper)
2641 2639
2642 2640
2643 2641 def summaryhook(ui, repo):
2644 2642 state = histeditstate(repo)
2645 2643 if not state.inprogress():
2646 2644 return
2647 2645 state.read()
2648 2646 if state.actions:
2649 2647 # i18n: column positioning for "hg summary"
2650 2648 ui.write(
2651 2649 _(b'hist: %s (histedit --continue)\n')
2652 2650 % (
2653 2651 ui.label(_(b'%d remaining'), b'histedit.remaining')
2654 2652 % len(state.actions)
2655 2653 )
2656 2654 )
2657 2655
2658 2656
2659 2657 def extsetup(ui):
2660 2658 cmdutil.summaryhooks.add(b'histedit', summaryhook)
2661 2659 statemod.addunfinished(
2662 2660 b'histedit',
2663 2661 fname=b'histedit-state',
2664 2662 allowcommit=True,
2665 2663 continueflag=True,
2666 2664 abortfunc=hgaborthistedit,
2667 2665 )
@@ -1,7962 +1,7960
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Olivia Mackall <olivia@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 nullrev,
19 19 short,
20 20 wdirrev,
21 21 )
22 22 from .pycompat import open
23 23 from . import (
24 24 archival,
25 25 bookmarks,
26 26 bundle2,
27 27 bundlecaches,
28 28 changegroup,
29 29 cmdutil,
30 30 copies,
31 31 debugcommands as debugcommandsmod,
32 32 destutil,
33 33 dirstateguard,
34 34 discovery,
35 35 encoding,
36 36 error,
37 37 exchange,
38 38 extensions,
39 39 filemerge,
40 40 formatter,
41 41 graphmod,
42 42 grep as grepmod,
43 43 hbisect,
44 44 help,
45 45 hg,
46 46 logcmdutil,
47 47 merge as mergemod,
48 48 mergestate as mergestatemod,
49 49 narrowspec,
50 50 obsolete,
51 51 obsutil,
52 52 patch,
53 53 phases,
54 54 pycompat,
55 55 rcutil,
56 56 registrar,
57 57 requirements,
58 58 revsetlang,
59 59 rewriteutil,
60 60 scmutil,
61 61 server,
62 62 shelve as shelvemod,
63 63 state as statemod,
64 64 streamclone,
65 65 tags as tagsmod,
66 66 ui as uimod,
67 67 util,
68 68 verify as verifymod,
69 69 vfs as vfsmod,
70 70 wireprotoserver,
71 71 )
72 72 from .utils import (
73 73 dateutil,
74 74 stringutil,
75 75 urlutil,
76 76 )
77 77
78 78 if pycompat.TYPE_CHECKING:
79 79 from typing import (
80 80 List,
81 81 )
82 82
83 83
84 84 table = {}
85 85 table.update(debugcommandsmod.command._table)
86 86
87 87 command = registrar.command(table)
88 88 INTENT_READONLY = registrar.INTENT_READONLY
89 89
90 90 # common command options
91 91
92 92 globalopts = [
93 93 (
94 94 b'R',
95 95 b'repository',
96 96 b'',
97 97 _(b'repository root directory or name of overlay bundle file'),
98 98 _(b'REPO'),
99 99 ),
100 100 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
101 101 (
102 102 b'y',
103 103 b'noninteractive',
104 104 None,
105 105 _(
106 106 b'do not prompt, automatically pick the first choice for all prompts'
107 107 ),
108 108 ),
109 109 (b'q', b'quiet', None, _(b'suppress output')),
110 110 (b'v', b'verbose', None, _(b'enable additional output')),
111 111 (
112 112 b'',
113 113 b'color',
114 114 b'',
115 115 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
116 116 # and should not be translated
117 117 _(b"when to colorize (boolean, always, auto, never, or debug)"),
118 118 _(b'TYPE'),
119 119 ),
120 120 (
121 121 b'',
122 122 b'config',
123 123 [],
124 124 _(b'set/override config option (use \'section.name=value\')'),
125 125 _(b'CONFIG'),
126 126 ),
127 127 (b'', b'debug', None, _(b'enable debugging output')),
128 128 (b'', b'debugger', None, _(b'start debugger')),
129 129 (
130 130 b'',
131 131 b'encoding',
132 132 encoding.encoding,
133 133 _(b'set the charset encoding'),
134 134 _(b'ENCODE'),
135 135 ),
136 136 (
137 137 b'',
138 138 b'encodingmode',
139 139 encoding.encodingmode,
140 140 _(b'set the charset encoding mode'),
141 141 _(b'MODE'),
142 142 ),
143 143 (b'', b'traceback', None, _(b'always print a traceback on exception')),
144 144 (b'', b'time', None, _(b'time how long the command takes')),
145 145 (b'', b'profile', None, _(b'print command execution profile')),
146 146 (b'', b'version', None, _(b'output version information and exit')),
147 147 (b'h', b'help', None, _(b'display help and exit')),
148 148 (b'', b'hidden', False, _(b'consider hidden changesets')),
149 149 (
150 150 b'',
151 151 b'pager',
152 152 b'auto',
153 153 _(b"when to paginate (boolean, always, auto, or never)"),
154 154 _(b'TYPE'),
155 155 ),
156 156 ]
157 157
158 158 dryrunopts = cmdutil.dryrunopts
159 159 remoteopts = cmdutil.remoteopts
160 160 walkopts = cmdutil.walkopts
161 161 commitopts = cmdutil.commitopts
162 162 commitopts2 = cmdutil.commitopts2
163 163 commitopts3 = cmdutil.commitopts3
164 164 formatteropts = cmdutil.formatteropts
165 165 templateopts = cmdutil.templateopts
166 166 logopts = cmdutil.logopts
167 167 diffopts = cmdutil.diffopts
168 168 diffwsopts = cmdutil.diffwsopts
169 169 diffopts2 = cmdutil.diffopts2
170 170 mergetoolopts = cmdutil.mergetoolopts
171 171 similarityopts = cmdutil.similarityopts
172 172 subrepoopts = cmdutil.subrepoopts
173 173 debugrevlogopts = cmdutil.debugrevlogopts
174 174
175 175 # Commands start here, listed alphabetically
176 176
177 177
178 178 @command(
179 179 b'abort',
180 180 dryrunopts,
181 181 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
182 182 helpbasic=True,
183 183 )
184 184 def abort(ui, repo, **opts):
185 185 """abort an unfinished operation (EXPERIMENTAL)
186 186
187 187 Aborts a multistep operation like graft, histedit, rebase, merge,
188 188 and unshelve if they are in an unfinished state.
189 189
190 190 use --dry-run/-n to dry run the command.
191 191 """
192 192 dryrun = opts.get('dry_run')
193 193 abortstate = cmdutil.getunfinishedstate(repo)
194 194 if not abortstate:
195 195 raise error.StateError(_(b'no operation in progress'))
196 196 if not abortstate.abortfunc:
197 197 raise error.InputError(
198 198 (
199 199 _(b"%s in progress but does not support 'hg abort'")
200 200 % (abortstate._opname)
201 201 ),
202 202 hint=abortstate.hint(),
203 203 )
204 204 if dryrun:
205 205 ui.status(
206 206 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
207 207 )
208 208 return
209 209 return abortstate.abortfunc(ui, repo)
210 210
211 211
212 212 @command(
213 213 b'add',
214 214 walkopts + subrepoopts + dryrunopts,
215 215 _(b'[OPTION]... [FILE]...'),
216 216 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
217 217 helpbasic=True,
218 218 inferrepo=True,
219 219 )
220 220 def add(ui, repo, *pats, **opts):
221 221 """add the specified files on the next commit
222 222
223 223 Schedule files to be version controlled and added to the
224 224 repository.
225 225
226 226 The files will be added to the repository at the next commit. To
227 227 undo an add before that, see :hg:`forget`.
228 228
229 229 If no names are given, add all files to the repository (except
230 230 files matching ``.hgignore``).
231 231
232 232 .. container:: verbose
233 233
234 234 Examples:
235 235
236 236 - New (unknown) files are added
237 237 automatically by :hg:`add`::
238 238
239 239 $ ls
240 240 foo.c
241 241 $ hg status
242 242 ? foo.c
243 243 $ hg add
244 244 adding foo.c
245 245 $ hg status
246 246 A foo.c
247 247
248 248 - Specific files to be added can be specified::
249 249
250 250 $ ls
251 251 bar.c foo.c
252 252 $ hg status
253 253 ? bar.c
254 254 ? foo.c
255 255 $ hg add bar.c
256 256 $ hg status
257 257 A bar.c
258 258 ? foo.c
259 259
260 260 Returns 0 if all files are successfully added.
261 261 """
262 262
263 263 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
264 264 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
265 265 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
266 266 return rejected and 1 or 0
267 267
268 268
269 269 @command(
270 270 b'addremove',
271 271 similarityopts + subrepoopts + walkopts + dryrunopts,
272 272 _(b'[OPTION]... [FILE]...'),
273 273 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
274 274 inferrepo=True,
275 275 )
276 276 def addremove(ui, repo, *pats, **opts):
277 277 """add all new files, delete all missing files
278 278
279 279 Add all new files and remove all missing files from the
280 280 repository.
281 281
282 282 Unless names are given, new files are ignored if they match any of
283 283 the patterns in ``.hgignore``. As with add, these changes take
284 284 effect at the next commit.
285 285
286 286 Use the -s/--similarity option to detect renamed files. This
287 287 option takes a percentage between 0 (disabled) and 100 (files must
288 288 be identical) as its parameter. With a parameter greater than 0,
289 289 this compares every removed file with every added file and records
290 290 those similar enough as renames. Detecting renamed files this way
291 291 can be expensive. After using this option, :hg:`status -C` can be
292 292 used to check which files were identified as moved or renamed. If
293 293 not specified, -s/--similarity defaults to 100 and only renames of
294 294 identical files are detected.
295 295
296 296 .. container:: verbose
297 297
298 298 Examples:
299 299
300 300 - A number of files (bar.c and foo.c) are new,
301 301 while foobar.c has been removed (without using :hg:`remove`)
302 302 from the repository::
303 303
304 304 $ ls
305 305 bar.c foo.c
306 306 $ hg status
307 307 ! foobar.c
308 308 ? bar.c
309 309 ? foo.c
310 310 $ hg addremove
311 311 adding bar.c
312 312 adding foo.c
313 313 removing foobar.c
314 314 $ hg status
315 315 A bar.c
316 316 A foo.c
317 317 R foobar.c
318 318
319 319 - A file foobar.c was moved to foo.c without using :hg:`rename`.
320 320 Afterwards, it was edited slightly::
321 321
322 322 $ ls
323 323 foo.c
324 324 $ hg status
325 325 ! foobar.c
326 326 ? foo.c
327 327 $ hg addremove --similarity 90
328 328 removing foobar.c
329 329 adding foo.c
330 330 recording removal of foobar.c as rename to foo.c (94% similar)
331 331 $ hg status -C
332 332 A foo.c
333 333 foobar.c
334 334 R foobar.c
335 335
336 336 Returns 0 if all files are successfully added.
337 337 """
338 338 opts = pycompat.byteskwargs(opts)
339 339 if not opts.get(b'similarity'):
340 340 opts[b'similarity'] = b'100'
341 341 matcher = scmutil.match(repo[None], pats, opts)
342 342 relative = scmutil.anypats(pats, opts)
343 343 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
344 344 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
345 345
346 346
347 347 @command(
348 348 b'annotate|blame',
349 349 [
350 350 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
351 351 (
352 352 b'',
353 353 b'follow',
354 354 None,
355 355 _(b'follow copies/renames and list the filename (DEPRECATED)'),
356 356 ),
357 357 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
358 358 (b'a', b'text', None, _(b'treat all files as text')),
359 359 (b'u', b'user', None, _(b'list the author (long with -v)')),
360 360 (b'f', b'file', None, _(b'list the filename')),
361 361 (b'd', b'date', None, _(b'list the date (short with -q)')),
362 362 (b'n', b'number', None, _(b'list the revision number (default)')),
363 363 (b'c', b'changeset', None, _(b'list the changeset')),
364 364 (
365 365 b'l',
366 366 b'line-number',
367 367 None,
368 368 _(b'show line number at the first appearance'),
369 369 ),
370 370 (
371 371 b'',
372 372 b'skip',
373 373 [],
374 374 _(b'revset to not display (EXPERIMENTAL)'),
375 375 _(b'REV'),
376 376 ),
377 377 ]
378 378 + diffwsopts
379 379 + walkopts
380 380 + formatteropts,
381 381 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
382 382 helpcategory=command.CATEGORY_FILE_CONTENTS,
383 383 helpbasic=True,
384 384 inferrepo=True,
385 385 )
386 386 def annotate(ui, repo, *pats, **opts):
387 387 """show changeset information by line for each file
388 388
389 389 List changes in files, showing the revision id responsible for
390 390 each line.
391 391
392 392 This command is useful for discovering when a change was made and
393 393 by whom.
394 394
395 395 If you include --file, --user, or --date, the revision number is
396 396 suppressed unless you also include --number.
397 397
398 398 Without the -a/--text option, annotate will avoid processing files
399 399 it detects as binary. With -a, annotate will annotate the file
400 400 anyway, although the results will probably be neither useful
401 401 nor desirable.
402 402
403 403 .. container:: verbose
404 404
405 405 Template:
406 406
407 407 The following keywords are supported in addition to the common template
408 408 keywords and functions. See also :hg:`help templates`.
409 409
410 410 :lines: List of lines with annotation data.
411 411 :path: String. Repository-absolute path of the specified file.
412 412
413 413 And each entry of ``{lines}`` provides the following sub-keywords in
414 414 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
415 415
416 416 :line: String. Line content.
417 417 :lineno: Integer. Line number at that revision.
418 418 :path: String. Repository-absolute path of the file at that revision.
419 419
420 420 See :hg:`help templates.operators` for the list expansion syntax.
421 421
422 422 Returns 0 on success.
423 423 """
424 424 opts = pycompat.byteskwargs(opts)
425 425 if not pats:
426 426 raise error.InputError(
427 427 _(b'at least one filename or pattern is required')
428 428 )
429 429
430 430 if opts.get(b'follow'):
431 431 # --follow is deprecated and now just an alias for -f/--file
432 432 # to mimic the behavior of Mercurial before version 1.5
433 433 opts[b'file'] = True
434 434
435 435 if (
436 436 not opts.get(b'user')
437 437 and not opts.get(b'changeset')
438 438 and not opts.get(b'date')
439 439 and not opts.get(b'file')
440 440 ):
441 441 opts[b'number'] = True
442 442
443 443 linenumber = opts.get(b'line_number') is not None
444 444 if (
445 445 linenumber
446 446 and (not opts.get(b'changeset'))
447 447 and (not opts.get(b'number'))
448 448 ):
449 449 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
450 450
451 451 rev = opts.get(b'rev')
452 452 if rev:
453 453 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
454 454 ctx = scmutil.revsingle(repo, rev)
455 455
456 456 ui.pager(b'annotate')
457 457 rootfm = ui.formatter(b'annotate', opts)
458 458 if ui.debugflag:
459 459 shorthex = pycompat.identity
460 460 else:
461 461
462 462 def shorthex(h):
463 463 return h[:12]
464 464
465 465 if ui.quiet:
466 466 datefunc = dateutil.shortdate
467 467 else:
468 468 datefunc = dateutil.datestr
469 469 if ctx.rev() is None:
470 470 if opts.get(b'changeset'):
471 471 # omit "+" suffix which is appended to node hex
472 472 def formatrev(rev):
473 473 if rev == wdirrev:
474 474 return b'%d' % ctx.p1().rev()
475 475 else:
476 476 return b'%d' % rev
477 477
478 478 else:
479 479
480 480 def formatrev(rev):
481 481 if rev == wdirrev:
482 482 return b'%d+' % ctx.p1().rev()
483 483 else:
484 484 return b'%d ' % rev
485 485
486 486 def formathex(h):
487 487 if h == repo.nodeconstants.wdirhex:
488 488 return b'%s+' % shorthex(hex(ctx.p1().node()))
489 489 else:
490 490 return b'%s ' % shorthex(h)
491 491
492 492 else:
493 493 formatrev = b'%d'.__mod__
494 494 formathex = shorthex
495 495
496 496 opmap = [
497 497 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
498 498 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
499 499 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
500 500 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
501 501 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
502 502 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
503 503 ]
504 504 opnamemap = {
505 505 b'rev': b'number',
506 506 b'node': b'changeset',
507 507 b'path': b'file',
508 508 b'lineno': b'line_number',
509 509 }
510 510
511 511 if rootfm.isplain():
512 512
513 513 def makefunc(get, fmt):
514 514 return lambda x: fmt(get(x))
515 515
516 516 else:
517 517
518 518 def makefunc(get, fmt):
519 519 return get
520 520
521 521 datahint = rootfm.datahint()
522 522 funcmap = [
523 523 (makefunc(get, fmt), sep)
524 524 for fn, sep, get, fmt in opmap
525 525 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
526 526 ]
527 527 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
528 528 fields = b' '.join(
529 529 fn
530 530 for fn, sep, get, fmt in opmap
531 531 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
532 532 )
533 533
534 534 def bad(x, y):
535 535 raise error.Abort(b"%s: %s" % (x, y))
536 536
537 537 m = scmutil.match(ctx, pats, opts, badfn=bad)
538 538
539 539 follow = not opts.get(b'no_follow')
540 540 diffopts = patch.difffeatureopts(
541 541 ui, opts, section=b'annotate', whitespace=True
542 542 )
543 543 skiprevs = opts.get(b'skip')
544 544 if skiprevs:
545 545 skiprevs = scmutil.revrange(repo, skiprevs)
546 546
547 547 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
548 548 for abs in ctx.walk(m):
549 549 fctx = ctx[abs]
550 550 rootfm.startitem()
551 551 rootfm.data(path=abs)
552 552 if not opts.get(b'text') and fctx.isbinary():
553 553 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
554 554 continue
555 555
556 556 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
557 557 lines = fctx.annotate(
558 558 follow=follow, skiprevs=skiprevs, diffopts=diffopts
559 559 )
560 560 if not lines:
561 561 fm.end()
562 562 continue
563 563 formats = []
564 564 pieces = []
565 565
566 566 for f, sep in funcmap:
567 567 l = [f(n) for n in lines]
568 568 if fm.isplain():
569 569 sizes = [encoding.colwidth(x) for x in l]
570 570 ml = max(sizes)
571 571 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
572 572 else:
573 573 formats.append([b'%s'] * len(l))
574 574 pieces.append(l)
575 575
576 576 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
577 577 fm.startitem()
578 578 fm.context(fctx=n.fctx)
579 579 fm.write(fields, b"".join(f), *p)
580 580 if n.skip:
581 581 fmt = b"* %s"
582 582 else:
583 583 fmt = b": %s"
584 584 fm.write(b'line', fmt, n.text)
585 585
586 586 if not lines[-1].text.endswith(b'\n'):
587 587 fm.plain(b'\n')
588 588 fm.end()
589 589
590 590 rootfm.end()
591 591
592 592
593 593 @command(
594 594 b'archive',
595 595 [
596 596 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
597 597 (
598 598 b'p',
599 599 b'prefix',
600 600 b'',
601 601 _(b'directory prefix for files in archive'),
602 602 _(b'PREFIX'),
603 603 ),
604 604 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
605 605 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
606 606 ]
607 607 + subrepoopts
608 608 + walkopts,
609 609 _(b'[OPTION]... DEST'),
610 610 helpcategory=command.CATEGORY_IMPORT_EXPORT,
611 611 )
612 612 def archive(ui, repo, dest, **opts):
613 613 """create an unversioned archive of a repository revision
614 614
615 615 By default, the revision used is the parent of the working
616 616 directory; use -r/--rev to specify a different revision.
617 617
618 618 The archive type is automatically detected based on file
619 619 extension (to override, use -t/--type).
620 620
621 621 .. container:: verbose
622 622
623 623 Examples:
624 624
625 625 - create a zip file containing the 1.0 release::
626 626
627 627 hg archive -r 1.0 project-1.0.zip
628 628
629 629 - create a tarball excluding .hg files::
630 630
631 631 hg archive project.tar.gz -X ".hg*"
632 632
633 633 Valid types are:
634 634
635 635 :``files``: a directory full of files (default)
636 636 :``tar``: tar archive, uncompressed
637 637 :``tbz2``: tar archive, compressed using bzip2
638 638 :``tgz``: tar archive, compressed using gzip
639 639 :``txz``: tar archive, compressed using lzma (only in Python 3)
640 640 :``uzip``: zip archive, uncompressed
641 641 :``zip``: zip archive, compressed using deflate
642 642
643 643 The exact name of the destination archive or directory is given
644 644 using a format string; see :hg:`help export` for details.
645 645
646 646 Each member added to an archive file has a directory prefix
647 647 prepended. Use -p/--prefix to specify a format string for the
648 648 prefix. The default is the basename of the archive, with suffixes
649 649 removed.
650 650
651 651 Returns 0 on success.
652 652 """
653 653
654 654 opts = pycompat.byteskwargs(opts)
655 655 rev = opts.get(b'rev')
656 656 if rev:
657 657 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
658 658 ctx = scmutil.revsingle(repo, rev)
659 659 if not ctx:
660 660 raise error.InputError(
661 661 _(b'no working directory: please specify a revision')
662 662 )
663 663 node = ctx.node()
664 664 dest = cmdutil.makefilename(ctx, dest)
665 665 if os.path.realpath(dest) == repo.root:
666 666 raise error.InputError(_(b'repository root cannot be destination'))
667 667
668 668 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
669 669 prefix = opts.get(b'prefix')
670 670
671 671 if dest == b'-':
672 672 if kind == b'files':
673 673 raise error.InputError(_(b'cannot archive plain files to stdout'))
674 674 dest = cmdutil.makefileobj(ctx, dest)
675 675 if not prefix:
676 676 prefix = os.path.basename(repo.root) + b'-%h'
677 677
678 678 prefix = cmdutil.makefilename(ctx, prefix)
679 679 match = scmutil.match(ctx, [], opts)
680 680 archival.archive(
681 681 repo,
682 682 dest,
683 683 node,
684 684 kind,
685 685 not opts.get(b'no_decode'),
686 686 match,
687 687 prefix,
688 688 subrepos=opts.get(b'subrepos'),
689 689 )
690 690
691 691
692 692 @command(
693 693 b'backout',
694 694 [
695 695 (
696 696 b'',
697 697 b'merge',
698 698 None,
699 699 _(b'merge with old dirstate parent after backout'),
700 700 ),
701 701 (
702 702 b'',
703 703 b'commit',
704 704 None,
705 705 _(b'commit if no conflicts were encountered (DEPRECATED)'),
706 706 ),
707 707 (b'', b'no-commit', None, _(b'do not commit')),
708 708 (
709 709 b'',
710 710 b'parent',
711 711 b'',
712 712 _(b'parent to choose when backing out merge (DEPRECATED)'),
713 713 _(b'REV'),
714 714 ),
715 715 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
716 716 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
717 717 ]
718 718 + mergetoolopts
719 719 + walkopts
720 720 + commitopts
721 721 + commitopts2,
722 722 _(b'[OPTION]... [-r] REV'),
723 723 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
724 724 )
725 725 def backout(ui, repo, node=None, rev=None, **opts):
726 726 """reverse effect of earlier changeset
727 727
728 728 Prepare a new changeset with the effect of REV undone in the
729 729 current working directory. If no conflicts were encountered,
730 730 it will be committed immediately.
731 731
732 732 If REV is the parent of the working directory, then this new changeset
733 733 is committed automatically (unless --no-commit is specified).
734 734
735 735 .. note::
736 736
737 737 :hg:`backout` cannot be used to fix either an unwanted or
738 738 incorrect merge.
739 739
740 740 .. container:: verbose
741 741
742 742 Examples:
743 743
744 744 - Reverse the effect of the parent of the working directory.
745 745 This backout will be committed immediately::
746 746
747 747 hg backout -r .
748 748
749 749 - Reverse the effect of previous bad revision 23::
750 750
751 751 hg backout -r 23
752 752
753 753 - Reverse the effect of previous bad revision 23 and
754 754 leave changes uncommitted::
755 755
756 756 hg backout -r 23 --no-commit
757 757 hg commit -m "Backout revision 23"
758 758
759 759 By default, the pending changeset will have one parent,
760 760 maintaining a linear history. With --merge, the pending
761 761 changeset will instead have two parents: the old parent of the
762 762 working directory and a new child of REV that simply undoes REV.
763 763
764 764 Before version 1.7, the behavior without --merge was equivalent
765 765 to specifying --merge followed by :hg:`update --clean .` to
766 766 cancel the merge and leave the child of REV as a head to be
767 767 merged separately.
768 768
769 769 See :hg:`help dates` for a list of formats valid for -d/--date.
770 770
771 771 See :hg:`help revert` for a way to restore files to the state
772 772 of another revision.
773 773
774 774 Returns 0 on success, 1 if nothing to backout or there are unresolved
775 775 files.
776 776 """
777 777 with repo.wlock(), repo.lock():
778 778 return _dobackout(ui, repo, node, rev, **opts)
779 779
780 780
781 781 def _dobackout(ui, repo, node=None, rev=None, **opts):
782 782 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
783 783 opts = pycompat.byteskwargs(opts)
784 784
785 785 if rev and node:
786 786 raise error.InputError(_(b"please specify just one revision"))
787 787
788 788 if not rev:
789 789 rev = node
790 790
791 791 if not rev:
792 792 raise error.InputError(_(b"please specify a revision to backout"))
793 793
794 794 date = opts.get(b'date')
795 795 if date:
796 796 opts[b'date'] = dateutil.parsedate(date)
797 797
798 798 cmdutil.checkunfinished(repo)
799 799 cmdutil.bailifchanged(repo)
800 800 ctx = scmutil.revsingle(repo, rev)
801 801 node = ctx.node()
802 802
803 803 op1, op2 = repo.dirstate.parents()
804 804 if not repo.changelog.isancestor(node, op1):
805 805 raise error.InputError(
806 806 _(b'cannot backout change that is not an ancestor')
807 807 )
808 808
809 809 p1, p2 = repo.changelog.parents(node)
810 810 if p1 == repo.nullid:
811 811 raise error.InputError(_(b'cannot backout a change with no parents'))
812 812 if p2 != repo.nullid:
813 813 if not opts.get(b'parent'):
814 814 raise error.InputError(_(b'cannot backout a merge changeset'))
815 815 p = repo.lookup(opts[b'parent'])
816 816 if p not in (p1, p2):
817 817 raise error.InputError(
818 818 _(b'%s is not a parent of %s') % (short(p), short(node))
819 819 )
820 820 parent = p
821 821 else:
822 822 if opts.get(b'parent'):
823 823 raise error.InputError(
824 824 _(b'cannot use --parent on non-merge changeset')
825 825 )
826 826 parent = p1
827 827
828 828 # the backout should appear on the same branch
829 829 branch = repo.dirstate.branch()
830 830 bheads = repo.branchheads(branch)
831 831 rctx = scmutil.revsingle(repo, hex(parent))
832 832 if not opts.get(b'merge') and op1 != node:
833 833 with dirstateguard.dirstateguard(repo, b'backout'):
834 834 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
835 835 with ui.configoverride(overrides, b'backout'):
836 836 stats = mergemod.back_out(ctx, parent=repo[parent])
837 837 repo.setparents(op1, op2)
838 838 hg._showstats(repo, stats)
839 839 if stats.unresolvedcount:
840 840 repo.ui.status(
841 841 _(b"use 'hg resolve' to retry unresolved file merges\n")
842 842 )
843 843 return 1
844 844 else:
845 845 hg.clean(repo, node, show_stats=False)
846 846 repo.dirstate.setbranch(branch)
847 847 cmdutil.revert(ui, repo, rctx)
848 848
849 849 if opts.get(b'no_commit'):
850 850 msg = _(b"changeset %s backed out, don't forget to commit.\n")
851 851 ui.status(msg % short(node))
852 852 return 0
853 853
854 854 def commitfunc(ui, repo, message, match, opts):
855 855 editform = b'backout'
856 856 e = cmdutil.getcommiteditor(
857 857 editform=editform, **pycompat.strkwargs(opts)
858 858 )
859 859 if not message:
860 860 # we don't translate commit messages
861 861 message = b"Backed out changeset %s" % short(node)
862 862 e = cmdutil.getcommiteditor(edit=True, editform=editform)
863 863 return repo.commit(
864 864 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
865 865 )
866 866
867 867 # save to detect changes
868 868 tip = repo.changelog.tip()
869 869
870 870 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
871 871 if not newnode:
872 872 ui.status(_(b"nothing changed\n"))
873 873 return 1
874 874 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
875 875
876 876 def nice(node):
877 877 return b'%d:%s' % (repo.changelog.rev(node), short(node))
878 878
879 879 ui.status(
880 880 _(b'changeset %s backs out changeset %s\n')
881 881 % (nice(newnode), nice(node))
882 882 )
883 883 if opts.get(b'merge') and op1 != node:
884 884 hg.clean(repo, op1, show_stats=False)
885 885 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
886 886 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
887 887 with ui.configoverride(overrides, b'backout'):
888 888 return hg.merge(repo[b'tip'])
889 889 return 0
890 890
891 891
892 892 @command(
893 893 b'bisect',
894 894 [
895 895 (b'r', b'reset', False, _(b'reset bisect state')),
896 896 (b'g', b'good', False, _(b'mark changeset good')),
897 897 (b'b', b'bad', False, _(b'mark changeset bad')),
898 898 (b's', b'skip', False, _(b'skip testing changeset')),
899 899 (b'e', b'extend', False, _(b'extend the bisect range')),
900 900 (
901 901 b'c',
902 902 b'command',
903 903 b'',
904 904 _(b'use command to check changeset state'),
905 905 _(b'CMD'),
906 906 ),
907 907 (b'U', b'noupdate', False, _(b'do not update to target')),
908 908 ],
909 909 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
910 910 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
911 911 )
912 912 def bisect(
913 913 ui,
914 914 repo,
915 915 positional_1=None,
916 916 positional_2=None,
917 917 command=None,
918 918 reset=None,
919 919 good=None,
920 920 bad=None,
921 921 skip=None,
922 922 extend=None,
923 923 noupdate=None,
924 924 ):
925 925 """subdivision search of changesets
926 926
927 927 This command helps to find changesets which introduce problems. To
928 928 use, mark the earliest changeset you know exhibits the problem as
929 929 bad, then mark the latest changeset which is free from the problem
930 930 as good. Bisect will update your working directory to a revision
931 931 for testing (unless the -U/--noupdate option is specified). Once
932 932 you have performed tests, mark the working directory as good or
933 933 bad, and bisect will either update to another candidate changeset
934 934 or announce that it has found the bad revision.
935 935
936 936 As a shortcut, you can also use the revision argument to mark a
937 937 revision as good or bad without checking it out first.
938 938
939 939 If you supply a command, it will be used for automatic bisection.
940 940 The environment variable HG_NODE will contain the ID of the
941 941 changeset being tested. The exit status of the command will be
942 942 used to mark revisions as good or bad: status 0 means good, 125
943 943 means to skip the revision, 127 (command not found) will abort the
944 944 bisection, and any other non-zero exit status means the revision
945 945 is bad.
946 946
947 947 .. container:: verbose
948 948
949 949 Some examples:
950 950
951 951 - start a bisection with known bad revision 34, and good revision 12::
952 952
953 953 hg bisect --bad 34
954 954 hg bisect --good 12
955 955
956 956 - advance the current bisection by marking current revision as good or
957 957 bad::
958 958
959 959 hg bisect --good
960 960 hg bisect --bad
961 961
962 962 - mark the current revision, or a known revision, to be skipped (e.g. if
963 963 that revision is not usable because of another issue)::
964 964
965 965 hg bisect --skip
966 966 hg bisect --skip 23
967 967
968 968 - skip all revisions that do not touch directories ``foo`` or ``bar``::
969 969
970 970 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
971 971
972 972 - forget the current bisection::
973 973
974 974 hg bisect --reset
975 975
976 976 - use 'make && make tests' to automatically find the first broken
977 977 revision::
978 978
979 979 hg bisect --reset
980 980 hg bisect --bad 34
981 981 hg bisect --good 12
982 982 hg bisect --command "make && make tests"
983 983
984 984 - see all changesets whose states are already known in the current
985 985 bisection::
986 986
987 987 hg log -r "bisect(pruned)"
988 988
989 989 - see the changeset currently being bisected (especially useful
990 990 if running with -U/--noupdate)::
991 991
992 992 hg log -r "bisect(current)"
993 993
994 994 - see all changesets that took part in the current bisection::
995 995
996 996 hg log -r "bisect(range)"
997 997
998 998 - you can even get a nice graph::
999 999
1000 1000 hg log --graph -r "bisect(range)"
1001 1001
1002 1002 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
1003 1003
1004 1004 Returns 0 on success.
1005 1005 """
1006 1006 rev = []
1007 1007 # backward compatibility
1008 1008 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1009 1009 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1010 1010 cmd = positional_1
1011 1011 rev.append(positional_2)
1012 1012 if cmd == b"good":
1013 1013 good = True
1014 1014 elif cmd == b"bad":
1015 1015 bad = True
1016 1016 else:
1017 1017 reset = True
1018 1018 elif positional_2:
1019 1019 raise error.InputError(_(b'incompatible arguments'))
1020 1020 elif positional_1 is not None:
1021 1021 rev.append(positional_1)
1022 1022
1023 1023 incompatibles = {
1024 1024 b'--bad': bad,
1025 1025 b'--command': bool(command),
1026 1026 b'--extend': extend,
1027 1027 b'--good': good,
1028 1028 b'--reset': reset,
1029 1029 b'--skip': skip,
1030 1030 }
1031 1031
1032 1032 enabled = [x for x in incompatibles if incompatibles[x]]
1033 1033
1034 1034 if len(enabled) > 1:
1035 1035 raise error.InputError(
1036 1036 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1037 1037 )
1038 1038
1039 1039 if reset:
1040 1040 hbisect.resetstate(repo)
1041 1041 return
1042 1042
1043 1043 state = hbisect.load_state(repo)
1044 1044
1045 1045 if rev:
1046 1046 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1047 1047 else:
1048 1048 nodes = [repo.lookup(b'.')]
1049 1049
1050 1050 # update state
1051 1051 if good or bad or skip:
1052 1052 if good:
1053 1053 state[b'good'] += nodes
1054 1054 elif bad:
1055 1055 state[b'bad'] += nodes
1056 1056 elif skip:
1057 1057 state[b'skip'] += nodes
1058 1058 hbisect.save_state(repo, state)
1059 1059 if not (state[b'good'] and state[b'bad']):
1060 1060 return
1061 1061
1062 1062 def mayupdate(repo, node, show_stats=True):
1063 1063 """common used update sequence"""
1064 1064 if noupdate:
1065 1065 return
1066 1066 cmdutil.checkunfinished(repo)
1067 1067 cmdutil.bailifchanged(repo)
1068 1068 return hg.clean(repo, node, show_stats=show_stats)
1069 1069
1070 1070 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1071 1071
1072 1072 if command:
1073 1073 changesets = 1
1074 1074 if noupdate:
1075 1075 try:
1076 1076 node = state[b'current'][0]
1077 1077 except LookupError:
1078 1078 raise error.StateError(
1079 1079 _(
1080 1080 b'current bisect revision is unknown - '
1081 1081 b'start a new bisect to fix'
1082 1082 )
1083 1083 )
1084 1084 else:
1085 1085 node, p2 = repo.dirstate.parents()
1086 1086 if p2 != repo.nullid:
1087 1087 raise error.StateError(_(b'current bisect revision is a merge'))
1088 1088 if rev:
1089 1089 if not nodes:
1090 1090 raise error.Abort(_(b'empty revision set'))
1091 1091 node = repo[nodes[-1]].node()
1092 1092 with hbisect.restore_state(repo, state, node):
1093 1093 while changesets:
1094 1094 # update state
1095 1095 state[b'current'] = [node]
1096 1096 hbisect.save_state(repo, state)
1097 1097 status = ui.system(
1098 1098 command,
1099 1099 environ={b'HG_NODE': hex(node)},
1100 1100 blockedtag=b'bisect_check',
1101 1101 )
1102 1102 if status == 125:
1103 1103 transition = b"skip"
1104 1104 elif status == 0:
1105 1105 transition = b"good"
1106 1106 # status < 0 means process was killed
1107 1107 elif status == 127:
1108 1108 raise error.Abort(_(b"failed to execute %s") % command)
1109 1109 elif status < 0:
1110 1110 raise error.Abort(_(b"%s killed") % command)
1111 1111 else:
1112 1112 transition = b"bad"
1113 1113 state[transition].append(node)
1114 1114 ctx = repo[node]
1115 1115 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1116 1116 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1117 1117 hbisect.checkstate(state)
1118 1118 # bisect
1119 1119 nodes, changesets, bgood = hbisect.bisect(repo, state)
1120 1120 # update to next check
1121 1121 node = nodes[0]
1122 1122 mayupdate(repo, node, show_stats=False)
1123 1123 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1124 1124 return
1125 1125
1126 1126 hbisect.checkstate(state)
1127 1127
1128 1128 # actually bisect
1129 1129 nodes, changesets, good = hbisect.bisect(repo, state)
1130 1130 if extend:
1131 1131 if not changesets:
1132 1132 extendctx = hbisect.extendrange(repo, state, nodes, good)
1133 1133 if extendctx is not None:
1134 1134 ui.write(
1135 1135 _(b"Extending search to changeset %s\n")
1136 1136 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1137 1137 )
1138 1138 state[b'current'] = [extendctx.node()]
1139 1139 hbisect.save_state(repo, state)
1140 1140 return mayupdate(repo, extendctx.node())
1141 1141 raise error.StateError(_(b"nothing to extend"))
1142 1142
1143 1143 if changesets == 0:
1144 1144 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1145 1145 else:
1146 1146 assert len(nodes) == 1 # only a single node can be tested next
1147 1147 node = nodes[0]
1148 1148 # compute the approximate number of remaining tests
1149 1149 tests, size = 0, 2
1150 1150 while size <= changesets:
1151 1151 tests, size = tests + 1, size * 2
1152 1152 rev = repo.changelog.rev(node)
1153 1153 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1154 1154 ui.write(
1155 1155 _(
1156 1156 b"Testing changeset %s "
1157 1157 b"(%d changesets remaining, ~%d tests)\n"
1158 1158 )
1159 1159 % (summary, changesets, tests)
1160 1160 )
1161 1161 state[b'current'] = [node]
1162 1162 hbisect.save_state(repo, state)
1163 1163 return mayupdate(repo, node)
1164 1164
1165 1165
1166 1166 @command(
1167 1167 b'bookmarks|bookmark',
1168 1168 [
1169 1169 (b'f', b'force', False, _(b'force')),
1170 1170 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1171 1171 (b'd', b'delete', False, _(b'delete a given bookmark')),
1172 1172 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1173 1173 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1174 1174 (b'l', b'list', False, _(b'list existing bookmarks')),
1175 1175 ]
1176 1176 + formatteropts,
1177 1177 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1178 1178 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1179 1179 )
1180 1180 def bookmark(ui, repo, *names, **opts):
1181 1181 """create a new bookmark or list existing bookmarks
1182 1182
1183 1183 Bookmarks are labels on changesets to help track lines of development.
1184 1184 Bookmarks are unversioned and can be moved, renamed and deleted.
1185 1185 Deleting or moving a bookmark has no effect on the associated changesets.
1186 1186
1187 1187 Creating or updating to a bookmark causes it to be marked as 'active'.
1188 1188 The active bookmark is indicated with a '*'.
1189 1189 When a commit is made, the active bookmark will advance to the new commit.
1190 1190 A plain :hg:`update` will also advance an active bookmark, if possible.
1191 1191 Updating away from a bookmark will cause it to be deactivated.
1192 1192
1193 1193 Bookmarks can be pushed and pulled between repositories (see
1194 1194 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1195 1195 diverged, a new 'divergent bookmark' of the form 'name@path' will
1196 1196 be created. Using :hg:`merge` will resolve the divergence.
1197 1197
1198 1198 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1199 1199 the active bookmark's name.
1200 1200
1201 1201 A bookmark named '@' has the special property that :hg:`clone` will
1202 1202 check it out by default if it exists.
1203 1203
1204 1204 .. container:: verbose
1205 1205
1206 1206 Template:
1207 1207
1208 1208 The following keywords are supported in addition to the common template
1209 1209 keywords and functions such as ``{bookmark}``. See also
1210 1210 :hg:`help templates`.
1211 1211
1212 1212 :active: Boolean. True if the bookmark is active.
1213 1213
1214 1214 Examples:
1215 1215
1216 1216 - create an active bookmark for a new line of development::
1217 1217
1218 1218 hg book new-feature
1219 1219
1220 1220 - create an inactive bookmark as a place marker::
1221 1221
1222 1222 hg book -i reviewed
1223 1223
1224 1224 - create an inactive bookmark on another changeset::
1225 1225
1226 1226 hg book -r .^ tested
1227 1227
1228 1228 - rename bookmark turkey to dinner::
1229 1229
1230 1230 hg book -m turkey dinner
1231 1231
1232 1232 - move the '@' bookmark from another branch::
1233 1233
1234 1234 hg book -f @
1235 1235
1236 1236 - print only the active bookmark name::
1237 1237
1238 1238 hg book -ql .
1239 1239 """
1240 1240 opts = pycompat.byteskwargs(opts)
1241 1241 force = opts.get(b'force')
1242 1242 rev = opts.get(b'rev')
1243 1243 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1244 1244
1245 1245 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1246 1246 if action:
1247 1247 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1248 1248 elif names or rev:
1249 1249 action = b'add'
1250 1250 elif inactive:
1251 1251 action = b'inactive' # meaning deactivate
1252 1252 else:
1253 1253 action = b'list'
1254 1254
1255 1255 cmdutil.check_incompatible_arguments(
1256 1256 opts, b'inactive', [b'delete', b'list']
1257 1257 )
1258 1258 if not names and action in {b'add', b'delete'}:
1259 1259 raise error.InputError(_(b"bookmark name required"))
1260 1260
1261 1261 if action in {b'add', b'delete', b'rename', b'inactive'}:
1262 1262 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1263 1263 if action == b'delete':
1264 1264 names = pycompat.maplist(repo._bookmarks.expandname, names)
1265 1265 bookmarks.delete(repo, tr, names)
1266 1266 elif action == b'rename':
1267 1267 if not names:
1268 1268 raise error.InputError(_(b"new bookmark name required"))
1269 1269 elif len(names) > 1:
1270 1270 raise error.InputError(
1271 1271 _(b"only one new bookmark name allowed")
1272 1272 )
1273 1273 oldname = repo._bookmarks.expandname(opts[b'rename'])
1274 1274 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1275 1275 elif action == b'add':
1276 1276 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1277 1277 elif action == b'inactive':
1278 1278 if len(repo._bookmarks) == 0:
1279 1279 ui.status(_(b"no bookmarks set\n"))
1280 1280 elif not repo._activebookmark:
1281 1281 ui.status(_(b"no active bookmark\n"))
1282 1282 else:
1283 1283 bookmarks.deactivate(repo)
1284 1284 elif action == b'list':
1285 1285 names = pycompat.maplist(repo._bookmarks.expandname, names)
1286 1286 with ui.formatter(b'bookmarks', opts) as fm:
1287 1287 bookmarks.printbookmarks(ui, repo, fm, names)
1288 1288 else:
1289 1289 raise error.ProgrammingError(b'invalid action: %s' % action)
1290 1290
1291 1291
1292 1292 @command(
1293 1293 b'branch',
1294 1294 [
1295 1295 (
1296 1296 b'f',
1297 1297 b'force',
1298 1298 None,
1299 1299 _(b'set branch name even if it shadows an existing branch'),
1300 1300 ),
1301 1301 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1302 1302 (
1303 1303 b'r',
1304 1304 b'rev',
1305 1305 [],
1306 1306 _(b'change branches of the given revs (EXPERIMENTAL)'),
1307 1307 ),
1308 1308 ],
1309 1309 _(b'[-fC] [NAME]'),
1310 1310 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1311 1311 )
1312 1312 def branch(ui, repo, label=None, **opts):
1313 1313 """set or show the current branch name
1314 1314
1315 1315 .. note::
1316 1316
1317 1317 Branch names are permanent and global. Use :hg:`bookmark` to create a
1318 1318 light-weight bookmark instead. See :hg:`help glossary` for more
1319 1319 information about named branches and bookmarks.
1320 1320
1321 1321 With no argument, show the current branch name. With one argument,
1322 1322 set the working directory branch name (the branch will not exist
1323 1323 in the repository until the next commit). Standard practice
1324 1324 recommends that primary development take place on the 'default'
1325 1325 branch.
1326 1326
1327 1327 Unless -f/--force is specified, branch will not let you set a
1328 1328 branch name that already exists.
1329 1329
1330 1330 Use -C/--clean to reset the working directory branch to that of
1331 1331 the parent of the working directory, negating a previous branch
1332 1332 change.
1333 1333
1334 1334 Use the command :hg:`update` to switch to an existing branch. Use
1335 1335 :hg:`commit --close-branch` to mark this branch head as closed.
1336 1336 When all heads of a branch are closed, the branch will be
1337 1337 considered closed.
1338 1338
1339 1339 Returns 0 on success.
1340 1340 """
1341 1341 opts = pycompat.byteskwargs(opts)
1342 1342 revs = opts.get(b'rev')
1343 1343 if label:
1344 1344 label = label.strip()
1345 1345
1346 1346 if not opts.get(b'clean') and not label:
1347 1347 if revs:
1348 1348 raise error.InputError(
1349 1349 _(b"no branch name specified for the revisions")
1350 1350 )
1351 1351 ui.write(b"%s\n" % repo.dirstate.branch())
1352 1352 return
1353 1353
1354 1354 with repo.wlock():
1355 1355 if opts.get(b'clean'):
1356 1356 label = repo[b'.'].branch()
1357 1357 repo.dirstate.setbranch(label)
1358 1358 ui.status(_(b'reset working directory to branch %s\n') % label)
1359 1359 elif label:
1360 1360
1361 1361 scmutil.checknewlabel(repo, label, b'branch')
1362 1362 if revs:
1363 1363 return cmdutil.changebranch(ui, repo, revs, label, opts)
1364 1364
1365 1365 if not opts.get(b'force') and label in repo.branchmap():
1366 1366 if label not in [p.branch() for p in repo[None].parents()]:
1367 1367 raise error.InputError(
1368 1368 _(b'a branch of the same name already exists'),
1369 1369 # i18n: "it" refers to an existing branch
1370 1370 hint=_(b"use 'hg update' to switch to it"),
1371 1371 )
1372 1372
1373 1373 repo.dirstate.setbranch(label)
1374 1374 ui.status(_(b'marked working directory as branch %s\n') % label)
1375 1375
1376 1376 # find any open named branches aside from default
1377 1377 for n, h, t, c in repo.branchmap().iterbranches():
1378 1378 if n != b"default" and not c:
1379 1379 return 0
1380 1380 ui.status(
1381 1381 _(
1382 1382 b'(branches are permanent and global, '
1383 1383 b'did you want a bookmark?)\n'
1384 1384 )
1385 1385 )
1386 1386
1387 1387
1388 1388 @command(
1389 1389 b'branches',
1390 1390 [
1391 1391 (
1392 1392 b'a',
1393 1393 b'active',
1394 1394 False,
1395 1395 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1396 1396 ),
1397 1397 (b'c', b'closed', False, _(b'show normal and closed branches')),
1398 1398 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1399 1399 ]
1400 1400 + formatteropts,
1401 1401 _(b'[-c]'),
1402 1402 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1403 1403 intents={INTENT_READONLY},
1404 1404 )
1405 1405 def branches(ui, repo, active=False, closed=False, **opts):
1406 1406 """list repository named branches
1407 1407
1408 1408 List the repository's named branches, indicating which ones are
1409 1409 inactive. If -c/--closed is specified, also list branches which have
1410 1410 been marked closed (see :hg:`commit --close-branch`).
1411 1411
1412 1412 Use the command :hg:`update` to switch to an existing branch.
1413 1413
1414 1414 .. container:: verbose
1415 1415
1416 1416 Template:
1417 1417
1418 1418 The following keywords are supported in addition to the common template
1419 1419 keywords and functions such as ``{branch}``. See also
1420 1420 :hg:`help templates`.
1421 1421
1422 1422 :active: Boolean. True if the branch is active.
1423 1423 :closed: Boolean. True if the branch is closed.
1424 1424 :current: Boolean. True if it is the current branch.
1425 1425
1426 1426 Returns 0.
1427 1427 """
1428 1428
1429 1429 opts = pycompat.byteskwargs(opts)
1430 1430 revs = opts.get(b'rev')
1431 1431 selectedbranches = None
1432 1432 if revs:
1433 1433 revs = scmutil.revrange(repo, revs)
1434 1434 getbi = repo.revbranchcache().branchinfo
1435 1435 selectedbranches = {getbi(r)[0] for r in revs}
1436 1436
1437 1437 ui.pager(b'branches')
1438 1438 fm = ui.formatter(b'branches', opts)
1439 1439 hexfunc = fm.hexfunc
1440 1440
1441 1441 allheads = set(repo.heads())
1442 1442 branches = []
1443 1443 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1444 1444 if selectedbranches is not None and tag not in selectedbranches:
1445 1445 continue
1446 1446 isactive = False
1447 1447 if not isclosed:
1448 1448 openheads = set(repo.branchmap().iteropen(heads))
1449 1449 isactive = bool(openheads & allheads)
1450 1450 branches.append((tag, repo[tip], isactive, not isclosed))
1451 1451 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1452 1452
1453 1453 for tag, ctx, isactive, isopen in branches:
1454 1454 if active and not isactive:
1455 1455 continue
1456 1456 if isactive:
1457 1457 label = b'branches.active'
1458 1458 notice = b''
1459 1459 elif not isopen:
1460 1460 if not closed:
1461 1461 continue
1462 1462 label = b'branches.closed'
1463 1463 notice = _(b' (closed)')
1464 1464 else:
1465 1465 label = b'branches.inactive'
1466 1466 notice = _(b' (inactive)')
1467 1467 current = tag == repo.dirstate.branch()
1468 1468 if current:
1469 1469 label = b'branches.current'
1470 1470
1471 1471 fm.startitem()
1472 1472 fm.write(b'branch', b'%s', tag, label=label)
1473 1473 rev = ctx.rev()
1474 1474 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1475 1475 fmt = b' ' * padsize + b' %d:%s'
1476 1476 fm.condwrite(
1477 1477 not ui.quiet,
1478 1478 b'rev node',
1479 1479 fmt,
1480 1480 rev,
1481 1481 hexfunc(ctx.node()),
1482 1482 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1483 1483 )
1484 1484 fm.context(ctx=ctx)
1485 1485 fm.data(active=isactive, closed=not isopen, current=current)
1486 1486 if not ui.quiet:
1487 1487 fm.plain(notice)
1488 1488 fm.plain(b'\n')
1489 1489 fm.end()
1490 1490
1491 1491
1492 1492 @command(
1493 1493 b'bundle',
1494 1494 [
1495 1495 (
1496 1496 b'f',
1497 1497 b'force',
1498 1498 None,
1499 1499 _(b'run even when the destination is unrelated'),
1500 1500 ),
1501 1501 (
1502 1502 b'r',
1503 1503 b'rev',
1504 1504 [],
1505 1505 _(b'a changeset intended to be added to the destination'),
1506 1506 _(b'REV'),
1507 1507 ),
1508 1508 (
1509 1509 b'b',
1510 1510 b'branch',
1511 1511 [],
1512 1512 _(b'a specific branch you would like to bundle'),
1513 1513 _(b'BRANCH'),
1514 1514 ),
1515 1515 (
1516 1516 b'',
1517 1517 b'base',
1518 1518 [],
1519 1519 _(b'a base changeset assumed to be available at the destination'),
1520 1520 _(b'REV'),
1521 1521 ),
1522 1522 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1523 1523 (
1524 1524 b't',
1525 1525 b'type',
1526 1526 b'bzip2',
1527 1527 _(b'bundle compression type to use'),
1528 1528 _(b'TYPE'),
1529 1529 ),
1530 1530 ]
1531 1531 + remoteopts,
1532 1532 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1533 1533 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1534 1534 )
1535 1535 def bundle(ui, repo, fname, *dests, **opts):
1536 1536 """create a bundle file
1537 1537
1538 1538 Generate a bundle file containing data to be transferred to another
1539 1539 repository.
1540 1540
1541 1541 To create a bundle containing all changesets, use -a/--all
1542 1542 (or --base null). Otherwise, hg assumes the destination will have
1543 1543 all the nodes you specify with --base parameters. Otherwise, hg
1544 1544 will assume the repository has all the nodes in destination, or
1545 1545 default-push/default if no destination is specified, where destination
1546 1546 is the repositories you provide through DEST option.
1547 1547
1548 1548 You can change bundle format with the -t/--type option. See
1549 1549 :hg:`help bundlespec` for documentation on this format. By default,
1550 1550 the most appropriate format is used and compression defaults to
1551 1551 bzip2.
1552 1552
1553 1553 The bundle file can then be transferred using conventional means
1554 1554 and applied to another repository with the unbundle or pull
1555 1555 command. This is useful when direct push and pull are not
1556 1556 available or when exporting an entire repository is undesirable.
1557 1557
1558 1558 Applying bundles preserves all changeset contents including
1559 1559 permissions, copy/rename information, and revision history.
1560 1560
1561 1561 Returns 0 on success, 1 if no changes found.
1562 1562 """
1563 1563 opts = pycompat.byteskwargs(opts)
1564 1564 revs = None
1565 1565 if b'rev' in opts:
1566 1566 revstrings = opts[b'rev']
1567 1567 revs = scmutil.revrange(repo, revstrings)
1568 1568 if revstrings and not revs:
1569 1569 raise error.InputError(_(b'no commits to bundle'))
1570 1570
1571 1571 bundletype = opts.get(b'type', b'bzip2').lower()
1572 1572 try:
1573 1573 bundlespec = bundlecaches.parsebundlespec(
1574 1574 repo, bundletype, strict=False
1575 1575 )
1576 1576 except error.UnsupportedBundleSpecification as e:
1577 1577 raise error.InputError(
1578 1578 pycompat.bytestr(e),
1579 1579 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1580 1580 )
1581 1581 cgversion = bundlespec.contentopts[b"cg.version"]
1582 1582
1583 1583 # Packed bundles are a pseudo bundle format for now.
1584 1584 if cgversion == b's1':
1585 1585 raise error.InputError(
1586 1586 _(b'packed bundles cannot be produced by "hg bundle"'),
1587 1587 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1588 1588 )
1589 1589
1590 1590 if opts.get(b'all'):
1591 1591 if dests:
1592 1592 raise error.InputError(
1593 1593 _(b"--all is incompatible with specifying destinations")
1594 1594 )
1595 1595 if opts.get(b'base'):
1596 1596 ui.warn(_(b"ignoring --base because --all was specified\n"))
1597 1597 base = [nullrev]
1598 1598 else:
1599 1599 base = scmutil.revrange(repo, opts.get(b'base'))
1600 1600 if cgversion not in changegroup.supportedoutgoingversions(repo):
1601 1601 raise error.Abort(
1602 1602 _(b"repository does not support bundle version %s") % cgversion
1603 1603 )
1604 1604
1605 1605 if base:
1606 1606 if dests:
1607 1607 raise error.InputError(
1608 1608 _(b"--base is incompatible with specifying destinations")
1609 1609 )
1610 1610 common = [repo[rev].node() for rev in base]
1611 1611 heads = [repo[r].node() for r in revs] if revs else None
1612 1612 outgoing = discovery.outgoing(repo, common, heads)
1613 1613 missing = outgoing.missing
1614 1614 excluded = outgoing.excluded
1615 1615 else:
1616 1616 missing = set()
1617 1617 excluded = set()
1618 1618 for path in urlutil.get_push_paths(repo, ui, dests):
1619 1619 other = hg.peer(repo, opts, path.rawloc)
1620 1620 if revs is not None:
1621 1621 hex_revs = [repo[r].hex() for r in revs]
1622 1622 else:
1623 1623 hex_revs = None
1624 1624 branches = (path.branch, [])
1625 1625 head_revs, checkout = hg.addbranchrevs(
1626 1626 repo, repo, branches, hex_revs
1627 1627 )
1628 1628 heads = (
1629 1629 head_revs
1630 1630 and pycompat.maplist(repo.lookup, head_revs)
1631 1631 or head_revs
1632 1632 )
1633 1633 outgoing = discovery.findcommonoutgoing(
1634 1634 repo,
1635 1635 other,
1636 1636 onlyheads=heads,
1637 1637 force=opts.get(b'force'),
1638 1638 portable=True,
1639 1639 )
1640 1640 missing.update(outgoing.missing)
1641 1641 excluded.update(outgoing.excluded)
1642 1642
1643 1643 if not missing:
1644 1644 scmutil.nochangesfound(ui, repo, not base and excluded)
1645 1645 return 1
1646 1646
1647 1647 if heads:
1648 1648 outgoing = discovery.outgoing(
1649 1649 repo, missingroots=missing, ancestorsof=heads
1650 1650 )
1651 1651 else:
1652 1652 outgoing = discovery.outgoing(repo, missingroots=missing)
1653 1653 outgoing.excluded = sorted(excluded)
1654 1654
1655 1655 if cgversion == b'01': # bundle1
1656 1656 bversion = b'HG10' + bundlespec.wirecompression
1657 1657 bcompression = None
1658 1658 elif cgversion in (b'02', b'03'):
1659 1659 bversion = b'HG20'
1660 1660 bcompression = bundlespec.wirecompression
1661 1661 else:
1662 1662 raise error.ProgrammingError(
1663 1663 b'bundle: unexpected changegroup version %s' % cgversion
1664 1664 )
1665 1665
1666 1666 # TODO compression options should be derived from bundlespec parsing.
1667 1667 # This is a temporary hack to allow adjusting bundle compression
1668 1668 # level without a) formalizing the bundlespec changes to declare it
1669 1669 # b) introducing a command flag.
1670 1670 compopts = {}
1671 1671 complevel = ui.configint(
1672 1672 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1673 1673 )
1674 1674 if complevel is None:
1675 1675 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1676 1676 if complevel is not None:
1677 1677 compopts[b'level'] = complevel
1678 1678
1679 1679 compthreads = ui.configint(
1680 1680 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1681 1681 )
1682 1682 if compthreads is None:
1683 1683 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1684 1684 if compthreads is not None:
1685 1685 compopts[b'threads'] = compthreads
1686 1686
1687 1687 # Bundling of obsmarker and phases is optional as not all clients
1688 1688 # support the necessary features.
1689 1689 cfg = ui.configbool
1690 1690 contentopts = {
1691 1691 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1692 1692 b'obsolescence-mandatory': cfg(
1693 1693 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1694 1694 ),
1695 1695 b'phases': cfg(b'experimental', b'bundle-phases'),
1696 1696 }
1697 1697 bundlespec.contentopts.update(contentopts)
1698 1698
1699 1699 bundle2.writenewbundle(
1700 1700 ui,
1701 1701 repo,
1702 1702 b'bundle',
1703 1703 fname,
1704 1704 bversion,
1705 1705 outgoing,
1706 1706 bundlespec.contentopts,
1707 1707 compression=bcompression,
1708 1708 compopts=compopts,
1709 1709 )
1710 1710
1711 1711
1712 1712 @command(
1713 1713 b'cat',
1714 1714 [
1715 1715 (
1716 1716 b'o',
1717 1717 b'output',
1718 1718 b'',
1719 1719 _(b'print output to file with formatted name'),
1720 1720 _(b'FORMAT'),
1721 1721 ),
1722 1722 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1723 1723 (b'', b'decode', None, _(b'apply any matching decode filter')),
1724 1724 ]
1725 1725 + walkopts
1726 1726 + formatteropts,
1727 1727 _(b'[OPTION]... FILE...'),
1728 1728 helpcategory=command.CATEGORY_FILE_CONTENTS,
1729 1729 inferrepo=True,
1730 1730 intents={INTENT_READONLY},
1731 1731 )
1732 1732 def cat(ui, repo, file1, *pats, **opts):
1733 1733 """output the current or given revision of files
1734 1734
1735 1735 Print the specified files as they were at the given revision. If
1736 1736 no revision is given, the parent of the working directory is used.
1737 1737
1738 1738 Output may be to a file, in which case the name of the file is
1739 1739 given using a template string. See :hg:`help templates`. In addition
1740 1740 to the common template keywords, the following formatting rules are
1741 1741 supported:
1742 1742
1743 1743 :``%%``: literal "%" character
1744 1744 :``%s``: basename of file being printed
1745 1745 :``%d``: dirname of file being printed, or '.' if in repository root
1746 1746 :``%p``: root-relative path name of file being printed
1747 1747 :``%H``: changeset hash (40 hexadecimal digits)
1748 1748 :``%R``: changeset revision number
1749 1749 :``%h``: short-form changeset hash (12 hexadecimal digits)
1750 1750 :``%r``: zero-padded changeset revision number
1751 1751 :``%b``: basename of the exporting repository
1752 1752 :``\\``: literal "\\" character
1753 1753
1754 1754 .. container:: verbose
1755 1755
1756 1756 Template:
1757 1757
1758 1758 The following keywords are supported in addition to the common template
1759 1759 keywords and functions. See also :hg:`help templates`.
1760 1760
1761 1761 :data: String. File content.
1762 1762 :path: String. Repository-absolute path of the file.
1763 1763
1764 1764 Returns 0 on success.
1765 1765 """
1766 1766 opts = pycompat.byteskwargs(opts)
1767 1767 rev = opts.get(b'rev')
1768 1768 if rev:
1769 1769 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1770 1770 ctx = scmutil.revsingle(repo, rev)
1771 1771 m = scmutil.match(ctx, (file1,) + pats, opts)
1772 1772 fntemplate = opts.pop(b'output', b'')
1773 1773 if cmdutil.isstdiofilename(fntemplate):
1774 1774 fntemplate = b''
1775 1775
1776 1776 if fntemplate:
1777 1777 fm = formatter.nullformatter(ui, b'cat', opts)
1778 1778 else:
1779 1779 ui.pager(b'cat')
1780 1780 fm = ui.formatter(b'cat', opts)
1781 1781 with fm:
1782 1782 return cmdutil.cat(
1783 1783 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1784 1784 )
1785 1785
1786 1786
1787 1787 @command(
1788 1788 b'clone',
1789 1789 [
1790 1790 (
1791 1791 b'U',
1792 1792 b'noupdate',
1793 1793 None,
1794 1794 _(
1795 1795 b'the clone will include an empty working '
1796 1796 b'directory (only a repository)'
1797 1797 ),
1798 1798 ),
1799 1799 (
1800 1800 b'u',
1801 1801 b'updaterev',
1802 1802 b'',
1803 1803 _(b'revision, tag, or branch to check out'),
1804 1804 _(b'REV'),
1805 1805 ),
1806 1806 (
1807 1807 b'r',
1808 1808 b'rev',
1809 1809 [],
1810 1810 _(
1811 1811 b'do not clone everything, but include this changeset'
1812 1812 b' and its ancestors'
1813 1813 ),
1814 1814 _(b'REV'),
1815 1815 ),
1816 1816 (
1817 1817 b'b',
1818 1818 b'branch',
1819 1819 [],
1820 1820 _(
1821 1821 b'do not clone everything, but include this branch\'s'
1822 1822 b' changesets and their ancestors'
1823 1823 ),
1824 1824 _(b'BRANCH'),
1825 1825 ),
1826 1826 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1827 1827 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1828 1828 (b'', b'stream', None, _(b'clone with minimal data processing')),
1829 1829 ]
1830 1830 + remoteopts,
1831 1831 _(b'[OPTION]... SOURCE [DEST]'),
1832 1832 helpcategory=command.CATEGORY_REPO_CREATION,
1833 1833 helpbasic=True,
1834 1834 norepo=True,
1835 1835 )
1836 1836 def clone(ui, source, dest=None, **opts):
1837 1837 """make a copy of an existing repository
1838 1838
1839 1839 Create a copy of an existing repository in a new directory.
1840 1840
1841 1841 If no destination directory name is specified, it defaults to the
1842 1842 basename of the source.
1843 1843
1844 1844 The location of the source is added to the new repository's
1845 1845 ``.hg/hgrc`` file, as the default to be used for future pulls.
1846 1846
1847 1847 Only local paths and ``ssh://`` URLs are supported as
1848 1848 destinations. For ``ssh://`` destinations, no working directory or
1849 1849 ``.hg/hgrc`` will be created on the remote side.
1850 1850
1851 1851 If the source repository has a bookmark called '@' set, that
1852 1852 revision will be checked out in the new repository by default.
1853 1853
1854 1854 To check out a particular version, use -u/--update, or
1855 1855 -U/--noupdate to create a clone with no working directory.
1856 1856
1857 1857 To pull only a subset of changesets, specify one or more revisions
1858 1858 identifiers with -r/--rev or branches with -b/--branch. The
1859 1859 resulting clone will contain only the specified changesets and
1860 1860 their ancestors. These options (or 'clone src#rev dest') imply
1861 1861 --pull, even for local source repositories.
1862 1862
1863 1863 In normal clone mode, the remote normalizes repository data into a common
1864 1864 exchange format and the receiving end translates this data into its local
1865 1865 storage format. --stream activates a different clone mode that essentially
1866 1866 copies repository files from the remote with minimal data processing. This
1867 1867 significantly reduces the CPU cost of a clone both remotely and locally.
1868 1868 However, it often increases the transferred data size by 30-40%. This can
1869 1869 result in substantially faster clones where I/O throughput is plentiful,
1870 1870 especially for larger repositories. A side-effect of --stream clones is
1871 1871 that storage settings and requirements on the remote are applied locally:
1872 1872 a modern client may inherit legacy or inefficient storage used by the
1873 1873 remote or a legacy Mercurial client may not be able to clone from a
1874 1874 modern Mercurial remote.
1875 1875
1876 1876 .. note::
1877 1877
1878 1878 Specifying a tag will include the tagged changeset but not the
1879 1879 changeset containing the tag.
1880 1880
1881 1881 .. container:: verbose
1882 1882
1883 1883 For efficiency, hardlinks are used for cloning whenever the
1884 1884 source and destination are on the same filesystem (note this
1885 1885 applies only to the repository data, not to the working
1886 1886 directory). Some filesystems, such as AFS, implement hardlinking
1887 1887 incorrectly, but do not report errors. In these cases, use the
1888 1888 --pull option to avoid hardlinking.
1889 1889
1890 1890 Mercurial will update the working directory to the first applicable
1891 1891 revision from this list:
1892 1892
1893 1893 a) null if -U or the source repository has no changesets
1894 1894 b) if -u . and the source repository is local, the first parent of
1895 1895 the source repository's working directory
1896 1896 c) the changeset specified with -u (if a branch name, this means the
1897 1897 latest head of that branch)
1898 1898 d) the changeset specified with -r
1899 1899 e) the tipmost head specified with -b
1900 1900 f) the tipmost head specified with the url#branch source syntax
1901 1901 g) the revision marked with the '@' bookmark, if present
1902 1902 h) the tipmost head of the default branch
1903 1903 i) tip
1904 1904
1905 1905 When cloning from servers that support it, Mercurial may fetch
1906 1906 pre-generated data from a server-advertised URL or inline from the
1907 1907 same stream. When this is done, hooks operating on incoming changesets
1908 1908 and changegroups may fire more than once, once for each pre-generated
1909 1909 bundle and as well as for any additional remaining data. In addition,
1910 1910 if an error occurs, the repository may be rolled back to a partial
1911 1911 clone. This behavior may change in future releases.
1912 1912 See :hg:`help -e clonebundles` for more.
1913 1913
1914 1914 Examples:
1915 1915
1916 1916 - clone a remote repository to a new directory named hg/::
1917 1917
1918 1918 hg clone https://www.mercurial-scm.org/repo/hg/
1919 1919
1920 1920 - create a lightweight local clone::
1921 1921
1922 1922 hg clone project/ project-feature/
1923 1923
1924 1924 - clone from an absolute path on an ssh server (note double-slash)::
1925 1925
1926 1926 hg clone ssh://user@server//home/projects/alpha/
1927 1927
1928 1928 - do a streaming clone while checking out a specified version::
1929 1929
1930 1930 hg clone --stream http://server/repo -u 1.5
1931 1931
1932 1932 - create a repository without changesets after a particular revision::
1933 1933
1934 1934 hg clone -r 04e544 experimental/ good/
1935 1935
1936 1936 - clone (and track) a particular named branch::
1937 1937
1938 1938 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1939 1939
1940 1940 See :hg:`help urls` for details on specifying URLs.
1941 1941
1942 1942 Returns 0 on success.
1943 1943 """
1944 1944 opts = pycompat.byteskwargs(opts)
1945 1945 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1946 1946
1947 1947 # --include/--exclude can come from narrow or sparse.
1948 1948 includepats, excludepats = None, None
1949 1949
1950 1950 # hg.clone() differentiates between None and an empty set. So make sure
1951 1951 # patterns are sets if narrow is requested without patterns.
1952 1952 if opts.get(b'narrow'):
1953 1953 includepats = set()
1954 1954 excludepats = set()
1955 1955
1956 1956 if opts.get(b'include'):
1957 1957 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1958 1958 if opts.get(b'exclude'):
1959 1959 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1960 1960
1961 1961 r = hg.clone(
1962 1962 ui,
1963 1963 opts,
1964 1964 source,
1965 1965 dest,
1966 1966 pull=opts.get(b'pull'),
1967 1967 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1968 1968 revs=opts.get(b'rev'),
1969 1969 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1970 1970 branch=opts.get(b'branch'),
1971 1971 shareopts=opts.get(b'shareopts'),
1972 1972 storeincludepats=includepats,
1973 1973 storeexcludepats=excludepats,
1974 1974 depth=opts.get(b'depth') or None,
1975 1975 )
1976 1976
1977 1977 return r is None
1978 1978
1979 1979
1980 1980 @command(
1981 1981 b'commit|ci',
1982 1982 [
1983 1983 (
1984 1984 b'A',
1985 1985 b'addremove',
1986 1986 None,
1987 1987 _(b'mark new/missing files as added/removed before committing'),
1988 1988 ),
1989 1989 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1990 1990 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1991 1991 (b's', b'secret', None, _(b'use the secret phase for committing')),
1992 1992 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1993 1993 (
1994 1994 b'',
1995 1995 b'force-close-branch',
1996 1996 None,
1997 1997 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1998 1998 ),
1999 1999 (b'i', b'interactive', None, _(b'use interactive mode')),
2000 2000 ]
2001 2001 + walkopts
2002 2002 + commitopts
2003 2003 + commitopts2
2004 2004 + subrepoopts,
2005 2005 _(b'[OPTION]... [FILE]...'),
2006 2006 helpcategory=command.CATEGORY_COMMITTING,
2007 2007 helpbasic=True,
2008 2008 inferrepo=True,
2009 2009 )
2010 2010 def commit(ui, repo, *pats, **opts):
2011 2011 """commit the specified files or all outstanding changes
2012 2012
2013 2013 Commit changes to the given files into the repository. Unlike a
2014 2014 centralized SCM, this operation is a local operation. See
2015 2015 :hg:`push` for a way to actively distribute your changes.
2016 2016
2017 2017 If a list of files is omitted, all changes reported by :hg:`status`
2018 2018 will be committed.
2019 2019
2020 2020 If you are committing the result of a merge, do not provide any
2021 2021 filenames or -I/-X filters.
2022 2022
2023 2023 If no commit message is specified, Mercurial starts your
2024 2024 configured editor where you can enter a message. In case your
2025 2025 commit fails, you will find a backup of your message in
2026 2026 ``.hg/last-message.txt``.
2027 2027
2028 2028 The --close-branch flag can be used to mark the current branch
2029 2029 head closed. When all heads of a branch are closed, the branch
2030 2030 will be considered closed and no longer listed.
2031 2031
2032 2032 The --amend flag can be used to amend the parent of the
2033 2033 working directory with a new commit that contains the changes
2034 2034 in the parent in addition to those currently reported by :hg:`status`,
2035 2035 if there are any. The old commit is stored in a backup bundle in
2036 2036 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2037 2037 on how to restore it).
2038 2038
2039 2039 Message, user and date are taken from the amended commit unless
2040 2040 specified. When a message isn't specified on the command line,
2041 2041 the editor will open with the message of the amended commit.
2042 2042
2043 2043 It is not possible to amend public changesets (see :hg:`help phases`)
2044 2044 or changesets that have children.
2045 2045
2046 2046 See :hg:`help dates` for a list of formats valid for -d/--date.
2047 2047
2048 2048 Returns 0 on success, 1 if nothing changed.
2049 2049
2050 2050 .. container:: verbose
2051 2051
2052 2052 Examples:
2053 2053
2054 2054 - commit all files ending in .py::
2055 2055
2056 2056 hg commit --include "set:**.py"
2057 2057
2058 2058 - commit all non-binary files::
2059 2059
2060 2060 hg commit --exclude "set:binary()"
2061 2061
2062 2062 - amend the current commit and set the date to now::
2063 2063
2064 2064 hg commit --amend --date now
2065 2065 """
2066 2066 with repo.wlock(), repo.lock():
2067 2067 return _docommit(ui, repo, *pats, **opts)
2068 2068
2069 2069
2070 2070 def _docommit(ui, repo, *pats, **opts):
2071 2071 if opts.get('interactive'):
2072 2072 opts.pop('interactive')
2073 2073 ret = cmdutil.dorecord(
2074 2074 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2075 2075 )
2076 2076 # ret can be 0 (no changes to record) or the value returned by
2077 2077 # commit(), 1 if nothing changed or None on success.
2078 2078 return 1 if ret == 0 else ret
2079 2079
2080 2080 if opts.get('subrepos'):
2081 2081 cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
2082 2082 # Let --subrepos on the command line override config setting.
2083 2083 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2084 2084
2085 2085 cmdutil.checkunfinished(repo, commit=True)
2086 2086
2087 2087 branch = repo[None].branch()
2088 2088 bheads = repo.branchheads(branch)
2089 2089 tip = repo.changelog.tip()
2090 2090
2091 2091 extra = {}
2092 2092 if opts.get('close_branch') or opts.get('force_close_branch'):
2093 2093 extra[b'close'] = b'1'
2094 2094
2095 2095 if repo[b'.'].closesbranch():
2096 2096 raise error.InputError(
2097 2097 _(b'current revision is already a branch closing head')
2098 2098 )
2099 2099 elif not bheads:
2100 2100 raise error.InputError(
2101 2101 _(b'branch "%s" has no heads to close') % branch
2102 2102 )
2103 2103 elif (
2104 2104 branch == repo[b'.'].branch()
2105 2105 and repo[b'.'].node() not in bheads
2106 2106 and not opts.get('force_close_branch')
2107 2107 ):
2108 2108 hint = _(
2109 2109 b'use --force-close-branch to close branch from a non-head'
2110 2110 b' changeset'
2111 2111 )
2112 2112 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2113 2113 elif opts.get('amend'):
2114 2114 if (
2115 2115 repo[b'.'].p1().branch() != branch
2116 2116 and repo[b'.'].p2().branch() != branch
2117 2117 ):
2118 2118 raise error.InputError(_(b'can only close branch heads'))
2119 2119
2120 2120 if opts.get('amend'):
2121 2121 if ui.configbool(b'ui', b'commitsubrepos'):
2122 2122 raise error.InputError(
2123 2123 _(b'cannot amend with ui.commitsubrepos enabled')
2124 2124 )
2125 2125
2126 2126 old = repo[b'.']
2127 2127 rewriteutil.precheck(repo, [old.rev()], b'amend')
2128 2128
2129 2129 # Currently histedit gets confused if an amend happens while histedit
2130 2130 # is in progress. Since we have a checkunfinished command, we are
2131 2131 # temporarily honoring it.
2132 2132 #
2133 2133 # Note: eventually this guard will be removed. Please do not expect
2134 2134 # this behavior to remain.
2135 2135 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2136 2136 cmdutil.checkunfinished(repo)
2137 2137
2138 2138 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2139 2139 opts = pycompat.byteskwargs(opts)
2140 2140 if node == old.node():
2141 2141 ui.status(_(b"nothing changed\n"))
2142 2142 return 1
2143 2143 else:
2144 2144
2145 2145 def commitfunc(ui, repo, message, match, opts):
2146 2146 overrides = {}
2147 2147 if opts.get(b'secret'):
2148 2148 overrides[(b'phases', b'new-commit')] = b'secret'
2149 2149
2150 2150 baseui = repo.baseui
2151 2151 with baseui.configoverride(overrides, b'commit'):
2152 2152 with ui.configoverride(overrides, b'commit'):
2153 2153 editform = cmdutil.mergeeditform(
2154 2154 repo[None], b'commit.normal'
2155 2155 )
2156 2156 editor = cmdutil.getcommiteditor(
2157 2157 editform=editform, **pycompat.strkwargs(opts)
2158 2158 )
2159 2159 return repo.commit(
2160 2160 message,
2161 2161 opts.get(b'user'),
2162 2162 opts.get(b'date'),
2163 2163 match,
2164 2164 editor=editor,
2165 2165 extra=extra,
2166 2166 )
2167 2167
2168 2168 opts = pycompat.byteskwargs(opts)
2169 2169 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2170 2170
2171 2171 if not node:
2172 2172 stat = cmdutil.postcommitstatus(repo, pats, opts)
2173 2173 if stat.deleted:
2174 2174 ui.status(
2175 2175 _(
2176 2176 b"nothing changed (%d missing files, see "
2177 2177 b"'hg status')\n"
2178 2178 )
2179 2179 % len(stat.deleted)
2180 2180 )
2181 2181 else:
2182 2182 ui.status(_(b"nothing changed\n"))
2183 2183 return 1
2184 2184
2185 2185 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2186 2186
2187 2187 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2188 2188 status(
2189 2189 ui,
2190 2190 repo,
2191 2191 modified=True,
2192 2192 added=True,
2193 2193 removed=True,
2194 2194 deleted=True,
2195 2195 unknown=True,
2196 2196 subrepos=opts.get(b'subrepos'),
2197 2197 )
2198 2198
2199 2199
2200 2200 @command(
2201 2201 b'config|showconfig|debugconfig',
2202 2202 [
2203 2203 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2204 2204 # This is experimental because we need
2205 2205 # * reasonable behavior around aliases,
2206 2206 # * decide if we display [debug] [experimental] and [devel] section par
2207 2207 # default
2208 2208 # * some way to display "generic" config entry (the one matching
2209 2209 # regexp,
2210 2210 # * proper display of the different value type
2211 2211 # * a better way to handle <DYNAMIC> values (and variable types),
2212 2212 # * maybe some type information ?
2213 2213 (
2214 2214 b'',
2215 2215 b'exp-all-known',
2216 2216 None,
2217 2217 _(b'show all known config option (EXPERIMENTAL)'),
2218 2218 ),
2219 2219 (b'e', b'edit', None, _(b'edit user config')),
2220 2220 (b'l', b'local', None, _(b'edit repository config')),
2221 2221 (b'', b'source', None, _(b'show source of configuration value')),
2222 2222 (
2223 2223 b'',
2224 2224 b'shared',
2225 2225 None,
2226 2226 _(b'edit shared source repository config (EXPERIMENTAL)'),
2227 2227 ),
2228 2228 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2229 2229 (b'g', b'global', None, _(b'edit global config')),
2230 2230 ]
2231 2231 + formatteropts,
2232 2232 _(b'[-u] [NAME]...'),
2233 2233 helpcategory=command.CATEGORY_HELP,
2234 2234 optionalrepo=True,
2235 2235 intents={INTENT_READONLY},
2236 2236 )
2237 2237 def config(ui, repo, *values, **opts):
2238 2238 """show combined config settings from all hgrc files
2239 2239
2240 2240 With no arguments, print names and values of all config items.
2241 2241
2242 2242 With one argument of the form section.name, print just the value
2243 2243 of that config item.
2244 2244
2245 2245 With multiple arguments, print names and values of all config
2246 2246 items with matching section names or section.names.
2247 2247
2248 2248 With --edit, start an editor on the user-level config file. With
2249 2249 --global, edit the system-wide config file. With --local, edit the
2250 2250 repository-level config file.
2251 2251
2252 2252 With --source, the source (filename and line number) is printed
2253 2253 for each config item.
2254 2254
2255 2255 See :hg:`help config` for more information about config files.
2256 2256
2257 2257 .. container:: verbose
2258 2258
2259 2259 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2260 2260 This file is not shared across shares when in share-safe mode.
2261 2261
2262 2262 Template:
2263 2263
2264 2264 The following keywords are supported. See also :hg:`help templates`.
2265 2265
2266 2266 :name: String. Config name.
2267 2267 :source: String. Filename and line number where the item is defined.
2268 2268 :value: String. Config value.
2269 2269
2270 2270 The --shared flag can be used to edit the config file of shared source
2271 2271 repository. It only works when you have shared using the experimental
2272 2272 share safe feature.
2273 2273
2274 2274 Returns 0 on success, 1 if NAME does not exist.
2275 2275
2276 2276 """
2277 2277
2278 2278 opts = pycompat.byteskwargs(opts)
2279 2279 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2280 2280 if any(opts.get(o) for o in editopts):
2281 2281 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2282 2282 if opts.get(b'local'):
2283 2283 if not repo:
2284 2284 raise error.InputError(
2285 2285 _(b"can't use --local outside a repository")
2286 2286 )
2287 2287 paths = [repo.vfs.join(b'hgrc')]
2288 2288 elif opts.get(b'global'):
2289 2289 paths = rcutil.systemrcpath()
2290 2290 elif opts.get(b'shared'):
2291 2291 if not repo.shared():
2292 2292 raise error.InputError(
2293 2293 _(b"repository is not shared; can't use --shared")
2294 2294 )
2295 2295 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2296 2296 raise error.InputError(
2297 2297 _(
2298 2298 b"share safe feature not enabled; "
2299 2299 b"unable to edit shared source repository config"
2300 2300 )
2301 2301 )
2302 2302 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2303 2303 elif opts.get(b'non_shared'):
2304 2304 paths = [repo.vfs.join(b'hgrc-not-shared')]
2305 2305 else:
2306 2306 paths = rcutil.userrcpath()
2307 2307
2308 2308 for f in paths:
2309 2309 if os.path.exists(f):
2310 2310 break
2311 2311 else:
2312 2312 if opts.get(b'global'):
2313 2313 samplehgrc = uimod.samplehgrcs[b'global']
2314 2314 elif opts.get(b'local'):
2315 2315 samplehgrc = uimod.samplehgrcs[b'local']
2316 2316 else:
2317 2317 samplehgrc = uimod.samplehgrcs[b'user']
2318 2318
2319 2319 f = paths[0]
2320 2320 fp = open(f, b"wb")
2321 2321 fp.write(util.tonativeeol(samplehgrc))
2322 2322 fp.close()
2323 2323
2324 2324 editor = ui.geteditor()
2325 2325 ui.system(
2326 2326 b"%s \"%s\"" % (editor, f),
2327 2327 onerr=error.InputError,
2328 2328 errprefix=_(b"edit failed"),
2329 2329 blockedtag=b'config_edit',
2330 2330 )
2331 2331 return
2332 2332 ui.pager(b'config')
2333 2333 fm = ui.formatter(b'config', opts)
2334 2334 for t, f in rcutil.rccomponents():
2335 2335 if t == b'path':
2336 2336 ui.debug(b'read config from: %s\n' % f)
2337 2337 elif t == b'resource':
2338 2338 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2339 2339 elif t == b'items':
2340 2340 # Don't print anything for 'items'.
2341 2341 pass
2342 2342 else:
2343 2343 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2344 2344 untrusted = bool(opts.get(b'untrusted'))
2345 2345
2346 2346 selsections = selentries = []
2347 2347 if values:
2348 2348 selsections = [v for v in values if b'.' not in v]
2349 2349 selentries = [v for v in values if b'.' in v]
2350 2350 uniquesel = len(selentries) == 1 and not selsections
2351 2351 selsections = set(selsections)
2352 2352 selentries = set(selentries)
2353 2353
2354 2354 matched = False
2355 2355 all_known = opts[b'exp_all_known']
2356 2356 show_source = ui.debugflag or opts.get(b'source')
2357 2357 entries = ui.walkconfig(untrusted=untrusted, all_known=all_known)
2358 2358 for section, name, value in entries:
2359 2359 source = ui.configsource(section, name, untrusted)
2360 2360 value = pycompat.bytestr(value)
2361 2361 defaultvalue = ui.configdefault(section, name)
2362 2362 if fm.isplain():
2363 2363 source = source or b'none'
2364 2364 value = value.replace(b'\n', b'\\n')
2365 2365 entryname = section + b'.' + name
2366 2366 if values and not (section in selsections or entryname in selentries):
2367 2367 continue
2368 2368 fm.startitem()
2369 2369 fm.condwrite(show_source, b'source', b'%s: ', source)
2370 2370 if uniquesel:
2371 2371 fm.data(name=entryname)
2372 2372 fm.write(b'value', b'%s\n', value)
2373 2373 else:
2374 2374 fm.write(b'name value', b'%s=%s\n', entryname, value)
2375 2375 if formatter.isprintable(defaultvalue):
2376 2376 fm.data(defaultvalue=defaultvalue)
2377 2377 elif isinstance(defaultvalue, list) and all(
2378 2378 formatter.isprintable(e) for e in defaultvalue
2379 2379 ):
2380 2380 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2381 2381 # TODO: no idea how to process unsupported defaultvalue types
2382 2382 matched = True
2383 2383 fm.end()
2384 2384 if matched:
2385 2385 return 0
2386 2386 return 1
2387 2387
2388 2388
2389 2389 @command(
2390 2390 b'continue',
2391 2391 dryrunopts,
2392 2392 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2393 2393 helpbasic=True,
2394 2394 )
2395 2395 def continuecmd(ui, repo, **opts):
2396 2396 """resumes an interrupted operation (EXPERIMENTAL)
2397 2397
2398 2398 Finishes a multistep operation like graft, histedit, rebase, merge,
2399 2399 and unshelve if they are in an interrupted state.
2400 2400
2401 2401 use --dry-run/-n to dry run the command.
2402 2402 """
2403 2403 dryrun = opts.get('dry_run')
2404 2404 contstate = cmdutil.getunfinishedstate(repo)
2405 2405 if not contstate:
2406 2406 raise error.StateError(_(b'no operation in progress'))
2407 2407 if not contstate.continuefunc:
2408 2408 raise error.StateError(
2409 2409 (
2410 2410 _(b"%s in progress but does not support 'hg continue'")
2411 2411 % (contstate._opname)
2412 2412 ),
2413 2413 hint=contstate.continuemsg(),
2414 2414 )
2415 2415 if dryrun:
2416 2416 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2417 2417 return
2418 2418 return contstate.continuefunc(ui, repo)
2419 2419
2420 2420
2421 2421 @command(
2422 2422 b'copy|cp',
2423 2423 [
2424 2424 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2425 2425 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2426 2426 (
2427 2427 b'',
2428 2428 b'at-rev',
2429 2429 b'',
2430 2430 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2431 2431 _(b'REV'),
2432 2432 ),
2433 2433 (
2434 2434 b'f',
2435 2435 b'force',
2436 2436 None,
2437 2437 _(b'forcibly copy over an existing managed file'),
2438 2438 ),
2439 2439 ]
2440 2440 + walkopts
2441 2441 + dryrunopts,
2442 2442 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2443 2443 helpcategory=command.CATEGORY_FILE_CONTENTS,
2444 2444 )
2445 2445 def copy(ui, repo, *pats, **opts):
2446 2446 """mark files as copied for the next commit
2447 2447
2448 2448 Mark dest as having copies of source files. If dest is a
2449 2449 directory, copies are put in that directory. If dest is a file,
2450 2450 the source must be a single file.
2451 2451
2452 2452 By default, this command copies the contents of files as they
2453 2453 exist in the working directory. If invoked with -A/--after, the
2454 2454 operation is recorded, but no copying is performed.
2455 2455
2456 2456 To undo marking a destination file as copied, use --forget. With that
2457 2457 option, all given (positional) arguments are unmarked as copies. The
2458 2458 destination file(s) will be left in place (still tracked). Note that
2459 2459 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2460 2460
2461 2461 This command takes effect with the next commit by default.
2462 2462
2463 2463 Returns 0 on success, 1 if errors are encountered.
2464 2464 """
2465 2465 opts = pycompat.byteskwargs(opts)
2466 2466 with repo.wlock():
2467 2467 return cmdutil.copy(ui, repo, pats, opts)
2468 2468
2469 2469
2470 2470 @command(
2471 2471 b'debugcommands',
2472 2472 [],
2473 2473 _(b'[COMMAND]'),
2474 2474 helpcategory=command.CATEGORY_HELP,
2475 2475 norepo=True,
2476 2476 )
2477 2477 def debugcommands(ui, cmd=b'', *args):
2478 2478 """list all available commands and options"""
2479 2479 for cmd, vals in sorted(pycompat.iteritems(table)):
2480 2480 cmd = cmd.split(b'|')[0]
2481 2481 opts = b', '.join([i[1] for i in vals[1]])
2482 2482 ui.write(b'%s: %s\n' % (cmd, opts))
2483 2483
2484 2484
2485 2485 @command(
2486 2486 b'debugcomplete',
2487 2487 [(b'o', b'options', None, _(b'show the command options'))],
2488 2488 _(b'[-o] CMD'),
2489 2489 helpcategory=command.CATEGORY_HELP,
2490 2490 norepo=True,
2491 2491 )
2492 2492 def debugcomplete(ui, cmd=b'', **opts):
2493 2493 """returns the completion list associated with the given command"""
2494 2494
2495 2495 if opts.get('options'):
2496 2496 options = []
2497 2497 otables = [globalopts]
2498 2498 if cmd:
2499 2499 aliases, entry = cmdutil.findcmd(cmd, table, False)
2500 2500 otables.append(entry[1])
2501 2501 for t in otables:
2502 2502 for o in t:
2503 2503 if b"(DEPRECATED)" in o[3]:
2504 2504 continue
2505 2505 if o[0]:
2506 2506 options.append(b'-%s' % o[0])
2507 2507 options.append(b'--%s' % o[1])
2508 2508 ui.write(b"%s\n" % b"\n".join(options))
2509 2509 return
2510 2510
2511 2511 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2512 2512 if ui.verbose:
2513 2513 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2514 2514 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2515 2515
2516 2516
2517 2517 @command(
2518 2518 b'diff',
2519 2519 [
2520 2520 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2521 2521 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2522 2522 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2523 2523 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2524 2524 ]
2525 2525 + diffopts
2526 2526 + diffopts2
2527 2527 + walkopts
2528 2528 + subrepoopts,
2529 2529 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2530 2530 helpcategory=command.CATEGORY_FILE_CONTENTS,
2531 2531 helpbasic=True,
2532 2532 inferrepo=True,
2533 2533 intents={INTENT_READONLY},
2534 2534 )
2535 2535 def diff(ui, repo, *pats, **opts):
2536 2536 """diff repository (or selected files)
2537 2537
2538 2538 Show differences between revisions for the specified files.
2539 2539
2540 2540 Differences between files are shown using the unified diff format.
2541 2541
2542 2542 .. note::
2543 2543
2544 2544 :hg:`diff` may generate unexpected results for merges, as it will
2545 2545 default to comparing against the working directory's first
2546 2546 parent changeset if no revisions are specified.
2547 2547
2548 2548 By default, the working directory files are compared to its first parent. To
2549 2549 see the differences from another revision, use --from. To see the difference
2550 2550 to another revision, use --to. For example, :hg:`diff --from .^` will show
2551 2551 the differences from the working copy's grandparent to the working copy,
2552 2552 :hg:`diff --to .` will show the diff from the working copy to its parent
2553 2553 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2554 2554 show the diff between those two revisions.
2555 2555
2556 2556 Alternatively you can specify -c/--change with a revision to see the changes
2557 2557 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2558 2558 equivalent to :hg:`diff --from 42^ --to 42`)
2559 2559
2560 2560 Without the -a/--text option, diff will avoid generating diffs of
2561 2561 files it detects as binary. With -a, diff will generate a diff
2562 2562 anyway, probably with undesirable results.
2563 2563
2564 2564 Use the -g/--git option to generate diffs in the git extended diff
2565 2565 format. For more information, read :hg:`help diffs`.
2566 2566
2567 2567 .. container:: verbose
2568 2568
2569 2569 Examples:
2570 2570
2571 2571 - compare a file in the current working directory to its parent::
2572 2572
2573 2573 hg diff foo.c
2574 2574
2575 2575 - compare two historical versions of a directory, with rename info::
2576 2576
2577 2577 hg diff --git --from 1.0 --to 1.2 lib/
2578 2578
2579 2579 - get change stats relative to the last change on some date::
2580 2580
2581 2581 hg diff --stat --from "date('may 2')"
2582 2582
2583 2583 - diff all newly-added files that contain a keyword::
2584 2584
2585 2585 hg diff "set:added() and grep(GNU)"
2586 2586
2587 2587 - compare a revision and its parents::
2588 2588
2589 2589 hg diff -c 9353 # compare against first parent
2590 2590 hg diff --from 9353^ --to 9353 # same using revset syntax
2591 2591 hg diff --from 9353^2 --to 9353 # compare against the second parent
2592 2592
2593 2593 Returns 0 on success.
2594 2594 """
2595 2595
2596 2596 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2597 2597 opts = pycompat.byteskwargs(opts)
2598 2598 revs = opts.get(b'rev')
2599 2599 change = opts.get(b'change')
2600 2600 from_rev = opts.get(b'from')
2601 2601 to_rev = opts.get(b'to')
2602 2602 stat = opts.get(b'stat')
2603 2603 reverse = opts.get(b'reverse')
2604 2604
2605 2605 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2606 2606 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2607 2607 if change:
2608 2608 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2609 2609 ctx2 = scmutil.revsingle(repo, change, None)
2610 2610 ctx1 = logcmdutil.diff_parent(ctx2)
2611 2611 elif from_rev or to_rev:
2612 2612 repo = scmutil.unhidehashlikerevs(
2613 2613 repo, [from_rev] + [to_rev], b'nowarn'
2614 2614 )
2615 2615 ctx1 = scmutil.revsingle(repo, from_rev, None)
2616 2616 ctx2 = scmutil.revsingle(repo, to_rev, None)
2617 2617 else:
2618 2618 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2619 2619 ctx1, ctx2 = scmutil.revpair(repo, revs)
2620 2620
2621 2621 if reverse:
2622 2622 ctxleft = ctx2
2623 2623 ctxright = ctx1
2624 2624 else:
2625 2625 ctxleft = ctx1
2626 2626 ctxright = ctx2
2627 2627
2628 2628 diffopts = patch.diffallopts(ui, opts)
2629 2629 m = scmutil.match(ctx2, pats, opts)
2630 2630 m = repo.narrowmatch(m)
2631 2631 ui.pager(b'diff')
2632 2632 logcmdutil.diffordiffstat(
2633 2633 ui,
2634 2634 repo,
2635 2635 diffopts,
2636 2636 ctxleft,
2637 2637 ctxright,
2638 2638 m,
2639 2639 stat=stat,
2640 2640 listsubrepos=opts.get(b'subrepos'),
2641 2641 root=opts.get(b'root'),
2642 2642 )
2643 2643
2644 2644
2645 2645 @command(
2646 2646 b'export',
2647 2647 [
2648 2648 (
2649 2649 b'B',
2650 2650 b'bookmark',
2651 2651 b'',
2652 2652 _(b'export changes only reachable by given bookmark'),
2653 2653 _(b'BOOKMARK'),
2654 2654 ),
2655 2655 (
2656 2656 b'o',
2657 2657 b'output',
2658 2658 b'',
2659 2659 _(b'print output to file with formatted name'),
2660 2660 _(b'FORMAT'),
2661 2661 ),
2662 2662 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2663 2663 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2664 2664 ]
2665 2665 + diffopts
2666 2666 + formatteropts,
2667 2667 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2668 2668 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2669 2669 helpbasic=True,
2670 2670 intents={INTENT_READONLY},
2671 2671 )
2672 2672 def export(ui, repo, *changesets, **opts):
2673 2673 """dump the header and diffs for one or more changesets
2674 2674
2675 2675 Print the changeset header and diffs for one or more revisions.
2676 2676 If no revision is given, the parent of the working directory is used.
2677 2677
2678 2678 The information shown in the changeset header is: author, date,
2679 2679 branch name (if non-default), changeset hash, parent(s) and commit
2680 2680 comment.
2681 2681
2682 2682 .. note::
2683 2683
2684 2684 :hg:`export` may generate unexpected diff output for merge
2685 2685 changesets, as it will compare the merge changeset against its
2686 2686 first parent only.
2687 2687
2688 2688 Output may be to a file, in which case the name of the file is
2689 2689 given using a template string. See :hg:`help templates`. In addition
2690 2690 to the common template keywords, the following formatting rules are
2691 2691 supported:
2692 2692
2693 2693 :``%%``: literal "%" character
2694 2694 :``%H``: changeset hash (40 hexadecimal digits)
2695 2695 :``%N``: number of patches being generated
2696 2696 :``%R``: changeset revision number
2697 2697 :``%b``: basename of the exporting repository
2698 2698 :``%h``: short-form changeset hash (12 hexadecimal digits)
2699 2699 :``%m``: first line of the commit message (only alphanumeric characters)
2700 2700 :``%n``: zero-padded sequence number, starting at 1
2701 2701 :``%r``: zero-padded changeset revision number
2702 2702 :``\\``: literal "\\" character
2703 2703
2704 2704 Without the -a/--text option, export will avoid generating diffs
2705 2705 of files it detects as binary. With -a, export will generate a
2706 2706 diff anyway, probably with undesirable results.
2707 2707
2708 2708 With -B/--bookmark changesets reachable by the given bookmark are
2709 2709 selected.
2710 2710
2711 2711 Use the -g/--git option to generate diffs in the git extended diff
2712 2712 format. See :hg:`help diffs` for more information.
2713 2713
2714 2714 With the --switch-parent option, the diff will be against the
2715 2715 second parent. It can be useful to review a merge.
2716 2716
2717 2717 .. container:: verbose
2718 2718
2719 2719 Template:
2720 2720
2721 2721 The following keywords are supported in addition to the common template
2722 2722 keywords and functions. See also :hg:`help templates`.
2723 2723
2724 2724 :diff: String. Diff content.
2725 2725 :parents: List of strings. Parent nodes of the changeset.
2726 2726
2727 2727 Examples:
2728 2728
2729 2729 - use export and import to transplant a bugfix to the current
2730 2730 branch::
2731 2731
2732 2732 hg export -r 9353 | hg import -
2733 2733
2734 2734 - export all the changesets between two revisions to a file with
2735 2735 rename information::
2736 2736
2737 2737 hg export --git -r 123:150 > changes.txt
2738 2738
2739 2739 - split outgoing changes into a series of patches with
2740 2740 descriptive names::
2741 2741
2742 2742 hg export -r "outgoing()" -o "%n-%m.patch"
2743 2743
2744 2744 Returns 0 on success.
2745 2745 """
2746 2746 opts = pycompat.byteskwargs(opts)
2747 2747 bookmark = opts.get(b'bookmark')
2748 2748 changesets += tuple(opts.get(b'rev', []))
2749 2749
2750 2750 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2751 2751
2752 2752 if bookmark:
2753 2753 if bookmark not in repo._bookmarks:
2754 2754 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2755 2755
2756 2756 revs = scmutil.bookmarkrevs(repo, bookmark)
2757 2757 else:
2758 2758 if not changesets:
2759 2759 changesets = [b'.']
2760 2760
2761 2761 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2762 2762 revs = scmutil.revrange(repo, changesets)
2763 2763
2764 2764 if not revs:
2765 2765 raise error.InputError(_(b"export requires at least one changeset"))
2766 2766 if len(revs) > 1:
2767 2767 ui.note(_(b'exporting patches:\n'))
2768 2768 else:
2769 2769 ui.note(_(b'exporting patch:\n'))
2770 2770
2771 2771 fntemplate = opts.get(b'output')
2772 2772 if cmdutil.isstdiofilename(fntemplate):
2773 2773 fntemplate = b''
2774 2774
2775 2775 if fntemplate:
2776 2776 fm = formatter.nullformatter(ui, b'export', opts)
2777 2777 else:
2778 2778 ui.pager(b'export')
2779 2779 fm = ui.formatter(b'export', opts)
2780 2780 with fm:
2781 2781 cmdutil.export(
2782 2782 repo,
2783 2783 revs,
2784 2784 fm,
2785 2785 fntemplate=fntemplate,
2786 2786 switch_parent=opts.get(b'switch_parent'),
2787 2787 opts=patch.diffallopts(ui, opts),
2788 2788 )
2789 2789
2790 2790
2791 2791 @command(
2792 2792 b'files',
2793 2793 [
2794 2794 (
2795 2795 b'r',
2796 2796 b'rev',
2797 2797 b'',
2798 2798 _(b'search the repository as it is in REV'),
2799 2799 _(b'REV'),
2800 2800 ),
2801 2801 (
2802 2802 b'0',
2803 2803 b'print0',
2804 2804 None,
2805 2805 _(b'end filenames with NUL, for use with xargs'),
2806 2806 ),
2807 2807 ]
2808 2808 + walkopts
2809 2809 + formatteropts
2810 2810 + subrepoopts,
2811 2811 _(b'[OPTION]... [FILE]...'),
2812 2812 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2813 2813 intents={INTENT_READONLY},
2814 2814 )
2815 2815 def files(ui, repo, *pats, **opts):
2816 2816 """list tracked files
2817 2817
2818 2818 Print files under Mercurial control in the working directory or
2819 2819 specified revision for given files (excluding removed files).
2820 2820 Files can be specified as filenames or filesets.
2821 2821
2822 2822 If no files are given to match, this command prints the names
2823 2823 of all files under Mercurial control.
2824 2824
2825 2825 .. container:: verbose
2826 2826
2827 2827 Template:
2828 2828
2829 2829 The following keywords are supported in addition to the common template
2830 2830 keywords and functions. See also :hg:`help templates`.
2831 2831
2832 2832 :flags: String. Character denoting file's symlink and executable bits.
2833 2833 :path: String. Repository-absolute path of the file.
2834 2834 :size: Integer. Size of the file in bytes.
2835 2835
2836 2836 Examples:
2837 2837
2838 2838 - list all files under the current directory::
2839 2839
2840 2840 hg files .
2841 2841
2842 2842 - shows sizes and flags for current revision::
2843 2843
2844 2844 hg files -vr .
2845 2845
2846 2846 - list all files named README::
2847 2847
2848 2848 hg files -I "**/README"
2849 2849
2850 2850 - list all binary files::
2851 2851
2852 2852 hg files "set:binary()"
2853 2853
2854 2854 - find files containing a regular expression::
2855 2855
2856 2856 hg files "set:grep('bob')"
2857 2857
2858 2858 - search tracked file contents with xargs and grep::
2859 2859
2860 2860 hg files -0 | xargs -0 grep foo
2861 2861
2862 2862 See :hg:`help patterns` and :hg:`help filesets` for more information
2863 2863 on specifying file patterns.
2864 2864
2865 2865 Returns 0 if a match is found, 1 otherwise.
2866 2866
2867 2867 """
2868 2868
2869 2869 opts = pycompat.byteskwargs(opts)
2870 2870 rev = opts.get(b'rev')
2871 2871 if rev:
2872 2872 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2873 2873 ctx = scmutil.revsingle(repo, rev, None)
2874 2874
2875 2875 end = b'\n'
2876 2876 if opts.get(b'print0'):
2877 2877 end = b'\0'
2878 2878 fmt = b'%s' + end
2879 2879
2880 2880 m = scmutil.match(ctx, pats, opts)
2881 2881 ui.pager(b'files')
2882 2882 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2883 2883 with ui.formatter(b'files', opts) as fm:
2884 2884 return cmdutil.files(
2885 2885 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2886 2886 )
2887 2887
2888 2888
2889 2889 @command(
2890 2890 b'forget',
2891 2891 [
2892 2892 (b'i', b'interactive', None, _(b'use interactive mode')),
2893 2893 ]
2894 2894 + walkopts
2895 2895 + dryrunopts,
2896 2896 _(b'[OPTION]... FILE...'),
2897 2897 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2898 2898 helpbasic=True,
2899 2899 inferrepo=True,
2900 2900 )
2901 2901 def forget(ui, repo, *pats, **opts):
2902 2902 """forget the specified files on the next commit
2903 2903
2904 2904 Mark the specified files so they will no longer be tracked
2905 2905 after the next commit.
2906 2906
2907 2907 This only removes files from the current branch, not from the
2908 2908 entire project history, and it does not delete them from the
2909 2909 working directory.
2910 2910
2911 2911 To delete the file from the working directory, see :hg:`remove`.
2912 2912
2913 2913 To undo a forget before the next commit, see :hg:`add`.
2914 2914
2915 2915 .. container:: verbose
2916 2916
2917 2917 Examples:
2918 2918
2919 2919 - forget newly-added binary files::
2920 2920
2921 2921 hg forget "set:added() and binary()"
2922 2922
2923 2923 - forget files that would be excluded by .hgignore::
2924 2924
2925 2925 hg forget "set:hgignore()"
2926 2926
2927 2927 Returns 0 on success.
2928 2928 """
2929 2929
2930 2930 opts = pycompat.byteskwargs(opts)
2931 2931 if not pats:
2932 2932 raise error.InputError(_(b'no files specified'))
2933 2933
2934 2934 m = scmutil.match(repo[None], pats, opts)
2935 2935 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2936 2936 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2937 2937 rejected = cmdutil.forget(
2938 2938 ui,
2939 2939 repo,
2940 2940 m,
2941 2941 prefix=b"",
2942 2942 uipathfn=uipathfn,
2943 2943 explicitonly=False,
2944 2944 dryrun=dryrun,
2945 2945 interactive=interactive,
2946 2946 )[0]
2947 2947 return rejected and 1 or 0
2948 2948
2949 2949
2950 2950 @command(
2951 2951 b'graft',
2952 2952 [
2953 2953 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2954 2954 (
2955 2955 b'',
2956 2956 b'base',
2957 2957 b'',
2958 2958 _(b'base revision when doing the graft merge (ADVANCED)'),
2959 2959 _(b'REV'),
2960 2960 ),
2961 2961 (b'c', b'continue', False, _(b'resume interrupted graft')),
2962 2962 (b'', b'stop', False, _(b'stop interrupted graft')),
2963 2963 (b'', b'abort', False, _(b'abort interrupted graft')),
2964 2964 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2965 2965 (b'', b'log', None, _(b'append graft info to log message')),
2966 2966 (
2967 2967 b'',
2968 2968 b'no-commit',
2969 2969 None,
2970 2970 _(b"don't commit, just apply the changes in working directory"),
2971 2971 ),
2972 2972 (b'f', b'force', False, _(b'force graft')),
2973 2973 (
2974 2974 b'D',
2975 2975 b'currentdate',
2976 2976 False,
2977 2977 _(b'record the current date as commit date'),
2978 2978 ),
2979 2979 (
2980 2980 b'U',
2981 2981 b'currentuser',
2982 2982 False,
2983 2983 _(b'record the current user as committer'),
2984 2984 ),
2985 2985 ]
2986 2986 + commitopts2
2987 2987 + mergetoolopts
2988 2988 + dryrunopts,
2989 2989 _(b'[OPTION]... [-r REV]... REV...'),
2990 2990 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2991 2991 )
2992 2992 def graft(ui, repo, *revs, **opts):
2993 2993 """copy changes from other branches onto the current branch
2994 2994
2995 2995 This command uses Mercurial's merge logic to copy individual
2996 2996 changes from other branches without merging branches in the
2997 2997 history graph. This is sometimes known as 'backporting' or
2998 2998 'cherry-picking'. By default, graft will copy user, date, and
2999 2999 description from the source changesets.
3000 3000
3001 3001 Changesets that are ancestors of the current revision, that have
3002 3002 already been grafted, or that are merges will be skipped.
3003 3003
3004 3004 If --log is specified, log messages will have a comment appended
3005 3005 of the form::
3006 3006
3007 3007 (grafted from CHANGESETHASH)
3008 3008
3009 3009 If --force is specified, revisions will be grafted even if they
3010 3010 are already ancestors of, or have been grafted to, the destination.
3011 3011 This is useful when the revisions have since been backed out.
3012 3012
3013 3013 If a graft merge results in conflicts, the graft process is
3014 3014 interrupted so that the current merge can be manually resolved.
3015 3015 Once all conflicts are addressed, the graft process can be
3016 3016 continued with the -c/--continue option.
3017 3017
3018 3018 The -c/--continue option reapplies all the earlier options.
3019 3019
3020 3020 .. container:: verbose
3021 3021
3022 3022 The --base option exposes more of how graft internally uses merge with a
3023 3023 custom base revision. --base can be used to specify another ancestor than
3024 3024 the first and only parent.
3025 3025
3026 3026 The command::
3027 3027
3028 3028 hg graft -r 345 --base 234
3029 3029
3030 3030 is thus pretty much the same as::
3031 3031
3032 3032 hg diff --from 234 --to 345 | hg import
3033 3033
3034 3034 but using merge to resolve conflicts and track moved files.
3035 3035
3036 3036 The result of a merge can thus be backported as a single commit by
3037 3037 specifying one of the merge parents as base, and thus effectively
3038 3038 grafting the changes from the other side.
3039 3039
3040 3040 It is also possible to collapse multiple changesets and clean up history
3041 3041 by specifying another ancestor as base, much like rebase --collapse
3042 3042 --keep.
3043 3043
3044 3044 The commit message can be tweaked after the fact using commit --amend .
3045 3045
3046 3046 For using non-ancestors as the base to backout changes, see the backout
3047 3047 command and the hidden --parent option.
3048 3048
3049 3049 .. container:: verbose
3050 3050
3051 3051 Examples:
3052 3052
3053 3053 - copy a single change to the stable branch and edit its description::
3054 3054
3055 3055 hg update stable
3056 3056 hg graft --edit 9393
3057 3057
3058 3058 - graft a range of changesets with one exception, updating dates::
3059 3059
3060 3060 hg graft -D "2085::2093 and not 2091"
3061 3061
3062 3062 - continue a graft after resolving conflicts::
3063 3063
3064 3064 hg graft -c
3065 3065
3066 3066 - show the source of a grafted changeset::
3067 3067
3068 3068 hg log --debug -r .
3069 3069
3070 3070 - show revisions sorted by date::
3071 3071
3072 3072 hg log -r "sort(all(), date)"
3073 3073
3074 3074 - backport the result of a merge as a single commit::
3075 3075
3076 3076 hg graft -r 123 --base 123^
3077 3077
3078 3078 - land a feature branch as one changeset::
3079 3079
3080 3080 hg up -cr default
3081 3081 hg graft -r featureX --base "ancestor('featureX', 'default')"
3082 3082
3083 3083 See :hg:`help revisions` for more about specifying revisions.
3084 3084
3085 3085 Returns 0 on successful completion, 1 if there are unresolved files.
3086 3086 """
3087 3087 with repo.wlock():
3088 3088 return _dograft(ui, repo, *revs, **opts)
3089 3089
3090 3090
3091 3091 def _dograft(ui, repo, *revs, **opts):
3092 3092 if revs and opts.get('rev'):
3093 3093 ui.warn(
3094 3094 _(
3095 3095 b'warning: inconsistent use of --rev might give unexpected '
3096 3096 b'revision ordering!\n'
3097 3097 )
3098 3098 )
3099 3099
3100 3100 revs = list(revs)
3101 3101 revs.extend(opts.get('rev'))
3102 3102 # a dict of data to be stored in state file
3103 3103 statedata = {}
3104 3104 # list of new nodes created by ongoing graft
3105 3105 statedata[b'newnodes'] = []
3106 3106
3107 3107 cmdutil.resolve_commit_options(ui, opts)
3108 3108
3109 3109 editor = cmdutil.getcommiteditor(editform=b'graft', **opts)
3110 3110
3111 3111 cmdutil.check_at_most_one_arg(opts, 'abort', 'stop', 'continue')
3112 3112
3113 3113 cont = False
3114 3114 if opts.get('no_commit'):
3115 3115 cmdutil.check_incompatible_arguments(
3116 3116 opts,
3117 3117 'no_commit',
3118 3118 ['edit', 'currentuser', 'currentdate', 'log'],
3119 3119 )
3120 3120
3121 3121 graftstate = statemod.cmdstate(repo, b'graftstate')
3122 3122
3123 3123 if opts.get('stop'):
3124 3124 cmdutil.check_incompatible_arguments(
3125 3125 opts,
3126 3126 'stop',
3127 3127 [
3128 3128 'edit',
3129 3129 'log',
3130 3130 'user',
3131 3131 'date',
3132 3132 'currentdate',
3133 3133 'currentuser',
3134 3134 'rev',
3135 3135 ],
3136 3136 )
3137 3137 return _stopgraft(ui, repo, graftstate)
3138 3138 elif opts.get('abort'):
3139 3139 cmdutil.check_incompatible_arguments(
3140 3140 opts,
3141 3141 'abort',
3142 3142 [
3143 3143 'edit',
3144 3144 'log',
3145 3145 'user',
3146 3146 'date',
3147 3147 'currentdate',
3148 3148 'currentuser',
3149 3149 'rev',
3150 3150 ],
3151 3151 )
3152 3152 return cmdutil.abortgraft(ui, repo, graftstate)
3153 3153 elif opts.get('continue'):
3154 3154 cont = True
3155 3155 if revs:
3156 3156 raise error.InputError(_(b"can't specify --continue and revisions"))
3157 3157 # read in unfinished revisions
3158 3158 if graftstate.exists():
3159 3159 statedata = cmdutil.readgraftstate(repo, graftstate)
3160 3160 if statedata.get(b'date'):
3161 3161 opts['date'] = statedata[b'date']
3162 3162 if statedata.get(b'user'):
3163 3163 opts['user'] = statedata[b'user']
3164 3164 if statedata.get(b'log'):
3165 3165 opts['log'] = True
3166 3166 if statedata.get(b'no_commit'):
3167 3167 opts['no_commit'] = statedata.get(b'no_commit')
3168 3168 if statedata.get(b'base'):
3169 3169 opts['base'] = statedata.get(b'base')
3170 3170 nodes = statedata[b'nodes']
3171 3171 revs = [repo[node].rev() for node in nodes]
3172 3172 else:
3173 3173 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3174 3174 else:
3175 3175 if not revs:
3176 3176 raise error.InputError(_(b'no revisions specified'))
3177 3177 cmdutil.checkunfinished(repo)
3178 3178 cmdutil.bailifchanged(repo)
3179 3179 revs = scmutil.revrange(repo, revs)
3180 3180
3181 3181 skipped = set()
3182 3182 basectx = None
3183 3183 if opts.get('base'):
3184 3184 basectx = scmutil.revsingle(repo, opts['base'], None)
3185 3185 if basectx is None:
3186 3186 # check for merges
3187 3187 for rev in repo.revs(b'%ld and merge()', revs):
3188 3188 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3189 3189 skipped.add(rev)
3190 3190 revs = [r for r in revs if r not in skipped]
3191 3191 if not revs:
3192 3192 return -1
3193 3193 if basectx is not None and len(revs) != 1:
3194 3194 raise error.InputError(_(b'only one revision allowed with --base '))
3195 3195
3196 3196 # Don't check in the --continue case, in effect retaining --force across
3197 3197 # --continues. That's because without --force, any revisions we decided to
3198 3198 # skip would have been filtered out here, so they wouldn't have made their
3199 3199 # way to the graftstate. With --force, any revisions we would have otherwise
3200 3200 # skipped would not have been filtered out, and if they hadn't been applied
3201 3201 # already, they'd have been in the graftstate.
3202 3202 if not (cont or opts.get('force')) and basectx is None:
3203 3203 # check for ancestors of dest branch
3204 3204 ancestors = repo.revs(b'%ld & (::.)', revs)
3205 3205 for rev in ancestors:
3206 3206 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3207 3207
3208 3208 revs = [r for r in revs if r not in ancestors]
3209 3209
3210 3210 if not revs:
3211 3211 return -1
3212 3212
3213 3213 # analyze revs for earlier grafts
3214 3214 ids = {}
3215 3215 for ctx in repo.set(b"%ld", revs):
3216 3216 ids[ctx.hex()] = ctx.rev()
3217 3217 n = ctx.extra().get(b'source')
3218 3218 if n:
3219 3219 ids[n] = ctx.rev()
3220 3220
3221 3221 # check ancestors for earlier grafts
3222 3222 ui.debug(b'scanning for duplicate grafts\n')
3223 3223
3224 3224 # The only changesets we can be sure doesn't contain grafts of any
3225 3225 # revs, are the ones that are common ancestors of *all* revs:
3226 3226 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3227 3227 ctx = repo[rev]
3228 3228 n = ctx.extra().get(b'source')
3229 3229 if n in ids:
3230 3230 try:
3231 3231 r = repo[n].rev()
3232 3232 except error.RepoLookupError:
3233 3233 r = None
3234 3234 if r in revs:
3235 3235 ui.warn(
3236 3236 _(
3237 3237 b'skipping revision %d:%s '
3238 3238 b'(already grafted to %d:%s)\n'
3239 3239 )
3240 3240 % (r, repo[r], rev, ctx)
3241 3241 )
3242 3242 revs.remove(r)
3243 3243 elif ids[n] in revs:
3244 3244 if r is None:
3245 3245 ui.warn(
3246 3246 _(
3247 3247 b'skipping already grafted revision %d:%s '
3248 3248 b'(%d:%s also has unknown origin %s)\n'
3249 3249 )
3250 3250 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3251 3251 )
3252 3252 else:
3253 3253 ui.warn(
3254 3254 _(
3255 3255 b'skipping already grafted revision %d:%s '
3256 3256 b'(%d:%s also has origin %d:%s)\n'
3257 3257 )
3258 3258 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3259 3259 )
3260 3260 revs.remove(ids[n])
3261 3261 elif ctx.hex() in ids:
3262 3262 r = ids[ctx.hex()]
3263 3263 if r in revs:
3264 3264 ui.warn(
3265 3265 _(
3266 3266 b'skipping already grafted revision %d:%s '
3267 3267 b'(was grafted from %d:%s)\n'
3268 3268 )
3269 3269 % (r, repo[r], rev, ctx)
3270 3270 )
3271 3271 revs.remove(r)
3272 3272 if not revs:
3273 3273 return -1
3274 3274
3275 3275 if opts.get('no_commit'):
3276 3276 statedata[b'no_commit'] = True
3277 3277 if opts.get('base'):
3278 3278 statedata[b'base'] = opts['base']
3279 3279 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3280 3280 desc = b'%d:%s "%s"' % (
3281 3281 ctx.rev(),
3282 3282 ctx,
3283 3283 ctx.description().split(b'\n', 1)[0],
3284 3284 )
3285 3285 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3286 3286 if names:
3287 3287 desc += b' (%s)' % b' '.join(names)
3288 3288 ui.status(_(b'grafting %s\n') % desc)
3289 3289 if opts.get('dry_run'):
3290 3290 continue
3291 3291
3292 3292 source = ctx.extra().get(b'source')
3293 3293 extra = {}
3294 3294 if source:
3295 3295 extra[b'source'] = source
3296 3296 extra[b'intermediate-source'] = ctx.hex()
3297 3297 else:
3298 3298 extra[b'source'] = ctx.hex()
3299 3299 user = ctx.user()
3300 3300 if opts.get('user'):
3301 3301 user = opts['user']
3302 3302 statedata[b'user'] = user
3303 3303 date = ctx.date()
3304 3304 if opts.get('date'):
3305 3305 date = opts['date']
3306 3306 statedata[b'date'] = date
3307 3307 message = ctx.description()
3308 3308 if opts.get('log'):
3309 3309 message += b'\n(grafted from %s)' % ctx.hex()
3310 3310 statedata[b'log'] = True
3311 3311
3312 3312 # we don't merge the first commit when continuing
3313 3313 if not cont:
3314 3314 # perform the graft merge with p1(rev) as 'ancestor'
3315 3315 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
3316 3316 base = ctx.p1() if basectx is None else basectx
3317 3317 with ui.configoverride(overrides, b'graft'):
3318 3318 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3319 3319 # report any conflicts
3320 3320 if stats.unresolvedcount > 0:
3321 3321 # write out state for --continue
3322 3322 nodes = [repo[rev].hex() for rev in revs[pos:]]
3323 3323 statedata[b'nodes'] = nodes
3324 3324 stateversion = 1
3325 3325 graftstate.save(stateversion, statedata)
3326 3326 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3327 3327 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3328 3328 return 1
3329 3329 else:
3330 3330 cont = False
3331 3331
3332 3332 # commit if --no-commit is false
3333 3333 if not opts.get('no_commit'):
3334 3334 node = repo.commit(
3335 3335 text=message, user=user, date=date, extra=extra, editor=editor
3336 3336 )
3337 3337 if node is None:
3338 3338 ui.warn(
3339 3339 _(b'note: graft of %d:%s created no changes to commit\n')
3340 3340 % (ctx.rev(), ctx)
3341 3341 )
3342 3342 # checking that newnodes exist because old state files won't have it
3343 3343 elif statedata.get(b'newnodes') is not None:
3344 3344 nn = statedata[b'newnodes'] # type: List[bytes]
3345 3345 nn.append(node)
3346 3346
3347 3347 # remove state when we complete successfully
3348 3348 if not opts.get('dry_run'):
3349 3349 graftstate.delete()
3350 3350
3351 3351 return 0
3352 3352
3353 3353
3354 3354 def _stopgraft(ui, repo, graftstate):
3355 3355 """stop the interrupted graft"""
3356 3356 if not graftstate.exists():
3357 3357 raise error.StateError(_(b"no interrupted graft found"))
3358 3358 pctx = repo[b'.']
3359 3359 mergemod.clean_update(pctx)
3360 3360 graftstate.delete()
3361 3361 ui.status(_(b"stopped the interrupted graft\n"))
3362 3362 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3363 3363 return 0
3364 3364
3365 3365
3366 3366 statemod.addunfinished(
3367 3367 b'graft',
3368 3368 fname=b'graftstate',
3369 3369 clearable=True,
3370 3370 stopflag=True,
3371 3371 continueflag=True,
3372 3372 abortfunc=cmdutil.hgabortgraft,
3373 3373 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3374 3374 )
3375 3375
3376 3376
3377 3377 @command(
3378 3378 b'grep',
3379 3379 [
3380 3380 (b'0', b'print0', None, _(b'end fields with NUL')),
3381 3381 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3382 3382 (
3383 3383 b'',
3384 3384 b'diff',
3385 3385 None,
3386 3386 _(
3387 3387 b'search revision differences for when the pattern was added '
3388 3388 b'or removed'
3389 3389 ),
3390 3390 ),
3391 3391 (b'a', b'text', None, _(b'treat all files as text')),
3392 3392 (
3393 3393 b'f',
3394 3394 b'follow',
3395 3395 None,
3396 3396 _(
3397 3397 b'follow changeset history,'
3398 3398 b' or file history across copies and renames'
3399 3399 ),
3400 3400 ),
3401 3401 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3402 3402 (
3403 3403 b'l',
3404 3404 b'files-with-matches',
3405 3405 None,
3406 3406 _(b'print only filenames and revisions that match'),
3407 3407 ),
3408 3408 (b'n', b'line-number', None, _(b'print matching line numbers')),
3409 3409 (
3410 3410 b'r',
3411 3411 b'rev',
3412 3412 [],
3413 3413 _(b'search files changed within revision range'),
3414 3414 _(b'REV'),
3415 3415 ),
3416 3416 (
3417 3417 b'',
3418 3418 b'all-files',
3419 3419 None,
3420 3420 _(
3421 3421 b'include all files in the changeset while grepping (DEPRECATED)'
3422 3422 ),
3423 3423 ),
3424 3424 (b'u', b'user', None, _(b'list the author (long with -v)')),
3425 3425 (b'd', b'date', None, _(b'list the date (short with -q)')),
3426 3426 ]
3427 3427 + formatteropts
3428 3428 + walkopts,
3429 3429 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3430 3430 helpcategory=command.CATEGORY_FILE_CONTENTS,
3431 3431 inferrepo=True,
3432 3432 intents={INTENT_READONLY},
3433 3433 )
3434 3434 def grep(ui, repo, pattern, *pats, **opts):
3435 3435 """search for a pattern in specified files
3436 3436
3437 3437 Search the working directory or revision history for a regular
3438 3438 expression in the specified files for the entire repository.
3439 3439
3440 3440 By default, grep searches the repository files in the working
3441 3441 directory and prints the files where it finds a match. To specify
3442 3442 historical revisions instead of the working directory, use the
3443 3443 --rev flag.
3444 3444
3445 3445 To search instead historical revision differences that contains a
3446 3446 change in match status ("-" for a match that becomes a non-match,
3447 3447 or "+" for a non-match that becomes a match), use the --diff flag.
3448 3448
3449 3449 PATTERN can be any Python (roughly Perl-compatible) regular
3450 3450 expression.
3451 3451
3452 3452 If no FILEs are specified and the --rev flag isn't supplied, all
3453 3453 files in the working directory are searched. When using the --rev
3454 3454 flag and specifying FILEs, use the --follow argument to also
3455 3455 follow the specified FILEs across renames and copies.
3456 3456
3457 3457 .. container:: verbose
3458 3458
3459 3459 Template:
3460 3460
3461 3461 The following keywords are supported in addition to the common template
3462 3462 keywords and functions. See also :hg:`help templates`.
3463 3463
3464 3464 :change: String. Character denoting insertion ``+`` or removal ``-``.
3465 3465 Available if ``--diff`` is specified.
3466 3466 :lineno: Integer. Line number of the match.
3467 3467 :path: String. Repository-absolute path of the file.
3468 3468 :texts: List of text chunks.
3469 3469
3470 3470 And each entry of ``{texts}`` provides the following sub-keywords.
3471 3471
3472 3472 :matched: Boolean. True if the chunk matches the specified pattern.
3473 3473 :text: String. Chunk content.
3474 3474
3475 3475 See :hg:`help templates.operators` for the list expansion syntax.
3476 3476
3477 3477 Returns 0 if a match is found, 1 otherwise.
3478 3478
3479 3479 """
3480 3480 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3481 3481 opts = pycompat.byteskwargs(opts)
3482 3482 diff = opts.get(b'all') or opts.get(b'diff')
3483 3483 follow = opts.get(b'follow')
3484 3484 if opts.get(b'all_files') is None and not diff:
3485 3485 opts[b'all_files'] = True
3486 3486 plaingrep = (
3487 3487 opts.get(b'all_files')
3488 3488 and not opts.get(b'rev')
3489 3489 and not opts.get(b'follow')
3490 3490 )
3491 3491 all_files = opts.get(b'all_files')
3492 3492 if plaingrep:
3493 3493 opts[b'rev'] = [b'wdir()']
3494 3494
3495 3495 reflags = re.M
3496 3496 if opts.get(b'ignore_case'):
3497 3497 reflags |= re.I
3498 3498 try:
3499 3499 regexp = util.re.compile(pattern, reflags)
3500 3500 except re.error as inst:
3501 3501 ui.warn(
3502 3502 _(b"grep: invalid match pattern: %s\n")
3503 3503 % stringutil.forcebytestr(inst)
3504 3504 )
3505 3505 return 1
3506 3506 sep, eol = b':', b'\n'
3507 3507 if opts.get(b'print0'):
3508 3508 sep = eol = b'\0'
3509 3509
3510 3510 searcher = grepmod.grepsearcher(
3511 3511 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3512 3512 )
3513 3513
3514 3514 getfile = searcher._getfile
3515 3515
3516 3516 uipathfn = scmutil.getuipathfn(repo)
3517 3517
3518 3518 def display(fm, fn, ctx, pstates, states):
3519 3519 rev = scmutil.intrev(ctx)
3520 3520 if fm.isplain():
3521 3521 formatuser = ui.shortuser
3522 3522 else:
3523 3523 formatuser = pycompat.bytestr
3524 3524 if ui.quiet:
3525 3525 datefmt = b'%Y-%m-%d'
3526 3526 else:
3527 3527 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3528 3528 found = False
3529 3529
3530 3530 @util.cachefunc
3531 3531 def binary():
3532 3532 flog = getfile(fn)
3533 3533 try:
3534 3534 return stringutil.binary(flog.read(ctx.filenode(fn)))
3535 3535 except error.WdirUnsupported:
3536 3536 return ctx[fn].isbinary()
3537 3537
3538 3538 fieldnamemap = {b'linenumber': b'lineno'}
3539 3539 if diff:
3540 3540 iter = grepmod.difflinestates(pstates, states)
3541 3541 else:
3542 3542 iter = [(b'', l) for l in states]
3543 3543 for change, l in iter:
3544 3544 fm.startitem()
3545 3545 fm.context(ctx=ctx)
3546 3546 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3547 3547 fm.plain(uipathfn(fn), label=b'grep.filename')
3548 3548
3549 3549 cols = [
3550 3550 (b'rev', b'%d', rev, not plaingrep, b''),
3551 3551 (
3552 3552 b'linenumber',
3553 3553 b'%d',
3554 3554 l.linenum,
3555 3555 opts.get(b'line_number'),
3556 3556 b'',
3557 3557 ),
3558 3558 ]
3559 3559 if diff:
3560 3560 cols.append(
3561 3561 (
3562 3562 b'change',
3563 3563 b'%s',
3564 3564 change,
3565 3565 True,
3566 3566 b'grep.inserted '
3567 3567 if change == b'+'
3568 3568 else b'grep.deleted ',
3569 3569 )
3570 3570 )
3571 3571 cols.extend(
3572 3572 [
3573 3573 (
3574 3574 b'user',
3575 3575 b'%s',
3576 3576 formatuser(ctx.user()),
3577 3577 opts.get(b'user'),
3578 3578 b'',
3579 3579 ),
3580 3580 (
3581 3581 b'date',
3582 3582 b'%s',
3583 3583 fm.formatdate(ctx.date(), datefmt),
3584 3584 opts.get(b'date'),
3585 3585 b'',
3586 3586 ),
3587 3587 ]
3588 3588 )
3589 3589 for name, fmt, data, cond, extra_label in cols:
3590 3590 if cond:
3591 3591 fm.plain(sep, label=b'grep.sep')
3592 3592 field = fieldnamemap.get(name, name)
3593 3593 label = extra_label + (b'grep.%s' % name)
3594 3594 fm.condwrite(cond, field, fmt, data, label=label)
3595 3595 if not opts.get(b'files_with_matches'):
3596 3596 fm.plain(sep, label=b'grep.sep')
3597 3597 if not opts.get(b'text') and binary():
3598 3598 fm.plain(_(b" Binary file matches"))
3599 3599 else:
3600 3600 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3601 3601 fm.plain(eol)
3602 3602 found = True
3603 3603 if opts.get(b'files_with_matches'):
3604 3604 break
3605 3605 return found
3606 3606
3607 3607 def displaymatches(fm, l):
3608 3608 p = 0
3609 3609 for s, e in l.findpos(regexp):
3610 3610 if p < s:
3611 3611 fm.startitem()
3612 3612 fm.write(b'text', b'%s', l.line[p:s])
3613 3613 fm.data(matched=False)
3614 3614 fm.startitem()
3615 3615 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3616 3616 fm.data(matched=True)
3617 3617 p = e
3618 3618 if p < len(l.line):
3619 3619 fm.startitem()
3620 3620 fm.write(b'text', b'%s', l.line[p:])
3621 3621 fm.data(matched=False)
3622 3622 fm.end()
3623 3623
3624 3624 found = False
3625 3625
3626 3626 wopts = logcmdutil.walkopts(
3627 3627 pats=pats,
3628 3628 opts=opts,
3629 3629 revspec=opts[b'rev'],
3630 3630 include_pats=opts[b'include'],
3631 3631 exclude_pats=opts[b'exclude'],
3632 3632 follow=follow,
3633 3633 force_changelog_traversal=all_files,
3634 3634 filter_revisions_by_pats=not all_files,
3635 3635 )
3636 3636 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3637 3637
3638 3638 ui.pager(b'grep')
3639 3639 fm = ui.formatter(b'grep', opts)
3640 3640 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3641 3641 r = display(fm, fn, ctx, pstates, states)
3642 3642 found = found or r
3643 3643 if r and not diff and not all_files:
3644 3644 searcher.skipfile(fn, ctx.rev())
3645 3645 fm.end()
3646 3646
3647 3647 return not found
3648 3648
3649 3649
3650 3650 @command(
3651 3651 b'heads',
3652 3652 [
3653 3653 (
3654 3654 b'r',
3655 3655 b'rev',
3656 3656 b'',
3657 3657 _(b'show only heads which are descendants of STARTREV'),
3658 3658 _(b'STARTREV'),
3659 3659 ),
3660 3660 (b't', b'topo', False, _(b'show topological heads only')),
3661 3661 (
3662 3662 b'a',
3663 3663 b'active',
3664 3664 False,
3665 3665 _(b'show active branchheads only (DEPRECATED)'),
3666 3666 ),
3667 3667 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3668 3668 ]
3669 3669 + templateopts,
3670 3670 _(b'[-ct] [-r STARTREV] [REV]...'),
3671 3671 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3672 3672 intents={INTENT_READONLY},
3673 3673 )
3674 3674 def heads(ui, repo, *branchrevs, **opts):
3675 3675 """show branch heads
3676 3676
3677 3677 With no arguments, show all open branch heads in the repository.
3678 3678 Branch heads are changesets that have no descendants on the
3679 3679 same branch. They are where development generally takes place and
3680 3680 are the usual targets for update and merge operations.
3681 3681
3682 3682 If one or more REVs are given, only open branch heads on the
3683 3683 branches associated with the specified changesets are shown. This
3684 3684 means that you can use :hg:`heads .` to see the heads on the
3685 3685 currently checked-out branch.
3686 3686
3687 3687 If -c/--closed is specified, also show branch heads marked closed
3688 3688 (see :hg:`commit --close-branch`).
3689 3689
3690 3690 If STARTREV is specified, only those heads that are descendants of
3691 3691 STARTREV will be displayed.
3692 3692
3693 3693 If -t/--topo is specified, named branch mechanics will be ignored and only
3694 3694 topological heads (changesets with no children) will be shown.
3695 3695
3696 3696 Returns 0 if matching heads are found, 1 if not.
3697 3697 """
3698 3698
3699 3699 opts = pycompat.byteskwargs(opts)
3700 3700 start = None
3701 3701 rev = opts.get(b'rev')
3702 3702 if rev:
3703 3703 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3704 3704 start = scmutil.revsingle(repo, rev, None).node()
3705 3705
3706 3706 if opts.get(b'topo'):
3707 3707 heads = [repo[h] for h in repo.heads(start)]
3708 3708 else:
3709 3709 heads = []
3710 3710 for branch in repo.branchmap():
3711 3711 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3712 3712 heads = [repo[h] for h in heads]
3713 3713
3714 3714 if branchrevs:
3715 3715 branches = {
3716 3716 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3717 3717 }
3718 3718 heads = [h for h in heads if h.branch() in branches]
3719 3719
3720 3720 if opts.get(b'active') and branchrevs:
3721 3721 dagheads = repo.heads(start)
3722 3722 heads = [h for h in heads if h.node() in dagheads]
3723 3723
3724 3724 if branchrevs:
3725 3725 haveheads = {h.branch() for h in heads}
3726 3726 if branches - haveheads:
3727 3727 headless = b', '.join(b for b in branches - haveheads)
3728 3728 msg = _(b'no open branch heads found on branches %s')
3729 3729 if opts.get(b'rev'):
3730 3730 msg += _(b' (started at %s)') % opts[b'rev']
3731 3731 ui.warn((msg + b'\n') % headless)
3732 3732
3733 3733 if not heads:
3734 3734 return 1
3735 3735
3736 3736 ui.pager(b'heads')
3737 3737 heads = sorted(heads, key=lambda x: -(x.rev()))
3738 3738 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3739 3739 for ctx in heads:
3740 3740 displayer.show(ctx)
3741 3741 displayer.close()
3742 3742
3743 3743
3744 3744 @command(
3745 3745 b'help',
3746 3746 [
3747 3747 (b'e', b'extension', None, _(b'show only help for extensions')),
3748 3748 (b'c', b'command', None, _(b'show only help for commands')),
3749 3749 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3750 3750 (
3751 3751 b's',
3752 3752 b'system',
3753 3753 [],
3754 3754 _(b'show help for specific platform(s)'),
3755 3755 _(b'PLATFORM'),
3756 3756 ),
3757 3757 ],
3758 3758 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3759 3759 helpcategory=command.CATEGORY_HELP,
3760 3760 norepo=True,
3761 3761 intents={INTENT_READONLY},
3762 3762 )
3763 3763 def help_(ui, name=None, **opts):
3764 3764 """show help for a given topic or a help overview
3765 3765
3766 3766 With no arguments, print a list of commands with short help messages.
3767 3767
3768 3768 Given a topic, extension, or command name, print help for that
3769 3769 topic.
3770 3770
3771 3771 Returns 0 if successful.
3772 3772 """
3773 3773
3774 3774 keep = opts.get('system') or []
3775 3775 if len(keep) == 0:
3776 3776 if pycompat.sysplatform.startswith(b'win'):
3777 3777 keep.append(b'windows')
3778 3778 elif pycompat.sysplatform == b'OpenVMS':
3779 3779 keep.append(b'vms')
3780 3780 elif pycompat.sysplatform == b'plan9':
3781 3781 keep.append(b'plan9')
3782 3782 else:
3783 3783 keep.append(b'unix')
3784 3784 keep.append(pycompat.sysplatform.lower())
3785 3785 if ui.verbose:
3786 3786 keep.append(b'verbose')
3787 3787
3788 3788 commands = sys.modules[__name__]
3789 3789 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3790 3790 ui.pager(b'help')
3791 3791 ui.write(formatted)
3792 3792
3793 3793
3794 3794 @command(
3795 3795 b'identify|id',
3796 3796 [
3797 3797 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3798 3798 (b'n', b'num', None, _(b'show local revision number')),
3799 3799 (b'i', b'id', None, _(b'show global revision id')),
3800 3800 (b'b', b'branch', None, _(b'show branch')),
3801 3801 (b't', b'tags', None, _(b'show tags')),
3802 3802 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3803 3803 ]
3804 3804 + remoteopts
3805 3805 + formatteropts,
3806 3806 _(b'[-nibtB] [-r REV] [SOURCE]'),
3807 3807 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3808 3808 optionalrepo=True,
3809 3809 intents={INTENT_READONLY},
3810 3810 )
3811 3811 def identify(
3812 3812 ui,
3813 3813 repo,
3814 3814 source=None,
3815 3815 rev=None,
3816 3816 num=None,
3817 3817 id=None,
3818 3818 branch=None,
3819 3819 tags=None,
3820 3820 bookmarks=None,
3821 3821 **opts
3822 3822 ):
3823 3823 """identify the working directory or specified revision
3824 3824
3825 3825 Print a summary identifying the repository state at REV using one or
3826 3826 two parent hash identifiers, followed by a "+" if the working
3827 3827 directory has uncommitted changes, the branch name (if not default),
3828 3828 a list of tags, and a list of bookmarks.
3829 3829
3830 3830 When REV is not given, print a summary of the current state of the
3831 3831 repository including the working directory. Specify -r. to get information
3832 3832 of the working directory parent without scanning uncommitted changes.
3833 3833
3834 3834 Specifying a path to a repository root or Mercurial bundle will
3835 3835 cause lookup to operate on that repository/bundle.
3836 3836
3837 3837 .. container:: verbose
3838 3838
3839 3839 Template:
3840 3840
3841 3841 The following keywords are supported in addition to the common template
3842 3842 keywords and functions. See also :hg:`help templates`.
3843 3843
3844 3844 :dirty: String. Character ``+`` denoting if the working directory has
3845 3845 uncommitted changes.
3846 3846 :id: String. One or two nodes, optionally followed by ``+``.
3847 3847 :parents: List of strings. Parent nodes of the changeset.
3848 3848
3849 3849 Examples:
3850 3850
3851 3851 - generate a build identifier for the working directory::
3852 3852
3853 3853 hg id --id > build-id.dat
3854 3854
3855 3855 - find the revision corresponding to a tag::
3856 3856
3857 3857 hg id -n -r 1.3
3858 3858
3859 3859 - check the most recent revision of a remote repository::
3860 3860
3861 3861 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3862 3862
3863 3863 See :hg:`log` for generating more information about specific revisions,
3864 3864 including full hash identifiers.
3865 3865
3866 3866 Returns 0 if successful.
3867 3867 """
3868 3868
3869 3869 opts = pycompat.byteskwargs(opts)
3870 3870 if not repo and not source:
3871 3871 raise error.InputError(
3872 3872 _(b"there is no Mercurial repository here (.hg not found)")
3873 3873 )
3874 3874
3875 3875 default = not (num or id or branch or tags or bookmarks)
3876 3876 output = []
3877 3877 revs = []
3878 3878
3879 3879 peer = None
3880 3880 try:
3881 3881 if source:
3882 3882 source, branches = urlutil.get_unique_pull_path(
3883 3883 b'identify', repo, ui, source
3884 3884 )
3885 3885 # only pass ui when no repo
3886 3886 peer = hg.peer(repo or ui, opts, source)
3887 3887 repo = peer.local()
3888 3888 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3889 3889
3890 3890 fm = ui.formatter(b'identify', opts)
3891 3891 fm.startitem()
3892 3892
3893 3893 if not repo:
3894 3894 if num or branch or tags:
3895 3895 raise error.InputError(
3896 3896 _(b"can't query remote revision number, branch, or tags")
3897 3897 )
3898 3898 if not rev and revs:
3899 3899 rev = revs[0]
3900 3900 if not rev:
3901 3901 rev = b"tip"
3902 3902
3903 3903 remoterev = peer.lookup(rev)
3904 3904 hexrev = fm.hexfunc(remoterev)
3905 3905 if default or id:
3906 3906 output = [hexrev]
3907 3907 fm.data(id=hexrev)
3908 3908
3909 3909 @util.cachefunc
3910 3910 def getbms():
3911 3911 bms = []
3912 3912
3913 3913 if b'bookmarks' in peer.listkeys(b'namespaces'):
3914 3914 hexremoterev = hex(remoterev)
3915 3915 bms = [
3916 3916 bm
3917 3917 for bm, bmr in pycompat.iteritems(
3918 3918 peer.listkeys(b'bookmarks')
3919 3919 )
3920 3920 if bmr == hexremoterev
3921 3921 ]
3922 3922
3923 3923 return sorted(bms)
3924 3924
3925 3925 if fm.isplain():
3926 3926 if bookmarks:
3927 3927 output.extend(getbms())
3928 3928 elif default and not ui.quiet:
3929 3929 # multiple bookmarks for a single parent separated by '/'
3930 3930 bm = b'/'.join(getbms())
3931 3931 if bm:
3932 3932 output.append(bm)
3933 3933 else:
3934 3934 fm.data(node=hex(remoterev))
3935 3935 if bookmarks or b'bookmarks' in fm.datahint():
3936 3936 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3937 3937 else:
3938 3938 if rev:
3939 3939 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3940 3940 ctx = scmutil.revsingle(repo, rev, None)
3941 3941
3942 3942 if ctx.rev() is None:
3943 3943 ctx = repo[None]
3944 3944 parents = ctx.parents()
3945 3945 taglist = []
3946 3946 for p in parents:
3947 3947 taglist.extend(p.tags())
3948 3948
3949 3949 dirty = b""
3950 3950 if ctx.dirty(missing=True, merge=False, branch=False):
3951 3951 dirty = b'+'
3952 3952 fm.data(dirty=dirty)
3953 3953
3954 3954 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3955 3955 if default or id:
3956 3956 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3957 3957 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3958 3958
3959 3959 if num:
3960 3960 numoutput = [b"%d" % p.rev() for p in parents]
3961 3961 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3962 3962
3963 3963 fm.data(
3964 3964 parents=fm.formatlist(
3965 3965 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3966 3966 )
3967 3967 )
3968 3968 else:
3969 3969 hexoutput = fm.hexfunc(ctx.node())
3970 3970 if default or id:
3971 3971 output = [hexoutput]
3972 3972 fm.data(id=hexoutput)
3973 3973
3974 3974 if num:
3975 3975 output.append(pycompat.bytestr(ctx.rev()))
3976 3976 taglist = ctx.tags()
3977 3977
3978 3978 if default and not ui.quiet:
3979 3979 b = ctx.branch()
3980 3980 if b != b'default':
3981 3981 output.append(b"(%s)" % b)
3982 3982
3983 3983 # multiple tags for a single parent separated by '/'
3984 3984 t = b'/'.join(taglist)
3985 3985 if t:
3986 3986 output.append(t)
3987 3987
3988 3988 # multiple bookmarks for a single parent separated by '/'
3989 3989 bm = b'/'.join(ctx.bookmarks())
3990 3990 if bm:
3991 3991 output.append(bm)
3992 3992 else:
3993 3993 if branch:
3994 3994 output.append(ctx.branch())
3995 3995
3996 3996 if tags:
3997 3997 output.extend(taglist)
3998 3998
3999 3999 if bookmarks:
4000 4000 output.extend(ctx.bookmarks())
4001 4001
4002 4002 fm.data(node=ctx.hex())
4003 4003 fm.data(branch=ctx.branch())
4004 4004 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4005 4005 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4006 4006 fm.context(ctx=ctx)
4007 4007
4008 4008 fm.plain(b"%s\n" % b' '.join(output))
4009 4009 fm.end()
4010 4010 finally:
4011 4011 if peer:
4012 4012 peer.close()
4013 4013
4014 4014
4015 4015 @command(
4016 4016 b'import|patch',
4017 4017 [
4018 4018 (
4019 4019 b'p',
4020 4020 b'strip',
4021 4021 1,
4022 4022 _(
4023 4023 b'directory strip option for patch. This has the same '
4024 4024 b'meaning as the corresponding patch option'
4025 4025 ),
4026 4026 _(b'NUM'),
4027 4027 ),
4028 4028 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4029 4029 (b'', b'secret', None, _(b'use the secret phase for committing')),
4030 4030 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4031 4031 (
4032 4032 b'f',
4033 4033 b'force',
4034 4034 None,
4035 4035 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4036 4036 ),
4037 4037 (
4038 4038 b'',
4039 4039 b'no-commit',
4040 4040 None,
4041 4041 _(b"don't commit, just update the working directory"),
4042 4042 ),
4043 4043 (
4044 4044 b'',
4045 4045 b'bypass',
4046 4046 None,
4047 4047 _(b"apply patch without touching the working directory"),
4048 4048 ),
4049 4049 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4050 4050 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4051 4051 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4052 4052 (
4053 4053 b'',
4054 4054 b'import-branch',
4055 4055 None,
4056 4056 _(b'use any branch information in patch (implied by --exact)'),
4057 4057 ),
4058 4058 ]
4059 4059 + commitopts
4060 4060 + commitopts2
4061 4061 + similarityopts,
4062 4062 _(b'[OPTION]... PATCH...'),
4063 4063 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4064 4064 )
4065 4065 def import_(ui, repo, patch1=None, *patches, **opts):
4066 4066 """import an ordered set of patches
4067 4067
4068 4068 Import a list of patches and commit them individually (unless
4069 4069 --no-commit is specified).
4070 4070
4071 4071 To read a patch from standard input (stdin), use "-" as the patch
4072 4072 name. If a URL is specified, the patch will be downloaded from
4073 4073 there.
4074 4074
4075 4075 Import first applies changes to the working directory (unless
4076 4076 --bypass is specified), import will abort if there are outstanding
4077 4077 changes.
4078 4078
4079 4079 Use --bypass to apply and commit patches directly to the
4080 4080 repository, without affecting the working directory. Without
4081 4081 --exact, patches will be applied on top of the working directory
4082 4082 parent revision.
4083 4083
4084 4084 You can import a patch straight from a mail message. Even patches
4085 4085 as attachments work (to use the body part, it must have type
4086 4086 text/plain or text/x-patch). From and Subject headers of email
4087 4087 message are used as default committer and commit message. All
4088 4088 text/plain body parts before first diff are added to the commit
4089 4089 message.
4090 4090
4091 4091 If the imported patch was generated by :hg:`export`, user and
4092 4092 description from patch override values from message headers and
4093 4093 body. Values given on command line with -m/--message and -u/--user
4094 4094 override these.
4095 4095
4096 4096 If --exact is specified, import will set the working directory to
4097 4097 the parent of each patch before applying it, and will abort if the
4098 4098 resulting changeset has a different ID than the one recorded in
4099 4099 the patch. This will guard against various ways that portable
4100 4100 patch formats and mail systems might fail to transfer Mercurial
4101 4101 data or metadata. See :hg:`bundle` for lossless transmission.
4102 4102
4103 4103 Use --partial to ensure a changeset will be created from the patch
4104 4104 even if some hunks fail to apply. Hunks that fail to apply will be
4105 4105 written to a <target-file>.rej file. Conflicts can then be resolved
4106 4106 by hand before :hg:`commit --amend` is run to update the created
4107 4107 changeset. This flag exists to let people import patches that
4108 4108 partially apply without losing the associated metadata (author,
4109 4109 date, description, ...).
4110 4110
4111 4111 .. note::
4112 4112
4113 4113 When no hunks apply cleanly, :hg:`import --partial` will create
4114 4114 an empty changeset, importing only the patch metadata.
4115 4115
4116 4116 With -s/--similarity, hg will attempt to discover renames and
4117 4117 copies in the patch in the same way as :hg:`addremove`.
4118 4118
4119 4119 It is possible to use external patch programs to perform the patch
4120 4120 by setting the ``ui.patch`` configuration option. For the default
4121 4121 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4122 4122 See :hg:`help config` for more information about configuration
4123 4123 files and how to use these options.
4124 4124
4125 4125 See :hg:`help dates` for a list of formats valid for -d/--date.
4126 4126
4127 4127 .. container:: verbose
4128 4128
4129 4129 Examples:
4130 4130
4131 4131 - import a traditional patch from a website and detect renames::
4132 4132
4133 4133 hg import -s 80 http://example.com/bugfix.patch
4134 4134
4135 4135 - import a changeset from an hgweb server::
4136 4136
4137 4137 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4138 4138
4139 4139 - import all the patches in an Unix-style mbox::
4140 4140
4141 4141 hg import incoming-patches.mbox
4142 4142
4143 4143 - import patches from stdin::
4144 4144
4145 4145 hg import -
4146 4146
4147 4147 - attempt to exactly restore an exported changeset (not always
4148 4148 possible)::
4149 4149
4150 4150 hg import --exact proposed-fix.patch
4151 4151
4152 4152 - use an external tool to apply a patch which is too fuzzy for
4153 4153 the default internal tool.
4154 4154
4155 4155 hg import --config ui.patch="patch --merge" fuzzy.patch
4156 4156
4157 4157 - change the default fuzzing from 2 to a less strict 7
4158 4158
4159 4159 hg import --config ui.fuzz=7 fuzz.patch
4160 4160
4161 4161 Returns 0 on success, 1 on partial success (see --partial).
4162 4162 """
4163 4163
4164 4164 cmdutil.check_incompatible_arguments(
4165 4165 opts, 'no_commit', ['bypass', 'secret']
4166 4166 )
4167 4167 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4168 4168 opts = pycompat.byteskwargs(opts)
4169 4169 if not patch1:
4170 4170 raise error.InputError(_(b'need at least one patch to import'))
4171 4171
4172 4172 patches = (patch1,) + patches
4173 4173
4174 4174 date = opts.get(b'date')
4175 4175 if date:
4176 4176 opts[b'date'] = dateutil.parsedate(date)
4177 4177
4178 4178 exact = opts.get(b'exact')
4179 4179 update = not opts.get(b'bypass')
4180 4180 try:
4181 4181 sim = float(opts.get(b'similarity') or 0)
4182 4182 except ValueError:
4183 4183 raise error.InputError(_(b'similarity must be a number'))
4184 4184 if sim < 0 or sim > 100:
4185 4185 raise error.InputError(_(b'similarity must be between 0 and 100'))
4186 4186 if sim and not update:
4187 4187 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4188 4188
4189 4189 base = opts[b"base"]
4190 4190 msgs = []
4191 4191 ret = 0
4192 4192
4193 4193 with repo.wlock():
4194 4194 if update:
4195 4195 cmdutil.checkunfinished(repo)
4196 4196 if exact or not opts.get(b'force'):
4197 4197 cmdutil.bailifchanged(repo)
4198 4198
4199 4199 if not opts.get(b'no_commit'):
4200 4200 lock = repo.lock
4201 4201 tr = lambda: repo.transaction(b'import')
4202 4202 dsguard = util.nullcontextmanager
4203 4203 else:
4204 4204 lock = util.nullcontextmanager
4205 4205 tr = util.nullcontextmanager
4206 4206 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4207 4207 with lock(), tr(), dsguard():
4208 4208 parents = repo[None].parents()
4209 4209 for patchurl in patches:
4210 4210 if patchurl == b'-':
4211 4211 ui.status(_(b'applying patch from stdin\n'))
4212 4212 patchfile = ui.fin
4213 4213 patchurl = b'stdin' # for error message
4214 4214 else:
4215 4215 patchurl = os.path.join(base, patchurl)
4216 4216 ui.status(_(b'applying %s\n') % patchurl)
4217 4217 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4218 4218
4219 4219 haspatch = False
4220 4220 for hunk in patch.split(patchfile):
4221 4221 with patch.extract(ui, hunk) as patchdata:
4222 4222 msg, node, rej = cmdutil.tryimportone(
4223 4223 ui, repo, patchdata, parents, opts, msgs, hg.clean
4224 4224 )
4225 4225 if msg:
4226 4226 haspatch = True
4227 4227 ui.note(msg + b'\n')
4228 4228 if update or exact:
4229 4229 parents = repo[None].parents()
4230 4230 else:
4231 4231 parents = [repo[node]]
4232 4232 if rej:
4233 4233 ui.write_err(_(b"patch applied partially\n"))
4234 4234 ui.write_err(
4235 4235 _(
4236 4236 b"(fix the .rej files and run "
4237 4237 b"`hg commit --amend`)\n"
4238 4238 )
4239 4239 )
4240 4240 ret = 1
4241 4241 break
4242 4242
4243 4243 if not haspatch:
4244 4244 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4245 4245
4246 4246 if msgs:
4247 4247 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4248 4248 return ret
4249 4249
4250 4250
4251 4251 @command(
4252 4252 b'incoming|in',
4253 4253 [
4254 4254 (
4255 4255 b'f',
4256 4256 b'force',
4257 4257 None,
4258 4258 _(b'run even if remote repository is unrelated'),
4259 4259 ),
4260 4260 (b'n', b'newest-first', None, _(b'show newest record first')),
4261 4261 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4262 4262 (
4263 4263 b'r',
4264 4264 b'rev',
4265 4265 [],
4266 4266 _(b'a remote changeset intended to be added'),
4267 4267 _(b'REV'),
4268 4268 ),
4269 4269 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4270 4270 (
4271 4271 b'b',
4272 4272 b'branch',
4273 4273 [],
4274 4274 _(b'a specific branch you would like to pull'),
4275 4275 _(b'BRANCH'),
4276 4276 ),
4277 4277 ]
4278 4278 + logopts
4279 4279 + remoteopts
4280 4280 + subrepoopts,
4281 4281 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4282 4282 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4283 4283 )
4284 4284 def incoming(ui, repo, source=b"default", **opts):
4285 4285 """show new changesets found in source
4286 4286
4287 4287 Show new changesets found in the specified path/URL or the default
4288 4288 pull location. These are the changesets that would have been pulled
4289 4289 by :hg:`pull` at the time you issued this command.
4290 4290
4291 4291 See pull for valid source format details.
4292 4292
4293 4293 .. container:: verbose
4294 4294
4295 4295 With -B/--bookmarks, the result of bookmark comparison between
4296 4296 local and remote repositories is displayed. With -v/--verbose,
4297 4297 status is also displayed for each bookmark like below::
4298 4298
4299 4299 BM1 01234567890a added
4300 4300 BM2 1234567890ab advanced
4301 4301 BM3 234567890abc diverged
4302 4302 BM4 34567890abcd changed
4303 4303
4304 4304 The action taken locally when pulling depends on the
4305 4305 status of each bookmark:
4306 4306
4307 4307 :``added``: pull will create it
4308 4308 :``advanced``: pull will update it
4309 4309 :``diverged``: pull will create a divergent bookmark
4310 4310 :``changed``: result depends on remote changesets
4311 4311
4312 4312 From the point of view of pulling behavior, bookmark
4313 4313 existing only in the remote repository are treated as ``added``,
4314 4314 even if it is in fact locally deleted.
4315 4315
4316 4316 .. container:: verbose
4317 4317
4318 4318 For remote repository, using --bundle avoids downloading the
4319 4319 changesets twice if the incoming is followed by a pull.
4320 4320
4321 4321 Examples:
4322 4322
4323 4323 - show incoming changes with patches and full description::
4324 4324
4325 4325 hg incoming -vp
4326 4326
4327 4327 - show incoming changes excluding merges, store a bundle::
4328 4328
4329 4329 hg in -vpM --bundle incoming.hg
4330 4330 hg pull incoming.hg
4331 4331
4332 4332 - briefly list changes inside a bundle::
4333 4333
4334 4334 hg in changes.hg -T "{desc|firstline}\\n"
4335 4335
4336 4336 Returns 0 if there are incoming changes, 1 otherwise.
4337 4337 """
4338 4338 opts = pycompat.byteskwargs(opts)
4339 4339 if opts.get(b'graph'):
4340 4340 logcmdutil.checkunsupportedgraphflags([], opts)
4341 4341
4342 4342 def display(other, chlist, displayer):
4343 4343 revdag = logcmdutil.graphrevs(other, chlist, opts)
4344 4344 logcmdutil.displaygraph(
4345 4345 ui, repo, revdag, displayer, graphmod.asciiedges
4346 4346 )
4347 4347
4348 4348 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4349 4349 return 0
4350 4350
4351 4351 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4352 4352
4353 4353 if opts.get(b'bookmarks'):
4354 4354 srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch'))
4355 4355 for source, branches in srcs:
4356 4356 other = hg.peer(repo, opts, source)
4357 4357 try:
4358 4358 if b'bookmarks' not in other.listkeys(b'namespaces'):
4359 4359 ui.warn(_(b"remote doesn't support bookmarks\n"))
4360 4360 return 0
4361 4361 ui.pager(b'incoming')
4362 4362 ui.status(
4363 4363 _(b'comparing with %s\n') % urlutil.hidepassword(source)
4364 4364 )
4365 4365 return bookmarks.incoming(ui, repo, other)
4366 4366 finally:
4367 4367 other.close()
4368 4368
4369 4369 return hg.incoming(ui, repo, source, opts)
4370 4370
4371 4371
4372 4372 @command(
4373 4373 b'init',
4374 4374 remoteopts,
4375 4375 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4376 4376 helpcategory=command.CATEGORY_REPO_CREATION,
4377 4377 helpbasic=True,
4378 4378 norepo=True,
4379 4379 )
4380 4380 def init(ui, dest=b".", **opts):
4381 4381 """create a new repository in the given directory
4382 4382
4383 4383 Initialize a new repository in the given directory. If the given
4384 4384 directory does not exist, it will be created.
4385 4385
4386 4386 If no directory is given, the current directory is used.
4387 4387
4388 4388 It is possible to specify an ``ssh://`` URL as the destination.
4389 4389 See :hg:`help urls` for more information.
4390 4390
4391 4391 Returns 0 on success.
4392 4392 """
4393 4393 opts = pycompat.byteskwargs(opts)
4394 4394 path = urlutil.get_clone_path(ui, dest)[1]
4395 4395 peer = hg.peer(ui, opts, path, create=True)
4396 4396 peer.close()
4397 4397
4398 4398
4399 4399 @command(
4400 4400 b'locate',
4401 4401 [
4402 4402 (
4403 4403 b'r',
4404 4404 b'rev',
4405 4405 b'',
4406 4406 _(b'search the repository as it is in REV'),
4407 4407 _(b'REV'),
4408 4408 ),
4409 4409 (
4410 4410 b'0',
4411 4411 b'print0',
4412 4412 None,
4413 4413 _(b'end filenames with NUL, for use with xargs'),
4414 4414 ),
4415 4415 (
4416 4416 b'f',
4417 4417 b'fullpath',
4418 4418 None,
4419 4419 _(b'print complete paths from the filesystem root'),
4420 4420 ),
4421 4421 ]
4422 4422 + walkopts,
4423 4423 _(b'[OPTION]... [PATTERN]...'),
4424 4424 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4425 4425 )
4426 4426 def locate(ui, repo, *pats, **opts):
4427 4427 """locate files matching specific patterns (DEPRECATED)
4428 4428
4429 4429 Print files under Mercurial control in the working directory whose
4430 4430 names match the given patterns.
4431 4431
4432 4432 By default, this command searches all directories in the working
4433 4433 directory. To search just the current directory and its
4434 4434 subdirectories, use "--include .".
4435 4435
4436 4436 If no patterns are given to match, this command prints the names
4437 4437 of all files under Mercurial control in the working directory.
4438 4438
4439 4439 If you want to feed the output of this command into the "xargs"
4440 4440 command, use the -0 option to both this command and "xargs". This
4441 4441 will avoid the problem of "xargs" treating single filenames that
4442 4442 contain whitespace as multiple filenames.
4443 4443
4444 4444 See :hg:`help files` for a more versatile command.
4445 4445
4446 4446 Returns 0 if a match is found, 1 otherwise.
4447 4447 """
4448 4448 opts = pycompat.byteskwargs(opts)
4449 4449 if opts.get(b'print0'):
4450 4450 end = b'\0'
4451 4451 else:
4452 4452 end = b'\n'
4453 4453 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4454 4454
4455 4455 ret = 1
4456 4456 m = scmutil.match(
4457 4457 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4458 4458 )
4459 4459
4460 4460 ui.pager(b'locate')
4461 4461 if ctx.rev() is None:
4462 4462 # When run on the working copy, "locate" includes removed files, so
4463 4463 # we get the list of files from the dirstate.
4464 4464 filesgen = sorted(repo.dirstate.matches(m))
4465 4465 else:
4466 4466 filesgen = ctx.matches(m)
4467 4467 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4468 4468 for abs in filesgen:
4469 4469 if opts.get(b'fullpath'):
4470 4470 ui.write(repo.wjoin(abs), end)
4471 4471 else:
4472 4472 ui.write(uipathfn(abs), end)
4473 4473 ret = 0
4474 4474
4475 4475 return ret
4476 4476
4477 4477
4478 4478 @command(
4479 4479 b'log|history',
4480 4480 [
4481 4481 (
4482 4482 b'f',
4483 4483 b'follow',
4484 4484 None,
4485 4485 _(
4486 4486 b'follow changeset history, or file history across copies and renames'
4487 4487 ),
4488 4488 ),
4489 4489 (
4490 4490 b'',
4491 4491 b'follow-first',
4492 4492 None,
4493 4493 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4494 4494 ),
4495 4495 (
4496 4496 b'd',
4497 4497 b'date',
4498 4498 b'',
4499 4499 _(b'show revisions matching date spec'),
4500 4500 _(b'DATE'),
4501 4501 ),
4502 4502 (b'C', b'copies', None, _(b'show copied files')),
4503 4503 (
4504 4504 b'k',
4505 4505 b'keyword',
4506 4506 [],
4507 4507 _(b'do case-insensitive search for a given text'),
4508 4508 _(b'TEXT'),
4509 4509 ),
4510 4510 (
4511 4511 b'r',
4512 4512 b'rev',
4513 4513 [],
4514 4514 _(b'revisions to select or follow from'),
4515 4515 _(b'REV'),
4516 4516 ),
4517 4517 (
4518 4518 b'L',
4519 4519 b'line-range',
4520 4520 [],
4521 4521 _(b'follow line range of specified file (EXPERIMENTAL)'),
4522 4522 _(b'FILE,RANGE'),
4523 4523 ),
4524 4524 (
4525 4525 b'',
4526 4526 b'removed',
4527 4527 None,
4528 4528 _(b'include revisions where files were removed'),
4529 4529 ),
4530 4530 (
4531 4531 b'm',
4532 4532 b'only-merges',
4533 4533 None,
4534 4534 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4535 4535 ),
4536 4536 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4537 4537 (
4538 4538 b'',
4539 4539 b'only-branch',
4540 4540 [],
4541 4541 _(
4542 4542 b'show only changesets within the given named branch (DEPRECATED)'
4543 4543 ),
4544 4544 _(b'BRANCH'),
4545 4545 ),
4546 4546 (
4547 4547 b'b',
4548 4548 b'branch',
4549 4549 [],
4550 4550 _(b'show changesets within the given named branch'),
4551 4551 _(b'BRANCH'),
4552 4552 ),
4553 4553 (
4554 4554 b'B',
4555 4555 b'bookmark',
4556 4556 [],
4557 4557 _(b"show changesets within the given bookmark"),
4558 4558 _(b'BOOKMARK'),
4559 4559 ),
4560 4560 (
4561 4561 b'P',
4562 4562 b'prune',
4563 4563 [],
4564 4564 _(b'do not display revision or any of its ancestors'),
4565 4565 _(b'REV'),
4566 4566 ),
4567 4567 ]
4568 4568 + logopts
4569 4569 + walkopts,
4570 4570 _(b'[OPTION]... [FILE]'),
4571 4571 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4572 4572 helpbasic=True,
4573 4573 inferrepo=True,
4574 4574 intents={INTENT_READONLY},
4575 4575 )
4576 4576 def log(ui, repo, *pats, **opts):
4577 4577 """show revision history of entire repository or files
4578 4578
4579 4579 Print the revision history of the specified files or the entire
4580 4580 project.
4581 4581
4582 4582 If no revision range is specified, the default is ``tip:0`` unless
4583 4583 --follow is set.
4584 4584
4585 4585 File history is shown without following rename or copy history of
4586 4586 files. Use -f/--follow with a filename to follow history across
4587 4587 renames and copies. --follow without a filename will only show
4588 4588 ancestors of the starting revisions. The starting revisions can be
4589 4589 specified by -r/--rev, which default to the working directory parent.
4590 4590
4591 4591 By default this command prints revision number and changeset id,
4592 4592 tags, non-trivial parents, user, date and time, and a summary for
4593 4593 each commit. When the -v/--verbose switch is used, the list of
4594 4594 changed files and full commit message are shown.
4595 4595
4596 4596 With --graph the revisions are shown as an ASCII art DAG with the most
4597 4597 recent changeset at the top.
4598 4598 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4599 4599 involved in an unresolved merge conflict, '_' closes a branch,
4600 4600 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4601 4601 changeset from the lines below is a parent of the 'o' merge on the same
4602 4602 line.
4603 4603 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4604 4604 of a '|' indicates one or more revisions in a path are omitted.
4605 4605
4606 4606 .. container:: verbose
4607 4607
4608 4608 Use -L/--line-range FILE,M:N options to follow the history of lines
4609 4609 from M to N in FILE. With -p/--patch only diff hunks affecting
4610 4610 specified line range will be shown. This option requires --follow;
4611 4611 it can be specified multiple times. Currently, this option is not
4612 4612 compatible with --graph. This option is experimental.
4613 4613
4614 4614 .. note::
4615 4615
4616 4616 :hg:`log --patch` may generate unexpected diff output for merge
4617 4617 changesets, as it will only compare the merge changeset against
4618 4618 its first parent. Also, only files different from BOTH parents
4619 4619 will appear in files:.
4620 4620
4621 4621 .. note::
4622 4622
4623 4623 For performance reasons, :hg:`log FILE` may omit duplicate changes
4624 4624 made on branches and will not show removals or mode changes. To
4625 4625 see all such changes, use the --removed switch.
4626 4626
4627 4627 .. container:: verbose
4628 4628
4629 4629 .. note::
4630 4630
4631 4631 The history resulting from -L/--line-range options depends on diff
4632 4632 options; for instance if white-spaces are ignored, respective changes
4633 4633 with only white-spaces in specified line range will not be listed.
4634 4634
4635 4635 .. container:: verbose
4636 4636
4637 4637 Some examples:
4638 4638
4639 4639 - changesets with full descriptions and file lists::
4640 4640
4641 4641 hg log -v
4642 4642
4643 4643 - changesets ancestral to the working directory::
4644 4644
4645 4645 hg log -f
4646 4646
4647 4647 - last 10 commits on the current branch::
4648 4648
4649 4649 hg log -l 10 -b .
4650 4650
4651 4651 - changesets showing all modifications of a file, including removals::
4652 4652
4653 4653 hg log --removed file.c
4654 4654
4655 4655 - all changesets that touch a directory, with diffs, excluding merges::
4656 4656
4657 4657 hg log -Mp lib/
4658 4658
4659 4659 - all revision numbers that match a keyword::
4660 4660
4661 4661 hg log -k bug --template "{rev}\\n"
4662 4662
4663 4663 - the full hash identifier of the working directory parent::
4664 4664
4665 4665 hg log -r . --template "{node}\\n"
4666 4666
4667 4667 - list available log templates::
4668 4668
4669 4669 hg log -T list
4670 4670
4671 4671 - check if a given changeset is included in a tagged release::
4672 4672
4673 4673 hg log -r "a21ccf and ancestor(1.9)"
4674 4674
4675 4675 - find all changesets by some user in a date range::
4676 4676
4677 4677 hg log -k alice -d "may 2008 to jul 2008"
4678 4678
4679 4679 - summary of all changesets after the last tag::
4680 4680
4681 4681 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4682 4682
4683 4683 - changesets touching lines 13 to 23 for file.c::
4684 4684
4685 4685 hg log -L file.c,13:23
4686 4686
4687 4687 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4688 4688 main.c with patch::
4689 4689
4690 4690 hg log -L file.c,13:23 -L main.c,2:6 -p
4691 4691
4692 4692 See :hg:`help dates` for a list of formats valid for -d/--date.
4693 4693
4694 4694 See :hg:`help revisions` for more about specifying and ordering
4695 4695 revisions.
4696 4696
4697 4697 See :hg:`help templates` for more about pre-packaged styles and
4698 4698 specifying custom templates. The default template used by the log
4699 4699 command can be customized via the ``command-templates.log`` configuration
4700 4700 setting.
4701 4701
4702 4702 Returns 0 on success.
4703 4703
4704 4704 """
4705 4705 opts = pycompat.byteskwargs(opts)
4706 4706 linerange = opts.get(b'line_range')
4707 4707
4708 4708 if linerange and not opts.get(b'follow'):
4709 4709 raise error.InputError(_(b'--line-range requires --follow'))
4710 4710
4711 4711 if linerange and pats:
4712 4712 # TODO: take pats as patterns with no line-range filter
4713 4713 raise error.InputError(
4714 4714 _(b'FILE arguments are not compatible with --line-range option')
4715 4715 )
4716 4716
4717 4717 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4718 4718 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4719 4719 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4720 4720 if linerange:
4721 4721 # TODO: should follow file history from logcmdutil._initialrevs(),
4722 4722 # then filter the result by logcmdutil._makerevset() and --limit
4723 4723 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4724 4724
4725 4725 getcopies = None
4726 4726 if opts.get(b'copies'):
4727 4727 endrev = None
4728 4728 if revs:
4729 4729 endrev = revs.max() + 1
4730 4730 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4731 4731
4732 4732 ui.pager(b'log')
4733 4733 displayer = logcmdutil.changesetdisplayer(
4734 4734 ui, repo, opts, differ, buffered=True
4735 4735 )
4736 4736 if opts.get(b'graph'):
4737 4737 displayfn = logcmdutil.displaygraphrevs
4738 4738 else:
4739 4739 displayfn = logcmdutil.displayrevs
4740 4740 displayfn(ui, repo, revs, displayer, getcopies)
4741 4741
4742 4742
4743 4743 @command(
4744 4744 b'manifest',
4745 4745 [
4746 4746 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4747 4747 (b'', b'all', False, _(b"list files from all revisions")),
4748 4748 ]
4749 4749 + formatteropts,
4750 4750 _(b'[-r REV]'),
4751 4751 helpcategory=command.CATEGORY_MAINTENANCE,
4752 4752 intents={INTENT_READONLY},
4753 4753 )
4754 4754 def manifest(ui, repo, node=None, rev=None, **opts):
4755 4755 """output the current or given revision of the project manifest
4756 4756
4757 4757 Print a list of version controlled files for the given revision.
4758 4758 If no revision is given, the first parent of the working directory
4759 4759 is used, or the null revision if no revision is checked out.
4760 4760
4761 4761 With -v, print file permissions, symlink and executable bits.
4762 4762 With --debug, print file revision hashes.
4763 4763
4764 4764 If option --all is specified, the list of all files from all revisions
4765 4765 is printed. This includes deleted and renamed files.
4766 4766
4767 4767 Returns 0 on success.
4768 4768 """
4769 4769 opts = pycompat.byteskwargs(opts)
4770 4770 fm = ui.formatter(b'manifest', opts)
4771 4771
4772 4772 if opts.get(b'all'):
4773 4773 if rev or node:
4774 4774 raise error.InputError(_(b"can't specify a revision with --all"))
4775 4775
4776 4776 res = set()
4777 4777 for rev in repo:
4778 4778 ctx = repo[rev]
4779 4779 res |= set(ctx.files())
4780 4780
4781 4781 ui.pager(b'manifest')
4782 4782 for f in sorted(res):
4783 4783 fm.startitem()
4784 4784 fm.write(b"path", b'%s\n', f)
4785 4785 fm.end()
4786 4786 return
4787 4787
4788 4788 if rev and node:
4789 4789 raise error.InputError(_(b"please specify just one revision"))
4790 4790
4791 4791 if not node:
4792 4792 node = rev
4793 4793
4794 4794 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4795 4795 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4796 4796 if node:
4797 4797 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4798 4798 ctx = scmutil.revsingle(repo, node)
4799 4799 mf = ctx.manifest()
4800 4800 ui.pager(b'manifest')
4801 4801 for f in ctx:
4802 4802 fm.startitem()
4803 4803 fm.context(ctx=ctx)
4804 4804 fl = ctx[f].flags()
4805 4805 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4806 4806 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4807 4807 fm.write(b'path', b'%s\n', f)
4808 4808 fm.end()
4809 4809
4810 4810
4811 4811 @command(
4812 4812 b'merge',
4813 4813 [
4814 4814 (
4815 4815 b'f',
4816 4816 b'force',
4817 4817 None,
4818 4818 _(b'force a merge including outstanding changes (DEPRECATED)'),
4819 4819 ),
4820 4820 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4821 4821 (
4822 4822 b'P',
4823 4823 b'preview',
4824 4824 None,
4825 4825 _(b'review revisions to merge (no merge is performed)'),
4826 4826 ),
4827 4827 (b'', b'abort', None, _(b'abort the ongoing merge')),
4828 4828 ]
4829 4829 + mergetoolopts,
4830 4830 _(b'[-P] [[-r] REV]'),
4831 4831 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4832 4832 helpbasic=True,
4833 4833 )
4834 4834 def merge(ui, repo, node=None, **opts):
4835 4835 """merge another revision into working directory
4836 4836
4837 4837 The current working directory is updated with all changes made in
4838 4838 the requested revision since the last common predecessor revision.
4839 4839
4840 4840 Files that changed between either parent are marked as changed for
4841 4841 the next commit and a commit must be performed before any further
4842 4842 updates to the repository are allowed. The next commit will have
4843 4843 two parents.
4844 4844
4845 4845 ``--tool`` can be used to specify the merge tool used for file
4846 4846 merges. It overrides the HGMERGE environment variable and your
4847 4847 configuration files. See :hg:`help merge-tools` for options.
4848 4848
4849 4849 If no revision is specified, the working directory's parent is a
4850 4850 head revision, and the current branch contains exactly one other
4851 4851 head, the other head is merged with by default. Otherwise, an
4852 4852 explicit revision with which to merge must be provided.
4853 4853
4854 4854 See :hg:`help resolve` for information on handling file conflicts.
4855 4855
4856 4856 To undo an uncommitted merge, use :hg:`merge --abort` which
4857 4857 will check out a clean copy of the original merge parent, losing
4858 4858 all changes.
4859 4859
4860 4860 Returns 0 on success, 1 if there are unresolved files.
4861 4861 """
4862 4862
4863 4863 opts = pycompat.byteskwargs(opts)
4864 4864 abort = opts.get(b'abort')
4865 4865 if abort and repo.dirstate.p2() == repo.nullid:
4866 4866 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4867 4867 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4868 4868 if abort:
4869 4869 state = cmdutil.getunfinishedstate(repo)
4870 4870 if state and state._opname != b'merge':
4871 4871 raise error.StateError(
4872 4872 _(b'cannot abort merge with %s in progress') % (state._opname),
4873 4873 hint=state.hint(),
4874 4874 )
4875 4875 if node:
4876 4876 raise error.InputError(_(b"cannot specify a node with --abort"))
4877 4877 return hg.abortmerge(repo.ui, repo)
4878 4878
4879 4879 if opts.get(b'rev') and node:
4880 4880 raise error.InputError(_(b"please specify just one revision"))
4881 4881 if not node:
4882 4882 node = opts.get(b'rev')
4883 4883
4884 4884 if node:
4885 4885 ctx = scmutil.revsingle(repo, node)
4886 4886 else:
4887 4887 if ui.configbool(b'commands', b'merge.require-rev'):
4888 4888 raise error.InputError(
4889 4889 _(
4890 4890 b'configuration requires specifying revision to merge '
4891 4891 b'with'
4892 4892 )
4893 4893 )
4894 4894 ctx = repo[destutil.destmerge(repo)]
4895 4895
4896 4896 if ctx.node() is None:
4897 4897 raise error.InputError(
4898 4898 _(b'merging with the working copy has no effect')
4899 4899 )
4900 4900
4901 4901 if opts.get(b'preview'):
4902 4902 # find nodes that are ancestors of p2 but not of p1
4903 4903 p1 = repo[b'.'].node()
4904 4904 p2 = ctx.node()
4905 4905 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4906 4906
4907 4907 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4908 4908 for node in nodes:
4909 4909 displayer.show(repo[node])
4910 4910 displayer.close()
4911 4911 return 0
4912 4912
4913 4913 # ui.forcemerge is an internal variable, do not document
4914 4914 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4915 4915 with ui.configoverride(overrides, b'merge'):
4916 4916 force = opts.get(b'force')
4917 4917 labels = [b'working copy', b'merge rev']
4918 4918 return hg.merge(ctx, force=force, labels=labels)
4919 4919
4920 4920
4921 4921 statemod.addunfinished(
4922 4922 b'merge',
4923 4923 fname=None,
4924 4924 clearable=True,
4925 4925 allowcommit=True,
4926 4926 cmdmsg=_(b'outstanding uncommitted merge'),
4927 4927 abortfunc=hg.abortmerge,
4928 4928 statushint=_(
4929 4929 b'To continue: hg commit\nTo abort: hg merge --abort'
4930 4930 ),
4931 4931 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4932 4932 )
4933 4933
4934 4934
4935 4935 @command(
4936 4936 b'outgoing|out',
4937 4937 [
4938 4938 (
4939 4939 b'f',
4940 4940 b'force',
4941 4941 None,
4942 4942 _(b'run even when the destination is unrelated'),
4943 4943 ),
4944 4944 (
4945 4945 b'r',
4946 4946 b'rev',
4947 4947 [],
4948 4948 _(b'a changeset intended to be included in the destination'),
4949 4949 _(b'REV'),
4950 4950 ),
4951 4951 (b'n', b'newest-first', None, _(b'show newest record first')),
4952 4952 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4953 4953 (
4954 4954 b'b',
4955 4955 b'branch',
4956 4956 [],
4957 4957 _(b'a specific branch you would like to push'),
4958 4958 _(b'BRANCH'),
4959 4959 ),
4960 4960 ]
4961 4961 + logopts
4962 4962 + remoteopts
4963 4963 + subrepoopts,
4964 4964 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4965 4965 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4966 4966 )
4967 4967 def outgoing(ui, repo, *dests, **opts):
4968 4968 """show changesets not found in the destination
4969 4969
4970 4970 Show changesets not found in the specified destination repository
4971 4971 or the default push location. These are the changesets that would
4972 4972 be pushed if a push was requested.
4973 4973
4974 4974 See pull for details of valid destination formats.
4975 4975
4976 4976 .. container:: verbose
4977 4977
4978 4978 With -B/--bookmarks, the result of bookmark comparison between
4979 4979 local and remote repositories is displayed. With -v/--verbose,
4980 4980 status is also displayed for each bookmark like below::
4981 4981
4982 4982 BM1 01234567890a added
4983 4983 BM2 deleted
4984 4984 BM3 234567890abc advanced
4985 4985 BM4 34567890abcd diverged
4986 4986 BM5 4567890abcde changed
4987 4987
4988 4988 The action taken when pushing depends on the
4989 4989 status of each bookmark:
4990 4990
4991 4991 :``added``: push with ``-B`` will create it
4992 4992 :``deleted``: push with ``-B`` will delete it
4993 4993 :``advanced``: push will update it
4994 4994 :``diverged``: push with ``-B`` will update it
4995 4995 :``changed``: push with ``-B`` will update it
4996 4996
4997 4997 From the point of view of pushing behavior, bookmarks
4998 4998 existing only in the remote repository are treated as
4999 4999 ``deleted``, even if it is in fact added remotely.
5000 5000
5001 5001 Returns 0 if there are outgoing changes, 1 otherwise.
5002 5002 """
5003 5003 opts = pycompat.byteskwargs(opts)
5004 5004 if opts.get(b'bookmarks'):
5005 5005 for path in urlutil.get_push_paths(repo, ui, dests):
5006 5006 dest = path.pushloc or path.loc
5007 5007 other = hg.peer(repo, opts, dest)
5008 5008 try:
5009 5009 if b'bookmarks' not in other.listkeys(b'namespaces'):
5010 5010 ui.warn(_(b"remote doesn't support bookmarks\n"))
5011 5011 return 0
5012 5012 ui.status(
5013 5013 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
5014 5014 )
5015 5015 ui.pager(b'outgoing')
5016 5016 return bookmarks.outgoing(ui, repo, other)
5017 5017 finally:
5018 5018 other.close()
5019 5019
5020 5020 return hg.outgoing(ui, repo, dests, opts)
5021 5021
5022 5022
5023 5023 @command(
5024 5024 b'parents',
5025 5025 [
5026 5026 (
5027 5027 b'r',
5028 5028 b'rev',
5029 5029 b'',
5030 5030 _(b'show parents of the specified revision'),
5031 5031 _(b'REV'),
5032 5032 ),
5033 5033 ]
5034 5034 + templateopts,
5035 5035 _(b'[-r REV] [FILE]'),
5036 5036 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5037 5037 inferrepo=True,
5038 5038 )
5039 5039 def parents(ui, repo, file_=None, **opts):
5040 5040 """show the parents of the working directory or revision (DEPRECATED)
5041 5041
5042 5042 Print the working directory's parent revisions. If a revision is
5043 5043 given via -r/--rev, the parent of that revision will be printed.
5044 5044 If a file argument is given, the revision in which the file was
5045 5045 last changed (before the working directory revision or the
5046 5046 argument to --rev if given) is printed.
5047 5047
5048 5048 This command is equivalent to::
5049 5049
5050 5050 hg log -r "p1()+p2()" or
5051 5051 hg log -r "p1(REV)+p2(REV)" or
5052 5052 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5053 5053 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5054 5054
5055 5055 See :hg:`summary` and :hg:`help revsets` for related information.
5056 5056
5057 5057 Returns 0 on success.
5058 5058 """
5059 5059
5060 5060 opts = pycompat.byteskwargs(opts)
5061 5061 rev = opts.get(b'rev')
5062 5062 if rev:
5063 5063 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5064 5064 ctx = scmutil.revsingle(repo, rev, None)
5065 5065
5066 5066 if file_:
5067 5067 m = scmutil.match(ctx, (file_,), opts)
5068 5068 if m.anypats() or len(m.files()) != 1:
5069 5069 raise error.InputError(_(b'can only specify an explicit filename'))
5070 5070 file_ = m.files()[0]
5071 5071 filenodes = []
5072 5072 for cp in ctx.parents():
5073 5073 if not cp:
5074 5074 continue
5075 5075 try:
5076 5076 filenodes.append(cp.filenode(file_))
5077 5077 except error.LookupError:
5078 5078 pass
5079 5079 if not filenodes:
5080 5080 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5081 5081 p = []
5082 5082 for fn in filenodes:
5083 5083 fctx = repo.filectx(file_, fileid=fn)
5084 5084 p.append(fctx.node())
5085 5085 else:
5086 5086 p = [cp.node() for cp in ctx.parents()]
5087 5087
5088 5088 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5089 5089 for n in p:
5090 5090 if n != repo.nullid:
5091 5091 displayer.show(repo[n])
5092 5092 displayer.close()
5093 5093
5094 5094
5095 5095 @command(
5096 5096 b'paths',
5097 5097 formatteropts,
5098 5098 _(b'[NAME]'),
5099 5099 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5100 5100 optionalrepo=True,
5101 5101 intents={INTENT_READONLY},
5102 5102 )
5103 5103 def paths(ui, repo, search=None, **opts):
5104 5104 """show aliases for remote repositories
5105 5105
5106 5106 Show definition of symbolic path name NAME. If no name is given,
5107 5107 show definition of all available names.
5108 5108
5109 5109 Option -q/--quiet suppresses all output when searching for NAME
5110 5110 and shows only the path names when listing all definitions.
5111 5111
5112 5112 Path names are defined in the [paths] section of your
5113 5113 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5114 5114 repository, ``.hg/hgrc`` is used, too.
5115 5115
5116 5116 The path names ``default`` and ``default-push`` have a special
5117 5117 meaning. When performing a push or pull operation, they are used
5118 5118 as fallbacks if no location is specified on the command-line.
5119 5119 When ``default-push`` is set, it will be used for push and
5120 5120 ``default`` will be used for pull; otherwise ``default`` is used
5121 5121 as the fallback for both. When cloning a repository, the clone
5122 5122 source is written as ``default`` in ``.hg/hgrc``.
5123 5123
5124 5124 .. note::
5125 5125
5126 5126 ``default`` and ``default-push`` apply to all inbound (e.g.
5127 5127 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5128 5128 and :hg:`bundle`) operations.
5129 5129
5130 5130 See :hg:`help urls` for more information.
5131 5131
5132 5132 .. container:: verbose
5133 5133
5134 5134 Template:
5135 5135
5136 5136 The following keywords are supported. See also :hg:`help templates`.
5137 5137
5138 5138 :name: String. Symbolic name of the path alias.
5139 5139 :pushurl: String. URL for push operations.
5140 5140 :url: String. URL or directory path for the other operations.
5141 5141
5142 5142 Returns 0 on success.
5143 5143 """
5144 5144
5145 5145 opts = pycompat.byteskwargs(opts)
5146 5146
5147 5147 pathitems = urlutil.list_paths(ui, search)
5148 5148 ui.pager(b'paths')
5149 5149
5150 5150 fm = ui.formatter(b'paths', opts)
5151 5151 if fm.isplain():
5152 5152 hidepassword = urlutil.hidepassword
5153 5153 else:
5154 5154 hidepassword = bytes
5155 5155 if ui.quiet:
5156 5156 namefmt = b'%s\n'
5157 5157 else:
5158 5158 namefmt = b'%s = '
5159 5159 showsubopts = not search and not ui.quiet
5160 5160
5161 5161 for name, path in pathitems:
5162 5162 fm.startitem()
5163 5163 fm.condwrite(not search, b'name', namefmt, name)
5164 5164 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5165 5165 for subopt, value in sorted(path.suboptions.items()):
5166 5166 assert subopt not in (b'name', b'url')
5167 5167 if showsubopts:
5168 5168 fm.plain(b'%s:%s = ' % (name, subopt))
5169 5169 if isinstance(value, bool):
5170 5170 if value:
5171 5171 value = b'yes'
5172 5172 else:
5173 5173 value = b'no'
5174 5174 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5175 5175
5176 5176 fm.end()
5177 5177
5178 5178 if search and not pathitems:
5179 5179 if not ui.quiet:
5180 5180 ui.warn(_(b"not found!\n"))
5181 5181 return 1
5182 5182 else:
5183 5183 return 0
5184 5184
5185 5185
5186 5186 @command(
5187 5187 b'phase',
5188 5188 [
5189 5189 (b'p', b'public', False, _(b'set changeset phase to public')),
5190 5190 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5191 5191 (b's', b'secret', False, _(b'set changeset phase to secret')),
5192 5192 (b'f', b'force', False, _(b'allow to move boundary backward')),
5193 5193 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5194 5194 ],
5195 5195 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5196 5196 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5197 5197 )
5198 5198 def phase(ui, repo, *revs, **opts):
5199 5199 """set or show the current phase name
5200 5200
5201 5201 With no argument, show the phase name of the current revision(s).
5202 5202
5203 5203 With one of -p/--public, -d/--draft or -s/--secret, change the
5204 5204 phase value of the specified revisions.
5205 5205
5206 5206 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5207 5207 lower phase to a higher phase. Phases are ordered as follows::
5208 5208
5209 5209 public < draft < secret
5210 5210
5211 5211 Returns 0 on success, 1 if some phases could not be changed.
5212 5212
5213 5213 (For more information about the phases concept, see :hg:`help phases`.)
5214 5214 """
5215 5215 opts = pycompat.byteskwargs(opts)
5216 5216 # search for a unique phase argument
5217 5217 targetphase = None
5218 5218 for idx, name in enumerate(phases.cmdphasenames):
5219 5219 if opts[name]:
5220 5220 if targetphase is not None:
5221 5221 raise error.InputError(_(b'only one phase can be specified'))
5222 5222 targetphase = idx
5223 5223
5224 5224 # look for specified revision
5225 5225 revs = list(revs)
5226 5226 revs.extend(opts[b'rev'])
5227 5227 if not revs:
5228 5228 # display both parents as the second parent phase can influence
5229 5229 # the phase of a merge commit
5230 5230 revs = [c.rev() for c in repo[None].parents()]
5231 5231
5232 5232 revs = scmutil.revrange(repo, revs)
5233 5233
5234 5234 ret = 0
5235 5235 if targetphase is None:
5236 5236 # display
5237 5237 for r in revs:
5238 5238 ctx = repo[r]
5239 5239 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5240 5240 else:
5241 5241 with repo.lock(), repo.transaction(b"phase") as tr:
5242 5242 # set phase
5243 5243 if not revs:
5244 5244 raise error.InputError(_(b'empty revision set'))
5245 5245 nodes = [repo[r].node() for r in revs]
5246 5246 # moving revision from public to draft may hide them
5247 5247 # We have to check result on an unfiltered repository
5248 5248 unfi = repo.unfiltered()
5249 5249 getphase = unfi._phasecache.phase
5250 5250 olddata = [getphase(unfi, r) for r in unfi]
5251 5251 phases.advanceboundary(repo, tr, targetphase, nodes)
5252 5252 if opts[b'force']:
5253 5253 phases.retractboundary(repo, tr, targetphase, nodes)
5254 5254 getphase = unfi._phasecache.phase
5255 5255 newdata = [getphase(unfi, r) for r in unfi]
5256 5256 changes = sum(newdata[r] != olddata[r] for r in unfi)
5257 5257 cl = unfi.changelog
5258 5258 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5259 5259 if rejected:
5260 5260 ui.warn(
5261 5261 _(
5262 5262 b'cannot move %i changesets to a higher '
5263 5263 b'phase, use --force\n'
5264 5264 )
5265 5265 % len(rejected)
5266 5266 )
5267 5267 ret = 1
5268 5268 if changes:
5269 5269 msg = _(b'phase changed for %i changesets\n') % changes
5270 5270 if ret:
5271 5271 ui.status(msg)
5272 5272 else:
5273 5273 ui.note(msg)
5274 5274 else:
5275 5275 ui.warn(_(b'no phases changed\n'))
5276 5276 return ret
5277 5277
5278 5278
5279 5279 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5280 5280 """Run after a changegroup has been added via pull/unbundle
5281 5281
5282 5282 This takes arguments below:
5283 5283
5284 5284 :modheads: change of heads by pull/unbundle
5285 5285 :optupdate: updating working directory is needed or not
5286 5286 :checkout: update destination revision (or None to default destination)
5287 5287 :brev: a name, which might be a bookmark to be activated after updating
5288 5288
5289 5289 return True if update raise any conflict, False otherwise.
5290 5290 """
5291 5291 if modheads == 0:
5292 5292 return False
5293 5293 if optupdate:
5294 5294 try:
5295 5295 return hg.updatetotally(ui, repo, checkout, brev)
5296 5296 except error.UpdateAbort as inst:
5297 5297 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5298 5298 hint = inst.hint
5299 5299 raise error.UpdateAbort(msg, hint=hint)
5300 5300 if modheads is not None and modheads > 1:
5301 5301 currentbranchheads = len(repo.branchheads())
5302 5302 if currentbranchheads == modheads:
5303 5303 ui.status(
5304 5304 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5305 5305 )
5306 5306 elif currentbranchheads > 1:
5307 5307 ui.status(
5308 5308 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5309 5309 )
5310 5310 else:
5311 5311 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5312 5312 elif not ui.configbool(b'commands', b'update.requiredest'):
5313 5313 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5314 5314 return False
5315 5315
5316 5316
5317 5317 @command(
5318 5318 b'pull',
5319 5319 [
5320 5320 (
5321 5321 b'u',
5322 5322 b'update',
5323 5323 None,
5324 5324 _(b'update to new branch head if new descendants were pulled'),
5325 5325 ),
5326 5326 (
5327 5327 b'f',
5328 5328 b'force',
5329 5329 None,
5330 5330 _(b'run even when remote repository is unrelated'),
5331 5331 ),
5332 5332 (
5333 5333 b'',
5334 5334 b'confirm',
5335 5335 None,
5336 5336 _(b'confirm pull before applying changes'),
5337 5337 ),
5338 5338 (
5339 5339 b'r',
5340 5340 b'rev',
5341 5341 [],
5342 5342 _(b'a remote changeset intended to be added'),
5343 5343 _(b'REV'),
5344 5344 ),
5345 5345 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5346 5346 (
5347 5347 b'b',
5348 5348 b'branch',
5349 5349 [],
5350 5350 _(b'a specific branch you would like to pull'),
5351 5351 _(b'BRANCH'),
5352 5352 ),
5353 5353 ]
5354 5354 + remoteopts,
5355 5355 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5356 5356 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5357 5357 helpbasic=True,
5358 5358 )
5359 5359 def pull(ui, repo, *sources, **opts):
5360 5360 """pull changes from the specified source
5361 5361
5362 5362 Pull changes from a remote repository to a local one.
5363 5363
5364 5364 This finds all changes from the repository at the specified path
5365 5365 or URL and adds them to a local repository (the current one unless
5366 5366 -R is specified). By default, this does not update the copy of the
5367 5367 project in the working directory.
5368 5368
5369 5369 When cloning from servers that support it, Mercurial may fetch
5370 5370 pre-generated data. When this is done, hooks operating on incoming
5371 5371 changesets and changegroups may fire more than once, once for each
5372 5372 pre-generated bundle and as well as for any additional remaining
5373 5373 data. See :hg:`help -e clonebundles` for more.
5374 5374
5375 5375 Use :hg:`incoming` if you want to see what would have been added
5376 5376 by a pull at the time you issued this command. If you then decide
5377 5377 to add those changes to the repository, you should use :hg:`pull
5378 5378 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5379 5379
5380 5380 If SOURCE is omitted, the 'default' path will be used.
5381 5381 See :hg:`help urls` for more information.
5382 5382
5383 5383 If multiple sources are specified, they will be pulled sequentially as if
5384 5384 the command was run multiple time. If --update is specify and the command
5385 5385 will stop at the first failed --update.
5386 5386
5387 5387 Specifying bookmark as ``.`` is equivalent to specifying the active
5388 5388 bookmark's name.
5389 5389
5390 5390 Returns 0 on success, 1 if an update had unresolved files.
5391 5391 """
5392 5392
5393 5393 opts = pycompat.byteskwargs(opts)
5394 5394 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5395 5395 b'update'
5396 5396 ):
5397 5397 msg = _(b'update destination required by configuration')
5398 5398 hint = _(b'use hg pull followed by hg update DEST')
5399 5399 raise error.InputError(msg, hint=hint)
5400 5400
5401 5401 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5402 5402 for source, branches in sources:
5403 5403 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5404 5404 ui.flush()
5405 5405 other = hg.peer(repo, opts, source)
5406 5406 update_conflict = None
5407 5407 try:
5408 5408 revs, checkout = hg.addbranchrevs(
5409 5409 repo, other, branches, opts.get(b'rev')
5410 5410 )
5411 5411
5412 5412 pullopargs = {}
5413 5413
5414 5414 nodes = None
5415 5415 if opts.get(b'bookmark') or revs:
5416 5416 # The list of bookmark used here is the same used to actually update
5417 5417 # the bookmark names, to avoid the race from issue 4689 and we do
5418 5418 # all lookup and bookmark queries in one go so they see the same
5419 5419 # version of the server state (issue 4700).
5420 5420 nodes = []
5421 5421 fnodes = []
5422 5422 revs = revs or []
5423 5423 if revs and not other.capable(b'lookup'):
5424 5424 err = _(
5425 5425 b"other repository doesn't support revision lookup, "
5426 5426 b"so a rev cannot be specified."
5427 5427 )
5428 5428 raise error.Abort(err)
5429 5429 with other.commandexecutor() as e:
5430 5430 fremotebookmarks = e.callcommand(
5431 5431 b'listkeys', {b'namespace': b'bookmarks'}
5432 5432 )
5433 5433 for r in revs:
5434 5434 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5435 5435 remotebookmarks = fremotebookmarks.result()
5436 5436 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5437 5437 pullopargs[b'remotebookmarks'] = remotebookmarks
5438 5438 for b in opts.get(b'bookmark', []):
5439 5439 b = repo._bookmarks.expandname(b)
5440 5440 if b not in remotebookmarks:
5441 5441 raise error.InputError(
5442 5442 _(b'remote bookmark %s not found!') % b
5443 5443 )
5444 5444 nodes.append(remotebookmarks[b])
5445 5445 for i, rev in enumerate(revs):
5446 5446 node = fnodes[i].result()
5447 5447 nodes.append(node)
5448 5448 if rev == checkout:
5449 5449 checkout = node
5450 5450
5451 5451 wlock = util.nullcontextmanager()
5452 5452 if opts.get(b'update'):
5453 5453 wlock = repo.wlock()
5454 5454 with wlock:
5455 5455 pullopargs.update(opts.get(b'opargs', {}))
5456 5456 modheads = exchange.pull(
5457 5457 repo,
5458 5458 other,
5459 5459 heads=nodes,
5460 5460 force=opts.get(b'force'),
5461 5461 bookmarks=opts.get(b'bookmark', ()),
5462 5462 opargs=pullopargs,
5463 5463 confirm=opts.get(b'confirm'),
5464 5464 ).cgresult
5465 5465
5466 5466 # brev is a name, which might be a bookmark to be activated at
5467 5467 # the end of the update. In other words, it is an explicit
5468 5468 # destination of the update
5469 5469 brev = None
5470 5470
5471 5471 if checkout:
5472 5472 checkout = repo.unfiltered().changelog.rev(checkout)
5473 5473
5474 5474 # order below depends on implementation of
5475 5475 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5476 5476 # because 'checkout' is determined without it.
5477 5477 if opts.get(b'rev'):
5478 5478 brev = opts[b'rev'][0]
5479 5479 elif opts.get(b'branch'):
5480 5480 brev = opts[b'branch'][0]
5481 5481 else:
5482 5482 brev = branches[0]
5483 5483 repo._subtoppath = source
5484 5484 try:
5485 5485 update_conflict = postincoming(
5486 5486 ui, repo, modheads, opts.get(b'update'), checkout, brev
5487 5487 )
5488 5488 except error.FilteredRepoLookupError as exc:
5489 5489 msg = _(b'cannot update to target: %s') % exc.args[0]
5490 5490 exc.args = (msg,) + exc.args[1:]
5491 5491 raise
5492 5492 finally:
5493 5493 del repo._subtoppath
5494 5494
5495 5495 finally:
5496 5496 other.close()
5497 5497 # skip the remaining pull source if they are some conflict.
5498 5498 if update_conflict:
5499 5499 break
5500 5500 if update_conflict:
5501 5501 return 1
5502 5502 else:
5503 5503 return 0
5504 5504
5505 5505
5506 5506 @command(
5507 5507 b'purge|clean',
5508 5508 [
5509 5509 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5510 5510 (b'', b'all', None, _(b'purge ignored files too')),
5511 5511 (b'i', b'ignored', None, _(b'purge only ignored files')),
5512 5512 (b'', b'dirs', None, _(b'purge empty directories')),
5513 5513 (b'', b'files', None, _(b'purge files')),
5514 5514 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5515 5515 (
5516 5516 b'0',
5517 5517 b'print0',
5518 5518 None,
5519 5519 _(
5520 5520 b'end filenames with NUL, for use with xargs'
5521 5521 b' (implies -p/--print)'
5522 5522 ),
5523 5523 ),
5524 5524 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5525 5525 ]
5526 5526 + cmdutil.walkopts,
5527 5527 _(b'hg purge [OPTION]... [DIR]...'),
5528 5528 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5529 5529 )
5530 5530 def purge(ui, repo, *dirs, **opts):
5531 5531 """removes files not tracked by Mercurial
5532 5532
5533 5533 Delete files not known to Mercurial. This is useful to test local
5534 5534 and uncommitted changes in an otherwise-clean source tree.
5535 5535
5536 5536 This means that purge will delete the following by default:
5537 5537
5538 5538 - Unknown files: files marked with "?" by :hg:`status`
5539 5539 - Empty directories: in fact Mercurial ignores directories unless
5540 5540 they contain files under source control management
5541 5541
5542 5542 But it will leave untouched:
5543 5543
5544 5544 - Modified and unmodified tracked files
5545 5545 - Ignored files (unless -i or --all is specified)
5546 5546 - New files added to the repository (with :hg:`add`)
5547 5547
5548 5548 The --files and --dirs options can be used to direct purge to delete
5549 5549 only files, only directories, or both. If neither option is given,
5550 5550 both will be deleted.
5551 5551
5552 5552 If directories are given on the command line, only files in these
5553 5553 directories are considered.
5554 5554
5555 5555 Be careful with purge, as you could irreversibly delete some files
5556 5556 you forgot to add to the repository. If you only want to print the
5557 5557 list of files that this program would delete, use the --print
5558 5558 option.
5559 5559 """
5560 5560 opts = pycompat.byteskwargs(opts)
5561 5561 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5562 5562
5563 5563 act = not opts.get(b'print')
5564 5564 eol = b'\n'
5565 5565 if opts.get(b'print0'):
5566 5566 eol = b'\0'
5567 5567 act = False # --print0 implies --print
5568 5568 if opts.get(b'all', False):
5569 5569 ignored = True
5570 5570 unknown = True
5571 5571 else:
5572 5572 ignored = opts.get(b'ignored', False)
5573 5573 unknown = not ignored
5574 5574
5575 5575 removefiles = opts.get(b'files')
5576 5576 removedirs = opts.get(b'dirs')
5577 5577 confirm = opts.get(b'confirm')
5578 5578 if confirm is None:
5579 5579 try:
5580 5580 extensions.find(b'purge')
5581 5581 confirm = False
5582 5582 except KeyError:
5583 5583 confirm = True
5584 5584
5585 5585 if not removefiles and not removedirs:
5586 5586 removefiles = True
5587 5587 removedirs = True
5588 5588
5589 5589 match = scmutil.match(repo[None], dirs, opts)
5590 5590
5591 5591 paths = mergemod.purge(
5592 5592 repo,
5593 5593 match,
5594 5594 unknown=unknown,
5595 5595 ignored=ignored,
5596 5596 removeemptydirs=removedirs,
5597 5597 removefiles=removefiles,
5598 5598 abortonerror=opts.get(b'abort_on_err'),
5599 5599 noop=not act,
5600 5600 confirm=confirm,
5601 5601 )
5602 5602
5603 5603 for path in paths:
5604 5604 if not act:
5605 5605 ui.write(b'%s%s' % (path, eol))
5606 5606
5607 5607
5608 5608 @command(
5609 5609 b'push',
5610 5610 [
5611 5611 (b'f', b'force', None, _(b'force push')),
5612 5612 (
5613 5613 b'r',
5614 5614 b'rev',
5615 5615 [],
5616 5616 _(b'a changeset intended to be included in the destination'),
5617 5617 _(b'REV'),
5618 5618 ),
5619 5619 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5620 5620 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5621 5621 (
5622 5622 b'b',
5623 5623 b'branch',
5624 5624 [],
5625 5625 _(b'a specific branch you would like to push'),
5626 5626 _(b'BRANCH'),
5627 5627 ),
5628 5628 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5629 5629 (
5630 5630 b'',
5631 5631 b'pushvars',
5632 5632 [],
5633 5633 _(b'variables that can be sent to server (ADVANCED)'),
5634 5634 ),
5635 5635 (
5636 5636 b'',
5637 5637 b'publish',
5638 5638 False,
5639 5639 _(b'push the changeset as public (EXPERIMENTAL)'),
5640 5640 ),
5641 5641 ]
5642 5642 + remoteopts,
5643 5643 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5644 5644 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5645 5645 helpbasic=True,
5646 5646 )
5647 5647 def push(ui, repo, *dests, **opts):
5648 5648 """push changes to the specified destination
5649 5649
5650 5650 Push changesets from the local repository to the specified
5651 5651 destination.
5652 5652
5653 5653 This operation is symmetrical to pull: it is identical to a pull
5654 5654 in the destination repository from the current one.
5655 5655
5656 5656 By default, push will not allow creation of new heads at the
5657 5657 destination, since multiple heads would make it unclear which head
5658 5658 to use. In this situation, it is recommended to pull and merge
5659 5659 before pushing.
5660 5660
5661 5661 Use --new-branch if you want to allow push to create a new named
5662 5662 branch that is not present at the destination. This allows you to
5663 5663 only create a new branch without forcing other changes.
5664 5664
5665 5665 .. note::
5666 5666
5667 5667 Extra care should be taken with the -f/--force option,
5668 5668 which will push all new heads on all branches, an action which will
5669 5669 almost always cause confusion for collaborators.
5670 5670
5671 5671 If -r/--rev is used, the specified revision and all its ancestors
5672 5672 will be pushed to the remote repository.
5673 5673
5674 5674 If -B/--bookmark is used, the specified bookmarked revision, its
5675 5675 ancestors, and the bookmark will be pushed to the remote
5676 5676 repository. Specifying ``.`` is equivalent to specifying the active
5677 5677 bookmark's name. Use the --all-bookmarks option for pushing all
5678 5678 current bookmarks.
5679 5679
5680 5680 Please see :hg:`help urls` for important details about ``ssh://``
5681 5681 URLs. If DESTINATION is omitted, a default path will be used.
5682 5682
5683 5683 When passed multiple destinations, push will process them one after the
5684 5684 other, but stop should an error occur.
5685 5685
5686 5686 .. container:: verbose
5687 5687
5688 5688 The --pushvars option sends strings to the server that become
5689 5689 environment variables prepended with ``HG_USERVAR_``. For example,
5690 5690 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5691 5691 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5692 5692
5693 5693 pushvars can provide for user-overridable hooks as well as set debug
5694 5694 levels. One example is having a hook that blocks commits containing
5695 5695 conflict markers, but enables the user to override the hook if the file
5696 5696 is using conflict markers for testing purposes or the file format has
5697 5697 strings that look like conflict markers.
5698 5698
5699 5699 By default, servers will ignore `--pushvars`. To enable it add the
5700 5700 following to your configuration file::
5701 5701
5702 5702 [push]
5703 5703 pushvars.server = true
5704 5704
5705 5705 Returns 0 if push was successful, 1 if nothing to push.
5706 5706 """
5707 5707
5708 5708 opts = pycompat.byteskwargs(opts)
5709 5709
5710 5710 if opts.get(b'all_bookmarks'):
5711 5711 cmdutil.check_incompatible_arguments(
5712 5712 opts,
5713 5713 b'all_bookmarks',
5714 5714 [b'bookmark', b'rev'],
5715 5715 )
5716 5716 opts[b'bookmark'] = list(repo._bookmarks)
5717 5717
5718 5718 if opts.get(b'bookmark'):
5719 5719 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5720 5720 for b in opts[b'bookmark']:
5721 5721 # translate -B options to -r so changesets get pushed
5722 5722 b = repo._bookmarks.expandname(b)
5723 5723 if b in repo._bookmarks:
5724 5724 opts.setdefault(b'rev', []).append(b)
5725 5725 else:
5726 5726 # if we try to push a deleted bookmark, translate it to null
5727 5727 # this lets simultaneous -r, -b options continue working
5728 5728 opts.setdefault(b'rev', []).append(b"null")
5729 5729
5730 5730 some_pushed = False
5731 5731 result = 0
5732 5732 for path in urlutil.get_push_paths(repo, ui, dests):
5733 5733 dest = path.pushloc or path.loc
5734 5734 branches = (path.branch, opts.get(b'branch') or [])
5735 5735 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5736 5736 revs, checkout = hg.addbranchrevs(
5737 5737 repo, repo, branches, opts.get(b'rev')
5738 5738 )
5739 5739 other = hg.peer(repo, opts, dest)
5740 5740
5741 5741 try:
5742 5742 if revs:
5743 5743 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5744 5744 if not revs:
5745 5745 raise error.InputError(
5746 5746 _(b"specified revisions evaluate to an empty set"),
5747 5747 hint=_(b"use different revision arguments"),
5748 5748 )
5749 5749 elif path.pushrev:
5750 5750 # It doesn't make any sense to specify ancestor revisions. So limit
5751 5751 # to DAG heads to make discovery simpler.
5752 5752 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5753 5753 revs = scmutil.revrange(repo, [expr])
5754 5754 revs = [repo[rev].node() for rev in revs]
5755 5755 if not revs:
5756 5756 raise error.InputError(
5757 5757 _(
5758 5758 b'default push revset for path evaluates to an empty set'
5759 5759 )
5760 5760 )
5761 5761 elif ui.configbool(b'commands', b'push.require-revs'):
5762 5762 raise error.InputError(
5763 5763 _(b'no revisions specified to push'),
5764 5764 hint=_(b'did you mean "hg push -r ."?'),
5765 5765 )
5766 5766
5767 5767 repo._subtoppath = dest
5768 5768 try:
5769 5769 # push subrepos depth-first for coherent ordering
5770 5770 c = repo[b'.']
5771 5771 subs = c.substate # only repos that are committed
5772 5772 for s in sorted(subs):
5773 5773 sub_result = c.sub(s).push(opts)
5774 5774 if sub_result == 0:
5775 5775 return 1
5776 5776 finally:
5777 5777 del repo._subtoppath
5778 5778
5779 5779 opargs = dict(
5780 5780 opts.get(b'opargs', {})
5781 5781 ) # copy opargs since we may mutate it
5782 5782 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5783 5783
5784 5784 pushop = exchange.push(
5785 5785 repo,
5786 5786 other,
5787 5787 opts.get(b'force'),
5788 5788 revs=revs,
5789 5789 newbranch=opts.get(b'new_branch'),
5790 5790 bookmarks=opts.get(b'bookmark', ()),
5791 5791 publish=opts.get(b'publish'),
5792 5792 opargs=opargs,
5793 5793 )
5794 5794
5795 5795 if pushop.cgresult == 0:
5796 5796 result = 1
5797 5797 elif pushop.cgresult is not None:
5798 5798 some_pushed = True
5799 5799
5800 5800 if pushop.bkresult is not None:
5801 5801 if pushop.bkresult == 2:
5802 5802 result = 2
5803 5803 elif not result and pushop.bkresult:
5804 5804 result = 2
5805 5805
5806 5806 if result:
5807 5807 break
5808 5808
5809 5809 finally:
5810 5810 other.close()
5811 5811 if result == 0 and not some_pushed:
5812 5812 result = 1
5813 5813 return result
5814 5814
5815 5815
5816 5816 @command(
5817 5817 b'recover',
5818 5818 [
5819 5819 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5820 5820 ],
5821 5821 helpcategory=command.CATEGORY_MAINTENANCE,
5822 5822 )
5823 5823 def recover(ui, repo, **opts):
5824 5824 """roll back an interrupted transaction
5825 5825
5826 5826 Recover from an interrupted commit or pull.
5827 5827
5828 5828 This command tries to fix the repository status after an
5829 5829 interrupted operation. It should only be necessary when Mercurial
5830 5830 suggests it.
5831 5831
5832 5832 Returns 0 if successful, 1 if nothing to recover or verify fails.
5833 5833 """
5834 5834 ret = repo.recover()
5835 5835 if ret:
5836 5836 if opts['verify']:
5837 5837 return hg.verify(repo)
5838 5838 else:
5839 5839 msg = _(
5840 5840 b"(verify step skipped, run `hg verify` to check your "
5841 5841 b"repository content)\n"
5842 5842 )
5843 5843 ui.warn(msg)
5844 5844 return 0
5845 5845 return 1
5846 5846
5847 5847
5848 5848 @command(
5849 5849 b'remove|rm',
5850 5850 [
5851 5851 (b'A', b'after', None, _(b'record delete for missing files')),
5852 5852 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5853 5853 ]
5854 5854 + subrepoopts
5855 5855 + walkopts
5856 5856 + dryrunopts,
5857 5857 _(b'[OPTION]... FILE...'),
5858 5858 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5859 5859 helpbasic=True,
5860 5860 inferrepo=True,
5861 5861 )
5862 5862 def remove(ui, repo, *pats, **opts):
5863 5863 """remove the specified files on the next commit
5864 5864
5865 5865 Schedule the indicated files for removal from the current branch.
5866 5866
5867 5867 This command schedules the files to be removed at the next commit.
5868 5868 To undo a remove before that, see :hg:`revert`. To undo added
5869 5869 files, see :hg:`forget`.
5870 5870
5871 5871 .. container:: verbose
5872 5872
5873 5873 -A/--after can be used to remove only files that have already
5874 5874 been deleted, -f/--force can be used to force deletion, and -Af
5875 5875 can be used to remove files from the next revision without
5876 5876 deleting them from the working directory.
5877 5877
5878 5878 The following table details the behavior of remove for different
5879 5879 file states (columns) and option combinations (rows). The file
5880 5880 states are Added [A], Clean [C], Modified [M] and Missing [!]
5881 5881 (as reported by :hg:`status`). The actions are Warn, Remove
5882 5882 (from branch) and Delete (from disk):
5883 5883
5884 5884 ========= == == == ==
5885 5885 opt/state A C M !
5886 5886 ========= == == == ==
5887 5887 none W RD W R
5888 5888 -f R RD RD R
5889 5889 -A W W W R
5890 5890 -Af R R R R
5891 5891 ========= == == == ==
5892 5892
5893 5893 .. note::
5894 5894
5895 5895 :hg:`remove` never deletes files in Added [A] state from the
5896 5896 working directory, not even if ``--force`` is specified.
5897 5897
5898 5898 Returns 0 on success, 1 if any warnings encountered.
5899 5899 """
5900 5900
5901 5901 opts = pycompat.byteskwargs(opts)
5902 5902 after, force = opts.get(b'after'), opts.get(b'force')
5903 5903 dryrun = opts.get(b'dry_run')
5904 5904 if not pats and not after:
5905 5905 raise error.InputError(_(b'no files specified'))
5906 5906
5907 5907 m = scmutil.match(repo[None], pats, opts)
5908 5908 subrepos = opts.get(b'subrepos')
5909 5909 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5910 5910 return cmdutil.remove(
5911 5911 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5912 5912 )
5913 5913
5914 5914
5915 5915 @command(
5916 5916 b'rename|move|mv',
5917 5917 [
5918 5918 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5919 5919 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5920 5920 (
5921 5921 b'',
5922 5922 b'at-rev',
5923 5923 b'',
5924 5924 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5925 5925 _(b'REV'),
5926 5926 ),
5927 5927 (
5928 5928 b'f',
5929 5929 b'force',
5930 5930 None,
5931 5931 _(b'forcibly move over an existing managed file'),
5932 5932 ),
5933 5933 ]
5934 5934 + walkopts
5935 5935 + dryrunopts,
5936 5936 _(b'[OPTION]... SOURCE... DEST'),
5937 5937 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5938 5938 )
5939 5939 def rename(ui, repo, *pats, **opts):
5940 5940 """rename files; equivalent of copy + remove
5941 5941
5942 5942 Mark dest as copies of sources; mark sources for deletion. If dest
5943 5943 is a directory, copies are put in that directory. If dest is a
5944 5944 file, there can only be one source.
5945 5945
5946 5946 By default, this command copies the contents of files as they
5947 5947 exist in the working directory. If invoked with -A/--after, the
5948 5948 operation is recorded, but no copying is performed.
5949 5949
5950 5950 To undo marking a destination file as renamed, use --forget. With that
5951 5951 option, all given (positional) arguments are unmarked as renames. The
5952 5952 destination file(s) will be left in place (still tracked). The source
5953 5953 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5954 5954 the same way as :hg:`copy --forget`.
5955 5955
5956 5956 This command takes effect with the next commit by default.
5957 5957
5958 5958 Returns 0 on success, 1 if errors are encountered.
5959 5959 """
5960 5960 opts = pycompat.byteskwargs(opts)
5961 5961 with repo.wlock():
5962 5962 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5963 5963
5964 5964
5965 5965 @command(
5966 5966 b'resolve',
5967 5967 [
5968 5968 (b'a', b'all', None, _(b'select all unresolved files')),
5969 5969 (b'l', b'list', None, _(b'list state of files needing merge')),
5970 5970 (b'm', b'mark', None, _(b'mark files as resolved')),
5971 5971 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5972 5972 (b'n', b'no-status', None, _(b'hide status prefix')),
5973 5973 (b'', b're-merge', None, _(b're-merge files')),
5974 5974 ]
5975 5975 + mergetoolopts
5976 5976 + walkopts
5977 5977 + formatteropts,
5978 5978 _(b'[OPTION]... [FILE]...'),
5979 5979 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5980 5980 inferrepo=True,
5981 5981 )
5982 5982 def resolve(ui, repo, *pats, **opts):
5983 5983 """redo merges or set/view the merge status of files
5984 5984
5985 5985 Merges with unresolved conflicts are often the result of
5986 5986 non-interactive merging using the ``internal:merge`` configuration
5987 5987 setting, or a command-line merge tool like ``diff3``. The resolve
5988 5988 command is used to manage the files involved in a merge, after
5989 5989 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5990 5990 working directory must have two parents). See :hg:`help
5991 5991 merge-tools` for information on configuring merge tools.
5992 5992
5993 5993 The resolve command can be used in the following ways:
5994 5994
5995 5995 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5996 5996 the specified files, discarding any previous merge attempts. Re-merging
5997 5997 is not performed for files already marked as resolved. Use ``--all/-a``
5998 5998 to select all unresolved files. ``--tool`` can be used to specify
5999 5999 the merge tool used for the given files. It overrides the HGMERGE
6000 6000 environment variable and your configuration files. Previous file
6001 6001 contents are saved with a ``.orig`` suffix.
6002 6002
6003 6003 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6004 6004 (e.g. after having manually fixed-up the files). The default is
6005 6005 to mark all unresolved files.
6006 6006
6007 6007 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6008 6008 default is to mark all resolved files.
6009 6009
6010 6010 - :hg:`resolve -l`: list files which had or still have conflicts.
6011 6011 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6012 6012 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6013 6013 the list. See :hg:`help filesets` for details.
6014 6014
6015 6015 .. note::
6016 6016
6017 6017 Mercurial will not let you commit files with unresolved merge
6018 6018 conflicts. You must use :hg:`resolve -m ...` before you can
6019 6019 commit after a conflicting merge.
6020 6020
6021 6021 .. container:: verbose
6022 6022
6023 6023 Template:
6024 6024
6025 6025 The following keywords are supported in addition to the common template
6026 6026 keywords and functions. See also :hg:`help templates`.
6027 6027
6028 6028 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6029 6029 :path: String. Repository-absolute path of the file.
6030 6030
6031 6031 Returns 0 on success, 1 if any files fail a resolve attempt.
6032 6032 """
6033 6033
6034 6034 opts = pycompat.byteskwargs(opts)
6035 6035 confirm = ui.configbool(b'commands', b'resolve.confirm')
6036 6036 flaglist = b'all mark unmark list no_status re_merge'.split()
6037 6037 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6038 6038
6039 6039 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6040 6040 if actioncount > 1:
6041 6041 raise error.InputError(_(b"too many actions specified"))
6042 6042 elif actioncount == 0 and ui.configbool(
6043 6043 b'commands', b'resolve.explicit-re-merge'
6044 6044 ):
6045 6045 hint = _(b'use --mark, --unmark, --list or --re-merge')
6046 6046 raise error.InputError(_(b'no action specified'), hint=hint)
6047 6047 if pats and all:
6048 6048 raise error.InputError(_(b"can't specify --all and patterns"))
6049 6049 if not (all or pats or show or mark or unmark):
6050 6050 raise error.InputError(
6051 6051 _(b'no files or directories specified'),
6052 6052 hint=b'use --all to re-merge all unresolved files',
6053 6053 )
6054 6054
6055 6055 if confirm:
6056 6056 if all:
6057 6057 if ui.promptchoice(
6058 6058 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6059 6059 ):
6060 6060 raise error.CanceledError(_(b'user quit'))
6061 6061 if mark and not pats:
6062 6062 if ui.promptchoice(
6063 6063 _(
6064 6064 b'mark all unresolved files as resolved (yn)?'
6065 6065 b'$$ &Yes $$ &No'
6066 6066 )
6067 6067 ):
6068 6068 raise error.CanceledError(_(b'user quit'))
6069 6069 if unmark and not pats:
6070 6070 if ui.promptchoice(
6071 6071 _(
6072 6072 b'mark all resolved files as unresolved (yn)?'
6073 6073 b'$$ &Yes $$ &No'
6074 6074 )
6075 6075 ):
6076 6076 raise error.CanceledError(_(b'user quit'))
6077 6077
6078 6078 uipathfn = scmutil.getuipathfn(repo)
6079 6079
6080 6080 if show:
6081 6081 ui.pager(b'resolve')
6082 6082 fm = ui.formatter(b'resolve', opts)
6083 6083 ms = mergestatemod.mergestate.read(repo)
6084 6084 wctx = repo[None]
6085 6085 m = scmutil.match(wctx, pats, opts)
6086 6086
6087 6087 # Labels and keys based on merge state. Unresolved path conflicts show
6088 6088 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6089 6089 # resolved conflicts.
6090 6090 mergestateinfo = {
6091 6091 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6092 6092 b'resolve.unresolved',
6093 6093 b'U',
6094 6094 ),
6095 6095 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6096 6096 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6097 6097 b'resolve.unresolved',
6098 6098 b'P',
6099 6099 ),
6100 6100 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6101 6101 b'resolve.resolved',
6102 6102 b'R',
6103 6103 ),
6104 6104 }
6105 6105
6106 6106 for f in ms:
6107 6107 if not m(f):
6108 6108 continue
6109 6109
6110 6110 label, key = mergestateinfo[ms[f]]
6111 6111 fm.startitem()
6112 6112 fm.context(ctx=wctx)
6113 6113 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6114 6114 fm.data(path=f)
6115 6115 fm.plain(b'%s\n' % uipathfn(f), label=label)
6116 6116 fm.end()
6117 6117 return 0
6118 6118
6119 6119 with repo.wlock():
6120 6120 ms = mergestatemod.mergestate.read(repo)
6121 6121
6122 6122 if not (ms.active() or repo.dirstate.p2() != repo.nullid):
6123 6123 raise error.StateError(
6124 6124 _(b'resolve command not applicable when not merging')
6125 6125 )
6126 6126
6127 6127 wctx = repo[None]
6128 6128 m = scmutil.match(wctx, pats, opts)
6129 6129 ret = 0
6130 6130 didwork = False
6131 6131
6132 6132 tocomplete = []
6133 6133 hasconflictmarkers = []
6134 6134 if mark:
6135 6135 markcheck = ui.config(b'commands', b'resolve.mark-check')
6136 6136 if markcheck not in [b'warn', b'abort']:
6137 6137 # Treat all invalid / unrecognized values as 'none'.
6138 6138 markcheck = False
6139 6139 for f in ms:
6140 6140 if not m(f):
6141 6141 continue
6142 6142
6143 6143 didwork = True
6144 6144
6145 6145 # path conflicts must be resolved manually
6146 6146 if ms[f] in (
6147 6147 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6148 6148 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6149 6149 ):
6150 6150 if mark:
6151 6151 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6152 6152 elif unmark:
6153 6153 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6154 6154 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6155 6155 ui.warn(
6156 6156 _(b'%s: path conflict must be resolved manually\n')
6157 6157 % uipathfn(f)
6158 6158 )
6159 6159 continue
6160 6160
6161 6161 if mark:
6162 6162 if markcheck:
6163 6163 fdata = repo.wvfs.tryread(f)
6164 6164 if (
6165 6165 filemerge.hasconflictmarkers(fdata)
6166 6166 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6167 6167 ):
6168 6168 hasconflictmarkers.append(f)
6169 6169 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6170 6170 elif unmark:
6171 6171 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6172 6172 else:
6173 6173 # backup pre-resolve (merge uses .orig for its own purposes)
6174 6174 a = repo.wjoin(f)
6175 6175 try:
6176 6176 util.copyfile(a, a + b".resolve")
6177 6177 except (IOError, OSError) as inst:
6178 6178 if inst.errno != errno.ENOENT:
6179 6179 raise
6180 6180
6181 6181 try:
6182 6182 # preresolve file
6183 6183 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6184 6184 with ui.configoverride(overrides, b'resolve'):
6185 6185 complete, r = ms.preresolve(f, wctx)
6186 6186 if not complete:
6187 6187 tocomplete.append(f)
6188 6188 elif r:
6189 6189 ret = 1
6190 6190 finally:
6191 6191 ms.commit()
6192 6192
6193 6193 # replace filemerge's .orig file with our resolve file, but only
6194 6194 # for merges that are complete
6195 6195 if complete:
6196 6196 try:
6197 6197 util.rename(
6198 6198 a + b".resolve", scmutil.backuppath(ui, repo, f)
6199 6199 )
6200 6200 except OSError as inst:
6201 6201 if inst.errno != errno.ENOENT:
6202 6202 raise
6203 6203
6204 6204 if hasconflictmarkers:
6205 6205 ui.warn(
6206 6206 _(
6207 6207 b'warning: the following files still have conflict '
6208 6208 b'markers:\n'
6209 6209 )
6210 6210 + b''.join(
6211 6211 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6212 6212 )
6213 6213 )
6214 6214 if markcheck == b'abort' and not all and not pats:
6215 6215 raise error.StateError(
6216 6216 _(b'conflict markers detected'),
6217 6217 hint=_(b'use --all to mark anyway'),
6218 6218 )
6219 6219
6220 6220 for f in tocomplete:
6221 6221 try:
6222 6222 # resolve file
6223 6223 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6224 6224 with ui.configoverride(overrides, b'resolve'):
6225 6225 r = ms.resolve(f, wctx)
6226 6226 if r:
6227 6227 ret = 1
6228 6228 finally:
6229 6229 ms.commit()
6230 6230
6231 6231 # replace filemerge's .orig file with our resolve file
6232 6232 a = repo.wjoin(f)
6233 6233 try:
6234 6234 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6235 6235 except OSError as inst:
6236 6236 if inst.errno != errno.ENOENT:
6237 6237 raise
6238 6238
6239 6239 ms.commit()
6240 6240 branchmerge = repo.dirstate.p2() != repo.nullid
6241 6241 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6242 6242
6243 6243 if not didwork and pats:
6244 6244 hint = None
6245 6245 if not any([p for p in pats if p.find(b':') >= 0]):
6246 6246 pats = [b'path:%s' % p for p in pats]
6247 6247 m = scmutil.match(wctx, pats, opts)
6248 6248 for f in ms:
6249 6249 if not m(f):
6250 6250 continue
6251 6251
6252 6252 def flag(o):
6253 6253 if o == b're_merge':
6254 6254 return b'--re-merge '
6255 6255 return b'-%s ' % o[0:1]
6256 6256
6257 6257 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6258 6258 hint = _(b"(try: hg resolve %s%s)\n") % (
6259 6259 flags,
6260 6260 b' '.join(pats),
6261 6261 )
6262 6262 break
6263 6263 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6264 6264 if hint:
6265 6265 ui.warn(hint)
6266 6266
6267 6267 unresolvedf = ms.unresolvedcount()
6268 6268 if not unresolvedf:
6269 6269 ui.status(_(b'(no more unresolved files)\n'))
6270 6270 cmdutil.checkafterresolved(repo)
6271 6271
6272 6272 return ret
6273 6273
6274 6274
6275 6275 @command(
6276 6276 b'revert',
6277 6277 [
6278 6278 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6279 6279 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6280 6280 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6281 6281 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6282 6282 (b'i', b'interactive', None, _(b'interactively select the changes')),
6283 6283 ]
6284 6284 + walkopts
6285 6285 + dryrunopts,
6286 6286 _(b'[OPTION]... [-r REV] [NAME]...'),
6287 6287 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6288 6288 )
6289 6289 def revert(ui, repo, *pats, **opts):
6290 6290 """restore files to their checkout state
6291 6291
6292 6292 .. note::
6293 6293
6294 6294 To check out earlier revisions, you should use :hg:`update REV`.
6295 6295 To cancel an uncommitted merge (and lose your changes),
6296 6296 use :hg:`merge --abort`.
6297 6297
6298 6298 With no revision specified, revert the specified files or directories
6299 6299 to the contents they had in the parent of the working directory.
6300 6300 This restores the contents of files to an unmodified
6301 6301 state and unschedules adds, removes, copies, and renames. If the
6302 6302 working directory has two parents, you must explicitly specify a
6303 6303 revision.
6304 6304
6305 6305 Using the -r/--rev or -d/--date options, revert the given files or
6306 6306 directories to their states as of a specific revision. Because
6307 6307 revert does not change the working directory parents, this will
6308 6308 cause these files to appear modified. This can be helpful to "back
6309 6309 out" some or all of an earlier change. See :hg:`backout` for a
6310 6310 related method.
6311 6311
6312 6312 Modified files are saved with a .orig suffix before reverting.
6313 6313 To disable these backups, use --no-backup. It is possible to store
6314 6314 the backup files in a custom directory relative to the root of the
6315 6315 repository by setting the ``ui.origbackuppath`` configuration
6316 6316 option.
6317 6317
6318 6318 See :hg:`help dates` for a list of formats valid for -d/--date.
6319 6319
6320 6320 See :hg:`help backout` for a way to reverse the effect of an
6321 6321 earlier changeset.
6322 6322
6323 6323 Returns 0 on success.
6324 6324 """
6325 6325
6326 6326 opts = pycompat.byteskwargs(opts)
6327 6327 if opts.get(b"date"):
6328 6328 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6329 6329 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6330 6330
6331 6331 parent, p2 = repo.dirstate.parents()
6332 6332 if not opts.get(b'rev') and p2 != repo.nullid:
6333 6333 # revert after merge is a trap for new users (issue2915)
6334 6334 raise error.InputError(
6335 6335 _(b'uncommitted merge with no revision specified'),
6336 6336 hint=_(b"use 'hg update' or see 'hg help revert'"),
6337 6337 )
6338 6338
6339 6339 rev = opts.get(b'rev')
6340 6340 if rev:
6341 6341 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6342 6342 ctx = scmutil.revsingle(repo, rev)
6343 6343
6344 6344 if not (
6345 6345 pats
6346 6346 or opts.get(b'include')
6347 6347 or opts.get(b'exclude')
6348 6348 or opts.get(b'all')
6349 6349 or opts.get(b'interactive')
6350 6350 ):
6351 6351 msg = _(b"no files or directories specified")
6352 6352 if p2 != repo.nullid:
6353 6353 hint = _(
6354 6354 b"uncommitted merge, use --all to discard all changes,"
6355 6355 b" or 'hg update -C .' to abort the merge"
6356 6356 )
6357 6357 raise error.InputError(msg, hint=hint)
6358 6358 dirty = any(repo.status())
6359 6359 node = ctx.node()
6360 6360 if node != parent:
6361 6361 if dirty:
6362 6362 hint = (
6363 6363 _(
6364 6364 b"uncommitted changes, use --all to discard all"
6365 6365 b" changes, or 'hg update %d' to update"
6366 6366 )
6367 6367 % ctx.rev()
6368 6368 )
6369 6369 else:
6370 6370 hint = (
6371 6371 _(
6372 6372 b"use --all to revert all files,"
6373 6373 b" or 'hg update %d' to update"
6374 6374 )
6375 6375 % ctx.rev()
6376 6376 )
6377 6377 elif dirty:
6378 6378 hint = _(b"uncommitted changes, use --all to discard all changes")
6379 6379 else:
6380 6380 hint = _(b"use --all to revert all files")
6381 6381 raise error.InputError(msg, hint=hint)
6382 6382
6383 6383 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6384 6384
6385 6385
6386 6386 @command(
6387 6387 b'rollback',
6388 6388 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6389 6389 helpcategory=command.CATEGORY_MAINTENANCE,
6390 6390 )
6391 6391 def rollback(ui, repo, **opts):
6392 6392 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6393 6393
6394 6394 Please use :hg:`commit --amend` instead of rollback to correct
6395 6395 mistakes in the last commit.
6396 6396
6397 6397 This command should be used with care. There is only one level of
6398 6398 rollback, and there is no way to undo a rollback. It will also
6399 6399 restore the dirstate at the time of the last transaction, losing
6400 6400 any dirstate changes since that time. This command does not alter
6401 6401 the working directory.
6402 6402
6403 6403 Transactions are used to encapsulate the effects of all commands
6404 6404 that create new changesets or propagate existing changesets into a
6405 6405 repository.
6406 6406
6407 6407 .. container:: verbose
6408 6408
6409 6409 For example, the following commands are transactional, and their
6410 6410 effects can be rolled back:
6411 6411
6412 6412 - commit
6413 6413 - import
6414 6414 - pull
6415 6415 - push (with this repository as the destination)
6416 6416 - unbundle
6417 6417
6418 6418 To avoid permanent data loss, rollback will refuse to rollback a
6419 6419 commit transaction if it isn't checked out. Use --force to
6420 6420 override this protection.
6421 6421
6422 6422 The rollback command can be entirely disabled by setting the
6423 6423 ``ui.rollback`` configuration setting to false. If you're here
6424 6424 because you want to use rollback and it's disabled, you can
6425 6425 re-enable the command by setting ``ui.rollback`` to true.
6426 6426
6427 6427 This command is not intended for use on public repositories. Once
6428 6428 changes are visible for pull by other users, rolling a transaction
6429 6429 back locally is ineffective (someone else may already have pulled
6430 6430 the changes). Furthermore, a race is possible with readers of the
6431 6431 repository; for example an in-progress pull from the repository
6432 6432 may fail if a rollback is performed.
6433 6433
6434 6434 Returns 0 on success, 1 if no rollback data is available.
6435 6435 """
6436 6436 if not ui.configbool(b'ui', b'rollback'):
6437 6437 raise error.Abort(
6438 6438 _(b'rollback is disabled because it is unsafe'),
6439 6439 hint=b'see `hg help -v rollback` for information',
6440 6440 )
6441 6441 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6442 6442
6443 6443
6444 6444 @command(
6445 6445 b'root',
6446 6446 [] + formatteropts,
6447 6447 intents={INTENT_READONLY},
6448 6448 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6449 6449 )
6450 6450 def root(ui, repo, **opts):
6451 6451 """print the root (top) of the current working directory
6452 6452
6453 6453 Print the root directory of the current repository.
6454 6454
6455 6455 .. container:: verbose
6456 6456
6457 6457 Template:
6458 6458
6459 6459 The following keywords are supported in addition to the common template
6460 6460 keywords and functions. See also :hg:`help templates`.
6461 6461
6462 6462 :hgpath: String. Path to the .hg directory.
6463 6463 :storepath: String. Path to the directory holding versioned data.
6464 6464
6465 6465 Returns 0 on success.
6466 6466 """
6467 6467 opts = pycompat.byteskwargs(opts)
6468 6468 with ui.formatter(b'root', opts) as fm:
6469 6469 fm.startitem()
6470 6470 fm.write(b'reporoot', b'%s\n', repo.root)
6471 6471 fm.data(hgpath=repo.path, storepath=repo.spath)
6472 6472
6473 6473
6474 6474 @command(
6475 6475 b'serve',
6476 6476 [
6477 6477 (
6478 6478 b'A',
6479 6479 b'accesslog',
6480 6480 b'',
6481 6481 _(b'name of access log file to write to'),
6482 6482 _(b'FILE'),
6483 6483 ),
6484 6484 (b'd', b'daemon', None, _(b'run server in background')),
6485 6485 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6486 6486 (
6487 6487 b'E',
6488 6488 b'errorlog',
6489 6489 b'',
6490 6490 _(b'name of error log file to write to'),
6491 6491 _(b'FILE'),
6492 6492 ),
6493 6493 # use string type, then we can check if something was passed
6494 6494 (
6495 6495 b'p',
6496 6496 b'port',
6497 6497 b'',
6498 6498 _(b'port to listen on (default: 8000)'),
6499 6499 _(b'PORT'),
6500 6500 ),
6501 6501 (
6502 6502 b'a',
6503 6503 b'address',
6504 6504 b'',
6505 6505 _(b'address to listen on (default: all interfaces)'),
6506 6506 _(b'ADDR'),
6507 6507 ),
6508 6508 (
6509 6509 b'',
6510 6510 b'prefix',
6511 6511 b'',
6512 6512 _(b'prefix path to serve from (default: server root)'),
6513 6513 _(b'PREFIX'),
6514 6514 ),
6515 6515 (
6516 6516 b'n',
6517 6517 b'name',
6518 6518 b'',
6519 6519 _(b'name to show in web pages (default: working directory)'),
6520 6520 _(b'NAME'),
6521 6521 ),
6522 6522 (
6523 6523 b'',
6524 6524 b'web-conf',
6525 6525 b'',
6526 6526 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6527 6527 _(b'FILE'),
6528 6528 ),
6529 6529 (
6530 6530 b'',
6531 6531 b'webdir-conf',
6532 6532 b'',
6533 6533 _(b'name of the hgweb config file (DEPRECATED)'),
6534 6534 _(b'FILE'),
6535 6535 ),
6536 6536 (
6537 6537 b'',
6538 6538 b'pid-file',
6539 6539 b'',
6540 6540 _(b'name of file to write process ID to'),
6541 6541 _(b'FILE'),
6542 6542 ),
6543 6543 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6544 6544 (
6545 6545 b'',
6546 6546 b'cmdserver',
6547 6547 b'',
6548 6548 _(b'for remote clients (ADVANCED)'),
6549 6549 _(b'MODE'),
6550 6550 ),
6551 6551 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6552 6552 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6553 6553 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6554 6554 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6555 6555 (b'', b'print-url', None, _(b'start and print only the URL')),
6556 6556 ]
6557 6557 + subrepoopts,
6558 6558 _(b'[OPTION]...'),
6559 6559 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6560 6560 helpbasic=True,
6561 6561 optionalrepo=True,
6562 6562 )
6563 6563 def serve(ui, repo, **opts):
6564 6564 """start stand-alone webserver
6565 6565
6566 6566 Start a local HTTP repository browser and pull server. You can use
6567 6567 this for ad-hoc sharing and browsing of repositories. It is
6568 6568 recommended to use a real web server to serve a repository for
6569 6569 longer periods of time.
6570 6570
6571 6571 Please note that the server does not implement access control.
6572 6572 This means that, by default, anybody can read from the server and
6573 6573 nobody can write to it by default. Set the ``web.allow-push``
6574 6574 option to ``*`` to allow everybody to push to the server. You
6575 6575 should use a real web server if you need to authenticate users.
6576 6576
6577 6577 By default, the server logs accesses to stdout and errors to
6578 6578 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6579 6579 files.
6580 6580
6581 6581 To have the server choose a free port number to listen on, specify
6582 6582 a port number of 0; in this case, the server will print the port
6583 6583 number it uses.
6584 6584
6585 6585 Returns 0 on success.
6586 6586 """
6587 6587
6588 6588 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6589 6589 opts = pycompat.byteskwargs(opts)
6590 6590 if opts[b"print_url"] and ui.verbose:
6591 6591 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6592 6592
6593 6593 if opts[b"stdio"]:
6594 6594 if repo is None:
6595 6595 raise error.RepoError(
6596 6596 _(b"there is no Mercurial repository here (.hg not found)")
6597 6597 )
6598 6598 s = wireprotoserver.sshserver(ui, repo)
6599 6599 s.serve_forever()
6600 6600 return
6601 6601
6602 6602 service = server.createservice(ui, repo, opts)
6603 6603 return server.runservice(opts, initfn=service.init, runfn=service.run)
6604 6604
6605 6605
6606 6606 @command(
6607 6607 b'shelve',
6608 6608 [
6609 6609 (
6610 6610 b'A',
6611 6611 b'addremove',
6612 6612 None,
6613 6613 _(b'mark new/missing files as added/removed before shelving'),
6614 6614 ),
6615 6615 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6616 6616 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6617 6617 (
6618 6618 b'',
6619 6619 b'date',
6620 6620 b'',
6621 6621 _(b'shelve with the specified commit date'),
6622 6622 _(b'DATE'),
6623 6623 ),
6624 6624 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6625 6625 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6626 6626 (
6627 6627 b'k',
6628 6628 b'keep',
6629 6629 False,
6630 6630 _(b'shelve, but keep changes in the working directory'),
6631 6631 ),
6632 6632 (b'l', b'list', None, _(b'list current shelves')),
6633 6633 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6634 6634 (
6635 6635 b'n',
6636 6636 b'name',
6637 6637 b'',
6638 6638 _(b'use the given name for the shelved commit'),
6639 6639 _(b'NAME'),
6640 6640 ),
6641 6641 (
6642 6642 b'p',
6643 6643 b'patch',
6644 6644 None,
6645 6645 _(
6646 6646 b'output patches for changes (provide the names of the shelved '
6647 6647 b'changes as positional arguments)'
6648 6648 ),
6649 6649 ),
6650 6650 (b'i', b'interactive', None, _(b'interactive mode')),
6651 6651 (
6652 6652 b'',
6653 6653 b'stat',
6654 6654 None,
6655 6655 _(
6656 6656 b'output diffstat-style summary of changes (provide the names of '
6657 6657 b'the shelved changes as positional arguments)'
6658 6658 ),
6659 6659 ),
6660 6660 ]
6661 6661 + cmdutil.walkopts,
6662 6662 _(b'hg shelve [OPTION]... [FILE]...'),
6663 6663 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6664 6664 )
6665 6665 def shelve(ui, repo, *pats, **opts):
6666 6666 """save and set aside changes from the working directory
6667 6667
6668 6668 Shelving takes files that "hg status" reports as not clean, saves
6669 6669 the modifications to a bundle (a shelved change), and reverts the
6670 6670 files so that their state in the working directory becomes clean.
6671 6671
6672 6672 To restore these changes to the working directory, using "hg
6673 6673 unshelve"; this will work even if you switch to a different
6674 6674 commit.
6675 6675
6676 6676 When no files are specified, "hg shelve" saves all not-clean
6677 6677 files. If specific files or directories are named, only changes to
6678 6678 those files are shelved.
6679 6679
6680 6680 In bare shelve (when no files are specified, without interactive,
6681 6681 include and exclude option), shelving remembers information if the
6682 6682 working directory was on newly created branch, in other words working
6683 6683 directory was on different branch than its first parent. In this
6684 6684 situation unshelving restores branch information to the working directory.
6685 6685
6686 6686 Each shelved change has a name that makes it easier to find later.
6687 6687 The name of a shelved change defaults to being based on the active
6688 6688 bookmark, or if there is no active bookmark, the current named
6689 6689 branch. To specify a different name, use ``--name``.
6690 6690
6691 6691 To see a list of existing shelved changes, use the ``--list``
6692 6692 option. For each shelved change, this will print its name, age,
6693 6693 and description; use ``--patch`` or ``--stat`` for more details.
6694 6694
6695 6695 To delete specific shelved changes, use ``--delete``. To delete
6696 6696 all shelved changes, use ``--cleanup``.
6697 6697 """
6698 6698 opts = pycompat.byteskwargs(opts)
6699 6699 allowables = [
6700 6700 (b'addremove', {b'create'}), # 'create' is pseudo action
6701 6701 (b'unknown', {b'create'}),
6702 6702 (b'cleanup', {b'cleanup'}),
6703 6703 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6704 6704 (b'delete', {b'delete'}),
6705 6705 (b'edit', {b'create'}),
6706 6706 (b'keep', {b'create'}),
6707 6707 (b'list', {b'list'}),
6708 6708 (b'message', {b'create'}),
6709 6709 (b'name', {b'create'}),
6710 6710 (b'patch', {b'patch', b'list'}),
6711 6711 (b'stat', {b'stat', b'list'}),
6712 6712 ]
6713 6713
6714 6714 def checkopt(opt):
6715 6715 if opts.get(opt):
6716 6716 for i, allowable in allowables:
6717 6717 if opts[i] and opt not in allowable:
6718 6718 raise error.InputError(
6719 6719 _(
6720 6720 b"options '--%s' and '--%s' may not be "
6721 6721 b"used together"
6722 6722 )
6723 6723 % (opt, i)
6724 6724 )
6725 6725 return True
6726 6726
6727 6727 if checkopt(b'cleanup'):
6728 6728 if pats:
6729 6729 raise error.InputError(
6730 6730 _(b"cannot specify names when using '--cleanup'")
6731 6731 )
6732 6732 return shelvemod.cleanupcmd(ui, repo)
6733 6733 elif checkopt(b'delete'):
6734 6734 return shelvemod.deletecmd(ui, repo, pats)
6735 6735 elif checkopt(b'list'):
6736 6736 return shelvemod.listcmd(ui, repo, pats, opts)
6737 6737 elif checkopt(b'patch') or checkopt(b'stat'):
6738 6738 return shelvemod.patchcmds(ui, repo, pats, opts)
6739 6739 else:
6740 6740 return shelvemod.createcmd(ui, repo, pats, opts)
6741 6741
6742 6742
6743 6743 _NOTTERSE = b'nothing'
6744 6744
6745 6745
6746 6746 @command(
6747 6747 b'status|st',
6748 6748 [
6749 6749 (b'A', b'all', None, _(b'show status of all files')),
6750 6750 (b'm', b'modified', None, _(b'show only modified files')),
6751 6751 (b'a', b'added', None, _(b'show only added files')),
6752 6752 (b'r', b'removed', None, _(b'show only removed files')),
6753 6753 (b'd', b'deleted', None, _(b'show only missing files')),
6754 6754 (b'c', b'clean', None, _(b'show only files without changes')),
6755 6755 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6756 6756 (b'i', b'ignored', None, _(b'show only ignored files')),
6757 6757 (b'n', b'no-status', None, _(b'hide status prefix')),
6758 6758 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6759 6759 (
6760 6760 b'C',
6761 6761 b'copies',
6762 6762 None,
6763 6763 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6764 6764 ),
6765 6765 (
6766 6766 b'0',
6767 6767 b'print0',
6768 6768 None,
6769 6769 _(b'end filenames with NUL, for use with xargs'),
6770 6770 ),
6771 6771 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6772 6772 (
6773 6773 b'',
6774 6774 b'change',
6775 6775 b'',
6776 6776 _(b'list the changed files of a revision'),
6777 6777 _(b'REV'),
6778 6778 ),
6779 6779 ]
6780 6780 + walkopts
6781 6781 + subrepoopts
6782 6782 + formatteropts,
6783 6783 _(b'[OPTION]... [FILE]...'),
6784 6784 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6785 6785 helpbasic=True,
6786 6786 inferrepo=True,
6787 6787 intents={INTENT_READONLY},
6788 6788 )
6789 6789 def status(ui, repo, *pats, **opts):
6790 6790 """show changed files in the working directory
6791 6791
6792 6792 Show status of files in the repository. If names are given, only
6793 6793 files that match are shown. Files that are clean or ignored or
6794 6794 the source of a copy/move operation, are not listed unless
6795 6795 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6796 6796 Unless options described with "show only ..." are given, the
6797 6797 options -mardu are used.
6798 6798
6799 6799 Option -q/--quiet hides untracked (unknown and ignored) files
6800 6800 unless explicitly requested with -u/--unknown or -i/--ignored.
6801 6801
6802 6802 .. note::
6803 6803
6804 6804 :hg:`status` may appear to disagree with diff if permissions have
6805 6805 changed or a merge has occurred. The standard diff format does
6806 6806 not report permission changes and diff only reports changes
6807 6807 relative to one merge parent.
6808 6808
6809 6809 If one revision is given, it is used as the base revision.
6810 6810 If two revisions are given, the differences between them are
6811 6811 shown. The --change option can also be used as a shortcut to list
6812 6812 the changed files of a revision from its first parent.
6813 6813
6814 6814 The codes used to show the status of files are::
6815 6815
6816 6816 M = modified
6817 6817 A = added
6818 6818 R = removed
6819 6819 C = clean
6820 6820 ! = missing (deleted by non-hg command, but still tracked)
6821 6821 ? = not tracked
6822 6822 I = ignored
6823 6823 = origin of the previous file (with --copies)
6824 6824
6825 6825 .. container:: verbose
6826 6826
6827 6827 The -t/--terse option abbreviates the output by showing only the directory
6828 6828 name if all the files in it share the same status. The option takes an
6829 6829 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6830 6830 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6831 6831 for 'ignored' and 'c' for clean.
6832 6832
6833 6833 It abbreviates only those statuses which are passed. Note that clean and
6834 6834 ignored files are not displayed with '--terse ic' unless the -c/--clean
6835 6835 and -i/--ignored options are also used.
6836 6836
6837 6837 The -v/--verbose option shows information when the repository is in an
6838 6838 unfinished merge, shelve, rebase state etc. You can have this behavior
6839 6839 turned on by default by enabling the ``commands.status.verbose`` option.
6840 6840
6841 6841 You can skip displaying some of these states by setting
6842 6842 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6843 6843 'histedit', 'merge', 'rebase', or 'unshelve'.
6844 6844
6845 6845 Template:
6846 6846
6847 6847 The following keywords are supported in addition to the common template
6848 6848 keywords and functions. See also :hg:`help templates`.
6849 6849
6850 6850 :path: String. Repository-absolute path of the file.
6851 6851 :source: String. Repository-absolute path of the file originated from.
6852 6852 Available if ``--copies`` is specified.
6853 6853 :status: String. Character denoting file's status.
6854 6854
6855 6855 Examples:
6856 6856
6857 6857 - show changes in the working directory relative to a
6858 6858 changeset::
6859 6859
6860 6860 hg status --rev 9353
6861 6861
6862 6862 - show changes in the working directory relative to the
6863 6863 current directory (see :hg:`help patterns` for more information)::
6864 6864
6865 6865 hg status re:
6866 6866
6867 6867 - show all changes including copies in an existing changeset::
6868 6868
6869 6869 hg status --copies --change 9353
6870 6870
6871 6871 - get a NUL separated list of added files, suitable for xargs::
6872 6872
6873 6873 hg status -an0
6874 6874
6875 6875 - show more information about the repository status, abbreviating
6876 6876 added, removed, modified, deleted, and untracked paths::
6877 6877
6878 6878 hg status -v -t mardu
6879 6879
6880 6880 Returns 0 on success.
6881 6881
6882 6882 """
6883 6883
6884 6884 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6885 6885 opts = pycompat.byteskwargs(opts)
6886 6886 revs = opts.get(b'rev')
6887 6887 change = opts.get(b'change')
6888 6888 terse = opts.get(b'terse')
6889 6889 if terse is _NOTTERSE:
6890 6890 if revs:
6891 6891 terse = b''
6892 6892 else:
6893 6893 terse = ui.config(b'commands', b'status.terse')
6894 6894
6895 6895 if revs and terse:
6896 6896 msg = _(b'cannot use --terse with --rev')
6897 6897 raise error.InputError(msg)
6898 6898 elif change:
6899 6899 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6900 6900 ctx2 = scmutil.revsingle(repo, change, None)
6901 6901 ctx1 = ctx2.p1()
6902 6902 else:
6903 6903 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6904 6904 ctx1, ctx2 = scmutil.revpair(repo, revs)
6905 6905
6906 6906 forcerelativevalue = None
6907 6907 if ui.hasconfig(b'commands', b'status.relative'):
6908 6908 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6909 6909 uipathfn = scmutil.getuipathfn(
6910 6910 repo,
6911 6911 legacyrelativevalue=bool(pats),
6912 6912 forcerelativevalue=forcerelativevalue,
6913 6913 )
6914 6914
6915 6915 if opts.get(b'print0'):
6916 6916 end = b'\0'
6917 6917 else:
6918 6918 end = b'\n'
6919 6919 states = b'modified added removed deleted unknown ignored clean'.split()
6920 6920 show = [k for k in states if opts.get(k)]
6921 6921 if opts.get(b'all'):
6922 6922 show += ui.quiet and (states[:4] + [b'clean']) or states
6923 6923
6924 6924 if not show:
6925 6925 if ui.quiet:
6926 6926 show = states[:4]
6927 6927 else:
6928 6928 show = states[:5]
6929 6929
6930 6930 m = scmutil.match(ctx2, pats, opts)
6931 6931 if terse:
6932 6932 # we need to compute clean and unknown to terse
6933 6933 stat = repo.status(
6934 6934 ctx1.node(),
6935 6935 ctx2.node(),
6936 6936 m,
6937 6937 b'ignored' in show or b'i' in terse,
6938 6938 clean=True,
6939 6939 unknown=True,
6940 6940 listsubrepos=opts.get(b'subrepos'),
6941 6941 )
6942 6942
6943 6943 stat = cmdutil.tersedir(stat, terse)
6944 6944 else:
6945 6945 stat = repo.status(
6946 6946 ctx1.node(),
6947 6947 ctx2.node(),
6948 6948 m,
6949 6949 b'ignored' in show,
6950 6950 b'clean' in show,
6951 6951 b'unknown' in show,
6952 6952 opts.get(b'subrepos'),
6953 6953 )
6954 6954
6955 6955 changestates = zip(
6956 6956 states,
6957 6957 pycompat.iterbytestr(b'MAR!?IC'),
6958 6958 [getattr(stat, s.decode('utf8')) for s in states],
6959 6959 )
6960 6960
6961 6961 copy = {}
6962 6962 if (
6963 6963 opts.get(b'all')
6964 6964 or opts.get(b'copies')
6965 6965 or ui.configbool(b'ui', b'statuscopies')
6966 6966 ) and not opts.get(b'no_status'):
6967 6967 copy = copies.pathcopies(ctx1, ctx2, m)
6968 6968
6969 6969 morestatus = None
6970 6970 if (
6971 6971 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6972 6972 and not ui.plain()
6973 6973 and not opts.get(b'print0')
6974 6974 ):
6975 6975 morestatus = cmdutil.readmorestatus(repo)
6976 6976
6977 6977 ui.pager(b'status')
6978 6978 fm = ui.formatter(b'status', opts)
6979 6979 fmt = b'%s' + end
6980 6980 showchar = not opts.get(b'no_status')
6981 6981
6982 6982 for state, char, files in changestates:
6983 6983 if state in show:
6984 6984 label = b'status.' + state
6985 6985 for f in files:
6986 6986 fm.startitem()
6987 6987 fm.context(ctx=ctx2)
6988 6988 fm.data(itemtype=b'file', path=f)
6989 6989 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6990 6990 fm.plain(fmt % uipathfn(f), label=label)
6991 6991 if f in copy:
6992 6992 fm.data(source=copy[f])
6993 6993 fm.plain(
6994 6994 (b' %s' + end) % uipathfn(copy[f]),
6995 6995 label=b'status.copied',
6996 6996 )
6997 6997 if morestatus:
6998 6998 morestatus.formatfile(f, fm)
6999 6999
7000 7000 if morestatus:
7001 7001 morestatus.formatfooter(fm)
7002 7002 fm.end()
7003 7003
7004 7004
7005 7005 @command(
7006 7006 b'summary|sum',
7007 7007 [(b'', b'remote', None, _(b'check for push and pull'))],
7008 7008 b'[--remote]',
7009 7009 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7010 7010 helpbasic=True,
7011 7011 intents={INTENT_READONLY},
7012 7012 )
7013 7013 def summary(ui, repo, **opts):
7014 7014 """summarize working directory state
7015 7015
7016 7016 This generates a brief summary of the working directory state,
7017 7017 including parents, branch, commit status, phase and available updates.
7018 7018
7019 7019 With the --remote option, this will check the default paths for
7020 7020 incoming and outgoing changes. This can be time-consuming.
7021 7021
7022 7022 Returns 0 on success.
7023 7023 """
7024 7024
7025 7025 opts = pycompat.byteskwargs(opts)
7026 7026 ui.pager(b'summary')
7027 7027 ctx = repo[None]
7028 7028 parents = ctx.parents()
7029 7029 pnode = parents[0].node()
7030 7030 marks = []
7031 7031
7032 7032 try:
7033 7033 ms = mergestatemod.mergestate.read(repo)
7034 7034 except error.UnsupportedMergeRecords as e:
7035 7035 s = b' '.join(e.recordtypes)
7036 7036 ui.warn(
7037 7037 _(b'warning: merge state has unsupported record types: %s\n') % s
7038 7038 )
7039 7039 unresolved = []
7040 7040 else:
7041 7041 unresolved = list(ms.unresolved())
7042 7042
7043 7043 for p in parents:
7044 7044 # label with log.changeset (instead of log.parent) since this
7045 7045 # shows a working directory parent *changeset*:
7046 7046 # i18n: column positioning for "hg summary"
7047 7047 ui.write(
7048 7048 _(b'parent: %d:%s ') % (p.rev(), p),
7049 7049 label=logcmdutil.changesetlabels(p),
7050 7050 )
7051 7051 ui.write(b' '.join(p.tags()), label=b'log.tag')
7052 7052 if p.bookmarks():
7053 7053 marks.extend(p.bookmarks())
7054 7054 if p.rev() == -1:
7055 7055 if not len(repo):
7056 7056 ui.write(_(b' (empty repository)'))
7057 7057 else:
7058 7058 ui.write(_(b' (no revision checked out)'))
7059 7059 if p.obsolete():
7060 7060 ui.write(_(b' (obsolete)'))
7061 7061 if p.isunstable():
7062 7062 instabilities = (
7063 7063 ui.label(instability, b'trouble.%s' % instability)
7064 7064 for instability in p.instabilities()
7065 7065 )
7066 7066 ui.write(b' (' + b', '.join(instabilities) + b')')
7067 7067 ui.write(b'\n')
7068 7068 if p.description():
7069 7069 ui.status(
7070 7070 b' ' + p.description().splitlines()[0].strip() + b'\n',
7071 7071 label=b'log.summary',
7072 7072 )
7073 7073
7074 7074 branch = ctx.branch()
7075 7075 bheads = repo.branchheads(branch)
7076 7076 # i18n: column positioning for "hg summary"
7077 7077 m = _(b'branch: %s\n') % branch
7078 7078 if branch != b'default':
7079 7079 ui.write(m, label=b'log.branch')
7080 7080 else:
7081 7081 ui.status(m, label=b'log.branch')
7082 7082
7083 7083 if marks:
7084 7084 active = repo._activebookmark
7085 7085 # i18n: column positioning for "hg summary"
7086 7086 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7087 7087 if active is not None:
7088 7088 if active in marks:
7089 7089 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7090 7090 marks.remove(active)
7091 7091 else:
7092 7092 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7093 7093 for m in marks:
7094 7094 ui.write(b' ' + m, label=b'log.bookmark')
7095 7095 ui.write(b'\n', label=b'log.bookmark')
7096 7096
7097 7097 status = repo.status(unknown=True)
7098 7098
7099 7099 c = repo.dirstate.copies()
7100 7100 copied, renamed = [], []
7101 7101 for d, s in pycompat.iteritems(c):
7102 7102 if s in status.removed:
7103 7103 status.removed.remove(s)
7104 7104 renamed.append(d)
7105 7105 else:
7106 7106 copied.append(d)
7107 7107 if d in status.added:
7108 7108 status.added.remove(d)
7109 7109
7110 7110 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7111 7111
7112 7112 labels = [
7113 7113 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7114 7114 (ui.label(_(b'%d added'), b'status.added'), status.added),
7115 7115 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7116 7116 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7117 7117 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7118 7118 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7119 7119 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7120 7120 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7121 7121 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7122 7122 ]
7123 7123 t = []
7124 7124 for l, s in labels:
7125 7125 if s:
7126 7126 t.append(l % len(s))
7127 7127
7128 7128 t = b', '.join(t)
7129 7129 cleanworkdir = False
7130 7130
7131 7131 if repo.vfs.exists(b'graftstate'):
7132 7132 t += _(b' (graft in progress)')
7133 7133 if repo.vfs.exists(b'updatestate'):
7134 7134 t += _(b' (interrupted update)')
7135 7135 elif len(parents) > 1:
7136 7136 t += _(b' (merge)')
7137 7137 elif branch != parents[0].branch():
7138 7138 t += _(b' (new branch)')
7139 7139 elif parents[0].closesbranch() and pnode in repo.branchheads(
7140 7140 branch, closed=True
7141 7141 ):
7142 7142 t += _(b' (head closed)')
7143 7143 elif not (
7144 7144 status.modified
7145 7145 or status.added
7146 7146 or status.removed
7147 7147 or renamed
7148 7148 or copied
7149 7149 or subs
7150 7150 ):
7151 7151 t += _(b' (clean)')
7152 7152 cleanworkdir = True
7153 7153 elif pnode not in bheads:
7154 7154 t += _(b' (new branch head)')
7155 7155
7156 7156 if parents:
7157 7157 pendingphase = max(p.phase() for p in parents)
7158 7158 else:
7159 7159 pendingphase = phases.public
7160 7160
7161 7161 if pendingphase > phases.newcommitphase(ui):
7162 7162 t += b' (%s)' % phases.phasenames[pendingphase]
7163 7163
7164 7164 if cleanworkdir:
7165 7165 # i18n: column positioning for "hg summary"
7166 7166 ui.status(_(b'commit: %s\n') % t.strip())
7167 7167 else:
7168 7168 # i18n: column positioning for "hg summary"
7169 7169 ui.write(_(b'commit: %s\n') % t.strip())
7170 7170
7171 7171 # all ancestors of branch heads - all ancestors of parent = new csets
7172 7172 new = len(
7173 7173 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7174 7174 )
7175 7175
7176 7176 if new == 0:
7177 7177 # i18n: column positioning for "hg summary"
7178 7178 ui.status(_(b'update: (current)\n'))
7179 7179 elif pnode not in bheads:
7180 7180 # i18n: column positioning for "hg summary"
7181 7181 ui.write(_(b'update: %d new changesets (update)\n') % new)
7182 7182 else:
7183 7183 # i18n: column positioning for "hg summary"
7184 7184 ui.write(
7185 7185 _(b'update: %d new changesets, %d branch heads (merge)\n')
7186 7186 % (new, len(bheads))
7187 7187 )
7188 7188
7189 7189 t = []
7190 7190 draft = len(repo.revs(b'draft()'))
7191 7191 if draft:
7192 7192 t.append(_(b'%d draft') % draft)
7193 7193 secret = len(repo.revs(b'secret()'))
7194 7194 if secret:
7195 7195 t.append(_(b'%d secret') % secret)
7196 7196
7197 7197 if draft or secret:
7198 7198 ui.status(_(b'phases: %s\n') % b', '.join(t))
7199 7199
7200 7200 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7201 7201 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7202 7202 numtrouble = len(repo.revs(trouble + b"()"))
7203 7203 # We write all the possibilities to ease translation
7204 7204 troublemsg = {
7205 7205 b"orphan": _(b"orphan: %d changesets"),
7206 7206 b"contentdivergent": _(b"content-divergent: %d changesets"),
7207 7207 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7208 7208 }
7209 7209 if numtrouble > 0:
7210 7210 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7211 7211
7212 7212 cmdutil.summaryhooks(ui, repo)
7213 7213
7214 7214 if opts.get(b'remote'):
7215 7215 needsincoming, needsoutgoing = True, True
7216 7216 else:
7217 7217 needsincoming, needsoutgoing = False, False
7218 7218 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7219 7219 if i:
7220 7220 needsincoming = True
7221 7221 if o:
7222 7222 needsoutgoing = True
7223 7223 if not needsincoming and not needsoutgoing:
7224 7224 return
7225 7225
7226 7226 def getincoming():
7227 7227 # XXX We should actually skip this if no default is specified, instead
7228 7228 # of passing "default" which will resolve as "./default/" if no default
7229 7229 # path is defined.
7230 7230 source, branches = urlutil.get_unique_pull_path(
7231 7231 b'summary', repo, ui, b'default'
7232 7232 )
7233 7233 sbranch = branches[0]
7234 7234 try:
7235 7235 other = hg.peer(repo, {}, source)
7236 7236 except error.RepoError:
7237 7237 if opts.get(b'remote'):
7238 7238 raise
7239 7239 return source, sbranch, None, None, None
7240 7240 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7241 7241 if revs:
7242 7242 revs = [other.lookup(rev) for rev in revs]
7243 7243 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7244 repo.ui.pushbuffer()
7245 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7246 repo.ui.popbuffer()
7244 with repo.ui.silent():
7245 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7247 7246 return source, sbranch, other, commoninc, commoninc[1]
7248 7247
7249 7248 if needsincoming:
7250 7249 source, sbranch, sother, commoninc, incoming = getincoming()
7251 7250 else:
7252 7251 source = sbranch = sother = commoninc = incoming = None
7253 7252
7254 7253 def getoutgoing():
7255 7254 # XXX We should actually skip this if no default is specified, instead
7256 7255 # of passing "default" which will resolve as "./default/" if no default
7257 7256 # path is defined.
7258 7257 d = None
7259 7258 if b'default-push' in ui.paths:
7260 7259 d = b'default-push'
7261 7260 elif b'default' in ui.paths:
7262 7261 d = b'default'
7263 7262 if d is not None:
7264 7263 path = urlutil.get_unique_push_path(b'summary', repo, ui, d)
7265 7264 dest = path.pushloc or path.loc
7266 7265 dbranch = path.branch
7267 7266 else:
7268 7267 dest = b'default'
7269 7268 dbranch = None
7270 7269 revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None)
7271 7270 if source != dest:
7272 7271 try:
7273 7272 dother = hg.peer(repo, {}, dest)
7274 7273 except error.RepoError:
7275 7274 if opts.get(b'remote'):
7276 7275 raise
7277 7276 return dest, dbranch, None, None
7278 7277 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7279 7278 elif sother is None:
7280 7279 # there is no explicit destination peer, but source one is invalid
7281 7280 return dest, dbranch, None, None
7282 7281 else:
7283 7282 dother = sother
7284 7283 if source != dest or (sbranch is not None and sbranch != dbranch):
7285 7284 common = None
7286 7285 else:
7287 7286 common = commoninc
7288 7287 if revs:
7289 7288 revs = [repo.lookup(rev) for rev in revs]
7290 repo.ui.pushbuffer()
7291 outgoing = discovery.findcommonoutgoing(
7292 repo, dother, onlyheads=revs, commoninc=common
7293 )
7294 repo.ui.popbuffer()
7289 with repo.ui.silent():
7290 outgoing = discovery.findcommonoutgoing(
7291 repo, dother, onlyheads=revs, commoninc=common
7292 )
7295 7293 return dest, dbranch, dother, outgoing
7296 7294
7297 7295 if needsoutgoing:
7298 7296 dest, dbranch, dother, outgoing = getoutgoing()
7299 7297 else:
7300 7298 dest = dbranch = dother = outgoing = None
7301 7299
7302 7300 if opts.get(b'remote'):
7303 7301 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7304 7302 # The former always sets `sother` (or raises an exception if it can't);
7305 7303 # the latter always sets `outgoing`.
7306 7304 assert sother is not None
7307 7305 assert outgoing is not None
7308 7306
7309 7307 t = []
7310 7308 if incoming:
7311 7309 t.append(_(b'1 or more incoming'))
7312 7310 o = outgoing.missing
7313 7311 if o:
7314 7312 t.append(_(b'%d outgoing') % len(o))
7315 7313 other = dother or sother
7316 7314 if b'bookmarks' in other.listkeys(b'namespaces'):
7317 7315 counts = bookmarks.summary(repo, other)
7318 7316 if counts[0] > 0:
7319 7317 t.append(_(b'%d incoming bookmarks') % counts[0])
7320 7318 if counts[1] > 0:
7321 7319 t.append(_(b'%d outgoing bookmarks') % counts[1])
7322 7320
7323 7321 if t:
7324 7322 # i18n: column positioning for "hg summary"
7325 7323 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7326 7324 else:
7327 7325 # i18n: column positioning for "hg summary"
7328 7326 ui.status(_(b'remote: (synced)\n'))
7329 7327
7330 7328 cmdutil.summaryremotehooks(
7331 7329 ui,
7332 7330 repo,
7333 7331 opts,
7334 7332 (
7335 7333 (source, sbranch, sother, commoninc),
7336 7334 (dest, dbranch, dother, outgoing),
7337 7335 ),
7338 7336 )
7339 7337
7340 7338
7341 7339 @command(
7342 7340 b'tag',
7343 7341 [
7344 7342 (b'f', b'force', None, _(b'force tag')),
7345 7343 (b'l', b'local', None, _(b'make the tag local')),
7346 7344 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7347 7345 (b'', b'remove', None, _(b'remove a tag')),
7348 7346 # -l/--local is already there, commitopts cannot be used
7349 7347 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7350 7348 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7351 7349 ]
7352 7350 + commitopts2,
7353 7351 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7354 7352 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7355 7353 )
7356 7354 def tag(ui, repo, name1, *names, **opts):
7357 7355 """add one or more tags for the current or given revision
7358 7356
7359 7357 Name a particular revision using <name>.
7360 7358
7361 7359 Tags are used to name particular revisions of the repository and are
7362 7360 very useful to compare different revisions, to go back to significant
7363 7361 earlier versions or to mark branch points as releases, etc. Changing
7364 7362 an existing tag is normally disallowed; use -f/--force to override.
7365 7363
7366 7364 If no revision is given, the parent of the working directory is
7367 7365 used.
7368 7366
7369 7367 To facilitate version control, distribution, and merging of tags,
7370 7368 they are stored as a file named ".hgtags" which is managed similarly
7371 7369 to other project files and can be hand-edited if necessary. This
7372 7370 also means that tagging creates a new commit. The file
7373 7371 ".hg/localtags" is used for local tags (not shared among
7374 7372 repositories).
7375 7373
7376 7374 Tag commits are usually made at the head of a branch. If the parent
7377 7375 of the working directory is not a branch head, :hg:`tag` aborts; use
7378 7376 -f/--force to force the tag commit to be based on a non-head
7379 7377 changeset.
7380 7378
7381 7379 See :hg:`help dates` for a list of formats valid for -d/--date.
7382 7380
7383 7381 Since tag names have priority over branch names during revision
7384 7382 lookup, using an existing branch name as a tag name is discouraged.
7385 7383
7386 7384 Returns 0 on success.
7387 7385 """
7388 7386 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7389 7387 opts = pycompat.byteskwargs(opts)
7390 7388 with repo.wlock(), repo.lock():
7391 7389 rev_ = b"."
7392 7390 names = [t.strip() for t in (name1,) + names]
7393 7391 if len(names) != len(set(names)):
7394 7392 raise error.InputError(_(b'tag names must be unique'))
7395 7393 for n in names:
7396 7394 scmutil.checknewlabel(repo, n, b'tag')
7397 7395 if not n:
7398 7396 raise error.InputError(
7399 7397 _(b'tag names cannot consist entirely of whitespace')
7400 7398 )
7401 7399 if opts.get(b'rev'):
7402 7400 rev_ = opts[b'rev']
7403 7401 message = opts.get(b'message')
7404 7402 if opts.get(b'remove'):
7405 7403 if opts.get(b'local'):
7406 7404 expectedtype = b'local'
7407 7405 else:
7408 7406 expectedtype = b'global'
7409 7407
7410 7408 for n in names:
7411 7409 if repo.tagtype(n) == b'global':
7412 7410 alltags = tagsmod.findglobaltags(ui, repo)
7413 7411 if alltags[n][0] == repo.nullid:
7414 7412 raise error.InputError(
7415 7413 _(b"tag '%s' is already removed") % n
7416 7414 )
7417 7415 if not repo.tagtype(n):
7418 7416 raise error.InputError(_(b"tag '%s' does not exist") % n)
7419 7417 if repo.tagtype(n) != expectedtype:
7420 7418 if expectedtype == b'global':
7421 7419 raise error.InputError(
7422 7420 _(b"tag '%s' is not a global tag") % n
7423 7421 )
7424 7422 else:
7425 7423 raise error.InputError(
7426 7424 _(b"tag '%s' is not a local tag") % n
7427 7425 )
7428 7426 rev_ = b'null'
7429 7427 if not message:
7430 7428 # we don't translate commit messages
7431 7429 message = b'Removed tag %s' % b', '.join(names)
7432 7430 elif not opts.get(b'force'):
7433 7431 for n in names:
7434 7432 if n in repo.tags():
7435 7433 raise error.InputError(
7436 7434 _(b"tag '%s' already exists (use -f to force)") % n
7437 7435 )
7438 7436 if not opts.get(b'local'):
7439 7437 p1, p2 = repo.dirstate.parents()
7440 7438 if p2 != repo.nullid:
7441 7439 raise error.StateError(_(b'uncommitted merge'))
7442 7440 bheads = repo.branchheads()
7443 7441 if not opts.get(b'force') and bheads and p1 not in bheads:
7444 7442 raise error.InputError(
7445 7443 _(
7446 7444 b'working directory is not at a branch head '
7447 7445 b'(use -f to force)'
7448 7446 )
7449 7447 )
7450 7448 node = scmutil.revsingle(repo, rev_).node()
7451 7449
7452 7450 if not message:
7453 7451 # we don't translate commit messages
7454 7452 message = b'Added tag %s for changeset %s' % (
7455 7453 b', '.join(names),
7456 7454 short(node),
7457 7455 )
7458 7456
7459 7457 date = opts.get(b'date')
7460 7458 if date:
7461 7459 date = dateutil.parsedate(date)
7462 7460
7463 7461 if opts.get(b'remove'):
7464 7462 editform = b'tag.remove'
7465 7463 else:
7466 7464 editform = b'tag.add'
7467 7465 editor = cmdutil.getcommiteditor(
7468 7466 editform=editform, **pycompat.strkwargs(opts)
7469 7467 )
7470 7468
7471 7469 # don't allow tagging the null rev
7472 7470 if (
7473 7471 not opts.get(b'remove')
7474 7472 and scmutil.revsingle(repo, rev_).rev() == nullrev
7475 7473 ):
7476 7474 raise error.InputError(_(b"cannot tag null revision"))
7477 7475
7478 7476 tagsmod.tag(
7479 7477 repo,
7480 7478 names,
7481 7479 node,
7482 7480 message,
7483 7481 opts.get(b'local'),
7484 7482 opts.get(b'user'),
7485 7483 date,
7486 7484 editor=editor,
7487 7485 )
7488 7486
7489 7487
7490 7488 @command(
7491 7489 b'tags',
7492 7490 formatteropts,
7493 7491 b'',
7494 7492 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7495 7493 intents={INTENT_READONLY},
7496 7494 )
7497 7495 def tags(ui, repo, **opts):
7498 7496 """list repository tags
7499 7497
7500 7498 This lists both regular and local tags. When the -v/--verbose
7501 7499 switch is used, a third column "local" is printed for local tags.
7502 7500 When the -q/--quiet switch is used, only the tag name is printed.
7503 7501
7504 7502 .. container:: verbose
7505 7503
7506 7504 Template:
7507 7505
7508 7506 The following keywords are supported in addition to the common template
7509 7507 keywords and functions such as ``{tag}``. See also
7510 7508 :hg:`help templates`.
7511 7509
7512 7510 :type: String. ``local`` for local tags.
7513 7511
7514 7512 Returns 0 on success.
7515 7513 """
7516 7514
7517 7515 opts = pycompat.byteskwargs(opts)
7518 7516 ui.pager(b'tags')
7519 7517 fm = ui.formatter(b'tags', opts)
7520 7518 hexfunc = fm.hexfunc
7521 7519
7522 7520 for t, n in reversed(repo.tagslist()):
7523 7521 hn = hexfunc(n)
7524 7522 label = b'tags.normal'
7525 7523 tagtype = repo.tagtype(t)
7526 7524 if not tagtype or tagtype == b'global':
7527 7525 tagtype = b''
7528 7526 else:
7529 7527 label = b'tags.' + tagtype
7530 7528
7531 7529 fm.startitem()
7532 7530 fm.context(repo=repo)
7533 7531 fm.write(b'tag', b'%s', t, label=label)
7534 7532 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7535 7533 fm.condwrite(
7536 7534 not ui.quiet,
7537 7535 b'rev node',
7538 7536 fmt,
7539 7537 repo.changelog.rev(n),
7540 7538 hn,
7541 7539 label=label,
7542 7540 )
7543 7541 fm.condwrite(
7544 7542 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7545 7543 )
7546 7544 fm.plain(b'\n')
7547 7545 fm.end()
7548 7546
7549 7547
7550 7548 @command(
7551 7549 b'tip',
7552 7550 [
7553 7551 (b'p', b'patch', None, _(b'show patch')),
7554 7552 (b'g', b'git', None, _(b'use git extended diff format')),
7555 7553 ]
7556 7554 + templateopts,
7557 7555 _(b'[-p] [-g]'),
7558 7556 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7559 7557 )
7560 7558 def tip(ui, repo, **opts):
7561 7559 """show the tip revision (DEPRECATED)
7562 7560
7563 7561 The tip revision (usually just called the tip) is the changeset
7564 7562 most recently added to the repository (and therefore the most
7565 7563 recently changed head).
7566 7564
7567 7565 If you have just made a commit, that commit will be the tip. If
7568 7566 you have just pulled changes from another repository, the tip of
7569 7567 that repository becomes the current tip. The "tip" tag is special
7570 7568 and cannot be renamed or assigned to a different changeset.
7571 7569
7572 7570 This command is deprecated, please use :hg:`heads` instead.
7573 7571
7574 7572 Returns 0 on success.
7575 7573 """
7576 7574 opts = pycompat.byteskwargs(opts)
7577 7575 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7578 7576 displayer.show(repo[b'tip'])
7579 7577 displayer.close()
7580 7578
7581 7579
7582 7580 @command(
7583 7581 b'unbundle',
7584 7582 [
7585 7583 (
7586 7584 b'u',
7587 7585 b'update',
7588 7586 None,
7589 7587 _(b'update to new branch head if changesets were unbundled'),
7590 7588 )
7591 7589 ],
7592 7590 _(b'[-u] FILE...'),
7593 7591 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7594 7592 )
7595 7593 def unbundle(ui, repo, fname1, *fnames, **opts):
7596 7594 """apply one or more bundle files
7597 7595
7598 7596 Apply one or more bundle files generated by :hg:`bundle`.
7599 7597
7600 7598 Returns 0 on success, 1 if an update has unresolved files.
7601 7599 """
7602 7600 fnames = (fname1,) + fnames
7603 7601
7604 7602 with repo.lock():
7605 7603 for fname in fnames:
7606 7604 f = hg.openpath(ui, fname)
7607 7605 gen = exchange.readbundle(ui, f, fname)
7608 7606 if isinstance(gen, streamclone.streamcloneapplier):
7609 7607 raise error.InputError(
7610 7608 _(
7611 7609 b'packed bundles cannot be applied with '
7612 7610 b'"hg unbundle"'
7613 7611 ),
7614 7612 hint=_(b'use "hg debugapplystreamclonebundle"'),
7615 7613 )
7616 7614 url = b'bundle:' + fname
7617 7615 try:
7618 7616 txnname = b'unbundle'
7619 7617 if not isinstance(gen, bundle2.unbundle20):
7620 7618 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7621 7619 with repo.transaction(txnname) as tr:
7622 7620 op = bundle2.applybundle(
7623 7621 repo, gen, tr, source=b'unbundle', url=url
7624 7622 )
7625 7623 except error.BundleUnknownFeatureError as exc:
7626 7624 raise error.Abort(
7627 7625 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7628 7626 hint=_(
7629 7627 b"see https://mercurial-scm.org/"
7630 7628 b"wiki/BundleFeature for more "
7631 7629 b"information"
7632 7630 ),
7633 7631 )
7634 7632 modheads = bundle2.combinechangegroupresults(op)
7635 7633
7636 7634 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7637 7635 return 1
7638 7636 else:
7639 7637 return 0
7640 7638
7641 7639
7642 7640 @command(
7643 7641 b'unshelve',
7644 7642 [
7645 7643 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7646 7644 (
7647 7645 b'c',
7648 7646 b'continue',
7649 7647 None,
7650 7648 _(b'continue an incomplete unshelve operation'),
7651 7649 ),
7652 7650 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7653 7651 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7654 7652 (
7655 7653 b'n',
7656 7654 b'name',
7657 7655 b'',
7658 7656 _(b'restore shelved change with given name'),
7659 7657 _(b'NAME'),
7660 7658 ),
7661 7659 (b't', b'tool', b'', _(b'specify merge tool')),
7662 7660 (
7663 7661 b'',
7664 7662 b'date',
7665 7663 b'',
7666 7664 _(b'set date for temporary commits (DEPRECATED)'),
7667 7665 _(b'DATE'),
7668 7666 ),
7669 7667 ],
7670 7668 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7671 7669 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7672 7670 )
7673 7671 def unshelve(ui, repo, *shelved, **opts):
7674 7672 """restore a shelved change to the working directory
7675 7673
7676 7674 This command accepts an optional name of a shelved change to
7677 7675 restore. If none is given, the most recent shelved change is used.
7678 7676
7679 7677 If a shelved change is applied successfully, the bundle that
7680 7678 contains the shelved changes is moved to a backup location
7681 7679 (.hg/shelve-backup).
7682 7680
7683 7681 Since you can restore a shelved change on top of an arbitrary
7684 7682 commit, it is possible that unshelving will result in a conflict
7685 7683 between your changes and the commits you are unshelving onto. If
7686 7684 this occurs, you must resolve the conflict, then use
7687 7685 ``--continue`` to complete the unshelve operation. (The bundle
7688 7686 will not be moved until you successfully complete the unshelve.)
7689 7687
7690 7688 (Alternatively, you can use ``--abort`` to abandon an unshelve
7691 7689 that causes a conflict. This reverts the unshelved changes, and
7692 7690 leaves the bundle in place.)
7693 7691
7694 7692 If bare shelved change (without interactive, include and exclude
7695 7693 option) was done on newly created branch it would restore branch
7696 7694 information to the working directory.
7697 7695
7698 7696 After a successful unshelve, the shelved changes are stored in a
7699 7697 backup directory. Only the N most recent backups are kept. N
7700 7698 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7701 7699 configuration option.
7702 7700
7703 7701 .. container:: verbose
7704 7702
7705 7703 Timestamp in seconds is used to decide order of backups. More
7706 7704 than ``maxbackups`` backups are kept, if same timestamp
7707 7705 prevents from deciding exact order of them, for safety.
7708 7706
7709 7707 Selected changes can be unshelved with ``--interactive`` flag.
7710 7708 The working directory is updated with the selected changes, and
7711 7709 only the unselected changes remain shelved.
7712 7710 Note: The whole shelve is applied to working directory first before
7713 7711 running interactively. So, this will bring up all the conflicts between
7714 7712 working directory and the shelve, irrespective of which changes will be
7715 7713 unshelved.
7716 7714 """
7717 7715 with repo.wlock():
7718 7716 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7719 7717
7720 7718
7721 7719 statemod.addunfinished(
7722 7720 b'unshelve',
7723 7721 fname=b'shelvedstate',
7724 7722 continueflag=True,
7725 7723 abortfunc=shelvemod.hgabortunshelve,
7726 7724 continuefunc=shelvemod.hgcontinueunshelve,
7727 7725 cmdmsg=_(b'unshelve already in progress'),
7728 7726 )
7729 7727
7730 7728
7731 7729 @command(
7732 7730 b'update|up|checkout|co',
7733 7731 [
7734 7732 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7735 7733 (b'c', b'check', None, _(b'require clean working directory')),
7736 7734 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7737 7735 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7738 7736 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7739 7737 ]
7740 7738 + mergetoolopts,
7741 7739 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7742 7740 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7743 7741 helpbasic=True,
7744 7742 )
7745 7743 def update(ui, repo, node=None, **opts):
7746 7744 """update working directory (or switch revisions)
7747 7745
7748 7746 Update the repository's working directory to the specified
7749 7747 changeset. If no changeset is specified, update to the tip of the
7750 7748 current named branch and move the active bookmark (see :hg:`help
7751 7749 bookmarks`).
7752 7750
7753 7751 Update sets the working directory's parent revision to the specified
7754 7752 changeset (see :hg:`help parents`).
7755 7753
7756 7754 If the changeset is not a descendant or ancestor of the working
7757 7755 directory's parent and there are uncommitted changes, the update is
7758 7756 aborted. With the -c/--check option, the working directory is checked
7759 7757 for uncommitted changes; if none are found, the working directory is
7760 7758 updated to the specified changeset.
7761 7759
7762 7760 .. container:: verbose
7763 7761
7764 7762 The -C/--clean, -c/--check, and -m/--merge options control what
7765 7763 happens if the working directory contains uncommitted changes.
7766 7764 At most of one of them can be specified.
7767 7765
7768 7766 1. If no option is specified, and if
7769 7767 the requested changeset is an ancestor or descendant of
7770 7768 the working directory's parent, the uncommitted changes
7771 7769 are merged into the requested changeset and the merged
7772 7770 result is left uncommitted. If the requested changeset is
7773 7771 not an ancestor or descendant (that is, it is on another
7774 7772 branch), the update is aborted and the uncommitted changes
7775 7773 are preserved.
7776 7774
7777 7775 2. With the -m/--merge option, the update is allowed even if the
7778 7776 requested changeset is not an ancestor or descendant of
7779 7777 the working directory's parent.
7780 7778
7781 7779 3. With the -c/--check option, the update is aborted and the
7782 7780 uncommitted changes are preserved.
7783 7781
7784 7782 4. With the -C/--clean option, uncommitted changes are discarded and
7785 7783 the working directory is updated to the requested changeset.
7786 7784
7787 7785 To cancel an uncommitted merge (and lose your changes), use
7788 7786 :hg:`merge --abort`.
7789 7787
7790 7788 Use null as the changeset to remove the working directory (like
7791 7789 :hg:`clone -U`).
7792 7790
7793 7791 If you want to revert just one file to an older revision, use
7794 7792 :hg:`revert [-r REV] NAME`.
7795 7793
7796 7794 See :hg:`help dates` for a list of formats valid for -d/--date.
7797 7795
7798 7796 Returns 0 on success, 1 if there are unresolved files.
7799 7797 """
7800 7798 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7801 7799 rev = opts.get('rev')
7802 7800 date = opts.get('date')
7803 7801 clean = opts.get('clean')
7804 7802 check = opts.get('check')
7805 7803 merge = opts.get('merge')
7806 7804 if rev and node:
7807 7805 raise error.InputError(_(b"please specify just one revision"))
7808 7806
7809 7807 if ui.configbool(b'commands', b'update.requiredest'):
7810 7808 if not node and not rev and not date:
7811 7809 raise error.InputError(
7812 7810 _(b'you must specify a destination'),
7813 7811 hint=_(b'for example: hg update ".::"'),
7814 7812 )
7815 7813
7816 7814 if rev is None or rev == b'':
7817 7815 rev = node
7818 7816
7819 7817 if date and rev is not None:
7820 7818 raise error.InputError(_(b"you can't specify a revision and a date"))
7821 7819
7822 7820 updatecheck = None
7823 7821 if check:
7824 7822 updatecheck = b'abort'
7825 7823 elif merge:
7826 7824 updatecheck = b'none'
7827 7825
7828 7826 with repo.wlock():
7829 7827 cmdutil.clearunfinished(repo)
7830 7828 if date:
7831 7829 rev = cmdutil.finddate(ui, repo, date)
7832 7830
7833 7831 # if we defined a bookmark, we have to remember the original name
7834 7832 brev = rev
7835 7833 if rev:
7836 7834 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7837 7835 ctx = scmutil.revsingle(repo, rev, default=None)
7838 7836 rev = ctx.rev()
7839 7837 hidden = ctx.hidden()
7840 7838 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7841 7839 with ui.configoverride(overrides, b'update'):
7842 7840 ret = hg.updatetotally(
7843 7841 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7844 7842 )
7845 7843 if hidden:
7846 7844 ctxstr = ctx.hex()[:12]
7847 7845 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7848 7846
7849 7847 if ctx.obsolete():
7850 7848 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7851 7849 ui.warn(b"(%s)\n" % obsfatemsg)
7852 7850 return ret
7853 7851
7854 7852
7855 7853 @command(
7856 7854 b'verify',
7857 7855 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7858 7856 helpcategory=command.CATEGORY_MAINTENANCE,
7859 7857 )
7860 7858 def verify(ui, repo, **opts):
7861 7859 """verify the integrity of the repository
7862 7860
7863 7861 Verify the integrity of the current repository.
7864 7862
7865 7863 This will perform an extensive check of the repository's
7866 7864 integrity, validating the hashes and checksums of each entry in
7867 7865 the changelog, manifest, and tracked files, as well as the
7868 7866 integrity of their crosslinks and indices.
7869 7867
7870 7868 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7871 7869 for more information about recovery from corruption of the
7872 7870 repository.
7873 7871
7874 7872 Returns 0 on success, 1 if errors are encountered.
7875 7873 """
7876 7874 opts = pycompat.byteskwargs(opts)
7877 7875
7878 7876 level = None
7879 7877 if opts[b'full']:
7880 7878 level = verifymod.VERIFY_FULL
7881 7879 return hg.verify(repo, level)
7882 7880
7883 7881
7884 7882 @command(
7885 7883 b'version',
7886 7884 [] + formatteropts,
7887 7885 helpcategory=command.CATEGORY_HELP,
7888 7886 norepo=True,
7889 7887 intents={INTENT_READONLY},
7890 7888 )
7891 7889 def version_(ui, **opts):
7892 7890 """output version and copyright information
7893 7891
7894 7892 .. container:: verbose
7895 7893
7896 7894 Template:
7897 7895
7898 7896 The following keywords are supported. See also :hg:`help templates`.
7899 7897
7900 7898 :extensions: List of extensions.
7901 7899 :ver: String. Version number.
7902 7900
7903 7901 And each entry of ``{extensions}`` provides the following sub-keywords
7904 7902 in addition to ``{ver}``.
7905 7903
7906 7904 :bundled: Boolean. True if included in the release.
7907 7905 :name: String. Extension name.
7908 7906 """
7909 7907 opts = pycompat.byteskwargs(opts)
7910 7908 if ui.verbose:
7911 7909 ui.pager(b'version')
7912 7910 fm = ui.formatter(b"version", opts)
7913 7911 fm.startitem()
7914 7912 fm.write(
7915 7913 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7916 7914 )
7917 7915 license = _(
7918 7916 b"(see https://mercurial-scm.org for more information)\n"
7919 7917 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7920 7918 b"This is free software; see the source for copying conditions. "
7921 7919 b"There is NO\nwarranty; "
7922 7920 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7923 7921 )
7924 7922 if not ui.quiet:
7925 7923 fm.plain(license)
7926 7924
7927 7925 if ui.verbose:
7928 7926 fm.plain(_(b"\nEnabled extensions:\n\n"))
7929 7927 # format names and versions into columns
7930 7928 names = []
7931 7929 vers = []
7932 7930 isinternals = []
7933 7931 for name, module in sorted(extensions.extensions()):
7934 7932 names.append(name)
7935 7933 vers.append(extensions.moduleversion(module) or None)
7936 7934 isinternals.append(extensions.ismoduleinternal(module))
7937 7935 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7938 7936 if names:
7939 7937 namefmt = b" %%-%ds " % max(len(n) for n in names)
7940 7938 places = [_(b"external"), _(b"internal")]
7941 7939 for n, v, p in zip(names, vers, isinternals):
7942 7940 fn.startitem()
7943 7941 fn.condwrite(ui.verbose, b"name", namefmt, n)
7944 7942 if ui.verbose:
7945 7943 fn.plain(b"%s " % places[p])
7946 7944 fn.data(bundled=p)
7947 7945 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7948 7946 if ui.verbose:
7949 7947 fn.plain(b"\n")
7950 7948 fn.end()
7951 7949 fm.end()
7952 7950
7953 7951
7954 7952 def loadcmdtable(ui, name, cmdtable):
7955 7953 """Load command functions from specified cmdtable"""
7956 7954 overrides = [cmd for cmd in cmdtable if cmd in table]
7957 7955 if overrides:
7958 7956 ui.warn(
7959 7957 _(b"extension '%s' overrides commands: %s\n")
7960 7958 % (name, b" ".join(overrides))
7961 7959 )
7962 7960 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
General Comments 0
You need to be logged in to leave comments. Login now