diff --git a/remotefilelog/remotefilectx.py b/remotefilelog/remotefilectx.py --- a/remotefilelog/remotefilectx.py +++ b/remotefilelog/remotefilectx.py @@ -6,6 +6,7 @@ # GNU General Public License version 2 or any later version. import collections +import time from mercurial.i18n import _ from mercurial.node import bin, hex, nullid, nullrev from mercurial import context, util, error, ancestor, phases, extensions @@ -333,6 +334,7 @@ def _linknodeviafastlog(self, repo, path, srcrev, fnode, cl, mfl, commonlogkwargs): + start = time.time() reponame = repo.ui.config('fbconduit', 'reponame') logmsg = '' if self._conduit is None: @@ -363,7 +365,9 @@ logmsg = 'fastlog failed (%s)' % e return None finally: - repo.ui.log('linkrevfixup', logmsg, **commonlogkwargs) + elapsed = time.time() - start + repo.ui.log('linkrevfixup', logmsg, elapsed=elapsed * 1000, + **commonlogkwargs) def _verifylinknode(self, revs, linknode): diff --git a/tests/test-remotefilelog-linknodes.t b/tests/test-remotefilelog-linknodes.t --- a/tests/test-remotefilelog-linknodes.t +++ b/tests/test-remotefilelog-linknodes.t @@ -340,7 +340,7 @@ Silencing stdout because we are interested only in ui.log output $ hg log -f x -T '{node|short} {desc} {phase} {files}\n' > /dev/null linkrevfixup: adjusting linknode (filepath=x, fnode=d4a3ed9310e5bd9887e3bf779da5077efab28216, reponame=master, revs=a5957b6bf0bdeb9b96368bddd2838004ad966b7d, user=test) - linkrevfixup: fastlog succeded (filepath=x, fnode=d4a3ed9310e5bd9887e3bf779da5077efab28216, reponame=master, revs=a5957b6bf0bdeb9b96368bddd2838004ad966b7d, user=test) + linkrevfixup: fastlog succeded (elapsed=*, filepath=x, fnode=d4a3ed9310e5bd9887e3bf779da5077efab28216, reponame=master, revs=a5957b6bf0bdeb9b96368bddd2838004ad966b7d, user=test) (glob) Fastlog fails $ cat > $TESTTMP/bad_conduit.py < /dev/null linkrevfixup: adjusting linknode (filepath=x, fnode=d4a3ed9310e5bd9887e3bf779da5077efab28216, reponame=master, revs=a5957b6bf0bdeb9b96368bddd2838004ad966b7d, user=test) - linkrevfixup: fastlog failed (error) (filepath=x, fnode=d4a3ed9310e5bd9887e3bf779da5077efab28216, reponame=master, revs=a5957b6bf0bdeb9b96368bddd2838004ad966b7d, user=test) + linkrevfixup: fastlog failed (error) (elapsed=*, filepath=x, fnode=d4a3ed9310e5bd9887e3bf779da5077efab28216, reponame=master, revs=a5957b6bf0bdeb9b96368bddd2838004ad966b7d, user=test) (glob)