Merge changes I9c1ab65f,I7b2027ae
* changes:
init: Remove string concat in no-op os.path.join
Support relative paths in --reference
diff --git a/project.py b/project.py
index 6ef7d3d..e4682e6 100644
--- a/project.py
+++ b/project.py
@@ -1270,7 +1270,8 @@
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 @@
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')
diff --git a/subcmds/init.py b/subcmds/init.py
index eeddca0..47a1c9f 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -175,7 +175,8 @@
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 @@
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.