hg-git: hggit/overlay.py annotate

annotate hggit/overlay.py @ 956:06385a2b30f3

init: handle AttributeError in addition to ImportError If a module doesn't exist, it yields an ImportError, if an attribtue doesn't exist on a module, it yields an AttributeError

author	timeless@gmail.com
date	Tue, 29 Dec 2015 18:06:14 +0000
parents	db308eba5251
children	07473e474bc4

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
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	11
620 0a514e303a06 overlay: add kludge to make sure we only ever give hexshas to dulwich Augie Fackler <raf@durin42.com> parents: 612 diff changeset	12 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	13 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	14 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	15 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	16
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	17 class overlaymanifest(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	18 def __init__(self, repo, sha):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	19 self.repo = repo
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	20 self.tree = repo.handler.git.get_object(sha)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	21 self._map = None
856 15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	22 self._flags = None
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	23
466 ac16efd25cc4 overlaymanifest: add the withflags method introduced in hg change a1dcd842ce17 Augie Fackler <raf@durin42.com> parents: 423 diff changeset	24 def withflags(self):
ac16efd25cc4 overlaymanifest: add the withflags method introduced in hg change a1dcd842ce17 Augie Fackler <raf@durin42.com> parents: 423 diff changeset	25 self.load()
856 15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	26 return set([path for path, flag in self._flags.iteritems()
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	27 if flag != ''])
466 ac16efd25cc4 overlaymanifest: add the withflags method introduced in hg change a1dcd842ce17 Augie Fackler <raf@durin42.com> parents: 423 diff changeset	28
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	29 def copy(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	30 return overlaymanifest(self.repo, self.tree.id)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	31
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	32 def keys(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	33 self.load()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	34 return self._map.keys()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	35
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	36 def iterkeys(self):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	37 return iter(self.keys())
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	38
856 15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	39 def load(self):
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	40 if self._map is not None:
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	41 return
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	42
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	43 self._map = {}
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	44 self._flags = {}
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	45
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	46 def hgflag(gitflag):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	47 if gitflag & 0100:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	48 return 'x'
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	49 elif gitflag & 020000:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	50 return 'l'
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	51 else:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	52 return ''
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	53
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	54 def addtree(tree, dirname):
423 f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	55 for entry in tree.iteritems():
f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	56 if entry.mode & 040000:
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	57 # expand directory
423 f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	58 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	59 addtree(subtree, dirname + entry.path + '/')
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	60 else:
423 f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	61 path = dirname + entry.path
f29401590803 overlay: stop using deprecated tree.entries() method Augie Fackler <durin42@gmail.com> parents: 408 diff changeset	62 self._map[path] = bin(entry.sha)
856 15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	63 self._flags[path] = hgflag(entry.mode)
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	64
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	65 addtree(self.tree, '')
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	66
829 64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	67 def matches(self, match):
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	68 '''generate a new manifest filtered by the match argument'''
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	69 if match.always():
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	70 return self.copy()
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	71
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	72 mf = self.copy()
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	73 for fn in mf.keys():
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	74 if not match(fn):
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	75 del mf[fn]
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	76 return mf
64fa5ea18b89 manifest: add matches() to overlay Durham Goode <durham@fb.com> parents: 690 diff changeset	77
597 3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	78 def iteritems(self):
3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	79 self.load()
3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	80 return self._map.iteritems()
3964de9961ec overlaymanifest: add iteritems(), used by recent hg versions Augie Fackler <raf@durin42.com> parents: 570 diff changeset	81
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	82 def __iter__(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	83 self.load()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	84 return self._map.__iter__()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	85
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	86 def __getitem__(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	87 self.load()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	88 return self._map[path]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	89
856 15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	90 def __contains__(self, path):
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	91 self.load()
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	92 return path in self._map
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	93
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	94 def get(self, path, default=None):
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	95 self.load()
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	96 return self._map.get(path, default)
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	97
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	98 def diff(self, m2, clean=False):
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	99 self.load()
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	100 if isinstance(m2, overlaymanifest):
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	101 m2.load()
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	102
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	103 # below code copied from manifest.py:manifestdict.diff
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	104 diff = {}
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	105
899 11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	106 try:
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	107 m2flagget = m2.flags
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	108 except AttributeError:
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	109 # Mercurial <= 3.3
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	110 m2flagget = m2._flags.get
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	111
856 15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	112 for fn, n1 in self.iteritems():
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	113 fl1 = self._flags.get(fn, '')
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	114 n2 = m2.get(fn, None)
899 11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	115 fl2 = m2flagget(fn, '')
856 15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	116 if n2 is None:
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	117 fl2 = ''
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	118 if n1 != n2 or fl1 != fl2:
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	119 diff[fn] = ((n1, fl1), (n2, fl2))
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	120 elif clean:
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	121 diff[fn] = None
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	122
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	123 for fn, n2 in m2.iteritems():
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	124 if fn not in self:
899 11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	125 fl2 = m2flagget(fn, '')
856 15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	126 diff[fn] = ((None, ''), (n2, fl2))
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	127
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	128 return diff
15d2b119ca99 overlaymanifest: implement more methods for Mercurial 3.3 compatibility Siddharth Agarwal <sid0@fb.com> parents: 855 diff changeset	129
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	130 def __delitem__(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	131 del self._map[path]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	132
899 11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	133 def wrapmanifestdictdiff(orig, self, m2, clean=False):
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	134 '''avoid calling into lazymanifest code if m2 is an overlaymanifest'''
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	135 if isinstance(m2, overlaymanifest):
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	136 diff = m2.diff(self, clean=clean)
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	137 # since we calculated the diff with m2 vs m1, flip it around
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	138 for fn in diff:
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	139 c1, c2 = diff[fn]
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	140 diff[fn] = c2, c1
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	141 return diff
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	142 else:
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	143 return orig(self, m2, clean=clean)
11ca21820a95 overlay: adapt diff to work with lazymanifests Siddharth Agarwal <sid0@fb.com> parents: 896 diff changeset	144
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	145 class overlayfilectx(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	146 def __init__(self, repo, path, fileid=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	147 self.repo = repo
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	148 self._path = path
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	149 self.fileid = fileid
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	150
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	151 # this is a hack to skip copy detection
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	152 def ancestors(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	153 return [self, self]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	154
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	155 def filenode(self):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	156 return nullid
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	157
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	158 def rev(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	159 return -1
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 path(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	162 return self._path
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 filelog(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	165 return self.fileid
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 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	168 blob = self.repo.handler.git.get_object(_maybehex(self.fileid))
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	169 return blob.data
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	170
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	171 class overlaychangectx(context.changectx):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	172 def __init__(self, repo, sha):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	173 self.repo = repo
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	174 if not isinstance(sha, basestring):
896 431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	175 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	176 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	177 self._overlay = getattr(repo, 'gitoverlay', repo)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	178 self._rev = self._overlay.rev(bin(self.commit.id))
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 node(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	181 return bin(self.commit.id)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	182
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	183 def rev(self):
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	184 return self._rev
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	185
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	186 def date(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	187 return self.commit.author_time, self.commit.author_timezone
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	188
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	189 def branch(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	190 return 'default'
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	191
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	192 def user(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	193 return self.commit.author
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 files(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	196 return []
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	197
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	198 def extra(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	199 return {}
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 def description(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	202 return self.commit.message
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	203
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	204 def parents(self):
900 db308eba5251 overlaychangectx: use overlayrevlog logic to determine parents Siddharth Agarwal <sid0@fb.com> parents: 899 diff changeset	205 cl = self.repo.changelog
db308eba5251 overlaychangectx: use overlayrevlog logic to determine parents Siddharth Agarwal <sid0@fb.com> parents: 899 diff changeset	206 parents = cl.parents(cl.node(self._rev))
873 517cf1b5e626 overlaychangectx: return nullrev if commit has no parents Siddharth Agarwal <sid0@fb.com> parents: 856 diff changeset	207 if not parents:
517cf1b5e626 overlaychangectx: return nullrev if commit has no parents Siddharth Agarwal <sid0@fb.com> parents: 856 diff changeset	208 return [self.repo['null']]
900 db308eba5251 overlaychangectx: use overlayrevlog logic to determine parents Siddharth Agarwal <sid0@fb.com> parents: 899 diff changeset	209 if parents[1] == nullid:
db308eba5251 overlaychangectx: use overlayrevlog logic to determine parents Siddharth Agarwal <sid0@fb.com> parents: 899 diff changeset	210 parents = parents[:-1]
db308eba5251 overlaychangectx: use overlayrevlog logic to determine parents Siddharth Agarwal <sid0@fb.com> parents: 899 diff changeset	211 return [self.repo[sha] for sha in parents]
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	212
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	213 def manifestnode(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	214 return bin(self.commit.tree)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	215
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	216 def hex(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	217 return self.commit.id
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	218
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	219 def tags(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	220 return []
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 def bookmarks(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	223 return []
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	224
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	225 def manifest(self):
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	226 return overlaymanifest(self._overlay, self.commit.tree)
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	227
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	228 def filectx(self, path, filelog=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	229 mf = self.manifest()
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	230 return overlayfilectx(self._overlay, path, mf[path])
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	231
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	232 def flags(self, path):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	233 mf = self.manifest()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	234 return mf.flags(path)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	235
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	236 def __nonzero__(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	237 return True
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	238
568 41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	239 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	240 try:
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	241 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	242 return phases.draft
956 06385a2b30f3 init: handle AttributeError in addition to ImportError timeless@gmail.com parents: 900 diff changeset	243 except (AttributeError, ImportError):
568 41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	244 return 1
41f6e3df67b1 overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo) David M. Carr <david@carrclan.us> parents: 466 diff changeset	245
855 4538981d2c3f overlaychangelog: return tuples for read() Siddharth Agarwal <sid0@fb.com> parents: 854 diff changeset	246 def totuple(self):
4538981d2c3f overlaychangelog: return tuples for read() Siddharth Agarwal <sid0@fb.com> parents: 854 diff changeset	247 return (self.commit.tree, self.user(), self.date(), self.files(),
4538981d2c3f overlaychangelog: return tuples for read() Siddharth Agarwal <sid0@fb.com> parents: 854 diff changeset	248 self.description(), self.extra())
4538981d2c3f overlaychangelog: return tuples for read() Siddharth Agarwal <sid0@fb.com> parents: 854 diff changeset	249
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	250 class overlayrevlog(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	251 def __init__(self, repo, base):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	252 self.repo = repo
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	253 self.base = base
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	254
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	255 def parents(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	256 gitrev = self.repo.revmap.get(n)
689 aa8519daf037 overlayrevlog: handle rev = 0 correctly Siddharth Agarwal <sid0@fb.com> parents: 684 diff changeset	257 if gitrev is None:
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	258 # we've reached a revision we have
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	259 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	260 commit = self.repo.handler.git.get_object(_maybehex(n))
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	261
690 c99941ff2d28 overlayrevlog: handle root commits correctly Siddharth Agarwal <sid0@fb.com> parents: 689 diff changeset	262 if not commit.parents:
c99941ff2d28 overlayrevlog: handle root commits correctly Siddharth Agarwal <sid0@fb.com> parents: 689 diff changeset	263 return [nullid, nullid]
c99941ff2d28 overlayrevlog: handle root commits correctly Siddharth Agarwal <sid0@fb.com> parents: 689 diff changeset	264
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	265 def gitorhg(n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	266 hn = self.repo.handler.map_hg_get(hex(n))
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	267 if hn is not None:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	268 return bin(hn)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	269 return n
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 # currently ignores the octopus
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	272 p1 = gitorhg(bin(commit.parents[0]))
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	273 if len(commit.parents) > 1:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	274 p2 = gitorhg(bin(commit.parents[1]))
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	275 else:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	276 p2 = nullid
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 return [p1, p2]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	279
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	280 def ancestor(self, a, b):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	281 anode = self.repo.nodemap.get(a)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	282 bnode = self.repo.nodemap.get(b)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	283 if anode is None and bnode is None:
896 431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	284 return self.base.ancestor(a, b)
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	285 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	286 if ancs:
896 431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	287 return min(map(self.node, ancs))
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	288 return nullid
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	289
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	290 def parentrevs(self, rev):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	291 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	292
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	293 def node(self, rev):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	294 gitnode = self.repo.nodemap.get(rev)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	295 if gitnode is None:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	296 return self.base.node(rev)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	297 return gitnode
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	298
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	299 def rev(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	300 gitrev = self.repo.revmap.get(n)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	301 if gitrev is None:
896 431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	302 return self.base.rev(n)
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	303 return gitrev
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	304
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	305 def __len__(self):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	306 return len(self.repo.handler.repo) + len(self.repo.revmap)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	307
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	308 class overlaymanifestlog(overlayrevlog):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	309 def read(self, sha):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	310 if sha == nullid:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	311 return manifest.manifestdict()
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	312 return overlaymanifest(self.repo, sha)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	313
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	314 class overlaychangelog(overlayrevlog):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	315 def read(self, sha):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	316 if isinstance(sha, int):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	317 sha = self.node(sha)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	318 if sha == nullid:
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	319 return (nullid, "", (0, 0), [], "", {})
855 4538981d2c3f overlaychangelog: return tuples for read() Siddharth Agarwal <sid0@fb.com> parents: 854 diff changeset	320 try:
4538981d2c3f overlaychangelog: return tuples for read() Siddharth Agarwal <sid0@fb.com> parents: 854 diff changeset	321 return self.base.read(sha)
4538981d2c3f overlaychangelog: return tuples for read() Siddharth Agarwal <sid0@fb.com> parents: 854 diff changeset	322 except LookupError:
4538981d2c3f overlaychangelog: return tuples for read() Siddharth Agarwal <sid0@fb.com> parents: 854 diff changeset	323 return overlaychangectx(self.repo, sha).totuple()
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	324
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	325 class overlayrepo(object):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	326 def __init__(self, handler, commits, refs):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	327 self.handler = handler
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	328
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	329 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	330 self.manifest = overlaymanifestlog(self, handler.repo.manifest)
408 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 # for incoming -p
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	333 self.root = handler.repo.root
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	334 self.getcwd = handler.repo.getcwd
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	335 # self.status = handler.repo.status
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	336 self.ui = handler.repo.ui
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	337
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	338 self.revmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	339 self.nodemap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	340 self.refmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	341 self.tagmap = None
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	342
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	343 self._makemaps(commits, refs)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	344
854 eba7dcfab1bb overlay: add namespace support to overlayrepo to support Mercurial >= 3.3 Siddharth Agarwal <sid0@fb.com> parents: 829 diff changeset	345 try:
eba7dcfab1bb overlay: add namespace support to overlayrepo to support Mercurial >= 3.3 Siddharth Agarwal <sid0@fb.com> parents: 829 diff changeset	346 # Mercurial >= 3.3
eba7dcfab1bb overlay: add namespace support to overlayrepo to support Mercurial >= 3.3 Siddharth Agarwal <sid0@fb.com> parents: 829 diff changeset	347 from mercurial import namespaces
eba7dcfab1bb overlay: add namespace support to overlayrepo to support Mercurial >= 3.3 Siddharth Agarwal <sid0@fb.com> parents: 829 diff changeset	348 self.names = namespaces.namespaces()
956 06385a2b30f3 init: handle AttributeError in addition to ImportError timeless@gmail.com parents: 900 diff changeset	349 except (AttributeError, ImportError):
854 eba7dcfab1bb overlay: add namespace support to overlayrepo to support Mercurial >= 3.3 Siddharth Agarwal <sid0@fb.com> parents: 829 diff changeset	350 pass
eba7dcfab1bb overlay: add namespace support to overlayrepo to support Mercurial >= 3.3 Siddharth Agarwal <sid0@fb.com> parents: 829 diff changeset	351
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	352 def __getitem__(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	353 if n not in self.revmap:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	354 return self.handler.repo[n]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	355 return overlaychangectx(self, n)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	356
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	357 def _handlerhack(self, method, args, *kwargs):
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	358 nothing = object()
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	359 r = self.handler.repo
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	360 oldhandler = getattr(r, 'handler', nothing)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	361 oldoverlay = getattr(r, 'gitoverlay', nothing)
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	362 r.handler = self.handler
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	363 r.gitoverlay = self
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	364 try:
896 431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	365 return getattr(r, method)(args, *kwargs)
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	366 finally:
896 431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	367 if oldhandler is nothing:
431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	368 del r.handler
431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	369 else:
431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	370 r.handler = oldhandler
431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	371 if oldoverlay is nothing:
431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	372 del r.gitoverlay
431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	373 else:
431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	374 r.gitoverlay = oldoverlay
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	375
bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	376 def status(self, args, *kwargs):
896 431d5121528d overlay: flake8 cleanup Sean Farley <sean@farley.io> parents: 895 diff changeset	377 return self._handlerhack('status', args, *kwargs)
612 bf8518b09d57 overlays: fix incoming support for hg 2.8 Augie Fackler <raf@durin42.com> parents: 597 diff changeset	378
557 4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	379 def node(self, n):
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	380 """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	381 if bin(n) in self.revmap:
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	382 return n
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	383 return self.handler.map_hg_get(n)
4f4ab2d89375 gitrepo: initial support for listkeys David M. Carr <david@carrclan.us> parents: 466 diff changeset	384
408 2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	385 def nodebookmarks(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	386 return self.refmap.get(n, [])
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	387
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	388 def nodetags(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	389 return self.tagmap.get(n, [])
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	390
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	391 def rev(self, n):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	392 return self.revmap[n]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	393
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	394 def filectx(self, path, fileid=None):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	395 return overlayfilectx(self, path, fileid=fileid)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	396
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	397 def _makemaps(self, commits, refs):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	398 baserev = self.handler.repo['tip'].rev()
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	399 self.revmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	400 self.nodemap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	401 for i, n in enumerate(commits):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	402 rev = baserev + i + 1
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	403 self.revmap[n] = rev
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	404 self.nodemap[rev] = n
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	405
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	406 self.refmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	407 self.tagmap = {}
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	408 for ref in refs:
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	409 if ref.startswith('refs/heads/'):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	410 refname = ref[11:]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	411 self.refmap.setdefault(bin(refs[ref]), []).append(refname)
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	412 elif ref.startswith('refs/tags/'):
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	413 tagname = ref[10:]
2dcfd4bbfc1a Support for hg incoming Brendan Cully <brendan@kublai.com> parents: diff changeset	414 self.tagmap.setdefault(bin(refs[ref]), []).append(tagname)

Mercurial > hg-git

annotate hggit/overlay.py @ 956:06385a2b30f3