Mercurial > hg
annotate tests/test-check-shbang.t @ 35455:02ea370c2baa
split: new extension to split changesets
This diff introduces an experimental split extension to split changesets.
The implementation is largely inspired by Laurent Charignon's implementation
for mutable-history (changeset 9603aa1ecdfd54b0d86e262318a72e0a2ffeb6cc [1])
This version contains various improvements:
- Rebase by default.
This is more friendly for new users. Split won't lead to merge conflicts
so a rebase won't give the user more trouble.
This has been on by default at Facebook for months now and seems to be a
good UX improvement.
The rebase skips obsoleted or orphaned changesets, which can avoid
issues like allowdivergence, merge conflicts, etc. This is more flexible
because the user can decide what to do next (see the last test case in
test-split.t)
- Remove "Done split? [y/n]" prompt.
That could be detected by checking `repo.status()` instead.
- Works with obsstore disabled.
Without obsstore, split uses strip to clean up old nodes, and it can
even handle split a non-head changeset with "allowunstable" disabled,
since it runs a rebase to solve the "unstable" issue in a same
transaction.
- More friendly editor text.
Put what has been already split into the editor text so users won't lost
track about where they are.
[1]: https://bitbucket.org/marmoute/mutable-history/commits/9603aa1ecdfd54b
Differential Revision: https://phab.mercurial-scm.org/D1082
author | Jun Wu <quark@fb.com> |
---|---|
date | Sat, 24 Jun 2017 23:03:41 -0700 |
parents | ddd65b4f3ae6 |
children | 2d8d4e08c493 |
rev | line source |
---|---|
28879
8c1759a2bdf4
tests: add new test for #! shebang lines
timeless <timeless@mozdev.org>
parents:
27569
diff
changeset
|
1 #require test-repo |
27569 | 2 |
29219
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
28879
diff
changeset
|
3 $ . "$TESTDIR/helpers-testrepo.sh" |
27569 | 4 $ cd "`dirname "$TESTDIR"`" |
5 | |
28879
8c1759a2bdf4
tests: add new test for #! shebang lines
timeless <timeless@mozdev.org>
parents:
27569
diff
changeset
|
6 look for python scripts that do not use /usr/bin/env |
27569 | 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:grep(r"^#!.*?python") and not grep(r"^#!/usr/bi{1}n/env python") - **/*.t' |
27569 | 9 [1] |
10 | |
32939
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
11 In tests, enforce $PYTHON and *not* /usr/bin/env python or similar: |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
12 $ testrepohg files 'set:grep(r"#!.*?python") and **/*.t' \ |
32939
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
13 > -X tests/test-check-execute.t \ |
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
14 > -X tests/test-check-module-imports.t \ |
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
15 > -X tests/test-check-pyflakes.t \ |
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
16 > -X tests/test-check-shbang.t |
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
17 [1] |
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
18 |
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
19 The above exclusions are because they're looking for files that |
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
20 contain Python but don't end in .py - please avoid adding more. |
cad62cb3c84c
tests: enforce use of $PYTHON in tests
Augie Fackler <augie@google.com>
parents:
29515
diff
changeset
|
21 |
28879
8c1759a2bdf4
tests: add new test for #! shebang lines
timeless <timeless@mozdev.org>
parents:
27569
diff
changeset
|
22 look for shell scripts that do not use /bin/sh |
27569 | 23 |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
24 $ testrepohg files 'set:grep(r"^#!.*/bi{1}n/sh") and not grep(r"^#!/bi{1}n/sh")' |
27569 | 25 [1] |