Perforce Helix: Difference between revisions
Content deleted Content added
m →See also: Removed "Perforce Jam" as it's not related to revision control |
m Bot: Fixing double redirect to Perforce Tag: Redirect target changed |
||
| (10 intermediate revisions by 8 users not shown) | |||
| Line 1: | Line 1: | ||
#REDIRECT [[Perforce#Helix Core]] |
|||
{{lead too short|date=March 2014}} |
|||
{{Infobox software |
|||
| name = Perforce Helix |
|||
| title = Perforce Helix |
|||
| logo = <!-- [[File: ]] --> |
|||
| screenshot = <!-- [[File: ]] --> |
|||
| caption = |
|||
| collapsible = |
|||
| author = |
|||
| developer = [[Perforce Software]] |
|||
| released = {{Start date and age|1995}} |
|||
| discontinued = |
|||
| latest release version = 2016.1/1411799<ref>https://www.perforce.com/support/software-release-index</ref> |
|||
| latest release date = {{Start date and age|2016|06|14}} |
|||
| latest preview version = |
|||
| latest preview date = <!-- {{Start date and age|YYYY|MM|DD}} --> |
|||
| frequently updated = <!-- DO NOT include this parameter unless you know what it does --> |
|||
| programming language = |
|||
| operating system = [[AIX]], [[FreeBSD]], [[HP-UX]], [[Linux]], [[macOS]], [[NetBSD]], [[Solaris (operating system)|Solaris]], [[Windows]] |
|||
| platform = |
|||
| size = |
|||
| language = |
|||
| status = Active |
|||
| genre = [[Revision control]] |
|||
| license = Proprietary |
|||
| website = {{URL|https://www.perforce.com/Helix}} |
|||
}} |
|||
'''Perforce Helix''' (originally just called Perforce) is a commercial, proprietary [[revision control]] system developed by [[Perforce Software]]. |
|||
==Architecture== |
|||
The Perforce Helix server manages a central [[database]] and a master [[wikt:repository|repository]] of [[Computer file|file]] versions. |
|||
===Server=== |
|||
====Metadata==== |
|||
The Perforce Helix database is proprietary, preconfigured, and self-installed. It stores system-related [[metadata]] (file state, file attributes, branching and merging history, changelists, change descriptions, users, groups, labels, etc.). Files are identified by namespace (i.e., by OS-neutral filenames). File content itself is not stored in the database. [[MD5]] hashes of file content are stored in the database, however, and can be used to verify repository file integrity. |
|||
Database tables are stored as binary files. [[Transaction checkpoint|Checkpoints and journals]] are written as text files that can be compressed and offloaded. A database that has been corrupted by hardware failure or other catastrophe can be recovered from the most recent journal and checkpoint. Administrators must plan for disaster recovery by configuring database |
|||
journaling and setting up regular checkpoints. |
|||
====Depot==== |
|||
Versioned file content is stored in a master directory hierarchy whose top levels are called "depots". |
|||
Text file revisions are stored as [[Revision Control System|RCS]] deltas,<ref group="notes">Although text file revisions are stored as RCS deltas in the repository, Perforce does not use the [[Revision Control System|RCS system]] to manage files.</ref> and binary file revisions are stored in their entirety. |
|||
The encoding used for text files in the repository is either [[ASCII]] or [[UTF-8]],<ref>[http://www.perforce.com/perforce/doc.current/user/i18nnotes.txt Internationalization Notes for P4D, the Perforce Server, and Perforce client applications. Version 2011.1]</ref> depending on Perforce server configuration. Repository files are not encrypted. Revisions that are branches or copies of other revisions are virtual copies within the repository. All revisions are preserved by default; limits can be set on the number of revisions preserved. Obsolete revisions and files can be purged by the administrator. Repository files must be included in regular system backups. |
|||
===Clients=== |
|||
Clients to the Perforce Helix system fall into roughly five categories: [[Git (software)|Git]], [[command (computing)|command]], [[GUI]], [[World Wide Web|web]], and [[Plug-in (computing)|plugin]]. The Perforce system can make part or all of its content available as Git repositories. Users of Git and of other clients can work with the same file content and history. Git commits are visible to users of other clients as Perforce changelists, and vice versa. Users submit changed files together in [[Source Code Management#Common vocabulary|changelists]], which are applied as [[atomic commit]]s. |
|||
The original command interface is P4, the [[command line interface|command-line]] client. P4 can be used in any command [[shell (computing)|shell]] or [[scripting language|script]]. It produces [[human-readable]] output by default, but can also produce [[tag (metadata)|tag]]ged text output and [[marshalling (computer science)|marshalled]] [[Python (programming language)|Python]] and [[Ruby (programming language)|Ruby]] output. Native C++ and Java APIs to the Perforce client commands are also available, as are [[Lua (programming language)|Lua]], [[Perl]], Python, PHP, Objective-C, and Ruby extensions built upon the C++ API.<ref>[http://www.perforce.com/perforce/loadsupp.html Perforce Related Software]</ref> |
|||
The command interfaces support the system's complete client functionality and can be used with OS-native [[filename]] syntax, as well as with Perforce's OS-neutral filename syntax. |
|||
Two GUI clients are available for users, the [[cross-platform]], [[Qt (toolkit)|Qt]]-based P4V, and the [[Microsoft Windows|Windows]]-only P4Win (in legacy maintenance mode since 2008<ref>[http://www.perforce.com/downloads/legacy-software]</ref>). Both support the majority of end-user operations. An administration GUI client, P4Admin, supports a subset of administrative operations.<ref>[http://www.perforce.com/perforce/products/p4admin.html P4Admin - Perforce Administration Tool]</ref> P4Admin, like P4V, is [[cross-platform]] and [[Qt (toolkit)|Qt]]-based. P4V and P4Admin can be extended with applets written in JavaScript and HTML.<ref>[http://www.perforce.com/perforce/doc.current/manuals/p4jsapi/index.html Perforce JavaScript API]</ref> |
|||
Plugins are provided for the Eclipse<ref>[http://www.perforce.com/product/components/eclipse_plugin P4Eclipse]</ref> and Visual Studio<ref>[http://www.perforce.com/product/components/visual_studio_plugin P4VS]</ref> IDEs. Ultimate version of Intellij IDEA has its own Perforce integration plugin.<ref>[https://www.jetbrains.com/idea/help/enabling-and-configuring-perforce-integration.html]</ref> |
|||
A web interface is provided by P4Web,<ref>[http://www.perforce.com/perforce/doc.current/manuals/p4web/help/index.html P4Web User Guide]</ref> a program that is both a Perforce client and a stand-alone [[HTTP]] [[daemon (computer software)|daemon]]. P4Web can be run as a shared [[web server]] to provide read-only access to the Perforce file repository and metadata. It can also be run on a user's machine, enabling [[web browser]]s to become the interface to client operations on the local machine. |
|||
The plugin interfaces are behind-the-scenes programs that |
|||
integrate Perforce client functionality into third-party software. |
|||
Perforce plugins are available for |
|||
[[desktop environments]], [[software development]] tools, [[digital asset]] development tools, [[software build]] tools, [[code review]] systems, [[defect tracking]] systems, [[office automation]] tools, [[SQL]] clients, and [[FTP]] clients. |
|||
===Distributed and remote revision control=== |
|||
Perforce Helix has four mechanisms for providing revision control to distributed or remote teams; these mechanisms can be used independently or in combination. The first is a [[proxy server]] that caches frequently read versions in order to reduce file access times for remote users. This mechanism accommodates closed development organizations where a centrally controlled file repository and a universally accessible database are desired. |
|||
The second mechanism, known as ''remote depots'', lets users connected to one server access file versions managed by other servers. With remote depots, each organization has control of its own server and makes parts or all of its repository visible to other servers. This mechanism is used for loosely coupled development organizations where a [[peer-to-peer]] approach is desired. |
|||
The third mechanism, known as ''replication'',<ref>[http://www.perforce.com/product/components/perforce_server Perforce Server]</ref> mirrors all (or some) of the repository data to another server. Replicas provide faster response time for remote users. |
|||
Finally, Perforce can be replicated to Git repositories, using the standard Git protocol and commands. |
|||
==Features== |
|||
{{Prose|section|date=August 2016}} |
|||
* Complete file and metadata history |
|||
* Full revision history for branched, renamed, moved, copied, and deleted files |
|||
* Three-way text file merging; merge tracking and re-merge prevention; common ancestor detection |
|||
* Graphical [[diff]]ing, merging, and offline/online reconciliation tools |
|||
* Graphical file content history and branch history viewers |
|||
* Graphical administrative interface |
|||
* Image thumbnails |
|||
* Centralized, access-controlled repository with support for distributed revision control (see below) |
|||
* ''Changelists'' – changed files can be grouped together and tracked as logical changes<ref group=notes>Perforce ''changelists'' are similar to what other revision control systems refer to as ''changesets''.</ref> |
|||
* [[Atomic commit]]s – the server assures that changelists are committed in their entirety |
|||
* ''Shelving'' – users can save and restore work in progress for code reviews or task switching |
|||
* Support for ASCII, [[Unicode]], binary, [[symbolic link]] (on Unix), Mac-specific, and [[UTF-16]] files |
|||
* Support for [[internationalization and localization]] |
|||
* Support for [[Revision Control System|RCS]]-style keyword expansion |
|||
* File compression for repository storage and network transfer |
|||
* Multi-platform, cross-platform – a single Unix or Windows server can support clients on any OS |
|||
* Server-side event triggers |
|||
* Programmable command-line client and API |
|||
* [[Software development kit|SDK]] for integrating with external systems (e.g., defect tracking) |
|||
* Change notification by [[RSS]]; support for email change notifications |
|||
* Replication of files and metadata<ref>[http://www.perforce.com/perforce/doc.current/manuals/p4sag/10_replication.html Perforce Replication]</ref> to support backup and performance improvement |
|||
* ''Broker'' for implementing local policies, restricting available commands, or redirecting commands to alternative servers<ref>[http://www.perforce.com/perforce/r10.2/manuals/p4sag/11_broker.html The Perforce Broker]</ref> |
|||
* Archiving files to reclaim server disk space<ref>[http://www.perforce.com/perforce/r10.2/manuals/p4sag/03_superuser.html#1092334 Reclaiming disk space by archiving files]</ref> |
|||
* Encrypted [[Secure Sockets Layer|SSL]] connections from clients to server<ref>[http://www.perforce.com/blog/120208/secure-perforce-communications-ssl Secure Perforce communications with SSL]</ref> |
|||
==Concurrency model== |
|||
The system offers a hybrid of ''merge'' and ''lock'' concurrency models.<ref group=notes >[[Comparison of revision control software]] describes concurrency models in these terms.</ref> As with similar systems, users do not have to lock files in order to work on them and are required to resolve concurrent, committed changes before submitting their work. Users may optionally lock files to ensure that they won't have to resolve concurrent changes. |
|||
However, the Perforce model is slightly different from those of similar systems in that users are expected to let the system know in advance which files they intend to change, even if they don't mean to lock them. Giving advance notice puts files in a ''pending changelist'' that can be submitted to the server. It also enables the system to alert other users working on the same files. Thus users can tell when they are working in parallel and can take the opportunity to coordinate with one another before making changes that could otherwise be difficult to merge. |
|||
Perforce enforces this advanced notification requirement loosely by setting read-only permission on workspace files as it fetches them from the repository. Users can bypass the requirement, by choice or by necessity (when working offline, for example), simply by hijacking file permissions and modifying files as they see fit. It is up to the user, in these cases, to remember to use Perforce to reconcile offline work and put hijacked files in a pending changelist so they can be submitted. (It is also up to users to leave hijacked files writable after changing them. A read-only file that is not in a pending changelist is assumed by Perforce to be a candidate for update by replacement.) |
|||
==Branching and merging== |
|||
A file is uniquely identified by its complete filename, e.g., <code>//depot/trunk/src/item.cpp</code>. Any non-deleted revision of a file can be branched. Perforce Helix uses ''inter-file branching'',<ref>Christopher Seiwald (1996). "Inter-File Branching: A Practical Method for Representing Variants". In ''Software Configuration Management: ICSE '96 SCM-6 Workshop, Berlin, Germany'', ed. Ian Sommerville, Springer, ISBN 3-540-61964-X.</ref> wherein branching creates a new file with a new name. For example, <code>my/index.php</code> may be branched into <code>your/index.php</code> and each file may then evolve independently. Repository paths are typically designated as containers for branched sets of files. For example, files in the <code>//depot/trunk</code> path may be branched as a set into a new <code>//depot/rel1.0</code> path, resulting in two sets of files evolving independently and between which changes can be merged. |
|||
In Perforce Helix, the operation that merges changes from one branch to another is called ''integration''. Integration propagates changes from a set of donor files into a set of corresponding target files; optional ''branch views'' can store customized donor–target mappings. By default, integration propagates all outstanding donor changes. Donor changes can be limited or cherry-picked by changelist, date, label, filename, or filename pattern-matching. The system records all integrations, uses them to select common ancestors for file merging, and does not by default perform redundant or unnecessary integrations. |
|||
Merging is actually only one of three possible outcomes of an integration. The others are ''ignoring'' (aka "blocking") and ''copying'' (aka "promoting"). Merging is used to keep one set of files up to date with another. For example, a development branch may be kept up to date with its trunk through repeated merging. Ignoring disqualifies changes in one set of files from future integration into another. It is often used when a development branch must be up to date with, and yet divergent from, its trunk. Copying is typically used to promote the content of an up-to-date development branch into a trunk. |
|||
Branching also supports renamed and moved files. The 'move' command branches originals to new files and deletes the originals. A branched file is no different from an added file; branched files are peers, not offshoots, of their originals. The system keeps track of file origins, however, and refers to them when displaying the history of renamed files. |
|||
Perforce streams<ref>[http://www.perforce.com/perforce/doc.current/manuals/p4v/streams_overview.html Perforce Streams]</ref> offer a way to capture more information about a branch, including ancestry and included paths. This information is used to provide guidelines for branching and merging operations. |
|||
==Access control and security== |
|||
The Perforce Helix server stores file content in a master repository that, when properly installed, is inaccessible to users. |
|||
User access to files is controlled by one or more Perforce [[superuser]]s. A range of file access protection levels can be granted. |
|||
Protections can be set for repository file [[Path (computing)|paths]], [[User (computing)|users]], [[Group (computing)|groups]], and [[IP address]] [[subnetwork|subnets]]. The server can maintain an audit log of client access events for [[Sarbanes-Oxley Act]] (SOX) and other compliance requirements. |
|||
User authentication is controlled by the Perforce system administrator. [[Password strength]] is configurable; [[Ticket (IT security)|ticket]]-based authentication can be configured as well. ''Triggers'' (custom scripts or programs that run at predefined events) can be set on many but not all Perforce user commands and used to extend user authentication (with [[LDAP]] or [[Single sign-on|SSO]], for example), to block or allow user commands, and to constrain or normalize file modifications. Triggers are run by the Perforce server and do not have access to client machines or workspaces. |
|||
Perforce Helix, like most version control systems, does not encrypt file content in the master repository or on user machines.<ref>[http://www.wired.com/images_blogs/threatlevel/2010/03/operationaurora_wp_0310_fnl.pdf Protecting Your Critical Assets, Lessons Learned from “Operation Aurora”, By McAfee Labs and McAfee Foundstone Professional Services]</ref><ref>[http://www.wired.com/threatlevel/2010/03/source-code-hacks/ 'Google' Hackers Had Ability to Alter Source Code]</ref><ref>[http://www.perforce.com/perforce/press/pr121_McAfee_statement.pdf Perforce Software Responds to McAfee White Paper on Operation Aurora]</ref> |
|||
Perforce versions prior to 2012.1 cannot encrypt file content sent over the network. A [[tunneling protocol]] (like [[VPN]] or [[Secure Shell|SSH]]) must be used to secure network transfers with those versions.<ref>[http://kb.perforce.com/article/1173/basics-of-perforce-security Perforce Knowledge Base: Securing Your Perforce Server]</ref> |
|||
The Perforce Helix client completely trusts the server, including writing arbitrary files anywhere in the local filesystem, and therefore running arbitrary code from the server.<ref> |
|||
[http://packetstormsecurity.org/files/view/53408/perforce.txt Client security hole alert, By Ben Bucksch] [http://www.securityfocus.com/archive/1/archive/1/455977/100/0/threaded Full-Disclosure post]</ref> That means the server has complete control over the client user's account, including reading and writing and sending all non-source code files of the user. In environments where the Perforce server is managed by a third party, this poses a significant threat to the client's security and privacy. |
|||
==Availability== |
|||
Use of the Perforce Helix server is unrestricted and free for up to 5<ref> Previously the number of free users was 20 in releases 2011.1 to 2016.1 of the server process http://answers.perforce.com/articles/KB/3159/?q=5+users&l=en_US&fs=Search&pn=1</ref> users, 20 workspaces and unlimited files, or unlimited users and up to 1,000 files, without a license. A license must be purchased for more users or workspaces; licenses may be purchased in perpetuity or on a subscription basis. The Perforce versioning engine, clients, plugin software, tools, and APIs are also freely available.<ref>[http://www.perforce.com/downloads/free/p4d Perforce 20/20 for Free]</ref> |
|||
Free licenses are available for [[open source|open-source]] software development, school or classroom projects, and trial/evaluation periods. Use of the Perforce client and plugin software is unrestricted, as is online access to Perforce technical documentation.<ref>[http://www.perforce.com/purchase Perforce Licensing and Pricing]</ref> |
|||
The server and client software are released as pre-built [[executable]]s for [[Microsoft Windows]], [[macOS]], [[Linux]], [[Solaris (operating system)|Solaris]], [[FreeBSD]], and other [[operating system]]s. |
|||
==See also== |
|||
*[[List of revision control software]] |
|||
*[[Comparison of revision control software]] |
|||
==Notes== |
|||
{{reflist|group=notes|liststyle=lower-roman}} |
|||
==References== |
|||
{{Reflist|30em}} |
|||
==External links== |
|||
*[http://www.perforce.com/ Perforce Software, Inc. website] |
|||
*{{Cite book |
|||
| last = Wingerd |
|||
| first = Laura |
|||
| title = Practical Perforce |
|||
| publisher = O'Reilly Media, Inc. |
|||
| date = November 18, 2005 |
|||
| isbn = 978-0-596-10185-5 |
|||
| ref = harv |
|||
| url = http://oreilly.com/catalog/9780596101855/ |
|||
}} |
|||
{{Revision control software}} |
|||
[[Category:Proprietary version control systems]] |
|||
[[Category:File comparison tools]] |
|||
Latest revision as of 04:12, 8 February 2018
Redirect to: