GITC: Always update the gitc manifest from the repo manifest

This way any changes made to the main manifest are reflected in the gitc
manifest. It's also necessary to use both manifests to sync since the
information required to update the gitc manifest is actually in the repo
manifest.

This also fixes a few issues that came up when testing. notdefault
groups weren't being saved to the gitc manifest in a method that matched
'sync'. The merge branch wasn't always being set to the correct value
either.

Change-Id: I435235cb5622a048ffad0059affd32ecf71f1f5b
This commit is contained in:
Dan Willemsen
2015-09-08 13:27:20 -07:00
parent 5cc384034d
commit 5ea32d1359
5 changed files with 104 additions and 36 deletions

View File

@ -19,6 +19,7 @@ import sys
import gitc_utils
from command import RequiresGitcCommand
from manifest_xml import GitcManifest
from subcmds import init
@ -68,15 +69,16 @@ use for this GITC client.
os.mkdir(self.client_dir)
super(GitcInit, self).Execute(opt, args)
for name, remote in self.manifest.remotes.iteritems():
remote.fetchUrl = remote.resolvedFetchUrl
manifest_file = self.manifest.manifestFile
if opt.manifest_file:
if not os.path.exists(opt.manifest_file):
print('fatal: Specified manifest file %s does not exist.' %
opt.manifest_file)
sys.exit(1)
self.manifest.Override(opt.manifest_file)
gitc_utils.generate_gitc_manifest(self.client_dir, self.manifest)
manifest_file = opt.manifest_file
manifest = GitcManifest(self.repodir, opt.gitc_client)
manifest.Override(manifest_file)
gitc_utils.generate_gitc_manifest(None, manifest)
print('Please run `cd %s` to view your GITC client.' %
os.path.join(gitc_utils.GITC_FS_ROOT_DIR, opt.gitc_client))