| Alphare |
| hg-reviewers |
backup seems like an obviously clearer name for something containing
something related to a backup.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/filemerge.py (44 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| return b'\r\n' | return b'\r\n' | ||||
| if b'\r' in data: # Old Mac | if b'\r' in data: # Old Mac | ||||
| return b'\r' | return b'\r' | ||||
| if b'\n' in data: # UNIX | if b'\n' in data: # UNIX | ||||
| return b'\n' | return b'\n' | ||||
| return None # unknown | return None # unknown | ||||
| def _matcheol(file, back): | def _matcheol(file, backup): | ||||
| """Convert EOL markers in a file to match origfile""" | """Convert EOL markers in a file to match origfile""" | ||||
| tostyle = _eoltype(back.data()) # No repo.wread filters? | tostyle = _eoltype(backup.data()) # No repo.wread filters? | ||||
| if tostyle: | if tostyle: | ||||
| data = util.readfile(file) | data = util.readfile(file) | ||||
| style = _eoltype(data) | style = _eoltype(data) | ||||
| if style: | if style: | ||||
| newdata = data.replace(style, tostyle) | newdata = data.replace(style, tostyle) | ||||
| if newdata != data: | if newdata != data: | ||||
| util.writefile(file, newdata) | util.writefile(file, newdata) | ||||
| else: | else: | ||||
| return filectx | return filectx | ||||
| def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None): | def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None): | ||||
| tool, toolpath, binary, symlink, scriptfn = toolconf | tool, toolpath, binary, symlink, scriptfn = toolconf | ||||
| if symlink or fcd.isabsent() or fco.isabsent(): | if symlink or fcd.isabsent() or fco.isabsent(): | ||||
| return 1 | return 1 | ||||
| unused, unused, unused, back = files | unused, unused, unused, backup = files | ||||
| ui = repo.ui | ui = repo.ui | ||||
| validkeep = [b'keep', b'keep-merge3', b'keep-mergediff'] | validkeep = [b'keep', b'keep-merge3', b'keep-mergediff'] | ||||
| # do we attempt to simplemerge first? | # do we attempt to simplemerge first? | ||||
| try: | try: | ||||
| premerge = _toolbool(ui, tool, b"premerge", not binary) | premerge = _toolbool(ui, tool, b"premerge", not binary) | ||||
| r = simplemerge.simplemerge( | r = simplemerge.simplemerge( | ||||
| ui, fcd, fca, fco, quiet=True, label=labels, mode=mode | ui, fcd, fca, fco, quiet=True, label=labels, mode=mode | ||||
| ) | ) | ||||
| if not r: | if not r: | ||||
| ui.debug(b" premerge successful\n") | ui.debug(b" premerge successful\n") | ||||
| return 0 | return 0 | ||||
| if premerge not in validkeep: | if premerge not in validkeep: | ||||
| # restore from backup and try again | # restore from backup and try again | ||||
| _restorebackup(fcd, back) | _restorebackup(fcd, backup) | ||||
| return 1 # continue merging | return 1 # continue merging | ||||
| def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | ||||
| tool, toolpath, binary, symlink, scriptfn = toolconf | tool, toolpath, binary, symlink, scriptfn = toolconf | ||||
| uipathfn = scmutil.getuipathfn(repo) | uipathfn = scmutil.getuipathfn(repo) | ||||
| if symlink: | if symlink: | ||||
| repo.ui.warn( | repo.ui.warn( | ||||
| tool, toolpath, binary, symlink, scriptfn = toolconf | tool, toolpath, binary, symlink, scriptfn = toolconf | ||||
| uipathfn = scmutil.getuipathfn(repo) | uipathfn = scmutil.getuipathfn(repo) | ||||
| if fcd.isabsent() or fco.isabsent(): | if fcd.isabsent() or fco.isabsent(): | ||||
| repo.ui.warn( | repo.ui.warn( | ||||
| _(b'warning: %s cannot merge change/delete conflict for %s\n') | _(b'warning: %s cannot merge change/delete conflict for %s\n') | ||||
| % (tool, uipathfn(fcd.path())) | % (tool, uipathfn(fcd.path())) | ||||
| ) | ) | ||||
| return False, 1, None | return False, 1, None | ||||
| unused, unused, unused, back = files | unused, unused, unused, backup = files | ||||
| localpath = _workingpath(repo, fcd) | localpath = _workingpath(repo, fcd) | ||||
| args = _toolstr(repo.ui, tool, b"args") | args = _toolstr(repo.ui, tool, b"args") | ||||
| with _maketempfiles( | with _maketempfiles( | ||||
| repo, fco, fca, repo.wvfs.join(back.path()), b"$output" in args | repo, fco, fca, repo.wvfs.join(backup.path()), b"$output" in args | ||||
| ) as temppaths: | ) as temppaths: | ||||
| basepath, otherpath, localoutputpath = temppaths | basepath, otherpath, localoutputpath = temppaths | ||||
| outpath = b"" | outpath = b"" | ||||
| mylabel, otherlabel = labels[:2] | mylabel, otherlabel = labels[:2] | ||||
| if len(labels) >= 3: | if len(labels) >= 3: | ||||
| baselabel = labels[2] | baselabel = labels[2] | ||||
| else: | else: | ||||
| baselabel = b'base' | baselabel = b'base' | ||||
| } | } | ||||
| return { | return { | ||||
| b"l": b" [%s]" % labels[0], | b"l": b" [%s]" % labels[0], | ||||
| b"o": b" [%s]" % labels[1], | b"o": b" [%s]" % labels[1], | ||||
| } | } | ||||
| def _restorebackup(fcd, back): | def _restorebackup(fcd, backup): | ||||
| # TODO: Add a workingfilectx.write(otherfilectx) path so we can use | # TODO: Add a workingfilectx.write(otherfilectx) path so we can use | ||||
| # util.copy here instead. | # util.copy here instead. | ||||
| fcd.write(back.data(), fcd.flags()) | fcd.write(backup.data(), fcd.flags()) | ||||
| def _makebackup(repo, ui, wctx, fcd): | def _makebackup(repo, ui, wctx, fcd): | ||||
| """Makes and returns a filectx-like object for ``fcd``'s backup file. | """Makes and returns a filectx-like object for ``fcd``'s backup file. | ||||
| In addition to preserving the user's pre-existing modifications to `fcd` | In addition to preserving the user's pre-existing modifications to `fcd` | ||||
| (if any), the backup is used to undo certain premerges, confirm whether a | (if any), the backup is used to undo certain premerges, confirm whether a | ||||
| merge changed anything, and determine what line endings the new file should | merge changed anything, and determine what line endings the new file should | ||||
| have. | have. | ||||
| Backups only need to be written once since their content doesn't change | Backups only need to be written once since their content doesn't change | ||||
| afterwards. | afterwards. | ||||
| """ | """ | ||||
| if fcd.isabsent(): | if fcd.isabsent(): | ||||
| return None | return None | ||||
| # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset -> | # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset -> | ||||
| # merge -> filemerge). (I suspect the fileset import is the weakest link) | # merge -> filemerge). (I suspect the fileset import is the weakest link) | ||||
| from . import context | from . import context | ||||
| back = scmutil.backuppath(ui, repo, fcd.path()) | backup = scmutil.backuppath(ui, repo, fcd.path()) | ||||
| inworkingdir = back.startswith(repo.wvfs.base) and not back.startswith( | inworkingdir = backup.startswith(repo.wvfs.base) and not backup.startswith( | ||||
| repo.vfs.base | repo.vfs.base | ||||
| ) | ) | ||||
| if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir: | if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir: | ||||
| # If the backup file is to be in the working directory, and we're | # If the backup file is to be in the working directory, and we're | ||||
| # merging in-memory, we must redirect the backup to the memory context | # merging in-memory, we must redirect the backup to the memory context | ||||
| # so we don't disturb the working directory. | # so we don't disturb the working directory. | ||||
| relpath = back[len(repo.wvfs.base) + 1 :] | relpath = backup[len(repo.wvfs.base) + 1 :] | ||||
| wctx[relpath].write(fcd.data(), fcd.flags()) | wctx[relpath].write(fcd.data(), fcd.flags()) | ||||
| return wctx[relpath] | return wctx[relpath] | ||||
| else: | else: | ||||
| # Otherwise, write to wherever path the user specified the backups | # Otherwise, write to wherever path the user specified the backups | ||||
| # should go. We still need to switch based on whether the source is | # should go. We still need to switch based on whether the source is | ||||
| # in-memory so we can use the fast path of ``util.copy`` if both are | # in-memory so we can use the fast path of ``util.copy`` if both are | ||||
| # on disk. | # on disk. | ||||
| if isinstance(fcd, context.overlayworkingfilectx): | if isinstance(fcd, context.overlayworkingfilectx): | ||||
| util.writefile(back, fcd.data()) | util.writefile(backup, fcd.data()) | ||||
| else: | else: | ||||
| a = _workingpath(repo, fcd) | a = _workingpath(repo, fcd) | ||||
| util.copyfile(a, back) | util.copyfile(a, backup) | ||||
| # A arbitraryfilectx is returned, so we can run the same functions on | # A arbitraryfilectx is returned, so we can run the same functions on | ||||
| # the backup context regardless of where it lives. | # the backup context regardless of where it lives. | ||||
| return context.arbitraryfilectx(back, repo=repo) | return context.arbitraryfilectx(backup, repo=repo) | ||||
| @contextlib.contextmanager | @contextlib.contextmanager | ||||
| def _maketempfiles(repo, fco, fca, localpath, uselocalpath): | def _maketempfiles(repo, fco, fca, localpath, uselocalpath): | ||||
| """Writes out `fco` and `fca` as temporary files, and (if uselocalpath) | """Writes out `fco` and `fca` as temporary files, and (if uselocalpath) | ||||
| copies `localpath` to another temporary file, so an external merge tool may | copies `localpath` to another temporary file, so an external merge tool may | ||||
| use them. | use them. | ||||
| """ | """ | ||||
| if onfailure: | if onfailure: | ||||
| if wctx.isinmemory(): | if wctx.isinmemory(): | ||||
| raise error.InMemoryMergeConflictsError( | raise error.InMemoryMergeConflictsError( | ||||
| b'in-memory merge does not support merge conflicts' | b'in-memory merge does not support merge conflicts' | ||||
| ) | ) | ||||
| ui.warn(onfailure % fduipath) | ui.warn(onfailure % fduipath) | ||||
| return True, 1, False | return True, 1, False | ||||
| back = _makebackup(repo, ui, wctx, fcd) | backup = _makebackup(repo, ui, wctx, fcd) | ||||
| files = (None, None, None, back) | files = (None, None, None, backup) | ||||
| r = 1 | r = 1 | ||||
| try: | try: | ||||
| internalmarkerstyle = ui.config(b'ui', b'mergemarkers') | internalmarkerstyle = ui.config(b'ui', b'mergemarkers') | ||||
| if isexternal: | if isexternal: | ||||
| markerstyle = _toolstr(ui, tool, b'mergemarkers') | markerstyle = _toolstr(ui, tool, b'mergemarkers') | ||||
| else: | else: | ||||
| markerstyle = internalmarkerstyle | markerstyle = internalmarkerstyle | ||||
| b'does not support ' | b'does not support ' | ||||
| b'merge conflicts' | b'merge conflicts' | ||||
| ) | ) | ||||
| ui.warn(onfailure % fduipath) | ui.warn(onfailure % fduipath) | ||||
| _onfilemergefailure(ui) | _onfilemergefailure(ui) | ||||
| return True, r, deleted | return True, r, deleted | ||||
| finally: | finally: | ||||
| if not r and back is not None: | if not r and backup is not None: | ||||
| back.remove() | backup.remove() | ||||
| def _haltmerge(): | def _haltmerge(): | ||||
| msg = _(b'merge halted after failed merge (see hg resolve)') | msg = _(b'merge halted after failed merge (see hg resolve)') | ||||
| raise error.InterventionRequired(msg) | raise error.InterventionRequired(msg) | ||||
| def _onfilemergefailure(ui): | def _onfilemergefailure(ui): | ||||
| re.MULTILINE, | re.MULTILINE, | ||||
| ) | ) | ||||
| ) | ) | ||||
| def _check(repo, r, ui, tool, fcd, files): | def _check(repo, r, ui, tool, fcd, files): | ||||
| fd = fcd.path() | fd = fcd.path() | ||||
| uipathfn = scmutil.getuipathfn(repo) | uipathfn = scmutil.getuipathfn(repo) | ||||
| unused, unused, unused, back = files | unused, unused, unused, backup = files | ||||
| if not r and ( | if not r and ( | ||||
| _toolbool(ui, tool, b"checkconflicts") | _toolbool(ui, tool, b"checkconflicts") | ||||
| or b'conflicts' in _toollist(ui, tool, b"check") | or b'conflicts' in _toollist(ui, tool, b"check") | ||||
| ): | ): | ||||
| if hasconflictmarkers(fcd.data()): | if hasconflictmarkers(fcd.data()): | ||||
| r = 1 | r = 1 | ||||
| if ( | if ( | ||||
| not r | not r | ||||
| and not checked | and not checked | ||||
| and ( | and ( | ||||
| _toolbool(ui, tool, b"checkchanged") | _toolbool(ui, tool, b"checkchanged") | ||||
| or b'changed' in _toollist(ui, tool, b"check") | or b'changed' in _toollist(ui, tool, b"check") | ||||
| ) | ) | ||||
| ): | ): | ||||
| if back is not None and not fcd.cmp(back): | if backup is not None and not fcd.cmp(backup): | ||||
| if ui.promptchoice( | if ui.promptchoice( | ||||
| _( | _( | ||||
| b" output file %s appears unchanged\n" | b" output file %s appears unchanged\n" | ||||
| b"was merge successful (yn)?" | b"was merge successful (yn)?" | ||||
| b"$$ &Yes $$ &No" | b"$$ &Yes $$ &No" | ||||
| ) | ) | ||||
| % uipathfn(fd), | % uipathfn(fd), | ||||
| 1, | 1, | ||||
| ): | ): | ||||
| r = 1 | r = 1 | ||||
| if back is not None and _toolbool(ui, tool, b"fixeol"): | if backup is not None and _toolbool(ui, tool, b"fixeol"): | ||||
| _matcheol(_workingpath(repo, fcd), back) | _matcheol(_workingpath(repo, fcd), backup) | ||||
| return r | return r | ||||
| def _workingpath(repo, ctx): | def _workingpath(repo, ctx): | ||||
| return repo.wjoin(ctx.path()) | return repo.wjoin(ctx.path()) | ||||