Show More
@@ -1,71 +1,70 b'' | |||
|
1 | 1 | .. _index: |
|
2 | 2 | |
|
3 | 3 | Administrators Guide |
|
4 | 4 | -------------------- |
|
5 | 5 | |
|
6 | 6 | **Readme** |
|
7 | 7 | |
|
8 | 8 | .. toctree:: |
|
9 | 9 | :maxdepth: 1 |
|
10 | 10 | |
|
11 | 11 | readme |
|
12 | 12 | |
|
13 | 13 | **Installation** |
|
14 | 14 | |
|
15 | 15 | .. toctree:: |
|
16 | 16 | :maxdepth: 1 |
|
17 | 17 | |
|
18 | 18 | installation |
|
19 | 19 | installation_win |
|
20 | 20 | installation_win_old |
|
21 | 21 | installation_iis |
|
22 | 22 | setup |
|
23 | 23 | |
|
24 | 24 | **Usage** |
|
25 | 25 | |
|
26 | 26 | .. toctree:: |
|
27 | 27 | :maxdepth: 1 |
|
28 | 28 | |
|
29 | 29 | usage/general |
|
30 | 30 | usage/vcs_support |
|
31 | 31 | usage/performance |
|
32 | 32 | usage/locking |
|
33 | 33 | usage/statistics |
|
34 | 34 | usage/backup |
|
35 | usage/subrepos | |
|
36 | 35 | usage/debugging |
|
37 | 36 | usage/troubleshooting |
|
38 | 37 | |
|
39 | 38 | **Develop** |
|
40 | 39 | |
|
41 | 40 | .. toctree:: |
|
42 | 41 | :maxdepth: 1 |
|
43 | 42 | |
|
44 | 43 | contributing |
|
45 | 44 | changelog |
|
46 | 45 | |
|
47 | 46 | **API** |
|
48 | 47 | |
|
49 | 48 | .. toctree:: |
|
50 | 49 | :maxdepth: 1 |
|
51 | 50 | |
|
52 | 51 | api/api |
|
53 | 52 | api/models |
|
54 | 53 | |
|
55 | 54 | |
|
56 | 55 | Other topics |
|
57 | 56 | ------------ |
|
58 | 57 | |
|
59 | 58 | * :ref:`genindex` |
|
60 | 59 | * :ref:`search` |
|
61 | 60 | |
|
62 | 61 | .. _virtualenv: http://pypi.python.org/pypi/virtualenv |
|
63 | 62 | .. _python: http://www.python.org/ |
|
64 | 63 | .. _django: http://www.djangoproject.com/ |
|
65 | 64 | .. _mercurial: http://mercurial.selenic.com/ |
|
66 | 65 | .. _bitbucket: http://bitbucket.org/ |
|
67 | 66 | .. _subversion: http://subversion.tigris.org/ |
|
68 | 67 | .. _git: http://git-scm.com/ |
|
69 | 68 | .. _celery: http://celeryproject.org/ |
|
70 | 69 | .. _Sphinx: http://sphinx.pocoo.org/ |
|
71 | 70 | .. _vcs: http://pypi.python.org/pypi/vcs |
@@ -1,49 +1,84 b'' | |||
|
1 | 1 | .. _vcs_support: |
|
2 | 2 | |
|
3 | 3 | =============================== |
|
4 | 4 | Version control systems support |
|
5 | 5 | =============================== |
|
6 | 6 | |
|
7 | 7 | Kallithea supports Git and Mercurial repositories out-of-the-box. |
|
8 | 8 | For Git, you do need the ``git`` command line client installed on the server. |
|
9 | 9 | |
|
10 | 10 | You can always disable Git or Mercurial support by editing the |
|
11 | 11 | file ``kallithea/__init__.py`` and commenting out the backend. |
|
12 | 12 | |
|
13 | 13 | .. code-block:: python |
|
14 | 14 | |
|
15 | 15 | BACKENDS = { |
|
16 | 16 | 'hg': 'Mercurial repository', |
|
17 | 17 | #'git': 'Git repository', |
|
18 | 18 | } |
|
19 | 19 | |
|
20 | 20 | Git support |
|
21 | 21 | ----------- |
|
22 | 22 | |
|
23 | 23 | Web server with chunked encoding |
|
24 | 24 | ```````````````````````````````` |
|
25 | 25 | Large Git pushes require an HTTP server with support for |
|
26 | 26 | chunked encoding for POST. The Python web servers waitress_ and |
|
27 | 27 | gunicorn_ (Linux only) can be used. By default, Kallithea uses |
|
28 | 28 | waitress_ for `paster serve` instead of the built-in `paste` WSGI |
|
29 | 29 | server. |
|
30 | 30 | |
|
31 | 31 | The default paste server is controlled in the .ini file:: |
|
32 | 32 | |
|
33 | 33 | use = egg:waitress#main |
|
34 | 34 | |
|
35 | 35 | or:: |
|
36 | 36 | |
|
37 | 37 | use = egg:gunicorn#main |
|
38 | 38 | |
|
39 | 39 | |
|
40 | 40 | Also make sure to comment out the following options:: |
|
41 | 41 | |
|
42 | 42 | threadpool_workers = |
|
43 | 43 | threadpool_max_requests = |
|
44 | 44 | use_threadpool = |
|
45 | 45 | |
|
46 | 46 | |
|
47 | Mercurial support | |
|
48 | ----------------- | |
|
49 | ||
|
50 | Working with Mercurial subrepositories | |
|
51 | `````````````````````````````````````` | |
|
52 | Example usage of Subrepos with Kallithea:: | |
|
53 | ||
|
54 | ## init a simple repo | |
|
55 | hg init repo1 | |
|
56 | cd repo1 | |
|
57 | echo "file1" > file1 | |
|
58 | hg add file1 | |
|
59 | hg ci --message "initial file 1" | |
|
60 | ||
|
61 | #clone subrepo we want to add | |
|
62 | hg clone http://kallithea.local/subrepo | |
|
63 | ||
|
64 | ## use path like url to existing repo in Kallithea | |
|
65 | echo "subrepo = http://kallithea.local/subrepo" > .hgsub | |
|
66 | ||
|
67 | hg add .hgsub | |
|
68 | hg ci --message "added remote subrepo" | |
|
69 | ||
|
70 | ||
|
71 | In the file list of a clone of ``repo1`` you will see a connected | |
|
72 | subrepo at the revision it was at during cloning. Clicking in | |
|
73 | subrepos link should send you to the proper repository in Kallithea. | |
|
74 | ||
|
75 | Cloning ``repo1`` will also clone the attached subrepository. | |
|
76 | ||
|
77 | Next we can edit the subrepo data, and push back to Kallithea. This will update | |
|
78 | both of the repositories. | |
|
79 | ||
|
80 | See http://mercurial.aragost.com/kick-start/en/subrepositories/ for more | |
|
81 | information about subrepositories. | |
|
47 | 82 | |
|
48 | 83 | .. _waitress: http://pypi.python.org/pypi/waitress |
|
49 | 84 | .. _gunicorn: http://pypi.python.org/pypi/gunicorn |
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now