facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

commitcloud: fix max(None, None) in Python3

Browse Source 
Summary:
In Python2, max allows None to be passed in, not in Python3, let's mimic the
Python2 behavior.

Reviewed By: sfilipco

Differential Revision: D19626654

fbshipit-source-id: f4fcaaa0516d898bc747d21735d2c30a4a9b41f4
This commit is contained in:
Xavier Deguillard 2020-01-29 13:30:46 -08:00 committed by Facebook Github Bot
parent 30c0e6482c
commit 7c0c6feea1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eden/scm/edenscm/hgext/commitcloud/background.py
View File

@ -97,10 +97,16 @@ def autobackupdisableduntil(repo):
'hg cloud disable', which stores its state in the autobackup state.
"""
# developer config: infinitepushbackup.disableduntil
return max(
repo.ui.configint("infinitepushbackup", "disableduntil", None),
util.parseint(loadautobackupstate(repo).get("disableduntil")),
)
disableduntilconf = repo.ui.configint("infinitepushbackup", "disableduntil", None)
disableduntilstate = util.parseint(loadautobackupstate(repo).get("disableduntil"))
if disableduntilconf is None:
return disableduntilstate
if disableduntilstate is None:
return disableduntilconf
return max(disableduntilconf, disableduntilstate)
def autobackupenabled(repo):