AFAICT `stats` is always a tuple in these cases. We don't
need to check if the variable has a truthy value.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Needs rebased, and the parent listed in the patch header isn't available for me. Can you give a rebase a shot?
| self.storestatus(tr=tr) | self.storestatus(tr=tr) | ||||
| if len(repo[None].parents()) == 2: | if len(repo[None].parents()) == 2: | ||||
| repo.ui.debug('resuming interrupted rebase\n') | repo.ui.debug('resuming interrupted rebase\n') | ||||
| else: | else: | ||||
| overrides = {('ui', 'forcemerge'): opts.get('tool', '')} | overrides = {('ui', 'forcemerge'): opts.get('tool', '')} | ||||
| with ui.configoverride(overrides, 'rebase'): | with ui.configoverride(overrides, 'rebase'): | ||||
| stats = rebasenode(repo, rev, p1, base, self.collapsef, | stats = rebasenode(repo, rev, p1, base, self.collapsef, | ||||
| dest, wctx=self.wctx) | dest, wctx=self.wctx) | ||||
| if stats and stats[3] > 0: | if stats[3] > 0: | ||||
| if self.wctx.isinmemory(): | if self.wctx.isinmemory(): | ||||
| raise error.InMemoryMergeConflictsError() | raise error.InMemoryMergeConflictsError() | ||||
| else: | else: | ||||
| raise error.InterventionRequired( | raise error.InterventionRequired( | ||||
| _('unresolved conflicts (see hg ' | _('unresolved conflicts (see hg ' | ||||
| 'resolve, then hg rebase --continue)')) | 'resolve, then hg rebase --continue)')) | ||||
| if not self.collapsef: | if not self.collapsef: | ||||
| merging = p2 != nullrev | merging = p2 != nullrev | ||||
| # ui.forcemerge is an internal variable, do not document | # ui.forcemerge is an internal variable, do not document | ||||
| repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | ||||
| 'graft') | 'graft') | ||||
| stats = mergemod.graft(repo, ctx, ctx.p1(), | stats = mergemod.graft(repo, ctx, ctx.p1(), | ||||
| ['local', 'graft']) | ['local', 'graft']) | ||||
| finally: | finally: | ||||
| repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | ||||
| # report any conflicts | # report any conflicts | ||||
| if stats and stats[3] > 0: | if stats[3] > 0: | ||||
| # write out state for --continue | # write out state for --continue | ||||
| nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | ||||
| repo.vfs.write('graftstate', ''.join(nodelines)) | repo.vfs.write('graftstate', ''.join(nodelines)) | ||||
| extra = '' | extra = '' | ||||
| if opts.get('user'): | if opts.get('user'): | ||||
| extra += ' --user %s' % util.shellquote(opts['user']) | extra += ' --user %s' % util.shellquote(opts['user']) | ||||
| if opts.get('date'): | if opts.get('date'): | ||||
| extra += ' --date %s' % util.shellquote(opts['date']) | extra += ' --date %s' % util.shellquote(opts['date']) | ||||