| durin42 |
| hg-reviewers |
It's just the path, not the nodeid, so "copysource" seems more
appropriate.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/fix.py (4 lines) | |||
| M | hgext/histedit.py (2 lines) | |||
| M | hgext/uncommit.py (2 lines) | |||
| M | mercurial/cmdutil.py (2 lines) | |||
| M | mercurial/context.py (14 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz |
| p1ctx.node() not in replacements and | p1ctx.node() not in replacements and | ||||
| p2ctx.node() not in replacements): | p2ctx.node() not in replacements): | ||||
| return | return | ||||
| def filectxfn(repo, memctx, path): | def filectxfn(repo, memctx, path): | ||||
| if path not in ctx: | if path not in ctx: | ||||
| return None | return None | ||||
| fctx = ctx[path] | fctx = ctx[path] | ||||
| copied = fctx.copysource() | copysource = fctx.copysource() | ||||
| return context.memfilectx( | return context.memfilectx( | ||||
| repo, | repo, | ||||
| memctx, | memctx, | ||||
| path=fctx.path(), | path=fctx.path(), | ||||
| data=filedata.get(path, fctx.data()), | data=filedata.get(path, fctx.data()), | ||||
| islink=fctx.islink(), | islink=fctx.islink(), | ||||
| isexec=fctx.isexec(), | isexec=fctx.isexec(), | ||||
| copied=copied) | copysource=copysource) | ||||
| extra = ctx.extra().copy() | extra = ctx.extra().copy() | ||||
| extra['fix_source'] = ctx.hex() | extra['fix_source'] = ctx.hex() | ||||
| memctx = context.memctx( | memctx = context.memctx( | ||||
| repo, | repo, | ||||
| parents=(newp1node, newp2node), | parents=(newp1node, newp2node), | ||||
| text=ctx.description(), | text=ctx.description(), | ||||
| def filectxfn(repo, ctx, path): | def filectxfn(repo, ctx, path): | ||||
| if path in headmf: | if path in headmf: | ||||
| fctx = lastctx[path] | fctx = lastctx[path] | ||||
| flags = fctx.flags() | flags = fctx.flags() | ||||
| mctx = context.memfilectx(repo, ctx, | mctx = context.memfilectx(repo, ctx, | ||||
| fctx.path(), fctx.data(), | fctx.path(), fctx.data(), | ||||
| islink='l' in flags, | islink='l' in flags, | ||||
| isexec='x' in flags, | isexec='x' in flags, | ||||
| copied=copied.get(path)) | copysource=copied.get(path)) | ||||
| return mctx | return mctx | ||||
| return None | return None | ||||
| if commitopts.get('message'): | if commitopts.get('message'): | ||||
| message = commitopts['message'] | message = commitopts['message'] | ||||
| else: | else: | ||||
| message = firstctx.description() | message = firstctx.description() | ||||
| user = commitopts.get('user') | user = commitopts.get('user') | ||||
| if dst in files) | if dst in files) | ||||
| def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()): | def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()): | ||||
| if path not in contentctx: | if path not in contentctx: | ||||
| return None | return None | ||||
| fctx = contentctx[path] | fctx = contentctx[path] | ||||
| mctx = context.memfilectx(repo, memctx, fctx.path(), fctx.data(), | mctx = context.memfilectx(repo, memctx, fctx.path(), fctx.data(), | ||||
| fctx.islink(), | fctx.islink(), | ||||
| fctx.isexec(), | fctx.isexec(), | ||||
| copied=copied.get(path)) | copysource=copied.get(path)) | ||||
| return mctx | return mctx | ||||
| if not files: | if not files: | ||||
| repo.ui.status(_("note: keeping empty commit\n")) | repo.ui.status(_("note: keeping empty commit\n")) | ||||
| new = context.memctx(repo, | new = context.memctx(repo, | ||||
| parents=[base.node(), node.nullid], | parents=[base.node(), node.nullid], | ||||
| text=ctx.description(), | text=ctx.description(), | ||||
| return None | return None | ||||
| fctx = wctx[path] | fctx = wctx[path] | ||||
| flags = fctx.flags() | flags = fctx.flags() | ||||
| mctx = context.memfilectx(repo, ctx_, | mctx = context.memfilectx(repo, ctx_, | ||||
| fctx.path(), fctx.data(), | fctx.path(), fctx.data(), | ||||
| islink='l' in flags, | islink='l' in flags, | ||||
| isexec='x' in flags, | isexec='x' in flags, | ||||
| copied=copied.get(path)) | copysource=copied.get(path)) | ||||
| return mctx | return mctx | ||||
| except KeyError: | except KeyError: | ||||
| return None | return None | ||||
| else: | else: | ||||
| ui.note(_('copying changeset %s to %s\n') % (old, base)) | ui.note(_('copying changeset %s to %s\n') % (old, base)) | ||||
| # Use version of files as in the old cset | # Use version of files as in the old cset | ||||
| def filectxfn(repo, ctx_, path): | def filectxfn(repo, ctx_, path): | ||||
| def memfilefromctx(ctx): | def memfilefromctx(ctx): | ||||
| """Given a context return a memfilectx for ctx[path] | """Given a context return a memfilectx for ctx[path] | ||||
| This is a convenience method for building a memctx based on another | This is a convenience method for building a memctx based on another | ||||
| context. | context. | ||||
| """ | """ | ||||
| def getfilectx(repo, memctx, path): | def getfilectx(repo, memctx, path): | ||||
| fctx = ctx[path] | fctx = ctx[path] | ||||
| copied = fctx.copysource() | copysource = fctx.copysource() | ||||
| return memfilectx(repo, memctx, path, fctx.data(), | return memfilectx(repo, memctx, path, fctx.data(), | ||||
| islink=fctx.islink(), isexec=fctx.isexec(), | islink=fctx.islink(), isexec=fctx.isexec(), | ||||
| copied=copied) | copysource=copysource) | ||||
| return getfilectx | return getfilectx | ||||
| def memfilefrompatch(patchstore): | def memfilefrompatch(patchstore): | ||||
| """Given a patch (e.g. patchstore object) return a memfilectx | """Given a patch (e.g. patchstore object) return a memfilectx | ||||
| This is a convenience method for building a memctx based on a patchstore. | This is a convenience method for building a memctx based on a patchstore. | ||||
| """ | """ | ||||
| def getfilectx(repo, memctx, path): | def getfilectx(repo, memctx, path): | ||||
| data, mode, copied = patchstore.getfile(path) | data, mode, copysource = patchstore.getfile(path) | ||||
| if data is None: | if data is None: | ||||
| return None | return None | ||||
| islink, isexec = mode | islink, isexec = mode | ||||
| return memfilectx(repo, memctx, path, data, islink=islink, | return memfilectx(repo, memctx, path, data, islink=islink, | ||||
| isexec=isexec, copied=copied) | isexec=isexec, copysource=copysource) | ||||
| return getfilectx | return getfilectx | ||||
| class memctx(committablectx): | class memctx(committablectx): | ||||
| """Use memctx to perform in-memory commits via localrepo.commitctx(). | """Use memctx to perform in-memory commits via localrepo.commitctx(). | ||||
| Revision information is supplied at initialization time while | Revision information is supplied at initialization time while | ||||
| related files data and is made available through a callback | related files data and is made available through a callback | ||||
| return scmutil.status(modified, added, removed, [], [], [], []) | return scmutil.status(modified, added, removed, [], [], [], []) | ||||
| class memfilectx(committablefilectx): | class memfilectx(committablefilectx): | ||||
| """memfilectx represents an in-memory file to commit. | """memfilectx represents an in-memory file to commit. | ||||
| See memctx and committablefilectx for more details. | See memctx and committablefilectx for more details. | ||||
| """ | """ | ||||
| def __init__(self, repo, changectx, path, data, islink=False, | def __init__(self, repo, changectx, path, data, islink=False, | ||||
| isexec=False, copied=None): | isexec=False, copysource=None): | ||||
| """ | """ | ||||
| path is the normalized file path relative to repository root. | path is the normalized file path relative to repository root. | ||||
| data is the file content as a string. | data is the file content as a string. | ||||
| islink is True if the file is a symbolic link. | islink is True if the file is a symbolic link. | ||||
| isexec is True if the file is executable. | isexec is True if the file is executable. | ||||
| copied is the source file path if current file was copied in the | copied is the source file path if current file was copied in the | ||||
| revision being committed, or None.""" | revision being committed, or None.""" | ||||
| super(memfilectx, self).__init__(repo, path, None, changectx) | super(memfilectx, self).__init__(repo, path, None, changectx) | ||||
| self._data = data | self._data = data | ||||
| if islink: | if islink: | ||||
| self._flags = 'l' | self._flags = 'l' | ||||
| elif isexec: | elif isexec: | ||||
| self._flags = 'x' | self._flags = 'x' | ||||
| else: | else: | ||||
| self._flags = '' | self._flags = '' | ||||
| self._copied = None | self._copied = None | ||||
| if copied: | if copysource: | ||||
| self._copied = (copied, nullid) | self._copied = (copysource, nullid) | ||||
| def cmp(self, fctx): | def cmp(self, fctx): | ||||
| return self.data() != fctx.data() | return self.data() != fctx.data() | ||||
| def data(self): | def data(self): | ||||
| return self._data | return self._data | ||||
| def remove(self, ignoremissing=False): | def remove(self, ignoremissing=False): | ||||