diff options
| -rw-r--r-- | gitc_utils.py | 4 | ||||
| -rw-r--r-- | manifest_xml.py | 2 | ||||
| -rw-r--r-- | subcmds/branches.py | 2 | ||||
| -rw-r--r-- | subcmds/sync.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gitc_utils.py b/gitc_utils.py index b47e181c..8b5b007e 100644 --- a/gitc_utils.py +++ b/gitc_utils.py | |||
| @@ -104,11 +104,11 @@ def generate_gitc_manifest(gitc_manifest, manifest, paths=None): | |||
| 104 | if not proj.upstream and not git_config.IsId(proj.revisionExpr): | 104 | if not proj.upstream and not git_config.IsId(proj.revisionExpr): |
| 105 | proj.upstream = proj.revisionExpr | 105 | proj.upstream = proj.revisionExpr |
| 106 | 106 | ||
| 107 | if not path in gitc_manifest.paths: | 107 | if path not in gitc_manifest.paths: |
| 108 | # Any new projects need their first revision, even if we weren't asked | 108 | # Any new projects need their first revision, even if we weren't asked |
| 109 | # for them. | 109 | # for them. |
| 110 | projects.append(proj) | 110 | projects.append(proj) |
| 111 | elif not path in paths: | 111 | elif path not in paths: |
| 112 | # And copy revisions from the previous manifest if we're not updating | 112 | # And copy revisions from the previous manifest if we're not updating |
| 113 | # them now. | 113 | # them now. |
| 114 | gitc_proj = gitc_manifest.paths[path] | 114 | gitc_proj = gitc_manifest.paths[path] |
diff --git a/manifest_xml.py b/manifest_xml.py index 2be717e2..d24dbcea 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -1093,7 +1093,7 @@ class XmlManifest(object): | |||
| 1093 | diff = {'added': [], 'removed': [], 'changed': [], 'unreachable': []} | 1093 | diff = {'added': [], 'removed': [], 'changed': [], 'unreachable': []} |
| 1094 | 1094 | ||
| 1095 | for proj in fromKeys: | 1095 | for proj in fromKeys: |
| 1096 | if not proj in toKeys: | 1096 | if proj not in toKeys: |
| 1097 | diff['removed'].append(fromProjects[proj]) | 1097 | diff['removed'].append(fromProjects[proj]) |
| 1098 | else: | 1098 | else: |
| 1099 | fromProj = fromProjects[proj] | 1099 | fromProj = fromProjects[proj] |
diff --git a/subcmds/branches.py b/subcmds/branches.py index fb60d7de..b8958848 100644 --- a/subcmds/branches.py +++ b/subcmds/branches.py | |||
| @@ -158,7 +158,7 @@ is shown, then the branch appears in all projects. | |||
| 158 | for b in i.projects: | 158 | for b in i.projects: |
| 159 | have.add(b.project) | 159 | have.add(b.project) |
| 160 | for p in projects: | 160 | for p in projects: |
| 161 | if not p in have: | 161 | if p not in have: |
| 162 | paths.append(p.relpath) | 162 | paths.append(p.relpath) |
| 163 | 163 | ||
| 164 | s = ' %s %s' % (in_type, ', '.join(paths)) | 164 | s = ' %s %s' % (in_type, ', '.join(paths)) |
diff --git a/subcmds/sync.py b/subcmds/sync.py index 13c419c3..54b5a7fc 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -744,7 +744,7 @@ later is required to fix a server side protocol bug. | |||
| 744 | if not opt.quiet: | 744 | if not opt.quiet: |
| 745 | print('Using manifest server %s' % manifest_server) | 745 | print('Using manifest server %s' % manifest_server) |
| 746 | 746 | ||
| 747 | if not '@' in manifest_server: | 747 | if '@' not in manifest_server: |
| 748 | username = None | 748 | username = None |
| 749 | password = None | 749 | password = None |
| 750 | if opt.manifest_server_username and opt.manifest_server_password: | 750 | if opt.manifest_server_username and opt.manifest_server_password: |
