Mercurial > hg
comparison mercurial/config.py @ 11292:037d910734de
error: fix up test-hgrc
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 04 Jun 2010 23:04:31 -0500 |
| parents | 2123aad24d56 |
| children | 3da456d0c885 |
comparison
equal
deleted
inserted
replaced
| 11291:543597fae51d | 11292:037d910734de |
|---|---|
| 101 inc = os.path.normpath(os.path.join(base, inc)) | 101 inc = os.path.normpath(os.path.join(base, inc)) |
| 102 if include: | 102 if include: |
| 103 try: | 103 try: |
| 104 include(inc, remap=remap, sections=sections) | 104 include(inc, remap=remap, sections=sections) |
| 105 except IOError, inst: | 105 except IOError, inst: |
| 106 raise error.ParseError( | 106 raise error.ParseError(_("cannot include %s (%s)") |
| 107 _("cannot include %s (%s)") | 107 % (inc, inst.strerror), |
| 108 % (inc, inst.strerror), | 108 "%s:%s" % (src, line)) |
| 109 msg, "%s:%s" % (src, line)) | |
| 110 continue | 109 continue |
| 111 if emptyre.match(l): | 110 if emptyre.match(l): |
| 112 continue | 111 continue |
| 113 m = sectionre.match(l) | 112 m = sectionre.match(l) |
| 114 if m: | 113 if m: |