From 0dd0a830b055e177a713bbc81fc7ecdda1605643 Mon Sep 17 00:00:00 2001 From: Matt Schulte Date: Thu, 30 Nov 2023 11:00:16 -0800 Subject: [PATCH] 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 Tested-by: Matt Schulte Commit-Queue: Gavin Mak --- subcmds/sync.py | 2 +- tests/test_subcmds_sync.py | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/subcmds/sync.py b/subcmds/sync.py index 02c1d3ae..b7236629 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -2011,7 +2011,7 @@ class LocalSyncState: delete = set() for path in self._state: 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) if not delete: return diff --git a/tests/test_subcmds_sync.py b/tests/test_subcmds_sync.py index 71e40489..af6bbef7 100644 --- a/tests/test_subcmds_sync.py +++ b/tests/test_subcmds_sync.py @@ -265,6 +265,44 @@ class LocalSyncState(unittest.TestCase): self.assertIsNone(self.state.GetFetchTime(projA)) 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): """Tests for _GetPreciousObjectsState."""