Mercurial > public > mercurial-scm > hg
comparison mercurial/copies.py @ 9102:bbc78cb1bf15
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 09 Jul 2009 19:49:02 -0500 |
| parents | 3f56055ff1d7 431462bd8478 |
| children | 4c041f1ee1b4 |
comparison
equal
deleted
inserted
replaced
| 9092:9aebeea7ac00 | 9102:bbc78cb1bf15 |
|---|---|
| 118 if len(n) != 20: # in a working context? | 118 if len(n) != 20: # in a working context? |
| 119 if c1.rev() is None: | 119 if c1.rev() is None: |
| 120 return c1.filectx(f) | 120 return c1.filectx(f) |
| 121 return c2.filectx(f) | 121 return c2.filectx(f) |
| 122 return repo.filectx(f, fileid=n) | 122 return repo.filectx(f, fileid=n) |
| 123 ctx = util.cachefunc(makectx) | 123 |
| 124 | 124 ctx = util.lrucachefunc(makectx) |
| 125 copy = {} | 125 copy = {} |
| 126 fullcopy = {} | 126 fullcopy = {} |
| 127 diverge = {} | 127 diverge = {} |
| 128 | 128 |
| 129 def checkcopies(f, m1, m2): | 129 def checkcopies(f, m1, m2): |