Mercurial > hg
annotate tests/test-diffstat.t @ 13425:0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
We restrict : to 1. make it easer to convert bookmarks to git branches,
2. use : later for a syntax to push a local bookmark to a remote bookmark
of a different name. \0, \n, \r are fobbidden they are used to separate
bookmarks in the bookmark file.
This change breaks backward compatbility as ':' was an allowed character in
previous versions.
author | David Soria Parra <dsp@php.net> |
---|---|
date | Wed, 16 Feb 2011 18:36:45 +0100 |
parents | 104c9ed93fc5 |
children | cbe13e6bdc34 |
rev | line source |
---|---|
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
1 $ hg init repo |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
2 $ cd repo |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
3 $ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
4 $ hg add a |
9640
9e76232fbfbe
diff: add --stat for diffstat output
Brodie Rao <me+hg@dackz.net>
parents:
diff
changeset
|
5 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
6 Wide diffstat: |
9640
9e76232fbfbe
diff: add --stat for diffstat output
Brodie Rao <me+hg@dackz.net>
parents:
diff
changeset
|
7 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
8 $ hg diff --stat |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
9 a | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
10 1 files changed, 213 insertions(+), 0 deletions(-) |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
11 |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
12 diffstat width: |
9640
9e76232fbfbe
diff: add --stat for diffstat output
Brodie Rao <me+hg@dackz.net>
parents:
diff
changeset
|
13 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
14 $ COLUMNS=24 hg diff --config ui.interactive=true --stat |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
15 a | 213 ++++++++++++++ |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
16 1 files changed, 213 insertions(+), 0 deletions(-) |
9640
9e76232fbfbe
diff: add --stat for diffstat output
Brodie Rao <me+hg@dackz.net>
parents:
diff
changeset
|
17 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
18 $ hg ci -m adda |
9640
9e76232fbfbe
diff: add --stat for diffstat output
Brodie Rao <me+hg@dackz.net>
parents:
diff
changeset
|
19 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
20 $ cat >> a <<EOF |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
21 > a |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
22 > a |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
23 > a |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
24 > EOF |
9640
9e76232fbfbe
diff: add --stat for diffstat output
Brodie Rao <me+hg@dackz.net>
parents:
diff
changeset
|
25 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
26 Narrow diffstat: |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
27 |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
28 $ hg diff --stat |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
29 a | 3 +++ |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
30 1 files changed, 3 insertions(+), 0 deletions(-) |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
31 |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
32 $ hg ci -m appenda |
9640
9e76232fbfbe
diff: add --stat for diffstat output
Brodie Rao <me+hg@dackz.net>
parents:
diff
changeset
|
33 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
34 $ printf '\0' > b |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
35 $ hg add b |
9640
9e76232fbfbe
diff: add --stat for diffstat output
Brodie Rao <me+hg@dackz.net>
parents:
diff
changeset
|
36 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
37 Binary diffstat: |
9640
9e76232fbfbe
diff: add --stat for diffstat output
Brodie Rao <me+hg@dackz.net>
parents:
diff
changeset
|
38 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
39 $ hg diff --stat |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
40 b | 0 |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
41 1 files changed, 0 insertions(+), 0 deletions(-) |
9642
7d17794f08a9
diffstat: with --git, mark binary files with Bin
Brodie Rao <me+hg@dackz.net>
parents:
9640
diff
changeset
|
42 |
12147
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
43 Binary git diffstat: |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
44 |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
45 $ hg diff --stat --git |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
46 b | Bin |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
47 1 files changed, 0 insertions(+), 0 deletions(-) |
2b171fe378c0
tests: unify test-diffstat
Adrian Buehlmann <adrian@cadifra.com>
parents:
9799
diff
changeset
|
48 |
13395
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
49 $ hg ci -m createb |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
50 |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
51 $ printf '\0' > "file with spaces" |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
52 $ hg add "file with spaces" |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
53 |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
54 Filename with spaces diffstat: |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
55 |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
56 $ hg diff --stat |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
57 file with spaces | 0 |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
58 1 files changed, 0 insertions(+), 0 deletions(-) |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
59 |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
60 Filename with spaces git diffstat: |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
61 |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
62 $ hg diff --stat --git |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
63 file with spaces | Bin |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
64 1 files changed, 0 insertions(+), 0 deletions(-) |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
12147
diff
changeset
|
65 |