equal
deleted
inserted
replaced
13 from mercurial import ( |
13 from mercurial import ( |
14 ancestor, |
14 ancestor, |
15 context, |
15 context, |
16 error, |
16 error, |
17 phases, |
17 phases, |
|
18 pycompat, |
18 util, |
19 util, |
19 ) |
20 ) |
20 from . import shallowutil |
21 from . import shallowutil |
21 |
22 |
22 propertycache = util.propertycache |
23 propertycache = util.propertycache |
216 |
217 |
217 if self._verifylinknode(revs, linknode): |
218 if self._verifylinknode(revs, linknode): |
218 return linknode |
219 return linknode |
219 |
220 |
220 commonlogkwargs = { |
221 commonlogkwargs = { |
221 'revs': ' '.join([hex(cl.node(rev)) for rev in revs]), |
222 r'revs': ' '.join([hex(cl.node(rev)) for rev in revs]), |
222 'fnode': hex(fnode), |
223 r'fnode': hex(fnode), |
223 'filepath': path, |
224 r'filepath': path, |
224 'user': shallowutil.getusername(repo.ui), |
225 r'user': shallowutil.getusername(repo.ui), |
225 'reponame': shallowutil.getreponame(repo.ui), |
226 r'reponame': shallowutil.getreponame(repo.ui), |
226 } |
227 } |
227 |
228 |
228 repo.ui.log('linkrevfixup', 'adjusting linknode', **commonlogkwargs) |
229 repo.ui.log('linkrevfixup', 'adjusting linknode', **commonlogkwargs) |
229 |
230 |
230 pc = repo._phasecache |
231 pc = repo._phasecache |
313 logmsg = 'remotefilelog prefetching failed (%s)' % e |
314 logmsg = 'remotefilelog prefetching failed (%s)' % e |
314 return None |
315 return None |
315 finally: |
316 finally: |
316 elapsed = time.time() - start |
317 elapsed = time.time() - start |
317 repo.ui.log('linkrevfixup', logmsg, elapsed=elapsed * 1000, |
318 repo.ui.log('linkrevfixup', logmsg, elapsed=elapsed * 1000, |
318 **commonlogkwargs) |
319 **pycompat.strkwargs(commonlogkwargs)) |
319 |
320 |
320 def _verifylinknode(self, revs, linknode): |
321 def _verifylinknode(self, revs, linknode): |
321 """ |
322 """ |
322 Check if a linknode is correct one for the current history. |
323 Check if a linknode is correct one for the current history. |
323 |
324 |
406 |
407 |
407 return None |
408 return None |
408 |
409 |
409 def annotate(self, *args, **kwargs): |
410 def annotate(self, *args, **kwargs): |
410 introctx = self |
411 introctx = self |
411 prefetchskip = kwargs.pop('prefetchskip', None) |
412 prefetchskip = kwargs.pop(r'prefetchskip', None) |
412 if prefetchskip: |
413 if prefetchskip: |
413 # use introrev so prefetchskip can be accurately tested |
414 # use introrev so prefetchskip can be accurately tested |
414 introrev = self.introrev() |
415 introrev = self.introrev() |
415 if self.rev() != introrev: |
416 if self.rev() != introrev: |
416 introctx = remotefilectx(self._repo, self._path, |
417 introctx = remotefilectx(self._repo, self._path, |