Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 31332:102d3a30582c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: directly use repo.vfs.join The 'repo.join' method is about to be deprecated.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 08 Mar 2017 16:53:32 -0800
parents 431d4f73249e
children b6a6df38a802
comparison
equal deleted inserted replaced
31331:4282feb79432 31332:102d3a30582c
122 self._readmergedriver = None 122 self._readmergedriver = None
123 if self.mergedriver: 123 if self.mergedriver:
124 self._mdstate = 's' 124 self._mdstate = 's'
125 else: 125 else:
126 self._mdstate = 'u' 126 self._mdstate = 'u'
127 shutil.rmtree(self._repo.join('merge'), True) 127 shutil.rmtree(self._repo.vfs.join('merge'), True)
128 self._results = {} 128 self._results = {}
129 self._dirty = False 129 self._dirty = False
130 130
131 def _read(self): 131 def _read(self):
132 """Analyse each record content to restore a serialized state from disk 132 """Analyse each record content to restore a serialized state from disk
1676 if not partial: 1676 if not partial:
1677 repo.dirstate.beginparentchange() 1677 repo.dirstate.beginparentchange()
1678 repo.setparents(fp1, fp2) 1678 repo.setparents(fp1, fp2)
1679 recordupdates(repo, actions, branchmerge) 1679 recordupdates(repo, actions, branchmerge)
1680 # update completed, clear state 1680 # update completed, clear state
1681 util.unlink(repo.join('updatestate')) 1681 util.unlink(repo.vfs.join('updatestate'))
1682 1682
1683 if not branchmerge: 1683 if not branchmerge:
1684 repo.dirstate.setbranch(p2.branch()) 1684 repo.dirstate.setbranch(p2.branch())
1685 repo.dirstate.endparentchange() 1685 repo.dirstate.endparentchange()
1686 1686