vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

tools: gen_vc - add force update flag/option

pull/4042/head
Joe Conigliaro 2020-03-17 00:17:19 +11:00
parent d456cc479c
commit db9323e7bd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/tools/gen_vc.v
View File

@ -105,6 +105,7 @@ struct FlagOptions {
log_to string log_to string
log_file string log_file string
dry_run bool dry_run bool
force bool
} }
fn main() { fn main() {
@ -186,6 +187,7 @@ fn parse_flags(fp mut flag.FlagParser) FlagOptions {
log_to : fp.string('log-to', log_to, 'log to is \'file\' or \'terminal\'') log_to : fp.string('log-to', log_to, 'log to is \'file\' or \'terminal\'')
log_file : fp.string('log-file', log_file, 'log file to use when log-to is \'file\'') log_file : fp.string('log-file', log_file, 'log file to use when log-to is \'file\'')
dry_run : fp.bool('dry-run', dry_run, 'when specified dont push anything to remote repo') dry_run : fp.bool('dry-run', dry_run, 'when specified dont push anything to remote repo')
force : fp.bool('force', false, 'force update even if already up to date')
} }
} }
@ -226,7 +228,7 @@ fn (gen_vc mut GenVC) generate() {
// fetch the remote repo just in case there are newer commits there // fetch the remote repo just in case there are newer commits there
gen_vc.cmd_exec('git -C $git_repo_dir_v fetch') gen_vc.cmd_exec('git -C $git_repo_dir_v fetch')
git_status := gen_vc.cmd_exec('git -C $git_repo_dir_v status') git_status := gen_vc.cmd_exec('git -C $git_repo_dir_v status')
if !git_status.contains('behind') { if !git_status.contains('behind') && !gen_vc.options.force {
gen_vc.logger.warn('v repository is already up to date.') gen_vc.logger.warn('v repository is already up to date.')
return return
} }
@ -274,7 +276,7 @@ fn (gen_vc mut GenVC) generate() {
gen_vc.logger.debug('last commit subject ($git_repo_v): $last_commit_subject') gen_vc.logger.debug('last commit subject ($git_repo_v): $last_commit_subject')
// if vc repo already has a newer commit than the v repo, assume it's up to date // if vc repo already has a newer commit than the v repo, assume it's up to date
if t_unix_vc >= t_unix_v { if t_unix_vc >= t_unix_v && !gen_vc.options.force {
gen_vc.logger.warn('vc repository is already up to date.') gen_vc.logger.warn('vc repository is already up to date.')
return return
} }