Mercurial > hg > truffle

comparison mxtool/mx.py @ 16086:6eef506c173d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx archive: only print overwrite warning on files
author Bernhard Urban <bernhard.urban@jku.at>
date Thu, 12 Jun 2014 11:39:53 +0200
parents a864a411fad3
children 64e172733061
comparison
equal deleted inserted replaced
16085:0cdce0e2d122 16086:6eef506c173d
100 if not hasattr(zf, '_provenance'): 100 if not hasattr(zf, '_provenance'):
101 zf._provenance = {} 101 zf._provenance = {}
102 existingSource = zf._provenance.get(arcname, None) 102 existingSource = zf._provenance.get(arcname, None)
103 isOverwrite = False 103 isOverwrite = False
104 if existingSource and existingSource != source: 104 if existingSource and existingSource != source:
105 log('warning: ' + self.path + ': avoid overwrite of ' + arcname + '\n new: ' + source + '\n old: ' + existingSource) 105 if arcname[-1] != os.path.sep:
106 log('warning: ' + self.path + ': avoid overwrite of ' + arcname + '\n new: ' + source + '\n old: ' + existingSource)
106 isOverwrite = True 107 isOverwrite = True
107 zf._provenance[arcname] = source 108 zf._provenance[arcname] = source
108 return isOverwrite 109 return isOverwrite
109 110
110 if self.mainClass: 111 if self.mainClass: