| quark | |
| durin42 |
| hg-reviewers |
The next patch will pass in overrides for bookmark moves, which is a
mapping itself, so let's rename "mapping" to "replacements" to
distinguish them better.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/scmutil.py (22 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Abandoned | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| def __init__(self, repo, revcontainer): | def __init__(self, repo, revcontainer): | ||||
| self._torev = repo.changelog.rev | self._torev = repo.changelog.rev | ||||
| self._revcontains = revcontainer.__contains__ | self._revcontains = revcontainer.__contains__ | ||||
| def __contains__(self, node): | def __contains__(self, node): | ||||
| return self._revcontains(self._torev(node)) | return self._revcontains(self._torev(node)) | ||||
| def cleanupnodes(repo, mapping, operation): | def cleanupnodes(repo, replacements, operation): | ||||
| """do common cleanups when old nodes are replaced by new nodes | """do common cleanups when old nodes are replaced by new nodes | ||||
| That includes writing obsmarkers or stripping nodes, and moving bookmarks. | That includes writing obsmarkers or stripping nodes, and moving bookmarks. | ||||
| (we might also want to move working directory parent in the future) | (we might also want to move working directory parent in the future) | ||||
| mapping is {oldnode: [newnode]} or a iterable of nodes if they do not have | replacements is {oldnode: [newnode]} or a iterable of nodes if they do not | ||||
| replacements. operation is a string, like "rebase". | have replacements. operation is a string, like "rebase". | ||||
| """ | """ | ||||
| if not util.safehasattr(mapping, 'items'): | if not util.safehasattr(replacements, 'items'): | ||||
| mapping = {n: () for n in mapping} | replacements = {n: () for n in replacements} | ||||
| # Calculate bookmark movements | # Calculate bookmark movements | ||||
| moves = {} | moves = {} | ||||
| # Unfiltered repo is needed since nodes in mapping might be hidden. | # Unfiltered repo is needed since nodes in replacements might be hidden. | ||||
| unfi = repo.unfiltered() | unfi = repo.unfiltered() | ||||
| for oldnode, newnodes in mapping.items(): | for oldnode, newnodes in replacements.items(): | ||||
| if len(newnodes) > 1: | if len(newnodes) > 1: | ||||
| # usually a split, take the one with biggest rev number | # usually a split, take the one with biggest rev number | ||||
| newnode = next(unfi.set('max(%ln)', newnodes)).node() | newnode = next(unfi.set('max(%ln)', newnodes)).node() | ||||
| elif len(newnodes) == 0: | elif len(newnodes) == 0: | ||||
| # move bookmark backwards | # move bookmark backwards | ||||
| roots = list(unfi.set('max((::%n) - %ln)', oldnode, | roots = list(unfi.set('max((::%n) - %ln)', oldnode, | ||||
| list(mapping))) | list(replacements))) | ||||
| if roots: | if roots: | ||||
| newnode = roots[0].node() | newnode = roots[0].node() | ||||
| else: | else: | ||||
| newnode = nullid | newnode = nullid | ||||
| else: | else: | ||||
| newnode = newnodes[0] | newnode = newnodes[0] | ||||
| moves[oldnode] = newnode | moves[oldnode] = newnode | ||||
| with repo.transaction('cleanup') as tr: | with repo.transaction('cleanup') as tr: | ||||
| # Move bookmarks | # Move bookmarks | ||||
| bmarks = repo._bookmarks | bmarks = repo._bookmarks | ||||
| bmarkchanges = [] | bmarkchanges = [] | ||||
| allnewnodes = [n for ns in mapping.values() for n in ns] | allnewnodes = [n for ns in replacements.values() for n in ns] | ||||
| for oldnode, newnode in moves.items(): | for oldnode, newnode in moves.items(): | ||||
| oldbmarks = repo.nodebookmarks(oldnode) | oldbmarks = repo.nodebookmarks(oldnode) | ||||
| if not oldbmarks: | if not oldbmarks: | ||||
| continue | continue | ||||
| from . import bookmarks # avoid import cycle | from . import bookmarks # avoid import cycle | ||||
| repo.ui.debug('moving bookmarks %r from %s to %s\n' % | repo.ui.debug('moving bookmarks %r from %s to %s\n' % | ||||
| (oldbmarks, hex(oldnode), hex(newnode))) | (oldbmarks, hex(oldnode), hex(newnode))) | ||||
| # Delete divergent bookmarks being parents of related newnodes | # Delete divergent bookmarks being parents of related newnodes | ||||
| # unnecessary. That's the "if s or not isobs(n)" check below. | # unnecessary. That's the "if s or not isobs(n)" check below. | ||||
| # Also sort the node in topology order, that might be useful for | # Also sort the node in topology order, that might be useful for | ||||
| # some obsstore logic. | # some obsstore logic. | ||||
| # NOTE: the filtering and sorting might belong to createmarkers. | # NOTE: the filtering and sorting might belong to createmarkers. | ||||
| isobs = unfi.obsstore.successors.__contains__ | isobs = unfi.obsstore.successors.__contains__ | ||||
| torev = unfi.changelog.rev | torev = unfi.changelog.rev | ||||
| sortfunc = lambda ns: torev(ns[0]) | sortfunc = lambda ns: torev(ns[0]) | ||||
| rels = [(unfi[n], tuple(unfi[m] for m in s)) | rels = [(unfi[n], tuple(unfi[m] for m in s)) | ||||
| for n, s in sorted(mapping.items(), key=sortfunc) | for n, s in sorted(replacements.items(), key=sortfunc) | ||||
| if s or not isobs(n)] | if s or not isobs(n)] | ||||
| obsolete.createmarkers(repo, rels, operation=operation) | obsolete.createmarkers(repo, rels, operation=operation) | ||||
| else: | else: | ||||
| from . import repair # avoid import cycle | from . import repair # avoid import cycle | ||||
| repair.delayedstrip(repo.ui, repo, list(mapping), operation) | repair.delayedstrip(repo.ui, repo, list(replacements), operation) | ||||
| def addremove(repo, matcher, prefix, opts=None, dry_run=None, similarity=None): | def addremove(repo, matcher, prefix, opts=None, dry_run=None, similarity=None): | ||||
| if opts is None: | if opts is None: | ||||
| opts = {} | opts = {} | ||||
| m = matcher | m = matcher | ||||
| if dry_run is None: | if dry_run is None: | ||||
| dry_run = opts.get('dry_run') | dry_run = opts.get('dry_run') | ||||
| if similarity is None: | if similarity is None: | ||||