Skip to content
Snippets Groups Projects
Commit 01c4dccf authored by Pulkit Goyal's avatar Pulkit Goyal
Browse files

mergestate: rename a helpless variable name to bit helpful one

The old variable name `r` makes it ~impossible to understand what does it mean.
One can only understand that after going to callers and hoping that its
documented there.

I also documented return value of the function involved while I was there.

Differential Revision: https://phab.mercurial-scm.org/D8738
parent 7f41e824
No related branches found
No related tags found
No related merge requests found
......@@ -619,7 +619,10 @@
return self._stateextras.setdefault(filename, {})
def _resolve(self, preresolve, dfile, wctx):
"""rerun merge process for file path `dfile`"""
"""rerun merge process for file path `dfile`.
Returns whether the merge was completed and the return value of merge
obtained from filemerge._filemerge().
"""
if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED):
return True, 0
if self._state[dfile][0] == MERGE_RECORD_MERGED_OTHER:
......@@ -660,7 +663,7 @@
f.close()
else:
wctx[dfile].remove(ignoremissing=True)
complete, r, deleted = filemerge.premerge(
complete, merge_ret, deleted = filemerge.premerge(
self._repo,
wctx,
self._local,
......@@ -671,7 +674,7 @@
labels=self._labels,
)
else:
complete, r, deleted = filemerge.filemerge(
complete, merge_ret, deleted = filemerge.filemerge(
self._repo,
wctx,
self._local,
......@@ -681,8 +684,8 @@
fca,
labels=self._labels,
)
if r is None:
# no real conflict
if merge_ret is None:
# If return value of merge is None, then there are no real conflict
del self._state[dfile]
self._stateextras.pop(dfile, None)
self._dirty = True
......@@ -686,7 +689,7 @@
del self._state[dfile]
self._stateextras.pop(dfile, None)
self._dirty = True
elif not r:
elif not merge_ret:
self.mark(dfile, MERGE_RECORD_RESOLVED)
if complete:
......@@ -708,5 +711,5 @@
else:
action = ACTION_ADD
# else: regular merges (no action necessary)
self._results[dfile] = r, action
self._results[dfile] = merge_ret, action
......@@ -712,5 +715,5 @@
return complete, r
return complete, merge_ret
def preresolve(self, dfile, wctx):
"""run premerge process for dfile
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment