From 8ce5041596ef486510245946b7c6c68ec59add29 Mon Sep 17 00:00:00 2001 From: Simran Basi Date: Fri, 28 Aug 2015 14:25:44 -0700 Subject: GITC: Pull GITC Manifest Dir from the config. Updates the repo launcher and gitc_utils to pull the manifest directory location out of the gitc config file. Change-Id: Id08381b8a7d61962093d5cddcb3ff6afbb13004b --- subcmds/sync.py | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'subcmds/sync.py') diff --git a/subcmds/sync.py b/subcmds/sync.py index 934aaa80..2e9bbe70 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -194,9 +194,6 @@ 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") @@ -539,16 +536,6 @@ 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) - if opt.manifest_name: self.manifest.Override(opt.manifest_name) -- cgit v1.2.3-54-g00ecf