This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5702

commands: check for modheads being None
ClosedPublic

Authored by indygreg on Jan 25 2019, 7:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2f2a7ea62e9a: commands: check for modheads being None
rHGe6451db43b35: commands: check for modheads being None
Summary

Python 2 allows the > operator to be used with a None and an
int. Python 3 does not. So we need to ensure the value isn't None
before comparing with >.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jan 25 2019, 7:01 PM
Closed by commit rHGe6451db43b35: commands: check for modheads being None (authored by indygreg). · Explain WhyJan 25 2019, 9:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 13471

mercurial/commands.py

return return
if optupdate: if optupdate:
try: try:
return hg.updatetotally(ui, repo, checkout, brev) return hg.updatetotally(ui, repo, checkout, brev)
except error.UpdateAbort as inst: except error.UpdateAbort as inst:
msg = _("not updating: %s") % stringutil.forcebytestr(inst) msg = _("not updating: %s") % stringutil.forcebytestr(inst)
hint = inst.hint hint = inst.hint
raise error.UpdateAbort(msg, hint=hint) raise error.UpdateAbort(msg, hint=hint)
if modheads > 1: if modheads is not None and modheads > 1:
currentbranchheads = len(repo.branchheads()) currentbranchheads = len(repo.branchheads())
if currentbranchheads == modheads: if currentbranchheads == modheads:
ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
elif currentbranchheads > 1: elif currentbranchheads > 1:
ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
"merge)\n")) "merge)\n"))
else: else:
ui.status(_("(run 'hg heads' to see heads)\n")) ui.status(_("(run 'hg heads' to see heads)\n"))