Show More
@@ -170,7 +170,15 b' class ui(object):' | |||
|
170 | 170 | |
|
171 | 171 | cdata = util.configparser() |
|
172 | 172 | try: |
|
173 | cdata.read(filename) | |
|
173 | try: | |
|
174 | fp = open(filename) | |
|
175 | except IOError, inst: | |
|
176 | raise util.Abort(_("unable to open %s: %s") % (filename, | |
|
177 | getattr(inst, "strerror", inst))) | |
|
178 | try: | |
|
179 | cdata.readfp(fp, filename) | |
|
180 | finally: | |
|
181 | fp.close() | |
|
174 | 182 | except ConfigParser.ParsingError, inst: |
|
175 | 183 | raise util.Abort(_("failed to parse %s\n%s") % (filename, |
|
176 | 184 | inst)) |
@@ -470,12 +470,11 b' adding foo/file.txt revisions' | |||
|
470 | 470 | adding quux/file.py revisions |
|
471 | 471 | added 3 changesets with 3 changes to 3 files |
|
472 | 472 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
473 | acl: acl.allow enabled, 1 entries for user barney | |
|
474 | acl: acl.deny enabled, 0 entries for user barney | |
|
475 | acl: allowing changeset ef1ea85a6374 | |
|
476 | acl: allowing changeset f9cafe1212c8 | |
|
477 | acl: allowing changeset 911600dab2ae | |
|
478 | rolling back last transaction | |
|
473 | error: pretxnchangegroup.acl hook failed: unable to open ../acl.config: No such file or directory | |
|
474 | abort: unable to open ../acl.config: No such file or directory | |
|
475 | transaction abort! | |
|
476 | rollback completed | |
|
477 | no rollback information available | |
|
479 | 478 | 0:6675d58eff77 |
|
480 | 479 | |
|
481 | 480 | betty is allowed inside foo/ by a acl.config file |
@@ -48,6 +48,12 b' template = Subject: {desc|firstline|stri' | |||
|
48 | 48 | baseurl = http://test/ |
|
49 | 49 | EOF |
|
50 | 50 | |
|
51 | echo % fail for config file is missing | |
|
52 | hg --cwd b rollback | |
|
53 | hg --cwd b pull ../a 2>&1 | grep 'unable to open.*\.notify\.conf' > /dev/null && echo pull failed | |
|
54 | ||
|
55 | touch "$HGTMP/.notify.conf" | |
|
56 | ||
|
51 | 57 | echo % pull |
|
52 | 58 | hg --cwd b rollback |
|
53 | 59 | hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \ |
General Comments 0
You need to be logged in to leave comments.
Login now