def CMDmerge(args):
"""Reads and merges the data from the trace back into the original .isolate.
Ignores --outdir.
"""
parser = OptionParserIsolate(command='merge', require_result=False)
options, _ = parser.parse_args(args)
complete_state = load_complete_state(options, NO_INFO)
value = read(complete_state)
# Now take that data and union it into the original .isolate file.
with open(complete_state.saved_state.isolate_file, 'r') as f:
prev_content = f.read()
prev_config = merge_isolate.load_gyp(
merge_isolate.eval_content(prev_content),
merge_isolate.extract_comment(prev_content),
merge_isolate.DEFAULT_OSES)
new_config = merge_isolate.load_gyp(
value,
'',
merge_isolate.DEFAULT_OSES)
config = merge_isolate.union(prev_config, new_config)
# pylint: disable=E1103
data = merge_isolate.convert_map_to_gyp(
*merge_isolate.reduce_inputs(*merge_isolate.invert_map(config.flatten())))
print 'Updating %s' % complete_state.saved_state.isolate_file
with open(complete_state.saved_state.isolate_file, 'wb') as f:
merge_isolate.print_all(config.file_comment, data, f)
return 0
def test_reduce_inputs(self):
values = {
'command': {
('echo', 'Hello World'):
set(['atari']),
('echo', 'You should get an Atari'):
set(['amiga', 'coleco', 'dendy']),
},
KEY_TRACKED: {
'a': set(['amiga', 'atari', 'coleco', 'dendy']),
'c': set(['atari']),
'e': set(['amiga', 'coleco', 'dendy']),
'g': set(['amiga']),
'x': set(['amiga', 'atari', 'coleco', 'dendy']),
},
KEY_UNTRACKED: {
'b': set(['amiga', 'atari', 'coleco', 'dendy']),
'd': set(['atari']),
'f': set(['amiga', 'coleco', 'dendy']),
'h': set(['amiga', 'atari', 'dendy']),
},
'read_only': {
None: set(['coleco', 'dendy']),
False: set(['amiga']),
True: set(['atari']),
},
}
oses = set(['amiga', 'atari', 'coleco', 'dendy'])
expected_values = {
'command': {
('echo', 'Hello World'): set(['atari']),
('echo', 'You should get an Atari'): set(['!atari']),
},
KEY_TRACKED: {
'a': set([None]),
'c': set(['atari']),
'e': set(['!atari']),
'g': set(['amiga']),
'x': set([None]),
},
KEY_UNTRACKED: {
'b': set([None]),
'd': set(['atari']),
'f': set(['!atari']),
'h': set(['!coleco']),
},
'read_only': {
None: set(['coleco', 'dendy']),
False: set(['amiga']),
True: set(['atari']),
},
}
actual_values, actual_oses = merge_isolate.reduce_inputs(values, oses)
self.assertEquals(expected_values, actual_values)
self.assertEquals(oses, actual_oses)
def test_reduce_inputs(self):
values = {
'command': {
('echo', 'Hello World'): set(['atari']),
('echo', 'You should get an Atari'): set(['amiga', 'coleco', 'dendy']),
},
KEY_TRACKED: {
'a': set(['amiga', 'atari', 'coleco', 'dendy']),
'c': set(['atari']),
'e': set(['amiga', 'coleco', 'dendy']),
'g': set(['amiga']),
'x': set(['amiga', 'atari', 'coleco', 'dendy']),
},
KEY_UNTRACKED: {
'b': set(['amiga', 'atari', 'coleco', 'dendy']),
'd': set(['atari']),
'f': set(['amiga', 'coleco', 'dendy']),
'h': set(['amiga', 'atari', 'dendy']),
},
'read_only': {
None: set(['coleco', 'dendy']),
False: set(['amiga']),
True: set(['atari']),
},
}
oses = set(['amiga', 'atari', 'coleco', 'dendy'])
expected_values = {
'command': {
('echo', 'Hello World'): set(['atari']),
('echo', 'You should get an Atari'): set(['!atari']),
},
KEY_TRACKED: {
'a': set([None]),
'c': set(['atari']),
'e': set(['!atari']),
'g': set(['amiga']),
'x': set([None]),
},
KEY_UNTRACKED: {
'b': set([None]),
'd': set(['atari']),
'f': set(['!atari']),
'h': set(['!coleco']),
},
'read_only': {
None: set(['coleco', 'dendy']),
False: set(['amiga']),
True: set(['atari']),
},
}
actual_values, actual_oses = merge_isolate.reduce_inputs(values, oses)
self.assertEquals(expected_values, actual_values)
self.assertEquals(oses, actual_oses)
def test_merge_three_conditions(self):
values = {
'linux': {
'isolate_dependency_tracked': ['file_common', 'file_linux'],
},
'mac': {
'isolate_dependency_tracked': ['file_common', 'file_mac'],
},
'win': {
'isolate_dependency_tracked': ['file_common', 'file_win'],
},
}
expected = {
'variables': {
'isolate_dependency_tracked': [
'file_common',
],
},
'conditions': [
[
'OS=="linux"', {
'variables': {
'isolate_dependency_tracked': [
'file_linux',
],
},
}
],
[
'OS=="mac"', {
'variables': {
'isolate_dependency_tracked': [
'file_mac',
],
},
}
],
[
'OS=="win"', {
'variables': {
'isolate_dependency_tracked': [
'file_win',
],
},
}
],
],
}
actual = merge_isolate.convert_map_to_gyp(*merge_isolate.reduce_inputs(
*merge_isolate.invert_map(values)))
self.assertEquals(expected, actual)
def test_merge_three_conditions(self):
values = {
'linux': {
'isolate_dependency_tracked': ['file_common', 'file_linux'],
},
'mac': {
'isolate_dependency_tracked': ['file_common', 'file_mac'],
},
'win': {
'isolate_dependency_tracked': ['file_common', 'file_win'],
},
}
expected = {
'variables': {
'isolate_dependency_tracked': [
'file_common',
],
},
'conditions': [
['OS=="linux"', {
'variables': {
'isolate_dependency_tracked': [
'file_linux',
],
},
}],
['OS=="mac"', {
'variables': {
'isolate_dependency_tracked': [
'file_mac',
],
},
}],
['OS=="win"', {
'variables': {
'isolate_dependency_tracked': [
'file_win',
],
},
}],
],
}
actual = merge_isolate.convert_map_to_gyp(*merge_isolate.reduce_inputs(
*merge_isolate.invert_map(values)))
self.assertEquals(expected, actual)
def test_merge_empty(self):
actual = merge_isolate.convert_map_to_gyp(*merge_isolate.reduce_inputs(
*merge_isolate.invert_map({})))
self.assertEquals({}, actual)
def test_merge_empty(self):
actual = merge_isolate.convert_map_to_gyp(*merge_isolate.reduce_inputs(
*merge_isolate.invert_map({})))
self.assertEquals({}, actual)
