diff options
author | Mike Frysinger <vapier@google.com> | 2022-07-10 04:56:04 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2022-08-17 16:54:21 +0000 |
commit | dede564c3dc62f985bc79b11a3dd78b220114683 (patch) | |
tree | d075d14dba713b772ee36597e26c344fcd40d211 /manifest_xml.py | |
parent | ac76fd3e3a08024493f28913ec0c9660282d5f5b (diff) | |
download | git-repo-dede564c3dc62f985bc79b11a3dd78b220114683.tar.gz |
project: simplify GetRemote a bit
We almost always use self.remote.name when calling self.GetRemote,
so make that the default to simplify the code a bit.
Change-Id: Ifdf6e1370d6b8963b44e6d384b0fac8fa5c4f2ba
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/343184
Tested-by: Mike Frysinger <vapier@google.com>
Reviewed-by: LaMont Jones <lamontjones@google.com>
Diffstat (limited to 'manifest_xml.py')
-rw-r--r-- | manifest_xml.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index ee513a7e..84be8f4a 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
@@ -284,7 +284,7 @@ class _XmlSubmanifest: | |||
284 | if self.project: | 284 | if self.project: |
285 | manifestUrl = remote.ToRemoteSpec(self.project).url | 285 | manifestUrl = remote.ToRemoteSpec(self.project).url |
286 | else: | 286 | else: |
287 | manifestUrl = mp.GetRemote(mp.remote.name).url | 287 | manifestUrl = mp.GetRemote().url |
288 | manifestName = self.manifestName or 'default.xml' | 288 | manifestName = self.manifestName or 'default.xml' |
289 | revision = self.revision or self.name | 289 | revision = self.revision or self.name |
290 | path = self.path or revision.split('/')[-1] | 290 | path = self.path or revision.split('/')[-1] |
@@ -1385,7 +1385,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md | |||
1385 | 1385 | ||
1386 | def _AddMetaProjectMirror(self, m): | 1386 | def _AddMetaProjectMirror(self, m): |
1387 | name = None | 1387 | name = None |
1388 | m_url = m.GetRemote(m.remote.name).url | 1388 | m_url = m.GetRemote().url |
1389 | if m_url.endswith('/.git'): | 1389 | if m_url.endswith('/.git'): |
1390 | raise ManifestParseError('refusing to mirror %s' % m_url) | 1390 | raise ManifestParseError('refusing to mirror %s' % m_url) |
1391 | 1391 | ||