Show More
@@ -1,13 +1,13 b'' | |||||
1 | """ |
|
1 | """ | |
2 | Hg app, a web based mercurial repository managment based on pylons |
|
2 | Hg app, a web based mercurial repository managment based on pylons | |
3 | """ |
|
3 | """ | |
4 |
|
4 | |||
5 |
VERSION = (0, 7, |
|
5 | VERSION = (0, 7, 3, 'beta') | |
6 |
|
6 | |||
7 | __version__ = '.'.join((str(each) for each in VERSION[:4])) |
|
7 | __version__ = '.'.join((str(each) for each in VERSION[:4])) | |
8 |
|
8 | |||
9 | def get_version(): |
|
9 | def get_version(): | |
10 | """ |
|
10 | """ | |
11 | Returns shorter version (digit parts only) as string. |
|
11 | Returns shorter version (digit parts only) as string. | |
12 | """ |
|
12 | """ | |
13 | return '.'.join((str(each) for each in VERSION[:3])) |
|
13 | return '.'.join((str(each) for each in VERSION[:3])) |
@@ -1,71 +1,75 b'' | |||||
1 | from beaker.cache import cache_region |
|
|||
2 |
|
|
1 | from mercurial.graphmod import revisions as graph_rev, colored, CHANGESET | |
3 | from mercurial.node import short |
|
2 | from mercurial.node import short | |
4 | from pylons import request, response, session, tmpl_context as c, url, config, \ |
|
3 | from pylons import request, response, session, tmpl_context as c, url, config, \ | |
5 | app_globals as g |
|
4 | app_globals as g | |
6 | from pylons.controllers.util import abort, redirect |
|
5 | from pylons.controllers.util import abort, redirect | |
7 | from pylons_app.lib.auth import LoginRequired |
|
6 | from pylons_app.lib.auth import LoginRequired | |
8 | from pylons_app.lib.base import BaseController, render, _full_changelog_cached |
|
7 | from pylons_app.lib.base import BaseController, render, _full_changelog_cached | |
9 | from pylons_app.lib.filters import age as _age, person |
|
8 | from pylons_app.lib.filters import age as _age, person | |
10 | from pylons_app.lib.utils import get_repo_slug |
|
|||
11 | from pylons_app.model.hg_model import HgModel |
|
|||
12 | from simplejson import dumps |
|
9 | from simplejson import dumps | |
13 | from webhelpers.paginate import Page |
|
10 | from webhelpers.paginate import Page | |
14 | import logging |
|
11 | import logging | |
15 | log = logging.getLogger(__name__) |
|
12 | log = logging.getLogger(__name__) | |
16 |
|
13 | |||
17 | class ChangelogController(BaseController): |
|
14 | class ChangelogController(BaseController): | |
18 |
|
15 | |||
19 | @LoginRequired() |
|
16 | @LoginRequired() | |
20 | def __before__(self): |
|
17 | def __before__(self): | |
21 | super(ChangelogController, self).__before__() |
|
18 | super(ChangelogController, self).__before__() | |
22 |
|
19 | |||
23 | def index(self): |
|
20 | def index(self): | |
24 | if request.params.get('size'): |
|
21 | if request.params.get('size'): | |
25 | c.size = int(request.params['size']) |
|
22 | limit = 100 | |
|
23 | default = 20 | |||
|
24 | try: | |||
|
25 | int_size = int(request.params.get('size')) | |||
|
26 | except ValueError: | |||
|
27 | int_size = default | |||
|
28 | int_size = int_size if int_size <= limit else limit | |||
|
29 | c.size = int_size | |||
26 | session['changelog_size'] = c.size |
|
30 | session['changelog_size'] = c.size | |
27 | session.save() |
|
31 | session.save() | |
28 | else: |
|
32 | else: | |
29 |
c.size = session.get('changelog_size', |
|
33 | c.size = session.get('changelog_size', default) | |
30 |
|
34 | |||
31 | changesets = _full_changelog_cached(c.repo_name) |
|
35 | changesets = _full_changelog_cached(c.repo_name) | |
32 |
|
36 | |||
33 | p = int(request.params.get('page', 1)) |
|
37 | p = int(request.params.get('page', 1)) | |
34 | c.pagination = Page(changesets, page=p, item_count=len(changesets), |
|
38 | c.pagination = Page(changesets, page=p, item_count=len(changesets), | |
35 | items_per_page=c.size) |
|
39 | items_per_page=c.size) | |
36 |
|
40 | |||
37 | #self._graph(c.repo, c.size,p) |
|
41 | #self._graph(c.repo, c.size,p) | |
38 |
|
42 | |||
39 | return render('changelog/changelog.html') |
|
43 | return render('changelog/changelog.html') | |
40 |
|
44 | |||
41 |
|
45 | |||
42 | def _graph(self, repo, size, p): |
|
46 | def _graph(self, repo, size, p): | |
43 | revcount = size |
|
47 | revcount = size | |
44 | if not repo.revisions:return dumps([]), 0 |
|
48 | if not repo.revisions:return dumps([]), 0 | |
45 |
|
49 | |||
46 | max_rev = repo.revisions[-1] |
|
50 | max_rev = repo.revisions[-1] | |
47 | offset = 1 if p == 1 else ((p - 1) * revcount) |
|
51 | offset = 1 if p == 1 else ((p - 1) * revcount) | |
48 | rev_start = repo.revisions[(-1 * offset)] |
|
52 | rev_start = repo.revisions[(-1 * offset)] | |
49 | c.bg_height = 120 |
|
53 | c.bg_height = 120 | |
50 |
|
54 | |||
51 | revcount = min(max_rev, revcount) |
|
55 | revcount = min(max_rev, revcount) | |
52 | rev_end = max(0, rev_start - revcount) |
|
56 | rev_end = max(0, rev_start - revcount) | |
53 | dag = graph_rev(repo.repo, rev_start, rev_end) |
|
57 | dag = graph_rev(repo.repo, rev_start, rev_end) | |
54 |
|
58 | |||
55 | c.dag = tree = list(colored(dag)) |
|
59 | c.dag = tree = list(colored(dag)) | |
56 | canvasheight = (len(tree) + 1) * c.bg_height - 27 |
|
60 | canvasheight = (len(tree) + 1) * c.bg_height - 27 | |
57 | data = [] |
|
61 | data = [] | |
58 | for (id, type, ctx, vtx, edges) in tree: |
|
62 | for (id, type, ctx, vtx, edges) in tree: | |
59 | if type != CHANGESET: |
|
63 | if type != CHANGESET: | |
60 | continue |
|
64 | continue | |
61 | node = short(ctx.node()) |
|
65 | node = short(ctx.node()) | |
62 | age = _age(ctx.date()) |
|
66 | age = _age(ctx.date()) | |
63 | desc = ctx.description() |
|
67 | desc = ctx.description() | |
64 | user = person(ctx.user()) |
|
68 | user = person(ctx.user()) | |
65 | branch = ctx.branch() |
|
69 | branch = ctx.branch() | |
66 | branch = branch, repo.repo.branchtags().get(branch) == ctx.node() |
|
70 | branch = branch, repo.repo.branchtags().get(branch) == ctx.node() | |
67 | data.append((node, vtx, edges, desc, user, age, branch, ctx.tags())) |
|
71 | data.append((node, vtx, edges, desc, user, age, branch, ctx.tags())) | |
68 |
|
72 | |||
69 | c.jsdata = dumps(data) |
|
73 | c.jsdata = dumps(data) | |
70 | c.canvasheight = canvasheight |
|
74 | c.canvasheight = canvasheight | |
71 |
|
75 |
General Comments 0
You need to be logged in to leave comments.
Login now