Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 41748:980e05204ed8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: use root-repo-relative path from `hg files` with ui.relative-paths=no The fix is to pass in a "subuipathfn" as we do everywhere else. Differential Revision: https://phab.mercurial-scm.org/D5978
author Martin von Zweigbergk <martinvonz@google.com>
date Sun, 17 Feb 2019 09:12:30 -0800
parents 91701785c2c5
children aaad36b88298
comparison
equal deleted inserted replaced
41747:31b84c72ada0 41748:980e05204ed8
323 323
324 def matchfileset(self, expr, badfn=None): 324 def matchfileset(self, expr, badfn=None):
325 """Resolve the fileset expression for this repo""" 325 """Resolve the fileset expression for this repo"""
326 return matchmod.never(badfn=badfn) 326 return matchmod.never(badfn=badfn)
327 327
328 def printfiles(self, ui, m, fm, fmt, subrepos): 328 def printfiles(self, ui, m, uipathfn, fm, fmt, subrepos):
329 """handle the files command for this subrepo""" 329 """handle the files command for this subrepo"""
330 return 1 330 return 1
331 331
332 def archive(self, archiver, prefix, match=None, decode=True): 332 def archive(self, archiver, prefix, match=None, decode=True):
333 if match is not None: 333 if match is not None:
793 rev = self._state[1] 793 rev = self._state[1]
794 ctx = self._repo[rev] 794 ctx = self._repo[rev]
795 return ctx.flags(name) 795 return ctx.flags(name)
796 796
797 @annotatesubrepoerror 797 @annotatesubrepoerror
798 def printfiles(self, ui, m, fm, fmt, subrepos): 798 def printfiles(self, ui, m, uipathfn, fm, fmt, subrepos):
799 # If the parent context is a workingctx, use the workingctx here for 799 # If the parent context is a workingctx, use the workingctx here for
800 # consistency. 800 # consistency.
801 if self._ctx.rev() is None: 801 if self._ctx.rev() is None:
802 ctx = self._repo[None] 802 ctx = self._repo[None]
803 else: 803 else:
804 rev = self._state[1] 804 rev = self._state[1]
805 ctx = self._repo[rev] 805 ctx = self._repo[rev]
806 return cmdutil.files(ui, ctx, m, fm, fmt, subrepos) 806 return cmdutil.files(ui, ctx, m, uipathfn, fm, fmt, subrepos)
807 807
808 @annotatesubrepoerror 808 @annotatesubrepoerror
809 def matchfileset(self, expr, badfn=None): 809 def matchfileset(self, expr, badfn=None):
810 if self._ctx.rev() is None: 810 if self._ctx.rev() is None:
811 ctx = self._repo[None] 811 ctx = self._repo[None]