Page MenuHomePhabricator

context: rename divergent into contentdivergent
ClosedPublic

Authored by lothiraldan on Aug 7 2017, 6:08 AM.

Details

Summary

Rename divergent context method into contentdivergent and add a deprecation
warning on divergent.

Only update all callers to keep the patch straightforward.

The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lothiraldan created this revision.Aug 7 2017, 6:08 AM
indygreg requested changes to this revision.Aug 8 2017, 12:38 AM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/context.py
227

This should be self.contentdivergent() no?

This revision now requires changes to proceed.Aug 8 2017, 12:38 AM
lothiraldan added inline comments.Aug 8 2017, 5:09 AM
mercurial/context.py
227

Damn it you are right, good catch!

lothiraldan edited edge metadata.Aug 8 2017, 5:33 AM
lothiraldan updated this revision to Diff 621.
lothiraldan marked 2 inline comments as done.Aug 8 2017, 5:35 AM
lothiraldan added inline comments.Aug 8 2017, 5:37 AM
mercurial/context.py
227

Sorry for the tone of my comment, I was only angry against myself, I thought I have fixed this code too many times due to merge conflicts.

This revision was automatically updated to reflect the committed changes.