| hg-reviewers |
We now use contexts first for everything and also pass them everywhere.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # You should have received a copy of the GNU General Public License | # You should have received a copy of the GNU General Public License | ||||
| # along with this program; if not, see <http://www.gnu.org/licenses/>. | # along with this program; if not, see <http://www.gnu.org/licenses/>. | ||||
| # mbp: "you know that thing where cvs gives you conflict markers?" | # mbp: "you know that thing where cvs gives you conflict markers?" | ||||
| # s: "i hate that." | # s: "i hate that." | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import os | |||||
| from .i18n import _ | from .i18n import _ | ||||
| from . import ( | from . import ( | ||||
| error, | error, | ||||
| mdiff, | mdiff, | ||||
| pycompat, | pycompat, | ||||
| util, | util, | ||||
| vfs as vfsmod, | |||||
| ) | ) | ||||
| class CantReprocessAndShowBase(Exception): | class CantReprocessAndShowBase(Exception): | ||||
| pass | pass | ||||
| def intersect(ra, rb): | def intersect(ra, rb): | ||||
| """Given two ranges return the range where they intersect or None. | """Given two ranges return the range where they intersect or None. | ||||
| return [name_a, name_b, name_base] | return [name_a, name_b, name_base] | ||||
| def simplemerge(ui, localfile, basefile, otherfile, | def simplemerge(ui, localfile, basefile, otherfile, | ||||
| localctx=None, basectx=None, otherctx=None, repo=None, **opts): | localctx=None, basectx=None, otherctx=None, repo=None, **opts): | ||||
| """Performs the simplemerge algorithm. | """Performs the simplemerge algorithm. | ||||
| {local|base|other}ctx are optional. If passed, they (local/base/other) will | {local|base|other}ctx are optional. If passed, they (local/base/other) will | ||||
| be read from and the merge result written to (local). You should pass | be read from and the merge result written to (local). You should pass | ||||
| explicit labels in this mode since the default is to use the file paths.""" | explicit labels in this mode since the default is to use the file paths. | ||||
| def readfile(filename): | """ | ||||
| f = open(filename, "rb") | |||||
| text = f.read() | |||||
| f.close() | |||||
| return _verifytext(text, filename, ui, opts) | |||||
| def readctx(ctx): | def readctx(ctx): | ||||
| if not ctx: | if not ctx: | ||||
| return None | return None | ||||
| # Merges were always run in the working copy before, which means | # Merges were always run in the working copy before, which means | ||||
| # they used decoded data, if the user defined any repository | # they used decoded data, if the user defined any repository | ||||
| # filters. | # filters. | ||||
| # | # | ||||
| # Maintain that behavior today for BC, though perhaps in the future | # Maintain that behavior today for BC, though perhaps in the future | ||||
| mode = opts.get('mode','merge') | mode = opts.get('mode','merge') | ||||
| name_a, name_b, name_base = None, None, None | name_a, name_b, name_base = None, None, None | ||||
| if mode != 'union': | if mode != 'union': | ||||
| name_a, name_b, name_base = _picklabels([localctx.path(), | name_a, name_b, name_base = _picklabels([localctx.path(), | ||||
| otherctx.path(), None], | otherctx.path(), None], | ||||
| opts.get('label', [])) | opts.get('label', [])) | ||||
| try: | try: | ||||
| localtext = readctx(localctx) if localctx else readfile(localfile) | localtext = readctx(localctx) | ||||
| basetext = readctx(basectx) if basectx else readfile(basefile) | basetext = readctx(basectx) | ||||
| othertext = readctx(otherctx) if otherctx else readfile(otherfile) | othertext = readctx(otherctx) | ||||
| except error.Abort: | except error.Abort: | ||||
| return 1 | return 1 | ||||
| if opts.get('print'): | if opts.get('print'): | ||||
| out = ui.fout | out = ui.fout | ||||
| elif localctx: | |||||
| out = ctxwriter(localctx) | |||||
| else: | else: | ||||
| localfile = os.path.realpath(localfile) | out = ctxwriter(localctx) | ||||
| opener = vfsmod.vfs(os.path.dirname(localfile)) | |||||
| out = opener(os.path.basename(localfile), "w", atomictemp=True) | |||||
| m3 = Merge3Text(basetext, localtext, othertext) | m3 = Merge3Text(basetext, localtext, othertext) | ||||
| extrakwargs = { | extrakwargs = { | ||||
| "localorother": opts.get("localorother", None), | "localorother": opts.get("localorother", None), | ||||
| 'minimize': True, | 'minimize': True, | ||||
| } | } | ||||
| if mode == 'union': | if mode == 'union': | ||||
| extrakwargs['start_marker'] = None | extrakwargs['start_marker'] = None | ||||