Skip to content

Commit 91efb38

Browse files
committed
Add revert and cherry-pick demos
1 parent e678eb6 commit 91efb38

File tree

1 file changed

+119
-31
lines changed

1 file changed

+119
-31
lines changed

js/demos.js

Lines changed: 119 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -175,68 +175,156 @@ define([], function () {
175175

176176
}
177177

178-
var mainline = {
179-
title: 'Mainline',
180-
key: 'mainline',
181-
message: 'Let\'s pick and revert some commits',
178+
var revert = {
179+
title: 'Revert',
180+
key: 'revert',
181+
message: 'Oops, let\'s revert some commits',
182182
commitData: [
183183
{
184184
"id": "e137e9b",
185185
"tags": [],
186186
"message": "first commit",
187-
"parent": "initial"
187+
"parent": "initial",
188+
"cx": 50,
189+
"cy": 330,
190+
"branchless": false
188191
},
189192
{
190-
"id": "78cc3bd",
193+
"id": "dd70cfe",
191194
"tags": [],
192-
"parent": "e137e9b"
195+
"parent": "e137e9b",
196+
"cx": 140,
197+
"cy": 330,
198+
"branchless": false
193199
},
194200
{
195-
"id": "aaad8c8",
196-
"tags": [ "master", "HEAD" ],
197-
"parent": "78cc3bd"
201+
"id": "2545b6f",
202+
"tags": [],
203+
"parent": "dd70cfe",
204+
"cx": 230,
205+
"cy": 330,
206+
"branchless": false
198207
},
199208
{
200-
"id": "157e15d",
209+
"id": "3d6ef16",
201210
"tags": [],
202-
"parent": "78cc3bd"
211+
"parent": "dd70cfe",
212+
"cx": 230,
213+
"cy": 240,
214+
"branchless": false
203215
},
204216
{
205-
"id": "a17ad66",
217+
"id": "077415f",
218+
"tags": [
219+
"feature"
220+
],
221+
"parent": "3d6ef16",
222+
"cx": 320,
223+
"cy": 240,
224+
"branchless": false
225+
},
226+
{
227+
"parent2": "077415f",
228+
"id": "8686fb6",
229+
"tags": [
230+
"master",
231+
"HEAD"
232+
],
233+
"message": "Merge",
234+
"parent": "2545b6f",
235+
"cx": 410,
236+
"cy": 330,
237+
"branchless": false
238+
}
239+
]
240+
}
241+
242+
var cherryPick = {
243+
title: 'Cherry Pick',
244+
key: 'cherry pick',
245+
message: 'Let\'s pick some commits',
246+
commitData: [
247+
{
248+
"id": "e137e9b",
206249
"tags": [],
207-
"parent": "157e15d"
250+
"message": "first commit",
251+
"parent": "initial",
252+
"cx": 50,
253+
"cy": 330,
254+
"branchless": false
208255
},
209256
{
210-
"id": "6f5b3a4",
211-
"tags": [ "[fix]" ],
212-
"parent": "a17ad66"
257+
"id": "1453f27",
258+
"tags": [],
259+
"parent": "e137e9b",
260+
"cx": 140,
261+
"cy": 330,
262+
"branchless": false
213263
},
214264
{
215-
"id": "f6089f6",
265+
"id": "89613dc",
216266
"tags": [],
217-
"parent": "6f5b3a4"
267+
"parent": "1453f27",
268+
"cx": 230,
269+
"cy": 330,
270+
"branchless": false
271+
},
272+
{
273+
"id": "378e507",
274+
"tags": [ "[bugfix2]" ],
275+
"parent": "89613dc",
276+
"cx": 320,
277+
"cy": 330,
278+
"branchless": false
218279
},
219280
{
220-
"id": "0da258b",
281+
"id": "0fdc964",
221282
"tags": [],
222-
"parent": "157e15d"
283+
"parent": "89613dc",
284+
"cx": 320,
285+
"cy": 240,
286+
"branchless": false
223287
},
224288
{
225-
"id": "c681e06",
289+
"id": "e2c97ff",
290+
"tags": [
291+
"bugfix"
292+
],
293+
"parent": "0fdc964",
294+
"cx": 410,
295+
"cy": 240,
296+
"branchless": false
297+
},
298+
{
299+
"id": "7561647",
226300
"tags": [],
227-
"parent": "0da258b"
301+
"parent": "1453f27",
302+
"cx": 230,
303+
"cy": 240,
304+
"branchless": false
228305
},
229306
{
230-
"id": "ab103f6",
231-
"tags": [ "feature" ],
232-
"parent": "c681e06"
307+
"id": "af18be0",
308+
"tags": [
309+
"release"
310+
],
311+
"parent": "7561647",
312+
"cx": 320,
313+
"cy": 150,
314+
"branchless": false
233315
},
234316
{
235-
"parent": "f6089f6",
236-
"id": "571f0d3",
237-
"tags": [ "development" ],
317+
"parent2": "e2c97ff",
318+
"id": "37b7579",
319+
"tags": [
320+
"master",
321+
"HEAD"
322+
],
238323
"message": "Merge",
239-
"parent2": "ab103f6"
324+
"parent": "378e507",
325+
"cx": 500,
326+
"cy": 330,
327+
"branchless": false
240328
}
241329
]
242330
}
@@ -251,6 +339,6 @@ define([], function () {
251339
}
252340

253341
return [
254-
free, freeWithRemote, upstreamChanges, rewrittenHistory, mainline
342+
free, freeWithRemote, upstreamChanges, rewrittenHistory, revert, cherryPick
255343
]
256344
})

0 commit comments

Comments
 (0)