hg-git: hggit/overlay.py annotate

annotate hggit/overlay.py @ 829:64fa5ea18b89

manifest: add matches() to overlay 0cc283f44655 in upstream Mercurial added a matches function to the manifest. This broke 'hg incoming -p' with hg-git. This patch adds a simple implementation that fixes the problem. This was caught by the tests, and now the tests pass.

author	Durham Goode <durham@fb.com>
date	Tue, 25 Nov 2014 10:53:11 -0800
parents	c99941ff2d28
children	eba7dcfab1bb

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
829 64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	73 def matches(self, match):
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	74 '''generate a new manifest filtered by the match argument'''
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	75 if match.always():
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	76 return self.copy()
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	77
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	78 mf = self.copy()
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	79 for fn in mf.keys():
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	80 if not match(fn):
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	81 del mf[fn]
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	82 return mf
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	83
597 3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	84 def iteritems(self):
3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	85 self.load()
3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	86 return self._map.iteritems()
3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	87
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	88 def __iter__(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	89 self.load()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	90 return self._map.__iter__()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	91
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	92 def __getitem__(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	93 self.load()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	94 return self._map[path]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	95
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	96 def __delitem__(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	97 del self._map[path]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	98
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	99 class overlayfilectx(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	100 def __init__(self, repo, path, fileid=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	101 self.repo = repo
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	102 self._path = path
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	103 self.fileid = fileid
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	104
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	105 # this is a hack to skip copy detection
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	106 def ancestors(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	107 return [self, self]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	108
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	109 def filenode(self):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	110 return nullid
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	111
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	112 def rev(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	113 return -1
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	114
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	115 def path(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	116 return self._path
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	117
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	118 def filelog(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	119 return self.fileid
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	120
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	121 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	122 blob = self.repo.handler.git.get_object(_maybehex(self.fileid))
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	123 return blob.data
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	124
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	125 class overlaychangectx(context.changectx):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	126 def __init__(self, repo, sha):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	127 self.repo = repo
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	128 if not isinstance(sha, basestring):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	129 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	130 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	131 self._overlay = getattr(repo, 'gitoverlay', repo)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	132 self._rev = self._overlay.rev(bin(self.commit.id))
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	133
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	134 def node(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	135 return bin(self.commit.id)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	136
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	137 def rev(self):
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	138 return self._rev
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	139
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	140 def date(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	141 return self.commit.author_time, self.commit.author_timezone
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	142
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	143 def branch(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	144 return 'default'
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	145
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	146 def user(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	147 return self.commit.author
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	148
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	149 def files(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	150 return []
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	151
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	152 def extra(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	153 return {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	154
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	155 def description(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	156 return self.commit.message
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	157
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	158 def parents(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	159 return [overlaychangectx(self.repo, sha) for sha in self.commit.parents]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	160
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	161 def manifestnode(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	162 return bin(self.commit.tree)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	163
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	164 def hex(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	165 return self.commit.id
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	166
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	167 def tags(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	168 return []
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	169
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	170 def bookmarks(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	171 return []
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 manifest(self):
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	174 return overlaymanifest(self._overlay, self.commit.tree)
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	175
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	176 def filectx(self, path, filelog=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	177 mf = self.manifest()
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	178 return overlayfilectx(self._overlay, path, mf[path])
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	179
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	180 def flags(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	181 mf = self.manifest()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	182 return mf.flags(path)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	183
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	184 def __nonzero__(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	185 return True
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	186
568 41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	187 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	188 try:
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	189 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	190 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	191 except ImportError:
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	192 return 1
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	193
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	194 class overlayrevlog(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	195 def __init__(self, repo, base):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	196 self.repo = repo
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	197 self.base = base
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	198
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	199 def parents(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	200 gitrev = self.repo.revmap.get(n)
689 aa8519daf037 overlayrevlog: handle rev = 0 correctly Siddharth Agarwal <sid0@fb.com> parents: 684 diff changeset	201 if gitrev is None:
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	202 # we've reached a revision we have
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	203 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	204 commit = self.repo.handler.git.get_object(_maybehex(n))
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	205
690 c99941ff2d28 overlayrevlog: handle root commits correctly Siddharth Agarwal <sid0@fb.com> parents: 689 diff changeset	206 if not commit.parents:
c99941ff2d28 overlayrevlog: handle root commits correctly Siddharth Agarwal <sid0@fb.com> parents: 689 diff changeset	207 return [nullid, nullid]
c99941ff2d28 overlayrevlog: handle root commits correctly Siddharth Agarwal <sid0@fb.com> parents: 689 diff changeset	208
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	209 def gitorhg(n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	210 hn = self.repo.handler.map_hg_get(hex(n))
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	211 if hn is not None:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	212 return bin(hn)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	213 return n
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	214
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	215 # currently ignores the octopus
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	216 p1 = gitorhg(bin(commit.parents[0]))
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	217 if len(commit.parents) > 1:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	218 p2 = gitorhg(bin(commit.parents[1]))
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	219 else:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	220 p2 = nullid
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	221
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	222 return [p1, p2]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	223
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	224 def ancestor(self, a, b):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	225 anode = self.repo.nodemap.get(a)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	226 bnode = self.repo.nodemap.get(b)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	227 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	228 return self.base.ancestor(a, b)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	229 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	230 if ancs:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	231 return min(map(self.node, ancs))
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	232 return nullid
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	233
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	234 def parentrevs(self, rev):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	235 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	236
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	237 def node(self, rev):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	238 gitnode = self.repo.nodemap.get(rev)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	239 if gitnode is None:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	240 return self.base.node(rev)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	241 return gitnode
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	242
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	243 def rev(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	244 gitrev = self.repo.revmap.get(n)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	245 if gitrev is None:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	246 return self.base.rev(n)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	247 return gitrev
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	248
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	249 def __len__(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	250 return len(self.repo.handler.repo) + len(self.repo.revmap)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	251
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	252 class overlaymanifestlog(overlayrevlog):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	253 def read(self, sha):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	254 if sha == nullid:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	255 return manifest.manifestdict()
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	256 return overlaymanifest(self.repo, sha)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	257
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	258 class overlaychangelog(overlayrevlog):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	259 def read(self, sha):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	260 if isinstance(sha, int):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	261 sha = self.node(sha)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	262 if sha == nullid:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	263 return (nullid, "", (0, 0), [], "", {})
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	264 return overlaychangectx(self.repo, sha)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	265
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	266
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	267 class overlayrepo(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	268 def __init__(self, handler, commits, refs):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	269 self.handler = handler
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	270
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	271 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	272 self.manifest = overlaymanifestlog(self, handler.repo.manifest)
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	273
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	274 # for incoming -p
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	275 self.root = handler.repo.root
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	276 self.getcwd = handler.repo.getcwd
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	277 # self.status = handler.repo.status
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	278 self.ui = handler.repo.ui
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	279
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	280 self.revmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	281 self.nodemap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	282 self.refmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	283 self.tagmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	284
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	285 self._makemaps(commits, refs)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	286
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	287 def __getitem__(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	288 if n not in self.revmap:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	289 return self.handler.repo[n]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	290 return overlaychangectx(self, n)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	291
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	292 def _handlerhack(self, method, args, *kwargs):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	293 nothing = object()
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	294 r = self.handler.repo
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	295 oldhandler = getattr(r, 'handler', nothing)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	296 oldoverlay = getattr(r, 'gitoverlay', nothing)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	297 r.handler = self.handler
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	298 r.gitoverlay = self
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	299 try:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	300 return getattr(r, method)(args, *kwargs)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	301 finally:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	302 if oldhandler is nothing:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	303 del r.handler
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	304 else:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	305 r.handler = oldhandler
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	306 if oldoverlay is nothing:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	307 del r.gitoverlay
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	308 else:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	309 r.gitoverlay = oldoverlay
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	310
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	311 def status(self, args, *kwargs):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	312 return self._handlerhack('status', args, *kwargs)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	313
557 4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	314 def node(self, n):
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	315 """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	316 if bin(n) in self.revmap:
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	317 return n
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	318 return self.handler.map_hg_get(n)
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	319
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	320 def nodebookmarks(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	321 return self.refmap.get(n, [])
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 nodetags(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	324 return self.tagmap.get(n, [])
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	325
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	326 def rev(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	327 return self.revmap[n]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	328
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	329 def filectx(self, path, fileid=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	330 return overlayfilectx(self, path, fileid=fileid)
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 def _makemaps(self, commits, refs):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	333 baserev = self.handler.repo['tip'].rev()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	334 self.revmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	335 self.nodemap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	336 for i, n in enumerate(commits):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	337 rev = baserev + i + 1
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	338 self.revmap[n] = rev
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	339 self.nodemap[rev] = n
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	340
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	341 self.refmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	342 self.tagmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	343 for ref in refs:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	344 if ref.startswith('refs/heads/'):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	345 refname = ref[11:]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	346 self.refmap.setdefault(bin(refs[ref]), []).append(refname)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	347 elif ref.startswith('refs/tags/'):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	348 tagname = ref[10:]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	349 self.tagmap.setdefault(bin(refs[ref]), []).append(tagname)

Mercurial > hg-git

annotate hggit/overlay.py @ 829:64fa5ea18b89