| pulkit |
| hg-reviewers |
Thanks to Yuya for noticing.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| 'headsforactive() only makes sense with an active bookmark') | 'headsforactive() only makes sense with an active bookmark') | ||||
| name = repo._activebookmark.split('@', 1)[0] | name = repo._activebookmark.split('@', 1)[0] | ||||
| heads = [] | heads = [] | ||||
| for mark, n in repo._bookmarks.iteritems(): | for mark, n in repo._bookmarks.iteritems(): | ||||
| if mark.split('@', 1)[0] == name: | if mark.split('@', 1)[0] == name: | ||||
| heads.append(n) | heads.append(n) | ||||
| return heads | return heads | ||||
| def calculateupdate(ui, repo, checkout): | def calculateupdate(ui, repo): | ||||
| '''Return a tuple (activemark, movemarkfrom) indicating the active bookmark | '''Return a tuple (activemark, movemarkfrom) indicating the active bookmark | ||||
| and where to move the active bookmark from, if needed.''' | and where to move the active bookmark from, if needed.''' | ||||
| movemarkfrom = None | checkout, movemarkfrom = None, None | ||||
| if checkout is None: | |||||
| activemark = repo._activebookmark | activemark = repo._activebookmark | ||||
| if isactivewdirparent(repo): | if isactivewdirparent(repo): | ||||
| movemarkfrom = repo['.'].node() | movemarkfrom = repo['.'].node() | ||||
| elif activemark: | elif activemark: | ||||
| ui.status(_("updating to active bookmark %s\n") % activemark) | ui.status(_("updating to active bookmark %s\n") % activemark) | ||||
| checkout = activemark | checkout = activemark | ||||
| return (checkout, movemarkfrom) | return (checkout, movemarkfrom) | ||||
| def update(repo, parents, node): | def update(repo, parents, node): | ||||
| deletefrom = parents | deletefrom = parents | ||||
| marks = repo._bookmarks | marks = repo._bookmarks | ||||
| active = marks.active | active = marks.active | ||||
| if not active: | if not active: | ||||
| return False | return False | ||||
| if bookmarks.isactivewdirparent(repo): | if bookmarks.isactivewdirparent(repo): | ||||
| movemark = repo['.'].node() | movemark = repo['.'].node() | ||||
| return node, movemark, None | return node, movemark, None | ||||
| def _destupdatebook(repo, clean): | def _destupdatebook(repo, clean): | ||||
| """decide on an update destination from active bookmark""" | """decide on an update destination from active bookmark""" | ||||
| # we also move the active bookmark, if any | # we also move the active bookmark, if any | ||||
| node = None | node = None | ||||
| activemark, movemark = bookmarks.calculateupdate(repo.ui, repo, None) | activemark, movemark = bookmarks.calculateupdate(repo.ui, repo) | ||||
| if activemark is not None: | if activemark is not None: | ||||
| node = repo.lookup(activemark) | node = repo.lookup(activemark) | ||||
| return node, movemark, activemark | return node, movemark, activemark | ||||
| def _destupdatebranch(repo, clean): | def _destupdatebranch(repo, clean): | ||||
| """decide on an update destination from current branch | """decide on an update destination from current branch | ||||
| This ignores closed branch heads. | This ignores closed branch heads. | ||||