sync: make .git init more robust
Hitting Ctrl-C in the middle of this func will leave the .git in a
bad state that requires manual recovery. The code tries to catch
all exceptions and recover by deleting the incomplete .git dir, but
it omits KeyboardInterrupt which Exception misses.
We could add that to the recovery path, but we can make this more
robust with a different approach: set up everything in .git.tmp/
and only move it to .git/ once we've fully initialized it.
Change-Id: I0f5b97f2e19fc39cffc3e5e23993a2da7220f4e3
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/244733
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>
diff --git a/platform_utils.py b/platform_utils.py
index 77e8fdf..6684ebc 100644
--- a/platform_utils.py
+++ b/platform_utils.py
@@ -241,14 +241,15 @@
return path
-def rmtree(path):
+def rmtree(path, ignore_errors=False):
"""shutil.rmtree(path) wrapper with support for long paths on Windows.
Availability: Unix, Windows."""
+ onerror = None
if isWindows():
- shutil.rmtree(_makelongpath(path), onerror=handle_rmtree_error)
- else:
- shutil.rmtree(path)
+ path = _makelongpath(path)
+ onerror = handle_rmtree_error
+ shutil.rmtree(path, ignore_errors=ignore_errors, onerror=onerror)
def handle_rmtree_error(function, path, excinfo):
diff --git a/project.py b/project.py
index 51160a9..a2a3adc 100755
--- a/project.py
+++ b/project.py
@@ -2706,41 +2706,45 @@
raise
def _InitWorkTree(self, force_sync=False, submodules=False):
- dotgit = os.path.join(self.worktree, '.git')
- init_dotgit = not os.path.exists(dotgit)
+ realdotgit = os.path.join(self.worktree, '.git')
+ tmpdotgit = realdotgit + '.tmp'
+ init_dotgit = not os.path.exists(realdotgit)
+ if init_dotgit:
+ dotgit = tmpdotgit
+ platform_utils.rmtree(tmpdotgit, ignore_errors=True)
+ os.makedirs(tmpdotgit)
+ self._ReferenceGitDir(self.gitdir, tmpdotgit, share_refs=True,
+ copy_all=False)
+ else:
+ dotgit = realdotgit
+
try:
- if init_dotgit:
- os.makedirs(dotgit)
- self._ReferenceGitDir(self.gitdir, dotgit, share_refs=True,
- copy_all=False)
+ self._CheckDirReference(self.gitdir, dotgit, share_refs=True)
+ except GitError as e:
+ if force_sync and not init_dotgit:
+ try:
+ platform_utils.rmtree(dotgit)
+ return self._InitWorkTree(force_sync=False, submodules=submodules)
+ except:
+ raise e
+ raise e
- try:
- self._CheckDirReference(self.gitdir, dotgit, share_refs=True)
- except GitError as e:
- if force_sync:
- try:
- platform_utils.rmtree(dotgit)
- return self._InitWorkTree(force_sync=False, submodules=submodules)
- except:
- raise e
- raise e
+ if init_dotgit:
+ _lwrite(os.path.join(tmpdotgit, HEAD), '%s\n' % self.GetRevisionId())
- if init_dotgit:
- _lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId())
+ # Now that the .git dir is fully set up, move it to its final home.
+ platform_utils.rename(tmpdotgit, realdotgit)
- cmd = ['read-tree', '--reset', '-u']
- cmd.append('-v')
- cmd.append(HEAD)
- if GitCommand(self, cmd).Wait() != 0:
- raise GitError("cannot initialize work tree for " + self.name)
+ # Finish checking out the worktree.
+ cmd = ['read-tree', '--reset', '-u']
+ cmd.append('-v')
+ cmd.append(HEAD)
+ if GitCommand(self, cmd).Wait() != 0:
+ raise GitError('Cannot initialize work tree for ' + self.name)
- if submodules:
- self._SyncSubmodules(quiet=True)
- self._CopyAndLinkFiles()
- except Exception:
- if init_dotgit:
- platform_utils.rmtree(dotgit)
- raise
+ if submodules:
+ self._SyncSubmodules(quiet=True)
+ self._CopyAndLinkFiles()
def _get_symlink_error_message(self):
if platform_utils.isWindows():
