This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8566

cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
ClosedPublic

Authored by durin42 on May 18 2020, 6:08 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdfca84970da8: cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
Summary

This avoids some pointless copying.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.May 18 2020, 6:08 PM
durin42 updated this revision to Diff 21511.May 28 2020, 4:26 PM
marmoute added a subscriber: marmoute.Jun 8 2020, 2:02 PM

how well, I see why you want an explicite method to avoid unrolling the iterator. Could we return an object with sensible bool and len methods?

durin42 added a comment.Jun 9 2020, 4:46 PM
In D8566#128623, @marmoute wrote:

how well, I see why you want an explicite method to avoid unrolling the iterator. Could we return an object with sensible bool and len methods?

I'd rather not: right now we have no extra type overhead, and if we make unresolved() return some custom iterator type it'll add extra bookkeeping etc.

If you feel strongly, I'd much rather someone that cares do that as a follow-up, since I'm just trying to do a quick-win case here.

durin42 updated this revision to Diff 21594.Jun 9 2020, 4:51 PM
marmoute accepted this revision.Jun 10 2020, 5:35 AM
In D8566#128782, @durin42 wrote:
In D8566#128623, @marmoute wrote:

how well, I see why you want an explicite method to avoid unrolling the iterator. Could we return an object with sensible bool and len methods?

I'd rather not: right now we have no extra type overhead, and if we make unresolved() return some custom iterator type it'll add extra bookkeeping etc.
If you feel strongly, I'd much rather someone that cares do that as a follow-up, since I'm just trying to do a quick-win case here.

nevermind, I got confused, the unresolvedcount method existed before your series, so this patch is clear win.

pulkit accepted this revision.Jun 17 2020, 9:25 AM
This revision is now accepted and ready to land.Jun 17 2020, 9:25 AM
durin42 added a child revision: D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs.Oct 2 2020, 2:45 PM
durin42 planned changes to this revision.
durin42 updated this revision to Diff 23027.
durin42 updated this revision to Diff 25157.Jan 19 2021, 1:53 PM
This revision is now accepted and ready to land.Jan 19 2021, 1:53 PM
pulkit accepted this revision.Jan 21 2021, 6:19 AM

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (5 lines)
Mmercurial/commands.py (2 lines)
Mmercurial/merge.py (2 lines)
Mmercurial/mergeutil.py (2 lines)
Mmercurial/shelve.py (2 lines)

Diff 25192

hgext/fix.py

if opts.get(b'working_dir'): if opts.get(b'working_dir'):
revs.add(wdirrev) revs.add(wdirrev)
for rev in revs: for rev in revs:
checkfixablectx(ui, repo, repo[rev]) checkfixablectx(ui, repo, repo[rev])
# Allow fixing only wdir() even if there's an unfinished operation # Allow fixing only wdir() even if there's an unfinished operation
if not (len(revs) == 1 and wdirrev in revs): if not (len(revs) == 1 and wdirrev in revs):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
rewriteutil.precheck(repo, revs, b'fix') rewriteutil.precheck(repo, revs, b'fix')
if wdirrev in revs and list( if (
mergestatemod.mergestate.read(repo).unresolved() wdirrev in revs
and mergestatemod.mergestate.read(repo).unresolvedcount()
): ):
raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
if not revs: if not revs:
raise error.Abort( raise error.Abort(
b'no changesets specified', hint=b'use --source or --working-dir' b'no changesets specified', hint=b'use --source or --working-dir'
) )
return revs return revs

mercurial/commands.py

flags, flags,
b' '.join(pats), b' '.join(pats),
) )
break break
ui.warn(_(b"arguments do not match paths that need resolving\n")) ui.warn(_(b"arguments do not match paths that need resolving\n"))
if hint: if hint:
ui.warn(hint) ui.warn(hint)
unresolvedf = list(ms.unresolved()) unresolvedf = ms.unresolvedcount()
if not unresolvedf: if not unresolvedf:
ui.status(_(b'(no more unresolved files)\n')) ui.status(_(b'(no more unresolved files)\n'))
cmdutil.checkafterresolved(repo) cmdutil.checkafterresolved(repo)
return ret return ret
@command( @command(

mercurial/merge.py

fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2) fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2)
overwrite = force and not branchmerge overwrite = force and not branchmerge
### check phase ### check phase
if not overwrite: if not overwrite:
if len(pl) > 1: if len(pl) > 1:
raise error.Abort(_(b"outstanding uncommitted merge")) raise error.Abort(_(b"outstanding uncommitted merge"))
ms = wc.mergestate() ms = wc.mergestate()
if list(ms.unresolved()): if ms.unresolvedcount():
raise error.Abort( raise error.Abort(
_(b"outstanding merge conflicts"), _(b"outstanding merge conflicts"),
hint=_(b"use 'hg resolve' to resolve"), hint=_(b"use 'hg resolve' to resolve"),
) )
if branchmerge: if branchmerge:
if pas == [p2]: if pas == [p2]:
raise error.Abort( raise error.Abort(
_( _(

mercurial/mergeutil.py

# mergeutil.py - help for merge processing in mercurial # mergeutil.py - help for merge processing in mercurial
# #
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from .i18n import _ from .i18n import _
from . import error from . import error
def checkunresolved(ms): def checkunresolved(ms):
if list(ms.unresolved()): if ms.unresolvedcount():
raise error.StateError( raise error.StateError(
_(b"unresolved merge conflicts (see 'hg help resolve')") _(b"unresolved merge conflicts (see 'hg help resolve')")
) )

mercurial/shelve.py

"""subcommand to continue an in-progress unshelve""" """subcommand to continue an in-progress unshelve"""
# We're finishing off a merge. First parent is our original # We're finishing off a merge. First parent is our original
# parent, second is the temporary "fake" commit we're unshelving. # parent, second is the temporary "fake" commit we're unshelving.
interactive = state.interactive interactive = state.interactive
basename = state.name basename = state.name
with repo.lock(): with repo.lock():
checkparents(repo, state) checkparents(repo, state)
ms = mergestatemod.mergestate.read(repo) ms = mergestatemod.mergestate.read(repo)
if list(ms.unresolved()): if ms.unresolvedcount():
raise error.Abort( raise error.Abort(
_(b"unresolved conflicts, can't continue"), _(b"unresolved conflicts, can't continue"),
hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"), hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"),
) )
shelvectx = repo[state.parents[1]] shelvectx = repo[state.parents[1]]
pendingctx = state.pendingctx pendingctx = state.pendingctx