From d5c306b404c321c19191c197c75130d1dc14897a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 7 Aug 2019 17:23:23 -0400 Subject: rebase: pull out project-independent settings from the for loop This makes the code a bit easier to read by doing all the project independent settings first instead of repeating it for every for loop iteration. Change-Id: I4ff21296e444627beba2f4b86561069f5e9a0d73 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/233554 Reviewed-by: David Pursehouse Tested-by: Mike Frysinger --- subcmds/rebase.py | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) (limited to 'subcmds/rebase.py') diff --git a/subcmds/rebase.py b/subcmds/rebase.py index 9d4b1672..9bc4460c 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py @@ -73,6 +73,21 @@ branch but need to incorporate new upstream changes "underneath" them. file=sys.stderr) return 1 + # Setup the common git rebase args that we use for all projects. + common_args = ['rebase'] + if opt.whitespace: + common_args.append('--whitespace=%s' % opt.whitespace) + if opt.quiet: + common_args.append('--quiet') + if opt.force_rebase: + common_args.append('--force-rebase') + if opt.no_ff: + common_args.append('--no-ff') + if opt.autosquash: + common_args.append('--autosquash') + if opt.interactive: + common_args.append('-i') + for project in all_projects: cb = project.CurrentBranch if not cb: @@ -92,26 +107,7 @@ branch but need to incorporate new upstream changes "underneath" them. # ignore branches without remotes continue - args = ["rebase"] - - if opt.whitespace: - args.append('--whitespace=%s' % opt.whitespace) - - if opt.quiet: - args.append('--quiet') - - if opt.force_rebase: - args.append('--force-rebase') - - if opt.no_ff: - args.append('--no-ff') - - if opt.autosquash: - args.append('--autosquash') - - if opt.interactive: - args.append("-i") - + args = common_args[:] if opt.onto_manifest: args.append('--onto') args.append(project.revisionExpr) -- cgit v1.2.3-54-g00ecf