Mercurial > hg
annotate tests/test-check-execute.t @ 38679:b3d0c97a0820
rebase: in --confirm option just abort if hit a conflict
Before this patch, it was prompting the user in both cases 1) when
there is no conflict 2) when there is at least one conflict. But
for simplicity we can just abort if we hit a conflict and no need to
prompt in that case.
Differential Revision: https://phab.mercurial-scm.org/D3944
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 14 Jul 2018 08:59:42 +0530 |
parents | ddd65b4f3ae6 |
children | fb6593307e24 |
rev | line source |
---|---|
27569 | 1 #require test-repo execbit |
2 | |
29219
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
27569
diff
changeset
|
3 $ . "$TESTDIR/helpers-testrepo.sh" |
27569 | 4 $ cd "`dirname "$TESTDIR"`" |
5 | |
6 look for python scripts without the execute bit | |
7 | |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
8 $ testrepohg files 'set:**.py and not exec() and grep(r"^#!.*?python")' |
27569 | 9 [1] |
10 | |
11 look for python scripts with execute bit but not shebang | |
12 | |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
13 $ testrepohg files 'set:**.py and exec() and not grep(r"^#!.*?python")' |
27569 | 14 [1] |
15 | |
16 look for shell scripts with execute bit but not shebang | |
17 | |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
18 $ testrepohg files 'set:**.sh and exec() and not grep(r"^#!.*(ba)?sh")' |
27569 | 19 [1] |
20 | |
21 look for non scripts with no shebang | |
22 | |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
23 $ testrepohg files 'set:exec() and not **.sh and not **.py and not grep(r"^#!")' |
27569 | 24 [1] |