McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Merge pull request #5609 from cjerdonek/vcs-add-is-repository-dir 

Break out VersionControl.is_repository_directory().
This commit is contained in:
Pradyun Gedam 2018-07-18 16:21:53 +05:30 committed by GitHub
parent 15e6b7c8b3 c6a18767dd
commit 459415697e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
news/67C1ECA3-A0C6-4DA6-B987-BE46C7629AF2.trivial Normal file
View File

19
src/pip/_internal/vcs/__init__.py
View File

@ -325,7 +325,7 @@ class VersionControl(object):
return return
rev_display = rev_options.to_display() rev_display = rev_options.to_display()
if os.path.exists(os.path.join(dest, self.dirname)): if self.is_repository_directory(dest):
existing_url = self.get_url(dest) existing_url = self.get_url(dest)
if self.compare_urls(existing_url, url): if self.compare_urls(existing_url, url):
logger.debug( logger.debug(
@ -459,17 +459,26 @@ class VersionControl(object):
else: else:
raise # re-raise exception if a different error occurred raise # re-raise exception if a different error occurred
@classmethod
def is_repository_directory(cls, path):
"""
Return whether a directory path is a repository directory.
"""
logger.debug('Checking in %s for %s (%s)...',
path, cls.dirname, cls.name)
return os.path.exists(os.path.join(path, cls.dirname))
@classmethod @classmethod
def controls_location(cls, location): def controls_location(cls, location):
""" """
Check if a location is controlled by the vcs. Check if a location is controlled by the vcs.
It is meant to be overridden to implement smarter detection It is meant to be overridden to implement smarter detection
mechanisms for specific vcs. mechanisms for specific vcs.
This can do more than is_repository_directory() alone. For example,
the Git override checks that Git is actually available.
""" """
logger.debug('Checking in %s for %s (%s)...', return cls.is_repository_directory(location)
location, cls.dirname, cls.name)
path = os.path.join(location, cls.dirname)
return os.path.exists(path)
def get_src_requirement(dist, location): def get_src_requirement(dist, location):