Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 34787:754b5117622f
context: add workingfilectx.markcopied
With in-memory merge, copy information needs to be stored in-memory, not in the
dirstate.
To make this transition easy, move the existing dirstate-based approach to
workingfilectx; that way, other implementations can choose to store it
somewhere else.
Differential Revision: https://phab.mercurial-scm.org/D1106
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Sun, 15 Oct 2017 20:36:29 -0700 |
| parents | 9c899660700a |
| children | df2ff314e36f |
comparison
equal
deleted
inserted
replaced
| 34786:9c899660700a | 34787:754b5117622f |
|---|---|
| 1999 | 1999 |
| 2000 with repo.dirstate.parentchange(): | 2000 with repo.dirstate.parentchange(): |
| 2001 repo.setparents(repo['.'].node(), pother) | 2001 repo.setparents(repo['.'].node(), pother) |
| 2002 repo.dirstate.write(repo.currenttransaction()) | 2002 repo.dirstate.write(repo.currenttransaction()) |
| 2003 # fix up dirstate for copies and renames | 2003 # fix up dirstate for copies and renames |
| 2004 copies.duplicatecopies(repo, ctx.rev(), pctx.rev()) | 2004 copies.duplicatecopies(repo, repo[None], ctx.rev(), pctx.rev()) |
| 2005 return stats | 2005 return stats |