Mercurial > public > mercurial-scm > hg
comparison mercurial/obsolete.py @ 17537:31f32a96e1e3
Merge spelling fixes
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Tue, 11 Sep 2012 08:36:09 -0700 |
| parents | f85816af6294 a736e1e15e46 |
| children | 0496d4f73cf4 |
comparison
equal
deleted
inserted
replaced
| 17475:63e45aee46d4 | 17537:31f32a96e1e3 |
|---|---|
| 224 self._load(new) | 224 self._load(new) |
| 225 # new marker *may* have changed several set. invalidate the cache. | 225 # new marker *may* have changed several set. invalidate the cache. |
| 226 self.caches.clear() | 226 self.caches.clear() |
| 227 return len(new) | 227 return len(new) |
| 228 | 228 |
| 229 def mergemarkers(self, transation, data): | 229 def mergemarkers(self, transaction, data): |
| 230 markers = _readmarkers(data) | 230 markers = _readmarkers(data) |
| 231 self.add(transation, markers) | 231 self.add(transaction, markers) |
| 232 | 232 |
| 233 def _load(self, markers): | 233 def _load(self, markers): |
| 234 for mark in markers: | 234 for mark in markers: |
| 235 self._all.append(mark) | 235 self._all.append(mark) |
| 236 pre, sucs = mark[:2] | 236 pre, sucs = mark[:2] |
| 318 yield marker(ctx._repo, data) | 318 yield marker(ctx._repo, data) |
| 319 | 319 |
| 320 def anysuccessors(obsstore, node): | 320 def anysuccessors(obsstore, node): |
| 321 """Yield every successor of <node> | 321 """Yield every successor of <node> |
| 322 | 322 |
| 323 This is a linear yield unsuitable to detect split changesets.""" | 323 This is a linear yield unsuited to detecting split changesets.""" |
| 324 remaining = set([node]) | 324 remaining = set([node]) |
| 325 seen = set(remaining) | 325 seen = set(remaining) |
| 326 while remaining: | 326 while remaining: |
| 327 current = remaining.pop() | 327 current = remaining.pop() |
| 328 yield current | 328 yield current |