diff options
author | Mike Frysinger <vapier@google.com> | 2021-02-09 23:45:28 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2021-02-11 02:38:53 +0000 |
commit | e3315bb49a782bcf62ba9df4fc1c2690b046763f (patch) | |
tree | 795468568ff401ad828f02817c6a690dd171b9f5 | |
parent | 38867fb6d38d45a11271d6ef492e4d40066b078f (diff) | |
download | git-repo-e3315bb49a782bcf62ba9df4fc1c2690b046763f.tar.gz |
diffmanifests/sync: simplify repodir lookup
We have access to repodir on the command object itself, so we don't
need to pull it indirectly out of the manifest object.
Change-Id: I8688fb1c84979825efa966dc787e78c6f7ba3823
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/296542
Reviewed-by: Raman Tenneti <rtenneti@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
-rw-r--r-- | subcmds/diffmanifests.py | 4 | ||||
-rw-r--r-- | subcmds/sync.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py index 8ff212ed..392e5972 100644 --- a/subcmds/diffmanifests.py +++ b/subcmds/diffmanifests.py | |||
@@ -191,12 +191,12 @@ synced and their revisions won't be found. | |||
191 | else: | 191 | else: |
192 | self.printProject = self.printAdded = self.printRemoved = self.printRevision = self.printText | 192 | self.printProject = self.printAdded = self.printRemoved = self.printRevision = self.printText |
193 | 193 | ||
194 | manifest1 = RepoClient(self.manifest.repodir) | 194 | manifest1 = RepoClient(self.repodir) |
195 | manifest1.Override(args[0], load_local_manifests=False) | 195 | manifest1.Override(args[0], load_local_manifests=False) |
196 | if len(args) == 1: | 196 | if len(args) == 1: |
197 | manifest2 = self.manifest | 197 | manifest2 = self.manifest |
198 | else: | 198 | else: |
199 | manifest2 = RepoClient(self.manifest.repodir) | 199 | manifest2 = RepoClient(self.repodir) |
200 | manifest2.Override(args[1], load_local_manifests=False) | 200 | manifest2.Override(args[1], load_local_manifests=False) |
201 | 201 | ||
202 | diff = manifest1.projectsDiff(manifest2) | 202 | diff = manifest1.projectsDiff(manifest2) |
diff --git a/subcmds/sync.py b/subcmds/sync.py index 5855af55..5020ea7a 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -680,7 +680,7 @@ later is required to fix a server side protocol bug. | |||
680 | if project.relpath: | 680 | if project.relpath: |
681 | new_project_paths.append(project.relpath) | 681 | new_project_paths.append(project.relpath) |
682 | file_name = 'project.list' | 682 | file_name = 'project.list' |
683 | file_path = os.path.join(self.manifest.repodir, file_name) | 683 | file_path = os.path.join(self.repodir, file_name) |
684 | old_project_paths = [] | 684 | old_project_paths = [] |
685 | 685 | ||
686 | if os.path.exists(file_path): | 686 | if os.path.exists(file_path): |