##// END OF EJS Templates
Migrate to Mergely 3.3.4....
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

File last commit:

r3976:42bca6fa default
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
hgcompat.py
34 lines | 1.3 KiB | text/x-python | PythonLexer
various fixes for git and mercurial with InMemoryCommit backend and non-ascii files...
r2199 """
Mercurial libs compatibility
"""
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
Moved all Mercurial imports into hgcompat from vcs
r3941 import mercurial
Patch demandimport.enable because of bug introduced...
r3944 import mercurial.demandimport
## patch demandimport, due to bug in mercurial when it allways triggers demandimport.enable()
mercurial.demandimport.enable = lambda *args, **kwargs: 1
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from mercurial import archival, merge as hg_merge, patch, ui
Moved all Mercurial imports into hgcompat from vcs
r3941 from mercurial import discovery
from mercurial import localrepo
Mads Kiilerich
unionrepo: update for Mercurial 2.6
r3976 from mercurial import unionrepo
Moved all Mercurial imports into hgcompat from vcs
r3941 from mercurial import scmutil
from mercurial import config
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from mercurial.commands import clone, nullid, pull
from mercurial.context import memctx, memfilectx
from mercurial.error import RepoError, RepoLookupError, Abort
Moved all Mercurial imports into hgcompat from vcs
r3941 from mercurial.hgweb import hgweb_mod
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from mercurial.hgweb.common import get_contact
from mercurial.localrepo import localrepository
from mercurial.match import match
from mercurial.mdiff import diffopts
from mercurial.node import hex
white space cleanup
r2207 from mercurial.encoding import tolocal
White space cleanup
r2815 from mercurial.discovery import findcommonoutgoing
Use lower level API from mercurial when doing a pull
r3877 from mercurial.hg import peer
Moved all Mercurial imports into hgcompat from vcs
r3941 from mercurial.httppeer import httppeer
synced vcs with upstream...
r3797 from mercurial.util import url as hg_url
Moved all Mercurial imports into hgcompat from vcs
r3941 from mercurial.scmutil import revrange
from mercurial.node import nullrev
synced vcs with upstream...
r3797
# those authnadlers are patched for python 2.6.5 bug an
# infinit looping when given invalid resources
from mercurial.url import httpbasicauthhandler, httpdigestauthhandler