665 try: |
665 try: |
666 # ui.forcemerge is an internal variable, do not document |
666 # ui.forcemerge is an internal variable, do not document |
667 repo.ui.setconfig( |
667 repo.ui.setconfig( |
668 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' |
668 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' |
669 ) |
669 ) |
670 stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit']) |
670 stats = mergemod.graft( |
|
671 repo, |
|
672 ctx, |
|
673 labels=[ |
|
674 b'already edited', |
|
675 b'current change', |
|
676 b'parent of current change', |
|
677 ], |
|
678 ) |
671 finally: |
679 finally: |
672 repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit') |
680 repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit') |
673 return stats |
681 return stats |
674 |
682 |
675 |
683 |
1322 help = b"""\ |
1330 help = b"""\ |
1323 ?: help, k/up: move up, j/down: move down, space: select, v: view patch |
1331 ?: help, k/up: move up, j/down: move down, space: select, v: view patch |
1324 d: drop, e: edit, f: fold, m: mess, p: pick, r: roll |
1332 d: drop, e: edit, f: fold, m: mess, p: pick, r: roll |
1325 pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort |
1333 pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort |
1326 """ |
1334 """ |
|
1335 if self.later_on_top: |
|
1336 help += b"Newer commits are shown above older commits.\n" |
|
1337 else: |
|
1338 help += b"Older commits are shown above newer commits.\n" |
1327 return help.splitlines() |
1339 return help.splitlines() |
1328 |
1340 |
1329 def render_help(self, win): |
1341 def render_help(self, win): |
1330 maxy, maxx = win.getmaxyx() |
1342 maxy, maxx = win.getmaxyx() |
1331 for y, line in enumerate(self.helplines()): |
1343 for y, line in enumerate(self.helplines()): |