##// END OF EJS Templates
Add core copy detection algorithm...
Add core copy detection algorithm This adds findcopies, which detects merge-relevant copies between files in a pair of manifests back to the merge ancestor. While the merge code invokes the copy detection routine, it does not yet use the result.

File last commit:

r3152:15d585dc default
r3153:c82ea81d default
Show More
context.py
203 lines | 6.8 KiB | text/x-python | PythonLexer
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 # context.py - changeset and file context objects for mercurial
#
Vadim Gelfer
update copyrights.
r2859 # Copyright 2006 Matt Mackall <mpm@selenic.com>
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 #
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
Matt Mackall
filectx: add rename traversal for parents()
r3122 from node import *
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126 from demandload import demandload
Brendan Cully
filectx.annotate: return filectx for each line instead of rev
r3146 demandload(globals(), "ancestor util")
Matt Mackall
filectx: add rename traversal for parents()
r3122
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 class changectx(object):
"""A changecontext object makes access to data related to a particular
changeset convenient."""
Brendan Cully
Move defaultrev into changectx...
r3132 def __init__(self, repo, changeid=None):
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 """changeid is a revision number, node, or tag"""
self._repo = repo
Brendan Cully
context: handle fileid or changeid == 0
r3143 if not changeid and changeid != 0:
Brendan Cully
Move defaultrev into changectx...
r3132 p1, p2 = self._repo.dirstate.parents()
self._rev = self._repo.changelog.rev(p1)
if self._rev == -1:
changeid = 'tip'
else:
self._node = p1
return
Benoit Boissinot
fix filectxt to really work...
r2643 self._node = self._repo.lookup(changeid)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 self._rev = self._repo.changelog.rev(self._node)
Matt Mackall
context: add __repr__ methods
r3151 def __repr__(self):
return "<changectx %s>" % short(self.node())
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 def changeset(self):
try:
return self._changeset
except AttributeError:
self._changeset = self._repo.changelog.read(self.node())
return self._changeset
def manifest(self):
try:
return self._manifest
except AttributeError:
self._manifest = self._repo.manifest.read(self.changeset()[0])
return self._manifest
def rev(self): return self._rev
def node(self): return self._node
def user(self): return self.changeset()[1]
def date(self): return self.changeset()[2]
Matt Mackall
filectx: add rename traversal for parents()
r3122 def files(self): return self.changeset()[3]
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 def description(self): return self.changeset()[4]
def parents(self):
"""return contexts for each parent changeset"""
Benoit Boissinot
context.py: self.repo is not defined, change to self._repo
r2627 p = self._repo.changelog.parents(self._node)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 return [ changectx(self._repo, x) for x in p ]
def children(self):
"""return contexts for each child changeset"""
Benoit Boissinot
context.py: self.repo is not defined, change to self._repo
r2627 c = self._repo.changelog.children(self._node)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 return [ changectx(self._repo, x) for x in c ]
def filenode(self, path):
node, flag = self._repo.manifest.find(self.changeset()[0], path)
return node
Benoit Boissinot
context.py: filectxs was using a keyword arg, add it to filectx
r2628 def filectx(self, path, fileid=None):
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 """get a file context from this changeset"""
Benoit Boissinot
context.py: filectxs was using a keyword arg, add it to filectx
r2628 if fileid is None:
fileid = self.filenode(path)
return filectx(self._repo, path, fileid=fileid)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
def filectxs(self):
"""generate a file context for each file in this changeset's
manifest"""
mf = self.manifest()
m = mf.keys()
m.sort()
for f in m:
yield self.filectx(f, fileid=mf[f])
Matt Mackall
changectx: add ancestor function
r3125 def ancestor(self, c2):
"""
return the ancestor context of self and c2
"""
n = self._repo.changelog.ancestor(self._node, c2._node)
return changectx(self._repo, n)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 class filectx(object):
"""A filecontext object makes access to data related to a particular
filerevision convenient."""
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124 def __init__(self, repo, path, changeid=None, fileid=None, filelog=None):
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 """changeid can be a changeset revision, node, or tag.
fileid can be a file revision or node."""
self._repo = repo
self._path = path
Brendan Cully
context: handle fileid or changeid == 0
r3143 assert changeid is not None or fileid is not None
Benoit Boissinot
fix filectxt to really work...
r2643
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124 if filelog:
self._filelog = filelog
else:
self._filelog = self._repo.file(self._path)
Brendan Cully
context: handle fileid or changeid == 0
r3143 if fileid is None:
Benoit Boissinot
fix filectxt to really work...
r2643 self._changeid = changeid
else:
self._filenode = self._filelog.lookup(fileid)
self._changeid = self._filelog.linkrev(self._filenode)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Brendan Cully
Make filectx lazier - some users never use filenode
r3144 def __getattr__(self, name):
if name == '_changectx':
Benoit Boissinot
fix filectxt to really work...
r2643 self._changectx = changectx(self._repo, self._changeid)
return self._changectx
Brendan Cully
Make filectx lazier - some users never use filenode
r3144 elif name == '_filenode':
self._filenode = self._changectx.filenode(self._path)
return self._filenode
elif name == '_filerev':
self._filerev = self._filelog.rev(self._filenode)
return self._filerev
else:
raise AttributeError, name
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
context: add __repr__ methods
r3151 def __repr__(self):
Matt Mackall
context: change filectx repr to use @...
r3152 return "<filectx %s@%s>" % (self.path(), short(self.node()))
Matt Mackall
context: add __repr__ methods
r3151
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 def filerev(self): return self._filerev
def filenode(self): return self._filenode
def filelog(self): return self._filelog
Matt Mackall
filectx: lazy linkrev usage
r3150 def rev(self):
if hasattr(self, "_changectx"):
return self._changectx.rev()
return self._filelog.linkrev(self._filenode)
Brendan Cully
Make filectx lazier - some users never use filenode
r3144 def node(self): return self._changectx.node()
def user(self): return self._changectx.user()
def date(self): return self._changectx.date()
def files(self): return self._changectx.files()
def description(self): return self._changectx.description()
def manifest(self): return self._changectx.manifest()
Matt Mackall
restore filectx.changectx() method
r3149 def changectx(self): return self._changectx
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
def data(self): return self._filelog.read(self._filenode)
def renamed(self): return self._filelog.renamed(self._filenode)
Matt Mackall
filectx: add rename traversal for parents()
r3122 def path(self): return self._path
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
def parents(self):
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124 p = self._path
fl = self._filelog
pl = [ (p, n, fl) for n in self._filelog.parents(self._filenode) ]
Matt Mackall
filelog: make metadata method private
r3123
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124 r = self.renamed()
Matt Mackall
filectx: add rename traversal for parents()
r3122 if r:
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124 pl[0] = (r[0], r[1], None)
return [ filectx(self._repo, p, fileid=n, filelog=l)
for p,n,l in pl if n != nullid ]
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
def children(self):
# hard for renames
c = self._filelog.children(self._filenode)
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124 return [ filectx(self._repo, self._path, fileid=x,
filelog=self._filelog) for x in c ]
Matt Mackall
Convert hg annotate to context api
r2566
def annotate(self):
Brendan Cully
filectx.annotate: return filectx for each line instead of rev
r3146 getctx = util.cachefunc(lambda x: filectx(self._repo, self._path,
changeid=x,
filelog=self._filelog))
hist = self._filelog.annotate(self._filenode)
return [(getctx(rev), line) for rev, line in hist]
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126 def ancestor(self, fc2):
"""
find the common ancestor file context, if any, of self, and fc2
"""
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 acache = {}
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126 flcache = {self._path:self._filelog, fc2._path:fc2._filelog}
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 def parents(vertex):
if vertex in acache:
return acache[vertex]
f, n = vertex
if f not in flcache:
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126 flcache[f] = self._repo.file(f)
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 fl = flcache[f]
pl = [ (f,p) for p in fl.parents(n) if p != nullid ]
re = fl.renamed(n)
if re:
pl.append(re)
acache[vertex]=pl
return pl
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 a, b = (self._path, self._filenode), (fc2._path, fc2._filenode)
v = ancestor.ancestor(a, b, parents)
if v:
f,n = v
return filectx(self._repo, f, fileid=n, filelog=flcache[f])
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 return None