equal
deleted
inserted
replaced
147 # trust warnings since the .hg/hgrc file is untrusted. That is |
147 # trust warnings since the .hg/hgrc file is untrusted. That is |
148 # fine, we don't want to load it anyway. Python may warn about |
148 # fine, we don't want to load it anyway. Python may warn about |
149 # a missing __init__.py in mercurial/locale, we also ignore that. |
149 # a missing __init__.py in mercurial/locale, we also ignore that. |
150 err = [e for e in err.splitlines() |
150 err = [e for e in err.splitlines() |
151 if not e.startswith(b('Not trusting file')) \ |
151 if not e.startswith(b('Not trusting file')) \ |
152 and not e.startswith(b('warning: Not importing'))] |
152 and not e.startswith(b('warning: Not importing')) \ |
|
153 and not e.startswith(b('obsolete feature not enabled'))] |
153 if err: |
154 if err: |
154 print >> sys.stderr, "stderr from '%s':" % (' '.join(cmd)) |
155 print >> sys.stderr, "stderr from '%s':" % (' '.join(cmd)) |
155 print >> sys.stderr, '\n'.join([' ' + e for e in err]) |
156 print >> sys.stderr, '\n'.join([' ' + e for e in err]) |
156 return '' |
157 return '' |
157 return out |
158 return out |