Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/cmdutil.py @ 4471:736e49292809
addremove: comparing two empty files caused ZeroDivisionError
(found by Giorgos Keramidas)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 01 Jun 2007 16:00:40 +0200 |
| parents | e89f9afc462b |
| children | b2b55acbacdd |
comparison
equal
deleted
inserted
replaced
| 4470:1196998c62e3 | 4471:736e49292809 |
|---|---|
| 158 matches = bdiff.blocks(aa, rr) | 158 matches = bdiff.blocks(aa, rr) |
| 159 for x1,x2,y1,y2 in matches: | 159 for x1,x2,y1,y2 in matches: |
| 160 for line in alines[x1:x2]: | 160 for line in alines[x1:x2]: |
| 161 equal += len(line) | 161 equal += len(line) |
| 162 | 162 |
| 163 myscore = equal*2.0 / (len(aa)+len(rr)) | 163 lengths = len(aa) + len(rr) |
| 164 if myscore >= bestscore: | 164 if lengths: |
| 165 bestname, bestscore = r, myscore | 165 myscore = equal*2.0 / lengths |
| 166 if myscore >= bestscore: | |
| 167 bestname, bestscore = r, myscore | |
| 166 if bestname: | 168 if bestname: |
| 167 yield bestname, a, bestscore | 169 yield bestname, a, bestscore |
| 168 | 170 |
| 169 def addremove(repo, pats=[], opts={}, wlock=None, dry_run=None, | 171 def addremove(repo, pats=[], opts={}, wlock=None, dry_run=None, |
| 170 similarity=None): | 172 similarity=None): |