This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11539

dirstate-item: use item's property instead of `state` in copy
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG304267b077de: dirstate-item: use item's property instead of `state` in copy

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (8 lines)

Diff 30539

mercurial/cmdutil.py

if b'/' in abstarget: if b'/' in abstarget:
# We cannot normalize abstarget itself, this would prevent # We cannot normalize abstarget itself, this would prevent
# case only renames, like a => A. # case only renames, like a => A.
abspath, absname = abstarget.rsplit(b'/', 1) abspath, absname = abstarget.rsplit(b'/', 1)
abstarget = repo.dirstate.normalize(abspath) + b'/' + absname abstarget = repo.dirstate.normalize(abspath) + b'/' + absname
reltarget = repo.pathto(abstarget, cwd) reltarget = repo.pathto(abstarget, cwd)
target = repo.wjoin(abstarget) target = repo.wjoin(abstarget)
src = repo.wjoin(abssrc) src = repo.wjoin(abssrc)
state = repo.dirstate[abstarget] entry = repo.dirstate.get_entry(abstarget)
already_commited = entry.tracked and not entry.added
scmutil.checkportable(ui, abstarget) scmutil.checkportable(ui, abstarget)
# check for collisions # check for collisions
prevsrc = targets.get(abstarget) prevsrc = targets.get(abstarget)
if prevsrc is not None: if prevsrc is not None:
ui.warn( ui.warn(
_(b'%s: not overwriting - %s collides with %s\n') _(b'%s: not overwriting - %s collides with %s\n')
abstarget abstarget
): ):
if not rename: if not rename:
ui.warn(_(b"%s: can't copy - same file\n") % reltarget) ui.warn(_(b"%s: can't copy - same file\n") % reltarget)
return True # report a failure return True # report a failure
exists = False exists = False
samefile = True samefile = True
if not after and exists or after and state in b'mn': if not after and exists or after and already_commited:
if not opts[b'force']: if not opts[b'force']:
if state in b'mn': if already_commited:
msg = _(b'%s: not overwriting - file already committed\n') msg = _(b'%s: not overwriting - file already committed\n')
if after: if after:
flags = b'--after --force' flags = b'--after --force'
else: else:
flags = b'--force' flags = b'--force'
if rename: if rename:
hint = ( hint = (
_( _(