equal
deleted
inserted
replaced
142 raise util.Abort(_("%s should not have CRLF line endings") |
142 raise util.Abort(_("%s should not have CRLF line endings") |
143 % f) |
143 % f) |
144 elif target == "to-crlf" and singlelf.search(data): |
144 elif target == "to-crlf" and singlelf.search(data): |
145 raise util.Abort(_("%s should not have LF line endings") |
145 raise util.Abort(_("%s should not have LF line endings") |
146 % f) |
146 % f) |
|
147 # Ignore other rules for this file |
|
148 break |
147 |
149 |
148 |
150 |
149 def preupdate(ui, repo, hooktype, parent1, parent2): |
151 def preupdate(ui, repo, hooktype, parent1, parent2): |
150 #print "preupdate for %s: %s -> %s" % (repo.root, parent1, parent2) |
152 #print "preupdate for %s: %s -> %s" % (repo.root, parent1, parent2) |
151 repo.readhgeol(parent1) |
153 repo.readhgeol(parent1) |