Show More
@@ -10,13 +10,14 b' before_script:' | |||
|
10 | 10 | |
|
11 | 11 | variables: |
|
12 | 12 | PYTHON: python |
|
13 | TEST_HGMODULEPOLICY: "allow" | |
|
13 | 14 | |
|
14 | 15 | .runtests_template: &runtests |
|
15 | 16 | script: |
|
16 | 17 | - cd tests/ |
|
17 | 18 | - echo "python used, $PYTHON" |
|
18 | 19 | - echo "$RUNTEST_ARGS" |
|
19 | - $PYTHON run-tests.py --color=always $RUNTEST_ARGS | |
|
20 | - HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" run-tests.py --color=always $RUNTEST_ARGS | |
|
20 | 21 | |
|
21 | 22 | checks-py2: |
|
22 | 23 | <<: *runtests |
@@ -43,29 +44,34 b' test-py2:' | |||
|
43 | 44 | <<: *runtests |
|
44 | 45 | variables: |
|
45 | 46 | RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt" |
|
47 | TEST_HGMODULEPOLICY: "c" | |
|
46 | 48 | |
|
47 | 49 | test-py3: |
|
48 | 50 | <<: *runtests |
|
49 | 51 | variables: |
|
50 | 52 | RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt" |
|
51 | 53 | PYTHON: python3 |
|
54 | TEST_HGMODULEPOLICY: "c" | |
|
52 | 55 | |
|
53 | 56 | test-py2-pure: |
|
54 | 57 | <<: *runtests |
|
55 | 58 | variables: |
|
56 | 59 | RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" |
|
60 | TEST_HGMODULEPOLICY: "py" | |
|
57 | 61 | |
|
58 | 62 | test-py3-pure: |
|
59 | 63 | <<: *runtests |
|
60 | 64 | variables: |
|
61 | 65 | RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" |
|
62 | 66 | PYTHON: python3 |
|
67 | TEST_HGMODULEPOLICY: "py" | |
|
63 | 68 | |
|
64 | 69 | test-py2-rust: |
|
65 | 70 | <<: *runtests |
|
66 | 71 | variables: |
|
67 | 72 | HGWITHRUSTEXT: cpython |
|
68 | 73 | RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt" |
|
74 | TEST_HGMODULEPOLICY: "rust+c" | |
|
69 | 75 | |
|
70 | 76 | test-py3-rust: |
|
71 | 77 | <<: *runtests |
@@ -73,3 +79,4 b' test-py3-rust:' | |||
|
73 | 79 | HGWITHRUSTEXT: cpython |
|
74 | 80 | RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt" |
|
75 | 81 | PYTHON: python3 |
|
82 | TEST_HGMODULEPOLICY: "rust+c" |
@@ -1860,10 +1860,7 b' def histedit(ui, repo, *freeargs, **opts' | |||
|
1860 | 1860 | # kludge: _chistedit only works for starting an edit, not aborting |
|
1861 | 1861 | # or continuing, so fall back to regular _texthistedit for those |
|
1862 | 1862 | # operations. |
|
1863 | if ( | |
|
1864 | ui.interface(b'histedit') == b'curses' | |
|
1865 | and _getgoal(opts) == goalnew | |
|
1866 | ): | |
|
1863 | if ui.interface(b'histedit') == b'curses' and _getgoal(opts) == goalnew: | |
|
1867 | 1864 | return _chistedit(ui, repo, freeargs, opts) |
|
1868 | 1865 | return _texthistedit(ui, repo, freeargs, opts) |
|
1869 | 1866 |
@@ -126,7 +126,12 b' py_class!(pub class LazyAncestors |py| {' | |||
|
126 | 126 | py_class!(pub class MissingAncestors |py| { |
|
127 | 127 | data inner: RefCell<Box<CoreMissing<Index>>>; |
|
128 | 128 | |
|
129 | def __new__(_cls, index: PyObject, bases: PyObject) -> PyResult<MissingAncestors> { | |
|
129 | def __new__( | |
|
130 | _cls, | |
|
131 | index: PyObject, | |
|
132 | bases: PyObject | |
|
133 | ) | |
|
134 | -> PyResult<MissingAncestors> { | |
|
130 | 135 | let bases_vec: Vec<Revision> = rev_pyiter_collect(py, &bases)?; |
|
131 | 136 | let inner = CoreMissing::new(pyindex_to_graph(py, index)?, bases_vec); |
|
132 | 137 | MissingAncestors::create_instance(py, RefCell::new(Box::new(inner))) |
General Comments 0
You need to be logged in to leave comments.
Login now