Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 16701:34c30506dd4e
cmdutil: use filectx.cmp() in amend()
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sun, 13 May 2012 13:19:46 +0200 |
parents | d947e1da1259 |
children | 5088d0b9a9a1 |
comparison
equal
deleted
inserted
replaced
16700:28001e8a5149 | 16701:34c30506dd4e |
---|---|
1343 def samefile(f): | 1343 def samefile(f): |
1344 if f in ctx.manifest(): | 1344 if f in ctx.manifest(): |
1345 a = ctx.filectx(f) | 1345 a = ctx.filectx(f) |
1346 if f in base.manifest(): | 1346 if f in base.manifest(): |
1347 b = base.filectx(f) | 1347 b = base.filectx(f) |
1348 return (a.data() == b.data() | 1348 return (not a.cmp(b) |
1349 and a.flags() == b.flags()) | 1349 and a.flags() == b.flags()) |
1350 else: | 1350 else: |
1351 return False | 1351 return False |
1352 else: | 1352 else: |
1353 return f not in base.manifest() | 1353 return f not in base.manifest() |