- Notifications
You must be signed in to change notification settings - Fork3.1k
Description
- pip version: 10.0.1
- Python version: all
- OS: all
Support for installing Git "refs" was added in response to issue#3876.
However, I noticed by inspecting the code that it will only work for the first install. If you try to install a ref after a package has already been installed, it won't work.
For example--
$ pip install -e git+https://github.com/pypa/twine.git@refs/pull/363/head#egg=twineNow74172b75179fb6b92f8cb0940800fca3cd3b309d is installed (visible in this PR):https://github.com/pypa/twine/pull/363/commits
Now try installing a different ref:
$ pip install -e git+https://github.com/pypa/twine.git@refs/pull/361/head#egg=twineObtaining twine from git+https://github.com/pypa/twine.git@refs/pull/361/head#egg=twine Updating /.../envs/pip-testing/src/twine clone (to revision refs/pull/361/head) Did not find branch or tag 'refs/pull/361/head', assuming revision or ref.fatal: ambiguous argument 'refs/pull/361/head': unknown revision or path not in the working tree.Use '--' to separate paths from revisions, like this:'git <command> [<revision>...] -- [<file>...]'Command "git reset --hard -q refs/pull/361/head" failed with error code 128 in /.../envs/pip-testing/src/twineThis is failing becauseGit.update() doesn't do an extra fetch in the "ref" case:
pip/src/pip/_internal/vcs/git.py
Lines 192 to 204 in67c5155
| defupdate(self,dest,rev_options): | |
| # First fetch changes from the default remote | |
| ifself.get_git_version()>=parse_version('1.9.0'): | |
| # fetch tags in addition to everything else | |
| self.run_command(['fetch','-q','--tags'],cwd=dest) | |
| else: | |
| self.run_command(['fetch','-q'],cwd=dest) | |
| # Then reset to wanted revision (maybe even origin/master) | |
| rev_options=self.check_rev_options(dest,rev_options) | |
| cmd_args= ['reset','--hard','-q']+rev_options.to_args() | |
| self.run_command(cmd_args,cwd=dest) | |
| #: update submodules | |
| self.update_submodules(dest) |
It only does the extra fetch in theGit.fetch_new() case (i.e. called in the first install):
pip/src/pip/_internal/vcs/git.py
Lines 170 to 180 in67c5155
| ifnotself.is_commit_id_equal(dest,rev_options.rev): | |
| rev=rev_options.rev | |
| # Only fetch the revision if it's a ref | |
| ifrev.startswith('refs/'): | |
| self.run_command( | |
| ['fetch','-q',url]+rev_options.to_args(), | |
| cwd=dest, | |
| ) | |
| # Change the revision to the SHA of the ref we fetched | |
| rev='FETCH_HEAD' | |
| self.run_command(['checkout','-q',rev],cwd=dest) |
I proposed a fix with tests here:#5623