Submitter | Kostia Balytskyi |
---|---|
Date | April 18, 2017, 9:43 a.m. |
Message ID | <b55f98398522d9c7cf81.1492508614@devvm1416.lla2.facebook.com> |
Download | mbox | patch |
Permalink | /patch/20255/ |
State | Accepted |
Delegated to: | Ryan McElroy |
Headers | show |
Comments
On 4/18/17 10:43 AM, Kostia Balytskyi wrote: > # HG changeset patch > # User Kostia Balytskyi <ikostia@fb.com> > # Date 1492508238 25200 > # Tue Apr 18 02:37:18 2017 -0700 > # Node ID b55f98398522d9c7cf81ab191ddd322926699b0a > # Parent 4f17d4ae821e7654b3c134002537155b28f7e146 > remotenames: be compatible with upstream change about scmutil.vfs > > scmutil.vfs is now vfs.vfs and usage of the former causes deprecation > warnings. > Looks good to me. I'll take this upstream. Thanks for the fix!
Patch
diff --git a/remotenames.py b/remotenames.py --- a/remotenames.py +++ b/remotenames.py @@ -39,6 +39,7 @@ from mercurial import scmutil from mercurial import templatekw from mercurial import url from mercurial import util +from mercurial import vfs as vfsmod from mercurial.i18n import _ from mercurial.node import hex, short, bin, nullid from hgext import schemes @@ -1376,7 +1377,7 @@ def joinremotename(remote, ref): def shareawarevfs(repo): if repo.shared(): - return scmutil.vfs(repo.sharedpath) + return vfsmod.vfs(repo.sharedpath) else: return repo.vfs