Mercurial > kallithea
comparison rhodecode/controllers/changelog.py @ 2238:09fd90d91b6a codereview
merge with beta
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 05 May 2012 22:22:53 +0200 |
parents | 69404d45f6c1 eb64d7835f22 |
children | 91fae60bf2b6 |
comparison
equal
deleted
inserted
replaced
2227:69404d45f6c1 | 2238:09fd90d91b6a |
---|---|
124 edges = [[0, 0, 1]] | 124 edges = [[0, 0, 1]] |
125 data.append(['', vtx, edges]) | 125 data.append(['', vtx, edges]) |
126 | 126 |
127 elif repo.alias == 'hg': | 127 elif repo.alias == 'hg': |
128 dag = graphmod.dagwalker(repo._repo, revs) | 128 dag = graphmod.dagwalker(repo._repo, revs) |
129 try: | 129 c.dag = graphmod.colored(dag, repo._repo) |
130 c.dag = graphmod.colored(dag) | |
131 except: | |
132 #HG 2.2+ | |
133 c.dag = graphmod.colored(dag, repo._repo) | |
134 | |
135 for (id, type, ctx, vtx, edges) in c.dag: | 130 for (id, type, ctx, vtx, edges) in c.dag: |
136 if type != graphmod.CHANGESET: | 131 if type != graphmod.CHANGESET: |
137 continue | 132 continue |
138 data.append(['', vtx, edges]) | 133 data.append(['', vtx, edges]) |
139 | 134 |