Show More
@@ -152,7 +152,11 b' def hook(ui, repo, node, hooktype, **kwa' | |||||
152 |
|
152 | |||
153 | def preupdate(ui, repo, hooktype, parent1, parent2): |
|
153 | def preupdate(ui, repo, hooktype, parent1, parent2): | |
154 | #print "preupdate for %s: %s -> %s" % (repo.root, parent1, parent2) |
|
154 | #print "preupdate for %s: %s -> %s" % (repo.root, parent1, parent2) | |
155 | repo.readhgeol(parent1) |
|
155 | try: | |
|
156 | repo.readhgeol(parent1) | |||
|
157 | except error.ParseError, inst: | |||
|
158 | ui.warn(_("warning: ignoring .hgeol file due to parse error " | |||
|
159 | "at %s: %s\n") % (inst.args[1], inst.args[0])) | |||
156 | return False |
|
160 | return False | |
157 |
|
161 | |||
158 | def uisetup(ui): |
|
162 | def uisetup(ui): | |
@@ -233,7 +237,12 b' def reposetup(ui, repo):' | |||||
233 | return match.match(self.root, '', [], include, exclude) |
|
237 | return match.match(self.root, '', [], include, exclude) | |
234 |
|
238 | |||
235 | def _hgcleardirstate(self): |
|
239 | def _hgcleardirstate(self): | |
236 | self._eolfile = self.readhgeol() or self.readhgeol('tip') |
|
240 | try: | |
|
241 | self._eolfile = self.readhgeol() or self.readhgeol('tip') | |||
|
242 | except error.ParseError, inst: | |||
|
243 | ui.warn(_("warning: ignoring .hgeol file due to parse error " | |||
|
244 | "at %s: %s\n") % (inst.args[1], inst.args[0])) | |||
|
245 | self._eolfile = None | |||
237 |
|
246 | |||
238 | if not self._eolfile: |
|
247 | if not self._eolfile: | |
239 | self._eolfile = util.never |
|
248 | self._eolfile = util.never |
@@ -426,3 +426,17 b' Check that both files have LF line-endin' | |||||
426 | foo |
|
426 | foo | |
427 | bar |
|
427 | bar | |
428 | baz |
|
428 | baz | |
|
429 | ||||
|
430 | Test handling of a broken .hgeol file: | |||
|
431 | ||||
|
432 | $ touch .hgeol | |||
|
433 | $ hg add .hgeol | |||
|
434 | $ hg commit -m 'clean version' | |||
|
435 | $ echo "bad" > .hgeol | |||
|
436 | $ hg status | |||
|
437 | warning: ignoring .hgeol file due to parse error at .hgeol:1: bad | |||
|
438 | M .hgeol | |||
|
439 | $ hg revert .hgeol | |||
|
440 | warning: ignoring .hgeol file due to parse error at .hgeol:1: bad | |||
|
441 | $ hg status | |||
|
442 | ? .hgeol.orig |
General Comments 0
You need to be logged in to leave comments.
Login now