Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 26769:5b00ec4c05cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.mergestate: set merge driver state to 's' if there's none present This allows mergestate.mdstate() to return 's' if there's nothing to be done on the merge driver end.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 01:06:29 -0700
parents ac68769a5985
children e9a0d5f5c225
comparison
equal deleted inserted replaced
26768:ac68769a5985 26769:5b00ec4c05cb
87 if 'otherctx' in vars(self): 87 if 'otherctx' in vars(self):
88 del self.otherctx 88 del self.otherctx
89 if node: 89 if node:
90 self._local = node 90 self._local = node
91 self._other = other 91 self._other = other
92 self._mdstate = 'u'
93 self._readmergedriver = None 92 self._readmergedriver = None
93 if self.mergedriver:
94 self._mdstate = 's'
95 else:
96 self._mdstate = 'u'
94 shutil.rmtree(self._repo.join('merge'), True) 97 shutil.rmtree(self._repo.join('merge'), True)
95 self._dirty = False 98 self._dirty = False
96 99
97 def _read(self): 100 def _read(self):
98 """Analyse each record content to restore a serialized state from disk 101 """Analyse each record content to restore a serialized state from disk
101 of on disk file. 104 of on disk file.
102 """ 105 """
103 self._state = {} 106 self._state = {}
104 self._local = None 107 self._local = None
105 self._other = None 108 self._other = None
106 self._mdstate = 'u'
107 if 'otherctx' in vars(self): 109 if 'otherctx' in vars(self):
108 del self.otherctx 110 del self.otherctx
109 self._readmergedriver = None 111 self._readmergedriver = None
112 self._mdstate = 's'
110 records = self._readrecords() 113 records = self._readrecords()
111 for rtype, record in records: 114 for rtype, record in records:
112 if rtype == 'L': 115 if rtype == 'L':
113 self._local = bin(record) 116 self._local = bin(record)
114 elif rtype == 'O': 117 elif rtype == 'O':