kallithea Changeset - 8ce4c8e43eb7

Changeset - 8ce4c8e43eb7

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2012-04-23 18:21:19
marcin@python-works.com

Bumped mercurial to 2.2 and fixed code for this release ref #429

3 files changed with 5 insertions and 4 deletions:

requires.txt

rhodecode/__init__.py

rhodecode/controllers/changelog.py

0 comments (0 inline, 0 general)

requires.txt

➞

Show inline comments

 Pylons==1.0.0
 Beaker==1.6.3
 WebHelpers==1.3
 formencode==1.2.4
 SQLAlchemy==0.7.6
 Mako==0.7.0
 pygments>=1.4
 whoosh>=2.3.0,<2.4
 celery>=2.2.5,<2.3
 babel
 python-dateutil>=1.5.0,<2.0.0
 dulwich>=0.8.5,<0.9.0
 webob==1.0.8
 markdown==2.1.1
 docutils==0.8.1
 py-bcrypt
 mercurial>=2.1,<2.2
@@ \ No newline at end of file @@
 mercurial>=2.2,<2.3
@@ \ No newline at end of file @@

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -48,47 +48,47 @@ PLATFORM_OTHERS = ('Linux', 'Darwin', 'F @@
 requirements = [
     "Pylons==1.0.0",
     "Beaker==1.6.3",
     "WebHelpers==1.3",
     "formencode==1.2.4",
     "SQLAlchemy==0.7.6",
     "Mako==0.7.0",
     "pygments>=1.4",
     "whoosh>=2.3.0,<2.4",
     "celery>=2.2.5,<2.3",
     "babel",
     "python-dateutil>=1.5.0,<2.0.0",
     "dulwich>=0.8.5,<0.9.0",
     "webob==1.0.8",
     "markdown==2.1.1",
     "docutils==0.8.1",
+]
 if __py_version__ < (2, 6):
     requirements.append("simplejson")
     requirements.append("pysqlite")
 if __platform__ in PLATFORM_WIN:
-    requirements.append("mercurial>=2.1,<2.2")
+    requirements.append("mercurial>=2.2,<2.3")
 else:
     requirements.append("py-bcrypt")
-    requirements.append("mercurial>=2.1,<2.2")
+    requirements.append("mercurial>=2.2,<2.3")
 def get_version():
     """Returns shorter version (digit parts only) as string."""
     return '.'.join((str(each) for each in VERSION[:3]))
 BACKENDS = {
     'hg': 'Mercurial repository',
     'git': 'Git repository',
+}
 CELERY_ON = False
 # link to config for pylons
 CONFIG = {}
 # Linked module for extensions
 EXTENSIONS = {}

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -104,31 +104,32 @@ class ChangelogController(BaseRepoContro @@
             return render('changelog/changelog_details.html')
     def _graph(self, repo, collection, repo_size, size, p):
         """
         Generates a DAG graph for mercurial
         :param repo: repo instance
         :param size: number of commits to show
         :param p: page number
         """
         if not collection:
             c.jsdata = json.dumps([])
             return
         data = []
         revs = [x.revision for x in collection]
         if repo.alias == 'git':
             for _ in revs:
                 vtx = [0, 1]
                 edges = [[0, 0, 1]]
                 data.append(['', vtx, edges])
         elif repo.alias == 'hg':
             c.dag = graphmod.colored(graphmod.dagwalker(repo._repo, revs))
             dag = graphmod.dagwalker(repo._repo, revs)
             c.dag = graphmod.colored(dag, repo._repo)
             for (id, type, ctx, vtx, edges) in c.dag:
                 if type != graphmod.CHANGESET:
                     continue
                 data.append(['', vtx, edges])
         c.jsdata = json.dumps(data)

0 comments (0 inline, 0 general)