From 4792912cecf52d63fdcc89e6f852e3a32f37c49c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 4 May 2020 19:48:13 +0100 Subject: lorry,{g,}zip-importer: Move top-level code into functions Split the top-level code of each script into: * export: Exports a single file to a 'git fast-import' pipe * main: Spawns 'git fast-import' and calls export for each file --- lorry.zip-importer | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'lorry.zip-importer') diff --git a/lorry.zip-importer b/lorry.zip-importer index c1b511c..7eca8f6 100755 --- a/lorry.zip-importer +++ b/lorry.zip-importer @@ -17,21 +17,17 @@ import time from zipfile import ZipFile -if len(sys.argv) < 2: - print('usage:', sys.argv[0], '...') - sys.exit(1) - branch_name = 'master' branch_ref = 'refs/heads/%s' % branch_name committer_name = 'Lorry Zip Importer' committer_email = 'lorry-zip-importer@lorry' -fast_import = os.popen('git fast-import --quiet', 'w') -def printlines(list): - for str in list: - fast_import.write(str + "\n") -for zipfile in sys.argv[1:]: +def export(zipfile, fast_import): + def printlines(list): + for str in list: + fast_import.write(str + "\n") + commit_time = 0 next_mark = 1 common_prefix = None @@ -77,5 +73,17 @@ for zipfile in sys.argv[1:]: 'from ' + branch_ref, 'tagger ' + committer, \ 'data <...') + sys.exit(1) + + fast_import = os.popen('git fast-import --quiet', 'w') + for zipfile in sys.argv[1:]: + export(zipfile, fast_import) + if fast_import.close(): + sys.exit(1) + + +main() -- cgit v1.2.1