diff -r 9e67ce5c4fd0 -r 165428b05fca mercurial/upgrade.py
--- a/mercurial/upgrade.py	Tue Apr 11 20:54:50 2017 -0400
+++ b/mercurial/upgrade.py	Tue Apr 11 22:01:13 2017 +0200
@@ -15,6 +15,7 @@
 from . import (
     changelog,
     error,
+    localrepo,
     manifest,
     revlog,
     scmutil,
@@ -144,9 +145,6 @@
     Returns a list of ``upgradeimprovement`` describing repository deficiencies
     and optimizations.
     """
-    # Avoid cycle: cmdutil -> repair -> localrepo -> cmdutil
-    from . import localrepo
-
     newreporeqs = localrepo.newreporequirements(repo)
 
     improvements = []
@@ -585,9 +583,6 @@
 
 def upgraderepo(ui, repo, run=False, optimize=None):
     """Upgrade a repository in place."""
-    # Avoid cycle: cmdutil -> repair -> localrepo -> cmdutil
-    from . import localrepo
-
     optimize = set(optimize or [])
     repo = repo.unfiltered()