Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 21268:a0b8a912ec81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify mergestate iter
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 13 May 2012 17:45:08 +0200
parents 19d6fec60b81
children fa601c4e03f9
comparison
equal deleted inserted replaced
21267:e4f451c8c05c 21268:a0b8a912ec81
246 246
247 def __getitem__(self, dfile): 247 def __getitem__(self, dfile):
248 return self._state[dfile][0] 248 return self._state[dfile][0]
249 249
250 def __iter__(self): 250 def __iter__(self):
251 l = self._state.keys() 251 return iter(sorted(self._state))
252 l.sort()
253 for f in l:
254 yield f
255 252
256 def files(self): 253 def files(self):
257 return self._state.keys() 254 return self._state.keys()
258 255
259 def mark(self, dfile, state): 256 def mark(self, dfile, state):