Mercurial > hg-stable
changeset 26616:2f1fce0d4e86
merge.mergestate._resolve: also return completed status
We'll need this for a new 'preresolve' function we're adding.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 18:37:54 -0700 |
| parents | c9223a3979b7 |
| children | dfd9811c5c9b |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Sun Oct 11 18:29:50 2015 -0700 +++ b/mercurial/merge.py Sun Oct 11 18:37:54 2015 -0700 @@ -290,7 +290,7 @@ def _resolve(self, dfile, wctx, labels=None): """rerun merge process for file path `dfile`""" if self[dfile] == 'r': - return 0 + return True, 0 stateentry = self._state[dfile] state, hash, lfile, afile, anode, ofile, onode, flags = stateentry octx = self._repo[self._other] @@ -321,11 +321,11 @@ self._dirty = True elif not r: self.mark(dfile, 'r') - return r + return complete, r def resolve(self, dfile, wctx, labels=None): """rerun merge process for file path `dfile`""" - return self._resolve(dfile, wctx, labels=labels) + return self._resolve(dfile, wctx, labels=labels)[1] def _checkunknownfile(repo, wctx, mctx, f, f2=None): if f2 is None: