Mercurial > hg > truffle

comparison mxtool/mx.py @ 15821:de8296c27680

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx archive: avoid multiple directory entries too
author Bernhard Urban <bernhard.urban@jku.at>
date Wed, 21 May 2014 15:34:35 +0200
parents 2460aed6c899
children 4900010a15d2
comparison
equal deleted inserted replaced
15820:f0127716b881 15821:de8296c27680
98 def overwriteCheck(zf, arcname, source): 98 def overwriteCheck(zf, arcname, source):
99 if not hasattr(zf, '_provenance'): 99 if not hasattr(zf, '_provenance'):
100 zf._provenance = {} 100 zf._provenance = {}
101 existingSource = zf._provenance.get(arcname, None) 101 existingSource = zf._provenance.get(arcname, None)
102 isOverwrite = False 102 isOverwrite = False
103 if existingSource and existingSource != source and not arcname.endswith('/'): 103 if existingSource and existingSource != source:
104 log('warning: ' + self.path + ': overwriting ' + arcname + '\n new: ' + source + '\n old: ' + existingSource) 104 log('warning: ' + self.path + ': overwriting ' + arcname + '\n new: ' + source + '\n old: ' + existingSource)
105 isOverwrite = True 105 isOverwrite = True
106 zf._provenance[arcname] = source 106 zf._provenance[arcname] = source
107 return isOverwrite 107 return isOverwrite
108 108