From bdb5271de3fafb9fbec3fde0e8e95e5b061ab0f5 Mon Sep 17 00:00:00 2001 From: Simran Basi Date: Mon, 10 Aug 2015 13:23:23 -0700 Subject: GITC: Add repo sync support. Add repo sync support for GITC checkouts. If the user is in the GITC client directory they can still pull the sources as normal if they pass in the --force-gitc argument. Otherwise the user should call repo sync in the GITC view to update the user's remote view. (This works because .repo in the GITC view will link to .repo in the client config directory.) Part of the support for this change is the refactoring of GITC related code into gitc_utils.py. Change-Id: I2636aaa50b450b6f091309db8dd0e8f4dbdad579 --- subcmds/sync.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'subcmds/sync.py') diff --git a/subcmds/sync.py b/subcmds/sync.py index 43d450be..652a0c0d 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -58,6 +58,7 @@ except ImportError: from git_command import GIT, git_require from git_refs import R_HEADS, HEAD +import gitc_utils from project import Project from project import RemoteSpec from command import Command, MirrorSafeCommand @@ -184,6 +185,9 @@ later is required to fix a server side protocol bug. help="overwrite an existing git directory if it needs to " "point to a different object directory. WARNING: this " "may cause loss of data") + p.add_option('--force-gitc', + dest='force_gitc', action='store_true', + help="actually sync sources in the gitc client directory.") p.add_option('-l', '--local-only', dest='local_only', action='store_true', help="only update working tree, don't fetch") @@ -526,6 +530,25 @@ later is required to fix a server side protocol bug. print('error: both -u and -p must be given', file=sys.stderr) sys.exit(1) + cwd = os.getcwd() + if cwd.startswith(gitc_utils.GITC_MANIFEST_DIR) and not opt.force_gitc: + print('WARNING this will pull all the sources like a normal repo sync.\n' + '\nIf you want to update your GITC Client View please rerun this ' + 'command in \n%s%s.\nOr if you actually want to pull the sources, ' + 'rerun with --force-gitc.' % + (gitc_utils.GITC_FS_ROOT_DIR, + cwd.split(gitc_utils.GITC_MANIFEST_DIR)[1])) + sys.exit(1) + + self._gitc_sync = False + if cwd.startswith(gitc_utils.GITC_FS_ROOT_DIR): + self._gitc_sync = True + self._client_name = cwd.split(gitc_utils.GITC_FS_ROOT_DIR)[1].split( + '/')[0] + self._client_dir = os.path.join(gitc_utils.GITC_MANIFEST_DIR, + self._client_name) + print('Updating GITC client: %s' % self._client_name) + if opt.manifest_name: self.manifest.Override(opt.manifest_name) @@ -642,6 +665,12 @@ later is required to fix a server side protocol bug. if opt.repo_upgraded: _PostRepoUpgrade(self.manifest, quiet=opt.quiet) + if self._gitc_sync: + gitc_utils.generate_gitc_manifest(self._client_dir, self.manifest) + print('GITC client successfully synced.') + return + + if not opt.local_only: mp.Sync_NetworkHalf(quiet=opt.quiet, current_branch_only=opt.current_branch_only, -- cgit v1.2.3-54-g00ecf