Skip to content

Commit b61ab82

Browse files
fcollonvalfcollonval
authored
Fix diff file broken for working file when Jupytext is installed (#1097)
* Add unit test for get_content and jupytext * Deal with jupytext when requesting working content
1 parent dc61c76 commit b61ab82

File tree

7 files changed

+416
-229
lines changed

7 files changed

+416
-229
lines changed

‎jupyterlab_git/git.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1300,8 +1300,11 @@ async def get_content(self, contents_manager, filename, path):
13001300
"""
13011301
relative_repo = os.path.relpath(path, contents_manager.root_dir)
13021302
try:
1303+
# Never request notebook model - see https://github.com/jupyterlab/jupyterlab-git/issues/970
13031304
model = await ensure_async(
1304-
contents_manager.get(path=os.path.join(relative_repo, filename))
1305+
contents_manager.get(
1306+
path=os.path.join(relative_repo, filename), type="file"
1307+
)
13051308
)
13061309
except tornado.web.HTTPError as error:
13071310
# Handle versioned file being deleted case

‎jupyterlab_git/tests/samples/ipynb_base.json

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
{
2-
"cells": [
3-
{
4-
"cell_type": "markdown",
5-
"metadata": {},
6-
"source": [
7-
"## Cool Header"
8-
]
9-
},
10-
{
11-
"cell_type": "markdown",
12-
"metadata": {},
13-
"source": [
14-
"## Some information\n",
15-
"* Item 1\n",
16-
"* Item 2\n",
17-
"* Item 3"
18-
]
19-
},
20-
{
21-
"cell_type": "code",
22-
"execution_count": 1,
23-
"metadata": {},
24-
"outputs": [
25-
{
26-
"name": "stdout",
27-
"output_type": "stream",
28-
"text": [
29-
"hi\n",
30-
"2\n"
31-
]
32-
}
33-
],
34-
"source": [
35-
"print('hi')\n",
36-
"print(1+1)"
37-
]
38-
}
39-
],
40-
"metadata": {
41-
"kernelspec": {
42-
"display_name": "Python 3",
43-
"language": "python",
44-
"name": "python3"
45-
},
46-
"language_info": {
47-
"codemirror_mode": {
48-
"name": "ipython",
49-
"version": 3
50-
},
51-
"file_extension": ".py",
52-
"mimetype": "text/x-python",
53-
"name": "python",
54-
"nbconvert_exporter": "python",
55-
"pygments_lexer": "ipython3",
56-
"version": "3.7.3"
57-
}
2+
"cells": [
3+
{
4+
"cell_type": "markdown",
5+
"metadata": {},
6+
"source": [
7+
"## Cool Header"
8+
]
589
},
59-
"nbformat": 4,
60-
"nbformat_minor": 2
61-
}
10+
{
11+
"cell_type": "markdown",
12+
"metadata": {},
13+
"source": [
14+
"## Some information\n",
15+
"* Item 1\n",
16+
"* Item 2\n",
17+
"* Item 3"
18+
]
19+
},
20+
{
21+
"cell_type": "code",
22+
"execution_count": 1,
23+
"metadata": {},
24+
"outputs": [
25+
{
26+
"name": "stdout",
27+
"output_type": "stream",
28+
"text": [
29+
"hi\n",
30+
"2\n"
31+
]
32+
}
33+
],
34+
"source": [
35+
"print('hi')\n",
36+
"print(1+1)"
37+
]
38+
}
39+
],
40+
"metadata": {
41+
"kernelspec": {
42+
"display_name": "Python 3",
43+
"language": "python",
44+
"name": "python3"
45+
},
46+
"language_info": {
47+
"codemirror_mode": {
48+
"name": "ipython",
49+
"version": 3
50+
},
51+
"file_extension": ".py",
52+
"mimetype": "text/x-python",
53+
"name": "python",
54+
"nbconvert_exporter": "python",
55+
"pygments_lexer": "ipython3",
56+
"version": "3.7.3"
57+
}
58+
},
59+
"nbformat": 4,
60+
"nbformat_minor": 2
61+
}

‎jupyterlab_git/tests/samples/ipynb_nbdiff.json

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,110 @@
11
{
2-
"base":{
3-
"cells":[
4-
{
5-
"cell_type":"markdown",
6-
"metadata":{
7-
8-
},
9-
"source":"## Cool Header"
10-
},
11-
{
12-
"cell_type":"markdown",
13-
"metadata":{
14-
15-
},
16-
"source":"## Some information\n* Item 1\n* Item 2\n* Item 3"
17-
},
18-
{
19-
"cell_type":"code",
20-
"execution_count":1,
21-
"metadata":{
22-
23-
},
24-
"outputs":[
25-
{
26-
"name":"stdout",
27-
"output_type":"stream",
28-
"text":"hi\n2\n"
29-
}
30-
],
31-
"source":"print('hi')\nprint(1+1)"
32-
}
33-
],
2+
"base":{
3+
"cells":[
4+
{
5+
"cell_type":"markdown",
346
"metadata":{
35-
"kernelspec":{
36-
"display_name":"Python 3",
37-
"language":"python",
38-
"name":"python3"
39-
},
40-
"language_info":{
41-
"codemirror_mode":{
42-
"name":"ipython",
43-
"version":3
44-
},
45-
"file_extension":".py",
46-
"mimetype":"text/x-python",
47-
"name":"python",
48-
"nbconvert_exporter":"python",
49-
"pygments_lexer":"ipython3",
50-
"version":"3.7.3"
51-
}
7+
528
},
53-
"nbformat":4,
54-
"nbformat_minor":2
9+
"source":"## Cool Header"
10+
},
11+
{
12+
"cell_type":"markdown",
13+
"metadata":{
14+
15+
},
16+
"source":"## Some information\n* Item 1\n* Item 2\n* Item 3"
17+
},
18+
{
19+
"cell_type":"code",
20+
"execution_count":1,
21+
"metadata":{
22+
23+
},
24+
"outputs":[
25+
{
26+
"name":"stdout",
27+
"output_type":"stream",
28+
"text":"hi\n2\n"
29+
}
30+
],
31+
"source":"print('hi')\nprint(1+1)"
32+
}
33+
],
34+
"metadata":{
35+
"kernelspec":{
36+
"display_name":"Python 3",
37+
"language":"python",
38+
"name":"python3"
39+
},
40+
"language_info":{
41+
"codemirror_mode":{
42+
"name":"ipython",
43+
"version":3
44+
},
45+
"file_extension":".py",
46+
"mimetype":"text/x-python",
47+
"name":"python",
48+
"nbconvert_exporter":"python",
49+
"pygments_lexer":"ipython3",
50+
"version":"3.7.3"
51+
}
5552
},
56-
"diff":[
53+
"nbformat":4,
54+
"nbformat_minor":2
55+
},
56+
"diff":[
57+
{
58+
"op":"patch",
59+
"key":"cells",
60+
"diff":[
5761
{
58-
"op":"patch",
59-
"key":"cells",
60-
"diff":[
61-
{
62-
"op":"addrange",
63-
"key":0,
64-
"valuelist":[
65-
{
66-
"cell_type":"code",
67-
"execution_count":1,
68-
"metadata":{
69-
70-
},
71-
"outputs":[
72-
73-
],
74-
"source":"def hello():\n print(\"hello!\")"
75-
}
76-
]
77-
},
78-
{
79-
"op":"removerange",
80-
"key":0,
81-
"length":1
82-
},
83-
{
84-
"op":"patch",
85-
"key":1,
86-
"diff":[
87-
{
88-
"op":"patch",
89-
"key":"source",
90-
"diff":[
91-
{
92-
"op":"addrange",
93-
"key":3,
94-
"valuelist":[
95-
"* Item 2.5\n"
96-
]
97-
}
98-
]
99-
}
100-
]
101-
}
102-
]
62+
"op":"addrange",
63+
"key":0,
64+
"valuelist":[
65+
{
66+
"cell_type":"code",
67+
"execution_count":1,
68+
"metadata":{
69+
70+
},
71+
"outputs":[
72+
73+
],
74+
"source":"def hello():\n print(\"hello!\")"
75+
}
76+
]
77+
},
78+
{
79+
"op":"removerange",
80+
"key":0,
81+
"length":1
10382
},
10483
{
105-
"op":"replace",
106-
"key":"nbformat_minor",
107-
"value":4
84+
"op":"patch",
85+
"key":1,
86+
"diff":[
87+
{
88+
"op":"patch",
89+
"key":"source",
90+
"diff":[
91+
{
92+
"op":"addrange",
93+
"key":3,
94+
"valuelist":[
95+
"* Item 2.5\n"
96+
]
97+
}
98+
]
99+
}
100+
]
108101
}
109-
]
102+
]
103+
},
104+
{
105+
"op":"replace",
106+
"key":"nbformat_minor",
107+
"value":4
108+
}
109+
]
110110
}

0 commit comments

Comments
 (0)