mercurial-scm/hg: mercurial/scmutil.py comparison

comparison mercurial/scmutil.py @ 48315:a44bb185f6bd stable 6.0rc0

merge with default

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Tue, 09 Nov 2021 21:56:04 +0530
parents	1c447fb82232 207df24a31f6
children	0b8e076e878c

comparison

equal deleted inserted replaced

-:6f43569729d4
+:a44bb185f6bd
 if not revspec and revspec != 0:
 return repo[default]
 l = revrange(repo, [revspec], localalias=localalias)
 if not l:
-raise error.Abort(_(b'empty revision set'))
+raise error.InputError(_(b'empty revision set'))
 return repo[l.last()]
 def _pairspec(revspec):
 tree = revsetlang.parse(revspec)
 return repo[b'.'], repo[None]
 l = revrange(repo, revs)
 if not l:
-raise error.Abort(_(b'empty revision range'))
+raise error.InputError(_(b'empty revision range'))
 first = l.first()
 second = l.last()
 if (
 first == second
 and len(revs) >= 2
 and not all(revrange(repo, [r]) for r in revs)
 ):
-raise error.Abort(_(b'empty revision on one side of range'))
+raise error.InputError(_(b'empty revision on one side of range'))
 # if top-level is range expression, the result must always be a pair
 if first == second and len(revs) == 1 and not _pairspec(revs[0]):
 return repo[first], repo[None]
 m = matcher
 dry_run = opts.get(b'dry_run')
 try:
 similarity = float(opts.get(b'similarity') or 0)
 except ValueError:
-raise error.Abort(_(b'similarity must be a number'))
+raise error.InputError(_(b'similarity must be a number'))
 if similarity < 0 or similarity > 100:
-raise error.Abort(_(b'similarity must be between 0 and 100'))
+raise error.InputError(_(b'similarity must be between 0 and 100'))
 similarity /= 100.0
 ret = 0
 wctx = repo[None]
 unknown=True,
 ignored=False,
 full=False,
 )
 for abs, st in pycompat.iteritems(walkresults):
-dstate = dirstate[abs]
+entry = dirstate.get_entry(abs)
-if dstate == b'?' and audit_path.check(abs):
+if (not entry.any_tracked) and audit_path.check(abs):
 unknown.append(abs)
-elif dstate != b'r' and not st:
+elif (not entry.removed) and not st:
 deleted.append(abs)
-elif dstate == b'r' and st:
+elif entry.removed and st:
 forgotten.append(abs)
 # for finding renames
-elif dstate == b'r' and not st:
+elif entry.removed and not st:
 removed.append(abs)
-elif dstate == b'a':
+elif entry.added:
 added.append(abs)
 return added, unknown, deleted, removed, forgotten
 """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.
 """
 origsrc = repo.dirstate.copied(src) or src
 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)
 else:
-if repo.dirstate[origsrc] == b'a' and origsrc == src:
+if repo.dirstate.get_entry(origsrc).added and origsrc == src:
 if not ui.quiet:
 ui.warn(
 _(
 b"%s has not been committed yet, so no copy "
 b"data will be stored for %s.\n"
 )
 % (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])
 elif not dryrun:
 wctx.copy(origsrc, dst)
 dst: oldcopies.get(src, src)
 for dst, src in pycompat.iteritems(oldcopies)
 }
 # Adjust the dirstate copies
 for dst, src in pycompat.iteritems(copies):
-if src not in newctx or dst in newctx or ds[dst] != b'a':
+if src not in newctx or dst in newctx or not ds.get_entry(dst).added:
 src = None
 ds.copy(src, dst)
 repo._quick_access_changeid_invalidate()

Mercurial > public > mercurial-scm > hg

comparison mercurial/scmutil.py @ 48315:a44bb185f6bd stable 6.0rc0