hg-git: hggit/overlay.py annotate

annotate hggit/overlay.py @ 620:0a514e303a06

overlay: add kludge to make sure we only ever give hexshas to dulwich

author	Augie Fackler <raf@durin42.com>
date	Fri, 13 Dec 2013 12:54:39 -0500
parents	bf8518b09d57
children	41bfd48ef2a2

rev	line source
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	1 # overlay classes for repositories
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	2 # unifies access to unimported git objects and committed hg objects
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	3 # designed to support incoming
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	4 #
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	5 # incomplete, implemented on demand
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	6
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	7 from mercurial import ancestor
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	8 from mercurial import manifest
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	9 from mercurial import context
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	10 from mercurial.node import bin, hex, nullid
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	11 from mercurial import localrepo
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	12
620 0a514e303a06 overlay: add kludge to make sure we only ever give hexshas to dulwich Augie Fackler <raf@durin42.com> parents: 612 diff changeset	13 def _maybehex(n):
0a514e303a06 overlay: add kludge to make sure we only ever give hexshas to dulwich Augie Fackler <raf@durin42.com> parents: 612 diff changeset	14 if len(n) == 20:
0a514e303a06 overlay: add kludge to make sure we only ever give hexshas to dulwich Augie Fackler <raf@durin42.com> parents: 612 diff changeset	15 return hex(n)
0a514e303a06 overlay: add kludge to make sure we only ever give hexshas to dulwich Augie Fackler <raf@durin42.com> parents: 612 diff changeset	16 return n
0a514e303a06 overlay: add kludge to make sure we only ever give hexshas to dulwich Augie Fackler <raf@durin42.com> parents: 612 diff changeset	17
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	18 class overlaymanifest(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	19 def __init__(self, repo, sha):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	20 self.repo = repo
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	21 self.tree = repo.handler.git.get_object(sha)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	22 self._map = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	23 self._flagmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	24
466 ac16efd25cc4 overlaymanifest: add the withflags method introduced in hg change a1dcd842ce17 Augie Fackler <raf@durin42.com> parents: 423 diff changeset	25 def withflags(self):
ac16efd25cc4 overlaymanifest: add the withflags method introduced in hg change a1dcd842ce17 Augie Fackler <raf@durin42.com> parents: 423 diff changeset	26 self.load()
ac16efd25cc4 overlaymanifest: add the withflags method introduced in hg change a1dcd842ce17 Augie Fackler <raf@durin42.com> parents: 423 diff changeset	27 return set([path for path, flag in self._flagmap.iteritems()
ac16efd25cc4 overlaymanifest: add the withflags method introduced in hg change a1dcd842ce17 Augie Fackler <raf@durin42.com> parents: 423 diff changeset	28 if flag & 020100])
ac16efd25cc4 overlaymanifest: add the withflags method introduced in hg change a1dcd842ce17 Augie Fackler <raf@durin42.com> parents: 423 diff changeset	29
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	30 def copy(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	31 return overlaymanifest(self.repo, self.tree.id)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	32
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	33 def keys(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	34 self.load()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	35 return self._map.keys()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	36
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	37 def iterkeys(self):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	38 return iter(self.keys())
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	39
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	40 def flags(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	41 self.load()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	42
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	43 def hgflag(gitflag):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	44 if gitflag & 0100:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	45 return 'x'
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	46 elif gitflag & 020000:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	47 return 'l'
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	48 else:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	49 return ''
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	50
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	51 return hgflag(self._flagmap[path])
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	52
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	53 def load(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	54 if self._map is not None:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	55 return
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	56
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	57 self._map = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	58 self._flagmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	59
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	60 def addtree(tree, dirname):
423 f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	61 for entry in tree.iteritems():
f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	62 if entry.mode & 040000:
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	63 # expand directory
423 f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	64 subtree = self.repo.handler.git.get_object(entry.sha)
f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	65 addtree(subtree, dirname + entry.path + '/')
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	66 else:
423 f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	67 path = dirname + entry.path
f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	68 self._map[path] = bin(entry.sha)
f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	69 self._flagmap[path] = entry.mode
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	70
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	71 addtree(self.tree, '')
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	72
597 3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	73 def iteritems(self):
3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	74 self.load()
3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	75 return self._map.iteritems()
3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	76
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	77 def __iter__(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	78 self.load()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	79 return self._map.__iter__()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	80
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	81 def __getitem__(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	82 self.load()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	83 return self._map[path]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	84
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	85 def __delitem__(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	86 del self._map[path]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	87
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	88 class overlayfilectx(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	89 def __init__(self, repo, path, fileid=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	90 self.repo = repo
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	91 self._path = path
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	92 self.fileid = fileid
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	93
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	94 # this is a hack to skip copy detection
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	95 def ancestors(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	96 return [self, self]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	97
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	98 def filenode(self):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	99 return nullid
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	100
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	101 def rev(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	102 return -1
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	103
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	104 def path(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	105 return self._path
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	106
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	107 def filelog(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	108 return self.fileid
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	109
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	110 def data(self):
620 0a514e303a06 overlay: add kludge to make sure we only ever give hexshas to dulwich Augie Fackler <raf@durin42.com> parents: 612 diff changeset	111 blob = self.repo.handler.git.get_object(_maybehex(self.fileid))
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	112 return blob.data
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	113
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	114 class overlaychangectx(context.changectx):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	115 def __init__(self, repo, sha):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	116 self.repo = repo
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	117 if not isinstance(sha, basestring):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	118 sha = sha.hex()
620 0a514e303a06 overlay: add kludge to make sure we only ever give hexshas to dulwich Augie Fackler <raf@durin42.com> parents: 612 diff changeset	119 self.commit = repo.handler.git.get_object(_maybehex(sha))
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	120 self._overlay = getattr(repo, 'gitoverlay', repo)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	121 self._rev = self._overlay.rev(bin(self.commit.id))
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	122
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	123 def node(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	124 return bin(self.commit.id)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	125
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	126 def rev(self):
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	127 return self._rev
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	128
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	129 def date(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	130 return self.commit.author_time, self.commit.author_timezone
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	131
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	132 def branch(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	133 return 'default'
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	134
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	135 def user(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	136 return self.commit.author
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	137
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	138 def files(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	139 return []
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	140
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	141 def extra(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	142 return {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	143
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	144 def description(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	145 return self.commit.message
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	146
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	147 def parents(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	148 return [overlaychangectx(self.repo, sha) for sha in self.commit.parents]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	149
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	150 def manifestnode(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	151 return bin(self.commit.tree)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	152
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	153 def hex(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	154 return self.commit.id
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	155
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	156 def tags(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	157 return []
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	158
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	159 def bookmarks(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	160 return []
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	161
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	162 def manifest(self):
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	163 return overlaymanifest(self._overlay, self.commit.tree)
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	164
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	165 def filectx(self, path, filelog=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	166 mf = self.manifest()
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	167 return overlayfilectx(self._overlay, path, mf[path])
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	168
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	169 def flags(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	170 mf = self.manifest()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	171 return mf.flags(path)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	172
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	173 def __nonzero__(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	174 return True
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	175
568 41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	176 def phase(self):
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	177 try:
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	178 from mercurial import phases
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	179 return phases.draft
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	180 except ImportError:
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	181 return 1
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	182
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	183 class overlayrevlog(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	184 def __init__(self, repo, base):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	185 self.repo = repo
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	186 self.base = base
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	187
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	188 def parents(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	189 gitrev = self.repo.revmap.get(n)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	190 if not gitrev:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	191 # we've reached a revision we have
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	192 return self.base.parents(n)
620 0a514e303a06 overlay: add kludge to make sure we only ever give hexshas to dulwich Augie Fackler <raf@durin42.com> parents: 612 diff changeset	193 commit = self.repo.handler.git.get_object(_maybehex(n))
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	194
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	195 def gitorhg(n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	196 hn = self.repo.handler.map_hg_get(hex(n))
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	197 if hn is not None:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	198 return bin(hn)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	199 return n
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	200
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	201 # currently ignores the octopus
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	202 p1 = gitorhg(bin(commit.parents[0]))
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	203 if len(commit.parents) > 1:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	204 p2 = gitorhg(bin(commit.parents[1]))
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	205 else:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	206 p2 = nullid
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	207
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	208 return [p1, p2]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	209
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	210 def ancestor(self, a, b):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	211 anode = self.repo.nodemap.get(a)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	212 bnode = self.repo.nodemap.get(b)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	213 if anode is None and bnode is None:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	214 return self.base.ancestor(a, b)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	215 ancs = ancestor.ancestors(self.parentrevs, a, b)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	216 if ancs:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	217 return min(map(self.node, ancs))
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	218 return nullid
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	219
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	220 def parentrevs(self, rev):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	221 return [self.rev(p) for p in self.parents(self.node(rev))]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	222
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	223 def node(self, rev):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	224 gitnode = self.repo.nodemap.get(rev)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	225 if gitnode is None:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	226 return self.base.node(rev)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	227 return gitnode
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	228
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	229 def rev(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	230 gitrev = self.repo.revmap.get(n)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	231 if gitrev is None:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	232 return self.base.rev(n)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	233 return gitrev
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	234
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	235 def nodesbetween(self, nodelist, revs):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	236 # this is called by pre-1.9 incoming with the nodelist we returned from
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	237 # getremotechanges. Just return it back.
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	238 return [nodelist]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	239
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	240 def __len__(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	241 return len(self.repo.handler.repo) + len(self.repo.revmap)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	242
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	243 class overlaymanifestlog(overlayrevlog):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	244 def read(self, sha):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	245 if sha == nullid:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	246 return manifest.manifestdict()
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	247 return overlaymanifest(self.repo, sha)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	248
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	249 class overlaychangelog(overlayrevlog):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	250 def read(self, sha):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	251 if isinstance(sha, int):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	252 sha = self.node(sha)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	253 if sha == nullid:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	254 return (nullid, "", (0, 0), [], "", {})
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	255 return overlaychangectx(self.repo, sha)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	256
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	257
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	258 class overlayrepo(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	259 def __init__(self, handler, commits, refs):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	260 self.handler = handler
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	261
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	262 self.changelog = overlaychangelog(self, handler.repo.changelog)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	263 self.manifest = overlaymanifestlog(self, handler.repo.manifest)
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	264
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	265 # for incoming -p
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	266 self.root = handler.repo.root
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	267 self.getcwd = handler.repo.getcwd
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	268 # self.status = handler.repo.status
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	269 self.ui = handler.repo.ui
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	270
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	271 self.revmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	272 self.nodemap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	273 self.refmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	274 self.tagmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	275
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	276 self._makemaps(commits, refs)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	277
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	278 def __getitem__(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	279 if n not in self.revmap:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	280 return self.handler.repo[n]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	281 return overlaychangectx(self, n)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	282
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	283 def _handlerhack(self, method, args, *kwargs):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	284 nothing = object()
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	285 r = self.handler.repo
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	286 oldhandler = getattr(r, 'handler', nothing)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	287 oldoverlay = getattr(r, 'gitoverlay', nothing)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	288 r.handler = self.handler
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	289 r.gitoverlay = self
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	290 try:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	291 return getattr(r, method)(args, *kwargs)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	292 finally:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	293 if oldhandler is nothing:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	294 del r.handler
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	295 else:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	296 r.handler = oldhandler
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	297 if oldoverlay is nothing:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	298 del r.gitoverlay
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	299 else:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	300 r.gitoverlay = oldoverlay
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	301
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	302 def status(self, args, *kwargs):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	303 return self._handlerhack('status', args, *kwargs)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	304
557 4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	305 def node(self, n):
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	306 """Returns an Hg or Git hash for the specified Git hash"""
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	307 if bin(n) in self.revmap:
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	308 return n
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	309 return self.handler.map_hg_get(n)
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	310
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	311 def nodebookmarks(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	312 return self.refmap.get(n, [])
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	313
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	314 def nodetags(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	315 return self.tagmap.get(n, [])
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	316
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	317 def rev(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	318 return self.revmap[n]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	319
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	320 def filectx(self, path, fileid=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	321 return overlayfilectx(self, path, fileid=fileid)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	322
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	323 def _makemaps(self, commits, refs):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	324 baserev = self.handler.repo['tip'].rev()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	325 self.revmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	326 self.nodemap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	327 for i, n in enumerate(commits):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	328 rev = baserev + i + 1
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	329 self.revmap[n] = rev
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	330 self.nodemap[rev] = n
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	331
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	332 self.refmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	333 self.tagmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	334 for ref in refs:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	335 if ref.startswith('refs/heads/'):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	336 refname = ref[11:]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	337 self.refmap.setdefault(bin(refs[ref]), []).append(refname)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	338 elif ref.startswith('refs/tags/'):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	339 tagname = ref[10:]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	340 self.tagmap.setdefault(bin(refs[ref]), []).append(tagname)

Mercurial > hg-git

annotate hggit/overlay.py @ 620:0a514e303a06