Files @ 6cb077e99873
Branch filter:

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

6cb077e99873 1013 B text/prs.fallenstein.rst Show Source Show as Raw Download as Raw
Mads Kiilerich
diff: rename template values for org and other for compare and PR

sed -i -e 's,\<\(c\.\(default_\)\?\)org_,\1a_,g' -e 's,\<\(c\.\(default_\)\?\)other_,\1cs_,g' kallithea/controllers/compare.py kallithea/templates/compare/compare_cs.html kallithea/templates/compare/compare_diff.html
sed -i -e 's,\<\(c\.\(default_\)\?\)org_,\1cs_,g' -e 's,\<\(c\.\(default_\)\?\)other_,\1a_,g' kallithea/controllers/pullrequests.py kallithea/templates/pullrequests/pullrequest.html kallithea/templates/pullrequests/pullrequest_show.html kallithea/templates/changeset/diff_block.html

Renaming it differently for compare and PR finally fixes some issues with diffs
and links pointing at wrong revisions and repos - no more whac-a-mole.
.. _subrepos:

=============================================
working with Kallithea and mercurial subrepos
=============================================

example usage of Subrepos with Kallithea::

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

    #clone subrepo we want to add
    hg clone http://rc.local/subrepo

    ## use path like url to existing repo in Kallithea
    echo "subrepo = http://rc.local/subrepo" > .hgsub

    hg add .hgsub
    hg ci --message "added remote subrepo"



In file list of repo1 you will see a connected subrepo at revision it was
during cloning.
Clicking in subrepos link should send you to proper repository in Kallithea

cloning repo1 will also clone attached subrepository.

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

see http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
information about subrepositories