##// END OF EJS Templates
push: feed pushoperation object to _pushbookmark function...
Pierre-Yves David -
r20431:bebf8b84 default
parent child Browse files
Show More
@@ -255,13 +255,16 b' def push(repo, remote, force=False, revs'
255 if locallock is not None:
255 if locallock is not None:
256 locallock.release()
256 locallock.release()
257
257
258 _pushbookmark(pushop.ui, unfi, pushop.remote, pushop.revs)
258 _pushbookmark(pushop)
259 return ret
259 return ret
260
260
261 def _pushbookmark(ui, repo, remote, revs):
261 def _pushbookmark(pushop):
262 """Update bookmark position on remote"""
262 """Update bookmark position on remote"""
263 ui = pushop.ui
264 repo = pushop.repo.unfiltered()
265 remote = pushop.remote
263 ui.debug("checking for updated bookmarks\n")
266 ui.debug("checking for updated bookmarks\n")
264 revnums = map(repo.changelog.rev, revs or [])
267 revnums = map(repo.changelog.rev, pushop.revs or [])
265 ancestors = [a for a in repo.changelog.ancestors(revnums, inclusive=True)]
268 ancestors = [a for a in repo.changelog.ancestors(revnums, inclusive=True)]
266 (addsrc, adddst, advsrc, advdst, diverge, differ, invalid
269 (addsrc, adddst, advsrc, advdst, diverge, differ, invalid
267 ) = bookmarks.compare(repo, repo._bookmarks, remote.listkeys('bookmarks'),
270 ) = bookmarks.compare(repo, repo._bookmarks, remote.listkeys('bookmarks'),
General Comments 0
You need to be logged in to leave comments. Login now