Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 26740:f4a27c05c43f
merge.mergestate: add a generator for driver-resolved files
Just like for unresolved files above, we need to be able to tell what files are
driver-resolved.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 14 Oct 2015 15:01:07 -0700 |
| parents | 08b068240a1a |
| children | 5ba0a99ff27f |
comparison
equal
deleted
inserted
replaced
| 26739:8429369eeb85 | 26740:f4a27c05c43f |
|---|---|
| 325 def unresolved(self): | 325 def unresolved(self): |
| 326 """Obtain the paths of unresolved files.""" | 326 """Obtain the paths of unresolved files.""" |
| 327 | 327 |
| 328 for f, entry in self._state.items(): | 328 for f, entry in self._state.items(): |
| 329 if entry[0] == 'u': | 329 if entry[0] == 'u': |
| 330 yield f | |
| 331 | |
| 332 def driverresolved(self): | |
| 333 """Obtain the paths of driver-resolved files.""" | |
| 334 | |
| 335 for f, entry in self._state.items(): | |
| 336 if entry[0] == 'd': | |
| 330 yield f | 337 yield f |
| 331 | 338 |
| 332 def _resolve(self, preresolve, dfile, wctx, labels=None): | 339 def _resolve(self, preresolve, dfile, wctx, labels=None): |
| 333 """rerun merge process for file path `dfile`""" | 340 """rerun merge process for file path `dfile`""" |
| 334 if self[dfile] in 'rd': | 341 if self[dfile] in 'rd': |