Mercurial > hg
comparison mercurial/obsolete.py @ 33732:32d4f815c4f4
obsolete: rename _addprecursors into _addpredecessors
Use util.nouideprecwarn because _addpredecessors doesn't have easy access to
an ui object.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D244
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 02 Aug 2017 19:34:15 +0200 |
parents | 388901a15bfa |
children | d5acd967f95a |
comparison
equal
deleted
inserted
replaced
33731:2cb442bc1a76 | 33732:32d4f815c4f4 |
---|---|
468 @util.nogc | 468 @util.nogc |
469 def _addsuccessors(successors, markers): | 469 def _addsuccessors(successors, markers): |
470 for mark in markers: | 470 for mark in markers: |
471 successors.setdefault(mark[0], set()).add(mark) | 471 successors.setdefault(mark[0], set()).add(mark) |
472 | 472 |
473 def _addprecursors(*args, **kwargs): | |
474 msg = ("'obsolete._addprecursors' is deprecated, " | |
475 "use 'obsolete._addpredecessors'") | |
476 util.nouideprecwarn(msg, '4.4') | |
477 | |
478 return _addpredecessors(*args, **kwargs) | |
479 | |
473 @util.nogc | 480 @util.nogc |
474 def _addprecursors(precursors, markers): | 481 def _addpredecessors(predecessors, markers): |
475 for mark in markers: | 482 for mark in markers: |
476 for suc in mark[1]: | 483 for suc in mark[1]: |
477 precursors.setdefault(suc, set()).add(mark) | 484 predecessors.setdefault(suc, set()).add(mark) |
478 | 485 |
479 @util.nogc | 486 @util.nogc |
480 def _addchildren(children, markers): | 487 def _addchildren(children, markers): |
481 for mark in markers: | 488 for mark in markers: |
482 parents = mark[5] | 489 parents = mark[5] |
658 _addsuccessors(successors, self._all) | 665 _addsuccessors(successors, self._all) |
659 return successors | 666 return successors |
660 | 667 |
661 @propertycache | 668 @propertycache |
662 def precursors(self): | 669 def precursors(self): |
663 precursors = {} | 670 predecessors = {} |
664 _addprecursors(precursors, self._all) | 671 _addpredecessors(predecessors, self._all) |
665 return precursors | 672 return predecessors |
666 | 673 |
667 @propertycache | 674 @propertycache |
668 def children(self): | 675 def children(self): |
669 children = {} | 676 children = {} |
670 _addchildren(children, self._all) | 677 _addchildren(children, self._all) |
678 self._data = self._data + rawdata | 685 self._data = self._data + rawdata |
679 self._all.extend(markers) | 686 self._all.extend(markers) |
680 if self._cached('successors'): | 687 if self._cached('successors'): |
681 _addsuccessors(self.successors, markers) | 688 _addsuccessors(self.successors, markers) |
682 if self._cached('precursors'): | 689 if self._cached('precursors'): |
683 _addprecursors(self.precursors, markers) | 690 _addpredecessors(self.precursors, markers) |
684 if self._cached('children'): | 691 if self._cached('children'): |
685 _addchildren(self.children, markers) | 692 _addchildren(self.children, markers) |
686 _checkinvalidmarkers(markers) | 693 _checkinvalidmarkers(markers) |
687 | 694 |
688 def relevantmarkers(self, nodes): | 695 def relevantmarkers(self, nodes): |