##// END OF EJS Templates
chistedit: move changeaction() onto state class...
Martin von Zweigbergk -
r49025:141aafac default
parent child Browse files
Show More
@@ -1,2660 +1,2659
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 578 with repo.ui.silent():
579 579 hg.update(repo, self.state.parentctxnode, quietempty=True)
580 580 stats = applychanges(repo.ui, repo, rulectx, {})
581 581 repo.dirstate.setbranch(rulectx.branch())
582 582 if stats.unresolvedcount:
583 583 raise error.InterventionRequired(
584 584 _(b'Fix up the change (%s %s)') % (self.verb, short(self.node)),
585 585 hint=_(b'hg histedit --continue to resume'),
586 586 )
587 587
588 588 def continuedirty(self):
589 589 """Continues the action when changes have been applied to the working
590 590 copy. The default behavior is to commit the dirty changes."""
591 591 repo = self.repo
592 592 rulectx = repo[self.node]
593 593
594 594 editor = self.commiteditor()
595 595 commit = commitfuncfor(repo, rulectx)
596 596 if repo.ui.configbool(b'rewrite', b'update-timestamp'):
597 597 date = dateutil.makedate()
598 598 else:
599 599 date = rulectx.date()
600 600 commit(
601 601 text=rulectx.description(),
602 602 user=rulectx.user(),
603 603 date=date,
604 604 extra=rulectx.extra(),
605 605 editor=editor,
606 606 )
607 607
608 608 def commiteditor(self):
609 609 """The editor to be used to edit the commit message."""
610 610 return False
611 611
612 612 def continueclean(self):
613 613 """Continues the action when the working copy is clean. The default
614 614 behavior is to accept the current commit as the new version of the
615 615 rulectx."""
616 616 ctx = self.repo[b'.']
617 617 if ctx.node() == self.state.parentctxnode:
618 618 self.repo.ui.warn(
619 619 _(b'%s: skipping changeset (no changes)\n') % short(self.node)
620 620 )
621 621 return ctx, [(self.node, tuple())]
622 622 if ctx.node() == self.node:
623 623 # Nothing changed
624 624 return ctx, []
625 625 return ctx, [(self.node, (ctx.node(),))]
626 626
627 627
628 628 def commitfuncfor(repo, src):
629 629 """Build a commit function for the replacement of <src>
630 630
631 631 This function ensure we apply the same treatment to all changesets.
632 632
633 633 - Add a 'histedit_source' entry in extra.
634 634
635 635 Note that fold has its own separated logic because its handling is a bit
636 636 different and not easily factored out of the fold method.
637 637 """
638 638 phasemin = src.phase()
639 639
640 640 def commitfunc(**kwargs):
641 641 overrides = {(b'phases', b'new-commit'): phasemin}
642 642 with repo.ui.configoverride(overrides, b'histedit'):
643 643 extra = kwargs.get('extra', {}).copy()
644 644 extra[b'histedit_source'] = src.hex()
645 645 kwargs['extra'] = extra
646 646 return repo.commit(**kwargs)
647 647
648 648 return commitfunc
649 649
650 650
651 651 def applychanges(ui, repo, ctx, opts):
652 652 """Merge changeset from ctx (only) in the current working directory"""
653 653 if ctx.p1().node() == repo.dirstate.p1():
654 654 # edits are "in place" we do not need to make any merge,
655 655 # just applies changes on parent for editing
656 656 with ui.silent():
657 657 cmdutil.revert(ui, repo, ctx, all=True)
658 658 stats = mergemod.updateresult(0, 0, 0, 0)
659 659 else:
660 660 try:
661 661 # ui.forcemerge is an internal variable, do not document
662 662 repo.ui.setconfig(
663 663 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
664 664 )
665 665 stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit'])
666 666 finally:
667 667 repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
668 668 return stats
669 669
670 670
671 671 def collapse(repo, firstctx, lastctx, commitopts, skipprompt=False):
672 672 """collapse the set of revisions from first to last as new one.
673 673
674 674 Expected commit options are:
675 675 - message
676 676 - date
677 677 - username
678 678 Commit message is edited in all cases.
679 679
680 680 This function works in memory."""
681 681 ctxs = list(repo.set(b'%d::%d', firstctx.rev(), lastctx.rev()))
682 682 if not ctxs:
683 683 return None
684 684 for c in ctxs:
685 685 if not c.mutable():
686 686 raise error.ParseError(
687 687 _(b"cannot fold into public change %s") % short(c.node())
688 688 )
689 689 base = firstctx.p1()
690 690
691 691 # commit a new version of the old changeset, including the update
692 692 # collect all files which might be affected
693 693 files = set()
694 694 for ctx in ctxs:
695 695 files.update(ctx.files())
696 696
697 697 # Recompute copies (avoid recording a -> b -> a)
698 698 copied = copies.pathcopies(base, lastctx)
699 699
700 700 # prune files which were reverted by the updates
701 701 files = [f for f in files if not cmdutil.samefile(f, lastctx, base)]
702 702 # commit version of these files as defined by head
703 703 headmf = lastctx.manifest()
704 704
705 705 def filectxfn(repo, ctx, path):
706 706 if path in headmf:
707 707 fctx = lastctx[path]
708 708 flags = fctx.flags()
709 709 mctx = context.memfilectx(
710 710 repo,
711 711 ctx,
712 712 fctx.path(),
713 713 fctx.data(),
714 714 islink=b'l' in flags,
715 715 isexec=b'x' in flags,
716 716 copysource=copied.get(path),
717 717 )
718 718 return mctx
719 719 return None
720 720
721 721 if commitopts.get(b'message'):
722 722 message = commitopts[b'message']
723 723 else:
724 724 message = firstctx.description()
725 725 user = commitopts.get(b'user')
726 726 date = commitopts.get(b'date')
727 727 extra = commitopts.get(b'extra')
728 728
729 729 parents = (firstctx.p1().node(), firstctx.p2().node())
730 730 editor = None
731 731 if not skipprompt:
732 732 editor = cmdutil.getcommiteditor(edit=True, editform=b'histedit.fold')
733 733 new = context.memctx(
734 734 repo,
735 735 parents=parents,
736 736 text=message,
737 737 files=files,
738 738 filectxfn=filectxfn,
739 739 user=user,
740 740 date=date,
741 741 extra=extra,
742 742 editor=editor,
743 743 )
744 744 return repo.commitctx(new)
745 745
746 746
747 747 def _isdirtywc(repo):
748 748 return repo[None].dirty(missing=True)
749 749
750 750
751 751 def abortdirty():
752 752 raise error.StateError(
753 753 _(b'working copy has pending changes'),
754 754 hint=_(
755 755 b'amend, commit, or revert them and run histedit '
756 756 b'--continue, or abort with histedit --abort'
757 757 ),
758 758 )
759 759
760 760
761 761 def action(verbs, message, priority=False, internal=False):
762 762 def wrap(cls):
763 763 assert not priority or not internal
764 764 verb = verbs[0]
765 765 if priority:
766 766 primaryactions.add(verb)
767 767 elif internal:
768 768 internalactions.add(verb)
769 769 elif len(verbs) > 1:
770 770 secondaryactions.add(verb)
771 771 else:
772 772 tertiaryactions.add(verb)
773 773
774 774 cls.verb = verb
775 775 cls.verbs = verbs
776 776 cls.message = message
777 777 for verb in verbs:
778 778 actiontable[verb] = cls
779 779 return cls
780 780
781 781 return wrap
782 782
783 783
784 784 @action([b'pick', b'p'], _(b'use commit'), priority=True)
785 785 class pick(histeditaction):
786 786 def run(self):
787 787 rulectx = self.repo[self.node]
788 788 if rulectx.p1().node() == self.state.parentctxnode:
789 789 self.repo.ui.debug(b'node %s unchanged\n' % short(self.node))
790 790 return rulectx, []
791 791
792 792 return super(pick, self).run()
793 793
794 794
795 795 @action(
796 796 [b'edit', b'e'],
797 797 _(b'use commit, but allow edits before making new commit'),
798 798 priority=True,
799 799 )
800 800 class edit(histeditaction):
801 801 def run(self):
802 802 repo = self.repo
803 803 rulectx = repo[self.node]
804 804 hg.update(repo, self.state.parentctxnode, quietempty=True)
805 805 applychanges(repo.ui, repo, rulectx, {})
806 806 hint = _(b'to edit %s, `hg histedit --continue` after making changes')
807 807 raise error.InterventionRequired(
808 808 _(b'Editing (%s), commit as needed now to split the change')
809 809 % short(self.node),
810 810 hint=hint % short(self.node),
811 811 )
812 812
813 813 def commiteditor(self):
814 814 return cmdutil.getcommiteditor(edit=True, editform=b'histedit.edit')
815 815
816 816
817 817 @action([b'fold', b'f'], _(b'use commit, but combine it with the one above'))
818 818 class fold(histeditaction):
819 819 def verify(self, prev, expected, seen):
820 820 """Verifies semantic correctness of the fold rule"""
821 821 super(fold, self).verify(prev, expected, seen)
822 822 repo = self.repo
823 823 if not prev:
824 824 c = repo[self.node].p1()
825 825 elif not prev.verb in (b'pick', b'base'):
826 826 return
827 827 else:
828 828 c = repo[prev.node]
829 829 if not c.mutable():
830 830 raise error.ParseError(
831 831 _(b"cannot fold into public change %s") % short(c.node())
832 832 )
833 833
834 834 def continuedirty(self):
835 835 repo = self.repo
836 836 rulectx = repo[self.node]
837 837
838 838 commit = commitfuncfor(repo, rulectx)
839 839 commit(
840 840 text=b'fold-temp-revision %s' % short(self.node),
841 841 user=rulectx.user(),
842 842 date=rulectx.date(),
843 843 extra=rulectx.extra(),
844 844 )
845 845
846 846 def continueclean(self):
847 847 repo = self.repo
848 848 ctx = repo[b'.']
849 849 rulectx = repo[self.node]
850 850 parentctxnode = self.state.parentctxnode
851 851 if ctx.node() == parentctxnode:
852 852 repo.ui.warn(_(b'%s: empty changeset\n') % short(self.node))
853 853 return ctx, [(self.node, (parentctxnode,))]
854 854
855 855 parentctx = repo[parentctxnode]
856 856 newcommits = {
857 857 c.node()
858 858 for c in repo.set(b'(%d::. - %d)', parentctx.rev(), parentctx.rev())
859 859 }
860 860 if not newcommits:
861 861 repo.ui.warn(
862 862 _(
863 863 b'%s: cannot fold - working copy is not a '
864 864 b'descendant of previous commit %s\n'
865 865 )
866 866 % (short(self.node), short(parentctxnode))
867 867 )
868 868 return ctx, [(self.node, (ctx.node(),))]
869 869
870 870 middlecommits = newcommits.copy()
871 871 middlecommits.discard(ctx.node())
872 872
873 873 return self.finishfold(
874 874 repo.ui, repo, parentctx, rulectx, ctx.node(), middlecommits
875 875 )
876 876
877 877 def skipprompt(self):
878 878 """Returns true if the rule should skip the message editor.
879 879
880 880 For example, 'fold' wants to show an editor, but 'rollup'
881 881 doesn't want to.
882 882 """
883 883 return False
884 884
885 885 def mergedescs(self):
886 886 """Returns true if the rule should merge messages of multiple changes.
887 887
888 888 This exists mainly so that 'rollup' rules can be a subclass of
889 889 'fold'.
890 890 """
891 891 return True
892 892
893 893 def firstdate(self):
894 894 """Returns true if the rule should preserve the date of the first
895 895 change.
896 896
897 897 This exists mainly so that 'rollup' rules can be a subclass of
898 898 'fold'.
899 899 """
900 900 return False
901 901
902 902 def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
903 903 mergemod.update(ctx.p1())
904 904 ### prepare new commit data
905 905 commitopts = {}
906 906 commitopts[b'user'] = ctx.user()
907 907 # commit message
908 908 if not self.mergedescs():
909 909 newmessage = ctx.description()
910 910 else:
911 911 newmessage = (
912 912 b'\n***\n'.join(
913 913 [ctx.description()]
914 914 + [repo[r].description() for r in internalchanges]
915 915 + [oldctx.description()]
916 916 )
917 917 + b'\n'
918 918 )
919 919 commitopts[b'message'] = newmessage
920 920 # date
921 921 if self.firstdate():
922 922 commitopts[b'date'] = ctx.date()
923 923 else:
924 924 commitopts[b'date'] = max(ctx.date(), oldctx.date())
925 925 # if date is to be updated to current
926 926 if ui.configbool(b'rewrite', b'update-timestamp'):
927 927 commitopts[b'date'] = dateutil.makedate()
928 928
929 929 extra = ctx.extra().copy()
930 930 # histedit_source
931 931 # note: ctx is likely a temporary commit but that the best we can do
932 932 # here. This is sufficient to solve issue3681 anyway.
933 933 extra[b'histedit_source'] = b'%s,%s' % (ctx.hex(), oldctx.hex())
934 934 commitopts[b'extra'] = extra
935 935 phasemin = max(ctx.phase(), oldctx.phase())
936 936 overrides = {(b'phases', b'new-commit'): phasemin}
937 937 with repo.ui.configoverride(overrides, b'histedit'):
938 938 n = collapse(
939 939 repo,
940 940 ctx,
941 941 repo[newnode],
942 942 commitopts,
943 943 skipprompt=self.skipprompt(),
944 944 )
945 945 if n is None:
946 946 return ctx, []
947 947 mergemod.update(repo[n])
948 948 replacements = [
949 949 (oldctx.node(), (newnode,)),
950 950 (ctx.node(), (n,)),
951 951 (newnode, (n,)),
952 952 ]
953 953 for ich in internalchanges:
954 954 replacements.append((ich, (n,)))
955 955 return repo[n], replacements
956 956
957 957
958 958 @action(
959 959 [b'base', b'b'],
960 960 _(b'checkout changeset and apply further changesets from there'),
961 961 )
962 962 class base(histeditaction):
963 963 def run(self):
964 964 if self.repo[b'.'].node() != self.node:
965 965 mergemod.clean_update(self.repo[self.node])
966 966 return self.continueclean()
967 967
968 968 def continuedirty(self):
969 969 abortdirty()
970 970
971 971 def continueclean(self):
972 972 basectx = self.repo[b'.']
973 973 return basectx, []
974 974
975 975 def _verifynodeconstraints(self, prev, expected, seen):
976 976 # base can only be use with a node not in the edited set
977 977 if self.node in expected:
978 978 msg = _(b'%s "%s" changeset was an edited list candidate')
979 979 raise error.ParseError(
980 980 msg % (self.verb, short(self.node)),
981 981 hint=_(b'base must only use unlisted changesets'),
982 982 )
983 983
984 984
985 985 @action(
986 986 [b'_multifold'],
987 987 _(
988 988 """fold subclass used for when multiple folds happen in a row
989 989
990 990 We only want to fire the editor for the folded message once when
991 991 (say) four changes are folded down into a single change. This is
992 992 similar to rollup, but we should preserve both messages so that
993 993 when the last fold operation runs we can show the user all the
994 994 commit messages in their editor.
995 995 """
996 996 ),
997 997 internal=True,
998 998 )
999 999 class _multifold(fold):
1000 1000 def skipprompt(self):
1001 1001 return True
1002 1002
1003 1003
1004 1004 @action(
1005 1005 [b"roll", b"r"],
1006 1006 _(b"like fold, but discard this commit's description and date"),
1007 1007 )
1008 1008 class rollup(fold):
1009 1009 def mergedescs(self):
1010 1010 return False
1011 1011
1012 1012 def skipprompt(self):
1013 1013 return True
1014 1014
1015 1015 def firstdate(self):
1016 1016 return True
1017 1017
1018 1018
1019 1019 @action([b"drop", b"d"], _(b'remove commit from history'))
1020 1020 class drop(histeditaction):
1021 1021 def run(self):
1022 1022 parentctx = self.repo[self.state.parentctxnode]
1023 1023 return parentctx, [(self.node, tuple())]
1024 1024
1025 1025
1026 1026 @action(
1027 1027 [b"mess", b"m"],
1028 1028 _(b'edit commit message without changing commit content'),
1029 1029 priority=True,
1030 1030 )
1031 1031 class message(histeditaction):
1032 1032 def commiteditor(self):
1033 1033 return cmdutil.getcommiteditor(edit=True, editform=b'histedit.mess')
1034 1034
1035 1035
1036 1036 def findoutgoing(ui, repo, remote=None, force=False, opts=None):
1037 1037 """utility function to find the first outgoing changeset
1038 1038
1039 1039 Used by initialization code"""
1040 1040 if opts is None:
1041 1041 opts = {}
1042 1042 path = urlutil.get_unique_push_path(b'histedit', repo, ui, remote)
1043 1043 dest = path.pushloc or path.loc
1044 1044
1045 1045 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
1046 1046
1047 1047 revs, checkout = hg.addbranchrevs(repo, repo, (path.branch, []), None)
1048 1048 other = hg.peer(repo, opts, dest)
1049 1049
1050 1050 if revs:
1051 1051 revs = [repo.lookup(rev) for rev in revs]
1052 1052
1053 1053 outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force)
1054 1054 if not outgoing.missing:
1055 1055 raise error.StateError(_(b'no outgoing ancestors'))
1056 1056 roots = list(repo.revs(b"roots(%ln)", outgoing.missing))
1057 1057 if len(roots) > 1:
1058 1058 msg = _(b'there are ambiguous outgoing revisions')
1059 1059 hint = _(b"see 'hg help histedit' for more detail")
1060 1060 raise error.StateError(msg, hint=hint)
1061 1061 return repo[roots[0]].node()
1062 1062
1063 1063
1064 1064 # Curses Support
1065 1065 try:
1066 1066 import curses
1067 1067 except ImportError:
1068 1068 curses = None
1069 1069
1070 1070 KEY_LIST = [b'pick', b'edit', b'fold', b'drop', b'mess', b'roll']
1071 1071 ACTION_LABELS = {
1072 1072 b'fold': b'^fold',
1073 1073 b'roll': b'^roll',
1074 1074 }
1075 1075
1076 1076 COLOR_HELP, COLOR_SELECTED, COLOR_OK, COLOR_WARN, COLOR_CURRENT = 1, 2, 3, 4, 5
1077 1077 COLOR_DIFF_ADD_LINE, COLOR_DIFF_DEL_LINE, COLOR_DIFF_OFFSET = 6, 7, 8
1078 1078 COLOR_ROLL, COLOR_ROLL_CURRENT, COLOR_ROLL_SELECTED = 9, 10, 11
1079 1079
1080 1080 E_QUIT, E_HISTEDIT = 1, 2
1081 1081 E_PAGEDOWN, E_PAGEUP, E_LINEUP, E_LINEDOWN, E_RESIZE = 3, 4, 5, 6, 7
1082 1082 MODE_INIT, MODE_PATCH, MODE_RULES, MODE_HELP = 0, 1, 2, 3
1083 1083
1084 1084 KEYTABLE = {
1085 1085 b'global': {
1086 1086 b'h': b'next-action',
1087 1087 b'KEY_RIGHT': b'next-action',
1088 1088 b'l': b'prev-action',
1089 1089 b'KEY_LEFT': b'prev-action',
1090 1090 b'q': b'quit',
1091 1091 b'c': b'histedit',
1092 1092 b'C': b'histedit',
1093 1093 b'v': b'showpatch',
1094 1094 b'?': b'help',
1095 1095 },
1096 1096 MODE_RULES: {
1097 1097 b'd': b'action-drop',
1098 1098 b'e': b'action-edit',
1099 1099 b'f': b'action-fold',
1100 1100 b'm': b'action-mess',
1101 1101 b'p': b'action-pick',
1102 1102 b'r': b'action-roll',
1103 1103 b' ': b'select',
1104 1104 b'j': b'down',
1105 1105 b'k': b'up',
1106 1106 b'KEY_DOWN': b'down',
1107 1107 b'KEY_UP': b'up',
1108 1108 b'J': b'move-down',
1109 1109 b'K': b'move-up',
1110 1110 b'KEY_NPAGE': b'move-down',
1111 1111 b'KEY_PPAGE': b'move-up',
1112 1112 b'0': b'goto', # Used for 0..9
1113 1113 },
1114 1114 MODE_PATCH: {
1115 1115 b' ': b'page-down',
1116 1116 b'KEY_NPAGE': b'page-down',
1117 1117 b'KEY_PPAGE': b'page-up',
1118 1118 b'j': b'line-down',
1119 1119 b'k': b'line-up',
1120 1120 b'KEY_DOWN': b'line-down',
1121 1121 b'KEY_UP': b'line-up',
1122 1122 b'J': b'down',
1123 1123 b'K': b'up',
1124 1124 },
1125 1125 MODE_HELP: {},
1126 1126 }
1127 1127
1128 1128
1129 1129 def screen_size():
1130 1130 return struct.unpack(b'hh', fcntl.ioctl(1, termios.TIOCGWINSZ, b' '))
1131 1131
1132 1132
1133 1133 class histeditrule(object):
1134 1134 def __init__(self, ui, ctx, pos, action=b'pick'):
1135 1135 self.ui = ui
1136 1136 self.ctx = ctx
1137 1137 self.action = action
1138 1138 self.origpos = pos
1139 1139 self.pos = pos
1140 1140 self.conflicts = []
1141 1141
1142 1142 def __bytes__(self):
1143 1143 # Example display of several histeditrules:
1144 1144 #
1145 1145 # #10 pick 316392:06a16c25c053 add option to skip tests
1146 1146 # #11 ^roll 316393:71313c964cc5 <RED>oops a fixup commit</RED>
1147 1147 # #12 pick 316394:ab31f3973b0d include mfbt for mozilla-config.h
1148 1148 # #13 ^fold 316395:14ce5803f4c3 fix warnings
1149 1149 #
1150 1150 # The carets point to the changeset being folded into ("roll this
1151 1151 # changeset into the changeset above").
1152 1152 return b'%s%s' % (self.prefix, self.desc)
1153 1153
1154 1154 __str__ = encoding.strmethod(__bytes__)
1155 1155
1156 1156 @property
1157 1157 def prefix(self):
1158 1158 # Some actions ('fold' and 'roll') combine a patch with a
1159 1159 # previous one. Add a marker showing which patch they apply
1160 1160 # to.
1161 1161 action = ACTION_LABELS.get(self.action, self.action)
1162 1162
1163 1163 h = self.ctx.hex()[0:12]
1164 1164 r = self.ctx.rev()
1165 1165
1166 1166 return b"#%s %s %d:%s " % (
1167 1167 (b'%d' % self.origpos).ljust(2),
1168 1168 action.ljust(6),
1169 1169 r,
1170 1170 h,
1171 1171 )
1172 1172
1173 1173 @util.propertycache
1174 1174 def desc(self):
1175 1175 summary = cmdutil.rendertemplate(
1176 1176 self.ctx, self.ui.config(b'histedit', b'summary-template')
1177 1177 )
1178 1178 if summary:
1179 1179 return summary
1180 1180 # This is split off from the prefix property so that we can
1181 1181 # separately make the description for 'roll' red (since it
1182 1182 # will get discarded).
1183 1183 return self.ctx.description().splitlines()[0].strip()
1184 1184
1185 1185 def checkconflicts(self, other):
1186 1186 if other.pos > self.pos and other.origpos <= self.origpos:
1187 1187 if set(other.ctx.files()) & set(self.ctx.files()) != set():
1188 1188 self.conflicts.append(other)
1189 1189 return self.conflicts
1190 1190
1191 1191 if other in self.conflicts:
1192 1192 self.conflicts.remove(other)
1193 1193 return self.conflicts
1194 1194
1195 1195
1196 1196 # ============ EVENTS ===============
1197 def changeaction(state, pos, action):
1198 """Change the action state on the given position to the new action"""
1199 rules = state.rules
1200 assert 0 <= pos < len(rules)
1201 rules[pos].action = action
1202
1203
1204 1197 def cycleaction(state, pos, next=False):
1205 1198 """Changes the action state the next or the previous action from
1206 1199 the action list"""
1207 1200 rules = state.rules
1208 1201 assert 0 <= pos < len(rules)
1209 1202 current = rules[pos].action
1210 1203
1211 1204 assert current in KEY_LIST
1212 1205
1213 1206 index = KEY_LIST.index(current)
1214 1207 if next:
1215 1208 index += 1
1216 1209 else:
1217 1210 index -= 1
1218 changeaction(state, pos, KEY_LIST[index % len(KEY_LIST)])
1211 state.change_action(pos, KEY_LIST[index % len(KEY_LIST)])
1219 1212
1220 1213
1221 1214 def changeview(state, delta, unit):
1222 1215 """Change the region of whatever is being viewed (a patch or the list of
1223 1216 changesets). 'delta' is an amount (+/- 1) and 'unit' is 'page' or 'line'."""
1224 1217 mode, _ = state.mode
1225 1218 if mode != MODE_PATCH:
1226 1219 return
1227 1220 mode_state = state.modes[mode]
1228 1221 num_lines = len(mode_state[b'patchcontents'])
1229 1222 page_height = state.page_height
1230 1223 unit = page_height if unit == b'page' else 1
1231 1224 num_pages = 1 + (num_lines - 1) // page_height
1232 1225 max_offset = (num_pages - 1) * page_height
1233 1226 newline = mode_state[b'line_offset'] + delta * unit
1234 1227 mode_state[b'line_offset'] = max(0, min(max_offset, newline))
1235 1228
1236 1229
1237 1230 def makecommands(rules):
1238 1231 """Returns a list of commands consumable by histedit --commands based on
1239 1232 our list of rules"""
1240 1233 commands = []
1241 1234 for rules in rules:
1242 1235 commands.append(b'%s %s\n' % (rules.action, rules.ctx))
1243 1236 return commands
1244 1237
1245 1238
1246 1239 def addln(win, y, x, line, color=None):
1247 1240 """Add a line to the given window left padding but 100% filled with
1248 1241 whitespace characters, so that the color appears on the whole line"""
1249 1242 maxy, maxx = win.getmaxyx()
1250 1243 length = maxx - 1 - x
1251 1244 line = bytes(line).ljust(length)[:length]
1252 1245 if y < 0:
1253 1246 y = maxy + y
1254 1247 if x < 0:
1255 1248 x = maxx + x
1256 1249 if color:
1257 1250 win.addstr(y, x, line, color)
1258 1251 else:
1259 1252 win.addstr(y, x, line)
1260 1253
1261 1254
1262 1255 def _trunc_head(line, n):
1263 1256 if len(line) <= n:
1264 1257 return line
1265 1258 return b'> ' + line[-(n - 2) :]
1266 1259
1267 1260
1268 1261 def _trunc_tail(line, n):
1269 1262 if len(line) <= n:
1270 1263 return line
1271 1264 return line[: n - 2] + b' >'
1272 1265
1273 1266
1274 1267 class _chistedit_state(object):
1275 1268 def __init__(
1276 1269 self,
1277 1270 repo,
1278 1271 rules,
1279 1272 stdscr,
1280 1273 ):
1281 1274 self.repo = repo
1282 1275 self.rules = rules
1283 1276 self.stdscr = stdscr
1284 1277 self.pos = 0
1285 1278 self.selected = None
1286 1279 self.mode = (MODE_INIT, MODE_INIT)
1287 1280 self.page_height = None
1288 1281 self.modes = {
1289 1282 MODE_RULES: {
1290 1283 b'line_offset': 0,
1291 1284 },
1292 1285 MODE_PATCH: {
1293 1286 b'line_offset': 0,
1294 1287 },
1295 1288 }
1296 1289
1297 1290 def render_commit(self, win):
1298 1291 """Renders the commit window that shows the log of the current selected
1299 1292 commit"""
1300 1293 pos = self.pos
1301 1294 rules = self.rules
1302 1295 rule = rules[pos]
1303 1296
1304 1297 ctx = rule.ctx
1305 1298 win.box()
1306 1299
1307 1300 maxy, maxx = win.getmaxyx()
1308 1301 length = maxx - 3
1309 1302
1310 1303 line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex()[:12])
1311 1304 win.addstr(1, 1, line[:length])
1312 1305
1313 1306 line = b"user: %s" % ctx.user()
1314 1307 win.addstr(2, 1, line[:length])
1315 1308
1316 1309 bms = self.repo.nodebookmarks(ctx.node())
1317 1310 line = b"bookmark: %s" % b' '.join(bms)
1318 1311 win.addstr(3, 1, line[:length])
1319 1312
1320 1313 line = b"summary: %s" % (ctx.description().splitlines()[0])
1321 1314 win.addstr(4, 1, line[:length])
1322 1315
1323 1316 line = b"files: "
1324 1317 win.addstr(5, 1, line)
1325 1318 fnx = 1 + len(line)
1326 1319 fnmaxx = length - fnx + 1
1327 1320 y = 5
1328 1321 fnmaxn = maxy - (1 + y) - 1
1329 1322 files = ctx.files()
1330 1323 for i, line1 in enumerate(files):
1331 1324 if len(files) > fnmaxn and i == fnmaxn - 1:
1332 1325 win.addstr(y, fnx, _trunc_tail(b','.join(files[i:]), fnmaxx))
1333 1326 y = y + 1
1334 1327 break
1335 1328 win.addstr(y, fnx, _trunc_head(line1, fnmaxx))
1336 1329 y = y + 1
1337 1330
1338 1331 conflicts = rule.conflicts
1339 1332 if len(conflicts) > 0:
1340 1333 conflictstr = b','.join(map(lambda r: r.ctx.hex()[:12], conflicts))
1341 1334 conflictstr = b"changed files overlap with %s" % conflictstr
1342 1335 else:
1343 1336 conflictstr = b'no overlap'
1344 1337
1345 1338 win.addstr(y, 1, conflictstr[:length])
1346 1339 win.noutrefresh()
1347 1340
1348 1341 def helplines(self):
1349 1342 if self.mode[0] == MODE_PATCH:
1350 1343 help = b"""\
1351 1344 ?: help, k/up: line up, j/down: line down, v: stop viewing patch
1352 1345 pgup: prev page, space/pgdn: next page, c: commit, q: abort
1353 1346 """
1354 1347 else:
1355 1348 help = b"""\
1356 1349 ?: help, k/up: move up, j/down: move down, space: select, v: view patch
1357 1350 d: drop, e: edit, f: fold, m: mess, p: pick, r: roll
1358 1351 pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort
1359 1352 """
1360 1353 return help.splitlines()
1361 1354
1362 1355 def render_help(self, win):
1363 1356 maxy, maxx = win.getmaxyx()
1364 1357 for y, line in enumerate(self.helplines()):
1365 1358 if y >= maxy:
1366 1359 break
1367 1360 addln(win, y, 0, line, curses.color_pair(COLOR_HELP))
1368 1361 win.noutrefresh()
1369 1362
1370 1363 def layout(self):
1371 1364 maxy, maxx = self.stdscr.getmaxyx()
1372 1365 helplen = len(self.helplines())
1373 1366 mainlen = maxy - helplen - 12
1374 1367 if mainlen < 1:
1375 1368 raise error.Abort(
1376 1369 _(b"terminal dimensions %d by %d too small for curses histedit")
1377 1370 % (maxy, maxx),
1378 1371 hint=_(
1379 1372 b"enlarge your terminal or use --config ui.interface=text"
1380 1373 ),
1381 1374 )
1382 1375 return {
1383 1376 b'commit': (12, maxx),
1384 1377 b'help': (helplen, maxx),
1385 1378 b'main': (mainlen, maxx),
1386 1379 }
1387 1380
1388 1381 def render_rules(self, rulesscr):
1389 1382 rules = self.rules
1390 1383 pos = self.pos
1391 1384 selected = self.selected
1392 1385 start = self.modes[MODE_RULES][b'line_offset']
1393 1386
1394 1387 conflicts = [r.ctx for r in rules if r.conflicts]
1395 1388 if len(conflicts) > 0:
1396 1389 line = b"potential conflict in %s" % b','.join(
1397 1390 map(pycompat.bytestr, conflicts)
1398 1391 )
1399 1392 addln(rulesscr, -1, 0, line, curses.color_pair(COLOR_WARN))
1400 1393
1401 1394 for y, rule in enumerate(rules[start:]):
1402 1395 if y >= self.page_height:
1403 1396 break
1404 1397 if len(rule.conflicts) > 0:
1405 1398 rulesscr.addstr(y, 0, b" ", curses.color_pair(COLOR_WARN))
1406 1399 else:
1407 1400 rulesscr.addstr(y, 0, b" ", curses.COLOR_BLACK)
1408 1401
1409 1402 if y + start == selected:
1410 1403 rollcolor = COLOR_ROLL_SELECTED
1411 1404 addln(rulesscr, y, 2, rule, curses.color_pair(COLOR_SELECTED))
1412 1405 elif y + start == pos:
1413 1406 rollcolor = COLOR_ROLL_CURRENT
1414 1407 addln(
1415 1408 rulesscr,
1416 1409 y,
1417 1410 2,
1418 1411 rule,
1419 1412 curses.color_pair(COLOR_CURRENT) | curses.A_BOLD,
1420 1413 )
1421 1414 else:
1422 1415 rollcolor = COLOR_ROLL
1423 1416 addln(rulesscr, y, 2, rule)
1424 1417
1425 1418 if rule.action == b'roll':
1426 1419 rulesscr.addstr(
1427 1420 y,
1428 1421 2 + len(rule.prefix),
1429 1422 rule.desc,
1430 1423 curses.color_pair(rollcolor),
1431 1424 )
1432 1425
1433 1426 rulesscr.noutrefresh()
1434 1427
1435 1428 def render_string(self, win, output, diffcolors=False):
1436 1429 maxy, maxx = win.getmaxyx()
1437 1430 length = min(maxy - 1, len(output))
1438 1431 for y in range(0, length):
1439 1432 line = output[y]
1440 1433 if diffcolors:
1441 1434 if line and line[0] == b'+':
1442 1435 win.addstr(
1443 1436 y, 0, line, curses.color_pair(COLOR_DIFF_ADD_LINE)
1444 1437 )
1445 1438 elif line and line[0] == b'-':
1446 1439 win.addstr(
1447 1440 y, 0, line, curses.color_pair(COLOR_DIFF_DEL_LINE)
1448 1441 )
1449 1442 elif line.startswith(b'@@ '):
1450 1443 win.addstr(y, 0, line, curses.color_pair(COLOR_DIFF_OFFSET))
1451 1444 else:
1452 1445 win.addstr(y, 0, line)
1453 1446 else:
1454 1447 win.addstr(y, 0, line)
1455 1448 win.noutrefresh()
1456 1449
1457 1450 def render_patch(self, win):
1458 1451 start = self.modes[MODE_PATCH][b'line_offset']
1459 1452 content = self.modes[MODE_PATCH][b'patchcontents']
1460 1453 self.render_string(win, content[start:], diffcolors=True)
1461 1454
1462 1455 def event(self, ch):
1463 1456 """Change state based on the current character input
1464 1457
1465 1458 This takes the current state and based on the current character input from
1466 1459 the user we change the state.
1467 1460 """
1468 1461 selected = self.selected
1469 1462 oldpos = self.pos
1470 1463 rules = self.rules
1471 1464
1472 1465 if ch in (curses.KEY_RESIZE, b"KEY_RESIZE"):
1473 1466 return E_RESIZE
1474 1467
1475 1468 lookup_ch = ch
1476 1469 if ch is not None and b'0' <= ch <= b'9':
1477 1470 lookup_ch = b'0'
1478 1471
1479 1472 curmode, prevmode = self.mode
1480 1473 action = KEYTABLE[curmode].get(
1481 1474 lookup_ch, KEYTABLE[b'global'].get(lookup_ch)
1482 1475 )
1483 1476 if action is None:
1484 1477 return
1485 1478 if action in (b'down', b'move-down'):
1486 1479 newpos = min(oldpos + 1, len(rules) - 1)
1487 1480 self.move_cursor(oldpos, newpos)
1488 1481 if selected is not None or action == b'move-down':
1489 1482 self.swap(oldpos, newpos)
1490 1483 elif action in (b'up', b'move-up'):
1491 1484 newpos = max(0, oldpos - 1)
1492 1485 self.move_cursor(oldpos, newpos)
1493 1486 if selected is not None or action == b'move-up':
1494 1487 self.swap(oldpos, newpos)
1495 1488 elif action == b'next-action':
1496 1489 cycleaction(self, oldpos, next=True)
1497 1490 elif action == b'prev-action':
1498 1491 cycleaction(self, oldpos, next=False)
1499 1492 elif action == b'select':
1500 1493 selected = oldpos if selected is None else None
1501 1494 self.make_selection(selected)
1502 1495 elif action == b'goto' and int(ch) < len(rules) and len(rules) <= 10:
1503 1496 newrule = next((r for r in rules if r.origpos == int(ch)))
1504 1497 self.move_cursor(oldpos, newrule.pos)
1505 1498 if selected is not None:
1506 1499 self.swap(oldpos, newrule.pos)
1507 1500 elif action.startswith(b'action-'):
1508 changeaction(self, oldpos, action[7:])
1501 self.change_action(oldpos, action[7:])
1509 1502 elif action == b'showpatch':
1510 1503 self.change_mode(MODE_PATCH if curmode != MODE_PATCH else prevmode)
1511 1504 elif action == b'help':
1512 1505 self.change_mode(MODE_HELP if curmode != MODE_HELP else prevmode)
1513 1506 elif action == b'quit':
1514 1507 return E_QUIT
1515 1508 elif action == b'histedit':
1516 1509 return E_HISTEDIT
1517 1510 elif action == b'page-down':
1518 1511 return E_PAGEDOWN
1519 1512 elif action == b'page-up':
1520 1513 return E_PAGEUP
1521 1514 elif action == b'line-down':
1522 1515 return E_LINEDOWN
1523 1516 elif action == b'line-up':
1524 1517 return E_LINEUP
1525 1518
1526 1519 def patch_contents(self):
1527 1520 repo = self.repo
1528 1521 rule = self.rules[self.pos]
1529 1522 displayer = logcmdutil.changesetdisplayer(
1530 1523 repo.ui,
1531 1524 repo,
1532 1525 {b"patch": True, b"template": b"status"},
1533 1526 buffered=True,
1534 1527 )
1535 1528 overrides = {(b'ui', b'verbose'): True}
1536 1529 with repo.ui.configoverride(overrides, source=b'histedit'):
1537 1530 displayer.show(rule.ctx)
1538 1531 displayer.close()
1539 1532 return displayer.hunk[rule.ctx.rev()].splitlines()
1540 1533
1541 1534 def move_cursor(self, oldpos, newpos):
1542 1535 """Change the rule/changeset that the cursor is pointing to, regardless of
1543 1536 current mode (you can switch between patches from the view patch window)."""
1544 1537 self.pos = newpos
1545 1538
1546 1539 mode, _ = self.mode
1547 1540 if mode == MODE_RULES:
1548 1541 # Scroll through the list by updating the view for MODE_RULES, so that
1549 1542 # even if we are not currently viewing the rules, switching back will
1550 1543 # result in the cursor's rule being visible.
1551 1544 modestate = self.modes[MODE_RULES]
1552 1545 if newpos < modestate[b'line_offset']:
1553 1546 modestate[b'line_offset'] = newpos
1554 1547 elif newpos > modestate[b'line_offset'] + self.page_height - 1:
1555 1548 modestate[b'line_offset'] = newpos - self.page_height + 1
1556 1549
1557 1550 # Reset the patch view region to the top of the new patch.
1558 1551 self.modes[MODE_PATCH][b'line_offset'] = 0
1559 1552
1560 1553 def change_mode(self, mode):
1561 1554 curmode, _ = self.mode
1562 1555 self.mode = (mode, curmode)
1563 1556 if mode == MODE_PATCH:
1564 1557 self.modes[MODE_PATCH][b'patchcontents'] = self.patch_contents()
1565 1558
1566 1559 def make_selection(self, pos):
1567 1560 self.selected = pos
1568 1561
1569 1562 def swap(self, oldpos, newpos):
1570 1563 """Swap two positions and calculate necessary conflicts in
1571 1564 O(|newpos-oldpos|) time"""
1572 1565
1573 1566 rules = self.rules
1574 1567 assert 0 <= oldpos < len(rules) and 0 <= newpos < len(rules)
1575 1568
1576 1569 rules[oldpos], rules[newpos] = rules[newpos], rules[oldpos]
1577 1570
1578 1571 # TODO: swap should not know about histeditrule's internals
1579 1572 rules[newpos].pos = newpos
1580 1573 rules[oldpos].pos = oldpos
1581 1574
1582 1575 start = min(oldpos, newpos)
1583 1576 end = max(oldpos, newpos)
1584 1577 for r in pycompat.xrange(start, end + 1):
1585 1578 rules[newpos].checkconflicts(rules[r])
1586 1579 rules[oldpos].checkconflicts(rules[r])
1587 1580
1588 1581 if self.selected:
1589 1582 self.make_selection(newpos)
1590 1583
1584 def change_action(self, pos, action):
1585 """Change the action state on the given position to the new action"""
1586 rules = self.rules
1587 assert 0 <= pos < len(rules)
1588 rules[pos].action = action
1589
1591 1590
1592 1591 def _chisteditmain(repo, rules, stdscr):
1593 1592 try:
1594 1593 curses.use_default_colors()
1595 1594 except curses.error:
1596 1595 pass
1597 1596
1598 1597 # initialize color pattern
1599 1598 curses.init_pair(COLOR_HELP, curses.COLOR_WHITE, curses.COLOR_BLUE)
1600 1599 curses.init_pair(COLOR_SELECTED, curses.COLOR_BLACK, curses.COLOR_WHITE)
1601 1600 curses.init_pair(COLOR_WARN, curses.COLOR_BLACK, curses.COLOR_YELLOW)
1602 1601 curses.init_pair(COLOR_OK, curses.COLOR_BLACK, curses.COLOR_GREEN)
1603 1602 curses.init_pair(COLOR_CURRENT, curses.COLOR_WHITE, curses.COLOR_MAGENTA)
1604 1603 curses.init_pair(COLOR_DIFF_ADD_LINE, curses.COLOR_GREEN, -1)
1605 1604 curses.init_pair(COLOR_DIFF_DEL_LINE, curses.COLOR_RED, -1)
1606 1605 curses.init_pair(COLOR_DIFF_OFFSET, curses.COLOR_MAGENTA, -1)
1607 1606 curses.init_pair(COLOR_ROLL, curses.COLOR_RED, -1)
1608 1607 curses.init_pair(
1609 1608 COLOR_ROLL_CURRENT, curses.COLOR_BLACK, curses.COLOR_MAGENTA
1610 1609 )
1611 1610 curses.init_pair(COLOR_ROLL_SELECTED, curses.COLOR_RED, curses.COLOR_WHITE)
1612 1611
1613 1612 # don't display the cursor
1614 1613 try:
1615 1614 curses.curs_set(0)
1616 1615 except curses.error:
1617 1616 pass
1618 1617
1619 1618 def drawvertwin(size, y, x):
1620 1619 win = curses.newwin(size[0], size[1], y, x)
1621 1620 y += size[0]
1622 1621 return win, y, x
1623 1622
1624 1623 state = _chistedit_state(repo, rules, stdscr)
1625 1624
1626 1625 # eventloop
1627 1626 ch = None
1628 1627 stdscr.clear()
1629 1628 stdscr.refresh()
1630 1629 while True:
1631 1630 oldmode, unused = state.mode
1632 1631 if oldmode == MODE_INIT:
1633 1632 state.change_mode(MODE_RULES)
1634 1633 e = state.event(ch)
1635 1634
1636 1635 if e == E_QUIT:
1637 1636 return False
1638 1637 if e == E_HISTEDIT:
1639 1638 return state.rules
1640 1639 else:
1641 1640 if e == E_RESIZE:
1642 1641 size = screen_size()
1643 1642 if size != stdscr.getmaxyx():
1644 1643 curses.resizeterm(*size)
1645 1644
1646 1645 sizes = state.layout()
1647 1646 curmode, unused = state.mode
1648 1647 if curmode != oldmode:
1649 1648 state.page_height = sizes[b'main'][0]
1650 1649 # Adjust the view to fit the current screen size.
1651 1650 state.move_cursor(state.pos, state.pos)
1652 1651
1653 1652 # Pack the windows against the top, each pane spread across the
1654 1653 # full width of the screen.
1655 1654 y, x = (0, 0)
1656 1655 helpwin, y, x = drawvertwin(sizes[b'help'], y, x)
1657 1656 mainwin, y, x = drawvertwin(sizes[b'main'], y, x)
1658 1657 commitwin, y, x = drawvertwin(sizes[b'commit'], y, x)
1659 1658
1660 1659 if e in (E_PAGEDOWN, E_PAGEUP, E_LINEDOWN, E_LINEUP):
1661 1660 if e == E_PAGEDOWN:
1662 1661 changeview(state, +1, b'page')
1663 1662 elif e == E_PAGEUP:
1664 1663 changeview(state, -1, b'page')
1665 1664 elif e == E_LINEDOWN:
1666 1665 changeview(state, +1, b'line')
1667 1666 elif e == E_LINEUP:
1668 1667 changeview(state, -1, b'line')
1669 1668
1670 1669 # start rendering
1671 1670 commitwin.erase()
1672 1671 helpwin.erase()
1673 1672 mainwin.erase()
1674 1673 if curmode == MODE_PATCH:
1675 1674 state.render_patch(mainwin)
1676 1675 elif curmode == MODE_HELP:
1677 1676 state.render_string(mainwin, __doc__.strip().splitlines())
1678 1677 else:
1679 1678 state.render_rules(mainwin)
1680 1679 state.render_commit(commitwin)
1681 1680 state.render_help(helpwin)
1682 1681 curses.doupdate()
1683 1682 # done rendering
1684 1683 ch = encoding.strtolocal(stdscr.getkey())
1685 1684
1686 1685
1687 1686 def _chistedit(ui, repo, freeargs, opts):
1688 1687 """interactively edit changeset history via a curses interface
1689 1688
1690 1689 Provides a ncurses interface to histedit. Press ? in chistedit mode
1691 1690 to see an extensive help. Requires python-curses to be installed."""
1692 1691
1693 1692 if curses is None:
1694 1693 raise error.Abort(_(b"Python curses library required"))
1695 1694
1696 1695 # disable color
1697 1696 ui._colormode = None
1698 1697
1699 1698 try:
1700 1699 keep = opts.get(b'keep')
1701 1700 revs = opts.get(b'rev', [])[:]
1702 1701 cmdutil.checkunfinished(repo)
1703 1702 cmdutil.bailifchanged(repo)
1704 1703
1705 1704 revs.extend(freeargs)
1706 1705 if not revs:
1707 1706 defaultrev = destutil.desthistedit(ui, repo)
1708 1707 if defaultrev is not None:
1709 1708 revs.append(defaultrev)
1710 1709 if len(revs) != 1:
1711 1710 raise error.InputError(
1712 1711 _(b'histedit requires exactly one ancestor revision')
1713 1712 )
1714 1713
1715 1714 rr = list(repo.set(b'roots(%ld)', logcmdutil.revrange(repo, revs)))
1716 1715 if len(rr) != 1:
1717 1716 raise error.InputError(
1718 1717 _(
1719 1718 b'The specified revisions must have '
1720 1719 b'exactly one common root'
1721 1720 )
1722 1721 )
1723 1722 root = rr[0].node()
1724 1723
1725 1724 topmost = repo.dirstate.p1()
1726 1725 revs = between(repo, root, topmost, keep)
1727 1726 if not revs:
1728 1727 raise error.InputError(
1729 1728 _(b'%s is not an ancestor of working directory') % short(root)
1730 1729 )
1731 1730
1732 1731 ctxs = []
1733 1732 for i, r in enumerate(revs):
1734 1733 ctxs.append(histeditrule(ui, repo[r], i))
1735 1734 with util.with_lc_ctype():
1736 1735 rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs))
1737 1736 curses.echo()
1738 1737 curses.endwin()
1739 1738 if rc is False:
1740 1739 ui.write(_(b"histedit aborted\n"))
1741 1740 return 0
1742 1741 if type(rc) is list:
1743 1742 ui.status(_(b"performing changes\n"))
1744 1743 rules = makecommands(rc)
1745 1744 with repo.vfs(b'chistedit', b'w+') as fp:
1746 1745 for r in rules:
1747 1746 fp.write(r)
1748 1747 opts[b'commands'] = fp.name
1749 1748 return _texthistedit(ui, repo, freeargs, opts)
1750 1749 except KeyboardInterrupt:
1751 1750 pass
1752 1751 return -1
1753 1752
1754 1753
1755 1754 @command(
1756 1755 b'histedit',
1757 1756 [
1758 1757 (
1759 1758 b'',
1760 1759 b'commands',
1761 1760 b'',
1762 1761 _(b'read history edits from the specified file'),
1763 1762 _(b'FILE'),
1764 1763 ),
1765 1764 (b'c', b'continue', False, _(b'continue an edit already in progress')),
1766 1765 (b'', b'edit-plan', False, _(b'edit remaining actions list')),
1767 1766 (
1768 1767 b'k',
1769 1768 b'keep',
1770 1769 False,
1771 1770 _(b"don't strip old nodes after edit is complete"),
1772 1771 ),
1773 1772 (b'', b'abort', False, _(b'abort an edit in progress')),
1774 1773 (b'o', b'outgoing', False, _(b'changesets not found in destination')),
1775 1774 (
1776 1775 b'f',
1777 1776 b'force',
1778 1777 False,
1779 1778 _(b'force outgoing even for unrelated repositories'),
1780 1779 ),
1781 1780 (b'r', b'rev', [], _(b'first revision to be edited'), _(b'REV')),
1782 1781 ]
1783 1782 + cmdutil.formatteropts,
1784 1783 _(b"[OPTIONS] ([ANCESTOR] | --outgoing [URL])"),
1785 1784 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
1786 1785 )
1787 1786 def histedit(ui, repo, *freeargs, **opts):
1788 1787 """interactively edit changeset history
1789 1788
1790 1789 This command lets you edit a linear series of changesets (up to
1791 1790 and including the working directory, which should be clean).
1792 1791 You can:
1793 1792
1794 1793 - `pick` to [re]order a changeset
1795 1794
1796 1795 - `drop` to omit changeset
1797 1796
1798 1797 - `mess` to reword the changeset commit message
1799 1798
1800 1799 - `fold` to combine it with the preceding changeset (using the later date)
1801 1800
1802 1801 - `roll` like fold, but discarding this commit's description and date
1803 1802
1804 1803 - `edit` to edit this changeset (preserving date)
1805 1804
1806 1805 - `base` to checkout changeset and apply further changesets from there
1807 1806
1808 1807 There are a number of ways to select the root changeset:
1809 1808
1810 1809 - Specify ANCESTOR directly
1811 1810
1812 1811 - Use --outgoing -- it will be the first linear changeset not
1813 1812 included in destination. (See :hg:`help config.paths.default-push`)
1814 1813
1815 1814 - Otherwise, the value from the "histedit.defaultrev" config option
1816 1815 is used as a revset to select the base revision when ANCESTOR is not
1817 1816 specified. The first revision returned by the revset is used. By
1818 1817 default, this selects the editable history that is unique to the
1819 1818 ancestry of the working directory.
1820 1819
1821 1820 .. container:: verbose
1822 1821
1823 1822 If you use --outgoing, this command will abort if there are ambiguous
1824 1823 outgoing revisions. For example, if there are multiple branches
1825 1824 containing outgoing revisions.
1826 1825
1827 1826 Use "min(outgoing() and ::.)" or similar revset specification
1828 1827 instead of --outgoing to specify edit target revision exactly in
1829 1828 such ambiguous situation. See :hg:`help revsets` for detail about
1830 1829 selecting revisions.
1831 1830
1832 1831 .. container:: verbose
1833 1832
1834 1833 Examples:
1835 1834
1836 1835 - A number of changes have been made.
1837 1836 Revision 3 is no longer needed.
1838 1837
1839 1838 Start history editing from revision 3::
1840 1839
1841 1840 hg histedit -r 3
1842 1841
1843 1842 An editor opens, containing the list of revisions,
1844 1843 with specific actions specified::
1845 1844
1846 1845 pick 5339bf82f0ca 3 Zworgle the foobar
1847 1846 pick 8ef592ce7cc4 4 Bedazzle the zerlog
1848 1847 pick 0a9639fcda9d 5 Morgify the cromulancy
1849 1848
1850 1849 Additional information about the possible actions
1851 1850 to take appears below the list of revisions.
1852 1851
1853 1852 To remove revision 3 from the history,
1854 1853 its action (at the beginning of the relevant line)
1855 1854 is changed to 'drop'::
1856 1855
1857 1856 drop 5339bf82f0ca 3 Zworgle the foobar
1858 1857 pick 8ef592ce7cc4 4 Bedazzle the zerlog
1859 1858 pick 0a9639fcda9d 5 Morgify the cromulancy
1860 1859
1861 1860 - A number of changes have been made.
1862 1861 Revision 2 and 4 need to be swapped.
1863 1862
1864 1863 Start history editing from revision 2::
1865 1864
1866 1865 hg histedit -r 2
1867 1866
1868 1867 An editor opens, containing the list of revisions,
1869 1868 with specific actions specified::
1870 1869
1871 1870 pick 252a1af424ad 2 Blorb a morgwazzle
1872 1871 pick 5339bf82f0ca 3 Zworgle the foobar
1873 1872 pick 8ef592ce7cc4 4 Bedazzle the zerlog
1874 1873
1875 1874 To swap revision 2 and 4, its lines are swapped
1876 1875 in the editor::
1877 1876
1878 1877 pick 8ef592ce7cc4 4 Bedazzle the zerlog
1879 1878 pick 5339bf82f0ca 3 Zworgle the foobar
1880 1879 pick 252a1af424ad 2 Blorb a morgwazzle
1881 1880
1882 1881 Returns 0 on success, 1 if user intervention is required (not only
1883 1882 for intentional "edit" command, but also for resolving unexpected
1884 1883 conflicts).
1885 1884 """
1886 1885 opts = pycompat.byteskwargs(opts)
1887 1886
1888 1887 # kludge: _chistedit only works for starting an edit, not aborting
1889 1888 # or continuing, so fall back to regular _texthistedit for those
1890 1889 # operations.
1891 1890 if ui.interface(b'histedit') == b'curses' and _getgoal(opts) == goalnew:
1892 1891 return _chistedit(ui, repo, freeargs, opts)
1893 1892 return _texthistedit(ui, repo, freeargs, opts)
1894 1893
1895 1894
1896 1895 def _texthistedit(ui, repo, freeargs, opts):
1897 1896 state = histeditstate(repo)
1898 1897 with repo.wlock() as wlock, repo.lock() as lock:
1899 1898 state.wlock = wlock
1900 1899 state.lock = lock
1901 1900 _histedit(ui, repo, state, freeargs, opts)
1902 1901
1903 1902
1904 1903 goalcontinue = b'continue'
1905 1904 goalabort = b'abort'
1906 1905 goaleditplan = b'edit-plan'
1907 1906 goalnew = b'new'
1908 1907
1909 1908
1910 1909 def _getgoal(opts):
1911 1910 if opts.get(b'continue'):
1912 1911 return goalcontinue
1913 1912 if opts.get(b'abort'):
1914 1913 return goalabort
1915 1914 if opts.get(b'edit_plan'):
1916 1915 return goaleditplan
1917 1916 return goalnew
1918 1917
1919 1918
1920 1919 def _readfile(ui, path):
1921 1920 if path == b'-':
1922 1921 with ui.timeblockedsection(b'histedit'):
1923 1922 return ui.fin.read()
1924 1923 else:
1925 1924 with open(path, b'rb') as f:
1926 1925 return f.read()
1927 1926
1928 1927
1929 1928 def _validateargs(ui, repo, freeargs, opts, goal, rules, revs):
1930 1929 # TODO only abort if we try to histedit mq patches, not just
1931 1930 # blanket if mq patches are applied somewhere
1932 1931 mq = getattr(repo, 'mq', None)
1933 1932 if mq and mq.applied:
1934 1933 raise error.StateError(_(b'source has mq patches applied'))
1935 1934
1936 1935 # basic argument incompatibility processing
1937 1936 outg = opts.get(b'outgoing')
1938 1937 editplan = opts.get(b'edit_plan')
1939 1938 abort = opts.get(b'abort')
1940 1939 force = opts.get(b'force')
1941 1940 if force and not outg:
1942 1941 raise error.InputError(_(b'--force only allowed with --outgoing'))
1943 1942 if goal == b'continue':
1944 1943 if any((outg, abort, revs, freeargs, rules, editplan)):
1945 1944 raise error.InputError(_(b'no arguments allowed with --continue'))
1946 1945 elif goal == b'abort':
1947 1946 if any((outg, revs, freeargs, rules, editplan)):
1948 1947 raise error.InputError(_(b'no arguments allowed with --abort'))
1949 1948 elif goal == b'edit-plan':
1950 1949 if any((outg, revs, freeargs)):
1951 1950 raise error.InputError(
1952 1951 _(b'only --commands argument allowed with --edit-plan')
1953 1952 )
1954 1953 else:
1955 1954 if outg:
1956 1955 if revs:
1957 1956 raise error.InputError(
1958 1957 _(b'no revisions allowed with --outgoing')
1959 1958 )
1960 1959 if len(freeargs) > 1:
1961 1960 raise error.InputError(
1962 1961 _(b'only one repo argument allowed with --outgoing')
1963 1962 )
1964 1963 else:
1965 1964 revs.extend(freeargs)
1966 1965 if len(revs) == 0:
1967 1966 defaultrev = destutil.desthistedit(ui, repo)
1968 1967 if defaultrev is not None:
1969 1968 revs.append(defaultrev)
1970 1969
1971 1970 if len(revs) != 1:
1972 1971 raise error.InputError(
1973 1972 _(b'histedit requires exactly one ancestor revision')
1974 1973 )
1975 1974
1976 1975
1977 1976 def _histedit(ui, repo, state, freeargs, opts):
1978 1977 fm = ui.formatter(b'histedit', opts)
1979 1978 fm.startitem()
1980 1979 goal = _getgoal(opts)
1981 1980 revs = opts.get(b'rev', [])
1982 1981 nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
1983 1982 rules = opts.get(b'commands', b'')
1984 1983 state.keep = opts.get(b'keep', False)
1985 1984
1986 1985 _validateargs(ui, repo, freeargs, opts, goal, rules, revs)
1987 1986
1988 1987 hastags = False
1989 1988 if revs:
1990 1989 revs = logcmdutil.revrange(repo, revs)
1991 1990 ctxs = [repo[rev] for rev in revs]
1992 1991 for ctx in ctxs:
1993 1992 tags = [tag for tag in ctx.tags() if tag != b'tip']
1994 1993 if not hastags:
1995 1994 hastags = len(tags)
1996 1995 if hastags:
1997 1996 if ui.promptchoice(
1998 1997 _(
1999 1998 b'warning: tags associated with the given'
2000 1999 b' changeset will be lost after histedit.\n'
2001 2000 b'do you want to continue (yN)? $$ &Yes $$ &No'
2002 2001 ),
2003 2002 default=1,
2004 2003 ):
2005 2004 raise error.CanceledError(_(b'histedit cancelled\n'))
2006 2005 # rebuild state
2007 2006 if goal == goalcontinue:
2008 2007 state.read()
2009 2008 state = bootstrapcontinue(ui, state, opts)
2010 2009 elif goal == goaleditplan:
2011 2010 _edithisteditplan(ui, repo, state, rules)
2012 2011 return
2013 2012 elif goal == goalabort:
2014 2013 _aborthistedit(ui, repo, state, nobackup=nobackup)
2015 2014 return
2016 2015 else:
2017 2016 # goal == goalnew
2018 2017 _newhistedit(ui, repo, state, revs, freeargs, opts)
2019 2018
2020 2019 _continuehistedit(ui, repo, state)
2021 2020 _finishhistedit(ui, repo, state, fm)
2022 2021 fm.end()
2023 2022
2024 2023
2025 2024 def _continuehistedit(ui, repo, state):
2026 2025 """This function runs after either:
2027 2026 - bootstrapcontinue (if the goal is 'continue')
2028 2027 - _newhistedit (if the goal is 'new')
2029 2028 """
2030 2029 # preprocess rules so that we can hide inner folds from the user
2031 2030 # and only show one editor
2032 2031 actions = state.actions[:]
2033 2032 for idx, (action, nextact) in enumerate(zip(actions, actions[1:] + [None])):
2034 2033 if action.verb == b'fold' and nextact and nextact.verb == b'fold':
2035 2034 state.actions[idx].__class__ = _multifold
2036 2035
2037 2036 # Force an initial state file write, so the user can run --abort/continue
2038 2037 # even if there's an exception before the first transaction serialize.
2039 2038 state.write()
2040 2039
2041 2040 tr = None
2042 2041 # Don't use singletransaction by default since it rolls the entire
2043 2042 # transaction back if an unexpected exception happens (like a
2044 2043 # pretxncommit hook throws, or the user aborts the commit msg editor).
2045 2044 if ui.configbool(b"histedit", b"singletransaction"):
2046 2045 # Don't use a 'with' for the transaction, since actions may close
2047 2046 # and reopen a transaction. For example, if the action executes an
2048 2047 # external process it may choose to commit the transaction first.
2049 2048 tr = repo.transaction(b'histedit')
2050 2049 progress = ui.makeprogress(
2051 2050 _(b"editing"), unit=_(b'changes'), total=len(state.actions)
2052 2051 )
2053 2052 with progress, util.acceptintervention(tr):
2054 2053 while state.actions:
2055 2054 state.write(tr=tr)
2056 2055 actobj = state.actions[0]
2057 2056 progress.increment(item=actobj.torule())
2058 2057 ui.debug(
2059 2058 b'histedit: processing %s %s\n' % (actobj.verb, actobj.torule())
2060 2059 )
2061 2060 parentctx, replacement_ = actobj.run()
2062 2061 state.parentctxnode = parentctx.node()
2063 2062 state.replacements.extend(replacement_)
2064 2063 state.actions.pop(0)
2065 2064
2066 2065 state.write()
2067 2066
2068 2067
2069 2068 def _finishhistedit(ui, repo, state, fm):
2070 2069 """This action runs when histedit is finishing its session"""
2071 2070 mergemod.update(repo[state.parentctxnode])
2072 2071
2073 2072 mapping, tmpnodes, created, ntm = processreplacement(state)
2074 2073 if mapping:
2075 2074 for prec, succs in pycompat.iteritems(mapping):
2076 2075 if not succs:
2077 2076 ui.debug(b'histedit: %s is dropped\n' % short(prec))
2078 2077 else:
2079 2078 ui.debug(
2080 2079 b'histedit: %s is replaced by %s\n'
2081 2080 % (short(prec), short(succs[0]))
2082 2081 )
2083 2082 if len(succs) > 1:
2084 2083 m = b'histedit: %s'
2085 2084 for n in succs[1:]:
2086 2085 ui.debug(m % short(n))
2087 2086
2088 2087 if not state.keep:
2089 2088 if mapping:
2090 2089 movetopmostbookmarks(repo, state.topmost, ntm)
2091 2090 # TODO update mq state
2092 2091 else:
2093 2092 mapping = {}
2094 2093
2095 2094 for n in tmpnodes:
2096 2095 if n in repo:
2097 2096 mapping[n] = ()
2098 2097
2099 2098 # remove entries about unknown nodes
2100 2099 has_node = repo.unfiltered().changelog.index.has_node
2101 2100 mapping = {
2102 2101 k: v
2103 2102 for k, v in mapping.items()
2104 2103 if has_node(k) and all(has_node(n) for n in v)
2105 2104 }
2106 2105 scmutil.cleanupnodes(repo, mapping, b'histedit')
2107 2106 hf = fm.hexfunc
2108 2107 fl = fm.formatlist
2109 2108 fd = fm.formatdict
2110 2109 nodechanges = fd(
2111 2110 {
2112 2111 hf(oldn): fl([hf(n) for n in newn], name=b'node')
2113 2112 for oldn, newn in pycompat.iteritems(mapping)
2114 2113 },
2115 2114 key=b"oldnode",
2116 2115 value=b"newnodes",
2117 2116 )
2118 2117 fm.data(nodechanges=nodechanges)
2119 2118
2120 2119 state.clear()
2121 2120 if os.path.exists(repo.sjoin(b'undo')):
2122 2121 os.unlink(repo.sjoin(b'undo'))
2123 2122 if repo.vfs.exists(b'histedit-last-edit.txt'):
2124 2123 repo.vfs.unlink(b'histedit-last-edit.txt')
2125 2124
2126 2125
2127 2126 def _aborthistedit(ui, repo, state, nobackup=False):
2128 2127 try:
2129 2128 state.read()
2130 2129 __, leafs, tmpnodes, __ = processreplacement(state)
2131 2130 ui.debug(b'restore wc to old parent %s\n' % short(state.topmost))
2132 2131
2133 2132 # Recover our old commits if necessary
2134 2133 if not state.topmost in repo and state.backupfile:
2135 2134 backupfile = repo.vfs.join(state.backupfile)
2136 2135 f = hg.openpath(ui, backupfile)
2137 2136 gen = exchange.readbundle(ui, f, backupfile)
2138 2137 with repo.transaction(b'histedit.abort') as tr:
2139 2138 bundle2.applybundle(
2140 2139 repo,
2141 2140 gen,
2142 2141 tr,
2143 2142 source=b'histedit',
2144 2143 url=b'bundle:' + backupfile,
2145 2144 )
2146 2145
2147 2146 os.remove(backupfile)
2148 2147
2149 2148 # check whether we should update away
2150 2149 if repo.unfiltered().revs(
2151 2150 b'parents() and (%n or %ln::)',
2152 2151 state.parentctxnode,
2153 2152 leafs | tmpnodes,
2154 2153 ):
2155 2154 hg.clean(repo, state.topmost, show_stats=True, quietempty=True)
2156 2155 cleanupnode(ui, repo, tmpnodes, nobackup=nobackup)
2157 2156 cleanupnode(ui, repo, leafs, nobackup=nobackup)
2158 2157 except Exception:
2159 2158 if state.inprogress():
2160 2159 ui.warn(
2161 2160 _(
2162 2161 b'warning: encountered an exception during histedit '
2163 2162 b'--abort; the repository may not have been completely '
2164 2163 b'cleaned up\n'
2165 2164 )
2166 2165 )
2167 2166 raise
2168 2167 finally:
2169 2168 state.clear()
2170 2169
2171 2170
2172 2171 def hgaborthistedit(ui, repo):
2173 2172 state = histeditstate(repo)
2174 2173 nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
2175 2174 with repo.wlock() as wlock, repo.lock() as lock:
2176 2175 state.wlock = wlock
2177 2176 state.lock = lock
2178 2177 _aborthistedit(ui, repo, state, nobackup=nobackup)
2179 2178
2180 2179
2181 2180 def _edithisteditplan(ui, repo, state, rules):
2182 2181 state.read()
2183 2182 if not rules:
2184 2183 comment = geteditcomment(
2185 2184 ui, short(state.parentctxnode), short(state.topmost)
2186 2185 )
2187 2186 rules = ruleeditor(repo, ui, state.actions, comment)
2188 2187 else:
2189 2188 rules = _readfile(ui, rules)
2190 2189 actions = parserules(rules, state)
2191 2190 ctxs = [repo[act.node] for act in state.actions if act.node]
2192 2191 warnverifyactions(ui, repo, actions, state, ctxs)
2193 2192 state.actions = actions
2194 2193 state.write()
2195 2194
2196 2195
2197 2196 def _newhistedit(ui, repo, state, revs, freeargs, opts):
2198 2197 outg = opts.get(b'outgoing')
2199 2198 rules = opts.get(b'commands', b'')
2200 2199 force = opts.get(b'force')
2201 2200
2202 2201 cmdutil.checkunfinished(repo)
2203 2202 cmdutil.bailifchanged(repo)
2204 2203
2205 2204 topmost = repo.dirstate.p1()
2206 2205 if outg:
2207 2206 if freeargs:
2208 2207 remote = freeargs[0]
2209 2208 else:
2210 2209 remote = None
2211 2210 root = findoutgoing(ui, repo, remote, force, opts)
2212 2211 else:
2213 2212 rr = list(repo.set(b'roots(%ld)', logcmdutil.revrange(repo, revs)))
2214 2213 if len(rr) != 1:
2215 2214 raise error.InputError(
2216 2215 _(
2217 2216 b'The specified revisions must have '
2218 2217 b'exactly one common root'
2219 2218 )
2220 2219 )
2221 2220 root = rr[0].node()
2222 2221
2223 2222 revs = between(repo, root, topmost, state.keep)
2224 2223 if not revs:
2225 2224 raise error.InputError(
2226 2225 _(b'%s is not an ancestor of working directory') % short(root)
2227 2226 )
2228 2227
2229 2228 ctxs = [repo[r] for r in revs]
2230 2229
2231 2230 wctx = repo[None]
2232 2231 # Please don't ask me why `ancestors` is this value. I figured it
2233 2232 # out with print-debugging, not by actually understanding what the
2234 2233 # merge code is doing. :(
2235 2234 ancs = [repo[b'.']]
2236 2235 # Sniff-test to make sure we won't collide with untracked files in
2237 2236 # the working directory. If we don't do this, we can get a
2238 2237 # collision after we've started histedit and backing out gets ugly
2239 2238 # for everyone, especially the user.
2240 2239 for c in [ctxs[0].p1()] + ctxs:
2241 2240 try:
2242 2241 mergemod.calculateupdates(
2243 2242 repo,
2244 2243 wctx,
2245 2244 c,
2246 2245 ancs,
2247 2246 # These parameters were determined by print-debugging
2248 2247 # what happens later on inside histedit.
2249 2248 branchmerge=False,
2250 2249 force=False,
2251 2250 acceptremote=False,
2252 2251 followcopies=False,
2253 2252 )
2254 2253 except error.Abort:
2255 2254 raise error.StateError(
2256 2255 _(
2257 2256 b"untracked files in working directory conflict with files in %s"
2258 2257 )
2259 2258 % c
2260 2259 )
2261 2260
2262 2261 if not rules:
2263 2262 comment = geteditcomment(ui, short(root), short(topmost))
2264 2263 actions = [pick(state, r) for r in revs]
2265 2264 rules = ruleeditor(repo, ui, actions, comment)
2266 2265 else:
2267 2266 rules = _readfile(ui, rules)
2268 2267 actions = parserules(rules, state)
2269 2268 warnverifyactions(ui, repo, actions, state, ctxs)
2270 2269
2271 2270 parentctxnode = repo[root].p1().node()
2272 2271
2273 2272 state.parentctxnode = parentctxnode
2274 2273 state.actions = actions
2275 2274 state.topmost = topmost
2276 2275 state.replacements = []
2277 2276
2278 2277 ui.log(
2279 2278 b"histedit",
2280 2279 b"%d actions to histedit\n",
2281 2280 len(actions),
2282 2281 histedit_num_actions=len(actions),
2283 2282 )
2284 2283
2285 2284 # Create a backup so we can always abort completely.
2286 2285 backupfile = None
2287 2286 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2288 2287 backupfile = repair.backupbundle(
2289 2288 repo, [parentctxnode], [topmost], root, b'histedit'
2290 2289 )
2291 2290 state.backupfile = backupfile
2292 2291
2293 2292
2294 2293 def _getsummary(ctx):
2295 2294 # a common pattern is to extract the summary but default to the empty
2296 2295 # string
2297 2296 summary = ctx.description() or b''
2298 2297 if summary:
2299 2298 summary = summary.splitlines()[0]
2300 2299 return summary
2301 2300
2302 2301
2303 2302 def bootstrapcontinue(ui, state, opts):
2304 2303 repo = state.repo
2305 2304
2306 2305 ms = mergestatemod.mergestate.read(repo)
2307 2306 mergeutil.checkunresolved(ms)
2308 2307
2309 2308 if state.actions:
2310 2309 actobj = state.actions.pop(0)
2311 2310
2312 2311 if _isdirtywc(repo):
2313 2312 actobj.continuedirty()
2314 2313 if _isdirtywc(repo):
2315 2314 abortdirty()
2316 2315
2317 2316 parentctx, replacements = actobj.continueclean()
2318 2317
2319 2318 state.parentctxnode = parentctx.node()
2320 2319 state.replacements.extend(replacements)
2321 2320
2322 2321 return state
2323 2322
2324 2323
2325 2324 def between(repo, old, new, keep):
2326 2325 """select and validate the set of revision to edit
2327 2326
2328 2327 When keep is false, the specified set can't have children."""
2329 2328 revs = repo.revs(b'%n::%n', old, new)
2330 2329 if revs and not keep:
2331 2330 rewriteutil.precheck(repo, revs, b'edit')
2332 2331 if repo.revs(b'(%ld) and merge()', revs):
2333 2332 raise error.StateError(
2334 2333 _(b'cannot edit history that contains merges')
2335 2334 )
2336 2335 return pycompat.maplist(repo.changelog.node, revs)
2337 2336
2338 2337
2339 2338 def ruleeditor(repo, ui, actions, editcomment=b""):
2340 2339 """open an editor to edit rules
2341 2340
2342 2341 rules are in the format [ [act, ctx], ...] like in state.rules
2343 2342 """
2344 2343 if repo.ui.configbool(b"experimental", b"histedit.autoverb"):
2345 2344 newact = util.sortdict()
2346 2345 for act in actions:
2347 2346 ctx = repo[act.node]
2348 2347 summary = _getsummary(ctx)
2349 2348 fword = summary.split(b' ', 1)[0].lower()
2350 2349 added = False
2351 2350
2352 2351 # if it doesn't end with the special character '!' just skip this
2353 2352 if fword.endswith(b'!'):
2354 2353 fword = fword[:-1]
2355 2354 if fword in primaryactions | secondaryactions | tertiaryactions:
2356 2355 act.verb = fword
2357 2356 # get the target summary
2358 2357 tsum = summary[len(fword) + 1 :].lstrip()
2359 2358 # safe but slow: reverse iterate over the actions so we
2360 2359 # don't clash on two commits having the same summary
2361 2360 for na, l in reversed(list(pycompat.iteritems(newact))):
2362 2361 actx = repo[na.node]
2363 2362 asum = _getsummary(actx)
2364 2363 if asum == tsum:
2365 2364 added = True
2366 2365 l.append(act)
2367 2366 break
2368 2367
2369 2368 if not added:
2370 2369 newact[act] = []
2371 2370
2372 2371 # copy over and flatten the new list
2373 2372 actions = []
2374 2373 for na, l in pycompat.iteritems(newact):
2375 2374 actions.append(na)
2376 2375 actions += l
2377 2376
2378 2377 rules = b'\n'.join([act.torule() for act in actions])
2379 2378 rules += b'\n\n'
2380 2379 rules += editcomment
2381 2380 rules = ui.edit(
2382 2381 rules,
2383 2382 ui.username(),
2384 2383 {b'prefix': b'histedit'},
2385 2384 repopath=repo.path,
2386 2385 action=b'histedit',
2387 2386 )
2388 2387
2389 2388 # Save edit rules in .hg/histedit-last-edit.txt in case
2390 2389 # the user needs to ask for help after something
2391 2390 # surprising happens.
2392 2391 with repo.vfs(b'histedit-last-edit.txt', b'wb') as f:
2393 2392 f.write(rules)
2394 2393
2395 2394 return rules
2396 2395
2397 2396
2398 2397 def parserules(rules, state):
2399 2398 """Read the histedit rules string and return list of action objects"""
2400 2399 rules = [
2401 2400 l
2402 2401 for l in (r.strip() for r in rules.splitlines())
2403 2402 if l and not l.startswith(b'#')
2404 2403 ]
2405 2404 actions = []
2406 2405 for r in rules:
2407 2406 if b' ' not in r:
2408 2407 raise error.ParseError(_(b'malformed line "%s"') % r)
2409 2408 verb, rest = r.split(b' ', 1)
2410 2409
2411 2410 if verb not in actiontable:
2412 2411 raise error.ParseError(_(b'unknown action "%s"') % verb)
2413 2412
2414 2413 action = actiontable[verb].fromrule(state, rest)
2415 2414 actions.append(action)
2416 2415 return actions
2417 2416
2418 2417
2419 2418 def warnverifyactions(ui, repo, actions, state, ctxs):
2420 2419 try:
2421 2420 verifyactions(actions, state, ctxs)
2422 2421 except error.ParseError:
2423 2422 if repo.vfs.exists(b'histedit-last-edit.txt'):
2424 2423 ui.warn(
2425 2424 _(
2426 2425 b'warning: histedit rules saved '
2427 2426 b'to: .hg/histedit-last-edit.txt\n'
2428 2427 )
2429 2428 )
2430 2429 raise
2431 2430
2432 2431
2433 2432 def verifyactions(actions, state, ctxs):
2434 2433 """Verify that there exists exactly one action per given changeset and
2435 2434 other constraints.
2436 2435
2437 2436 Will abort if there are to many or too few rules, a malformed rule,
2438 2437 or a rule on a changeset outside of the user-given range.
2439 2438 """
2440 2439 expected = {c.node() for c in ctxs}
2441 2440 seen = set()
2442 2441 prev = None
2443 2442
2444 2443 if actions and actions[0].verb in [b'roll', b'fold']:
2445 2444 raise error.ParseError(
2446 2445 _(b'first changeset cannot use verb "%s"') % actions[0].verb
2447 2446 )
2448 2447
2449 2448 for action in actions:
2450 2449 action.verify(prev, expected, seen)
2451 2450 prev = action
2452 2451 if action.node is not None:
2453 2452 seen.add(action.node)
2454 2453 missing = sorted(expected - seen) # sort to stabilize output
2455 2454
2456 2455 if state.repo.ui.configbool(b'histedit', b'dropmissing'):
2457 2456 if len(actions) == 0:
2458 2457 raise error.ParseError(
2459 2458 _(b'no rules provided'),
2460 2459 hint=_(b'use strip extension to remove commits'),
2461 2460 )
2462 2461
2463 2462 drops = [drop(state, n) for n in missing]
2464 2463 # put the in the beginning so they execute immediately and
2465 2464 # don't show in the edit-plan in the future
2466 2465 actions[:0] = drops
2467 2466 elif missing:
2468 2467 raise error.ParseError(
2469 2468 _(b'missing rules for changeset %s') % short(missing[0]),
2470 2469 hint=_(
2471 2470 b'use "drop %s" to discard, see also: '
2472 2471 b"'hg help -e histedit.config'"
2473 2472 )
2474 2473 % short(missing[0]),
2475 2474 )
2476 2475
2477 2476
2478 2477 def adjustreplacementsfrommarkers(repo, oldreplacements):
2479 2478 """Adjust replacements from obsolescence markers
2480 2479
2481 2480 Replacements structure is originally generated based on
2482 2481 histedit's state and does not account for changes that are
2483 2482 not recorded there. This function fixes that by adding
2484 2483 data read from obsolescence markers"""
2485 2484 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2486 2485 return oldreplacements
2487 2486
2488 2487 unfi = repo.unfiltered()
2489 2488 get_rev = unfi.changelog.index.get_rev
2490 2489 obsstore = repo.obsstore
2491 2490 newreplacements = list(oldreplacements)
2492 2491 oldsuccs = [r[1] for r in oldreplacements]
2493 2492 # successors that have already been added to succstocheck once
2494 2493 seensuccs = set().union(
2495 2494 *oldsuccs
2496 2495 ) # create a set from an iterable of tuples
2497 2496 succstocheck = list(seensuccs)
2498 2497 while succstocheck:
2499 2498 n = succstocheck.pop()
2500 2499 missing = get_rev(n) is None
2501 2500 markers = obsstore.successors.get(n, ())
2502 2501 if missing and not markers:
2503 2502 # dead end, mark it as such
2504 2503 newreplacements.append((n, ()))
2505 2504 for marker in markers:
2506 2505 nsuccs = marker[1]
2507 2506 newreplacements.append((n, nsuccs))
2508 2507 for nsucc in nsuccs:
2509 2508 if nsucc not in seensuccs:
2510 2509 seensuccs.add(nsucc)
2511 2510 succstocheck.append(nsucc)
2512 2511
2513 2512 return newreplacements
2514 2513
2515 2514
2516 2515 def processreplacement(state):
2517 2516 """process the list of replacements to return
2518 2517
2519 2518 1) the final mapping between original and created nodes
2520 2519 2) the list of temporary node created by histedit
2521 2520 3) the list of new commit created by histedit"""
2522 2521 replacements = adjustreplacementsfrommarkers(state.repo, state.replacements)
2523 2522 allsuccs = set()
2524 2523 replaced = set()
2525 2524 fullmapping = {}
2526 2525 # initialize basic set
2527 2526 # fullmapping records all operations recorded in replacement
2528 2527 for rep in replacements:
2529 2528 allsuccs.update(rep[1])
2530 2529 replaced.add(rep[0])
2531 2530 fullmapping.setdefault(rep[0], set()).update(rep[1])
2532 2531 new = allsuccs - replaced
2533 2532 tmpnodes = allsuccs & replaced
2534 2533 # Reduce content fullmapping into direct relation between original nodes
2535 2534 # and final node created during history edition
2536 2535 # Dropped changeset are replaced by an empty list
2537 2536 toproceed = set(fullmapping)
2538 2537 final = {}
2539 2538 while toproceed:
2540 2539 for x in list(toproceed):
2541 2540 succs = fullmapping[x]
2542 2541 for s in list(succs):
2543 2542 if s in toproceed:
2544 2543 # non final node with unknown closure
2545 2544 # We can't process this now
2546 2545 break
2547 2546 elif s in final:
2548 2547 # non final node, replace with closure
2549 2548 succs.remove(s)
2550 2549 succs.update(final[s])
2551 2550 else:
2552 2551 final[x] = succs
2553 2552 toproceed.remove(x)
2554 2553 # remove tmpnodes from final mapping
2555 2554 for n in tmpnodes:
2556 2555 del final[n]
2557 2556 # we expect all changes involved in final to exist in the repo
2558 2557 # turn `final` into list (topologically sorted)
2559 2558 get_rev = state.repo.changelog.index.get_rev
2560 2559 for prec, succs in final.items():
2561 2560 final[prec] = sorted(succs, key=get_rev)
2562 2561
2563 2562 # computed topmost element (necessary for bookmark)
2564 2563 if new:
2565 2564 newtopmost = sorted(new, key=state.repo.changelog.rev)[-1]
2566 2565 elif not final:
2567 2566 # Nothing rewritten at all. we won't need `newtopmost`
2568 2567 # It is the same as `oldtopmost` and `processreplacement` know it
2569 2568 newtopmost = None
2570 2569 else:
2571 2570 # every body died. The newtopmost is the parent of the root.
2572 2571 r = state.repo.changelog.rev
2573 2572 newtopmost = state.repo[sorted(final, key=r)[0]].p1().node()
2574 2573
2575 2574 return final, tmpnodes, new, newtopmost
2576 2575
2577 2576
2578 2577 def movetopmostbookmarks(repo, oldtopmost, newtopmost):
2579 2578 """Move bookmark from oldtopmost to newly created topmost
2580 2579
2581 2580 This is arguably a feature and we may only want that for the active
2582 2581 bookmark. But the behavior is kept compatible with the old version for now.
2583 2582 """
2584 2583 if not oldtopmost or not newtopmost:
2585 2584 return
2586 2585 oldbmarks = repo.nodebookmarks(oldtopmost)
2587 2586 if oldbmarks:
2588 2587 with repo.lock(), repo.transaction(b'histedit') as tr:
2589 2588 marks = repo._bookmarks
2590 2589 changes = []
2591 2590 for name in oldbmarks:
2592 2591 changes.append((name, newtopmost))
2593 2592 marks.applychanges(repo, tr, changes)
2594 2593
2595 2594
2596 2595 def cleanupnode(ui, repo, nodes, nobackup=False):
2597 2596 """strip a group of nodes from the repository
2598 2597
2599 2598 The set of node to strip may contains unknown nodes."""
2600 2599 with repo.lock():
2601 2600 # do not let filtering get in the way of the cleanse
2602 2601 # we should probably get rid of obsolescence marker created during the
2603 2602 # histedit, but we currently do not have such information.
2604 2603 repo = repo.unfiltered()
2605 2604 # Find all nodes that need to be stripped
2606 2605 # (we use %lr instead of %ln to silently ignore unknown items)
2607 2606 has_node = repo.changelog.index.has_node
2608 2607 nodes = sorted(n for n in nodes if has_node(n))
2609 2608 roots = [c.node() for c in repo.set(b"roots(%ln)", nodes)]
2610 2609 if roots:
2611 2610 backup = not nobackup
2612 2611 repair.strip(ui, repo, roots, backup=backup)
2613 2612
2614 2613
2615 2614 def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs):
2616 2615 if isinstance(nodelist, bytes):
2617 2616 nodelist = [nodelist]
2618 2617 state = histeditstate(repo)
2619 2618 if state.inprogress():
2620 2619 state.read()
2621 2620 histedit_nodes = {
2622 2621 action.node for action in state.actions if action.node
2623 2622 }
2624 2623 common_nodes = histedit_nodes & set(nodelist)
2625 2624 if common_nodes:
2626 2625 raise error.Abort(
2627 2626 _(b"histedit in progress, can't strip %s")
2628 2627 % b', '.join(short(x) for x in common_nodes)
2629 2628 )
2630 2629 return orig(ui, repo, nodelist, *args, **kwargs)
2631 2630
2632 2631
2633 2632 extensions.wrapfunction(repair, b'strip', stripwrapper)
2634 2633
2635 2634
2636 2635 def summaryhook(ui, repo):
2637 2636 state = histeditstate(repo)
2638 2637 if not state.inprogress():
2639 2638 return
2640 2639 state.read()
2641 2640 if state.actions:
2642 2641 # i18n: column positioning for "hg summary"
2643 2642 ui.write(
2644 2643 _(b'hist: %s (histedit --continue)\n')
2645 2644 % (
2646 2645 ui.label(_(b'%d remaining'), b'histedit.remaining')
2647 2646 % len(state.actions)
2648 2647 )
2649 2648 )
2650 2649
2651 2650
2652 2651 def extsetup(ui):
2653 2652 cmdutil.summaryhooks.add(b'histedit', summaryhook)
2654 2653 statemod.addunfinished(
2655 2654 b'histedit',
2656 2655 fname=b'histedit-state',
2657 2656 allowcommit=True,
2658 2657 continueflag=True,
2659 2658 abortfunc=hgaborthistedit,
2660 2659 )
General Comments 0
You need to be logged in to leave comments. Login now