##// END OF EJS Templates
localrepo: move storevfs calculation out of if statement...
Pulkit Goyal -
r46851:9804162a default
parent child Browse files
Show More
@@ -549,8 +549,13 b' def makelocalrepository(baseui, path, in'
549 requirementsmod.SHARED_REQUIREMENT in requirements
549 requirementsmod.SHARED_REQUIREMENT in requirements
550 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
550 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
551 )
551 )
552 storevfs = None
552 if shared:
553 if shared:
554 # This is a shared repo
553 sharedvfs = _getsharedvfs(hgvfs, requirements)
555 sharedvfs = _getsharedvfs(hgvfs, requirements)
556 storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
557 else:
558 storevfs = vfsmod.vfs(hgvfs.join(b'store'))
554
559
555 # if .hg/requires contains the sharesafe requirement, it means
560 # if .hg/requires contains the sharesafe requirement, it means
556 # there exists a `.hg/store/requires` too and we should read it
561 # there exists a `.hg/store/requires` too and we should read it
@@ -573,12 +578,6 b' def makelocalrepository(baseui, path, in'
573 _(b"share source does not support exp-sharesafe requirement")
578 _(b"share source does not support exp-sharesafe requirement")
574 )
579 )
575
580
576 if shared:
577 # This is a shared repo
578 storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
579 else:
580 storevfs = vfsmod.vfs(hgvfs.join(b'store'))
581
582 requirements |= _readrequires(storevfs, False)
581 requirements |= _readrequires(storevfs, False)
583 elif shared:
582 elif shared:
584 sourcerequires = _readrequires(sharedvfs, False)
583 sourcerequires = _readrequires(sharedvfs, False)
General Comments 0
You need to be logged in to leave comments. Login now