Show More
@@ -115,7 +115,7 b' def churn(ui, repo, *pats, **opts):' | |||||
115 | It is possible to map alternate email addresses to a main address |
|
115 | It is possible to map alternate email addresses to a main address | |
116 | by providing a file using the following format:: |
|
116 | by providing a file using the following format:: | |
117 |
|
117 | |||
118 | <alias email> <actual email> |
|
118 | <alias email> = <actual email> | |
119 |
|
119 | |||
120 | Such a file may be specified with the --aliases option, otherwise |
|
120 | Such a file may be specified with the --aliases option, otherwise | |
121 | a .hgchurn file will be looked for in the working directory root. |
|
121 | a .hgchurn file will be looked for in the working directory root. | |
@@ -129,9 +129,8 b' def churn(ui, repo, *pats, **opts):' | |||||
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 | l = l.strip() |
|
132 | alias, actual = l.split('=' in l and '=' or None, 1) | |
133 |
alias |
|
133 | amap[alias.strip()] = actual.strip() | |
134 | amap[alias] = actual |
|
|||
135 |
|
134 | |||
136 | rate = countrate(ui, repo, amap, *pats, **opts).items() |
|
135 | rate = countrate(ui, repo, amap, *pats, **opts).items() | |
137 | if not rate: |
|
136 | if not rate: |
@@ -59,6 +59,12 b' hg --config extensions.color= churn --co' | |||||
59 | echo % changeset number churn |
|
59 | echo % changeset number churn | |
60 | hg churn -c |
|
60 | hg churn -c | |
61 |
|
61 | |||
|
62 | echo 'with space = no-space' >> ../aliases | |||
|
63 | echo a >> a | |||
|
64 | hg commit -m a -u 'with space' -d 15:00 | |||
|
65 | echo % churn with space in alias | |||
|
66 | hg churn --aliases ../aliases -r tip | |||
|
67 | ||||
62 | cd .. |
|
68 | cd .. | |
63 |
|
69 | |||
64 | # issue 833: ZeroDivisionError |
|
70 | # issue 833: ZeroDivisionError |
@@ -40,5 +40,7 b' user2 +2/-0 \x1b[0;32m+++++++++++' | |||||
40 | user1 4 *************************************************************** |
|
40 | user1 4 *************************************************************** | |
41 | user3 3 *********************************************** |
|
41 | user3 3 *********************************************** | |
42 | user2 2 ******************************** |
|
42 | user2 2 ******************************** | |
|
43 | % churn with space in alias | |||
|
44 | no-space 1 ************************************************************ | |||
43 | adding foo |
|
45 | adding foo | |
44 | test 0 |
|
46 | test 0 |
General Comments 0
You need to be logged in to leave comments.
Login now