Mercurial > hg-git
annotate hggit/overlay.py @ 873:517cf1b5e626
overlaychangectx: return nullrev if commit has no parents
In Mercurial, every commit has at least one parent -- root commits have the
null revision as their parent. In Git, root commits don't have any parents.
This difference needs to be papered over in hg-git for 'hg incoming' to work in
Mercurial 3.4+.
Note that this doesn't fix all the broken tests in default -- I haven't had
time to investigate the others.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 03 Apr 2015 11:18:30 -0700 |
parents | 15d2b119ca99 |
children | a1e47539644e |
rev | line source |
---|---|
408 | 1 # overlay classes for repositories |
2 # unifies access to unimported git objects and committed hg objects | |
3 # designed to support incoming | |
4 # | |
5 # incomplete, implemented on demand | |
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 | 9 from mercurial import context |
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 | 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 | 18 class overlaymanifest(object): |
19 def __init__(self, repo, sha): | |
20 self.repo = repo | |
21 self.tree = repo.handler.git.get_object(sha) | |
22 self._map = None | |
856
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
23 self._flags = None |
408 | 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() |
856
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
27 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
|
28 if flag != '']) |
466
ac16efd25cc4
overlaymanifest: add the withflags method introduced in hg change a1dcd842ce17
Augie Fackler <raf@durin42.com>
parents:
423
diff
changeset
|
29 |
408 | 30 def copy(self): |
31 return overlaymanifest(self.repo, self.tree.id) | |
32 | |
33 def keys(self): | |
34 self.load() | |
35 return self._map.keys() | |
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 | 40 def flags(self, path): |
41 self.load() | |
42 | |
856
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
43 return hgflag(self._flags[path]) |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
44 |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
45 def load(self): |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
46 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
|
47 return |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
48 |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
49 self._map = {} |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
50 self._flags = {} |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
51 |
408 | 52 def hgflag(gitflag): |
53 if gitflag & 0100: | |
54 return 'x' | |
55 elif gitflag & 020000: | |
56 return 'l' | |
57 else: | |
58 return '' | |
59 | |
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 | 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 | 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) |
856
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
69 self._flags[path] = hgflag(entry.mode) |
408 | 70 |
71 addtree(self.tree, '') | |
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 | 88 def __iter__(self): |
89 self.load() | |
90 return self._map.__iter__() | |
91 | |
92 def __getitem__(self, path): | |
93 self.load() | |
94 return self._map[path] | |
95 | |
856
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
96 def __contains__(self, path): |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
97 self.load() |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
98 return path in self._map |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
99 |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
100 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
|
101 self.load() |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
102 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
|
103 |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
104 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
|
105 self.load() |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
106 if isinstance(m2, overlaymanifest): |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
107 m2.load() |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
108 |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
109 # 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
|
110 diff = {} |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
111 |
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) |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
115 fl2 = m2._flags.get(fn, '') |
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: |
15d2b119ca99
overlaymanifest: implement more methods for Mercurial 3.3 compatibility
Siddharth Agarwal <sid0@fb.com>
parents:
855
diff
changeset
|
125 fl2 = m2._flags.get(fn, '') |
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 | 130 def __delitem__(self, path): |
131 del self._map[path] | |
132 | |
133 class overlayfilectx(object): | |
134 def __init__(self, repo, path, fileid=None): | |
135 self.repo = repo | |
136 self._path = path | |
137 self.fileid = fileid | |
138 | |
139 # this is a hack to skip copy detection | |
140 def ancestors(self): | |
141 return [self, self] | |
142 | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
143 def filenode(self): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
144 return nullid |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
145 |
408 | 146 def rev(self): |
147 return -1 | |
148 | |
149 def path(self): | |
150 return self._path | |
151 | |
152 def filelog(self): | |
153 return self.fileid | |
154 | |
155 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
|
156 blob = self.repo.handler.git.get_object(_maybehex(self.fileid)) |
408 | 157 return blob.data |
158 | |
159 class overlaychangectx(context.changectx): | |
160 def __init__(self, repo, sha): | |
161 self.repo = repo | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
162 if not isinstance(sha, basestring): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
163 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
|
164 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
|
165 self._overlay = getattr(repo, 'gitoverlay', repo) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
166 self._rev = self._overlay.rev(bin(self.commit.id)) |
408 | 167 |
168 def node(self): | |
169 return bin(self.commit.id) | |
170 | |
171 def rev(self): | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
172 return self._rev |
408 | 173 |
174 def date(self): | |
175 return self.commit.author_time, self.commit.author_timezone | |
176 | |
177 def branch(self): | |
178 return 'default' | |
179 | |
180 def user(self): | |
181 return self.commit.author | |
182 | |
183 def files(self): | |
184 return [] | |
185 | |
186 def extra(self): | |
187 return {} | |
188 | |
189 def description(self): | |
190 return self.commit.message | |
191 | |
192 def parents(self): | |
873
517cf1b5e626
overlaychangectx: return nullrev if commit has no parents
Siddharth Agarwal <sid0@fb.com>
parents:
856
diff
changeset
|
193 parents = self.commit.parents |
517cf1b5e626
overlaychangectx: return nullrev if commit has no parents
Siddharth Agarwal <sid0@fb.com>
parents:
856
diff
changeset
|
194 if not parents: |
517cf1b5e626
overlaychangectx: return nullrev if commit has no parents
Siddharth Agarwal <sid0@fb.com>
parents:
856
diff
changeset
|
195 return [self.repo['null']] |
517cf1b5e626
overlaychangectx: return nullrev if commit has no parents
Siddharth Agarwal <sid0@fb.com>
parents:
856
diff
changeset
|
196 return [overlaychangectx(self.repo, sha) for sha in parents] |
408 | 197 |
198 def manifestnode(self): | |
199 return bin(self.commit.tree) | |
200 | |
201 def hex(self): | |
202 return self.commit.id | |
203 | |
204 def tags(self): | |
205 return [] | |
206 | |
207 def bookmarks(self): | |
208 return [] | |
209 | |
210 def manifest(self): | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
211 return overlaymanifest(self._overlay, self.commit.tree) |
408 | 212 |
213 def filectx(self, path, filelog=None): | |
214 mf = self.manifest() | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
215 return overlayfilectx(self._overlay, path, mf[path]) |
408 | 216 |
217 def flags(self, path): | |
218 mf = self.manifest() | |
219 return mf.flags(path) | |
220 | |
221 def __nonzero__(self): | |
222 return True | |
223 | |
568
41f6e3df67b1
overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo)
David M. Carr <david@carrclan.us>
parents:
466
diff
changeset
|
224 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
|
225 try: |
41f6e3df67b1
overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo)
David M. Carr <david@carrclan.us>
parents:
466
diff
changeset
|
226 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
|
227 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
|
228 except ImportError: |
41f6e3df67b1
overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo)
David M. Carr <david@carrclan.us>
parents:
466
diff
changeset
|
229 return 1 |
41f6e3df67b1
overlaychangectx: fix compatibility with mercurial 2.4-rc (no attribute _repo)
David M. Carr <david@carrclan.us>
parents:
466
diff
changeset
|
230 |
855
4538981d2c3f
overlaychangelog: return tuples for read()
Siddharth Agarwal <sid0@fb.com>
parents:
854
diff
changeset
|
231 def totuple(self): |
4538981d2c3f
overlaychangelog: return tuples for read()
Siddharth Agarwal <sid0@fb.com>
parents:
854
diff
changeset
|
232 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
|
233 self.description(), self.extra()) |
4538981d2c3f
overlaychangelog: return tuples for read()
Siddharth Agarwal <sid0@fb.com>
parents:
854
diff
changeset
|
234 |
408 | 235 class overlayrevlog(object): |
236 def __init__(self, repo, base): | |
237 self.repo = repo | |
238 self.base = base | |
239 | |
240 def parents(self, n): | |
241 gitrev = self.repo.revmap.get(n) | |
689
aa8519daf037
overlayrevlog: handle rev = 0 correctly
Siddharth Agarwal <sid0@fb.com>
parents:
684
diff
changeset
|
242 if gitrev is None: |
408 | 243 # we've reached a revision we have |
244 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
|
245 commit = self.repo.handler.git.get_object(_maybehex(n)) |
408 | 246 |
690
c99941ff2d28
overlayrevlog: handle root commits correctly
Siddharth Agarwal <sid0@fb.com>
parents:
689
diff
changeset
|
247 if not commit.parents: |
c99941ff2d28
overlayrevlog: handle root commits correctly
Siddharth Agarwal <sid0@fb.com>
parents:
689
diff
changeset
|
248 return [nullid, nullid] |
c99941ff2d28
overlayrevlog: handle root commits correctly
Siddharth Agarwal <sid0@fb.com>
parents:
689
diff
changeset
|
249 |
408 | 250 def gitorhg(n): |
251 hn = self.repo.handler.map_hg_get(hex(n)) | |
252 if hn is not None: | |
253 return bin(hn) | |
254 return n | |
255 | |
256 # currently ignores the octopus | |
257 p1 = gitorhg(bin(commit.parents[0])) | |
258 if len(commit.parents) > 1: | |
259 p2 = gitorhg(bin(commit.parents[1])) | |
260 else: | |
261 p2 = nullid | |
262 | |
263 return [p1, p2] | |
264 | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
265 def ancestor(self, a, b): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
266 anode = self.repo.nodemap.get(a) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
267 bnode = self.repo.nodemap.get(b) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
268 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
|
269 return self.base.ancestor(a, b) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
270 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
|
271 if ancs: |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
272 return min(map(self.node, ancs)) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
273 return nullid |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
274 |
408 | 275 def parentrevs(self, rev): |
276 return [self.rev(p) for p in self.parents(self.node(rev))] | |
277 | |
278 def node(self, rev): | |
279 gitnode = self.repo.nodemap.get(rev) | |
280 if gitnode is None: | |
281 return self.base.node(rev) | |
282 return gitnode | |
283 | |
284 def rev(self, n): | |
285 gitrev = self.repo.revmap.get(n) | |
286 if gitrev is None: | |
287 return self.base.rev(n) | |
288 return gitrev | |
289 | |
290 def __len__(self): | |
291 return len(self.repo.handler.repo) + len(self.repo.revmap) | |
292 | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
293 class overlaymanifestlog(overlayrevlog): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
294 def read(self, sha): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
295 if sha == nullid: |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
296 return manifest.manifestdict() |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
297 return overlaymanifest(self.repo, sha) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
298 |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
299 class overlaychangelog(overlayrevlog): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
300 def read(self, sha): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
301 if isinstance(sha, int): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
302 sha = self.node(sha) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
303 if sha == nullid: |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
304 return (nullid, "", (0, 0), [], "", {}) |
855
4538981d2c3f
overlaychangelog: return tuples for read()
Siddharth Agarwal <sid0@fb.com>
parents:
854
diff
changeset
|
305 try: |
4538981d2c3f
overlaychangelog: return tuples for read()
Siddharth Agarwal <sid0@fb.com>
parents:
854
diff
changeset
|
306 return self.base.read(sha) |
4538981d2c3f
overlaychangelog: return tuples for read()
Siddharth Agarwal <sid0@fb.com>
parents:
854
diff
changeset
|
307 except LookupError: |
4538981d2c3f
overlaychangelog: return tuples for read()
Siddharth Agarwal <sid0@fb.com>
parents:
854
diff
changeset
|
308 return overlaychangectx(self.repo, sha).totuple() |
408 | 309 |
310 class overlayrepo(object): | |
311 def __init__(self, handler, commits, refs): | |
312 self.handler = handler | |
313 | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
314 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
|
315 self.manifest = overlaymanifestlog(self, handler.repo.manifest) |
408 | 316 |
317 # for incoming -p | |
318 self.root = handler.repo.root | |
319 self.getcwd = handler.repo.getcwd | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
320 # self.status = handler.repo.status |
408 | 321 self.ui = handler.repo.ui |
322 | |
323 self.revmap = None | |
324 self.nodemap = None | |
325 self.refmap = None | |
326 self.tagmap = None | |
327 | |
328 self._makemaps(commits, refs) | |
329 | |
854
eba7dcfab1bb
overlay: add namespace support to overlayrepo to support Mercurial >= 3.3
Siddharth Agarwal <sid0@fb.com>
parents:
829
diff
changeset
|
330 try: |
eba7dcfab1bb
overlay: add namespace support to overlayrepo to support Mercurial >= 3.3
Siddharth Agarwal <sid0@fb.com>
parents:
829
diff
changeset
|
331 # Mercurial >= 3.3 |
eba7dcfab1bb
overlay: add namespace support to overlayrepo to support Mercurial >= 3.3
Siddharth Agarwal <sid0@fb.com>
parents:
829
diff
changeset
|
332 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
|
333 self.names = namespaces.namespaces() |
eba7dcfab1bb
overlay: add namespace support to overlayrepo to support Mercurial >= 3.3
Siddharth Agarwal <sid0@fb.com>
parents:
829
diff
changeset
|
334 except ImportError: |
eba7dcfab1bb
overlay: add namespace support to overlayrepo to support Mercurial >= 3.3
Siddharth Agarwal <sid0@fb.com>
parents:
829
diff
changeset
|
335 pass |
eba7dcfab1bb
overlay: add namespace support to overlayrepo to support Mercurial >= 3.3
Siddharth Agarwal <sid0@fb.com>
parents:
829
diff
changeset
|
336 |
408 | 337 def __getitem__(self, n): |
338 if n not in self.revmap: | |
339 return self.handler.repo[n] | |
340 return overlaychangectx(self, n) | |
341 | |
612
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
342 def _handlerhack(self, method, *args, **kwargs): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
343 nothing = object() |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
344 r = self.handler.repo |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
345 oldhandler = getattr(r, 'handler', nothing) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
346 oldoverlay = getattr(r, 'gitoverlay', nothing) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
347 r.handler = self.handler |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
348 r.gitoverlay = self |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
349 try: |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
350 return getattr(r, method)(*args, **kwargs) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
351 finally: |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
352 if oldhandler is nothing: |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
353 del r.handler |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
354 else: |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
355 r.handler = oldhandler |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
356 if oldoverlay is nothing: |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
357 del r.gitoverlay |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
358 else: |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
359 r.gitoverlay = oldoverlay |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
360 |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
361 def status(self, *args, **kwargs): |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
362 return self._handlerhack('status', *args, **kwargs) |
bf8518b09d57
overlays: fix incoming support for hg 2.8
Augie Fackler <raf@durin42.com>
parents:
597
diff
changeset
|
363 |
557
4f4ab2d89375
gitrepo: initial support for listkeys
David M. Carr <david@carrclan.us>
parents:
466
diff
changeset
|
364 def node(self, n): |
4f4ab2d89375
gitrepo: initial support for listkeys
David M. Carr <david@carrclan.us>
parents:
466
diff
changeset
|
365 """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
|
366 if bin(n) in self.revmap: |
4f4ab2d89375
gitrepo: initial support for listkeys
David M. Carr <david@carrclan.us>
parents:
466
diff
changeset
|
367 return n |
4f4ab2d89375
gitrepo: initial support for listkeys
David M. Carr <david@carrclan.us>
parents:
466
diff
changeset
|
368 return self.handler.map_hg_get(n) |
4f4ab2d89375
gitrepo: initial support for listkeys
David M. Carr <david@carrclan.us>
parents:
466
diff
changeset
|
369 |
408 | 370 def nodebookmarks(self, n): |
371 return self.refmap.get(n, []) | |
372 | |
373 def nodetags(self, n): | |
374 return self.tagmap.get(n, []) | |
375 | |
376 def rev(self, n): | |
377 return self.revmap[n] | |
378 | |
379 def filectx(self, path, fileid=None): | |
380 return overlayfilectx(self, path, fileid=fileid) | |
381 | |
382 def _makemaps(self, commits, refs): | |
383 baserev = self.handler.repo['tip'].rev() | |
384 self.revmap = {} | |
385 self.nodemap = {} | |
386 for i, n in enumerate(commits): | |
387 rev = baserev + i + 1 | |
388 self.revmap[n] = rev | |
389 self.nodemap[rev] = n | |
390 | |
391 self.refmap = {} | |
392 self.tagmap = {} | |
393 for ref in refs: | |
394 if ref.startswith('refs/heads/'): | |
395 refname = ref[11:] | |
396 self.refmap.setdefault(bin(refs[ref]), []).append(refname) | |
397 elif ref.startswith('refs/tags/'): | |
398 tagname = ref[10:] | |
399 self.tagmap.setdefault(bin(refs[ref]), []).append(tagname) |