diff options
author | Conley Owens <cco3@android.com> | 2013-04-19 15:31:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-19 15:31:29 +0000 |
commit | c4c01f914c7cdfa997be60ea97cd487d63333a04 (patch) | |
tree | c7063f88ab55998187c907807364ce7f4444cc4a /subcmds/branches.py | |
parent | 51813dfed1528307c46707bc38b4db33b87bb36e (diff) | |
parent | 217ea7d2747e3098009afe0b389fc4b45f55ea5a (diff) | |
download | git-repo-c4c01f914c7cdfa997be60ea97cd487d63333a04.tar.gz |
Merge "Some fixes for supporting python3"
Diffstat (limited to 'subcmds/branches.py')
-rw-r--r-- | subcmds/branches.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/subcmds/branches.py b/subcmds/branches.py index 06d45abe..c2e7c4b9 100644 --- a/subcmds/branches.py +++ b/subcmds/branches.py | |||
@@ -98,14 +98,13 @@ is shown, then the branch appears in all projects. | |||
98 | project_cnt = len(projects) | 98 | project_cnt = len(projects) |
99 | 99 | ||
100 | for project in projects: | 100 | for project in projects: |
101 | for name, b in project.GetBranches().iteritems(): | 101 | for name, b in project.GetBranches().items(): |
102 | b.project = project | 102 | b.project = project |
103 | if name not in all_branches: | 103 | if name not in all_branches: |
104 | all_branches[name] = BranchInfo(name) | 104 | all_branches[name] = BranchInfo(name) |
105 | all_branches[name].add(b) | 105 | all_branches[name].add(b) |
106 | 106 | ||
107 | names = all_branches.keys() | 107 | names = list(sorted(all_branches)) |
108 | names.sort() | ||
109 | 108 | ||
110 | if not names: | 109 | if not names: |
111 | print(' (no branches)', file=sys.stderr) | 110 | print(' (no branches)', file=sys.stderr) |