Coding style cleanup
Fix the following issues reported by pylint:
C0321: More than one statement on a single line
W0622: Redefining built-in 'name'
W0612: Unused variable 'name'
W0613: Unused argument 'name'
W0102: Dangerous default value 'value' as argument
W0105: String statement has no effect
Also fixed a few cases of inconsistent indentation.
Change-Id: Ie0db839e7c57d576cff12d8c055fe87030d00744
diff --git a/color.py b/color.py
index 9b3365b..9200a29 100644
--- a/color.py
+++ b/color.py
@@ -38,8 +38,11 @@
RESET = "\033[m"
-def is_color(s): return s in COLORS
-def is_attr(s): return s in ATTRS
+def is_color(s):
+ return s in COLORS
+
+def is_attr(s):
+ return s in ATTRS
def _Color(fg = None, bg = None, attr = None):
fg = COLORS[fg]
@@ -80,8 +83,8 @@
class Coloring(object):
- def __init__(self, config, type):
- self._section = 'color.%s' % type
+ def __init__(self, config, section_type):
+ self._section = 'color.%s' % section_type
self._config = config
self._out = sys.stdout
@@ -126,8 +129,8 @@
if self._on:
c = self._parse(opt, fg, bg, attr)
def f(fmt, *args):
- str = fmt % args
- return ''.join([c, str, RESET])
+ output = fmt % args
+ return ''.join([c, output, RESET])
return f
else:
def f(fmt, *args):
@@ -151,8 +154,10 @@
have_fg = False
for a in v.split(' '):
if is_color(a):
- if have_fg: bg = a
- else: fg = a
+ if have_fg:
+ bg = a
+ else:
+ fg = a
elif is_attr(a):
attr = a
diff --git a/command.py b/command.py
index 5789582..e17f0ab 100644
--- a/command.py
+++ b/command.py
@@ -63,7 +63,7 @@
def GetProjects(self, args, missing_ok=False):
"""A list of projects that match the arguments.
"""
- all = self.manifest.projects
+ all_projects = self.manifest.projects
result = []
mp = self.manifest.manifestProject
@@ -74,7 +74,7 @@
groups = [x for x in re.split('[,\s]+', groups) if x]
if not args:
- for project in all.values():
+ for project in all_projects.values():
if ((missing_ok or project.Exists) and
project.MatchesGroups(groups)):
result.append(project)
@@ -82,14 +82,14 @@
by_path = None
for arg in args:
- project = all.get(arg)
+ project = all_projects.get(arg)
if not project:
path = os.path.abspath(arg).replace('\\', '/')
if not by_path:
by_path = dict()
- for p in all.values():
+ for p in all_projects.values():
by_path[p.worktree] = p
if os.path.exists(path):
diff --git a/error.py b/error.py
index 48e3189..783ab7d 100644
--- a/error.py
+++ b/error.py
@@ -85,8 +85,8 @@
repo or manifest repositories. In this special case we must
use exec to re-execute repo with the new code and manifest.
"""
- def __init__(self, extra_args=[]):
- self.extra_args = extra_args
+ def __init__(self, extra_args=None):
+ self.extra_args = extra_args or []
class HookError(Exception):
"""Thrown if a 'repo-hook' could not be run.
diff --git a/git_config.py b/git_config.py
index eb532d0..afaa6f1 100644
--- a/git_config.py
+++ b/git_config.py
@@ -56,16 +56,16 @@
@classmethod
def ForUser(cls):
if cls._ForUser is None:
- cls._ForUser = cls(file = os.path.expanduser('~/.gitconfig'))
+ cls._ForUser = cls(configfile = os.path.expanduser('~/.gitconfig'))
return cls._ForUser
@classmethod
def ForRepository(cls, gitdir, defaults=None):
- return cls(file = os.path.join(gitdir, 'config'),
+ return cls(configfile = os.path.join(gitdir, 'config'),
defaults = defaults)
- def __init__(self, file, defaults=None, pickleFile=None):
- self.file = file
+ def __init__(self, configfile, defaults=None, pickleFile=None):
+ self.file = configfile
self.defaults = defaults
self._cache_dict = None
self._section_dict = None
@@ -104,20 +104,20 @@
return False
return None
- def GetString(self, name, all=False):
+ def GetString(self, name, all_keys=False):
"""Get the first value for a key, or None if it is not defined.
This configuration file is used first, if the key is not
- defined or all = True then the defaults are also searched.
+ defined or all_keys = True then the defaults are also searched.
"""
try:
v = self._cache[_key(name)]
except KeyError:
if self.defaults:
- return self.defaults.GetString(name, all = all)
+ return self.defaults.GetString(name, all_keys = all_keys)
v = []
- if not all:
+ if not all_keys:
if v:
return v[0]
return None
@@ -125,7 +125,7 @@
r = []
r.extend(v)
if self.defaults:
- r.extend(self.defaults.GetString(name, all = True))
+ r.extend(self.defaults.GetString(name, all_keys = True))
return r
def SetString(self, name, value):
@@ -526,7 +526,7 @@
self.review = self._Get('review')
self.projectname = self._Get('projectname')
self.fetch = map(lambda x: RefSpec.FromString(x),
- self._Get('fetch', all=True))
+ self._Get('fetch', all_keys=True))
self._review_url = None
def _InsteadOf(self):
@@ -537,7 +537,7 @@
for url in urlList:
key = "url." + url + ".insteadOf"
- insteadOfList = globCfg.GetString(key, all=True)
+ insteadOfList = globCfg.GetString(key, all_keys=True)
for insteadOf in insteadOfList:
if self.url.startswith(insteadOf) \
@@ -567,7 +567,7 @@
if u.endswith('/ssh_info'):
u = u[:len(u) - len('/ssh_info')]
if not u.endswith('/'):
- u += '/'
+ u += '/'
http_url = u
if u in REVIEW_CACHE:
@@ -651,9 +651,9 @@
key = 'remote.%s.%s' % (self.name, key)
return self._config.SetString(key, value)
- def _Get(self, key, all=False):
+ def _Get(self, key, all_keys=False):
key = 'remote.%s.%s' % (self.name, key)
- return self._config.GetString(key, all = all)
+ return self._config.GetString(key, all_keys = all_keys)
class Branch(object):
@@ -703,6 +703,6 @@
key = 'branch.%s.%s' % (self.name, key)
return self._config.SetString(key, value)
- def _Get(self, key, all=False):
+ def _Get(self, key, all_keys=False):
key = 'branch.%s.%s' % (self.name, key)
- return self._config.GetString(key, all = all)
+ return self._config.GetString(key, all_keys = all_keys)
diff --git a/git_refs.py b/git_refs.py
index 1124143..18c9230 100644
--- a/git_refs.py
+++ b/git_refs.py
@@ -115,10 +115,10 @@
line = line[:-1]
p = line.split(' ')
- id = p[0]
+ ref_id = p[0]
name = p[1]
- self._phyref[name] = id
+ self._phyref[name] = ref_id
finally:
fd.close()
self._mtime['packed-refs'] = mtime
@@ -144,18 +144,18 @@
try:
try:
mtime = os.path.getmtime(path)
- id = fd.readline()
+ ref_id = fd.readline()
except:
return
finally:
fd.close()
- if not id:
+ if not ref_id:
return
- id = id[:-1]
+ ref_id = ref_id[:-1]
- if id.startswith('ref: '):
- self._symref[name] = id[5:]
+ if ref_id.startswith('ref: '):
+ self._symref[name] = ref_id[5:]
else:
- self._phyref[name] = id
+ self._phyref[name] = ref_id
self._mtime[name] = mtime
diff --git a/main.py b/main.py
index 1275229..5c8772c 100755
--- a/main.py
+++ b/main.py
@@ -88,7 +88,7 @@
glob = argv
name = 'help'
argv = []
- gopts, gargs = global_options.parse_args(glob)
+ gopts, _gargs = global_options.parse_args(glob)
if gopts.trace:
SetTrace()
@@ -182,8 +182,8 @@
repo_path = '~/bin/repo'
if not ver:
- print >>sys.stderr, 'no --wrapper-version argument'
- sys.exit(1)
+ print >>sys.stderr, 'no --wrapper-version argument'
+ sys.exit(1)
exp = _CurrentWrapperVersion()
ver = tuple(map(lambda x: int(x), ver.split('.')))
@@ -211,8 +211,8 @@
def _CheckRepoDir(dir):
if not dir:
- print >>sys.stderr, 'no --repo-dir argument'
- sys.exit(1)
+ print >>sys.stderr, 'no --repo-dir argument'
+ sys.exit(1)
def _PruneOptions(argv, opt):
i = 0
diff --git a/manifest_xml.py b/manifest_xml.py
index a6364a7..1207244 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -113,7 +113,7 @@
if os.path.exists(self.manifestFile):
os.remove(self.manifestFile)
os.symlink('manifests/%s' % name, self.manifestFile)
- except OSError, e:
+ except OSError:
raise ManifestParseError('cannot link manifest %s' % name)
def _RemoteToXml(self, r, doc, root):
@@ -589,7 +589,6 @@
groups.extend(set(default_groups).difference(groups))
if self.IsMirror:
- relpath = None
worktree = None
gitdir = os.path.join(self.topdir, '%s.git' % name)
else:
diff --git a/pager.py b/pager.py
index 7086aef..888b108 100755
--- a/pager.py
+++ b/pager.py
@@ -74,11 +74,11 @@
# ready works around a long-standing bug in popularly
# available versions of 'less', a better 'more'.
#
- a, b, c = select.select([0], [], [0])
+ _a, _b, _c = select.select([0], [], [0])
os.environ['LESS'] = 'FRSX'
try:
os.execvp(pager, [pager])
- except OSError, e:
+ except OSError:
os.execv('/bin/sh', ['sh', '-c', pager])
diff --git a/project.py b/project.py
index 04c43bb..d81152c 100644
--- a/project.py
+++ b/project.py
@@ -328,7 +328,6 @@
HookError: Raised if the user doesn't approve and abort_if_user_denies
was passed to the consturctor.
"""
- hooks_dir = self._hooks_project.worktree
hooks_config = self._hooks_project.config
git_approval_key = 'repo.hooks.%s.approvedhash' % self._hook_type
@@ -608,25 +607,24 @@
"""Get all existing local branches.
"""
current = self.CurrentBranch
- all = self._allrefs
+ all_refs = self._allrefs
heads = {}
- pubd = {}
- for name, id in all.iteritems():
+ for name, ref_id in all_refs.iteritems():
if name.startswith(R_HEADS):
name = name[len(R_HEADS):]
b = self.GetBranch(name)
b.current = name == current
b.published = None
- b.revision = id
+ b.revision = ref_id
heads[name] = b
- for name, id in all.iteritems():
+ for name, ref_id in all_refs.iteritems():
if name.startswith(R_PUB):
name = name[len(R_PUB):]
b = heads.get(name)
if b:
- b.published = id
+ b.published = ref_id
return heads
@@ -785,40 +783,40 @@
## Publish / Upload ##
- def WasPublished(self, branch, all=None):
+ def WasPublished(self, branch, all_refs=None):
"""Was the branch published (uploaded) for code review?
If so, returns the SHA-1 hash of the last published
state for the branch.
"""
key = R_PUB + branch
- if all is None:
+ if all_refs is None:
try:
return self.bare_git.rev_parse(key)
except GitError:
return None
else:
try:
- return all[key]
+ return all_refs[key]
except KeyError:
return None
- def CleanPublishedCache(self, all=None):
+ def CleanPublishedCache(self, all_refs=None):
"""Prunes any stale published refs.
"""
- if all is None:
- all = self._allrefs
+ if all_refs is None:
+ all_refs = self._allrefs
heads = set()
canrm = {}
- for name, id in all.iteritems():
+ for name, ref_id in all_refs.iteritems():
if name.startswith(R_HEADS):
heads.add(name)
elif name.startswith(R_PUB):
- canrm[name] = id
+ canrm[name] = ref_id
- for name, id in canrm.iteritems():
+ for name, ref_id in canrm.iteritems():
n = name[len(R_PUB):]
if R_HEADS + n not in heads:
- self.bare_git.DeleteRef(name, id)
+ self.bare_git.DeleteRef(name, ref_id)
def GetUploadableBranches(self, selected_branch=None):
"""List any branches which can be uploaded for review.
@@ -826,15 +824,15 @@
heads = {}
pubed = {}
- for name, id in self._allrefs.iteritems():
+ for name, ref_id in self._allrefs.iteritems():
if name.startswith(R_HEADS):
- heads[name[len(R_HEADS):]] = id
+ heads[name[len(R_HEADS):]] = ref_id
elif name.startswith(R_PUB):
- pubed[name[len(R_PUB):]] = id
+ pubed[name[len(R_PUB):]] = ref_id
ready = []
- for branch, id in heads.iteritems():
- if branch in pubed and pubed[branch] == id:
+ for branch, ref_id in heads.iteritems():
+ if branch in pubed and pubed[branch] == ref_id:
continue
if selected_branch and branch != selected_branch:
continue
@@ -978,18 +976,18 @@
self._InitHooks()
def _CopyFiles(self):
- for file in self.copyfiles:
- file._Copy()
+ for copyfile in self.copyfiles:
+ copyfile._Copy()
- def GetRevisionId(self, all=None):
+ def GetRevisionId(self, all_refs=None):
if self.revisionId:
return self.revisionId
rem = self.GetRemote(self.remote.name)
rev = rem.ToLocal(self.revisionExpr)
- if all is not None and rev in all:
- return all[rev]
+ if all_refs is not None and rev in all_refs:
+ return all_refs[rev]
try:
return self.bare_git.rev_parse('--verify', '%s^0' % rev)
@@ -1002,16 +1000,16 @@
"""Perform only the local IO portion of the sync process.
Network access is not required.
"""
- all = self.bare_ref.all
- self.CleanPublishedCache(all)
- revid = self.GetRevisionId(all)
+ all_refs = self.bare_ref.all
+ self.CleanPublishedCache(all_refs)
+ revid = self.GetRevisionId(all_refs)
self._InitWorkTree()
head = self.work_git.GetHead()
if head.startswith(R_HEADS):
branch = head[len(R_HEADS):]
try:
- head = all[head]
+ head = all_refs[head]
except KeyError:
head = None
else:
@@ -1067,7 +1065,7 @@
return
upstream_gain = self._revlist(not_rev(HEAD), revid)
- pub = self.WasPublished(branch.name, all)
+ pub = self.WasPublished(branch.name, all_refs)
if pub:
not_merged = self._revlist(not_rev(revid), pub)
if not_merged:
@@ -1190,8 +1188,8 @@
if head == (R_HEADS + name):
return True
- all = self.bare_ref.all
- if (R_HEADS + name) in all:
+ all_refs = self.bare_ref.all
+ if (R_HEADS + name) in all_refs:
return GitCommand(self,
['checkout', name, '--'],
capture_stdout = True,
@@ -1200,11 +1198,11 @@
branch = self.GetBranch(name)
branch.remote = self.GetRemote(self.remote.name)
branch.merge = self.revisionExpr
- revid = self.GetRevisionId(all)
+ revid = self.GetRevisionId(all_refs)
if head.startswith(R_HEADS):
try:
- head = all[head]
+ head = all_refs[head]
except KeyError:
head = None
@@ -1245,9 +1243,9 @@
#
return True
- all = self.bare_ref.all
+ all_refs = self.bare_ref.all
try:
- revid = all[rev]
+ revid = all_refs[rev]
except KeyError:
# Branch does not exist in this project
#
@@ -1255,7 +1253,7 @@
if head.startswith(R_HEADS):
try:
- head = all[head]
+ head = all_refs[head]
except KeyError:
head = None
@@ -1283,8 +1281,8 @@
didn't exist.
"""
rev = R_HEADS + name
- all = self.bare_ref.all
- if rev not in all:
+ all_refs = self.bare_ref.all
+ if rev not in all_refs:
# Doesn't exist
return None
@@ -1293,9 +1291,9 @@
# We can't destroy the branch while we are sitting
# on it. Switch to a detached HEAD.
#
- head = all[head]
+ head = all_refs[head]
- revid = self.GetRevisionId(all)
+ revid = self.GetRevisionId(all_refs)
if head == revid:
_lwrite(os.path.join(self.worktree, '.git', HEAD),
'%s\n' % revid)
@@ -1412,33 +1410,33 @@
packed_refs = os.path.join(self.gitdir, 'packed-refs')
remote = self.GetRemote(name)
- all = self.bare_ref.all
- ids = set(all.values())
+ all_refs = self.bare_ref.all
+ ids = set(all_refs.values())
tmp = set()
- for r, id in GitRefs(ref_dir).all.iteritems():
- if r not in all:
+ for r, ref_id in GitRefs(ref_dir).all.iteritems():
+ if r not in all_refs:
if r.startswith(R_TAGS) or remote.WritesTo(r):
- all[r] = id
- ids.add(id)
+ all_refs[r] = ref_id
+ ids.add(ref_id)
continue
- if id in ids:
+ if ref_id in ids:
continue
- r = 'refs/_alt/%s' % id
- all[r] = id
- ids.add(id)
+ r = 'refs/_alt/%s' % ref_id
+ all_refs[r] = ref_id
+ ids.add(ref_id)
tmp.add(r)
- ref_names = list(all.keys())
+ ref_names = list(all_refs.keys())
ref_names.sort()
tmp_packed = ''
old_packed = ''
for r in ref_names:
- line = '%s %s\n' % (all[r], r)
+ line = '%s %s\n' % (all_refs[r], r)
tmp_packed += line
if r not in tmp:
old_packed += line
@@ -1477,7 +1475,7 @@
cmd.append((u'+refs/heads/%s:' % branch) + remote.ToLocal('refs/heads/%s' % branch))
ok = False
- for i in range(2):
+ for _i in range(2):
ret = GitCommand(self, cmd, bare=True, ssh_proxy=ssh_proxy).Wait()
if ret == 0:
ok = True
@@ -2034,7 +2032,7 @@
self.action()
out.nl()
return True
- except GitError, e:
+ except GitError:
out.nl()
return False
@@ -2104,7 +2102,6 @@
"""A special project housed under .repo.
"""
def __init__(self, manifest, name, gitdir, worktree):
- repodir = manifest.repodir
Project.__init__(self,
manifest = manifest,
name = name,
@@ -2156,12 +2153,12 @@
if not self.remote or not self.revisionExpr:
return False
- all = self.bare_ref.all
- revid = self.GetRevisionId(all)
+ all_refs = self.bare_ref.all
+ revid = self.GetRevisionId(all_refs)
head = self.work_git.GetHead()
if head.startswith(R_HEADS):
try:
- head = all[head]
+ head = all_refs[head]
except KeyError:
head = None
diff --git a/subcmds/branches.py b/subcmds/branches.py
index a4f8d36..81aa5b1 100644
--- a/subcmds/branches.py
+++ b/subcmds/branches.py
@@ -140,12 +140,12 @@
fmt = out.write
paths = []
if in_cnt < project_cnt - in_cnt:
- type = 'in'
+ in_type = 'in'
for b in i.projects:
paths.append(b.project.relpath)
else:
fmt = out.notinproject
- type = 'not in'
+ in_type = 'not in'
have = set()
for b in i.projects:
have.add(b.project)
@@ -153,11 +153,11 @@
if not p in have:
paths.append(p.relpath)
- s = ' %s %s' % (type, ', '.join(paths))
+ s = ' %s %s' % (in_type, ', '.join(paths))
if width + 7 + len(s) < 80:
fmt(s)
else:
- fmt(' %s:' % type)
+ fmt(' %s:' % in_type)
for p in paths:
out.nl()
fmt(width*' ' + ' %s' % p)
diff --git a/subcmds/forall.py b/subcmds/forall.py
index 9436f4e..76a0268 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -208,7 +208,6 @@
return self.fd.fileno()
empty = True
- didout = False
errbuf = ''
p.stdin.close()
@@ -220,7 +219,7 @@
fcntl.fcntl(s.fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
while s_in:
- in_ready, out_ready, err_ready = select.select(s_in, [], [])
+ in_ready, _out_ready, _err_ready = select.select(s_in, [], [])
for s in in_ready:
buf = s.fd.read(4096)
if not buf:
@@ -229,9 +228,7 @@
continue
if not opt.verbose:
- if s.fd == p.stdout:
- didout = True
- else:
+ if s.fd != p.stdout:
errbuf += buf
continue
diff --git a/subcmds/help.py b/subcmds/help.py
index 0df3c14..375d04d 100644
--- a/subcmds/help.py
+++ b/subcmds/help.py
@@ -120,8 +120,8 @@
m = asciidoc_hdr.match(para)
if m:
title = m.group(1)
- type = m.group(2)
- if type[0] in ('=', '-'):
+ section_type = m.group(2)
+ if section_type[0] in ('=', '-'):
p = self.heading
else:
def _p(fmt, *args):
@@ -131,7 +131,7 @@
p('%s', title)
self.nl()
- p('%s', ''.ljust(len(title),type[0]))
+ p('%s', ''.ljust(len(title),section_type[0]))
self.nl()
continue
diff --git a/subcmds/init.py b/subcmds/init.py
index 9a4f711..697d6be 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -213,8 +213,6 @@
sys.exit(1)
def _Prompt(self, prompt, value):
- mp = self.manifest.manifestProject
-
sys.stdout.write('%-10s [%s]: ' % (prompt, value))
a = sys.stdin.readline().strip()
if a == '':
@@ -328,9 +326,9 @@
self._ConfigureDepth(opt)
if self.manifest.IsMirror:
- type = 'mirror '
+ init_type = 'mirror '
else:
- type = ''
+ init_type = ''
print ''
- print 'repo %sinitialized in %s' % (type, self.manifest.topdir)
+ print 'repo %sinitialized in %s' % (init_type, self.manifest.topdir)
diff --git a/subcmds/manifest.py b/subcmds/manifest.py
index 4388765..5592a37 100644
--- a/subcmds/manifest.py
+++ b/subcmds/manifest.py
@@ -35,14 +35,14 @@
@property
def helpDescription(self):
- help = self._helpDescription + '\n'
+ helptext = self._helpDescription + '\n'
r = os.path.dirname(__file__)
r = os.path.dirname(r)
fd = open(os.path.join(r, 'docs', 'manifest-format.txt'))
for line in fd:
- help += line
+ helptext += line
fd.close()
- return help
+ return helptext
def _Options(self, p):
p.add_option('-r', '--revision-as-HEAD',
diff --git a/subcmds/overview.py b/subcmds/overview.py
index 96fa93d..a509bd9 100644
--- a/subcmds/overview.py
+++ b/subcmds/overview.py
@@ -38,16 +38,16 @@
help="Consider only checked out branches")
def Execute(self, opt, args):
- all = []
+ all_branches = []
for project in self.GetProjects(args):
br = [project.GetUploadableBranch(x)
for x in project.GetBranches().keys()]
br = [x for x in br if x]
if opt.current_branch:
br = [x for x in br if x.name == project.CurrentBranch]
- all.extend(br)
+ all_branches.extend(br)
- if not all:
+ if not all_branches:
return
class Report(Coloring):
@@ -55,13 +55,13 @@
Coloring.__init__(self, config, 'status')
self.project = self.printer('header', attr='bold')
- out = Report(all[0].project.config)
+ out = Report(all_branches[0].project.config)
out.project('Projects Overview')
out.nl()
project = None
- for branch in all:
+ for branch in all_branches:
if project != branch.project:
project = branch.project
out.nl()
diff --git a/subcmds/prune.py b/subcmds/prune.py
index f412bd4..c50a550 100644
--- a/subcmds/prune.py
+++ b/subcmds/prune.py
@@ -24,11 +24,11 @@
"""
def Execute(self, opt, args):
- all = []
+ all_branches = []
for project in self.GetProjects(args):
- all.extend(project.PruneHeads())
+ all_branches.extend(project.PruneHeads())
- if not all:
+ if not all_branches:
return
class Report(Coloring):
@@ -36,13 +36,13 @@
Coloring.__init__(self, config, 'status')
self.project = self.printer('header', attr='bold')
- out = Report(all[0].project.config)
+ out = Report(all_branches[0].project.config)
out.project('Pending Branches')
out.nl()
project = None
- for branch in all:
+ for branch in all_branches:
if project != branch.project:
project = branch.project
out.nl()
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index 2c1752d..a8d58cd 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -55,14 +55,14 @@
help='Stash local modifications before starting')
def Execute(self, opt, args):
- all = self.GetProjects(args)
- one_project = len(all) == 1
+ all_projects = self.GetProjects(args)
+ one_project = len(all_projects) == 1
if opt.interactive and not one_project:
print >>sys.stderr, 'error: interactive rebase not supported with multiple projects'
return -1
- for project in all:
+ for project in all_projects:
cb = project.CurrentBranch
if not cb:
if one_project:
diff --git a/subcmds/stage.py b/subcmds/stage.py
index 4c221db..2ec4806 100644
--- a/subcmds/stage.py
+++ b/subcmds/stage.py
@@ -48,8 +48,8 @@
self.Usage()
def _Interactive(self, opt, args):
- all = filter(lambda x: x.IsDirty(), self.GetProjects(args))
- if not all:
+ all_projects = filter(lambda x: x.IsDirty(), self.GetProjects(args))
+ if not all_projects:
print >>sys.stderr,'no projects have uncommitted modifications'
return
@@ -58,8 +58,8 @@
out.header(' %s', 'project')
out.nl()
- for i in xrange(0, len(all)):
- p = all[i]
+ for i in xrange(0, len(all_projects)):
+ p = all_projects[i]
out.write('%3d: %s', i + 1, p.relpath + '/')
out.nl()
out.nl()
@@ -93,11 +93,11 @@
if a_index is not None:
if a_index == 0:
break
- if 0 < a_index and a_index <= len(all):
- _AddI(all[a_index - 1])
+ if 0 < a_index and a_index <= len(all_projects):
+ _AddI(all_projects[a_index - 1])
continue
- p = filter(lambda x: x.name == a or x.relpath == a, all)
+ p = filter(lambda x: x.name == a or x.relpath == a, all_projects)
if len(p) == 1:
_AddI(p[0])
continue
diff --git a/subcmds/start.py b/subcmds/start.py
index 0088507..be64531 100644
--- a/subcmds/start.py
+++ b/subcmds/start.py
@@ -52,10 +52,10 @@
print >>sys.stderr, "error: at least one project must be specified"
sys.exit(1)
- all = self.GetProjects(projects)
+ all_projects = self.GetProjects(projects)
- pm = Progress('Starting %s' % nb, len(all))
- for project in all:
+ pm = Progress('Starting %s' % nb, len(all_projects))
+ for project in all_projects:
pm.update()
# If the current revision is a specific SHA1 then we can't push back
# to it so substitute the manifest default revision instead.
diff --git a/subcmds/status.py b/subcmds/status.py
index 75d68eb..7611621 100644
--- a/subcmds/status.py
+++ b/subcmds/status.py
@@ -98,18 +98,18 @@
sem.release()
def Execute(self, opt, args):
- all = self.GetProjects(args)
+ all_projects = self.GetProjects(args)
counter = itertools.count()
if opt.jobs == 1:
- for project in all:
+ for project in all_projects:
state = project.PrintWorkTreeStatus()
if state == 'CLEAN':
counter.next()
else:
sem = _threading.Semaphore(opt.jobs)
threads_and_output = []
- for project in all:
+ for project in all_projects:
sem.acquire()
class BufList(StringIO.StringIO):
@@ -128,5 +128,5 @@
t.join()
output.dump(sys.stdout)
output.close()
- if len(all) == counter.next():
+ if len(all_projects) == counter.next():
print 'nothing to commit (working directory clean)'
diff --git a/subcmds/sync.py b/subcmds/sync.py
index b84d169..1b71635 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -316,8 +316,7 @@
if not path:
continue
if path not in new_project_paths:
- """If the path has already been deleted, we don't need to do it
- """
+ # If the path has already been deleted, we don't need to do it
if os.path.exists(self.manifest.topdir + '/' + path):
project = Project(
manifest = self.manifest,
@@ -495,16 +494,16 @@
self.manifest._Unload()
if opt.jobs is None:
self.jobs = self.manifest.default.sync_j
- all = self.GetProjects(args, missing_ok=True)
+ all_projects = self.GetProjects(args, missing_ok=True)
if not opt.local_only:
to_fetch = []
now = time.time()
if (24 * 60 * 60) <= (now - rp.LastFetch):
to_fetch.append(rp)
- to_fetch.extend(all)
+ to_fetch.extend(all_projects)
- fetched = self._Fetch(to_fetch, opt)
+ self._Fetch(to_fetch, opt)
_PostRepoFetch(rp, opt.no_repo_verify)
if opt.network_only:
# bail out now; the rest touches the working tree
@@ -519,8 +518,8 @@
syncbuf = SyncBuffer(mp.config,
detach_head = opt.detach_head)
- pm = Progress('Syncing work tree', len(all))
- for project in all:
+ pm = Progress('Syncing work tree', len(all_projects))
+ for project in all_projects:
pm.update()
if project.worktree:
project.Sync_LocalHalf(syncbuf)
diff --git a/subcmds/upload.py b/subcmds/upload.py
index c931297..685e342 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -40,8 +40,8 @@
def _SplitEmails(values):
result = []
- for str in values:
- result.extend([s.strip() for s in str.split(',')])
+ for value in values:
+ result.extend([s.strip() for s in value.split(',')])
return result
class Upload(InteractiveCommand):
@@ -174,15 +174,15 @@
if answer is None:
date = branch.date
- list = branch.commits
+ commit_list = branch.commits
print 'Upload project %s/ to remote branch %s:' % (project.relpath, project.revisionExpr)
print ' branch %s (%2d commit%s, %s):' % (
name,
- len(list),
- len(list) != 1 and 's' or '',
+ len(commit_list),
+ len(commit_list) != 1 and 's' or '',
date)
- for commit in list:
+ for commit in commit_list:
print ' %s' % commit
sys.stdout.write('to %s (y/N)? ' % remote.review)
@@ -212,17 +212,17 @@
for branch in avail:
name = branch.name
date = branch.date
- list = branch.commits
+ commit_list = branch.commits
if b:
script.append('#')
script.append('# branch %s (%2d commit%s, %s) to remote branch %s:' % (
name,
- len(list),
- len(list) != 1 and 's' or '',
+ len(commit_list),
+ len(commit_list) != 1 and 's' or '',
date,
project.revisionExpr))
- for commit in list:
+ for commit in commit_list:
script.append('# %s' % commit)
b[name] = branch