Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 7622:4dd7b28003d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use dict.iteritems() rather than dict.items() This should be faster and more future-proof. Calls where the result is to be sorted using util.sort() have been left unchanged. Calls to .items() on configparser objects have been left as-is, too.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 12 Jan 2009 09:16:03 +0100
parents 89207edf3973
children 0b2ee57dfdb1
comparison
equal deleted inserted replaced
7621:6d891df43a5f 7622:4dd7b28003d2
34 if err.errno != errno.ENOENT: 34 if err.errno != errno.ENOENT:
35 raise 35 raise
36 def _write(self): 36 def _write(self):
37 f = self._repo.opener("merge/state", "w") 37 f = self._repo.opener("merge/state", "w")
38 f.write(hex(self._local) + "\n") 38 f.write(hex(self._local) + "\n")
39 for d, v in self._state.items(): 39 for d, v in self._state.iteritems():
40 f.write("\0".join([d] + v) + "\n") 40 f.write("\0".join([d] + v) + "\n")
41 def add(self, fcl, fco, fca, fd, flags): 41 def add(self, fcl, fco, fca, fd, flags):
42 hash = util.sha1(fcl.path()).hexdigest() 42 hash = util.sha1(fcl.path()).hexdigest()
43 self._repo.opener("merge/" + hash, "w").write(fcl.data()) 43 self._repo.opener("merge/" + hash, "w").write(fcl.data())
44 self._state[fd] = ['u', hash, fcl.path(), fca.path(), 44 self._state[fd] = ['u', hash, fcl.path(), fca.path(),
164 if pa and not (backwards or overwrite): 164 if pa and not (backwards or overwrite):
165 if repo.ui.configbool("merge", "followcopies", True): 165 if repo.ui.configbool("merge", "followcopies", True):
166 dirs = repo.ui.configbool("merge", "followdirs", True) 166 dirs = repo.ui.configbool("merge", "followdirs", True)
167 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) 167 copy, diverge = copies.copies(repo, p1, p2, pa, dirs)
168 copied = dict.fromkeys(copy.values()) 168 copied = dict.fromkeys(copy.values())
169 for of, fl in diverge.items(): 169 for of, fl in diverge.iteritems():
170 act("divergent renames", "dr", of, fl) 170 act("divergent renames", "dr", of, fl)
171 171
172 # Compare manifests 172 # Compare manifests
173 for f, n in m1.iteritems(): 173 for f, n in m1.iteritems():
174 if partial and not partial(f): 174 if partial and not partial(f):