comparison hgext/churn.py @ 12069:7c3c44413bc1 stable

churn: do not crash on malformed lines in alias file
author Martin Geisler <mg@lazybytes.net>
date Sun, 29 Aug 2010 22:46:00 +0200
parents 2e7647d25458
children fddacca3202e
comparison
equal deleted inserted replaced
12068:2e7647d25458 12069:7c3c44413bc1
127 aliases = opts.get('aliases') 127 aliases = opts.get('aliases')
128 if not aliases and os.path.exists(repo.wjoin('.hgchurn')): 128 if not aliases and os.path.exists(repo.wjoin('.hgchurn')):
129 aliases = repo.wjoin('.hgchurn') 129 aliases = repo.wjoin('.hgchurn')
130 if aliases: 130 if aliases:
131 for l in open(aliases, "r"): 131 for l in open(aliases, "r"):
132 if not l.strip(): 132 try:
133 alias, actual = l.split('=' in l and '=' or None, 1)
134 amap[alias.strip()] = actual.strip()
135 except ValueError:
136 l = l.strip()
137 if l:
138 ui.warn(_("skipping malformed alias: %s\n" % l))
133 continue 139 continue
134 alias, actual = l.split('=' in l and '=' or None, 1)
135 amap[alias.strip()] = actual.strip()
136 140
137 rate = countrate(ui, repo, amap, *pats, **opts).items() 141 rate = countrate(ui, repo, amap, *pats, **opts).items()
138 if not rate: 142 if not rate:
139 return 143 return
140 144