summaryrefslogtreecommitdiffstats
path: root/xmldiff.py
diff options
context:
space:
mode:
authorEduardo Pedroni <eduardo.pedroni@ch.abb.com>2019-03-08 13:48:19 +0000
committerEduardo Pedroni <eduardo.pedroni@ch.abb.com>2019-03-08 13:48:19 +0000
commitc3008dc261f94e9993114d4bb825cb57ade43589 (patch)
treeb3a849f7780cef651443966fa19ebdcfbe864aac /xmldiff.py
parent976040831c81dea5c8e0b8249ef6e681d7ee6d5c (diff)
Changed output to show the file name instead of ours and theirsHEADmaster
Diffstat (limited to 'xmldiff.py')
-rw-r--r--xmldiff.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/xmldiff.py b/xmldiff.py
index 3449053..fdeb8b1 100644
--- a/xmldiff.py
+++ b/xmldiff.py
@@ -51,10 +51,10 @@ for key, value in byHandle.items():
for sekey, sevalue in subelements.items():
ensureKey(differences, key, list)
if sevalue[0] is None:
- differences[key].append(sekey + ' only in ours')
+ differences[key].append(sekey + ' only in ' + argv[1])
match = False
elif sevalue[1] is None:
- differences[key].append(sekey + ' only in theirs')
+ differences[key].append(sekey + ' only in ' + argv[2])
match = False
elif sevalue[0] != sevalue[1]:
differences[key].append(sekey + ' differs')
@@ -64,12 +64,12 @@ for key, value in byHandle.items():
results[2].append(key)
# Print results in groups
-print 'Elements only in ours (' + str(len(results[0])) + '):'
+print 'Elements only in ' + argv[1] + ' (' + str(len(results[0])) + '):'
for e in results[0]:
print ' ' + e
print
-print 'Elements only in theirs (' + str(len(results[1])) + '):'
+print 'Elements only in ' + argv[2] + ' (' + str(len(results[1])) + '):'
for e in results[1]:
print ' ' + e