# HG changeset patch # User Jun Wu <qu...@fb.com> # Date 1486675027 28800 # Thu Feb 09 13:17:07 2017 -0800 # Node ID 2c1834e1e6b5f734c27199d47de9b2252b8f4913 # Parent 245b1d962dcd5df48f929f10f786dc53936daabf # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.org/quark-zju/hg-draft -r 2c1834e1e6b5 localrepo: move join and wjoin to baselocalrepository
See the previous patch for why. diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -259,4 +259,10 @@ class baselocalrepository(object): self.baseui = baseui + def join(self, f, *insidef): + return self.vfs.join(os.path.join(f, *insidef)) + + def wjoin(self, f, *insidef): + return self.vfs.reljoin(self.root, f, *insidef) + class localrepository(baselocalrepository): @@ -910,10 +916,4 @@ class localrepository(baselocalrepositor return None - def join(self, f, *insidef): - return self.vfs.join(os.path.join(f, *insidef)) - - def wjoin(self, f, *insidef): - return self.vfs.reljoin(self.root, f, *insidef) - def file(self, f): if f[0] == '/': _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel