Show More
@@ -30,8 +30,8 b' from webob.exc import HTTPNotFound, HTTP' | |||||
30 | from collections import defaultdict |
|
30 | from collections import defaultdict | |
31 | from itertools import groupby |
|
31 | from itertools import groupby | |
32 |
|
32 | |||
33 |
from pylons import request |
|
33 | from pylons import request, tmpl_context as c, url | |
34 |
from pylons.controllers.util import |
|
34 | from pylons.controllers.util import redirect | |
35 | from pylons.i18n.translation import _ |
|
35 | from pylons.i18n.translation import _ | |
36 |
|
36 | |||
37 | from rhodecode.lib.compat import json |
|
37 | from rhodecode.lib.compat import json | |
@@ -44,17 +44,14 b' from rhodecode.lib import diffs' | |||||
44 | from rhodecode.lib.utils import action_logger, jsonify |
|
44 | from rhodecode.lib.utils import action_logger, jsonify | |
45 | from rhodecode.lib.vcs.utils import safe_str |
|
45 | from rhodecode.lib.vcs.utils import safe_str | |
46 | from rhodecode.lib.vcs.exceptions import EmptyRepositoryError |
|
46 | from rhodecode.lib.vcs.exceptions import EmptyRepositoryError | |
47 | from rhodecode.lib.vcs.backends.base import EmptyChangeset |
|
|||
48 | from rhodecode.lib.diffs import LimitedDiffContainer |
|
47 | from rhodecode.lib.diffs import LimitedDiffContainer | |
49 |
from rhodecode.model.db import |
|
48 | from rhodecode.model.db import PullRequest, ChangesetStatus, ChangesetComment | |
50 | ChangesetComment |
|
|||
51 | from rhodecode.model.pull_request import PullRequestModel |
|
49 | from rhodecode.model.pull_request import PullRequestModel | |
52 | from rhodecode.model.meta import Session |
|
50 | from rhodecode.model.meta import Session | |
53 | from rhodecode.model.repo import RepoModel |
|
51 | from rhodecode.model.repo import RepoModel | |
54 | from rhodecode.model.comment import ChangesetCommentsModel |
|
52 | from rhodecode.model.comment import ChangesetCommentsModel | |
55 | from rhodecode.model.changeset_status import ChangesetStatusModel |
|
53 | from rhodecode.model.changeset_status import ChangesetStatusModel | |
56 | from rhodecode.model.forms import PullRequestForm |
|
54 | from rhodecode.model.forms import PullRequestForm | |
57 | from mercurial import scmutil |
|
|||
58 | from rhodecode.lib.utils2 import safe_int |
|
55 | from rhodecode.lib.utils2 import safe_int | |
59 |
|
56 | |||
60 | log = logging.getLogger(__name__) |
|
57 | log = logging.getLogger(__name__) |
@@ -29,9 +29,7 b' import binascii' | |||||
29 | import traceback |
|
29 | import traceback | |
30 | from inspect import isfunction |
|
30 | from inspect import isfunction | |
31 |
|
31 | |||
32 |
from |
|
32 | from rhodecode.lib.vcs.utils.hgcompat import nullrev, revrange | |
33 | from mercurial.node import nullrev |
|
|||
34 |
|
||||
35 | from rhodecode.lib import helpers as h |
|
33 | from rhodecode.lib import helpers as h | |
36 | from rhodecode.lib.utils import action_logger |
|
34 | from rhodecode.lib.utils import action_logger | |
37 | from rhodecode.lib.vcs.backends.base import EmptyChangeset |
|
35 | from rhodecode.lib.vcs.backends.base import EmptyChangeset |
@@ -28,8 +28,6 b' import os' | |||||
28 | import logging |
|
28 | import logging | |
29 | import traceback |
|
29 | import traceback | |
30 |
|
30 | |||
31 | from mercurial.error import RepoError |
|
|||
32 | from mercurial.hgweb import hgweb_mod |
|
|||
33 |
|
31 | |||
34 | from paste.httpheaders import REMOTE_USER, AUTH_TYPE |
|
32 | from paste.httpheaders import REMOTE_USER, AUTH_TYPE | |
35 | from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError, \ |
|
33 | from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError, \ | |
@@ -41,6 +39,7 b' from rhodecode.lib.base import BaseVCSCo' | |||||
41 | from rhodecode.lib.auth import get_container_username |
|
39 | from rhodecode.lib.auth import get_container_username | |
42 | from rhodecode.lib.utils import make_ui, is_valid_repo, ui_sections |
|
40 | from rhodecode.lib.utils import make_ui, is_valid_repo, ui_sections | |
43 | from rhodecode.lib.compat import json |
|
41 | from rhodecode.lib.compat import json | |
|
42 | from rhodecode.lib.vcs.utils.hgcompat import RepoError, hgweb_mod | |||
44 | from rhodecode.model.db import User |
|
43 | from rhodecode.model.db import User | |
45 | from rhodecode.lib.exceptions import HTTPLockedRC |
|
44 | from rhodecode.lib.exceptions import HTTPLockedRC | |
46 |
|
45 |
@@ -39,13 +39,12 b' from os.path import dirname as dn, join ' | |||||
39 |
|
39 | |||
40 | from paste.script.command import Command, BadCommand |
|
40 | from paste.script.command import Command, BadCommand | |
41 |
|
41 | |||
42 | from mercurial import ui, config |
|
|||
43 |
|
||||
44 | from webhelpers.text import collapse, remove_formatting, strip_tags |
|
42 | from webhelpers.text import collapse, remove_formatting, strip_tags | |
45 |
|
43 | |||
46 | from rhodecode.lib.vcs import get_backend |
|
44 | from rhodecode.lib.vcs import get_backend | |
47 | from rhodecode.lib.vcs.backends.base import BaseChangeset |
|
45 | from rhodecode.lib.vcs.backends.base import BaseChangeset | |
48 | from rhodecode.lib.vcs.utils.lazy import LazyProperty |
|
46 | from rhodecode.lib.vcs.utils.lazy import LazyProperty | |
|
47 | from rhodecode.lib.vcs.utils.hgcompat import ui, config | |||
49 | from rhodecode.lib.vcs.utils.helpers import get_scm |
|
48 | from rhodecode.lib.vcs.utils.helpers import get_scm | |
50 | from rhodecode.lib.vcs.exceptions import VCSError |
|
49 | from rhodecode.lib.vcs.exceptions import VCSError | |
51 |
|
50 |
@@ -1,4 +1,4 b'' | |||||
1 | from mercurial import ui, config |
|
1 | from rhodecode.lib.vcs.utils.hgcompat import ui, config | |
2 |
|
2 | |||
3 |
|
3 | |||
4 | def make_ui(self, path='hgwebdir.config'): |
|
4 | def make_ui(self, path='hgwebdir.config'): |
@@ -2,23 +2,28 b'' | |||||
2 | Mercurial libs compatibility |
|
2 | Mercurial libs compatibility | |
3 | """ |
|
3 | """ | |
4 |
|
4 | |||
|
5 | import mercurial | |||
5 | from mercurial import archival, merge as hg_merge, patch, ui |
|
6 | from mercurial import archival, merge as hg_merge, patch, ui | |
|
7 | from mercurial import discovery | |||
|
8 | from mercurial import localrepo | |||
|
9 | from mercurial import scmutil | |||
|
10 | from mercurial import config | |||
6 | from mercurial.commands import clone, nullid, pull |
|
11 | from mercurial.commands import clone, nullid, pull | |
7 | from mercurial.context import memctx, memfilectx |
|
12 | from mercurial.context import memctx, memfilectx | |
8 | from mercurial.error import RepoError, RepoLookupError, Abort |
|
13 | from mercurial.error import RepoError, RepoLookupError, Abort | |
|
14 | from mercurial.hgweb import hgweb_mod | |||
9 | from mercurial.hgweb.common import get_contact |
|
15 | from mercurial.hgweb.common import get_contact | |
10 | from mercurial.localrepo import localrepository |
|
16 | from mercurial.localrepo import localrepository | |
11 | from mercurial.match import match |
|
17 | from mercurial.match import match | |
12 | from mercurial.mdiff import diffopts |
|
18 | from mercurial.mdiff import diffopts | |
13 | from mercurial.node import hex |
|
19 | from mercurial.node import hex | |
14 | from mercurial.encoding import tolocal |
|
20 | from mercurial.encoding import tolocal | |
15 | from mercurial import discovery |
|
|||
16 | from mercurial import localrepo |
|
|||
17 | from mercurial import scmutil |
|
|||
18 | from mercurial.discovery import findcommonoutgoing |
|
21 | from mercurial.discovery import findcommonoutgoing | |
19 | from mercurial.hg import peer |
|
22 | from mercurial.hg import peer | |
20 |
|
23 | from mercurial.httppeer import httppeer | ||
21 | from mercurial.util import url as hg_url |
|
24 | from mercurial.util import url as hg_url | |
|
25 | from mercurial.scmutil import revrange | |||
|
26 | from mercurial.node import nullrev | |||
22 |
|
27 | |||
23 | # those authnadlers are patched for python 2.6.5 bug an |
|
28 | # those authnadlers are patched for python 2.6.5 bug an | |
24 | # infinit looping when given invalid resources |
|
29 | # infinit looping when given invalid resources |
@@ -406,7 +406,7 b' def ValidCloneUri():' | |||||
406 | def url_handler(repo_type, url, ui=None): |
|
406 | def url_handler(repo_type, url, ui=None): | |
407 | if repo_type == 'hg': |
|
407 | if repo_type == 'hg': | |
408 | from rhodecode.lib.vcs.backends.hg.repository import MercurialRepository |
|
408 | from rhodecode.lib.vcs.backends.hg.repository import MercurialRepository | |
409 |
from |
|
409 | from rhodecode.lib.vcs.utils.hgcompat import httppeer | |
410 | if url.startswith('http'): |
|
410 | if url.startswith('http'): | |
411 | ## initially check if it's at least the proper URL |
|
411 | ## initially check if it's at least the proper URL | |
412 | ## or does it pass basic auth |
|
412 | ## or does it pass basic auth | |
@@ -418,7 +418,7 b' def ValidCloneUri():' | |||||
418 | elif url.startswith('git+http'): |
|
418 | elif url.startswith('git+http'): | |
419 | raise NotImplementedError() |
|
419 | raise NotImplementedError() | |
420 | else: |
|
420 | else: | |
421 | raise Exception('clone from URI %s not allowed' % (url)) |
|
421 | raise Exception('clone from URI %s not allowed' % (url,)) | |
422 |
|
422 | |||
423 | elif repo_type == 'git': |
|
423 | elif repo_type == 'git': | |
424 | from rhodecode.lib.vcs.backends.git.repository import GitRepository |
|
424 | from rhodecode.lib.vcs.backends.git.repository import GitRepository |
@@ -10,7 +10,7 b' from rhodecode.lib.vcs.utils.compat impo' | |||||
10 |
|
10 | |||
11 |
|
11 | |||
12 | # Use only clean mercurial's ui |
|
12 | # Use only clean mercurial's ui | |
13 | import mercurial.scmutil |
|
13 | from rhodecode.lib.vcs.utils.hgcompat import mercurial | |
14 | mercurial.scmutil.rcpath() |
|
14 | mercurial.scmutil.rcpath() | |
15 | if mercurial.scmutil._rcpath: |
|
15 | if mercurial.scmutil._rcpath: | |
16 | mercurial.scmutil._rcpath = mercurial.scmutil._rcpath[:1] |
|
16 | mercurial.scmutil._rcpath = mercurial.scmutil._rcpath[:1] |
General Comments 0
You need to be logged in to leave comments.
Login now