D7594: status: add template/json data about whether a file has unresolved conflicts

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Wed Dec 11 12:02:11 EST 2019


martinvonz added inline comments.

INLINE COMMENTS

> cmdutil.py:792
> +    def formatfile(self, path, fm):
> +        if self.inmergestate and path in self.unresolvedpaths:
> +            fm.data(unresolved=True)

That's an O(n) lookup. Probably fine since you very rarely have thousands of conflicts...

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7594/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7594

To: rdamazio, #hg-reviewers, pulkit
Cc: martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list