Files
@ aa3b55946089
Branch filter:
Location: kallithea/rhodecode/bin/rhodecode_api.py - annotation
aa3b55946089
4.1 KiB
text/x-python
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
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 | 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 ffd45b185016 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 5a7d52cf084d 7ac09514a178 7ac09514a178 7ac09514a178 94a92bd832c5 5055dd385118 5055dd385118 5055dd385118 ffd45b185016 94a92bd832c5 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 94a92bd832c5 5055dd385118 7ac09514a178 7ac09514a178 5055dd385118 7ac09514a178 7ac09514a178 e487d2a6aa38 5a7d52cf084d 5a7d52cf084d e487d2a6aa38 e487d2a6aa38 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 5055dd385118 7ac09514a178 5055dd385118 94a92bd832c5 94a92bd832c5 7ac09514a178 5055dd385118 7ac09514a178 7ac09514a178 94a92bd832c5 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 5a7d52cf084d 7ac09514a178 955956f4bdda 5a7d52cf084d 5a7d52cf084d 5a7d52cf084d 5a7d52cf084d 955956f4bdda 955956f4bdda 10b4e34841a4 955956f4bdda 955956f4bdda 5a7d52cf084d 5a7d52cf084d 7ac09514a178 8dae2a288339 ffd45b185016 8dae2a288339 ffd45b185016 8dae2a288339 8dae2a288339 8dae2a288339 5a7d52cf084d 5a7d52cf084d 5a7d52cf084d ffd45b185016 ffd45b185016 ffd45b185016 7ac09514a178 7ac09514a178 7ac09514a178 7ac09514a178 | # -*- coding: utf-8 -*-
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
rhodecode.bin.api
~~~~~~~~~~~~~~~~~
Api CLI client for RhodeCode
:created_on: Jun 3, 2012
:author: marcink
:copyright: (c) 2013 RhodeCode GmbH.
:license: GPLv3, see LICENSE for more details.
"""
from __future__ import with_statement
import sys
import argparse
from rhodecode.bin.base import json, api_call, RcConf, FORMAT_JSON, FORMAT_PRETTY
def argparser(argv):
usage = (
"rhodecode-api [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] "
"[--config=CONFIG] [--save-config] "
"METHOD <key:val> <key2:val> ...\n"
"Create config file: rhodecode-api --apikey=<key> --apihost=http://rhodecode.server --save-config"
)
parser = argparse.ArgumentParser(description='RhodeCode API cli',
usage=usage)
## config
group = parser.add_argument_group('config')
group.add_argument('--apikey', help='api access key')
group.add_argument('--apihost', help='api host')
group.add_argument('--config', help='config file')
group.add_argument('--save-config', action='store_true', help='save the given config into a file')
group = parser.add_argument_group('API')
group.add_argument('method', metavar='METHOD', nargs='?', type=str, default=None,
help='API method name to call followed by key:value attributes',
)
group.add_argument('--format', dest='format', type=str,
help='output format default: `%s` can '
'be also `%s`' % (FORMAT_PRETTY, FORMAT_JSON),
default=FORMAT_PRETTY
)
args, other = parser.parse_known_args()
return parser, args, other
def main(argv=None):
"""
Main execution function for cli
:param argv:
"""
if argv is None:
argv = sys.argv
conf = None
parser, args, other = argparser(argv)
api_credentials_given = (args.apikey and args.apihost)
if args.save_config:
if not api_credentials_given:
raise parser.error('--save-config requires --apikey and --apihost')
conf = RcConf(config_location=args.config,
autocreate=True, config={'apikey': args.apikey,
'apihost': args.apihost})
sys.exit()
if not conf:
conf = RcConf(config_location=args.config, autoload=True)
if not conf:
if not api_credentials_given:
parser.error('Could not find config file and missing '
'--apikey or --apihost in params')
apikey = args.apikey or conf['apikey']
apihost = args.apihost or conf['apihost']
method = args.method
# if we don't have method here it's an error
if not method:
parser.error('Please specify method name')
try:
margs = dict(map(lambda s: s.split(':', 1), other))
except Exception:
sys.stderr.write('Error parsing arguments \n')
sys.exit()
if args.format == FORMAT_PRETTY:
print 'Calling method %s => %s' % (method, apihost)
json_resp = api_call(apikey, apihost, method, **margs)
error_prefix = ''
if json_resp['error']:
error_prefix = 'ERROR:'
json_data = json_resp['error']
else:
json_data = json_resp['result']
if args.format == FORMAT_JSON:
print json.dumps(json_data)
elif args.format == FORMAT_PRETTY:
print 'Server response \n%s%s' % (
error_prefix, json.dumps(json_data, indent=4, sort_keys=True)
)
return 0
if __name__ == '__main__':
sys.exit(main(sys.argv))
|