summaryrefslogtreecommitdiffstats
path: root/subcmds
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds')
-rw-r--r--subcmds/download.py6
-rw-r--r--subcmds/grep.py14
-rw-r--r--subcmds/help.py2
-rw-r--r--subcmds/init.py4
-rw-r--r--subcmds/sync.py12
-rw-r--r--subcmds/upload.py4
6 files changed, 21 insertions, 21 deletions
diff --git a/subcmds/download.py b/subcmds/download.py
index 6aa54afa..471e88b5 100644
--- a/subcmds/download.py
+++ b/subcmds/download.py
@@ -33,13 +33,13 @@ makes it available in your project's local working directory.
33""" 33"""
34 34
35 def _Options(self, p): 35 def _Options(self, p):
36 p.add_option('-c','--cherry-pick', 36 p.add_option('-c', '--cherry-pick',
37 dest='cherrypick', action='store_true', 37 dest='cherrypick', action='store_true',
38 help="cherry-pick instead of checkout") 38 help="cherry-pick instead of checkout")
39 p.add_option('-r','--revert', 39 p.add_option('-r', '--revert',
40 dest='revert', action='store_true', 40 dest='revert', action='store_true',
41 help="revert instead of checkout") 41 help="revert instead of checkout")
42 p.add_option('-f','--ff-only', 42 p.add_option('-f', '--ff-only',
43 dest='ffonly', action='store_true', 43 dest='ffonly', action='store_true',
44 help="force fast-forward merge") 44 help="force fast-forward merge")
45 45
diff --git a/subcmds/grep.py b/subcmds/grep.py
index fa5f8765..dd391cfa 100644
--- a/subcmds/grep.py
+++ b/subcmds/grep.py
@@ -85,7 +85,7 @@ contain a line that matches both expressions:
85 g.add_option('--cached', 85 g.add_option('--cached',
86 action='callback', callback=carry, 86 action='callback', callback=carry,
87 help='Search the index, instead of the work tree') 87 help='Search the index, instead of the work tree')
88 g.add_option('-r','--revision', 88 g.add_option('-r', '--revision',
89 dest='revision', action='append', metavar='TREEish', 89 dest='revision', action='append', metavar='TREEish',
90 help='Search TREEish, instead of the work tree') 90 help='Search TREEish, instead of the work tree')
91 91
@@ -97,7 +97,7 @@ contain a line that matches both expressions:
97 g.add_option('-i', '--ignore-case', 97 g.add_option('-i', '--ignore-case',
98 action='callback', callback=carry, 98 action='callback', callback=carry,
99 help='Ignore case differences') 99 help='Ignore case differences')
100 g.add_option('-a','--text', 100 g.add_option('-a', '--text',
101 action='callback', callback=carry, 101 action='callback', callback=carry,
102 help="Process binary files as if they were text") 102 help="Process binary files as if they were text")
103 g.add_option('-I', 103 g.add_option('-I',
@@ -126,7 +126,7 @@ contain a line that matches both expressions:
126 g.add_option('--and', '--or', '--not', 126 g.add_option('--and', '--or', '--not',
127 action='callback', callback=carry, 127 action='callback', callback=carry,
128 help='Boolean operators to combine patterns') 128 help='Boolean operators to combine patterns')
129 g.add_option('-(','-)', 129 g.add_option('-(', '-)',
130 action='callback', callback=carry, 130 action='callback', callback=carry,
131 help='Boolean operator grouping') 131 help='Boolean operator grouping')
132 132
@@ -146,10 +146,10 @@ contain a line that matches both expressions:
146 action='callback', callback=carry, 146 action='callback', callback=carry,
147 metavar='CONTEXT', type='str', 147 metavar='CONTEXT', type='str',
148 help='Show CONTEXT lines after match') 148 help='Show CONTEXT lines after match')
149 g.add_option('-l','--name-only','--files-with-matches', 149 g.add_option('-l', '--name-only', '--files-with-matches',
150 action='callback', callback=carry, 150 action='callback', callback=carry,
151 help='Show only file names containing matching lines') 151 help='Show only file names containing matching lines')
152 g.add_option('-L','--files-without-match', 152 g.add_option('-L', '--files-without-match',
153 action='callback', callback=carry, 153 action='callback', callback=carry,
154 help='Show only file names not containing matching lines') 154 help='Show only file names not containing matching lines')
155 155
@@ -158,9 +158,9 @@ contain a line that matches both expressions:
158 out = GrepColoring(self.manifest.manifestProject.config) 158 out = GrepColoring(self.manifest.manifestProject.config)
159 159
160 cmd_argv = ['grep'] 160 cmd_argv = ['grep']
161 if out.is_on and git_require((1,6,3)): 161 if out.is_on and git_require((1, 6, 3)):
162 cmd_argv.append('--color') 162 cmd_argv.append('--color')
163 cmd_argv.extend(getattr(opt,'cmd_argv',[])) 163 cmd_argv.extend(getattr(opt, 'cmd_argv', []))
164 164
165 if '-e' not in cmd_argv: 165 if '-e' not in cmd_argv:
166 if not args: 166 if not args:
diff --git a/subcmds/help.py b/subcmds/help.py
index 57fb3cc2..15aab7f9 100644
--- a/subcmds/help.py
+++ b/subcmds/help.py
@@ -126,7 +126,7 @@ Displays detailed usage information about a command.
126 126
127 p('%s', title) 127 p('%s', title)
128 self.nl() 128 self.nl()
129 p('%s', ''.ljust(len(title),section_type[0])) 129 p('%s', ''.ljust(len(title), section_type[0]))
130 self.nl() 130 self.nl()
131 continue 131 continue
132 132
diff --git a/subcmds/init.py b/subcmds/init.py
index 7aaa7f17..eeadc70d 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -279,14 +279,14 @@ to update the working directory files.
279 print() 279 print()
280 print("Testing colorized output (for 'repo diff', 'repo status'):") 280 print("Testing colorized output (for 'repo diff', 'repo status'):")
281 281
282 for c in ['black','red','green','yellow','blue','magenta','cyan']: 282 for c in ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan']:
283 out.write(' ') 283 out.write(' ')
284 out.printer(fg=c)(' %-6s ', c) 284 out.printer(fg=c)(' %-6s ', c)
285 out.write(' ') 285 out.write(' ')
286 out.printer(fg='white', bg='black')(' %s ' % 'white') 286 out.printer(fg='white', bg='black')(' %s ' % 'white')
287 out.nl() 287 out.nl()
288 288
289 for c in ['bold','dim','ul','reverse']: 289 for c in ['bold', 'dim', 'ul', 'reverse']:
290 out.write(' ') 290 out.write(' ')
291 out.printer(fg='black', attr=c)(' %-6s ', c) 291 out.printer(fg='black', attr=c)(' %-6s ', c)
292 out.nl() 292 out.nl()
diff --git a/subcmds/sync.py b/subcmds/sync.py
index df64ab09..5b3dca78 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -150,22 +150,22 @@ later is required to fix a server side protocol bug.
150 p.add_option('-f', '--force-broken', 150 p.add_option('-f', '--force-broken',
151 dest='force_broken', action='store_true', 151 dest='force_broken', action='store_true',
152 help="continue sync even if a project fails to sync") 152 help="continue sync even if a project fails to sync")
153 p.add_option('-l','--local-only', 153 p.add_option('-l', '--local-only',
154 dest='local_only', action='store_true', 154 dest='local_only', action='store_true',
155 help="only update working tree, don't fetch") 155 help="only update working tree, don't fetch")
156 p.add_option('-n','--network-only', 156 p.add_option('-n', '--network-only',
157 dest='network_only', action='store_true', 157 dest='network_only', action='store_true',
158 help="fetch only, don't update working tree") 158 help="fetch only, don't update working tree")
159 p.add_option('-d','--detach', 159 p.add_option('-d', '--detach',
160 dest='detach_head', action='store_true', 160 dest='detach_head', action='store_true',
161 help='detach projects back to manifest revision') 161 help='detach projects back to manifest revision')
162 p.add_option('-c','--current-branch', 162 p.add_option('-c', '--current-branch',
163 dest='current_branch_only', action='store_true', 163 dest='current_branch_only', action='store_true',
164 help='fetch only current branch from server') 164 help='fetch only current branch from server')
165 p.add_option('-q','--quiet', 165 p.add_option('-q', '--quiet',
166 dest='quiet', action='store_true', 166 dest='quiet', action='store_true',
167 help='be more quiet') 167 help='be more quiet')
168 p.add_option('-j','--jobs', 168 p.add_option('-j', '--jobs',
169 dest='jobs', action='store', type='int', 169 dest='jobs', action='store', type='int',
170 help="projects to fetch simultaneously (default %d)" % self.jobs) 170 help="projects to fetch simultaneously (default %d)" % self.jobs)
171 p.add_option('-m', '--manifest-name', 171 p.add_option('-m', '--manifest-name',
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 219c5093..e314032a 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -50,7 +50,7 @@ def _SplitEmails(values):
50class Upload(InteractiveCommand): 50class Upload(InteractiveCommand):
51 common = True 51 common = True
52 helpSummary = "Upload changes for code review" 52 helpSummary = "Upload changes for code review"
53 helpUsage=""" 53 helpUsage = """
54%prog [--re --cc] [<project>]... 54%prog [--re --cc] [<project>]...
55""" 55"""
56 helpDescription = """ 56 helpDescription = """
@@ -397,7 +397,7 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
397 reviewers = _SplitEmails(opt.reviewers) 397 reviewers = _SplitEmails(opt.reviewers)
398 if opt.cc: 398 if opt.cc:
399 cc = _SplitEmails(opt.cc) 399 cc = _SplitEmails(opt.cc)
400 people = (reviewers,cc) 400 people = (reviewers, cc)
401 401
402 if not pending: 402 if not pending:
403 print("no branches ready for upload", file=sys.stderr) 403 print("no branches ready for upload", file=sys.stderr)