| pulkit |
| hg-reviewers |
This reduced the time that the override is in place, but I that it's
correct this way (only for the duration of the orig() call).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/overrides.py (9 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| os.makedirs(makestandin(dest)) | os.makedirs(makestandin(dest)) | ||||
| try: | try: | ||||
| # When we call orig below it creates the standins but we don't add | # When we call orig below it creates the standins but we don't add | ||||
| # them to the dir state until later so lock during that time. | # them to the dir state until later so lock during that time. | ||||
| wlock = repo.wlock() | wlock = repo.wlock() | ||||
| manifest = repo[None].manifest() | manifest = repo[None].manifest() | ||||
| def overridematch(ctx, pats=(), opts=None, globbed=False, | def overridematch(orig, ctx, pats=(), opts=None, globbed=False, | ||||
| default='relpath', badfn=None): | default='relpath', badfn=None): | ||||
| if opts is None: | if opts is None: | ||||
| opts = {} | opts = {} | ||||
| newpats = [] | newpats = [] | ||||
| # The patterns were previously mangled to add the standin | # The patterns were previously mangled to add the standin | ||||
| # directory; we need to remove that now | # directory; we need to remove that now | ||||
| for pat in pats: | for pat in pats: | ||||
| if matchmod.patkind(pat) is None and lfutil.shortname in pat: | if matchmod.patkind(pat) is None and lfutil.shortname in pat: | ||||
| newpats.append(pat.replace(lfutil.shortname, '')) | newpats.append(pat.replace(lfutil.shortname, '')) | ||||
| else: | else: | ||||
| newpats.append(pat) | newpats.append(pat) | ||||
| match = oldmatch(ctx, newpats, opts, globbed, default, badfn=badfn) | match = orig(ctx, newpats, opts, globbed, default, badfn=badfn) | ||||
| m = copy.copy(match) | m = copy.copy(match) | ||||
| lfile = lambda f: lfutil.standin(f) in manifest | lfile = lambda f: lfutil.standin(f) in manifest | ||||
| m._files = [lfutil.standin(f) for f in m._files if lfile(f)] | m._files = [lfutil.standin(f) for f in m._files if lfile(f)] | ||||
| m._fileset = set(m._files) | m._fileset = set(m._files) | ||||
| origmatchfn = m.matchfn | origmatchfn = m.matchfn | ||||
| def matchfn(f): | def matchfn(f): | ||||
| lfile = lfutil.splitstandin(f) | lfile = lfutil.splitstandin(f) | ||||
| return (lfile is not None and | return (lfile is not None and | ||||
| (f in manifest) and | (f in manifest) and | ||||
| origmatchfn(lfile) or | origmatchfn(lfile) or | ||||
| None) | None) | ||||
| m.matchfn = matchfn | m.matchfn = matchfn | ||||
| return m | return m | ||||
| oldmatch = installmatchfn(overridematch) | |||||
| listpats = [] | listpats = [] | ||||
| for pat in pats: | for pat in pats: | ||||
| if matchmod.patkind(pat) is not None: | if matchmod.patkind(pat) is not None: | ||||
| listpats.append(pat) | listpats.append(pat) | ||||
| else: | else: | ||||
| listpats.append(makestandin(pat)) | listpats.append(makestandin(pat)) | ||||
| copiedfiles = [] | copiedfiles = [] | ||||
| def overridecopyfile(orig, src, dest, *args, **kwargs): | def overridecopyfile(orig, src, dest, *args, **kwargs): | ||||
| if (lfutil.shortname in src and | if (lfutil.shortname in src and | ||||
| dest.startswith(repo.wjoin(lfutil.shortname))): | dest.startswith(repo.wjoin(lfutil.shortname))): | ||||
| destlfile = dest.replace(lfutil.shortname, '') | destlfile = dest.replace(lfutil.shortname, '') | ||||
| if not opts['force'] and os.path.exists(destlfile): | if not opts['force'] and os.path.exists(destlfile): | ||||
| raise IOError('', | raise IOError('', | ||||
| _('destination largefile already exists')) | _('destination largefile already exists')) | ||||
| copiedfiles.append((src, dest)) | copiedfiles.append((src, dest)) | ||||
| orig(src, dest, *args, **kwargs) | orig(src, dest, *args, **kwargs) | ||||
| with extensions.wrappedfunction(util, 'copyfile', overridecopyfile): | with extensions.wrappedfunction(util, 'copyfile', overridecopyfile), \ | ||||
| extensions.wrappedfunction(scmutil, 'match', overridematch): | |||||
| result += orig(ui, repo, listpats, opts, rename) | result += orig(ui, repo, listpats, opts, rename) | ||||
| lfdirstate = lfutil.openlfdirstate(ui, repo) | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||||
| for (src, dest) in copiedfiles: | for (src, dest) in copiedfiles: | ||||
| if (lfutil.shortname in src and | if (lfutil.shortname in src and | ||||
| dest.startswith(repo.wjoin(lfutil.shortname))): | dest.startswith(repo.wjoin(lfutil.shortname))): | ||||
| srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') | srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') | ||||
| destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') | destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') | ||||
| lfdirstate.add(destlfile) | lfdirstate.add(destlfile) | ||||
| lfdirstate.write() | lfdirstate.write() | ||||
| except error.Abort as e: | except error.Abort as e: | ||||
| if pycompat.bytestr(e) != _('no files to copy'): | if pycompat.bytestr(e) != _('no files to copy'): | ||||
| raise e | raise e | ||||
| else: | else: | ||||
| nolfiles = True | nolfiles = True | ||||
| finally: | finally: | ||||
| restorematchfn() | |||||
| wlock.release() | wlock.release() | ||||
| if nolfiles and nonormalfiles: | if nolfiles and nonormalfiles: | ||||
| raise error.Abort(_('no files to copy')) | raise error.Abort(_('no files to copy')) | ||||
| return result | return result | ||||
| # When the user calls revert, we have to be careful to not revert any | # When the user calls revert, we have to be careful to not revert any | ||||