Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/context.py @ 4640:178778ca648f
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 20 Jun 2007 00:22:51 +0200 |
| parents | 63b9d2deed48 3c7fc13c4bfa |
| children | 6b2e8cb39583 |
comparison
equal
deleted
inserted
replaced
| 4635:63b9d2deed48 | 4640:178778ca648f |
|---|---|
| 289 # count how many times we'll use this | 289 # count how many times we'll use this |
| 290 needed[p] += 1 | 290 needed[p] += 1 |
| 291 | 291 |
| 292 # sort by revision (per file) which is a topological order | 292 # sort by revision (per file) which is a topological order |
| 293 visit = [] | 293 visit = [] |
| 294 files.reverse() | |
| 295 for f in files: | 294 for f in files: |
| 296 fn = [(n._filerev, n) for n in needed.keys() if n._path == f] | 295 fn = [(n.rev(), n) for n in needed.keys() if n._path == f] |
| 297 fn.sort() | |
| 298 visit.extend(fn) | 296 visit.extend(fn) |
| 297 visit.sort() | |
| 299 hist = {} | 298 hist = {} |
| 300 | 299 |
| 301 for r, f in visit: | 300 for r, f in visit: |
| 302 curr = decorate(f.data(), f) | 301 curr = decorate(f.data(), f) |
| 303 for p in parents(f): | 302 for p in parents(f): |