Mercurial > hg
diff mercurial/utils/resourceutil.py @ 51700:7f0cb9ee0534
Backout accidental publication of a large range of revisions
I accidentally published 25e7f9dcad0f::bd1483fd7088, this is the inverse.
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Tue, 23 Jul 2024 10:02:46 +0200 |
parents | 493034cc3265 |
children | ca7bde5dbafb |
line wrap: on
line diff
--- a/mercurial/utils/resourceutil.py Mon Jul 22 16:49:38 2024 +0200 +++ b/mercurial/utils/resourceutil.py Tue Jul 23 10:02:46 2024 +0200 @@ -52,6 +52,7 @@ assert dirs[0] == b"mercurial" return os.path.join(_rootpath, *dirs[1:]) + else: datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__))) _rootpath = os.path.dirname(datapath) @@ -97,6 +98,7 @@ for p in os.listdir(path): yield pycompat.fsencode(p) + else: from .. import encoding