Mercurial > hg
comparison hgext/churn.py @ 12070:fddacca3202e
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 29 Aug 2010 22:55:37 +0200 |
| parents | deb5d02ae91c 7c3c44413bc1 |
| children | c52c629ce19e |
comparison
equal
deleted
inserted
replaced
| 12066:d01e28657429 | 12070:fddacca3202e |
|---|---|
| 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 alias, actual = l.split('=' in l and '=' or None, 1) | 132 try: |
| 133 amap[alias.strip()] = actual.strip() | 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)) | |
| 139 continue | |
| 134 | 140 |
| 135 rate = countrate(ui, repo, amap, *pats, **opts).items() | 141 rate = countrate(ui, repo, amap, *pats, **opts).items() |
| 136 if not rate: | 142 if not rate: |
| 137 return | 143 return |
| 138 | 144 |