Fossil SCM
For consistency, use the spelling 'descendant' for the noun usage.
Commit
c9d3900367eb6e51ce4c524e93efed69dc72d929ffc633954a786e63a39c47c2
Parent
254dfbd2ba49e45…
4 files changed
+1
-1
+7
-7
+1
-1
+1
-1
+1
-1
| --- src/graph.c | ||
| +++ src/graph.c | ||
| @@ -84,11 +84,11 @@ | ||
| 84 | 84 | |
| 85 | 85 | GraphRow *pNext; /* Next row down in the list of all rows */ |
| 86 | 86 | GraphRow *pPrev; /* Previous row */ |
| 87 | 87 | |
| 88 | 88 | int idx; /* Row index. Top row is smallest. */ |
| 89 | - int idxTop; /* Direct descendent highest up on the graph */ | |
| 89 | + int idxTop; /* Direct descendant highest up on the graph */ | |
| 90 | 90 | GraphRow *pChild; /* Child immediately above this node */ |
| 91 | 91 | u8 isDup; /* True if this is duplicate of a prior entry */ |
| 92 | 92 | u8 isLeaf; /* True if this is a leaf node */ |
| 93 | 93 | u8 isStepParent; /* pChild is actually a step-child. The thick |
| 94 | 94 | ** arrow up to the child is dashed, not solid */ |
| 95 | 95 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -84,11 +84,11 @@ | |
| 84 | |
| 85 | GraphRow *pNext; /* Next row down in the list of all rows */ |
| 86 | GraphRow *pPrev; /* Previous row */ |
| 87 | |
| 88 | int idx; /* Row index. Top row is smallest. */ |
| 89 | int idxTop; /* Direct descendent highest up on the graph */ |
| 90 | GraphRow *pChild; /* Child immediately above this node */ |
| 91 | u8 isDup; /* True if this is duplicate of a prior entry */ |
| 92 | u8 isLeaf; /* True if this is a leaf node */ |
| 93 | u8 isStepParent; /* pChild is actually a step-child. The thick |
| 94 | ** arrow up to the child is dashed, not solid */ |
| 95 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -84,11 +84,11 @@ | |
| 84 | |
| 85 | GraphRow *pNext; /* Next row down in the list of all rows */ |
| 86 | GraphRow *pPrev; /* Previous row */ |
| 87 | |
| 88 | int idx; /* Row index. Top row is smallest. */ |
| 89 | int idxTop; /* Direct descendant highest up on the graph */ |
| 90 | GraphRow *pChild; /* Child immediately above this node */ |
| 91 | u8 isDup; /* True if this is duplicate of a prior entry */ |
| 92 | u8 isLeaf; /* True if this is a leaf node */ |
| 93 | u8 isStepParent; /* pChild is actually a step-child. The thick |
| 94 | ** arrow up to the child is dashed, not solid */ |
| 95 |
+7
-7
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1381,11 +1381,11 @@ | ||
| 1381 | 1381 | ** return 0. |
| 1382 | 1382 | */ |
| 1383 | 1383 | static int timeline_endpoint( |
| 1384 | 1384 | int iFrom, /* Starting point */ |
| 1385 | 1385 | const char *zEnd, /* Tag we are searching for */ |
| 1386 | - int bForward /* 1: forwards in time (descendents) 0: backwards */ | |
| 1386 | + int bForward /* 1: forwards in time (descendants) 0: backwards */ | |
| 1387 | 1387 | ){ |
| 1388 | 1388 | int tagId; |
| 1389 | 1389 | int endId = 0; |
| 1390 | 1390 | Stmt q; |
| 1391 | 1391 | int ans = 0; |
| @@ -1513,17 +1513,17 @@ | ||
| 1513 | 1513 | /* |
| 1514 | 1514 | ** COMMAND: test-endpoint |
| 1515 | 1515 | ** |
| 1516 | 1516 | ** Usage: fossil test-endpoint BASE TAG ?OPTIONS? |
| 1517 | 1517 | ** |
| 1518 | -** Show the first check-in with TAG that is a descendent or ancestor | |
| 1519 | -** of BASE. The first descendent checkin is shown by default. Use | |
| 1518 | +** Show the first check-in with TAG that is a descendant or ancestor | |
| 1519 | +** of BASE. The first descendant checkin is shown by default. Use | |
| 1520 | 1520 | ** the --backto to see the first ancestor checkin. |
| 1521 | 1521 | ** |
| 1522 | 1522 | ** Options: |
| 1523 | 1523 | ** |
| 1524 | -** --backto Show ancestor. Others defaults to descendents. | |
| 1524 | +** --backto Show ancestor. Others defaults to descendants. | |
| 1525 | 1525 | */ |
| 1526 | 1526 | void timeline_test_endpoint(void){ |
| 1527 | 1527 | int bForward = find_option("backto",0,0)==0; |
| 1528 | 1528 | int from_rid; |
| 1529 | 1529 | int ans; |
| @@ -2355,11 +2355,11 @@ | ||
| 2355 | 2355 | if( bSeparateDandP ){ |
| 2356 | 2356 | int n = db_int(0, "SELECT count(*) FROM ok"); |
| 2357 | 2357 | blob_reset(&desc); |
| 2358 | 2358 | blob_appendf(&desc, |
| 2359 | 2359 | "%d check-ins that are both ancestors of %z%h</a>" |
| 2360 | - " and descendents of %z%h</a>", | |
| 2360 | + " and descendants of %z%h</a>", | |
| 2361 | 2361 | n, |
| 2362 | 2362 | href("%R/info?name=%h",zDPNameP),zDPNameP, |
| 2363 | 2363 | href("%R/info?name=%h",zDPNameD),zDPNameD |
| 2364 | 2364 | ); |
| 2365 | 2365 | ridBackTo = 0; |
| @@ -2380,11 +2380,11 @@ | ||
| 2380 | 2380 | href("%R/info?name=%h",zBackTo), zBackTo, |
| 2381 | 2381 | bBackAdded ? " (not a direct anscestor)" : ""); |
| 2382 | 2382 | if( ridFwdTo && zFwdTo ){ |
| 2383 | 2383 | blob_appendf(&desc, " and up to %z%h</a>%s", |
| 2384 | 2384 | href("%R/info?name=%h",zFwdTo), zFwdTo, |
| 2385 | - bFwdAdded ? " (not a direct descendent)" : ""); | |
| 2385 | + bFwdAdded ? " (not a direct descendant)" : ""); | |
| 2386 | 2386 | } |
| 2387 | 2387 | } |
| 2388 | 2388 | }else if( ridFwdTo ){ |
| 2389 | 2389 | if( nd==0 ){ |
| 2390 | 2390 | blob_reset(&desc); |
| @@ -2393,11 +2393,11 @@ | ||
| 2393 | 2393 | href("%R/info?name=%h",zBaseName), zBaseName, |
| 2394 | 2394 | href("%R/info?name=%h",zFwdTo), zFwdTo); |
| 2395 | 2395 | }else{ |
| 2396 | 2396 | blob_appendf(&desc, " up to %z%h</a>%s", |
| 2397 | 2397 | href("%R/info?name=%h",zFwdTo), zFwdTo, |
| 2398 | - bFwdAdded ? " (not a direct descendent)":""); | |
| 2398 | + bFwdAdded ? " (not a direct descendant)":""); | |
| 2399 | 2399 | } |
| 2400 | 2400 | } |
| 2401 | 2401 | if( advancedMenu ){ |
| 2402 | 2402 | style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0); |
| 2403 | 2403 | } |
| 2404 | 2404 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1381,11 +1381,11 @@ | |
| 1381 | ** return 0. |
| 1382 | */ |
| 1383 | static int timeline_endpoint( |
| 1384 | int iFrom, /* Starting point */ |
| 1385 | const char *zEnd, /* Tag we are searching for */ |
| 1386 | int bForward /* 1: forwards in time (descendents) 0: backwards */ |
| 1387 | ){ |
| 1388 | int tagId; |
| 1389 | int endId = 0; |
| 1390 | Stmt q; |
| 1391 | int ans = 0; |
| @@ -1513,17 +1513,17 @@ | |
| 1513 | /* |
| 1514 | ** COMMAND: test-endpoint |
| 1515 | ** |
| 1516 | ** Usage: fossil test-endpoint BASE TAG ?OPTIONS? |
| 1517 | ** |
| 1518 | ** Show the first check-in with TAG that is a descendent or ancestor |
| 1519 | ** of BASE. The first descendent checkin is shown by default. Use |
| 1520 | ** the --backto to see the first ancestor checkin. |
| 1521 | ** |
| 1522 | ** Options: |
| 1523 | ** |
| 1524 | ** --backto Show ancestor. Others defaults to descendents. |
| 1525 | */ |
| 1526 | void timeline_test_endpoint(void){ |
| 1527 | int bForward = find_option("backto",0,0)==0; |
| 1528 | int from_rid; |
| 1529 | int ans; |
| @@ -2355,11 +2355,11 @@ | |
| 2355 | if( bSeparateDandP ){ |
| 2356 | int n = db_int(0, "SELECT count(*) FROM ok"); |
| 2357 | blob_reset(&desc); |
| 2358 | blob_appendf(&desc, |
| 2359 | "%d check-ins that are both ancestors of %z%h</a>" |
| 2360 | " and descendents of %z%h</a>", |
| 2361 | n, |
| 2362 | href("%R/info?name=%h",zDPNameP),zDPNameP, |
| 2363 | href("%R/info?name=%h",zDPNameD),zDPNameD |
| 2364 | ); |
| 2365 | ridBackTo = 0; |
| @@ -2380,11 +2380,11 @@ | |
| 2380 | href("%R/info?name=%h",zBackTo), zBackTo, |
| 2381 | bBackAdded ? " (not a direct anscestor)" : ""); |
| 2382 | if( ridFwdTo && zFwdTo ){ |
| 2383 | blob_appendf(&desc, " and up to %z%h</a>%s", |
| 2384 | href("%R/info?name=%h",zFwdTo), zFwdTo, |
| 2385 | bFwdAdded ? " (not a direct descendent)" : ""); |
| 2386 | } |
| 2387 | } |
| 2388 | }else if( ridFwdTo ){ |
| 2389 | if( nd==0 ){ |
| 2390 | blob_reset(&desc); |
| @@ -2393,11 +2393,11 @@ | |
| 2393 | href("%R/info?name=%h",zBaseName), zBaseName, |
| 2394 | href("%R/info?name=%h",zFwdTo), zFwdTo); |
| 2395 | }else{ |
| 2396 | blob_appendf(&desc, " up to %z%h</a>%s", |
| 2397 | href("%R/info?name=%h",zFwdTo), zFwdTo, |
| 2398 | bFwdAdded ? " (not a direct descendent)":""); |
| 2399 | } |
| 2400 | } |
| 2401 | if( advancedMenu ){ |
| 2402 | style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0); |
| 2403 | } |
| 2404 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1381,11 +1381,11 @@ | |
| 1381 | ** return 0. |
| 1382 | */ |
| 1383 | static int timeline_endpoint( |
| 1384 | int iFrom, /* Starting point */ |
| 1385 | const char *zEnd, /* Tag we are searching for */ |
| 1386 | int bForward /* 1: forwards in time (descendants) 0: backwards */ |
| 1387 | ){ |
| 1388 | int tagId; |
| 1389 | int endId = 0; |
| 1390 | Stmt q; |
| 1391 | int ans = 0; |
| @@ -1513,17 +1513,17 @@ | |
| 1513 | /* |
| 1514 | ** COMMAND: test-endpoint |
| 1515 | ** |
| 1516 | ** Usage: fossil test-endpoint BASE TAG ?OPTIONS? |
| 1517 | ** |
| 1518 | ** Show the first check-in with TAG that is a descendant or ancestor |
| 1519 | ** of BASE. The first descendant checkin is shown by default. Use |
| 1520 | ** the --backto to see the first ancestor checkin. |
| 1521 | ** |
| 1522 | ** Options: |
| 1523 | ** |
| 1524 | ** --backto Show ancestor. Others defaults to descendants. |
| 1525 | */ |
| 1526 | void timeline_test_endpoint(void){ |
| 1527 | int bForward = find_option("backto",0,0)==0; |
| 1528 | int from_rid; |
| 1529 | int ans; |
| @@ -2355,11 +2355,11 @@ | |
| 2355 | if( bSeparateDandP ){ |
| 2356 | int n = db_int(0, "SELECT count(*) FROM ok"); |
| 2357 | blob_reset(&desc); |
| 2358 | blob_appendf(&desc, |
| 2359 | "%d check-ins that are both ancestors of %z%h</a>" |
| 2360 | " and descendants of %z%h</a>", |
| 2361 | n, |
| 2362 | href("%R/info?name=%h",zDPNameP),zDPNameP, |
| 2363 | href("%R/info?name=%h",zDPNameD),zDPNameD |
| 2364 | ); |
| 2365 | ridBackTo = 0; |
| @@ -2380,11 +2380,11 @@ | |
| 2380 | href("%R/info?name=%h",zBackTo), zBackTo, |
| 2381 | bBackAdded ? " (not a direct anscestor)" : ""); |
| 2382 | if( ridFwdTo && zFwdTo ){ |
| 2383 | blob_appendf(&desc, " and up to %z%h</a>%s", |
| 2384 | href("%R/info?name=%h",zFwdTo), zFwdTo, |
| 2385 | bFwdAdded ? " (not a direct descendant)" : ""); |
| 2386 | } |
| 2387 | } |
| 2388 | }else if( ridFwdTo ){ |
| 2389 | if( nd==0 ){ |
| 2390 | blob_reset(&desc); |
| @@ -2393,11 +2393,11 @@ | |
| 2393 | href("%R/info?name=%h",zBaseName), zBaseName, |
| 2394 | href("%R/info?name=%h",zFwdTo), zFwdTo); |
| 2395 | }else{ |
| 2396 | blob_appendf(&desc, " up to %z%h</a>%s", |
| 2397 | href("%R/info?name=%h",zFwdTo), zFwdTo, |
| 2398 | bFwdAdded ? " (not a direct descendant)":""); |
| 2399 | } |
| 2400 | } |
| 2401 | if( advancedMenu ){ |
| 2402 | style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0); |
| 2403 | } |
| 2404 |
+1
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -199,11 +199,11 @@ | ||
| 199 | 199 | } |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | /* If no VERSION is specified on the command-line, then look for a |
| 204 | - ** descendent of the current version. If there are multiple descendants, | |
| 204 | + ** descendant of the current version. If there are multiple descendants, | |
| 205 | 205 | ** look for one from the same branch as the current version. If there |
| 206 | 206 | ** are still multiple descendants, show them all and refuse to update |
| 207 | 207 | ** until the user selects one. |
| 208 | 208 | */ |
| 209 | 209 | if( tid==0 ){ |
| 210 | 210 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -199,11 +199,11 @@ | |
| 199 | } |
| 200 | } |
| 201 | } |
| 202 | |
| 203 | /* If no VERSION is specified on the command-line, then look for a |
| 204 | ** descendent of the current version. If there are multiple descendants, |
| 205 | ** look for one from the same branch as the current version. If there |
| 206 | ** are still multiple descendants, show them all and refuse to update |
| 207 | ** until the user selects one. |
| 208 | */ |
| 209 | if( tid==0 ){ |
| 210 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -199,11 +199,11 @@ | |
| 199 | } |
| 200 | } |
| 201 | } |
| 202 | |
| 203 | /* If no VERSION is specified on the command-line, then look for a |
| 204 | ** descendant of the current version. If there are multiple descendants, |
| 205 | ** look for one from the same branch as the current version. If there |
| 206 | ** are still multiple descendants, show them all and refuse to update |
| 207 | ** until the user selects one. |
| 208 | */ |
| 209 | if( tid==0 ){ |
| 210 |
+1
-1
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -62,11 +62,11 @@ | ||
| 62 | 62 | <li> The new "min" query parameter, when added to a from=,to= query, |
| 63 | 63 | collapses long runs of check-ins on the same branch into just |
| 64 | 64 | end-points. |
| 65 | 65 | <li> The p= and d= parameters an reference different check-ins, which |
| 66 | 66 | case the timeline shows those check-ins that are both ancestors |
| 67 | - of p= and descendents of d=. | |
| 67 | + of p= and descendants of d=. | |
| 68 | 68 | </ol> |
| 69 | 69 | * Added the [/help?cmd=/clusterlist|/clusterlist page] for analysis |
| 70 | 70 | and debugging |
| 71 | 71 | * Fix a bug in [/help?cmd=patch|fossil patch create] that causes |
| 72 | 72 | [/help?cmd=revert|fossil revert] operations that happened on individual |
| 73 | 73 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -62,11 +62,11 @@ | |
| 62 | <li> The new "min" query parameter, when added to a from=,to= query, |
| 63 | collapses long runs of check-ins on the same branch into just |
| 64 | end-points. |
| 65 | <li> The p= and d= parameters an reference different check-ins, which |
| 66 | case the timeline shows those check-ins that are both ancestors |
| 67 | of p= and descendents of d=. |
| 68 | </ol> |
| 69 | * Added the [/help?cmd=/clusterlist|/clusterlist page] for analysis |
| 70 | and debugging |
| 71 | * Fix a bug in [/help?cmd=patch|fossil patch create] that causes |
| 72 | [/help?cmd=revert|fossil revert] operations that happened on individual |
| 73 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -62,11 +62,11 @@ | |
| 62 | <li> The new "min" query parameter, when added to a from=,to= query, |
| 63 | collapses long runs of check-ins on the same branch into just |
| 64 | end-points. |
| 65 | <li> The p= and d= parameters an reference different check-ins, which |
| 66 | case the timeline shows those check-ins that are both ancestors |
| 67 | of p= and descendants of d=. |
| 68 | </ol> |
| 69 | * Added the [/help?cmd=/clusterlist|/clusterlist page] for analysis |
| 70 | and debugging |
| 71 | * Fix a bug in [/help?cmd=patch|fossil patch create] that causes |
| 72 | [/help?cmd=revert|fossil revert] operations that happened on individual |
| 73 |