Files @ 21c6a1e5bf6c
Branch filter:

Location: kallithea/docs/usage/vcs_notes.rst - annotation

21c6a1e5bf6c 3.9 KiB text/prs.fallenstein.rst Show Source Show as Raw Download as Raw
Mads Kiilerich
i18n: drop automaticly introduced bad translations - completely remove previously fuzzy translations, not just the fuzzy markers

This is redoing cb02ca192180, but more aggressively.

msgmerge is aggressively adding fuzzy translations of strings that vaguely
resemble each other. But these translations are bad. And even more bad almost
irreversible when we dropped the fuzzy markers.

Consider for example the translation in 0.4.1 at
https://kallithea-scm.org/repos/kallithea/files/da65398a62fff50f3d241796cbf17acdea2092ef/kallithea/i18n/be/LC_MESSAGES/kallithea.po

"Unauthorized access to resource" is translated to "Несанкцыянаваны доступ да
рэсурсу", but the same translation is also used fuzzily for very different
strings. That can't be good. While the translation of a slightly similar string
might be a good starting point for translators, we don't want to show such
automated and invalid translations to our users. Then it is better to show the
orginal english text, that at least is a clear TODO item and doesn't say
anything wrong.

We thus remove these automaticly generated translations. Some of them were
perhaps marked fuzzy for other reasons, and we might lose a few good
translations. That is still better than having wrong translations. Translators
can also just mark the translation as non-fuzzy and deal with the conflict of
diverging opinion on whether the translation is good. Their statement trumps
our presumption that the automated fuzzy translation is bad.
.. _vcs_notes:

===================================
Version control systems usage notes
===================================

.. _importing:


Importing existing repositories
-------------------------------

There are two main methods to import repositories in Kallithea: via the web
interface or via the filesystem. If you have a large number of repositories to
import, importing them via the filesystem is more convenient.

Importing via web interface
^^^^^^^^^^^^^^^^^^^^^^^^^^^

For a small number of repositories, it may be easier to create the target
repositories through the Kallithea web interface, via *Admin > Repositories* or
via the *Add Repository* button on the entry page of the web interface.

Repositories can be nested in repository groups by first creating the group (via
*Admin > Repository Groups* or via the *Add Repository Group* button on the
entry page of the web interface) and then selecting the appropriate group when
adding the repository.

After creation of the (empty) repository, push the existing commits to the
*Clone URL* displayed on the repository summary page. For Git repositories,
first add the *Clone URL* as remote, then push the commits to that remote.  The
specific commands to execute are shown under the *Existing repository?* section
of the new repository's summary page.

A benefit of this method particular for Git repositories, is that the
Kallithea-specific Git hooks are installed automatically.  For Mercurial, no
hooks are required anyway.

Importing via the filesystem
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

The alternative method of importing repositories consists of creating the
repositories in the desired hierarchy on the filesystem and letting Kallithea
scan that location.

All repositories are stored in a central location on the filesystem. This
location is specified during installation (via ``db-create``) and can be reviewed
at *Admin > Settings > VCS > Location of repositories*. Repository groups
(defined in *Admin > Repository Groups*) are represented by a directory in that
repository location. Repositories of the repository group are nested under that
directory.

To import a set of repositories and organize them in a certain repository group
structure, first place clones in the desired hierarchy at the configured
repository location.
These clones should be created without working directory. For Mercurial, this is
done with ``hg clone -U``, for Git with ``git clone --bare``.

When the repositories are added correctly on the filesystem:

* go to *Admin > Settings > Remap and Rescan* in the Kallithea web interface
* select the *Install Git hooks* checkbox when importing Git repositories
* click *Rescan Repositories*

This step will scan the filesystem and create the appropriate repository groups
and repositories in Kallithea.

*Note*: Once repository groups have been created this way, manage their access
permissions through the Kallithea web interface.


Mercurial-specific notes
------------------------


Working with subrepositories
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

This section explains how to use Mercurial subrepositories_ in Kallithea.

Example usage::

    ## init a simple repo
    hg init mainrepo
    cd mainrepo
    echo "file" > file
    hg add file
    hg ci --message "initial file"

    # clone subrepo we want to add from Kallithea
    hg clone http://kallithea.local/subrepo

    ## specify URL to existing repo in Kallithea as subrepository path
    echo "subrepo = http://kallithea.local/subrepo" > .hgsub
    hg add .hgsub
    hg ci --message "added remote subrepo"

In the file list of a clone of ``mainrepo`` you will see a connected
subrepository at the revision it was cloned with. Clicking on the
subrepository link sends you to the proper repository in Kallithea.

Cloning ``mainrepo`` will also clone the attached subrepository.

Next we can edit the subrepository data, and push back to Kallithea. This will
update both repositories.


.. _subrepositories: http://mercurial.aragost.com/kick-start/en/subrepositories/