| Alphare |
| hg-reviewers |
The two callers of the local maketempfrompath() function used the
returned file object in the same way. We can reduce duplication by
moving that code into the function.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/filemerge.py (17 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| e4a674cb9768 | c959754116a7 | Martin von Zweigbergk | Feb 15 2022, 1:16 AM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| from .i18n import _ | from .i18n import _ | ||||
| from .node import ( | from .node import ( | ||||
| hex, | hex, | ||||
| short, | short, | ||||
| ) | ) | ||||
| from .pycompat import ( | from .pycompat import ( | ||||
| getattr, | getattr, | ||||
| open, | |||||
| ) | ) | ||||
| from . import ( | from . import ( | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| formatter, | formatter, | ||||
| match, | match, | ||||
| pycompat, | pycompat, | ||||
| @contextlib.contextmanager | @contextlib.contextmanager | ||||
| def _maketempfiles(fco, fca, localpath): | def _maketempfiles(fco, fca, localpath): | ||||
| """Writes out `fco` and `fca` as temporary files, and (if localpath is not | """Writes out `fco` and `fca` as temporary files, and (if localpath is not | ||||
| None) copies `localpath` to another temporary file, so an external merge | None) copies `localpath` to another temporary file, so an external merge | ||||
| tool may use them. | tool may use them. | ||||
| """ | """ | ||||
| tmproot = pycompat.mkdtemp(prefix=b'hgmerge-') | tmproot = pycompat.mkdtemp(prefix=b'hgmerge-') | ||||
| def maketempfrompath(prefix, path): | def maketempfrompath(prefix, path, data): | ||||
| fullbase, ext = os.path.splitext(path) | fullbase, ext = os.path.splitext(path) | ||||
| pre = b"%s~%s" % (os.path.basename(fullbase), prefix) | pre = b"%s~%s" % (os.path.basename(fullbase), prefix) | ||||
| name = os.path.join(tmproot, pre) | name = os.path.join(tmproot, pre) | ||||
| if ext: | if ext: | ||||
| name += ext | name += ext | ||||
| f = open(name, "wb") | util.writefile(name, data) | ||||
| return f, name | return name | ||||
| def tempfromcontext(prefix, ctx): | def tempfromcontext(prefix, ctx): | ||||
| f, name = maketempfrompath(prefix, ctx.path()) | return maketempfrompath(prefix, ctx.path(), ctx.decodeddata()) | ||||
| data = ctx.decodeddata() | |||||
| f.write(data) | |||||
| f.close() | |||||
| return name | |||||
| b = tempfromcontext(b"base", fca) | b = tempfromcontext(b"base", fca) | ||||
| c = tempfromcontext(b"other", fco) | c = tempfromcontext(b"other", fco) | ||||
| d = localpath | d = localpath | ||||
| if localpath is not None: | if localpath is not None: | ||||
| f, d = maketempfrompath(b"local", d) | |||||
| data = util.readfile(localpath) | data = util.readfile(localpath) | ||||
| f.write(data) | d = maketempfrompath(b"local", localpath, data) | ||||
| f.close() | |||||
| try: | try: | ||||
| yield b, c, d | yield b, c, d | ||||
| finally: | finally: | ||||
| shutil.rmtree(tmproot) | shutil.rmtree(tmproot) | ||||
| def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): | def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): | ||||