android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes I9c1ab65f,I7b2027ae

Browse Source 
* changes:
  init: Remove string concat in no-op os.path.join
  Support relative paths in --reference
This commit is contained in:
David Pursehouse 2018-03-16 02:06:10 +00:00 committed by Gerrit Code Review
commit 4ea1f0cabd
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
project.py
View File

@ -1270,7 +1270,8 @@ class Project(object):
try:
fd = open(alt)
try:
alt_dir = fd.readline().rstrip()
# This works for both absolute and relative alternate directories.
alt_dir = os.path.join(self.objdir, 'objects', fd.readline().rstrip())
finally:
fd.close()
except IOError:
@ -2361,6 +2362,10 @@ class Project(object):
ref_dir = None
if ref_dir:
if not os.path.isabs(ref_dir):
# The alternate directory is relative to the object database.
ref_dir = os.path.relpath(ref_dir,
os.path.join(self.objdir, 'objects'))
_lwrite(os.path.join(self.gitdir, 'objects/info/alternates'),
os.path.join(ref_dir, 'objects') + '\n')

5
subcmds/init.py
View File

@ -175,7 +175,8 @@ to update the working directory files.
if not mirrored_manifest_git.endswith(".git"):
mirrored_manifest_git += ".git"
if not os.path.exists(mirrored_manifest_git):
mirrored_manifest_git = os.path.join(opt.reference + '/.repo/manifests.git')
mirrored_manifest_git = os.path.join(opt.reference,
'.repo/manifests.git')
m._InitGitDir(mirror_git=mirrored_manifest_git)
@ -401,7 +402,7 @@ to update the working directory files.
git_require(MIN_GIT_VERSION, fail=True)
if opt.reference:
opt.reference = os.path.abspath(os.path.expanduser(opt.reference))
opt.reference = os.path.expanduser(opt.reference)
# Check this here, else manifest will be tagged "not new" and init won't be
# possible anymore without removing the .repo/manifests directory.