Mercurial > evolve
comparison hgext/obsolete.py @ 344:9bbcd2746898 stable 0.4.0
obsolete: fix bug in detection of remote obsolete support
We were checking again local...
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Fri, 06 Jul 2012 18:32:10 +0200 |
| parents | 7653f80fd7a4 |
| children | afbe4fc8de42 b836862d48b4 |
comparison
equal
deleted
inserted
replaced
| 341:7653f80fd7a4 | 344:9bbcd2746898 |
|---|---|
| 1132 | 1132 |
| 1133 def push(self, remote, *args, **opts): | 1133 def push(self, remote, *args, **opts): |
| 1134 """wrapper around pull that pull obsolete relation""" | 1134 """wrapper around pull that pull obsolete relation""" |
| 1135 self._turn_extinct_secret() | 1135 self._turn_extinct_secret() |
| 1136 result = opush(remote, *args, **opts) | 1136 result = opush(remote, *args, **opts) |
| 1137 if 'obsolete' in self.listkeys('namespaces') and self.obsstore: | 1137 if 'obsolete' in remote.listkeys('namespaces') and self.obsstore: |
| 1138 data = self.obsstore._writemarkers() | 1138 data = self.obsstore._writemarkers() |
| 1139 r = remote.pushkey('obsolete', 'dump', '', | 1139 r = remote.pushkey('obsolete', 'dump', '', |
| 1140 base85.b85encode(data)) | 1140 base85.b85encode(data)) |
| 1141 if not r: | 1141 if not r: |
| 1142 self.ui.warn(_('failed to push obsolete markers!\n')) | 1142 self.ui.warn(_('failed to push obsolete markers!\n')) |