##// END OF EJS Templates
narrow: add trailing slash to dir earlier for debug{revlog,index,data}...
Martin von Zweigbergk -
r37287:6ff8bd69 default
parent child Browse files
Show More
@@ -117,8 +117,6 b' def makenarrowmanifestrevlog(mfrevlog, r'
117 # at least some push operations. This will be used to wrap/exclude the
117 # at least some push operations. This will be used to wrap/exclude the
118 # child directories when using treemanifests.
118 # child directories when using treemanifests.
119 def dirlog(self, d):
119 def dirlog(self, d):
120 if d and not d.endswith('/'):
121 d = d + '/'
122 if not repo.narrowmatch().visitdir(d[:-1] or '.'):
120 if not repo.narrowmatch().visitdir(d[:-1] or '.'):
123 return excludedmanifestrevlog(d)
121 return excludedmanifestrevlog(d)
124 result = super(narrowmanifestrevlog, self).dirlog(d)
122 result = super(narrowmanifestrevlog, self).dirlog(d)
@@ -1058,6 +1058,8 b' def openrevlog(repo, cmd, file_, opts):'
1058 if 'treemanifest' not in repo.requirements:
1058 if 'treemanifest' not in repo.requirements:
1059 raise error.Abort(_("--dir can only be used on repos with "
1059 raise error.Abort(_("--dir can only be used on repos with "
1060 "treemanifest enabled"))
1060 "treemanifest enabled"))
1061 if not dir.endswith('/'):
1062 dir = dir + '/'
1061 dirlog = repo.manifestlog._revlog.dirlog(dir)
1063 dirlog = repo.manifestlog._revlog.dirlog(dir)
1062 if len(dirlog):
1064 if len(dirlog):
1063 r = dirlog
1065 r = dirlog
@@ -1160,8 +1160,6 b' class manifestrevlog(revlog.revlog):'
1160
1160
1161 if dir:
1161 if dir:
1162 assert self._treeondisk, 'opts is %r' % opts
1162 assert self._treeondisk, 'opts is %r' % opts
1163 if not dir.endswith('/'):
1164 dir = dir + '/'
1165
1163
1166 if indexfile is None:
1164 if indexfile is None:
1167 indexfile = '00manifest.i'
1165 indexfile = '00manifest.i'
General Comments 0
You need to be logged in to leave comments. Login now