Mercurial > hg
comparison hgext/mq.py @ 10773:bd36e5c0ccb1
merge with stable
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Fri, 26 Mar 2010 17:09:56 +0100 |
| parents | 68a7b9ed3c71 fe39f0160c74 |
| children | e8611ef6bdfb |
comparison
equal
deleted
inserted
replaced
| 10769:d70ada7e987d | 10773:bd36e5c0ccb1 |
|---|---|
| 2575 | 2575 |
| 2576 qbase = cl.rev(qbasenode) | 2576 qbase = cl.rev(qbasenode) |
| 2577 start = lrev + 1 | 2577 start = lrev + 1 |
| 2578 if start < qbase: | 2578 if start < qbase: |
| 2579 # update the cache (excluding the patches) and save it | 2579 # update the cache (excluding the patches) and save it |
| 2580 self._updatebranchcache(partial, lrev + 1, qbase) | 2580 ctxgen = (self[r] for r in xrange(lrev + 1, qbase)) |
| 2581 self._updatebranchcache(partial, ctxgen) | |
| 2581 self._writebranchcache(partial, cl.node(qbase - 1), qbase - 1) | 2582 self._writebranchcache(partial, cl.node(qbase - 1), qbase - 1) |
| 2582 start = qbase | 2583 start = qbase |
| 2583 # if start = qbase, the cache is as updated as it should be. | 2584 # if start = qbase, the cache is as updated as it should be. |
| 2584 # if start > qbase, the cache includes (part of) the patches. | 2585 # if start > qbase, the cache includes (part of) the patches. |
| 2585 # we might as well use it, but we won't save it. | 2586 # we might as well use it, but we won't save it. |
| 2586 | 2587 |
| 2587 # update the cache up to the tip | 2588 # update the cache up to the tip |
| 2588 self._updatebranchcache(partial, start, len(cl)) | 2589 ctxgen = (self[r] for r in xrange(start, len(cl))) |
| 2590 self._updatebranchcache(partial, ctxgen) | |
| 2589 | 2591 |
| 2590 return partial | 2592 return partial |
| 2591 | 2593 |
| 2592 if repo.local(): | 2594 if repo.local(): |
| 2593 repo.__class__ = mqrepo | 2595 repo.__class__ = mqrepo |