From 3802a9b29838faa5d595c95d00e1e82645bdc650 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Oct 23 2016 16:08:26 +0000 Subject: Added flag for issue offset, that way we can import issue to pagure even when the pagure project already contains issues --- diff --git a/pagure_importer/commands/fedorahosted.py b/pagure_importer/commands/fedorahosted.py index 923b363..17b21f6 100644 --- a/pagure_importer/commands/fedorahosted.py +++ b/pagure_importer/commands/fedorahosted.py @@ -14,7 +14,9 @@ from pagure_importer.utils.fas import FASclient help="FAS username") @click.option('--password', prompt=True, hide_input=True, help="FAS password") -def fedorahosted(project_url, tags, private, username, password): +@click.option('--offset', default=0, + help='Number of issue in pagure before import') +def fedorahosted(project_url, tags, private, username, password, offset): fasclient = FASclient(username, password, 'https://admin.fedoraproject.org/accounts') project_url = project_url + '/login/jsonrpc' @@ -24,8 +26,8 @@ def fedorahosted(project_url, tags, private, username, password): default=1) repo_name = repos[int(repo_index)-1] trac_importer = importer_trac.TracImporter(project_url, username, - password, fasclient, tags, - private) + password, offset, fasclient, + tags, private) trac_importer.import_issues(repo_name=repo_name, repo_folder=REPO_PATH) else: click.echo('No ticket repository found. Use pgimport clone command') diff --git a/pagure_importer/utils/importer_trac.py b/pagure_importer/utils/importer_trac.py index b922593..4a5ab23 100644 --- a/pagure_importer/utils/importer_trac.py +++ b/pagure_importer/utils/importer_trac.py @@ -13,7 +13,7 @@ from pagure_importer.utils.models import User, Issue, IssueComment class TracImporter(): ''' Pagure importer for trac instance ''' - def __init__(self, project_url, username, password, + def __init__(self, project_url, username, password, offset, fasclient=None, tags=False, private=False): ''' Instantiate a TracImporter object ''' @@ -23,6 +23,7 @@ class TracImporter(): self.fas = fasclient self.tags = tags self.private = private + self.offset = offset self.somebody = User(name='somebody', fullname='somebody', emails=['some@body.com']) self.reqid = 0 @@ -144,7 +145,7 @@ class TracImporter(): pagure_issue_is_private = False pagure_issue = Issue( - id=ticket_id, + id=ticket_id + self.offset, title=pagure_issue_title, content=pagure_issue_content, status=issue_status,