Patchwork D8739: mergestate: document what mergestate._results is for

login
register
mail settings
Submitter phabricator
Date July 14, 2020, 12:32 p.m.
Message ID <differential-rev-PHID-DREV-lhywxeqkgzg46lixqwzv-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46725/
State Superseded
Headers show

Comments

phabricator - July 14, 2020, 12:32 p.m.
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Understanding that dict is important for understanding how mergestate is
  performing operations on dirstate.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/mergestate.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -267,6 +267,11 @@ 
                 self._labels = [l for l in labels if len(l) > 0]
             elif not rtype.islower():
                 unsupported.add(rtype)
+        # contains a mapping of form:
+        # {filename : (merge_return_value, action_to_be_performed}
+        # these are results of re-running merge process
+        # this dict is used to perform actions on dirstate caused by re-running
+        # the merge
         self._results = {}
         self._dirty = False