Mercurial > hg
annotate tests/test-identify.t @ 14732:e9ed3506f066 stable
backout of d04ba50e104d: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:
1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
(new behavior would only fail if the outstanding changes and the patches
changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch
It's worth considering if we can move this behavior to -f in the future.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Fri, 24 Jun 2011 23:25:42 +0300 |
parents | 973959fbe8ec |
children | 72e4fcb43227 |
rev | line source |
---|---|
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
1 $ "$TESTDIR/hghave" no-outer-repo || exit 80 |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
2 |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
3 no repo |
7757
af6a63438a8a
identify: have consistent output for local repositories
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
4 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
5 $ hg id |
12070 | 6 abort: there is no Mercurial repository here (.hg not found) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12070
diff
changeset
|
7 [255] |
7830
55bd03e2e13c
test-identify: require no-outer-repo
Mads Kiilerich <mads@kiilerich.com>
parents:
7759
diff
changeset
|
8 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
9 create repo |
7757
af6a63438a8a
identify: have consistent output for local repositories
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
10 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
11 $ hg init test |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
12 $ cd test |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
13 $ echo a > a |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
14 $ hg ci -Ama |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
15 adding a |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
16 |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
17 basic id usage |
7757
af6a63438a8a
identify: have consistent output for local repositories
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
18 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
19 $ hg id |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
20 cb9a9f314b8b tip |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
21 $ hg id --debug |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
22 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b tip |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
23 $ hg id -q |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
24 cb9a9f314b8b |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
25 $ hg id -v |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
26 cb9a9f314b8b tip |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
27 |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
28 with options |
7757
af6a63438a8a
identify: have consistent output for local repositories
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
29 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
30 $ hg id -r. |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
31 cb9a9f314b8b tip |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
32 $ hg id -n |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
33 0 |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
34 $ hg id -t |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
35 tip |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
36 $ hg id -b |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
37 default |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
38 $ hg id -i |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
39 cb9a9f314b8b |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
40 $ hg id -n -t -b -i |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
41 cb9a9f314b8b 0 default tip |
7757
af6a63438a8a
identify: have consistent output for local repositories
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
42 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
43 with modifications |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
44 |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
45 $ echo b > a |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
46 $ hg id -n -t -b -i |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
47 cb9a9f314b8b+ 0+ default tip |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
48 |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
49 other local repo |
7757
af6a63438a8a
identify: have consistent output for local repositories
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
50 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
51 $ cd .. |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
52 $ hg -R test id |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
53 cb9a9f314b8b+ tip |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
54 $ hg id test |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
55 cb9a9f314b8b+ tip |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
56 |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
57 with remote http repo |
7757
af6a63438a8a
identify: have consistent output for local repositories
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
58 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
59 $ cd test |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
60 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
61 $ cat hg.pid >> $DAEMON_PIDS |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
62 $ hg id http://localhost:$HGPORT1/ |
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
63 cb9a9f314b8b |
7757
af6a63438a8a
identify: have consistent output for local repositories
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
64 |
13477
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
65 remote with rev number? |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
66 |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
67 $ hg id -n http://localhost:$HGPORT1/ |
13644
7e6c2f58ad56
identify: list bookmarks for remote repositories
Nils Adermann <naderman@naderman.de>
parents:
13477
diff
changeset
|
68 abort: can't query remote revision number, branch, or tags |
13477
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
69 [255] |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
70 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
71 remote with tags? |
7759
50baf8215942
tests: fix for test-identify returning 255
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7757
diff
changeset
|
72 |
11796
141e2e964705
tests: unify test-identify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7830
diff
changeset
|
73 $ hg id -t http://localhost:$HGPORT1/ |
13644
7e6c2f58ad56
identify: list bookmarks for remote repositories
Nils Adermann <naderman@naderman.de>
parents:
13477
diff
changeset
|
74 abort: can't query remote revision number, branch, or tags |
13477
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
75 [255] |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
76 |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
77 remote with branch? |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
78 |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13447
diff
changeset
|
79 $ hg id -b http://localhost:$HGPORT1/ |
13644
7e6c2f58ad56
identify: list bookmarks for remote repositories
Nils Adermann <naderman@naderman.de>
parents:
13477
diff
changeset
|
80 abort: can't query remote revision number, branch, or tags |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12070
diff
changeset
|
81 [255] |
13447
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
82 |
13645
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
83 test bookmark support |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
84 |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
85 $ hg bookmark Y |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
86 $ hg bookmark Z |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
87 $ hg bookmarks |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
88 Y 0:cb9a9f314b8b |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
89 * Z 0:cb9a9f314b8b |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
90 $ hg id |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
91 cb9a9f314b8b+ tip Y/Z |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
92 $ hg id --bookmarks |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
93 Y Z |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
94 |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
95 test remote identify with bookmarks |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
96 |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
97 $ hg id http://localhost:$HGPORT1/ |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
98 cb9a9f314b8b Y/Z |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
99 $ hg id --bookmarks http://localhost:$HGPORT1/ |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
100 Y Z |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
101 $ hg id -r . http://localhost:$HGPORT1/ |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
102 cb9a9f314b8b Y/Z |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
103 $ hg id --bookmarks -r . http://localhost:$HGPORT1/ |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
104 Y Z |
3786b810ea75
tests: add tests for bookmarks support in hg identify
David Soria Parra <dsp@php.net>
parents:
13644
diff
changeset
|
105 |
13447
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
106 Make sure we do not obscure unknown requires file entries (issue2649) |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
107 |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
108 $ echo fake >> .hg/requires |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
109 $ hg id |
14483
973959fbe8ec
readrequires: provide easier to understand error message
Adrian Buehlmann <adrian@cadifra.com>
parents:
13645
diff
changeset
|
110 abort: unknown repository format: requires feature 'fake' (upgrade Mercurial)! |
13447
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
111 [255] |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
112 |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
113 $ cd .. |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
114 $ hg id test |
14483
973959fbe8ec
readrequires: provide easier to understand error message
Adrian Buehlmann <adrian@cadifra.com>
parents:
13645
diff
changeset
|
115 abort: unknown repository format: requires feature 'fake' (upgrade Mercurial)! |
13447
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
116 [255] |
931a72e00efa
introduce new RequirementError (issue2649)
Adrian Buehlmann <adrian@cadifra.com>
parents:
12346
diff
changeset
|
117 |