Mercurial > hg-stable
comparison mercurial/exchange.py @ 22240:d092f4b68fb6
push: use stepsdone to control bookmark push
If bookmark are to be integrated in the unified bundle2, we need a way to disable
the old-style push.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 15 Aug 2014 18:40:57 -0700 |
| parents | 0688010ee38f |
| children | ed222ebd61be |
comparison
equal
deleted
inserted
replaced
| 22239:0688010ee38f | 22240:d092f4b68fb6 |
|---|---|
| 631 msg = _('failed to push some obsolete markers!\n') | 631 msg = _('failed to push some obsolete markers!\n') |
| 632 repo.ui.warn(msg) | 632 repo.ui.warn(msg) |
| 633 | 633 |
| 634 def _pushbookmark(pushop): | 634 def _pushbookmark(pushop): |
| 635 """Update bookmark position on remote""" | 635 """Update bookmark position on remote""" |
| 636 if pushop.ret == 0: | 636 if pushop.ret == 0 or 'bookmarks' in pushop.stepsdone: |
| 637 return | 637 return |
| 638 pushop.stepsdone.add('bookmarks') | |
| 638 ui = pushop.ui | 639 ui = pushop.ui |
| 639 remote = pushop.remote | 640 remote = pushop.remote |
| 640 for b, old, new in pushop.outbookmarks: | 641 for b, old, new in pushop.outbookmarks: |
| 641 if remote.pushkey('bookmarks', b, old, new): | 642 if remote.pushkey('bookmarks', b, old, new): |
| 642 ui.status(_("updating bookmark %s\n") % b) | 643 ui.status(_("updating bookmark %s\n") % b) |