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

InitGitDir: Clean up created directories

Browse Source 
If _InitGitDir fails, it leaves any progress it had made on the file
system. This can cause subsequent calls to repo sync to behave
differently. This is especially evident when _CheckDirReference() fails,
since it will not be invoked when sync is retried because both the
source and destination directories already exist.

To address this, have _InitGitDir() clean up any directories it has created
if it catches an exception. Also behave the same way for _InitWorkTree().

Change-Id: Ic16bb3feea649e115b59bd44be294e89e3692aeb
This commit is contained in:
Kevin Degi 2015-07-27 13:33:43 -06:00
parent b3d6e67196
commit b1a07b8276
1 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
project.py
View File

@ -2169,54 +2169,61 @@ class Project(object):
def _InitGitDir(self, mirror_git=None): def _InitGitDir(self, mirror_git=None):
init_git_dir = not os.path.exists(self.gitdir) init_git_dir = not os.path.exists(self.gitdir)
init_obj_dir = not os.path.exists(self.objdir) init_obj_dir = not os.path.exists(self.objdir)
# Initialize the bare repository, which contains all of the objects. try:
if init_obj_dir: # Initialize the bare repository, which contains all of the objects.
os.makedirs(self.objdir) if init_obj_dir:
self.bare_objdir.init() os.makedirs(self.objdir)
self.bare_objdir.init()
# If we have a separate directory to hold refs, initialize it as well.
if self.objdir != self.gitdir:
if init_git_dir:
os.makedirs(self.gitdir)
if init_obj_dir or init_git_dir:
self._ReferenceGitDir(self.objdir, self.gitdir, share_refs=False,
copy_all=True)
self._CheckDirReference(self.objdir, self.gitdir, share_refs=False)
# If we have a separate directory to hold refs, initialize it as well.
if self.objdir != self.gitdir:
if init_git_dir: if init_git_dir:
os.makedirs(self.gitdir) mp = self.manifest.manifestProject
ref_dir = mp.config.GetString('repo.reference') or ''
if init_obj_dir or init_git_dir: if ref_dir or mirror_git:
self._ReferenceGitDir(self.objdir, self.gitdir, share_refs=False, if not mirror_git:
copy_all=True) mirror_git = os.path.join(ref_dir, self.name + '.git')
self._CheckDirReference(self.objdir, self.gitdir, share_refs=False) repo_git = os.path.join(ref_dir, '.repo', 'projects',
self.relpath + '.git')
if init_git_dir: if os.path.exists(mirror_git):
mp = self.manifest.manifestProject ref_dir = mirror_git
ref_dir = mp.config.GetString('repo.reference') or ''
if ref_dir or mirror_git: elif os.path.exists(repo_git):
if not mirror_git: ref_dir = repo_git
mirror_git = os.path.join(ref_dir, self.name + '.git')
repo_git = os.path.join(ref_dir, '.repo', 'projects',
self.relpath + '.git')
if os.path.exists(mirror_git): else:
ref_dir = mirror_git ref_dir = None
elif os.path.exists(repo_git): if ref_dir:
ref_dir = repo_git _lwrite(os.path.join(self.gitdir, 'objects/info/alternates'),
os.path.join(ref_dir, 'objects') + '\n')
self._UpdateHooks()
m = self.manifest.manifestProject.config
for key in ['user.name', 'user.email']:
if m.Has(key, include_defaults=False):
self.config.SetString(key, m.GetString(key))
if self.manifest.IsMirror:
self.config.SetString('core.bare', 'true')
else: else:
ref_dir = None self.config.SetString('core.bare', None)
except Exception:
if ref_dir: if init_obj_dir and os.path.exists(self.objdir):
_lwrite(os.path.join(self.gitdir, 'objects/info/alternates'), shutil.rmtree(self.objdir)
os.path.join(ref_dir, 'objects') + '\n') if init_git_dir and os.path.exists(self.gitdir):
shutil.rmtree(self.gitdir)
self._UpdateHooks() raise
m = self.manifest.manifestProject.config
for key in ['user.name', 'user.email']:
if m.Has(key, include_defaults=False):
self.config.SetString(key, m.GetString(key))
if self.manifest.IsMirror:
self.config.SetString('core.bare', 'true')
else:
self.config.SetString('core.bare', None)
def _UpdateHooks(self): def _UpdateHooks(self):
if os.path.exists(self.gitdir): if os.path.exists(self.gitdir):
@ -2363,23 +2370,28 @@ class Project(object):
def _InitWorkTree(self): def _InitWorkTree(self):
dotgit = os.path.join(self.worktree, '.git') dotgit = os.path.join(self.worktree, '.git')
init_dotgit = not os.path.exists(dotgit) init_dotgit = not os.path.exists(dotgit)
if init_dotgit: try:
os.makedirs(dotgit) if init_dotgit:
self._ReferenceGitDir(self.gitdir, dotgit, share_refs=True, os.makedirs(dotgit)
copy_all=False) self._ReferenceGitDir(self.gitdir, dotgit, share_refs=True,
copy_all=False)
self._CheckDirReference(self.gitdir, dotgit, share_refs=True) self._CheckDirReference(self.gitdir, dotgit, share_refs=True)
if init_dotgit: if init_dotgit:
_lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId()) _lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId())
cmd = ['read-tree', '--reset', '-u'] cmd = ['read-tree', '--reset', '-u']
cmd.append('-v') cmd.append('-v')
cmd.append(HEAD) cmd.append(HEAD)
if GitCommand(self, cmd).Wait() != 0: if GitCommand(self, cmd).Wait() != 0:
raise GitError("cannot initialize work tree") raise GitError("cannot initialize work tree")
self._CopyAndLinkFiles() self._CopyAndLinkFiles()
except Exception:
if init_dotgit:
shutil.rmtree(dotgit)
raise
def _gitdir_path(self, path): def _gitdir_path(self, path):
return os.path.realpath(os.path.join(self.gitdir, path)) return os.path.realpath(os.path.join(self.gitdir, path))