Mercurial > hg
comparison mercurial/merge.py @ 8152:08e1baf924ca
replace set-like dictionaries with real sets
Many of the dictionaries created by dict.fromkeys were emulating sets.
These can now be replaced with real sets.
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Wed, 22 Apr 2009 00:57:28 +0200 |
| parents | 496ae1ea4698 |
| children | 46293a0c7e9f |
comparison
equal
deleted
inserted
replaced
| 8151:127281884959 | 8152:08e1baf924ca |
|---|---|
| 164 | 164 |
| 165 if pa and not (backwards or overwrite): | 165 if pa and not (backwards or overwrite): |
| 166 if repo.ui.configbool("merge", "followcopies", True): | 166 if repo.ui.configbool("merge", "followcopies", True): |
| 167 dirs = repo.ui.configbool("merge", "followdirs", True) | 167 dirs = repo.ui.configbool("merge", "followdirs", True) |
| 168 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) | 168 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) |
| 169 copied = dict.fromkeys(copy.values()) | 169 copied = set(copy.values()) |
| 170 for of, fl in diverge.iteritems(): | 170 for of, fl in diverge.iteritems(): |
| 171 act("divergent renames", "dr", of, fl) | 171 act("divergent renames", "dr", of, fl) |
| 172 | 172 |
| 173 # Compare manifests | 173 # Compare manifests |
| 174 for f, n in m1.iteritems(): | 174 for f, n in m1.iteritems(): |