Mercurial > evolve
comparison hgext/evolve.py @ 1095:26334cfd4e95
evolve: fix a typo in a long function name
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 29 Aug 2014 16:11:22 +0200 |
| parents | bb2c01cd096f |
| children | 661f3a112f7a |
comparison
equal
deleted
inserted
replaced
| 1094:bb2c01cd096f | 1095:26334cfd4e95 |
|---|---|
| 2473 finally: | 2473 finally: |
| 2474 lock.release() | 2474 lock.release() |
| 2475 repo.hook('evolve_pushobsmarkers') | 2475 repo.hook('evolve_pushobsmarkers') |
| 2476 return wireproto.pushres(0) | 2476 return wireproto.pushres(0) |
| 2477 | 2477 |
| 2478 def _buildpullobsmerkersboundaries(pullop): | 2478 def _buildpullobsmarkersboundaries(pullop): |
| 2479 """small funtion returning the argument for pull markers call | 2479 """small funtion returning the argument for pull markers call |
| 2480 may to contains 'heads' and 'common'. skip the key for None. | 2480 may to contains 'heads' and 'common'. skip the key for None. |
| 2481 | 2481 |
| 2482 Its a separed functio to play around with strategy for that.""" | 2482 Its a separed functio to play around with strategy for that.""" |
| 2483 repo = pullop.repo | 2483 repo = pullop.repo |
| 2507 return orig(pullop) | 2507 return orig(pullop) |
| 2508 if 'obsolete' not in pullop.remote.listkeys('namespaces'): | 2508 if 'obsolete' not in pullop.remote.listkeys('namespaces'): |
| 2509 return None # remote opted out of obsolescence marker exchange | 2509 return None # remote opted out of obsolescence marker exchange |
| 2510 tr = None | 2510 tr = None |
| 2511 ui = pullop.repo.ui | 2511 ui = pullop.repo.ui |
| 2512 boundaries = _buildpullobsmerkersboundaries(pullop) | 2512 boundaries = _buildpullobsmarkersboundaries(pullop) |
| 2513 if not set(boundaries['heads']) - set(boundaries['common']): | 2513 if not set(boundaries['heads']) - set(boundaries['common']): |
| 2514 obsexcmsg(ui, "nothing to pull\n") | 2514 obsexcmsg(ui, "nothing to pull\n") |
| 2515 return None | 2515 return None |
| 2516 | 2516 |
| 2517 obsexcmsg(ui, "pull obsolescence markers\n", True) | 2517 obsexcmsg(ui, "pull obsolescence markers\n", True) |