mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
sync: Fix partial sync false positive
In the case of a project being removed from the manifest, and in the path in which the project used to exist, and symlink is place to another project repo will start to warn about partial syncs when a partial sync did not occur. Repro steps: 1) Create a manifest with two projects. Project a -> a/ and project b -> b/ 2) Run `repo sync` 3) Remove project b from the manifest. 4) Use `link` in the manifest to link all of Project a to b/ Bug: 314161804 Change-Id: I4a4ac4f70a7038bc7e0c4e0e51ae9fc942411a34 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/395640 Reviewed-by: Gavin Mak <gavinmak@google.com> Tested-by: Matt Schulte <matsch@google.com> Commit-Queue: Gavin Mak <gavinmak@google.com>
This commit is contained in:
parent
9f0ef5d926
commit
0dd0a830b0
@ -2011,7 +2011,7 @@ class LocalSyncState:
|
|||||||
delete = set()
|
delete = set()
|
||||||
for path in self._state:
|
for path in self._state:
|
||||||
gitdir = os.path.join(self._manifest.topdir, path, ".git")
|
gitdir = os.path.join(self._manifest.topdir, path, ".git")
|
||||||
if not os.path.exists(gitdir):
|
if not os.path.exists(gitdir) or os.path.islink(gitdir):
|
||||||
delete.add(path)
|
delete.add(path)
|
||||||
if not delete:
|
if not delete:
|
||||||
return
|
return
|
||||||
|
@ -265,6 +265,44 @@ class LocalSyncState(unittest.TestCase):
|
|||||||
self.assertIsNone(self.state.GetFetchTime(projA))
|
self.assertIsNone(self.state.GetFetchTime(projA))
|
||||||
self.assertEqual(self.state.GetFetchTime(projB), 7)
|
self.assertEqual(self.state.GetFetchTime(projB), 7)
|
||||||
|
|
||||||
|
def test_prune_removed_and_symlinked_projects(self):
|
||||||
|
"""Removed projects that still exists on disk as symlink are pruned."""
|
||||||
|
with open(self.state._path, "w") as f:
|
||||||
|
f.write(
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"projA": {
|
||||||
|
"last_fetch": 5
|
||||||
|
},
|
||||||
|
"projB": {
|
||||||
|
"last_fetch": 7
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
|
def mock_exists(path):
|
||||||
|
return True
|
||||||
|
|
||||||
|
def mock_islink(path):
|
||||||
|
if "projB" in path:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
projA = mock.MagicMock(relpath="projA")
|
||||||
|
projB = mock.MagicMock(relpath="projB")
|
||||||
|
self.state = self._new_state()
|
||||||
|
self.assertEqual(self.state.GetFetchTime(projA), 5)
|
||||||
|
self.assertEqual(self.state.GetFetchTime(projB), 7)
|
||||||
|
with mock.patch("os.path.exists", side_effect=mock_exists):
|
||||||
|
with mock.patch("os.path.islink", side_effect=mock_islink):
|
||||||
|
self.state.PruneRemovedProjects()
|
||||||
|
self.assertIsNone(self.state.GetFetchTime(projB))
|
||||||
|
|
||||||
|
self.state = self._new_state()
|
||||||
|
self.assertIsNone(self.state.GetFetchTime(projB))
|
||||||
|
self.assertEqual(self.state.GetFetchTime(projA), 5)
|
||||||
|
|
||||||
|
|
||||||
class GetPreciousObjectsState(unittest.TestCase):
|
class GetPreciousObjectsState(unittest.TestCase):
|
||||||
"""Tests for _GetPreciousObjectsState."""
|
"""Tests for _GetPreciousObjectsState."""
|
||||||
|
Loading…
Reference in New Issue
Block a user