344. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 7/6/2017 8:22:50 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

344.1 Files compared

#	Location	File	Last Modified
1	OSCIF_CTT_v4_build 1.zip\ISAAC-developer-docs\scripts	pushToAltRemote.py	Wed May 31 03:55:50 2017 UTC
2	OSCIF_CTT_v4_build 1.zip\ISAAC-developer-docs\scripts	pushToAltRemote.py	Mon Jul 3 21:30:12 2017 UTC

344.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	2	130
Changed	1	2
Inserted	0	0
Removed	0	0

344.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

344.4 Active regular expressions

No regular expressions were active.

344.5 Comparison detail

	1	#! /usr/bi n/python
	2	#
	3	# Various git comman ds that Da n uses to fetch from two diffe rent remot es, and th en push co de from on e to the o ther.
	4	#
	5	# Note tha t this scr ipt does N OT push co de from yo ur local d evelopment or master branch an ywhere. I t only
	6	# pushes c ode that h as already been push ed to remo te1/develo p to remot e2/develop , and remo te1/master to remote 2/master.
	7	# Note tha t is will push any l ocal tags, however.
	8	# This cod e also onl y pushes d evelop and master - no other b ranches ar e handled.
	9	#
	10	# Utilize something like this , ahead of time, to cache http s credenti als...
	11	# git con fig --glob al credent ial.helper cache
	12	# git config --global credential .https:// DNS
	13
	14	import sub process
	15
	16
	17	projects = ['ISAAC-d eveloper-d ocs',
	18	'ISAAC ',
	19	'ISAAC -term-conv ert-cpt',
	20	'ISAAC -term-conv ert-cvx',
	21	'ISAAC -term-conv ert-nucc',
	22	'ISAAC -term-conv ert-hl7v3' ,
	23	'ISAAC -term-conv ert-icd10' ,
	24	'ISAAC -term-conv ert-rf2',
	25	'ISAAC -term-conv ert-vhat',
	26	'ISAAC -term-conv ert-loinc' ,
	27	'ISAAC -term-conv ert-mvx',
	28	'ISAAC -term-conv ert-rxnorm ',
	29	'ISAAC -term-conv ert-sopt',
	30	'ISAAC -db-builde r-solor',
	31	'ISAAC -db-builde r-vhat',
	32	'ISAAC -db-builde r-vets',
	33	'ISAAC -fx-gui',
	34	'ISAAC -fx-gui-pa ',
	35	'ISAAC -rest',
	36	'ISAAC -file-tran sfer-utils ',
	37	'rails _common',
	38	'rails _komet',
	39	'rails _prisme',
	40	'VUID- rest',
	41	'apach e_extensio ns',
	42	'aitc_ install']
	43
	44	def git(*a rgs):
	45	re turn subpr ocess.chec k_call(['g it'] + lis t(args))
	46
	47	remoteMast er = 'orig in'
	48	remoteSlav e = 'vadev '
	49
	50	for projec t in proje cts:
	51	pr int("===== ========== ========== =========" )
	52	pr int("Fetch ing Latest from " + project)
	53	gi t("-C", pr oject, "fe tch", remo teMaster, "--tags")
	54	gi t("-C", pr oject, "fe tch", remo teSlave)
	55
	56	if project ! = 'ISAAC-d eveloper-d ocs':
	57	prin t("Pushing develop b ranch from " + remot eMaster + " to " + r emoteSlave )
	58	git( "-C", proj ect, "push ", remoteS lave, remo teMaster + "/develop :refs/head s/develop" )
	59
	60	pr int("Pushi ng master branch fro m " + remo teMaster + " to " + remoteSlav e)
	61	gi t("-C", pr oject, "pu sh", remot eSlave, re moteMaster + "/maste r:refs/hea ds/master" )
	62
	63	pr int("Pushi ng Tags to " + remot eSlave)
	64	gi t("-C", pr oject, "pu sh", remot eSlave, "- -tags")
	65	pr int("===== ========== ========== =========" )
	66	print("");