Perforce 2002.1 User's Guide | ||
<< Previous Chapter Perforce Basics: Quick Start |
Table of Contents Index Perforce on the Web |
Next Chapter >> Perforce Basics: Resolving File Conflicts |
All files within a Perforce client workspace share a common root directory, called the client root. In the degenerate case, the client root can be the host's root, but in practice the client root is the lowest level directory under which the managed source files sit.
Perforce manages the files in a client workspace in three direct ways:
Perforce's management of a client workspace requires a certain amount of cooperation from the user. Because client files are ordinary files with write permission turned off, willful users can circumvent the system by turning on write permission, directly deleting or renaming files, or otherwise modifying the file tree supposedly under Perforce's control.
Perforce counters this with two measures: first, Perforce has explicit commands to verify that the client workspace state is in accord with the server's recording of that state; second, Perforce tries to make using Perforce at least as easy as circumventing it. For example: to make a temporary modification to a file, it is easier to use Perforce than it is to copy and restore the file manually.
Files not managed by Perforce may also be under a client's root, but are ignored by Perforce. For example, Perforce may manage the source files in a client workspace, while the workspace also holds compiled objects, libraries, and executables, as well as a developer's temporary files.
In addition to accessing the client files, the p4 client program sometimes creates temporary files on the client host. Otherwise, Perforce neither creates nor uses any files on the client host.
Wildcard |
Meaning |
---|---|
* |
Matches anything except slashes; matches only within a single directory. |
... |
Matches anything including slashes; matches across multiple directories. |
%d |
Used for parametric substitution in views. See "Changing the order of filename substrings" on page 39 for a full explanation. |
The "..." wildcard is passed by the p4 client program to the Perforce server, where it is expanded to match the corresponding files known to p4d. The * wildcard is expanded locally by the OS shell before the p4 command is sent to the server, and the files that match the wildcard are passed as multiple arguments to the p4 command. To have Perforce match the * wildcard against the contents of the depot, it must be escaped, usually with quotes or a backslash. Most command shells don't interfere with the other two wildcards.
When you type p4 client, Perforce displays a variation of the following form:
Client: eds_elm |
The contents of the View: field determine where client files get stored in the depot, and where depot files are copied to in the client.
Note |
The p4 client form has more fields than are described here. For a full discussion, please see the Perforce Command Reference. |
If your system administrator has created multiple depots on your server, the default client view will look something like this:
View: |
The Perforce System Administrator's Guide explains how to create multiple depots.
//depotname/file_specification
The right-hand side of each mapping describes one or more files within the client workspace, and has the form:
//clientname/file_specification
The left-hand side of a client view mapping is called the depot side, and the right-hand side is the client side.
The default view in the example above is quite simple: it maps the entire depot to the entire client workspace. Views can contain multiple mappings, and can be much more complex, but all client views, no matter how elaborate, perform the same two functions:
Windows |
On Windows machines, the Perforce client must be specified in a slightly different way if it is to span multiple drives. For details, please see the platform notes at http://www.perforce.com/perforce/technical.html |
//depot/elm_proj/... //eds_elm/...
the single mapping contains Perforce's "..." wildcard, which matches everything including slashes. The result is that any file in the eds_elm client workspace will be mapped to the same location within the depot's elm_proj file tree. For example, the file //depot/elm_proj/nls/gencat/README is mapped to the client workspace file //eds_elm/nls/gencat/README.
To properly specify file trees, use the "..." wildcard after a trailing slash. (If you specify only //depot/elm_proj..., then the resulting view also includes files and directories such as //depot/elm_project_coredumps, which is probably not what you intended.)
//depot/... //eds_elm/...
indicates that any file in the directory tree under the client eds_elm will be stored in the identical subdirectory in the depot. This view is usually considered to be overkill, as most users only need to see a subset of the files in the depot.
Bettie is rewriting the documentation for Elm, which is found in the depot within its doc
subdirectory. Her client is named elm_docs, and her client root is /usr/bes/docs; she
types p4 client and sets the View: field as follows:
//depot/elm_proj/doc/... //elm_docs/...
The files in //depot/elm_proj/doc are mapped to /usr/bes/docs. Files not beneath the
//depot/elm_proj/doc directory no longer appear in Bettie's workspace.
The elm_proj subdirectory of the depot contains a directory called doc, which has all of the
Elm documents. Included in this directory are four files named elmdoc.0 through
elmdoc.3. Mike wants to separate these four files from the other documentation files in his
client workspace, which is called mike_elm.
To do this, he creates a new directory in his client workspace called help, which is located at
the same level as his doc directory. The four elmdoc files will go here, so he fills in the View:
field of the p4 client form as follows:
Any file whose name starts with elmdoc within the depot's doc subdirectory is caught by the
later mapping and appears in Mike's workspace's help directory; all other files are caught by
the first mapping and appear in their normal location. Conversely, any files beginning with
elmdoc within Mike's client workspace help subdirectory are mapped to the doc
subdirectory of the depot.
Note |
Whenever you map two sections of the depot to different parts of the client workspace, some depot and client files will remain unmapped. See "Two mappings can conflict and fail" on page 39 for details. |
Bill, whose client is named billm, wants to view only source code; he's not interested in the
documentation files. His client view would look like this:
Since later mappings have precedence over earlier ones, no files from the depot's doc
subdirectory will ever be copied to Bill's client. Conversely, if Bill does have a doc
subdirectory in his client, no files from that subdirectory will ever be copied to the depot.
Mike wants to store the files as above, but he wants to take the elmdoc.X files in the depot
and call them helpfile.X in his client workspace. He uses the following mappings:
Each wildcard on the depot side of a mapping must have a corresponding wildcard on the client side of the same mapping. The wildcards are replaced in the copied-to direction by the substring that the wildcard represents in the copied-from direction.
There can be multiple wildcards; the nth wildcard in the depot specification corresponds to the nth wildcard in the client description.
Mike wants to change the names of any files with a dot in them within his doc subdirectory in
such a way that the file's suffixes and prefixes are reversed in his client workspace. For
example, he'd like to rename the Elm.cover file in the depot cover.Elm in his client
workspace. (Mike can be a bit difficult to work with). He uses the following mappings:
Joe has constructed a view as follows:
The depot file //depot/proj1/bar maps to //joe/proj1/bar, but that same client file
//joe/proj1/bar maps back to the depot via the higher-precedence second line to
//depot/proj1/foo. Because the file would be written back to a different location in the
depot than where it was read from, Perforce doesn't map this name at all, and the file is
ignored.
In older versions of Perforce, this was often used as a trick to exclude particular files from the client workspace. Because Perforce now has exclusionary mappings, this type of mapping is no longer useful, and should be avoided.
Note that changing a client specification has no immediate effect on the locations of any files; the locations of files in your workspace are affected only when the client specification is used in subsequent commands.
This is particularly important for two types of client spec changes, specifically changes to the client view and changes to the client root:
To delete existing files from a client workspace, use p4 sync #none (described in "Specifying Older File Revisions" on page 46) on the files before deleting the client specification, or use the standard local OS deletion commands after deleting the client specification.
The following table provides the option values and their meanings:
Note |
The LineEnd: option is new to Perforce 2001.1, and replaces the old convention of specifying crlf or nocrlf in the Options: field. |
The LineEnd: field accepts one of five values:
The components of the path are separated by slashes.
Perforce syntax is sometimes called depot syntax or client syntax, depending on whether the file specifier refers to a file in the depot or on the client, but both forms of file specification work the same way.
Any filenames provided to Perforce commands can be specified in any valid local syntax, or in Perforce syntax by depot or client. If a client filename is provided, Perforce uses the client view to locate the corresponding file in the depot. If a depot filename is given, the client view is used to locate the corresponding file in the client workspace.
Ed wants to delete the src/lock.c file. He can give the p4 delete command in a number
of ways:
While in his client root directory, he could type
or, while in the src subdirectory, he could type
or, while in any directory on the client host, he could type any of the following commands:
p4 delete //eds_elm/src/lock.c
p4 delete //depot/elm_proj/src/lock.c
p4 delete /usr/edk/elm/src/lock.c
Client names and depot names in a single Perforce server share the same namespace, so Perforce will never confuse a client name with a depot name. Client workspace names and depot names can never be the same.
Perforce's wildcards and the revision-specifying characters @ and #, are not allowed in file names, label names, or other identifiers:
Observe that most of these characters tend to be difficult to use in filenames in cross-platform environments: UNIX separates path components with /, while many DOS commands interpret / as a command line switch. Most UNIX shells interpret # as the beginning of a comment. Both DOS and UNIX shells automatically expand * to match multiple files, and the DOS command line uses % to refer to variables.
For internationalization purposes, there are some limitations on how filenames with non-ASCII character sets are displayed. For Release 2001.1, all users should use a common code page setting (under Windows, use the Regional Settings applet in the Control Panel; under UNIX, set the LOCALE environment variable) in order to ensure that all filenames are displayed consistently across all machines in your organization.
If you are using Perforce in internationalized mode, all users must have P4CHARSET set properly. For details, see the Command Reference.
Make sure not to quote spaces that divide two separate strings; for example, a client mapping containing a directory named "my projects" would be quoted like this:
//depot/projects/foo/... "//aclient/my projects/foo/..."
Other Perforce objects, such as branch names, client names, label names, and so on, may be specified with spaces, but these spaces will be automatically converted to underscores by the Perforce server.
Warning! |
Some OS shells treat the revision character # as a comment character if it starts a new word. If your shell is one of these, escape the # before use. |
Revision Specifier |
Meaning |
Examples |
---|---|---|
file#n |
Revision number |
Refers to revision 3 of file lock.c |
file@n |
A change number |
Refers to the version of lock.c when changelist 126 was submitted, even if it was not part of the change. Refers to the state of the entire depot at changelist 126 (numbered changelists are explained in Chapter 7, Changelists). |
file@labelname |
A label name |
The revision of lock.c in the label called beta (labels are explained in Chapter 8, Labels). |
file@clientname |
The revision of file last taken into client workspace clientname. |
The revision of lock.c last taken into client workspace lisag_ws |
file#none |
The nonexistent revision. |
Says that there should be no version of lock.c in the client workspace, even if one exists in the depot. |
file#head |
The head revision, or latest version, of the file. |
Except for explicitly noted exceptions, this is identical to referring to the file with no revision specifier. |
file#have |
The revision on the current client. This is synonymous to @client where client is the current client name. |
The revision of lock.c found in the current client. |
file@date |
The head revision of the file at 00:00:00 on the morning of that date. Dates are specified as YYYY/MM/DD. |
The head revision of lock.c as of 00:00:00, May 18, 1998. |
file@"date time" |
The head revision of the file in the depot on the given date at the given time. The date is specified as above; the time is specified as HH:MM:SS. |
p4 sync lock.c@"1998/05/18 15:21:34" The head revision of lock.c as of May 18, 1998, at 3:21:34 pm. Both forms shown above are equivalent. The date and the time must be separated by a single space or a colon, and the entire string should be quoted. The time is specified on the 24-hour clock. Warning! Perforce allows you to search on dates with two-digit years, but these years are assumed to fall in the twentieth century. For safety's sake, use four-digit years. |
In all cases, if a file doesn't exist at the given revision number, it appears as if the file doesn't exist at all. Thus, using a label to refer to a file that isn't in the label is indistinguishable from referring to a file that doesn't exist at all.
Date and time specifications are always interpreted with respect to the local time zone of the Perforce server. Note that because the server stores times internally in terms of number of seconds since the Epoch (00:00:00 GMT Jan. 1, 1970), if you move your server across time zones, the times recorded on the server will automatically be reported in the new timezone.
The date, time, and time zone in effect at your Perforce server are displayed in the "Server date:" line in the output of p4 info.
Ed wants to retrieve all the doc files into his Elm doc subdirectory, but he wants to see only
those revisions that existed at change number 30. He types
Later, he creates another client for a different user. The new client should have all of the file
revisions that Ed last synced. Ed sets up the new client specification and types
p4 sync //depot/elm_proj/...@eds_elm
and the effect would have been the same.
Another client needs all its files removed, but these files shouldn't be deleted from the depot.
Ed sets P4CLIENT to the correct clientname, and types
The files are removed from his workspace ("synced to the nonexistent revision"), but not from
the depot.
If only a single revision is given where a revision range is expected, the named revision specifies the end of the range, and the start of the range is assumed to be 1. If no revision number or range is given where a revision range is expected, the default is all revisions.
The commands that accept revision range specifications are:
A release manager needs to see a list of all changes to the Elm project in July. He types:
p4 changes //depot/elm_proj/...@2000/7/1,2000/8/1
The resulting list of changes looks like this:
Change 632 on 2000/07/1 by edk@eds_elm 'Started work'
Change 633 on 2000/07/1 by edk@eds_elm 'First build w/bug fix'
...
Change 673 on 2000/07/31 by edk@eds_elm 'Final build for QA'
He can then use p4 describe change# against any desired change for a full description.
Perforce attempts to determine the type of the file automatically: when a file is opened with p4 add, Perforce first decides if the file is a regular file or a symbolic link, and then examines the first part of the file to determine whether it's text or binary. If any non-text characters are found, the file is assumed to be binary; otherwise, the file is assumed to be text. (Files of type unicode are detected only when the server is running in internationalized mode; for details, see your system administrator.)
Some file formats (for example, Adobe PDF files, and Rich Text Format files) are actually binary files, but can sometimes be mistakenly detected by Perforce as being of type text. For these files, your system administrator can use the p4 typemap command to set up a table matching Perforce file types to file name specifications.
Whenever you open a new file for add, Perforce checks the typemap table. If the file matches an entry in the table, Perforce uses the file type specified in the table, rather than the file type it would have otherwise used. You can override the file type specified in the typemap table by specifying it on the command line with the -t filetype modifier.
Once set, a file's type is normally inherited from one revision to the next, but can be overridden or changed with the -t flag:
The type of an existing file can be determined with p4 opened or p4 files.
File revisions of binary files are normally stored in full within the depot, but only changes made to text files since the previous revision are normally stored. This is called delta storage, and Perforce uses RCS format to store its deltas. The file's type determines whether full file or delta storage is used. When delta storage is used, file merges and file compares can be performed. Files that are stored in their full form can't be merged or compared. (RCS format and delta storage are described in more detail at the start of the next chapter).
Some of the file types are compressed to gzip format for storage in the depot. The compression occurs during the submission process, and decompression happens while syncing. The client workspace always contains the file as it was submitted.
The base Perforce file types are:
Keyword |
Description |
Comments |
Server Storage Type |
---|---|---|---|
text |
Text file |
Treated as text on the client. Line-ending translations are performed automatically on Windows and Macintosh clients. |
delta |
binary |
Non-text file |
Accessed as binary files on the client. Stored compressed within the depot. |
full file, |
symlink |
Symbolic link |
UNIX clients (and the BeOS client) access these as symbolic links. Non-UNIX clients treat them as (small) text files. |
delta |
apple |
Multi-forked Macintosh file |
AppleSingle storage of Mac data fork, resource fork, file type and file creator. New to Perforce 99.2. For full details, please see the Mac platform notes at http://www.perforce.com/perforce/technical.html |
full file, |
resource |
Macintosh resource fork |
The only file type for Mac resource forks in Perforce 99.1 and before. This is still supported, but we recommend using the new apple file type instead. For full details, please see the Mac platform notes at http://www.perforce.com/perforce/technical.html |
full file, |
unicode |
Unicode file |
Perforce servers operating in internationalized mode support a Unicode file type. These files are translated into the local character set. For details, see the System Administrator's Guide. |
Stored as UTF-8 |
The modtime (+m) modifier is a special case: It is intended for use by developers who need to preserve a file's original timestamp. (Normally, Perforce updates the timestamp when a file is synced.) It allows a user to ensure that the timestamp of a file in a client workspace after a p4 sync will be the original timestamp existing on the file at the time of submission (that is, not the time at the Perforce server at time of submission, and not the time on the client at the time of sync).
The most common case where this is useful is development involving the third-party DLLs often encountered in Windows environments. Because the timestamps on such files are often used as proxies for versioning information (both within the development environment and also by the operating system), it is sometimes necessary to preserve the files' original timestamps regardless of a Perforce user's client settings.
The +m modifier on a file allows this to happen; if set, Perforce ignores the modtime ("file's timestamp at time of submission") or nomodtime ("date and time on the client at time of sync") setting at the p4 client level when syncing the file, and always restore the file's original timestamp at the time of submit.
RCS keywords are expanded as follows:
The rules of form syntax are simple: keywords must be against the left margin and end with a colon, and values must either be on the same line as the keyword or indented on the lines beneath the keyword. Only the keywords already present on the form are recognized. Some keywords, such as the Client: field in the p4 client form, take a single value; other fields, such as Description:, take a block of text; and others, like View:, take a list of lines.
Certain fields, like Client: in p4 client, can't have their values changed; others, like Description: in p4 submit, must have their values changed. If you don't change a field that needs to be changed, or vice versa, the worst that will happen is that you'll get an error. We've done our best to make these cases as self-evident as possible. When in doubt, consult the Perforce Command Reference or use p4 help command.
These two flags are primarily used in scripts that access Perforce: use the -o flag to read a form, process the strings representing the form within your script, and finally, use the -i flag to send the processed form back to Perforce.
For example, to create a new job within a script you could first use p4 job -o > tempfile to read a blank job specification, then add information to the proper lines in tempfile, and finally use a command like p4 job -i < tempfile to store the new job in Perforce.
The commands that display forms and can therefore use these flags are:
These reports always generate information on depot files, not files within the client workspace. As with any other Perforce command, when a client file is provided on the command line, Perforce maps it to the proper depot file.
Revision specifiers can be used with all of these reporting commands, for example p4 files @clientname can be used to report on all the files in the depot that are currently found in client clientname. See Chapter 11, Reporting and Data Mining, for a more detailed discussion of each of these commands.
Perforce 2002.1 User's Guide | ||
<< Previous Chapter Perforce Basics: Quick Start |
Table of Contents Index Perforce on the Web |
Next Chapter >> Perforce Basics: Resolving File Conflicts |