fix import warnings and add log request time

Reviewed By: StanislavGlebik

Differential Revision: D7365309

fbshipit-source-id: 5984fa811b8d1cb9eb996700e6352ec9966b18ad

hgext/commitcloud/httpsservice.py

@@ -15,14 +15,12 @@ import urllib
 
 from mercurial import (
     error,
+    util,
 )
 
-from .baseservice import (
-    BaseService,
-    References,
-)
+from . import baseservice
 
-from mercurial.util import httplib
+httplib = util.httplib
 
 try:
     xrange
@@ -32,7 +30,7 @@ except NameError:
 DEFAULT_TIMEOUT = 60
 MAX_CONNECT_RETRIES = 2
 
-class HttpsCommitCloudService(BaseService):
+class HttpsCommitCloudService(baseservice.BaseService):
     """Commit Cloud Client uses interngraph proxy to communicate with
        Commit Cloud Service
     """
@@ -165,8 +163,12 @@ class HttpsCommitCloudService(BaseService):
             'repo_name': self.repo_name,
             'workspace': self.workspace,
         }
+        start = time.time()
         response = self._send(path, data)
-        self.ui.debug("%s responce received\n" % self.ccht)
+        elapsed = time.time() - start
+        self.ui.debug("%s responce received in %0.2f sec\n" % (
+            self.ccht, elapsed)
+        )
 
         if 'error' in response:
             raise error.Abort(self.ccht + ' ' + response['error'])
@@ -178,14 +180,14 @@ class HttpsCommitCloudService(BaseService):
                 '%s \'get_references\' '
                 'informs the workspace \'%s\' is not known by server\n'
                 % (self.ccht, self.workspace)))
-            return References(version, None, None, None)
+            return baseservice.References(version, None, None, None)
 
         if version == baseversion:
             self.ui.debug(
                 '%s \'get_references\' '
                 'confirms the current version %s is the latest\n'
                 % (self.ccht, version))
-            return References(version, None, None, None)
+            return baseservice.References(version, None, None, None)
 
         self.ui.debug(
             '%s \'get_references\' '
@@ -211,8 +213,12 @@ class HttpsCommitCloudService(BaseService):
             'new_obsmarkers': self._encodedmarkers(newobsmarkers),
         }
 
+        start = time.time()
         response = self._send(path, data)
-        self.ui.debug("%s responce received\n" % self.ccht)
+        elapsed = time.time() - start
+        self.ui.debug("%s responce received in %0.2f sec\n" % (
+            self.ccht, elapsed)
+        )
 
         if 'error' in response:
             raise error.Abort(self.ccht + ' ' + response['error'])
@@ -234,4 +240,4 @@ class HttpsCommitCloudService(BaseService):
             'accepted update, old version is %d, new version is %d\n'
             % (self.ccht, version, newversion))
 
-        return True, References(newversion, None, None, None)
+        return True, baseservice.References(newversion, None, None, None)

hgext/commitcloud/localservice.py

@@ -12,12 +12,9 @@ from mercurial import (
     error,
 )
 
-from .baseservice import (
-    BaseService,
-    References,
-)
+from . import baseservice
 
-class LocalService(BaseService):
+class LocalService(baseservice.BaseService):
     """Local commit-cloud service implemented using files on disk.
 
     There is no locking, so this is suitable only for use in unit tests.
@@ -60,7 +57,7 @@ class LocalService(BaseService):
             self._ui.debug(
                 'commitcloud local service: '
                 'get_references for current version %s\n' % version)
-            return References(version, None, None, None)
+            return baseservice.References(version, None, None, None)
         else:
             self._ui.debug(
                 'commitcloud local service: '
@@ -88,4 +85,4 @@ class LocalService(BaseService):
             'update_references to %s (%s heads, %s bookmarks)\n'
             % (newversion, len(data['heads']), len(data['bookmarks'])))
         self._save(data)
-        return True, References(newversion, None, None, None)
+        return True, baseservice.References(newversion, None, None, None)

tests/test-check-module-imports.t

@@ -50,12 +50,6 @@ outputs, which should be fixed later.
   hgext/commitcloud/baseservice.py:7: direct symbol import ABCMeta, abstractmethod from abc
   hgext/commitcloud/httpsservice.py:13: relative import of stdlib module
   hgext/commitcloud/httpsservice.py:13: direct symbol import StringIO from StringIO
-  hgext/commitcloud/httpsservice.py:20: direct symbol import BaseService, References from hgext.commitcloud.baseservice
-  hgext/commitcloud/httpsservice.py:20: symbol import follows non-symbol import: hgext.commitcloud.baseservice
-  hgext/commitcloud/httpsservice.py:25: direct symbol import httplib from mercurial.util
-  hgext/commitcloud/httpsservice.py:25: symbol import follows non-symbol import: mercurial.util
-  hgext/commitcloud/localservice.py:15: direct symbol import BaseService, References from hgext.commitcloud.baseservice
-  hgext/commitcloud/localservice.py:15: symbol import follows non-symbol import: hgext.commitcloud.baseservice
   hgext/conflictinfo.py:30: direct symbol import absentfilectx from mercurial.filemerge
   hgext/crdump.py:5: multiple imported names: json, re, shutil, tempfile
   hgext/crdump.py:6: relative import of stdlib module