Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add "ci" as an alias for "commit". Make provisions for a future "fossil mv" command. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
2bde9f9b3d97781ea981f8ac6a0c37b6 |
| User & Date: | drh 2008-10-21 06:10:33.000 |
Context
|
2008-10-24
| ||
| 13:45 | Create named fork test-tag-1 Closed-Leaf check-in: 32b480faa3 user: drh tags: test-tag-1, trunk | |
|
2008-10-21
| ||
| 06:52 | The "diff" command with no arguments now does a diff on all files in the checkout which have been edited. check-in: c863ec1a98 user: drh tags: trunk | |
| 06:10 | Add "ci" as an alias for "commit". Make provisions for a future "fossil mv" command. check-in: 2bde9f9b3d user: drh tags: trunk | |
|
2008-10-20
| ||
| 16:05 | Improvements in the display of ticket history. check-in: c8a78004ce user: drh tags: trunk | |
Changes
Changes to src/checkin.c.
| ︙ | ︙ | |||
327 328 329 330 331 332 333 334 335 336 337 338 339 340 |
blob_reset(&b);
}
g.aCommitFile[ii-2] = 0;
}
}
/*
** COMMAND: commit
**
** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
**
** Create a new version containing all of the changes in the current
** checkout. You will be prompted to enter a check-in comment unless
** the "-m" option is used to specify a comment line. You will be
| > | 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 |
blob_reset(&b);
}
g.aCommitFile[ii-2] = 0;
}
}
/*
** COMMAND: ci
** COMMAND: commit
**
** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
**
** Create a new version containing all of the changes in the current
** checkout. You will be prompted to enter a check-in comment unless
** the "-m" option is used to specify a comment line. You will be
|
| ︙ | ︙ |
Changes to src/manifest.c.
| ︙ | ︙ | |||
139 140 141 142 143 144 145 |
** The card type determines the other parameters to the card.
** Cards must occur in lexicographical order.
*/
int manifest_parse(Manifest *p, Blob *pContent){
int seenHeader = 0;
int seenZ = 0;
int i, lineNo=0;
| | | 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 |
** The card type determines the other parameters to the card.
** Cards must occur in lexicographical order.
*/
int manifest_parse(Manifest *p, Blob *pContent){
int seenHeader = 0;
int seenZ = 0;
int i, lineNo=0;
Blob line, token, a1, a2, a3, a4;
char cPrevType = 0;
memset(p, 0, sizeof(*p));
memcpy(&p->content, pContent, sizeof(p->content));
blob_zero(pContent);
pContent = &p->content;
|
| ︙ | ︙ | |||
270 271 272 273 274 275 276 |
}else{
goto manifest_syntax_error;
}
break;
}
/*
| | | | > > > > > > > > | 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 |
}else{
goto manifest_syntax_error;
}
break;
}
/*
** F <filename> <uuid> ?<permissions>? ?<old-name>?
**
** Identifies a file in a manifest. Multiple F lines are
** allowed in a manifest. F lines are not allowed in any
** other control file. The filename and old-name are fossil-encoded.
*/
case 'F': {
char *zName, *zUuid, *zPerm, *zPriorName;
md5sum_step_text(blob_buffer(&line), blob_size(&line));
if( blob_token(&line, &a1)==0 ) goto manifest_syntax_error;
if( blob_token(&line, &a2)==0 ) goto manifest_syntax_error;
zName = blob_terminate(&a1);
zUuid = blob_terminate(&a2);
blob_token(&line, &a3);
zPerm = blob_terminate(&a3);
if( blob_size(&a2)!=UUID_SIZE ) goto manifest_syntax_error;
if( !validate16(zUuid, UUID_SIZE) ) goto manifest_syntax_error;
defossilize(zName);
if( !file_is_simple_pathname(zName) ){
goto manifest_syntax_error;
}
blob_token(&line, &a4);
zPriorName = blob_terminate(&a4);
if( zPriorName[0] ){
defossilize(zPriorName);
if( !file_is_simple_pathname(zPriorName) ){
goto manifest_syntax_error;
}
}
if( p->nFile>=p->nFileAlloc ){
p->nFileAlloc = p->nFileAlloc*2 + 10;
p->aFile = realloc(p->aFile, p->nFileAlloc*sizeof(p->aFile[0]) );
if( p->aFile==0 ) fossil_panic("out of memory");
}
i = p->nFile++;
|
| ︙ | ︙ |
Changes to www/fileformat.wiki.
| ︙ | ︙ | |||
87 88 89 90 91 92 93 | <p> Allowed cards in the manifest are as follows: </p> <blockquote> <b>C</b> <i>checkin-comment</i><br> <b>D</b> <i>time-and-date-stamp</i><br> | | | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | <p> Allowed cards in the manifest are as follows: </p> <blockquote> <b>C</b> <i>checkin-comment</i><br> <b>D</b> <i>time-and-date-stamp</i><br> <b>F</b> <i>filename</i> <i>SHA1-hash</i> <i>permissions</i> <i>old-name</i><br> <b>P</b> <i>SHA1-hash</i>+<br> <b>R</b> <i>repository-checksum</i><br> <b>U</b> <i>user-login</i><br> <b>Z</b> <i>manifest-checksum</i> </blockquote> <p> |
| ︙ | ︙ | |||
121 122 123 124 125 126 127 | <blockquote> <i>YYYY</i><b>-</b><i>MM</i><b>-</b><i>DD</i><b>T</b><i>HH</i><b>:</b><i>MM</i><b>:</b><i>SS</i> </blockquote> <p> A manifest has zero or more F-cards. Each F-card defines a file (other than the manifest itself) which is part of the baseline that | | > | > > > > > > > > > > > > > > | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | <blockquote> <i>YYYY</i><b>-</b><i>MM</i><b>-</b><i>DD</i><b>T</b><i>HH</i><b>:</b><i>MM</i><b>:</b><i>SS</i> </blockquote> <p> A manifest has zero or more F-cards. Each F-card defines a file (other than the manifest itself) which is part of the baseline that the manifest defines. There are two, three, or three arguments. The first argment is the pathname of the file in the baseline relative to the root of the project file hierarchy. No ".." or "." directories are allowed within the filename. Space characters are escaped as in C-card comment text. Backslash characters and newlines are not allowed within filenames. The directory separator character is a forward slash (ASCII 0x2F). The second argument to the F-card is the full 40-character lower-case hexadecimal SHA1 hash of the content artifact. The optional 3rd argument defines any special access permissions associated with the file. The only special code currently defined is "x" which means that the file is executable. All files are always readable and writable. This can be expressed by "w" permission if desired but is optional. The optional 4th argument is the name of the same file as it existed in the parent baseline. If the name of the file is unchanged from its parent, then the 4th argument is omitted. </p> <p> A manifest has zero or more N-cards. Each N card records a name changes to one of the files in the manifest. The first argument to the N code is the name of the file in the parent baseline. The second argument is the name of the file in the baseline defined by the manifest. </p> <p> A manifest has zero or one P-cards. Most manifests have one P-card. The P-card has a varying number of arguments that defines other manifests from which the current manifest is derived. Each argument is an 40-character lowercase |
| ︙ | ︙ |