Shelve Changes dialog

/

Previous Difference / Next Difference ⇧ F7 F7

Jump to the next or previous difference.

When the last or the first difference is reached, AppCode suggests clicking the arrow buttons or pressing F7/⇧ F7 once more and comparing other files modified locally. This behavior depends on the Go to the next file after reaching last change option in the Differences Viewer settings.

This behavior is supported only when the Differences Viewer is invoked from the Commit tool window ⌥ 0.

Jump to Source

F4

Open the selected file in the editor. The caret is placed in the same position as in the Differences Viewer.

Compare Previous/Next File

⌥ ← ⌥ →

Click these buttons to compare the local copy of the previous/next file with its update from the server.

tip

These buttons are only available when there is more than one file in the selected changelist.

Viewers

Select a viewer mode: side-by-side or unified. The side-by-side mode has two panels, the unified mode has one panel.

You can edit code and perform the Apply, Append, Revert actions in both viewers.

You can change text only in the right-hand part of the side-by-side viewer, or in the lower line in the unified viewer.

You can edit only local versions of your files. You cannot edit files that have read-only status.

Whitespace

Define how the differences viewer should treat whitespaces.

• Do not ignore: white spaces are important, and all the differences are highlighted. This option is selected by default.

• Trim whitespaces: trim whitespaces if they appear in the end and at the beginning of a line (("\t", " ")).

  • If two lines differ in trailing whitespaces only, these lines are considered equal.

  • If two lines are different, trailing whitespaces are not highlighted in the By word mode.

• Ignore whitespaces: white spaces are not important, regardless of their location in the source code.

• Ignore whitespaces and empty lines: ignores whitespaces and empty lines. The following entities are ignored:

  • all whitespaces (as in the 'Ignore whitespaces' option)

  • all added or removed lines consisting of whitespaces only

  • all changes consisting of splitting or joining lines without changes to non-whitespace parts.

    For example, differences between a b c and a \n b c are not highlighted in this mode.

Highlighting mode

Select the way differences granularity is highlighted.

The available options are:

• Highlight words: modified words are highlighted

• Highlight lines: modified lines are highlighted

• Highlight split changes: if this option is selected, big changes are split into smaller changes.

  For example, A \n B and A X \n B X are treated as two changes instead of one.

• Highlight symbols: modified symbols are highlighted

• Do not highlight: if this option is selected, the differences are not highlighted at all.

  Use the Do not highlight option when you work with the files that were significantly modified. In such cases, highlighting might introduce additional difficulties during a review.

Collapse unchanged fragments

Collapse all the unchanged fragments in both files. The amount of non-collapsible unchanged lines is configurable in the Diff & Merge settings page. To open the Diff & Merge page, open settings by pressing ⌃ ⌥ S and navigate to Tools | Diff & Merge.

Synchronize scrolling

Scroll both differences panes simultaneously. If this button is released, each pane can be scrolled independently.

Disable editing

Enable editing of the local copy of the selected file, which is disabled by default. When editing is enabled, you can make last-minute changes to the modified file before committing it.

Editor settings

Open a list of available options. Select or clear these options to show or hide line numbers, indentation guides, white spaces, and soft wraps.

Help

F1

Open a browser and show the corresponding help page.