summaryrefslogtreecommitdiffstats
path: root/subcmds/upload.py
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2013-10-15 10:48:40 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2013-10-15 10:48:40 +0900
commit37128b6f709410763f85d112a1a3e6f9e42e1338 (patch)
treeb87eceeed61ef08a77e6ded4989ad46cff2ce0b0 /subcmds/upload.py
parent143b4cc992b3602b56f1904c4a030a933b01ccc1 (diff)
downloadgit-repo-37128b6f709410763f85d112a1a3e6f9e42e1338.tar.gz
Fix indentationv1.12.5
git-repo uses 2 space indentation. A couple of recent changes introduced 4 space indentation in some modules. Change-Id: Ia4250157c1824c1b5e7d555068c4608f995be9da
Diffstat (limited to 'subcmds/upload.py')
-rw-r--r--subcmds/upload.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 8d801e08..7d460ddf 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -351,13 +351,13 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
351 merge_branch = self._GetMergeBranch(branch.project) 351 merge_branch = self._GetMergeBranch(branch.project)
352 full_dest = 'refs/heads/%s' % destination 352 full_dest = 'refs/heads/%s' % destination
353 if not opt.dest_branch and merge_branch and merge_branch != full_dest: 353 if not opt.dest_branch and merge_branch and merge_branch != full_dest:
354 print('merge branch %s does not match destination branch %s' 354 print('merge branch %s does not match destination branch %s'
355 % (merge_branch, full_dest)) 355 % (merge_branch, full_dest))
356 print('skipping upload.') 356 print('skipping upload.')
357 print('Please use `--destination %s` if this is intentional' 357 print('Please use `--destination %s` if this is intentional'
358 % destination) 358 % destination)
359 branch.uploaded = False 359 branch.uploaded = False
360 continue 360 continue
361 361
362 branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination) 362 branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination)
363 branch.uploaded = True 363 branch.uploaded = True