Show More
@@ -62,6 +62,7 b' def countrate(ui, repo, amap, *pats, **o' | |||||
62 |
|
62 | |||
63 | key = getkey(ctx) |
|
63 | key = getkey(ctx) | |
64 | key = amap.get(key, key) # alias remap |
|
64 | key = amap.get(key, key) # alias remap | |
|
65 | key = key.strip() # ignore leading and trailing spaces | |||
65 | if opts.get('changesets'): |
|
66 | if opts.get('changesets'): | |
66 | rate[key] = (rate.get(key, (0,))[0] + 1, 0) |
|
67 | rate[key] = (rate.get(key, (0,))[0] + 1, 0) | |
67 | else: |
|
68 | else: |
@@ -11,18 +11,20 b' configuration file every time you run an' | |||||
11 | configuration files. It uses two sections, ``[patterns]`` and |
|
11 | configuration files. It uses two sections, ``[patterns]`` and | |
12 | ``[repository]``. |
|
12 | ``[repository]``. | |
13 |
|
13 | |||
14 |
The ``[patterns]`` section specifies |
|
14 | The ``[patterns]`` section specifies how line endings should be | |
15 | working directory. The format is specified by a file pattern. The |
|
15 | converted between the working copy and the repository. The format is | |
16 | first match is used, so put more specific patterns first. The |
|
16 | specified by a file pattern. The first match is used, so put more | |
17 | available line endings are ``LF``, ``CRLF``, and ``BIN``. |
|
17 | specific patterns first. The available line endings are ``LF``, | |
|
18 | ``CRLF``, and ``BIN``. | |||
18 |
|
19 | |||
19 | Files with the declared format of ``CRLF`` or ``LF`` are always |
|
20 | Files with the declared format of ``CRLF`` or ``LF`` are always | |
20 | checked out in that format and files declared to be binary (``BIN``) |
|
21 | checked out and stored in the repository in that format and files | |
21 | are left unchanged. Additionally, ``native`` is an alias for the |
|
22 | declared to be binary (``BIN``) are left unchanged. Additionally, | |
22 | platform's default line ending: ``LF`` on Unix (including Mac OS X) |
|
23 | ``native`` is an alias for checking out in the platform's default line | |
23 | and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line |
|
24 | ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on | |
24 | endings) is Mercurial's default behaviour; it is only needed if you |
|
25 | Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's | |
25 | need to override a later, more general pattern. |
|
26 | default behaviour; it is only needed if you need to override a later, | |
|
27 | more general pattern. | |||
26 |
|
28 | |||
27 | The optional ``[repository]`` section specifies the line endings to |
|
29 | The optional ``[repository]`` section specifies the line endings to | |
28 | use for files stored in the repository. It has a single setting, |
|
30 | use for files stored in the repository. It has a single setting, | |
@@ -46,6 +48,10 b' Example versioned ``.hgeol`` file::' | |||||
46 | [repository] |
|
48 | [repository] | |
47 | native = LF |
|
49 | native = LF | |
48 |
|
50 | |||
|
51 | .. note:: | |||
|
52 | The rules will first apply when files are touched in the working | |||
|
53 | copy, e.g. by updating to null and back to tip to touch all files. | |||
|
54 | ||||
49 | The extension uses an optional ``[eol]`` section in your hgrc file |
|
55 | The extension uses an optional ``[eol]`` section in your hgrc file | |
50 | (not the ``.hgeol`` file) for settings that control the overall |
|
56 | (not the ``.hgeol`` file) for settings that control the overall | |
51 | behavior. There are two settings: |
|
57 | behavior. There are two settings: |
@@ -139,3 +139,22 b' this was failing with a ZeroDivisionErro' | |||||
139 | $ hg churn |
|
139 | $ hg churn | |
140 | test 0 |
|
140 | test 0 | |
141 | $ cd .. |
|
141 | $ cd .. | |
|
142 | ||||
|
143 | Ignore trailing or leading spaces in emails | |||
|
144 | ||||
|
145 | $ cd repo | |||
|
146 | $ touch bar | |||
|
147 | $ hg ci -Am'bar' -u 'user4 <user4@x.com>' | |||
|
148 | adding bar | |||
|
149 | $ touch foo | |||
|
150 | $ hg ci -Am'foo' -u 'user4 < user4@x.com >' | |||
|
151 | adding foo | |||
|
152 | $ hg log -l2 --template '[{author|email}]\n' | |||
|
153 | [ user4@x.com ] | |||
|
154 | [user4@x.com] | |||
|
155 | $ hg churn -c | |||
|
156 | user1 4 ********************************************************* | |||
|
157 | user3 3 ******************************************* | |||
|
158 | user4@x.com 2 ***************************** | |||
|
159 | user2 2 ***************************** | |||
|
160 | with space 1 ************** |
General Comments 0
You need to be logged in to leave comments.
Login now