equal
deleted
inserted
replaced
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): |