Table of Contents
This appendix contains a more detailed discussion of the implementation of some of TortoiseSVN's features.
Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseSVN they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values.
The Conflicted overlay is used to
represent the conflicted
state, where
an update or switch results in conflicts between local
changes and changes downloaded from the repository. It is
also used to indicate the obstructed
state,
which can occur when an operation is unable to complete.
The Modified overlay represents the
modified
state, where you have made
local modifications, the merged
state,
where changes from the repository have been merged with
local changes, and the replaced
state,
where a file has been deleted and replaced by another
different file with the same name.
The Deleted overlay represents the
deleted
state, where an item is scheduled for
deletion, or the missing
state, where an
item is not present. Naturally an item which is missing cannot have
an overlay itself, but the parent folder can be marked if one of its
child items is missing.
The Added overlay is simply used to
represent the added
status when an item
has been added to version control.
The In Subversion overlay is used to
represent an item which is in the normal
state, or a versioned item whose state is not yet known.
Because TortoiseSVN uses a background caching process to
gather status, it may take a few seconds before the overlay
updates.
The Needs Lock overlay is used to
indicate when a file has the svn:needs-lock
property set.
The Locked overlay is used when the local working copy holds a lock for that file.
The Ignored overlay is used to
represent an item which is in the ignored
state, either due to a global ignore pattern, or the
svn:ignore
property of the parent folder.
This overlay is optional.
The Unversioned overlay is used to
represent an item which is in the unversioned
state. This is an item in a versioned folder, but which is not
under version control itself.
This overlay is optional.
If an item has Subversion status none
(the item
is not within a working copy) then no overlay is shown.
If you have chosen to disable the Ignored
and Unversioned overlays then no overlay
will be shown for those files either.
An item can only have one Subversion status value. For example
a file could be locally modified and it could be marked for
deletion at the same time. Subversion returns a single status
value - in this case deleted
.
Those priorities are defined within Subversion itself.
When TortoiseSVN displays the status recursively (the default setting), each folder displays an overlay reflecting its own status and the status of all its children. In order to display a single summary overlay, we use the priority order shown above to determine which overlay to use, with the Conflicted overlay taking highest priority.
In fact, you may find that not all of these icons are used on your system. This is because the number of overlays allowed by Windows is limited to 15. Windows uses 4 of those, and the remaining 11 can be used by other applications. If there are not enough overlay slots available, TortoiseSVN tries to be a Good Citizen (TM) and limits its use of overlays to give other apps a chance.
Since there are Tortoise clients available for other version control systems, we've created a shared component which is responsible for showing the overlay icons. The technical details are not important here, all you need to know is that this shared component allows all Tortoise clients to use the same overlays and therefore the limit of 11 available slots isn't used up by installing more than one Tortoise client. Of course there's one small drawback: all Tortoise clients use the same overlay icons, so you can't figure out by the overlay icons what version control system a working copy is using.
-
Normal, Modified and Conflicted are always loaded and visible.
-
Deleted is loaded if possible, but falls back to Modified if there are not enough slots.
-
Read-Only is loaded if possible, but falls back to Normal if there are not enough slots.
-
Locked is loaded if possible, but falls back to Normal if there are not enough slots.
-
Added is loaded if possible, but falls back to Modified if there are not enough slots.