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 Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

   204    204   ** Usage: %fossil changes ?OPTIONS?
   205    205   **
   206    206   ** Report the change status of files in the current checkout.
   207    207   **
   208    208   ** Each line of output is the name of a changed file, with paths shown
   209    209   ** according to the "relative-paths" setting, unless overridden by the
   210    210   ** --abs-paths or --rel-paths options.
   211         -** 
          211  +**
   212    212   ** By default, all changed files are selected for display.  This behavior
   213    213   ** can be overridden by using one or more filter options (listed below),
   214    214   ** in which case only files with the specified change type(s) are shown.
          215  +** As a special case, the --no-merge option does not inhibit this default.
   215    216   **
   216         -** If file change type classification is enabled, each output line starts
   217         -** with a code describing the file's change type, e.g. EDITED or RENAMED.
   218         -** This can be turned on or off using the --classify or --no-classify
   219         -** options, respectively.  By default, it is enabled only when more than
   220         -** one change type is enabled (i.e. zero or multiple filter options or
   221         -** --all are used) and disabled when only one change type is enabled.
          217  +** If no filter options are used, or if the --merge option is used, the
          218  +** SHA1 hash of each merge contributor check-in version is displayed at
          219  +** the end of the report.  The --no-merge option is useful to display the
          220  +** default set of changed files but not the merge contributors.
          221  +**
          222  +** If change type classification is enabled, each output line starts with
          223  +** a code describing the file's change type, e.g. EDITED or RENAMED.  It
          224  +** is enabled by default except when exactly one filter option (besides
          225  +** --merge or --no-merge) is used.  The default can be overridden by the
          226  +** --classify or --no-classify options.
   222    227   **
   223    228   ** The "fossil changes -extra" command is equivalent to "fossil extras".
   224    229   **
   225         -** Options:
          230  +** General options:
   226    231   **    --abs-paths       Display absolute pathnames.
   227    232   **    --rel-paths       Display pathnames relative to the current working
   228    233   **                      directory.
   229    234   **    --sha1sum         Verify file status using SHA1 hashing rather than
   230    235   **                      relying on file mtimes.
   231         -**    --header          Identify the repository if any files are listed.
   232         -**    -v|--verbose      Say "(none)" if no files are listed.
          236  +**    --header          Identify the repository if report is non-empty.
          237  +**    -v|--verbose      Say "(none)" if the change report is empty.
   233    238   **    --classify        Start each line with the file's change type.
   234    239   **    --no-classify     Do not print file change types.
   235    240   **
   236    241   ** Filter options:
   237         -**    --edited          Display edited files.
          242  +**    --edited          Display edited, merged, and conflicted files.
          243  +**    --updated         Display files updated by merge/integrate.
          244  +**    --modified        Combination of the above two options.
   238    245   **    --missing         Display missing files.
   239    246   **    --added           Display added files.
   240    247   **    --deleted         Display deleted files.
   241    248   **    --renamed         Display renamed files.
   242         -**    --conflict        Display merge conflict files.
   243         -**    --unmodified      Display unmodified files.
          249  +**    --conflict        Display files having merge conflicts.
   244    250   **    --meta            Display files with metadata changes.
          251  +**    --unmodified      Display unmodified files.
   245    252   **    --all             Display all managed files, i.e. all of the above.
   246    253   **    --extra           Display unmanaged files.
          254  +**    --merge           Display merge contributors.
          255  +**    --no-merge        Do not display merge contributors.
   247    256   **
   248    257   ** See also: extras, ls, status
   249    258   */
   250    259   void changes_cmd(void){
   251    260     int useSha1sum = find_option("sha1sum", 0, 0)!=0;
   252    261     int showHdr = find_option("header",0,0)!=0;
   253    262     int verboseFlag = find_option("verbose","v",0)!=0;