##// END OF EJS Templates
Teach import to understand git diff extensions....
Teach import to understand git diff extensions. Vanilla patch chokes on git patches that include files that are copied or renamed, then modified. So this code detects that case and rewrites the patch if necessary.

File last commit:

r2859:345bac2b default
r2860:b3d1145e default
Show More
context.py
126 lines | 4.5 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
#
# Copyright 2005 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
class changectx(object):
"""A changecontext object makes access to data related to a particular
changeset convenient."""
def __init__(self, repo, changeid):
"""changeid is a revision number, node, or tag"""
self._repo = repo
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)
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]
def changedfiles(self): return self.changeset()[3]
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])
class filectx(object):
"""A filecontext object makes access to data related to a particular
filerevision convenient."""
def __init__(self, repo, path, changeid=None, fileid=None):
"""changeid can be a changeset revision, node, or tag.
fileid can be a file revision or node."""
self._repo = repo
self._path = path
Benoit Boissinot
fix filectxt to really work...
r2643 assert changeid or fileid
if not fileid:
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 # if given a changeset id, go ahead and look up the file
Benoit Boissinot
fix filectxt to really work...
r2643 self._changeid = changeid
self._changectx = self.changectx()
Benoit Boissinot
context.py: self.repo is not defined, change to self._repo
r2627 self._filelog = self._repo.file(self._path)
Benoit Boissinot
fix filectxt to really work...
r2643 self._filenode = self._changectx.filenode(self._path)
else:
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 # else be lazy
self._filelog = self._repo.file(self._path)
Benoit Boissinot
fix filectxt to really work...
r2643 self._filenode = self._filelog.lookup(fileid)
self._changeid = self._filelog.linkrev(self._filenode)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 self._filerev = self._filelog.rev(self._filenode)
Benoit Boissinot
fix filectxt to really work...
r2643 def changectx(self):
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 try:
Benoit Boissinot
fix filectxt to really work...
r2643 return self._changectx
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 except AttributeError:
Benoit Boissinot
fix filectxt to really work...
r2643 self._changectx = changectx(self._repo, self._changeid)
return self._changectx
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
Benoit Boissinot
fix filectxt to really work...
r2643 def rev(self): return self.changectx().rev()
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
Add context.py: changeset and file revision contexts
r2563
def data(self): return self._filelog.read(self._filenode)
def metadata(self): return self._filelog.readmeta(self._filenode)
def renamed(self): return self._filelog.renamed(self._filenode)
def parents(self):
# need to fix for renames
p = self._filelog.parents(self._filenode)
return [ filectx(self._repo, self._path, fileid=x) for x in p ]
def children(self):
# hard for renames
c = self._filelog.children(self._filenode)
return [ filectx(self._repo, self._path, fileid=x) for x in c ]
Matt Mackall
Convert hg annotate to context api
r2566
def annotate(self):
return self._filelog.annotate(self._filenode)