Mercurial > hg
annotate tests/test-bad-extension @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | f8a86ea7521b |
children |
rev | line source |
---|---|
3014
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 #!/bin/sh |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
4139
efe6f92c0847
test-bad-extension: avoid printing the file name
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3990
diff
changeset
|
3 echo 'raise Exception("bit bucket overflow")' > badext.py |
3014
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 abspath=`pwd`/badext.py |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
6 echo '[extensions]' >> $HGRCPATH |
3990
96e21337dc03
Improved error message for extensions overriding commands (with test):
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3014
diff
changeset
|
7 echo "gpg =" >> $HGRCPATH |
96e21337dc03
Improved error message for extensions overriding commands (with test):
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3014
diff
changeset
|
8 echo "hgext.gpg =" >> $HGRCPATH |
3014
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 echo "badext = $abspath" >> $HGRCPATH |
6204
f8a86ea7521b
When failing to load an extension, show where Hg tried to load it from.
Jesse Glick <jesse.glick@sun.com>
parents:
4139
diff
changeset
|
10 echo "badext2 =" >> $HGRCPATH |
3014
01454af644b8
load extensions only after the ui object has been completely initialized
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 |
6204
f8a86ea7521b
When failing to load an extension, show where Hg tried to load it from.
Jesse Glick <jesse.glick@sun.com>
parents:
4139
diff
changeset
|
12 hg -q help help 2>&1 | python -c \ |
f8a86ea7521b
When failing to load an extension, show where Hg tried to load it from.
Jesse Glick <jesse.glick@sun.com>
parents:
4139
diff
changeset
|
13 "import sys; sys.stdout.write(sys.stdin.read().replace('$abspath', '.../badext.py'))" |