You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2014/02/07 17:23:24 UTC
[1/2] git commit: [#7114] Don't hardcode nbhd prefix
Updated Branches:
refs/heads/master 07e206f1b -> d6fe461e7
[#7114] Don't hardcode nbhd prefix
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/f62e5c96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f62e5c96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f62e5c96
Branch: refs/heads/master
Commit: f62e5c963e9f4fef45635b6cd8b441ad89d072c7
Parents: 07e206f
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Tue Jan 28 21:36:57 2014 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Fri Feb 7 16:23:03 2014 +0000
----------------------------------------------------------------------
Allura/allura/lib/import_api.py | 1 +
ForgeTracker/forgetracker/scripts/import_tracker.py | 10 +++++++---
scripts/allura_import.py | 7 ++++++-
3 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f62e5c96/Allura/allura/lib/import_api.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/import_api.py b/Allura/allura/lib/import_api.py
index 9e383b5..d8159c5 100644
--- a/Allura/allura/lib/import_api.py
+++ b/Allura/allura/lib/import_api.py
@@ -57,6 +57,7 @@ class AlluraImportApiClient(object):
resp = result.read()
return json.loads(resp)
except urllib2.HTTPError, e:
+ e.msg += ' ({0})'.format(url)
if self.verbose:
error_content = e.read()
e.msg += '. Error response:\n' + error_content
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f62e5c96/ForgeTracker/forgetracker/scripts/import_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/scripts/import_tracker.py b/ForgeTracker/forgetracker/scripts/import_tracker.py
index ba8e93f..965fafa 100644
--- a/ForgeTracker/forgetracker/scripts/import_tracker.py
+++ b/ForgeTracker/forgetracker/scripts/import_tracker.py
@@ -28,7 +28,12 @@ log = logging.getLogger(__name__)
def import_tracker(cli, project, tool, import_options, doc_txt,
validate=True, verbose=False, cont=False):
- url = '/rest/p/' + project + '/' + tool
+ from allura import model as M
+ p = M.Project.query.get(shortname=project)
+ url = '/rest/{project_url}/{tool}'.format(
+ project_url=p.url().strip('/'),
+ tool=tool,
+ )
if validate:
url += '/validate_import'
else:
@@ -36,8 +41,7 @@ def import_tracker(cli, project, tool, import_options, doc_txt,
existing_map = {}
if cont:
- existing_tickets = cli.call(
- '/rest/p/' + project + '/' + tool + '/')['tickets']
+ existing_tickets = cli.call(url + '/')['tickets']
for t in existing_tickets:
existing_map[t['ticket_num']] = t['summary']
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f62e5c96/scripts/allura_import.py
----------------------------------------------------------------------
diff --git a/scripts/allura_import.py b/scripts/allura_import.py
index 56bc5d5..63d14f1 100644
--- a/scripts/allura_import.py
+++ b/scripts/allura_import.py
@@ -70,7 +70,12 @@ def main():
def import_forum(cli, project, tool, user_map, doc_txt, validate=True):
- url = '/rest/p/' + project + '/' + tool
+ from allura import model as M
+ p = M.Project.query.get(shortname=project)
+ url = '/rest/{project_url}/{tool}'.format(
+ project_url=p.url().strip('/'),
+ tool=tool,
+ )
if validate:
url += '/validate_import'
print cli.call(url, doc=doc_txt, user_map=json.dumps(user_map))
[2/2] git commit: [#7114] Pass in nbhd instead of querying
Posted by tv...@apache.org.
[#7114] Pass in nbhd instead of querying
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d6fe461e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d6fe461e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d6fe461e
Branch: refs/heads/master
Commit: d6fe461e7961de6e1972196eab8ee5cd2ed85f54
Parents: f62e5c9
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Fri Jan 31 05:51:44 2014 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Fri Feb 7 16:23:04 2014 +0000
----------------------------------------------------------------------
.../forgetracker/scripts/import_tracker.py | 9 ++++---
scripts/allura_import.py | 25 ++++++++++++--------
2 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d6fe461e/ForgeTracker/forgetracker/scripts/import_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/scripts/import_tracker.py b/ForgeTracker/forgetracker/scripts/import_tracker.py
index 965fafa..c991d11 100644
--- a/ForgeTracker/forgetracker/scripts/import_tracker.py
+++ b/ForgeTracker/forgetracker/scripts/import_tracker.py
@@ -27,11 +27,10 @@ log = logging.getLogger(__name__)
def import_tracker(cli, project, tool, import_options, doc_txt,
- validate=True, verbose=False, cont=False):
- from allura import model as M
- p = M.Project.query.get(shortname=project)
- url = '/rest/{project_url}/{tool}'.format(
- project_url=p.url().strip('/'),
+ validate=True, verbose=False, cont=False, neighborhood='p'):
+ url = '/rest/{neighborhood}/{project}/{tool}'.format(
+ neighborhood=neighborhood,
+ project=project,
tool=tool,
)
if validate:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d6fe461e/scripts/allura_import.py
----------------------------------------------------------------------
diff --git a/scripts/allura_import.py b/scripts/allura_import.py
index 63d14f1..270d988 100644
--- a/scripts/allura_import.py
+++ b/scripts/allura_import.py
@@ -60,20 +60,21 @@ def main():
if options.tracker:
import_tracker(
cli, options.project, options.tracker, import_options, options, doc_txt,
- validate=options.validate,
- verbose=options.verbose)
+ validate=options.validate, verbose=options.verbose,
+ neighborhood=options.neighborhood)
elif options.forum:
- import_forum(cli, options.project, options.forum,
- user_map, doc_txt, validate=options.validate)
+ import_forum(cli, options.project, options.forum, user_map, doc_txt,
+ validate=options.validate, neighborhood=options.neighborhood)
elif options.wiki:
- import_wiki(cli, options.project, options.wiki, options, doc_txt)
+ import_wiki(cli, options.project, options.wiki, options, doc_txt,
+ neighborhood=options.neighborhood)
-def import_forum(cli, project, tool, user_map, doc_txt, validate=True):
- from allura import model as M
- p = M.Project.query.get(shortname=project)
- url = '/rest/{project_url}/{tool}'.format(
- project_url=p.url().strip('/'),
+def import_forum(cli, project, tool, user_map, doc_txt, validate=True,
+ neighborhood='p'):
+ url = '/rest/{neighborhood}/{project}/{tool}'.format(
+ neighborhood=neighborhood,
+ project=project,
tool=tool,
)
if validate:
@@ -94,6 +95,9 @@ Import project data dump in JSON format into an Allura project.''')
dest='secret_key', help='Secret key')
optparser.add_option('-p', '--project', dest='project',
help='Project to import to')
+ optparser.add_option('-n', '--neighborhood', dest='neighborhood',
+ help="URL prefix of destination neighborhood (default is 'p')",
+ default='p')
optparser.add_option('-t', '--tracker', dest='tracker',
help='Tracker to import to')
optparser.add_option('-f', '--forum', dest='forum',
@@ -119,6 +123,7 @@ Import project data dump in JSON format into an Allura project.''')
optparser.error("Keys are required")
if not options.project:
optparser.error("Target project is required")
+ options.neighborhood = options.neighborhood.strip('/')
return optparser, options, args