Jump to content

Unity Version Control

Edit links
From Wikipedia, the free encyclopedia
This is an old revision of this page, as edited by Bshubotm (talk | contribs) at 02:26, 25 October 2018 (→History). The present address (URL) is a permanent link to this revision, which may differ significantly from the current revision.
Plastic SCM
Developer(s)Codice Software
Initial release31 October 2006; 18 years ago (2006-10-31)
Stable release
7.0 / March 16, 2018; 7 years ago (2018-03-16)
Preview release
7.0 / New releases every week
Operating systemMicrosoft Windows, Linux, Mac OS
Platform.NET / Mono
Size93 MB (Windows installer)
TypeRevision control
LicenseProprietary
Websitewww.plasticscm.com

Plastic SCM is a cross-platform commercial distributed version control tool developed by Códice Software Inc. It is available for Microsoft Windows, Mac OS X, Linux, and other operating systems. It includes a command-line tool, a antive GUI, and integration with a number of diff and merge tool and integration with a number of IDEs. It is a full version control stack not based on Git (although it can communicate with it).

Features

Plastic SCM is a full version control stack platform. It includes these components:

  • Server
  • Command line client
  • GUIs
  • Diff and merge tools
  • Web GUI and web-based admin interface[1][2][3]

Some of its features include:

  • Support for heavy branching and merging: According to its creators, Plastic can handle unlimited branching and complex merge scenarios[4]
  • Visual Branch Explorer: A timeline to represent branches, merges and changes in repositories, implemented in all of its GUIs[5]
  • ACL-based security: Every object in the system can be secured with access control lists[6]
  • Built-in 3-way merge and side-by-side diff including language-aware support and history of a specific method or function[7]
  • Directory versioning and support for versioning renames
  • Revision history for branched, renamed, moved, copied, and deleted files
  • Blame/Annotate
  • Centralized operation (SVN/Perforce style)
  • Distributed operation (Git/Mercurial style)
  • Atomic commits—the server assures that changesets are committed in the repository entirely
  • Shelving—users can save and restore work in progress for task switching
  • Support for ASCII, Unicode, binary, symbolic link (on Unix), Mac-specific, and UTF-16 files
  • Support for Mac OS X, Windows and Linux platforms
  • Server-side and client-side event triggers[8]
  • High-latency network support: The network protocol used by Plastic is optimized for high-speed/high-latency networks[9]
  • Gluon: GUI and workflow for non-developers (specially focused on game development)[10]
  • Locking: Binary files and assets that can't be merged can use locking instead of branching/merging[11]

Clients

There are different kind of clients:

The command line tool can be used for automation. It can be run in "shell mode" (cm shell) where the command stays open and receives commands through the standard input, avoiding to restart the process for every command what is useful for high performance integrations.

The GUI for Linux do not have all the functionality, and it looks is not being updated, the mergetool is not ported, you must use third-party software like Kdiff3, and the package repositories for apt, yum, etc. are not available any more.

Architecture

Plastic is a client/server system although in current terms of version control it can also be defined as a distributed revision control system, due to its ability to have very lightweight servers on the developer computer and push and pull branches between servers (similar to what Git and Mercurial do). Developers work on files in their client workspaces, and check in changed files together in changesets. Communication from client to server is done through a customized .NET Remoting channel.

Database

The default Plastic database on a regular installation is a SQL Server Compact embedded database on Windows systems and an SQLite embedded database on Linux and Mac OS X (since Plastic 3.0).

The database can be configured by tweaking the db.conf file located on the server directory and can be set up to use any of the other alternatives. The database can be queried to extract extended information. All the data and metadata are stored in the database.

Administrators can set up their preferred database system and set it up to run backups, disaster recovery and high-availability. Every repository is stored in a separate database, except in case of Oracle, where every repository is a different user and tablespace.

Concurrency model

Plastic is based on a branch & merge concurrency model. Optionally it is possible to do exclusive checkouts in order to prevent concurrency, but it is neither the default nor the recommended way of working. A checkout in Plastic doesn't mean a lock. It just means a new revision of the item is created in order to be edited. Several checkouts of the same item can be performed in parallel on different workspaces, even on the same branch.

In the default checkout and change model, users are expected to let the system know in advance which files they intend to change, even if they do not mean to lock them (similar to Perforce). Since version 2.8 it is also possible to perform a change and commit cycle in which a previous checkout is not needed, as developers from systems such as Subversion or Git are used to.

Branching

Every item (file or directory) is identified by a unique id instead of a path. Files do not have names directly associated, but as it happens with a file system, directories handle all naming. It makes renaming a very cheap operation. Branches are defined as revision containers. Creating a branch doesn't perform any copy of revisions, it simply creates a new empty object.

Plastic branches are hierarchical: there's always a main branch (by default named /main) on every repository and normally all branches are created as child branches. A child branch means it inherits everything from its parent except the contents it already has. So, after creation, a branch is empty but it inherits its contents from the parent branch.

That's why when a new branch is created on Plastic it doesn't have any contents but if a workspace is switched (updated) to the branch the workspace won't be empty. Branches with hierarchy are also known as smart branches and their inheritance can be set up as follows:

  • Inherit from a specific label
  • Inherit from a specific changeset
  • Dynamic inheritance from the parent branch, which means a change on the parent branch will be directly inherited to the child branches set up with dynamic inheritance

Branching is a cheap operation and the recommended workflow with Plastic encourages the creation of many branches (branch per task).

Merging

As of version 3.0 merge tracking information is kept on a per item basis. Every file and directory keeps track of the merge links between its revisions. Merge tracking information is used to calculate the nearest common ancestor of the two candidates on a merge, and parent links and merge links are weighted differently. Merging is meant to be a focus feature of Plastic, and the system is built around this capability.

Distributed revision control

Plastic is able to push and pull branches from remote repositories, and merge conflicts if modifications happened on the same branch on two locations concurrently on the same files or directories. In case of conflict during push or pull operations, a fetch branch is created containing the fetched revisions. The branch can be merged later. Plastic also provides a proxy server that caches frequently accessed revision data and can be used to reduce traffic on centralized setups.

Enterprise features

Backend support

The Plastic server stores data and metadata on a relational database. The database can be one of the following:

Access control

Plastic differentiates from access control and security. User and group information can be retrieved from one of the following sources:

  • LDAP
  • Active Directory
  • Built-in user/password
  • Local users on the client and server machine (if the network is secured, Plastic is secured, otherwise there's no secured auth in this mode)

Security

Every object in the system (branches, repositories and changesets included) has an associated access control list (ACL)[13] and there is a set of 32 different permissions to tune security.

Availability, release cycle and supported platforms

Plastic SCM is available to download from the plasticscm.com website. Major releases are published yearly as pre-built executables for Microsoft Windows, Mac OS X, and Linux.[14]

Minor releases are available on a weekly basis.

Licensing and terms of use

Plastic SCM is free for individuals (Personal Edition), non-profit organizations and open source projects (Community Edition).

Cloud Edition is a commercial version for teams that don’t need an on-premise server. Customers pay per active monthly user and cloud storage. The subscription includes all the Plastic SCM software.

Team Edition is a commercial version for teams under 15 users that need an on-premise server. The subscriptions are monthly or annual and includes all the Plastic SCM software.

Enterprise Edition is a commercial version for teams over 15 users, typically used by corporations. It can be purchased in perpetual edition mode or with a monthly or annual subscription.[15]

History

Codice Software started in August 2005 backed by an angel investor and the founders[16]. The goal was to create a version control stronger than SVN in branching and merging and more affordable for SME than the commercial alternatives available at the time. In October 2006, they released the first version of Plastic SCM and was officially presented in Tech Ed 2006 in Barcelona.[17][18]

In 2007 Codice was the first Spanish SME to achieve CMMI L2 using SCRUM[19]

Plastic SCM was featured by Novell as one of the companies using Mono commercially.[20]

Plastic SCM 2.0 was launched on March 2008.[21]

In 2009 Codice secures its first round of VC backed by Bullnet Capital, a Spanish firm specialized in tech companies[22]

Plastic SCM was a Jolt Award finalist in the Change and Configuration Management category, announced in December 2008.[23]

Plastic SCM 3.0 was launched in July 2010[24] and it featured Xdiff/Xmerge: their first approach to track moved code in diffs and merges.

In December 2010, Plastic SCM announces "method history", a feature that allows the user to calculate the history of a given method/function instead of the history of a full file[25]

In 2011, Francisco Monteverde joined the company as CEO while Pablo Santos, founder, was appointed as CTO and President of the board.[26]

Plastic SCM 4.0 was launched on Nov 23th 2011[27][28] and introduced a major change in the internal design: versioning and merge tracked was moved from a per-file approach to a per-changeset approach, which helped improving later Git-interop[29]

Since 4.0, Plastic started to be more oriented towards game development, specially considering the weaknesses of Git in terms of big repositories and files[30]

Version 4.1 was launched in April 2012[31]

In 2013, Codice launches Semantic Merge, a tool that diffs and merges based on code structure and not text.[32] The technology was later integrated inside Plastic. Semantic builds on top of the previous work done on the Xdiff/Xmerge tool. Later that year Semantic added Java support to complement the initial .NET offering.[33] Pablo Santos introduced cross-file diff and merge detection in QCon 2013 in San Francisco.[34]

In 2013, Plastic SCM started natively supporting the Git network protocol, which virtually converts any Plastic installation into a Git client.[35]

Plastic SCM 5.0 is launched in September 2013Cite error: A <ref> tag is missing the closing </ref> (see the help page). and method history [36]. Other features are path based security, client changelists and improved cloaked rules.

Version 5.4 later expands some of these features and add a few more: encrypted servers, JavaCLI (a Java client to support HP-UX and Solaris scripting), multi-core file upload and download, Plastic Gluon (developed in collaboration with Telltale [37]), a GUI for artists in game development, WAN optimized data transfer, submodules, transformable workspaces. Plastic 5.4 evolves as Plastic's primary version and in December 2014 a new native GUI for Linux is launched replacing the previous cross-platform one.[38] 5.4 includes a new native MacOS GUI too. [citation needed].


In January 2016 Plastic Cloud was launched as a cloud repo hosting system.[39]

In March 2016 Plastic Cloud Edition was launched, a new version designed for teams who don't need an on-premise server.[40]

Version 6.0 was finally released in January 2017.[41] It features a new data storage system called Jet, full backwards compatibility up to 5.0 and floating licenses support. 6.0 continues evolving during 2017.

Plastic SCM 7.0 was launched in March 2018[42] including a new Branch Explorer design, new web-based administration interface, and improvements in MacOS and Linux GUIs.

The mergebots feature was launched on September 2017. mergebots are a way to implement DevOps with server-side agents that detect when branches have to be merged after testing them on a CI system.[43]

See also

Notes

  1. ^ WebUI: redesigned web interface for Plastic
  2. ^ webadmin – introducing the new server admin tool
  3. ^ XDIFF AND XMERGE
  4. ^ mergeMachine
  5. ^ Branch Explorer
  6. ^ SECURITY
  7. ^ Semantic Version Control
  8. ^ TRIGGERS GUIDE
  9. ^ Optimized network channel for high latency
  10. ^ Gluon: Version Control for Artists
  11. ^ PLASTIC SCM ADMINISTRATOR'S GUIDE: Chapter 7: Configuring exclusive checkout (Lock)
  12. ^ Third party tools compatibility matrix
  13. ^ Plastic SCM ACL-based security
  14. ^ Miguel de Icaza on Plastic SCM UI on Linux and Mac OS X
  15. ^ Major PlasticSCM Updates
  16. ^ LinkedIn: Paul Santos
  17. ^ SIMO 2006
  18. ^ Plastic SCM – DVCS at Enterprise Level Plastic SCM – DVCS at Enterprise Level
  19. ^ Codice Software shows off new SCM tool
  20. ^ Companies using Mono
  21. ^ Plastic SCM 2.0 set for parallel development projects
  22. ^ Innova.- La entidad de capital riesgo Bullnet Capital entra en el accionariado de la vallisoletana Códice Software
  23. ^ Embarcadero products are Jolt Award finalists in several categories
  24. ^ Codice includes XMerge/XDiff 2.0 in Plastic SCM release
  25. ^ Announcing the method history
  26. ^ Embarcadero products are Jolt Award finalists in several categories
  27. ^ Plastic SCM 4.0 Launch: new features in Plastic SCM 4.0 by Pablo Santos
  28. ^ Codice Software Launches Plastic SCM 4.0; Challenges Git and Perforce in DVCS
  29. ^ Plastic internals: de 3.0 a 4.0
  30. ^ Codice Software Unveils Plastic SCM 4.0 for Game Development, Successful Collaboration With Digital Legends Entertainment
  31. ^ Plastic SCM Pays Attention to Detail in Source Code Management
  32. ^ A Merge Tool that Understands Functions
  33. ^ Codice Add Java Support to their Code-Aware Merging Tool
  34. ^ InfoQ - QCon San Francisco 2013 - Refactoring in the DVCS Age - Enter Semantic Merge
  35. ^ GitSync for Plastic SCM with Native Git Protocols and Visual Studio 2012 Support
  36. ^ Plastic SCM features
  37. ^ How Telltale Games handles version control
  38. ^ Native Linux GUI – gtkplastic
  39. ^ Plastic Cloud is now out!
  40. ^ Plastic SCM Cloud Edition
  41. ^ Release 6.0.16.804
  42. ^ Release 7.0.16.2047
  43. ^ Add a mergebot to your repo!

References

  • Krill, Paul (2008-03-24), "Plastic SCM 2.0 set for parallel development projects", InfoWorld, retrieved 2012-03-14
  • Feinman, Jeff (2009-12-01), "Codice branches out with new version of SCM tool", SD Times, retrieved 2012-03-14
  • Norfolk, David (2007-07-30), "Codice Software shows off new SCM tool", The Register, retrieved 2012-03-14
  • Serignese, Katie (2010-07-15), "Codice includes XMerge/XDiff 2.0 in Plastic SCM release", SD Times, retrieved 2012-03-14
  • McConnel, Toni (2010-04-27), "ESC — Embed-X incorporates first Agile dev framework for critical software processes", EE Times, retrieved 2012-03-14
  • Santos, Pablo (2007-08-02), "SCRUM Meets CMMi", Dr. Dobb's Journal, retrieved 2012-03-14
Retrieved from "https://en.wikipedia.org/w/index.php?title=Unity_Version_Control&oldid=865620108"