Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 26766:a83110faece1
merge.mergestate: add a way to get the merge driver state
This will be useful to check what the status of the merge driver is.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 15 Oct 2015 00:57:56 -0700 |
| parents | 45976219eb80 |
| children | ac68769a5985 |
comparison
equal
deleted
inserted
replaced
| 26765:45976219eb80 | 26766:a83110faece1 |
|---|---|
| 326 return self._state.keys() | 326 return self._state.keys() |
| 327 | 327 |
| 328 def mark(self, dfile, state): | 328 def mark(self, dfile, state): |
| 329 self._state[dfile][0] = state | 329 self._state[dfile][0] = state |
| 330 self._dirty = True | 330 self._dirty = True |
| 331 | |
| 332 def mdstate(self): | |
| 333 return self._mdstate | |
| 331 | 334 |
| 332 def unresolved(self): | 335 def unresolved(self): |
| 333 """Obtain the paths of unresolved files.""" | 336 """Obtain the paths of unresolved files.""" |
| 334 | 337 |
| 335 for f, entry in self._state.items(): | 338 for f, entry in self._state.items(): |