Mercurial > hg
annotate tests/test-paths.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 | 3b9a896af09c |
children | 9910f60a37ee |
rev | line source |
---|---|
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
1 $ hg init a |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
2 $ hg clone a b |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
3 updating to branch default |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
5 $ cd a |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
6 $ echo '[paths]' >> .hg/hgrc |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
7 $ echo 'dupe = ../b' >> .hg/hgrc |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
8 $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
9 $ hg in dupe |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12587
diff
changeset
|
10 comparing with $TESTTMP/b |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
11 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11785
diff
changeset
|
12 [1] |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
13 $ cd .. |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
14 $ hg -R a in dupe |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12587
diff
changeset
|
15 comparing with $TESTTMP/b |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
16 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11785
diff
changeset
|
17 [1] |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
18 $ cd a |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
19 $ hg paths |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
20 dupe = $TESTTMP/b |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
21 expand = $TESTTMP/a/$SOMETHING/bar |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
22 $ SOMETHING=foo hg paths |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
23 dupe = $TESTTMP/b |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
24 expand = $TESTTMP/a/foo/bar |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
25 $ SOMETHING=/foo hg paths |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
26 dupe = $TESTTMP/b |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
27 expand = /foo/bar |
14331
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
28 $ hg paths -q |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
29 dupe |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
30 expand |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
31 $ hg paths dupe |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
32 $TESTTMP/b |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
33 $ hg paths -q dupe |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
34 $ hg paths unknown |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
35 not found! |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
36 [1] |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
37 $ hg paths -q unknown |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
38 [1] |
13797
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
39 $ cd .. |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
40 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
41 'file:' disables [paths] entries for clone destination |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
42 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
43 $ cat >> $HGRCPATH <<EOF |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
44 > [paths] |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
45 > gpath1 = http://hg.example.com |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
46 > EOF |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
47 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
48 $ hg clone a gpath1 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
49 abort: cannot create new http repository |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
50 [255] |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
51 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
52 $ hg clone a file:gpath1 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
53 updating to branch default |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
54 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
55 $ cd gpath1 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
56 $ hg -q id |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
57 000000000000 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
58 |