##// END OF EJS Templates
statichttprepo: prevent loading dirstate over HTTP on node lookup (issue5717)...
Yuya Nishihara -
r34927:f7e4d6c2 stable
parent child Browse files
Show More
@@ -471,7 +471,8 b' class changectx(basectx):'
471 self._node = repo.changelog.tip()
471 self._node = repo.changelog.tip()
472 self._rev = repo.changelog.rev(self._node)
472 self._rev = repo.changelog.rev(self._node)
473 return
473 return
474 if changeid == '.' or changeid == repo.dirstate.p1():
474 if (changeid == '.'
475 or repo.local() and changeid == repo.dirstate.p1()):
475 # this is a hack to delay/avoid loading obsmarkers
476 # this is a hack to delay/avoid loading obsmarkers
476 # when we know that '.' won't be hidden
477 # when we know that '.' won't be hidden
477 self._node = repo.dirstate.p1()
478 self._node = repo.dirstate.p1()
@@ -536,7 +537,8 b' class changectx(basectx):'
536 #
537 #
537 # XXX we could avoid the unfiltered if we had a recognizable
538 # XXX we could avoid the unfiltered if we had a recognizable
538 # exception for filtered changeset access
539 # exception for filtered changeset access
539 if changeid in repo.unfiltered().dirstate.parents():
540 if (repo.local()
541 and changeid in repo.unfiltered().dirstate.parents()):
540 msg = _("working directory has unknown parent '%s'!")
542 msg = _("working directory has unknown parent '%s'!")
541 raise error.Abort(msg % short(changeid))
543 raise error.Abort(msg % short(changeid))
542 try:
544 try:
@@ -222,7 +222,6 b' List of files accessed over HTTP:'
222 /.hg/bookmarks
222 /.hg/bookmarks
223 /.hg/bookmarks.current
223 /.hg/bookmarks.current
224 /.hg/cache/hgtagsfnodes1
224 /.hg/cache/hgtagsfnodes1
225 /.hg/dirstate
226 /.hg/requires
225 /.hg/requires
227 /.hg/store/00changelog.i
226 /.hg/store/00changelog.i
228 /.hg/store/00manifest.i
227 /.hg/store/00manifest.i
@@ -236,7 +235,6 b' List of files accessed over HTTP:'
236 /remote-with-names/.hg/cache/branch2-served
235 /remote-with-names/.hg/cache/branch2-served
237 /remote-with-names/.hg/cache/hgtagsfnodes1
236 /remote-with-names/.hg/cache/hgtagsfnodes1
238 /remote-with-names/.hg/cache/tags2-served
237 /remote-with-names/.hg/cache/tags2-served
239 /remote-with-names/.hg/dirstate
240 /remote-with-names/.hg/localtags
238 /remote-with-names/.hg/localtags
241 /remote-with-names/.hg/requires
239 /remote-with-names/.hg/requires
242 /remote-with-names/.hg/store/00changelog.i
240 /remote-with-names/.hg/store/00changelog.i
@@ -251,7 +249,6 b' List of files accessed over HTTP:'
251 /remote/.hg/cache/hgtagsfnodes1
249 /remote/.hg/cache/hgtagsfnodes1
252 /remote/.hg/cache/rbc-names-v1
250 /remote/.hg/cache/rbc-names-v1
253 /remote/.hg/cache/tags2-served
251 /remote/.hg/cache/tags2-served
254 /remote/.hg/dirstate
255 /remote/.hg/localtags
252 /remote/.hg/localtags
256 /remote/.hg/requires
253 /remote/.hg/requires
257 /remote/.hg/store/00changelog.i
254 /remote/.hg/store/00changelog.i
@@ -268,7 +265,6 b' List of files accessed over HTTP:'
268 /sub/.hg/bookmarks
265 /sub/.hg/bookmarks
269 /sub/.hg/bookmarks.current
266 /sub/.hg/bookmarks.current
270 /sub/.hg/cache/hgtagsfnodes1
267 /sub/.hg/cache/hgtagsfnodes1
271 /sub/.hg/dirstate
272 /sub/.hg/requires
268 /sub/.hg/requires
273 /sub/.hg/store/00changelog.i
269 /sub/.hg/store/00changelog.i
274 /sub/.hg/store/00manifest.i
270 /sub/.hg/store/00manifest.i
General Comments 0
You need to be logged in to leave comments. Login now