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

fix format for broken check-code test

Browse Source 
Summary: Just renaming, and another variable as well to look similar

Reviewed By: DurhamG, quark-zju

Differential Revision: D14185033

fbshipit-source-id: e34de690274afd2f2c6e51db21c7b158f6c3452a
This commit is contained in:
Liubov Dmitrieva 2019-02-22 11:38:52 -08:00 committed by Facebook Github Bot
parent 91b1a56c3a
commit ac751a0ac1
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
edenscm/hgext/pushrebase/__init__.py
View File

@ -306,7 +306,7 @@ def unbundle(orig, repo, cg, heads, source, url, replaydata=None, respondlightly
repo.manifestlog[bin(mfnode)].read()
try:
start_time = time.time()
starttime = time.time()
result = orig(
repo,
cg,
@ -317,15 +317,15 @@ def unbundle(orig, repo, cg, heads, source, url, replaydata=None, respondlightly
respondlightly=respondlightly,
)
recording.recordpushrebaserequest(
repo, conflicts=None, pushrebase_errmsg=None, start_time=start_time
repo, conflicts=None, pushrebaseerrmsg=None, starttime=starttime
)
return result
except ConflictsError as ex:
recording.recordpushrebaserequest(
repo,
conflicts="\n".join(sorted(ex.conflicts)),
pushrebase_errmsg=None,
start_time=start_time,
pushrebaseerrmsg=None,
starttime=starttime,
)
raise
except error.HookAbort as ex:
@ -334,12 +334,12 @@ def unbundle(orig, repo, cg, heads, source, url, replaydata=None, respondlightly
else:
errmsg = "%s" % ex
recording.recordpushrebaserequest(
repo, conflicts=None, pushrebase_errmsg=errmsg, start_time=start_time
repo, conflicts=None, pushrebaseerrmsg=errmsg, starttime=starttime
)
raise
except Exception as ex:
recording.recordpushrebaserequest(
repo, conflicts=None, pushrebase_errmsg="%s" % ex, start_time=start_time
repo, conflicts=None, pushrebaseerrmsg="%s" % ex, starttime=starttime
)
raise

20
edenscm/hgext/pushrebase/recording.py
View File

@ -16,7 +16,7 @@ from edenscm.mercurial.node import hex
from ..extlib import mysqlutil
def recordpushrebaserequest(repo, conflicts, pushrebase_errmsg, start_time):
def recordpushrebaserequest(repo, conflicts, pushrebaseerrmsg, starttime):
"""Uploads bundle parts to a bundlestore, and then inserts the parameters
in the mysql table
"""
@ -30,24 +30,22 @@ def recordpushrebaserequest(repo, conflicts, pushrebase_errmsg, start_time):
return
try:
return _dorecordpushrebaserequest(
repo, conflicts, pushrebase_errmsg, start_time
)
return _dorecordpushrebaserequest(repo, conflicts, pushrebaseerrmsg, starttime)
except Exception as ex:
# There is no need to fail the push, but at least let's log
# the problem
repo.ui.warn(_("error while recording pushrebase request %s") % ex)
def _dorecordpushrebaserequest(repo, conflicts, pushrebase_errmsg, start_time):
durationms = (time.time() - start_time) * 1000
# Limit pushrebase_errmsg to protect from too long messages
if pushrebase_errmsg:
pushrebase_errmsg = pushrebase_errmsg[:1000]
def _dorecordpushrebaserequest(repo, conflicts, pushrebaseerrmsg, starttime):
durationms = (time.time() - starttime) * 1000
# Limit pushrebaseerrmsg to protect from too long messages
if pushrebaseerrmsg:
pushrebaseerrmsg = pushrebaseerrmsg[:1000]
logparams = {
"conflicts": conflicts,
"pushrebase_errmsg": pushrebase_errmsg,
"pushrebase_errmsg": pushrebaseerrmsg,
"duration_ms": durationms,
}
uploaderrmsg = None
@ -65,7 +63,7 @@ def _dorecordpushrebaserequest(repo, conflicts, pushrebase_errmsg, start_time):
logparams.update(repo.pushrebaserecordingparams)
# Collect timestamps and manifest hashes (but only if there were no errors)
if not pushrebase_errmsg and getattr(repo, "pushrebaseaddedchangesets", None):
if not pushrebaseerrmsg and getattr(repo, "pushrebaseaddedchangesets", None):
# We want to record mappings from old commit hashes to timestamps
# of new commits and manifest hashes of new commits. To do this, we
# need to revert replacements dict