changeset 5849:689b384168fd stable

evolve: import mercurial.i18n._ first There seems to be a rule for this somewhere, but I can't find it at the moment.
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 14 Mar 2021 16:50:49 +0800
parents 64082dc8888a
children b2d4cc5dff79
files hgext3rd/evolve/depthcache.py hgext3rd/evolve/obsdiscovery.py hgext3rd/evolve/stablerangecache.py hgext3rd/evolve/stablesort.py
diffstat 4 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/depthcache.py	Sun Mar 14 16:48:41 2021 +0800
+++ b/hgext3rd/evolve/depthcache.py	Sun Mar 14 16:50:49 2021 +0800
@@ -11,6 +11,7 @@
 
 import array
 
+from mercurial.i18n import _
 from mercurial import (
     localrepo,
     scmutil,
@@ -26,8 +27,6 @@
     utility,
 )
 
-from mercurial.i18n import _
-
 filterparents = utility.filterparents
 
 eh = exthelper.exthelper()
--- a/hgext3rd/evolve/obsdiscovery.py	Sun Mar 14 16:48:41 2021 +0800
+++ b/hgext3rd/evolve/obsdiscovery.py	Sun Mar 14 16:50:49 2021 +0800
@@ -22,6 +22,7 @@
 import struct
 import weakref
 
+from mercurial.i18n import _
 from mercurial import (
     encoding,
     error,
@@ -34,7 +35,6 @@
     store,
     util,
 )
-from mercurial.i18n import _
 
 from mercurial.utils.stringutil import forcebytestr
 
--- a/hgext3rd/evolve/stablerangecache.py	Sun Mar 14 16:48:41 2021 +0800
+++ b/hgext3rd/evolve/stablerangecache.py	Sun Mar 14 16:50:49 2021 +0800
@@ -14,6 +14,7 @@
 import sqlite3
 import time
 
+from mercurial.i18n import _
 from mercurial import (
     commands,
     encoding,
@@ -34,8 +35,6 @@
     utility,
 )
 
-from mercurial.i18n import _
-
 eh = exthelper.exthelper()
 
 LONG_WARNING_TIME = 60
--- a/hgext3rd/evolve/stablesort.py	Sun Mar 14 16:48:41 2021 +0800
+++ b/hgext3rd/evolve/stablesort.py	Sun Mar 14 16:50:49 2021 +0800
@@ -250,6 +250,7 @@
 import collections
 import struct
 
+from mercurial.i18n import _
 from mercurial import (
     commands,
     error,
@@ -262,8 +263,6 @@
 
 from mercurial.utils.stringutil import forcebytestr
 
-from mercurial.i18n import _
-
 from . import (
     compat,
     depthcache,