Mercurial > hg

comparison mercurial/copies.py @ 10282:08a0f04b56bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
many, many trivial check-code fixups
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Jan 2010 00:05:27 -0600
parents 25e572394f5c
children cade47dcac2d
comparison
equal deleted inserted replaced
10281:e7d3b509af8b 10282:08a0f04b56bd
188 188
189 if fullcopy: 189 if fullcopy:
190 repo.ui.debug(" all copies found (* = to merge, ! = divergent):\n") 190 repo.ui.debug(" all copies found (* = to merge, ! = divergent):\n")
191 for f in fullcopy: 191 for f in fullcopy:
192 note = "" 192 note = ""
193 if f in copy: note += "*" 193 if f in copy:
194 if f in diverge2: note += "!" 194 note += "*"
195 if f in diverge2:
196 note += "!"
195 repo.ui.debug(" %s -> %s %s\n" % (f, fullcopy[f], note)) 197 repo.ui.debug(" %s -> %s %s\n" % (f, fullcopy[f], note))
196 del diverge2 198 del diverge2
197 199
198 if not fullcopy or not checkdirs: 200 if not fullcopy or not checkdirs:
199 return copy, diverge 201 return copy, diverge