| hg-reviewers |
The function is already used by hg log (for following renames, not
for templates), so it seems it does not belong in templatekw.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/remotefilelog/__init__.py (3 lines) | |||
| M | mercurial/commands.py (3 lines) | |||
| M | mercurial/scmutil.py (31 lines) | |||
| M | mercurial/templatekw.py (33 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| pycompat, | pycompat, | ||||
| registrar, | registrar, | ||||
| repair, | repair, | ||||
| repoview, | repoview, | ||||
| revset, | revset, | ||||
| scmutil, | scmutil, | ||||
| smartset, | smartset, | ||||
| streamclone, | streamclone, | ||||
| templatekw, | |||||
| util, | util, | ||||
| ) | ) | ||||
| from . import ( | from . import ( | ||||
| constants, | constants, | ||||
| debugcommands, | debugcommands, | ||||
| fileserverclient, | fileserverclient, | ||||
| remotefilectx, | remotefilectx, | ||||
| remotefilelog, | remotefilelog, | ||||
| try: | try: | ||||
| return orig(lui, repo, *args, **kwargs) | return orig(lui, repo, *args, **kwargs) | ||||
| finally: | finally: | ||||
| if fileservice: | if fileservice: | ||||
| fileservice.close() | fileservice.close() | ||||
| extensions.wrapfunction(dispatch, 'runcommand', runcommand) | extensions.wrapfunction(dispatch, 'runcommand', runcommand) | ||||
| # disappointing hacks below | # disappointing hacks below | ||||
| templatekw.getrenamedfn = getrenamedfn | scmutil.getrenamedfn = getrenamedfn | ||||
| extensions.wrapfunction(revset, 'filelog', filelogrevset) | extensions.wrapfunction(revset, 'filelog', filelogrevset) | ||||
| revset.symbols['filelog'] = revset.filelog | revset.symbols['filelog'] = revset.filelog | ||||
| extensions.wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs) | extensions.wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs) | ||||
| # prevent strip from stripping remotefilelogs | # prevent strip from stripping remotefilelogs | ||||
| def _collectbrokencsets(orig, repo, files, striprev): | def _collectbrokencsets(orig, repo, files, striprev): | ||||
| if isenabled(repo): | if isenabled(repo): | ||||
| files = list([f for f in files if not repo.shallowmatch(f)]) | files = list([f for f in files if not repo.shallowmatch(f)]) | ||||
| repair, | repair, | ||||
| revsetlang, | revsetlang, | ||||
| rewriteutil, | rewriteutil, | ||||
| scmutil, | scmutil, | ||||
| server, | server, | ||||
| state as statemod, | state as statemod, | ||||
| streamclone, | streamclone, | ||||
| tags as tagsmod, | tags as tagsmod, | ||||
| templatekw, | |||||
| ui as uimod, | ui as uimod, | ||||
| util, | util, | ||||
| wireprotoserver, | wireprotoserver, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| dateutil, | dateutil, | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| # then filter the result by logcmdutil._makerevset() and --limit | # then filter the result by logcmdutil._makerevset() and --limit | ||||
| revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) | ||||
| getrenamed = None | getrenamed = None | ||||
| if opts.get('copies'): | if opts.get('copies'): | ||||
| endrev = None | endrev = None | ||||
| if revs: | if revs: | ||||
| endrev = revs.max() + 1 | endrev = revs.max() + 1 | ||||
| getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | getrenamed = scmutil.getrenamedfn(repo, endrev=endrev) | ||||
| ui.pager('log') | ui.pager('log') | ||||
| displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, | displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, | ||||
| buffered=True) | buffered=True) | ||||
| if opts.get('graph'): | if opts.get('graph'): | ||||
| displayfn = logcmdutil.displaygraphrevs | displayfn = logcmdutil.displaygraphrevs | ||||
| else: | else: | ||||
| displayfn = logcmdutil.displayrevs | displayfn = logcmdutil.displayrevs | ||||
| and the files in renames as copied.''' | and the files in renames as copied.''' | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| wctx.forget(deleted) | wctx.forget(deleted) | ||||
| wctx.add(unknown) | wctx.add(unknown) | ||||
| for new, old in renames.iteritems(): | for new, old in renames.iteritems(): | ||||
| wctx.copy(old, new) | wctx.copy(old, new) | ||||
| def getrenamedfn(repo, endrev=None): | |||||
| rcache = {} | |||||
| if endrev is None: | |||||
| endrev = len(repo) | |||||
| def getrenamed(fn, rev): | |||||
| '''looks up all renames for a file (up to endrev) the first | |||||
| time the file is given. It indexes on the changerev and only | |||||
| parses the manifest if linkrev != changerev. | |||||
| Returns rename info for fn at changerev rev.''' | |||||
| if fn not in rcache: | |||||
| rcache[fn] = {} | |||||
| fl = repo.file(fn) | |||||
| for i in fl: | |||||
| lr = fl.linkrev(i) | |||||
| renamed = fl.renamed(fl.node(i)) | |||||
| rcache[fn][lr] = renamed and renamed[0] | |||||
| if lr >= endrev: | |||||
| break | |||||
| if rev in rcache[fn]: | |||||
| return rcache[fn][rev] | |||||
| # If linkrev != rev (i.e. rev not found in rcache) fallback to | |||||
| # filectx logic. | |||||
| try: | |||||
| return repo[rev][fn].copysource() | |||||
| except error.LookupError: | |||||
| return None | |||||
| return getrenamed | |||||
| 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 'mn' and not dryrun: | if repo.dirstate[dst] not in 'mn' and not dryrun: | ||||
| repo.dirstate.normallookup(dst) | repo.dirstate.normallookup(dst) | ||||
| except KeyError: | except KeyError: | ||||
| # Cache miss - recurse | # Cache miss - recurse | ||||
| todo.append(rev) | todo.append(rev) | ||||
| todo.extend(p.rev() for p in ctx.parents()) | todo.extend(p.rev() for p in ctx.parents()) | ||||
| continue | continue | ||||
| latesttags[rev] = pdate, pdist + 1, ptag | latesttags[rev] = pdate, pdist + 1, ptag | ||||
| return latesttags[rev] | return latesttags[rev] | ||||
| def getrenamedfn(repo, endrev=None): | |||||
| rcache = {} | |||||
| if endrev is None: | |||||
| endrev = len(repo) | |||||
| def getrenamed(fn, rev): | |||||
| '''looks up all renames for a file (up to endrev) the first | |||||
| time the file is given. It indexes on the changerev and only | |||||
| parses the manifest if linkrev != changerev. | |||||
| Returns rename info for fn at changerev rev.''' | |||||
| if fn not in rcache: | |||||
| rcache[fn] = {} | |||||
| fl = repo.file(fn) | |||||
| for i in fl: | |||||
| lr = fl.linkrev(i) | |||||
| renamed = fl.renamed(fl.node(i)) | |||||
| rcache[fn][lr] = renamed and renamed[0] | |||||
| if lr >= endrev: | |||||
| break | |||||
| if rev in rcache[fn]: | |||||
| return rcache[fn][rev] | |||||
| # If linkrev != rev (i.e. rev not found in rcache) fallback to | |||||
| # filectx logic. | |||||
| try: | |||||
| return repo[rev][fn].copysource() | |||||
| except error.LookupError: | |||||
| return None | |||||
| return getrenamed | |||||
| def getlogcolumns(): | def getlogcolumns(): | ||||
| """Return a dict of log column labels""" | """Return a dict of log column labels""" | ||||
| _ = pycompat.identity # temporarily disable gettext | _ = pycompat.identity # temporarily disable gettext | ||||
| # i18n: column positioning for "hg log" | # i18n: column positioning for "hg log" | ||||
| columns = _('bookmark: %s\n' | columns = _('bookmark: %s\n' | ||||
| 'branch: %s\n' | 'branch: %s\n' | ||||
| 'changeset: %s\n' | 'changeset: %s\n' | ||||
| 'copies: %s\n' | 'copies: %s\n' | ||||
| their sources. | their sources. | ||||
| """ | """ | ||||
| repo = context.resource(mapping, 'repo') | repo = context.resource(mapping, 'repo') | ||||
| ctx = context.resource(mapping, 'ctx') | ctx = context.resource(mapping, 'ctx') | ||||
| cache = context.resource(mapping, 'cache') | cache = context.resource(mapping, 'cache') | ||||
| copies = context.resource(mapping, 'revcache').get('copies') | copies = context.resource(mapping, 'revcache').get('copies') | ||||
| if copies is None: | if copies is None: | ||||
| if 'getrenamed' not in cache: | if 'getrenamed' not in cache: | ||||
| cache['getrenamed'] = getrenamedfn(repo) | cache['getrenamed'] = scmutil.getrenamedfn(repo) | ||||
| copies = [] | copies = [] | ||||
| getrenamed = cache['getrenamed'] | getrenamed = cache['getrenamed'] | ||||
| for fn in ctx.files(): | for fn in ctx.files(): | ||||
| rename = getrenamed(fn, ctx.rev()) | rename = getrenamed(fn, ctx.rev()) | ||||
| if rename: | if rename: | ||||
| copies.append((fn, rename)) | copies.append((fn, rename)) | ||||
| return templateutil.compatfilecopiesdict(context, mapping, 'file_copy', | return templateutil.compatfilecopiesdict(context, mapping, 'file_copy', | ||||
| copies) | copies) | ||||