##// END OF EJS Templates
Bumped mercurial to 2.2 and fixed code for this release ref #429
marcink -
r2204:8ce4c8e4 beta
parent child Browse files
Show More
@@ -14,4 +14,4 webob==1.0.8
14 markdown==2.1.1
14 markdown==2.1.1
15 docutils==0.8.1
15 docutils==0.8.1
16 py-bcrypt
16 py-bcrypt
17 mercurial>=2.1,<2.2 No newline at end of file
17 mercurial>=2.2,<2.3 No newline at end of file
@@ -69,10 +69,10 if __py_version__ < (2, 6):
69 requirements.append("pysqlite")
69 requirements.append("pysqlite")
70
70
71 if __platform__ in PLATFORM_WIN:
71 if __platform__ in PLATFORM_WIN:
72 requirements.append("mercurial>=2.1,<2.2")
72 requirements.append("mercurial>=2.2,<2.3")
73 else:
73 else:
74 requirements.append("py-bcrypt")
74 requirements.append("py-bcrypt")
75 requirements.append("mercurial>=2.1,<2.2")
75 requirements.append("mercurial>=2.2,<2.3")
76
76
77
77
78 def get_version():
78 def get_version():
@@ -125,7 +125,8 class ChangelogController(BaseRepoContro
125 data.append(['', vtx, edges])
125 data.append(['', vtx, edges])
126
126
127 elif repo.alias == 'hg':
127 elif repo.alias == 'hg':
128 c.dag = graphmod.colored(graphmod.dagwalker(repo._repo, revs))
128 dag = graphmod.dagwalker(repo._repo, revs)
129 c.dag = graphmod.colored(dag, repo._repo)
129 for (id, type, ctx, vtx, edges) in c.dag:
130 for (id, type, ctx, vtx, edges) in c.dag:
130 if type != graphmod.CHANGESET:
131 if type != graphmod.CHANGESET:
131 continue
132 continue
General Comments 0
You need to be logged in to leave comments. Login now