( )⚙ D11540 dirstate-item: use item's property when computing a copies

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11540

dirstate-item: use item's property when computing a copies
ClosedPublic

Authored by marmoute on Oct 1 2021, 5:40 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8f452fecd0a4: dirstate-item: use item's property when computing a copies

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (7 lines)

Diff 30467

mercurial/scmutil.py

def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None): def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None):
"""Update the dirstate to reflect the intent of copying src to dst. For """Update the dirstate to reflect the intent of copying src to dst. For
different reasons it might not end with dst being marked as copied from src. different reasons it might not end with dst being marked as copied from src.
""" """
origsrc = repo.dirstate.copied(src) or src origsrc = repo.dirstate.copied(src) or src
if dst == origsrc: # copying back a copy? if dst == origsrc: # copying back a copy?
if repo.dirstate[dst] not in b'mn' and not dryrun: entry = repo.dirstate.get_entry(dst)
if (entry.added or not entry.tracked) and not dryrun:
repo.dirstate.set_tracked(dst) repo.dirstate.set_tracked(dst)
else: else:
if repo.dirstate[origsrc] == b'a' and origsrc == src: if repo.dirstate.get_entry(origsrc).added and origsrc == src:
if not ui.quiet: if not ui.quiet:
ui.warn( ui.warn(
_( _(
b"%s has not been committed yet, so no copy " b"%s has not been committed yet, so no copy "
b"data will be stored for %s.\n" b"data will be stored for %s.\n"
) )
% (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)) % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd))
) )
if repo.dirstate[dst] in b'?r' and not dryrun: if not repo.dirstate.get_entry(dst).tracked and not dryrun:
wctx.add([dst]) wctx.add([dst])
elif not dryrun: elif not dryrun:
wctx.copy(origsrc, dst) wctx.copy(origsrc, dst)
def movedirstate(repo, newctx, match=None): def movedirstate(repo, newctx, match=None):
"""Move the dirstate to newctx and adjust it as necessary. """Move the dirstate to newctx and adjust it as necessary.