Fossil

Check-in [69b41682]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Revise proposed changes options and help text to accommodate merges.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | andygoth-changes
Files: files | file ages | folders
SHA1: 69b41682655375ff1ca2c2a31051bcad8bba749a
User & Date: andygoth 2016-10-12 03:45:13
Original Comment: Revise proposed changes options and help text.
Context
2016-10-12
13:20
Change "-modified" to "-changed" to be consistent with the terminology used by the diff commands check-in: ffee6e81 user: andygoth tags: andygoth-changes
03:45
Revise proposed changes options and help text to accommodate merges. check-in: 69b41682 user: andygoth tags: andygoth-changes
2016-10-11
21:07
Propose an enhanced changes command. At this point, there is no implementation, only help text describing the new options and behaviors. check-in: 2bfdbf97 user: andygoth tags: andygoth-changes
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

204
205
206
207
208
209
210
211
212
213
214

215





216
217


218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237


238
239
240
241
242
243
244

245
246


247
248
249
250
251
252
253
** Usage: %fossil changes ?OPTIONS?
**
** Report the change status of files in the current checkout.
**
** Each line of output is the name of a changed file, with paths shown
** according to the "relative-paths" setting, unless overridden by the
** --abs-paths or --rel-paths options.
** 
** By default, all changed files are selected for display.  This behavior
** can be overridden by using one or more filter options (listed below),
** in which case only files with the specified change type(s) are shown.

**





** If file change type classification is enabled, each output line starts
** with a code describing the file's change type, e.g. EDITED or RENAMED.


** This can be turned on or off using the --classify or --no-classify
** options, respectively.  By default, it is enabled only when more than
** one change type is enabled (i.e. zero or multiple filter options or
** --all are used) and disabled when only one change type is enabled.
**
** The "fossil changes -extra" command is equivalent to "fossil extras".
**
** Options:
**    --abs-paths       Display absolute pathnames.
**    --rel-paths       Display pathnames relative to the current working
**                      directory.
**    --sha1sum         Verify file status using SHA1 hashing rather than
**                      relying on file mtimes.
**    --header          Identify the repository if any files are listed.
**    -v|--verbose      Say "(none)" if no files are listed.
**    --classify        Start each line with the file's change type.
**    --no-classify     Do not print file change types.
**
** Filter options:
**    --edited          Display edited files.


**    --missing         Display missing files.
**    --added           Display added files.
**    --deleted         Display deleted files.
**    --renamed         Display renamed files.
**    --conflict        Display merge conflict files.
**    --unmodified      Display unmodified files.
**    --meta            Display files with metadata changes.

**    --all             Display all managed files, i.e. all of the above.
**    --extra           Display unmanaged files.


**
** See also: extras, ls, status
*/
void changes_cmd(void){
  int useSha1sum = find_option("sha1sum", 0, 0)!=0;
  int showHdr = find_option("header",0,0)!=0;
  int verboseFlag = find_option("verbose","v",0)!=0;







|



>

>
>
>
>
>
|
|
>
>
|
<
<
<



|





|
|




|
>
>




|
<

>


>
>







204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226



227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249

250
251
252
253
254
255
256
257
258
259
260
261
262
** Usage: %fossil changes ?OPTIONS?
**
** Report the change status of files in the current checkout.
**
** Each line of output is the name of a changed file, with paths shown
** according to the "relative-paths" setting, unless overridden by the
** --abs-paths or --rel-paths options.
**
** By default, all changed files are selected for display.  This behavior
** can be overridden by using one or more filter options (listed below),
** in which case only files with the specified change type(s) are shown.
** As a special case, the --no-merge option does not inhibit this default.
**
** If no filter options are used, or if the --merge option is used, the
** SHA1 hash of each merge contributor check-in version is displayed at
** the end of the report.  The --no-merge option is useful to display the
** default set of changed files but not the merge contributors.
**
** If change type classification is enabled, each output line starts with
** a code describing the file's change type, e.g. EDITED or RENAMED.  It
** is enabled by default except when exactly one filter option (besides
** --merge or --no-merge) is used.  The default can be overridden by the
** --classify or --no-classify options.



**
** The "fossil changes -extra" command is equivalent to "fossil extras".
**
** General options:
**    --abs-paths       Display absolute pathnames.
**    --rel-paths       Display pathnames relative to the current working
**                      directory.
**    --sha1sum         Verify file status using SHA1 hashing rather than
**                      relying on file mtimes.
**    --header          Identify the repository if report is non-empty.
**    -v|--verbose      Say "(none)" if the change report is empty.
**    --classify        Start each line with the file's change type.
**    --no-classify     Do not print file change types.
**
** Filter options:
**    --edited          Display edited, merged, and conflicted files.
**    --updated         Display files updated by merge/integrate.
**    --modified        Combination of the above two options.
**    --missing         Display missing files.
**    --added           Display added files.
**    --deleted         Display deleted files.
**    --renamed         Display renamed files.
**    --conflict        Display files having merge conflicts.

**    --meta            Display files with metadata changes.
**    --unmodified      Display unmodified files.
**    --all             Display all managed files, i.e. all of the above.
**    --extra           Display unmanaged files.
**    --merge           Display merge contributors.
**    --no-merge        Do not display merge contributors.
**
** See also: extras, ls, status
*/
void changes_cmd(void){
  int useSha1sum = find_option("sha1sum", 0, 0)!=0;
  int showHdr = find_option("header",0,0)!=0;
  int verboseFlag = find_option("verbose","v",0)!=0;