# HG changeset patch # User Matt Harbison # Date 1428182356 14400 # Node ID a0b47885a1c5fa71d48c2d615949b79f4eeef4e6 # Parent f33236c9b025e4cc4fc300c9d8ffe6992152dcd2 vfs: make it possible to pass multiple path elements to join os.path.join(), localrepo.join() and localrepo.wjoin() allow passing multiple path elements; vfs.join() should be as convenient. diff -r f33236c9b025 -r a0b47885a1c5 mercurial/scmutil.py --- a/mercurial/scmutil.py Sat Apr 04 15:43:00 2015 -0400 +++ b/mercurial/scmutil.py Sat Apr 04 17:19:16 2015 -0400 @@ -445,9 +445,9 @@ else: self.write(dst, src) - def join(self, path): + def join(self, path, *insidef): if path: - return os.path.join(self.base, path) + return os.path.join(self.base, path, *insidef) else: return self.base @@ -475,9 +475,9 @@ def __call__(self, path, *args, **kwargs): return self.vfs(self._filter(path), *args, **kwargs) - def join(self, path): + def join(self, path, *insidef): if path: - return self.vfs.join(self._filter(path)) + return self.vfs.join(self._filter(self.vfs.reljoin(path, *insidef))) else: return self.vfs.join(path)