This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3000

addremove: remove dry_run, similarity from scmutil.addremove
ClosedPublic

Authored by khanchi97 on Mar 31 2018, 2:27 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG14cd5290c4e6: addremove: remove dry_run, similarity from scmutil.addremove (API)

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.

Event Timeline

khanchi97 created this revision.Mar 31 2018, 2:27 PM
khanchi97 added a subscriber: yuja.Mar 31 2018, 2:37 PM

I ran all the tests those are related to addremove and they are passing.

yuja requested changes to this revision.Mar 31 2018, 9:56 PM

Sorry, I didn't notice that the opts dict carries extra options other
than subrepos, dry_run, and similarity. Because of that, my idea of
dropping opts turns out to be worse than the current state.

Maybe we can get rid of dry_run and similarity instead, but we'll
have to be careful since the default similarity value varies on command.

mercurial/commands.py
252

Oops, largefiles options in core.

This revision now requires changes to proceed.Mar 31 2018, 9:56 PM
khanchi97 retitled this revision from addremove: remove opts from scmutil.addremove to addremove: remove dry_run, similarity from scmutil.addremove.Apr 1 2018, 6:44 AM
khanchi97 updated this revision to Diff 7500.
khanchi97 added a comment.Apr 1 2018, 9:54 AM

okay, so I have sent another revision which removes dry_run and
similarity from scmutil.addremove

yuja requested changes to this revision.Apr 2 2018, 10:53 AM

Other than that, the patch looks good to me. Thanks!

contrib/perf.py
426–427

Here opts['dry_run'] must be set.

This revision now requires changes to proceed.Apr 2 2018, 10:53 AM
khanchi97 updated this revision to Diff 7523.Apr 2 2018, 5:26 PM
khanchi97 updated this revision to Diff 7524.Apr 2 2018, 5:29 PM
yuja accepted this revision.Apr 3 2018, 8:19 AM
This revision is now accepted and ready to land.Apr 3 2018, 8:19 AM
Closed by commit rHG14cd5290c4e6: addremove: remove dry_run, similarity from scmutil.addremove (API) (authored by khanchi97). · Explain WhyApr 3 2018, 8:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7535

contrib/perf.py

@command('perfaddremove', formatteropts) @command('perfaddremove', formatteropts)
def perfaddremove(ui, repo, **opts): def perfaddremove(ui, repo, **opts):
timer, fm = gettimer(ui, opts) timer, fm = gettimer(ui, opts)
try: try:
oldquiet = repo.ui.quiet oldquiet = repo.ui.quiet
repo.ui.quiet = True repo.ui.quiet = True
matcher = scmutil.match(repo[None]) matcher = scmutil.match(repo[None])
timer(lambda: scmutil.addremove(repo, matcher, "", dry_run=True)) opts['dry_run'] = True
timer(lambda: scmutil.addremove(repo, matcher, "", opts))
yujaUnsubmitted
Not Done

Here opts['dry_run'] must be set.

yuja: Here opts['dry_run'] must be set.
finally: finally:
repo.ui.quiet = oldquiet repo.ui.quiet = oldquiet
fm.end() fm.end()
def clearcaches(cl): def clearcaches(cl):
# behave somewhat consistently across internal API changes # behave somewhat consistently across internal API changes
if util.safehasattr(cl, 'clearcaches'): if util.safehasattr(cl, 'clearcaches'):
cl.clearcaches() cl.clearcaches()

hgext/largefiles/overrides.py

def overridesummary(orig, ui, repo, *pats, **opts): def overridesummary(orig, ui, repo, *pats, **opts):
try: try:
repo.lfstatus = True repo.lfstatus = True
orig(ui, repo, *pats, **opts) orig(ui, repo, *pats, **opts)
finally: finally:
repo.lfstatus = False repo.lfstatus = False
def scmutiladdremove(orig, repo, matcher, prefix, opts=None, dry_run=None, def scmutiladdremove(orig, repo, matcher, prefix, opts=None):
similarity=None):
if opts is None: if opts is None:
opts = {} opts = {}
if not lfutil.islfilesrepo(repo): if not lfutil.islfilesrepo(repo):
return orig(repo, matcher, prefix, opts, dry_run, similarity) return orig(repo, matcher, prefix, opts)
# Get the list of missing largefiles so we can remove them # Get the list of missing largefiles so we can remove them
lfdirstate = lfutil.openlfdirstate(repo.ui, repo) lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
unsure, s = lfdirstate.status(matchmod.always(repo.root, repo.getcwd()), unsure, s = lfdirstate.status(matchmod.always(repo.root, repo.getcwd()),
subrepos=[], ignored=False, clean=False, subrepos=[], ignored=False, clean=False,
unknown=False) unknown=False)
# Call into the normal remove code, but the removing of the standin, we want # Call into the normal remove code, but the removing of the standin, we want
# to have handled by original addremove. Monkey patching here makes sure # to have handled by original addremove. Monkey patching here makes sure
# Call into the normal add code, and any files that *should* be added as # Call into the normal add code, and any files that *should* be added as
# largefiles will be # largefiles will be
added, bad = addlargefiles(repo.ui, repo, True, matcher, added, bad = addlargefiles(repo.ui, repo, True, matcher,
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))
# Now that we've handled largefiles, hand off to the original addremove # Now that we've handled largefiles, hand off to the original addremove
# function to take care of the rest. Make sure it doesn't do anything with # function to take care of the rest. Make sure it doesn't do anything with
# largefiles by passing a matcher that will ignore them. # largefiles by passing a matcher that will ignore them.
matcher = composenormalfilematcher(matcher, repo[None].manifest(), added) matcher = composenormalfilematcher(matcher, repo[None].manifest(), added)
return orig(repo, matcher, prefix, opts, dry_run, similarity) return orig(repo, matcher, prefix, opts)
# Calling purge with --all will cause the largefiles to be deleted. # Calling purge with --all will cause the largefiles to be deleted.
# Override repo.status to prevent this from happening. # Override repo.status to prevent this from happening.
def overridepurge(orig, ui, repo, *dirs, **opts): def overridepurge(orig, ui, repo, *dirs, **opts):
# XXX Monkey patching a repoview will not work. The assigned attribute will # XXX Monkey patching a repoview will not work. The assigned attribute will
# be set on the unfiltered repo, but we will only lookup attributes in the # be set on the unfiltered repo, but we will only lookup attributes in the
# unfiltered repo if the lookup in the repoview object itself fails. As the # unfiltered repo if the lookup in the repoview object itself fails. As the
# monkey patched method exists on the repoview class the lookup will not # monkey patched method exists on the repoview class the lookup will not

mercurial/commands.py

foobar.c foobar.c
R foobar.c R foobar.c
Returns 0 if all files are successfully added. Returns 0 if all files are successfully added.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
try: try:
sim = float(opts.get('similarity') or 100) sim = float(opts.get('similarity') or 100)
except ValueError: except ValueError:
yujaUnsubmitted
Not Done

Oops, largefiles options in core.

yuja: Oops, largefiles options in core.
raise error.Abort(_('similarity must be a number')) raise error.Abort(_('similarity must be a number'))
if sim < 0 or sim > 100: if sim < 0 or sim > 100:
raise error.Abort(_('similarity must be between 0 and 100')) raise error.Abort(_('similarity must be between 0 and 100'))
opts['similarity'] = sim / 100.0
matcher = scmutil.match(repo[None], pats, opts) matcher = scmutil.match(repo[None], pats, opts)
return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) return scmutil.addremove(repo, matcher, "", opts)
@command('^annotate|blame', @command('^annotate|blame',
[('r', 'rev', '', _('annotate the specified revision'), _('REV')), [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
('', 'follow', None, ('', 'follow', None,
_('follow copies/renames and list the filename (DEPRECATED)')), _('follow copies/renames and list the filename (DEPRECATED)')),
('', 'no-follow', None, _("don't follow copies and renames")), ('', 'no-follow', None, _("don't follow copies and renames")),
('a', 'text', None, _('treat all files as text')), ('a', 'text', None, _('treat all files as text')),
('u', 'user', None, _('list the author (long with -v)')), ('u', 'user', None, _('list the author (long with -v)')),

mercurial/scmutil.py

obsolete.createmarkers(repo, rels, operation=operation, obsolete.createmarkers(repo, rels, operation=operation,
metadata=metadata) metadata=metadata)
else: else:
from . import repair # avoid import cycle from . import repair # avoid import cycle
tostrip = list(replacements) tostrip = list(replacements)
if tostrip: if tostrip:
repair.delayedstrip(repo.ui, repo, tostrip, operation) repair.delayedstrip(repo.ui, repo, tostrip, operation)
def addremove(repo, matcher, prefix, opts=None, dry_run=None, similarity=None): def addremove(repo, matcher, prefix, opts=None):
if opts is None: if opts is None:
opts = {} opts = {}
m = matcher m = matcher
if dry_run is None:
dry_run = opts.get('dry_run') dry_run = opts.get('dry_run')
if similarity is None:
similarity = float(opts.get('similarity') or 0) similarity = float(opts.get('similarity') or 0)
ret = 0 ret = 0
join = lambda f: os.path.join(prefix, f) join = lambda f: os.path.join(prefix, f)
wctx = repo[None] wctx = repo[None]
for subpath in sorted(wctx.substate): for subpath in sorted(wctx.substate):
submatch = matchmod.subdirmatcher(subpath, m) submatch = matchmod.subdirmatcher(subpath, m)
if opts.get('subrepos') or m.exact(subpath) or any(submatch.files()): if opts.get('subrepos') or m.exact(subpath) or any(submatch.files()):
sub = wctx.sub(subpath) sub = wctx.sub(subpath)
try: try:
if sub.addremove(submatch, prefix, opts, dry_run, similarity): if sub.addremove(submatch, prefix, opts):
ret = 1 ret = 1
except error.LookupError: except error.LookupError:
repo.ui.status(_("skipping missing subrepository: %s\n") repo.ui.status(_("skipping missing subrepository: %s\n")
% join(subpath)) % join(subpath))
rejected = [] rejected = []
def badfn(f, msg): def badfn(f, msg):
if f in m.files(): if f in m.files():

mercurial/subrepo.py

This may be a no-op on some systems. This may be a no-op on some systems.
""" """
raise NotImplementedError raise NotImplementedError
def add(self, ui, match, prefix, explicitonly, **opts): def add(self, ui, match, prefix, explicitonly, **opts):
return [] return []
def addremove(self, matcher, prefix, opts, dry_run, similarity): def addremove(self, matcher, prefix, opts):
self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) self.ui.warn("%s: %s" % (prefix, _("addremove is not supported")))
return 1 return 1
def cat(self, match, fm, fntemplate, prefix, **opts): def cat(self, match, fm, fntemplate, prefix, **opts):
return 1 return 1
def status(self, rev2, **opts): def status(self, rev2, **opts):
return scmutil.status([], [], [], [], [], [], []) return scmutil.status([], [], [], [], [], [], [])
@annotatesubrepoerror @annotatesubrepoerror
def add(self, ui, match, prefix, explicitonly, **opts): def add(self, ui, match, prefix, explicitonly, **opts):
return cmdutil.add(ui, self._repo, match, return cmdutil.add(ui, self._repo, match,
self.wvfs.reljoin(prefix, self._path), self.wvfs.reljoin(prefix, self._path),
explicitonly, **opts) explicitonly, **opts)
@annotatesubrepoerror @annotatesubrepoerror
def addremove(self, m, prefix, opts, dry_run, similarity): def addremove(self, m, prefix, opts):
# In the same way as sub directories are processed, once in a subrepo, # In the same way as sub directories are processed, once in a subrepo,
# always entry any of its subrepos. Don't corrupt the options that will # always entry any of its subrepos. Don't corrupt the options that will
# be used to process sibling subrepos however. # be used to process sibling subrepos however.
opts = copy.copy(opts) opts = copy.copy(opts)
opts['subrepos'] = True opts['subrepos'] = True
return scmutil.addremove(self._repo, m, return scmutil.addremove(self._repo, m,
self.wvfs.reljoin(prefix, self._path), opts, self.wvfs.reljoin(prefix, self._path), opts)
dry_run, similarity)
@annotatesubrepoerror @annotatesubrepoerror
def cat(self, match, fm, fntemplate, prefix, **opts): def cat(self, match, fm, fntemplate, prefix, **opts):
rev = self._state[1] rev = self._state[1]
ctx = self._repo[rev] ctx = self._repo[rev]
return cmdutil.cat(self.ui, self._repo, ctx, match, fm, fntemplate, return cmdutil.cat(self.ui, self._repo, ctx, match, fm, fntemplate,
prefix, **opts) prefix, **opts)