This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10380

outgoing: remove some early return
ClosedPublic

Authored by marmoute on Apr 13 2021, 10:52 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG627bb1875fee: outgoing: remove some early return
Summary

Since 066b8d8f75b8, the push command accept multiple destination. However `hg
outgoing` does not. On the way to fix this, we need to clean up the outgoing
code. We start with removing some early return to make the code ready to house
more changes.

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

marmoute created this revision.Apr 13 2021, 10:52 AM
pulkit accepted this revision.Apr 14 2021, 7:42 PM
This revision is now accepted and ready to land.Apr 14 2021, 7:42 PM
marmoute added a commit: rHG627bb1875fee: outgoing: remove some early return.Apr 14 2021, 8:39 PM
Closed by commit rHG627bb1875fee: outgoing: remove some early return (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (38 lines)

Diff 26897

mercurial/hg.py

ctx = repo[None] ctx = repo[None]
for subpath in sorted(ctx.substate): for subpath in sorted(ctx.substate):
sub = ctx.sub(subpath) sub = ctx.sub(subpath)
ret = min(ret, sub.outgoing(ui, dest, opts)) ret = min(ret, sub.outgoing(ui, dest, opts))
return ret return ret
limit = logcmdutil.getlimit(opts) limit = logcmdutil.getlimit(opts)
o, other = _outgoing(ui, repo, dest, opts) o, other = _outgoing(ui, repo, dest, opts)
ret = 1
try: try:
if not o: if o:
cmdutil.outgoinghooks(ui, repo, other, opts, o) ret = 0
return recurse()
if opts.get(b'newest_first'): if opts.get(b'newest_first'):
o.reverse() o.reverse()
ui.pager(b'outgoing') ui.pager(b'outgoing')
displayer = logcmdutil.changesetdisplayer(ui, repo, opts) displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
count = 0 count = 0
for n in o: for n in o:
if limit is not None and count >= limit: if limit is not None and count >= limit:
break break
parents = [p for p in repo.changelog.parents(n) if p != nullid] parents = [p for p in repo.changelog.parents(n) if p != nullid]
if opts.get(b'no_merges') and len(parents) == 2: if opts.get(b'no_merges') and len(parents) == 2:
continue continue
count += 1 count += 1
displayer.show(repo[n]) displayer.show(repo[n])
displayer.close() displayer.close()
cmdutil.outgoinghooks(ui, repo, other, opts, o) cmdutil.outgoinghooks(ui, repo, other, opts, o)
recurse() ret = min(ret, recurse())
return 0 # exit code is zero since we found outgoing changes return ret # exit code is zero since we found outgoing changes
finally: finally:
other.close() other.close()
def verify(repo, level=None): def verify(repo, level=None):
"""verify the consistency of a repository""" """verify the consistency of a repository"""
ret = verifymod.verify(repo, level=level) ret = verifymod.verify(repo, level=level)