Mercurial > hg-git

comparison hggit/overlay.py @ 1115:8ed6c0cae9b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: add some blank lines
author Sean Farley <sean@farley.io>
date Mon, 27 Nov 2017 18:46:07 -0500
parents f1c4e2ba8ff9
children bd1a01f98154
comparison
equal deleted inserted replaced
1114:6ef251fdbb30 1115:8ed6c0cae9b8
12 context, 12 context,
13 util, 13 util,
14 ) 14 )
15 from mercurial.node import bin, hex, nullid 15 from mercurial.node import bin, hex, nullid
16 16
17
17 def _maybehex(n): 18 def _maybehex(n):
18 if len(n) == 20: 19 if len(n) == 20:
19 return hex(n) 20 return hex(n)
20 return n 21 return n
22
21 23
22 class overlaymanifest(object): 24 class overlaymanifest(object):
23 def __init__(self, repo, sha): 25 def __init__(self, repo, sha):
24 self.repo = repo 26 self.repo = repo
25 self.tree = repo.handler.git.get_object(sha) 27 self.tree = repo.handler.git.get_object(sha)
144 146
145 return diff 147 return diff
146 148
147 def __delitem__(self, path): 149 def __delitem__(self, path):
148 del self._map[path] 150 del self._map[path]
151
149 152
150 def wrapmanifestdictdiff(orig, self, m2, match=None, clean=False): 153 def wrapmanifestdictdiff(orig, self, m2, match=None, clean=False):
151 '''avoid calling into lazymanifest code if m2 is an overlaymanifest''' 154 '''avoid calling into lazymanifest code if m2 is an overlaymanifest'''
152 # Older mercurial clients used diff(m2, clean=False). If a caller failed 155 # Older mercurial clients used diff(m2, clean=False). If a caller failed
153 # to specify clean as a keyword arg, it might get passed as match here. 156 # to specify clean as a keyword arg, it might get passed as match here.
170 diff[fn] = c2, c1 173 diff[fn] = c2, c1
171 return diff 174 return diff
172 else: 175 else:
173 return orig(self, m2, **kwargs) 176 return orig(self, m2, **kwargs)
174 177
178
175 class overlayfilectx(object): 179 class overlayfilectx(object):
176 def __init__(self, repo, path, fileid=None): 180 def __init__(self, repo, path, fileid=None):
177 self._repo = repo 181 self._repo = repo
178 self._path = path 182 self._path = path
179 self.fileid = fileid 183 self.fileid = fileid
201 blob = self._repo.handler.git.get_object(_maybehex(self.fileid)) 205 blob = self._repo.handler.git.get_object(_maybehex(self.fileid))
202 return blob.data 206 return blob.data
203 207
204 def isbinary(self): 208 def isbinary(self):
205 return util.binary(self.data()) 209 return util.binary(self.data())
210
206 211
207 class overlaychangectx(context.changectx): 212 class overlaychangectx(context.changectx):
208 def __init__(self, repo, sha): 213 def __init__(self, repo, sha):
209 # Can't store this in self._repo because the base class uses that field 214 # Can't store this in self._repo because the base class uses that field
210 self._hgrepo = repo 215 self._hgrepo = repo
285 290
286 def totuple(self): 291 def totuple(self):
287 return (self.commit.tree, self.user(), self.date(), self.files(), 292 return (self.commit.tree, self.user(), self.date(), self.files(),
288 self.description(), self.extra()) 293 self.description(), self.extra())
289 294
295
290 class overlayrevlog(object): 296 class overlayrevlog(object):
291 def __init__(self, repo, base): 297 def __init__(self, repo, base):
292 self.repo = repo 298 self.repo = repo
293 self.base = base 299 self.base = base
294 300
343 return gitrev 349 return gitrev
344 350
345 def __len__(self): 351 def __len__(self):
346 return len(self.repo.handler.repo) + len(self.repo.revmap) 352 return len(self.repo.handler.repo) + len(self.repo.revmap)
347 353
354
348 class overlayoldmanifestlog(overlayrevlog): 355 class overlayoldmanifestlog(overlayrevlog):
349 def read(self, sha): 356 def read(self, sha):
350 if sha == nullid: 357 if sha == nullid:
351 return manifest.manifestdict() 358 return manifest.manifestdict()
352 return overlaymanifest(self.repo, sha) 359 return overlaymanifest(self.repo, sha)
353 360
354 def __getitem__(self, sha): 361 def __getitem__(self, sha):
355 return overlaymanifestctx(self.repo, sha) 362 return overlaymanifestctx(self.repo, sha)
356 363
364
357 class overlaymanifestrevlog(overlayrevlog): 365 class overlaymanifestrevlog(overlayrevlog):
358 pass 366 pass
367
359 368
360 class overlaymanifestctx(object): 369 class overlaymanifestctx(object):
361 def __init__(self, repo, node): 370 def __init__(self, repo, node):
362 self._repo = repo 371 self._repo = repo
363 self._node = node 372 self._node = node
364 373
365 def read(self): 374 def read(self):
366 return overlaymanifest(self._repo, self._node) 375 return overlaymanifest(self._repo, self._node)
376
367 377
368 try: 378 try:
369 class overlaymanifestlog(manifest.manifestlog): 379 class overlaymanifestlog(manifest.manifestlog):
370 def __init__(self, repo): 380 def __init__(self, repo):
371 self._repo = repo 381 self._repo = repo
382 return manifest.manifestctx() 392 return manifest.manifestctx()
383 return overlaymanifestctx(self._repo, node) 393 return overlaymanifestctx(self._repo, node)
384 except AttributeError: 394 except AttributeError:
385 # manifestlog did not exist prior to 4.0 395 # manifestlog did not exist prior to 4.0
386 pass 396 pass
397
387 398
388 class overlaychangelog(overlayrevlog): 399 class overlaychangelog(overlayrevlog):
389 def read(self, sha): 400 def read(self, sha):
390 if isinstance(sha, int): 401 if isinstance(sha, int):
391 sha = self.node(sha) 402 sha = self.node(sha)
404 date=values[2], 415 date=values[2],
405 files=values[3], 416 files=values[3],
406 description=values[4], 417 description=values[4],
407 extra=values[5], 418 extra=values[5],
408 ) 419 )
420
409 421
410 class overlayrepo(object): 422 class overlayrepo(object):
411 def __init__(self, handler, commits, refs): 423 def __init__(self, handler, commits, refs):
412 self.handler = handler 424 self.handler = handler
413 425