Changes between Initial Version and Version 1 of TracChangeset


Ignore:
Timestamp:
10/22/18 13:07:17 (6 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v1 v1  
     1= Trac Changeset Module
     2
     3[[TracGuideToc]]
     4[[PageOutline(2-5,Contents,pullout)]]
     5
     6Trac has a built-in functionality for visualizing "diffs", or changes to files.
     7
     8There are different kinds of ''change sets''.  Some correspond to revisions made in the repositories, others aggregate changes made in several revisions. Ultimately, any kind of difference can be shown.
     9
     10The changeset view consists of two parts, the ''header'' and the ''diff views''.
     11
     12== Changeset Header
     13
     14The header shows an overview of the whole changeset.
     15Here you will find metadata:
     16
     17 * Timestamp — When the changeset was commited
     18 * Author — Who commited the changeset
     19 * Message — A brief description from the author (the commit log message)
     20 * Location — Parent directory of all files affected by this changeset
     21 * Files — A list of files affected by this changeset
     22
     23If more than one revision is involved in the set of changes being displayed, the ''Timestamp'', ''Author'' and ''Message'' fields will not be shown.
     24
     25A colored rectangle indicates how the file is affected by the changeset:
     26 
     27 [[span(style=background:#bfb;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Green: Added \\
     28 [[span(style=background:#f88;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Red: Removed \\
     29 [[span(style=background:#fd8;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Yellow: Modified \\
     30 [[span(style=background:#88f;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Blue: Copied \\
     31 [[span(style=background:#ccc;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Gray: Moved \\
     32
     33The color legend is located below the header.
     34
     35== Diff Views
     36
     37Below the header is the main part of the changeset, the diff view. Each file is shown in a separate section. There are two different diff styles: ''inline'' and ''side-by-side''. You can switch between the styles using the preferences form:
     38
     39 * The ''inline'' style shows the changed regions of a file underneath each other. A region removed from the file will be colored red, an added region will be colored green. If a region was modified, the old version is displayed above the new version. Line numbers indicate the exact position of the change in both the old and the new version of the file.
     40 * The ''side-by-side'' style shows the old version on the left and the new version on the right and this will typically require more screen width than the inline style. Added and removed regions will be colored in the same way as with the inline style (green and red), and modified regions will have a yellow background.
     41
     42In addition, various advanced options are available in the preferences form for adjusting the display of the diffs:
     43 * You can set how many lines are displayed before and after every change, or display the changes in the context of the full file.
     44 * You can toggle whether blank lines, case changes and white space changes are ignored. This can be useful in more easily locating the functional changes.
     45 * You can toggle between contextual and unified diff views using the //Tabular// and //Unified// links at the top of each section.
     46
     47== The Different Ways to Get a Diff
     48
     49=== Examining a Changeset
     50
     51When viewing a repository check-in, such as when following a changeset [TracLinks link] or a changeset event in the [TracTimeline timeline], Trac will display the exact changes made by the check-in.
     52
     53There will also be navigation links to the ''Previous Changeset'' and the ''Next Changeset''.
     54
     55=== Downloading a Changeset
     56
     57From the changeset view, the changeset can be downloaded in unified diff format using the links at the bottom of the page. The full content of each file in the changeset can also be downloaded as a zip archive.
     58
     59=== Examining Differences Between Revisions
     60
     61Often you want to look at changes made on a file or on a directory spanning multiple revisions. The easiest way to get there is from the TracRevisionLog, where you can select the ''old'' and the ''new'' revisions of the file or directory, and then click the ''View changes'' button.
     62
     63=== Examining Differences Between Branches
     64
     65One of the core features of version control systems is the possibility to work simultaneously on different ''Lines of Developments'', commonly called "branches". Trac enables you to examine the exact differences between such branches.
     66
     67Following the '''View changes ...''' button in the TracBrowser leads to the diff page, where you can enter ''From:'' and ''To:'' path/revision pairs. The resulting set of differences consist of the changes that should be applied to the ''From:'' content to get to the ''To:'' content.
     68
     69For convenience, it is possible to invert the roles of the ''old'' and the ''new'' path/revision pairs by clicking the ''Reverse Diff'' link on the changeset page.
     70
     71=== Checking the Last Change
     72
     73Another way to examine changes is to use the ''Last Change'' link provided by the TracBrowser.
     74
     75This link will take you to the last change that was made on that path. From there, you can use the ''Previous Change'' and ''Next Change'' links to traverse the change history of the file or directory.
     76
     77----
     78See also: TracGuide, TracBrowser