Files
@ aa3b55946089
Branch filter:
Location: kallithea/docs/usage/subrepos.rst - annotation
aa3b55946089
1013 B
text/prs.fallenstein.rst
Migrate to Mergely 3.3.4.
RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that
Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be
changes we want for Kallithea this way and we take the 3.3.4 files as they are.
I've also included the Mergely license file, as downloaded from:
http://www.mergely.com/license.php
That LICENSE file is kept in HTML just as it was downloaded from their
website. While it's a bit annoying to keep the license file in HTML, this is
the way it came from upstream so we'll leave it that way.
Since the Javascript code is used with other GPLv3 Javascript, we are using the
GPL option of Mergely's tri-license.
Finally, note that previously, this was incorrectly called "mergerly", so the
opportunity is taken here to correct the name. That required changes to
diff_2way.html.
As commands::
$ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php
$ hg add LICENSE-MERGELY.html
$ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css
$ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js
$ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html
$ ( cd /tmp; \
wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \
unzip mergely-3.3.4.zip )
$ sha256sum /tmp/mergely-3.3.4.zip
87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip
$ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js
$ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css
$ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css
RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that
Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be
changes we want for Kallithea this way and we take the 3.3.4 files as they are.
I've also included the Mergely license file, as downloaded from:
http://www.mergely.com/license.php
That LICENSE file is kept in HTML just as it was downloaded from their
website. While it's a bit annoying to keep the license file in HTML, this is
the way it came from upstream so we'll leave it that way.
Since the Javascript code is used with other GPLv3 Javascript, we are using the
GPL option of Mergely's tri-license.
Finally, note that previously, this was incorrectly called "mergerly", so the
opportunity is taken here to correct the name. That required changes to
diff_2way.html.
As commands::
$ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php
$ hg add LICENSE-MERGELY.html
$ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css
$ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js
$ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html
$ ( cd /tmp; \
wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \
unzip mergely-3.3.4.zip )
$ sha256sum /tmp/mergely-3.3.4.zip
87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip
$ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js
$ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css
$ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css
e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 8b8edfc25856 e54ec8211944 8b8edfc25856 e54ec8211944 e54ec8211944 8b8edfc25856 e54ec8211944 8b8edfc25856 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 8b8edfc25856 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 e54ec8211944 8b8edfc25856 | .. _subrepos:
=============================================
working with RhodeCode and mercurial subrepos
=============================================
example usage of Subrepos with RhodeCode::
## 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 RhodeCode
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 RhodeCode
cloning repo1 will also clone attached subrepository.
Next we can edit the subrepo data, and push back to RhodeCode. This will update
both of repositories.
see http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
information about subrepositories
|