McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

remove hardcoded 'svn' and 'hg' commands

Browse source
This commit is contained in:
Alexandre Conrad 2010-04-15 16:01:29 +02:00
parent 44c988a4bc
commit 933a5ad363
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pip/vcs/__init__.py
View file

@ -97,8 +97,8 @@ class VersionControl(object):
return self._cmd
command = find_command(self.name)
if command is None:
raise BadCommand('Cannot find command %s' % self.name)
logger.info('Found command %s at %s' % (self.name, command))
raise BadCommand('Cannot find command %r' % self.name)
logger.info('Found command %r at %r' % (self.name, command))
self._cmd = command
return command

24
pip/vcs/mercurial.py
View file

@ -42,7 +42,7 @@ class Mercurial(VersionControl):
if os.path.exists(location):
os.rmdir(location)
call_subprocess(
['hg', 'clone', url, location],
[self.cmd, 'clone', url, location],
filter_stdout=self._filter, show_stdout=False)
finally:
logger.indent -= 2
@ -53,7 +53,7 @@ class Mercurial(VersionControl):
self.unpack(temp_dir)
try:
call_subprocess(
['hg', 'archive', location],
[self.cmd, 'archive', location],
filter_stdout=self._filter, show_stdout=False, cwd=temp_dir)
finally:
shutil.rmtree(temp_dir)
@ -72,12 +72,12 @@ class Mercurial(VersionControl):
'Could not switch Mercurial repository to %s: %s'
% (url, e))
else:
call_subprocess(['hg', 'update', '-q'] + rev_options, cwd=dest)
call_subprocess([self.cmd, 'update', '-q'] + rev_options, cwd=dest)
def update(self, dest, rev_options):
call_subprocess(['hg', 'pull', '-q'], cwd=dest)
call_subprocess([self.cmd, 'pull', '-q'], cwd=dest)
call_subprocess(
['hg', 'update', '-q'] + rev_options, cwd=dest)
[self.cmd, 'update', '-q'] + rev_options, cwd=dest)
def obtain(self, dest):
url, rev = self.get_url_rev()
@ -90,12 +90,12 @@ class Mercurial(VersionControl):
if self.check_destination(dest, url, rev_options, rev_display):
logger.notify('Cloning hg %s%s to %s'
% (url, rev_display, display_path(dest)))
call_subprocess(['hg', 'clone', '--noupdate', '-q', url, dest])
call_subprocess(['hg', 'update', '-q'] + rev_options, cwd=dest)
call_subprocess([self.cmd, 'clone', '--noupdate', '-q', url, dest])
call_subprocess([self.cmd, 'update', '-q'] + rev_options, cwd=dest)
def get_url(self, location):
url = call_subprocess(
['hg', 'showconfig', 'paths.default'],
[self.cmd, 'showconfig', 'paths.default'],
show_stdout=False, cwd=location).strip()
if url.startswith('/') or url.startswith('\\'):
url = path_to_url(url)
@ -103,7 +103,7 @@ class Mercurial(VersionControl):
def get_tag_revs(self, location):
tags = call_subprocess(
['hg', 'tags'], show_stdout=False, cwd=location)
[self.cmd, 'tags'], show_stdout=False, cwd=location)
tag_revs = []
for line in tags.splitlines():
tags_match = re.search(r'([\w\d\.-]+)\s*([\d]+):.*$', line)
@ -115,7 +115,7 @@ class Mercurial(VersionControl):
def get_branch_revs(self, location):
branches = call_subprocess(
['hg', 'branches'], show_stdout=False, cwd=location)
[self.cmd, 'branches'], show_stdout=False, cwd=location)
branch_revs = []
for line in branches.splitlines():
branches_match = re.search(r'([\w\d\.-]+)\s*([\d]+):.*$', line)
@ -127,13 +127,13 @@ class Mercurial(VersionControl):
def get_revision(self, location):
current_revision = call_subprocess(
['hg', 'parents', '--template={rev}'],
[self.cmd, 'parents', '--template={rev}'],
show_stdout=False, cwd=location).strip()
return current_revision
def get_revision_hash(self, location):
current_rev_hash = call_subprocess(
['hg', 'parents', '--template={node}'],
[self.cmd, 'parents', '--template={node}'],
show_stdout=False, cwd=location).strip()
return current_rev_hash

14
pip/vcs/subversion.py
View file

@ -24,7 +24,7 @@ class Subversion(VersionControl):
"""Returns (url, revision), where both are strings"""
assert not location.rstrip('/').endswith(self.dirname), 'Bad directory: %s' % location
output = call_subprocess(
['svn', 'info', location], show_stdout=False, extra_environ={'LANG': 'C'})
[self.cmd, 'info', location], show_stdout=False, extra_environ={'LANG': 'C'})
match = _svn_url_re.search(output)
if not match:
logger.warn('Cannot determine URL of svn checkout %s' % display_path(location))
@ -61,7 +61,7 @@ class Subversion(VersionControl):
# --force fixes this, but was only added in svn 1.5
rmtree(location)
call_subprocess(
['svn', 'checkout', url, location],
[self.cmd, 'checkout', url, location],
filter_stdout=self._filter, show_stdout=False)
finally:
logger.indent -= 2
@ -77,18 +77,18 @@ class Subversion(VersionControl):
# --force fixes this, but was only added in svn 1.5
rmtree(location)
call_subprocess(
['svn', 'export', url, location],
[self.cmd, 'export', url, location],
filter_stdout=self._filter, show_stdout=False)
finally:
logger.indent -= 2
def switch(self, dest, url, rev_options):
call_subprocess(
['svn', 'switch'] + rev_options + [url, dest])
[self.cmd, 'switch'] + rev_options + [url, dest])
def update(self, dest, rev_options):
call_subprocess(
['svn', 'update'] + rev_options + [dest])
[self.cmd, 'update'] + rev_options + [dest])
def obtain(self, dest):
url, rev = self.get_url_rev()
@ -102,7 +102,7 @@ class Subversion(VersionControl):
logger.notify('Checking out %s%s to %s'
% (url, rev_display, display_path(dest)))
call_subprocess(
['svn', 'checkout', '-q'] + rev_options + [url, dest])
[self.cmd, 'checkout', '-q'] + rev_options + [url, dest])
def get_location(self, dist, dependency_links):
egg_fragment_re = re.compile(r'#egg=(.*)$')
@ -205,7 +205,7 @@ class Subversion(VersionControl):
def get_tag_revs(self, svn_tag_url):
stdout = call_subprocess(
['svn', 'ls', '-v', svn_tag_url], show_stdout=False)
[self.cmd, 'ls', '-v', svn_tag_url], show_stdout=False)
results = []
for line in stdout.splitlines():
parts = line.split()