| durin42 | |
| pulkit |
| hg-reviewers |
Part of the ongoing effort to move narrow into core.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowmerge.py (35 lines) | |||
| M | mercurial/merge.py (32 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # narrowmerge.py - extensions to mercurial merge module to support narrow clones | # narrowmerge.py - extensions to mercurial merge module to support narrow clones | ||||
| # | # | ||||
| # Copyright 2017 Google, Inc. | # Copyright 2017 Google, Inc. | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from mercurial.i18n import _ | |||||
| from mercurial import ( | from mercurial import ( | ||||
| copies, | copies, | ||||
| error, | |||||
| extensions, | extensions, | ||||
| merge, | merge, | ||||
| ) | ) | ||||
| def setup(): | def setup(): | ||||
| def _manifestmerge(orig, repo, wctx, p2, pa, branchmerge, *args, **kwargs): | |||||
| """Filter updates to only lay out files that match the narrow spec.""" | |||||
| actions, diverge, renamedelete = orig( | |||||
| repo, wctx, p2, pa, branchmerge, *args, **kwargs) | |||||
| narrowmatch = repo.narrowmatch() | |||||
| if narrowmatch.always(): | |||||
| return actions, diverge, renamedelete | |||||
| nooptypes = set(['k']) # TODO: handle with nonconflicttypes | |||||
| nonconflicttypes = set('a am c cm f g r e'.split()) | |||||
| # We mutate the items in the dict during iteration, so iterate | |||||
| # over a copy. | |||||
| for f, action in list(actions.items()): | |||||
| if narrowmatch(f): | |||||
| pass | |||||
| elif not branchmerge: | |||||
| del actions[f] # just updating, ignore changes outside clone | |||||
| elif action[0] in nooptypes: | |||||
| del actions[f] # merge does not affect file | |||||
| elif action[0] in nonconflicttypes: | |||||
| raise error.Abort(_('merge affects file \'%s\' outside narrow, ' | |||||
| 'which is not yet supported') % f, | |||||
| hint=_('merging in the other direction ' | |||||
| 'may work')) | |||||
| else: | |||||
| raise error.Abort(_('conflict in file \'%s\' is outside ' | |||||
| 'narrow clone') % f) | |||||
| return actions, diverge, renamedelete | |||||
| extensions.wrapfunction(merge, 'manifestmerge', _manifestmerge) | |||||
| def _checkcollision(orig, repo, wmf, actions): | def _checkcollision(orig, repo, wmf, actions): | ||||
| narrowmatch = repo.narrowmatch() | narrowmatch = repo.narrowmatch() | ||||
| if not narrowmatch.always(): | if not narrowmatch.always(): | ||||
| wmf = wmf.matches(narrowmatch) | wmf = wmf.matches(narrowmatch) | ||||
| if actions: | if actions: | ||||
| narrowactions = {} | narrowactions = {} | ||||
| for m, actionsfortype in actions.iteritems(): | for m, actionsfortype in actions.iteritems(): | ||||
| narrowactions[m] = [] | narrowactions[m] = [] | ||||
| remoteconflicts.remove(p) | remoteconflicts.remove(p) | ||||
| break | break | ||||
| if invalidconflicts: | if invalidconflicts: | ||||
| for p in invalidconflicts: | for p in invalidconflicts: | ||||
| repo.ui.warn(_("%s: is both a file and a directory\n") % p) | repo.ui.warn(_("%s: is both a file and a directory\n") % p) | ||||
| raise error.Abort(_("destination manifest contains path conflicts")) | raise error.Abort(_("destination manifest contains path conflicts")) | ||||
| def _filternarrowactions(narrowmatch, branchmerge, actions): | |||||
| """ | |||||
| Filters out actions that can ignored because the repo is narrowed. | |||||
| Raise an exception if the merge cannot be completed because the repo is | |||||
| narrowed. | |||||
| """ | |||||
| nooptypes = set(['k']) # TODO: handle with nonconflicttypes | |||||
| nonconflicttypes = set('a am c cm f g r e'.split()) | |||||
| # We mutate the items in the dict during iteration, so iterate | |||||
| # over a copy. | |||||
| for f, action in list(actions.items()): | |||||
| if narrowmatch(f): | |||||
| pass | |||||
| elif not branchmerge: | |||||
| del actions[f] # just updating, ignore changes outside clone | |||||
| elif action[0] in nooptypes: | |||||
| del actions[f] # merge does not affect file | |||||
| elif action[0] in nonconflicttypes: | |||||
| raise error.Abort(_('merge affects file \'%s\' outside narrow, ' | |||||
| 'which is not yet supported') % f, | |||||
| hint=_('merging in the other direction ' | |||||
| 'may work')) | |||||
| else: | |||||
| raise error.Abort(_('conflict in file \'%s\' is outside ' | |||||
| 'narrow clone') % f) | |||||
| def manifestmerge(repo, wctx, p2, pa, branchmerge, force, matcher, | def manifestmerge(repo, wctx, p2, pa, branchmerge, force, matcher, | ||||
| acceptremote, followcopies, forcefulldiff=False): | acceptremote, followcopies, forcefulldiff=False): | ||||
| """ | """ | ||||
| Merge wctx and p2 with ancestor pa and generate merge action list | Merge wctx and p2 with ancestor pa and generate merge action list | ||||
| branchmerge and force are as passed in to update | branchmerge and force are as passed in to update | ||||
| matcher = matcher to filter file lists | matcher = matcher to filter file lists | ||||
| acceptremote = accept the incoming changes without prompting | acceptremote = accept the incoming changes without prompting | ||||
| actions[f] = (ACTION_DELETED_CHANGED, | actions[f] = (ACTION_DELETED_CHANGED, | ||||
| (None, f, f, False, pa.node()), | (None, f, f, False, pa.node()), | ||||
| 'prompt deleted/changed') | 'prompt deleted/changed') | ||||
| if repo.ui.configbool('experimental', 'merge.checkpathconflicts'): | if repo.ui.configbool('experimental', 'merge.checkpathconflicts'): | ||||
| # If we are merging, look for path conflicts. | # If we are merging, look for path conflicts. | ||||
| checkpathconflicts(repo, wctx, p2, actions) | checkpathconflicts(repo, wctx, p2, actions) | ||||
| narrowmatch = repo.narrowmatch() | |||||
| if not narrowmatch.always(): | |||||
| # Updates "actions" in place | |||||
| _filternarrowactions(narrowmatch, branchmerge, actions) | |||||
| return actions, diverge, renamedelete | return actions, diverge, renamedelete | ||||
| def _resolvetrivial(repo, wctx, mctx, ancestor, actions): | def _resolvetrivial(repo, wctx, mctx, ancestor, actions): | ||||
| """Resolves false conflicts where the nodeid changed but the content | """Resolves false conflicts where the nodeid changed but the content | ||||
| remained the same.""" | remained the same.""" | ||||
| # We force a copy of actions.items() because we're going to mutate | # We force a copy of actions.items() because we're going to mutate | ||||
| # actions as we resolve trivial conflicts. | # actions as we resolve trivial conflicts. | ||||
| for f, (m, args, msg) in list(actions.items()): | for f, (m, args, msg) in list(actions.items()): | ||||