Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 26615:c9223a3979b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.mergestate: add a wrapper around resolve The resolve function will be broken up into separate pre-resolve and resolve steps.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 18:29:50 -0700
parents a5ff66e6d77a
children 2f1fce0d4e86
comparison
equal deleted inserted replaced
26614:ef1eb6df7071 26615:c9223a3979b7
285 285
286 for f, entry in self._state.items(): 286 for f, entry in self._state.items():
287 if entry[0] == 'u': 287 if entry[0] == 'u':
288 yield f 288 yield f
289 289
290 def resolve(self, dfile, wctx, labels=None): 290 def _resolve(self, dfile, wctx, labels=None):
291 """rerun merge process for file path `dfile`""" 291 """rerun merge process for file path `dfile`"""
292 if self[dfile] == 'r': 292 if self[dfile] == 'r':
293 return 0 293 return 0
294 stateentry = self._state[dfile] 294 stateentry = self._state[dfile]
295 state, hash, lfile, afile, anode, ofile, onode, flags = stateentry 295 state, hash, lfile, afile, anode, ofile, onode, flags = stateentry
320 del self._state[dfile] 320 del self._state[dfile]
321 self._dirty = True 321 self._dirty = True
322 elif not r: 322 elif not r:
323 self.mark(dfile, 'r') 323 self.mark(dfile, 'r')
324 return r 324 return r
325
326 def resolve(self, dfile, wctx, labels=None):
327 """rerun merge process for file path `dfile`"""
328 return self._resolve(dfile, wctx, labels=labels)
325 329
326 def _checkunknownfile(repo, wctx, mctx, f, f2=None): 330 def _checkunknownfile(repo, wctx, mctx, f, f2=None):
327 if f2 is None: 331 if f2 is None:
328 f2 = f 332 f2 = f
329 return (os.path.isfile(repo.wjoin(f)) 333 return (os.path.isfile(repo.wjoin(f))