Jump to content

Mercurial: Difference between revisions

From Wikipedia, the free encyclopedia
Browse history interactively
← Previous editNext edit →
Content deleted Content added
VisualWikitext
MrtnGslr (talk | contribs)
69 edits
→Related software: Expanded TortoiseHg item, sorted according to my impression of popularity
Line 59: Line 59:


* [[Graphical user interface|GUI]] interfaces for Mercurial include:
* [[Graphical user interface|GUI]] interfaces for Mercurial include:
*; [[TortoiseHg]]: TortoiseHg is a cross-platform GUI for Mercurial. Most Mercurial operations can be invoked from the graphical interface. It can be used stand-alone on Windows, Mac OS X, or Linux.<ref>{{cite web
| title=Introduction
| url=http://tortoisehg.readthedocs.org/en/latest/intro.html
| work=TortoiseHg Documentation
| accessdate=23 April 2014}}</ref> It can also be integrated with [[Windows Explorer]]<ref>{{cite web
| title=Windows Explorer Integration
| url=http://tortoisehg.readthedocs.org/en/latest/explorer.html
| work=TortoiseHg Documentation
| accessdate=23 April 2014
}}</ref> and [[GNOME Files|GNOME Nautilus]]<ref>{{cite web
| title=GNOME desktop integration
| url=http://tortoisehg.readthedocs.org/en/latest/nautilus.html
| work=TortoiseHg Documentation
| accessdate=23 April 2014
}}</ref>. On Windows, the TortoiseHg installer bundles Mercurial and Python, making it a complete environment.
⚫
*; MacHg:<ref>http://jasonfharris.com/machg/</ref> MacHg is a free and fast multithreaded front end for Mac OS X 10.6 and later.
⚫
*; SourceTree:<ref>http://www.sourcetreeapp.com/</ref> A [[freeware]] Mac OS X and Windows GUI client that works with both Mercurial and Git.
*; ''Hgk'' ([[tcl/tk]]): This is implemented as a Mercurial extension, and is part of the official version. This viewer displays the [[directed acyclic graph]] of the [[changeset]]s of a Mercurial repository. This viewer can be invoked via the command <code>hg view</code>, if the extension is enabled. hgk was originally based on a similar tool for Git called gitk. There is an hgk replacement named hgview<ref>http://www.logilab.org/project/hgview</ref> that is written in pure Python and provides both gtk and qt interfaces.
*; ''Hgk'' ([[tcl/tk]]): This is implemented as a Mercurial extension, and is part of the official version. This viewer displays the [[directed acyclic graph]] of the [[changeset]]s of a Mercurial repository. This viewer can be invoked via the command <code>hg view</code>, if the extension is enabled. hgk was originally based on a similar tool for Git called gitk. There is an hgk replacement named hgview<ref>http://www.logilab.org/project/hgview</ref> that is written in pure Python and provides both gtk and qt interfaces.
*; [[TortoiseHg]]: TortoiseHg is a shell extension and a series of applications for the Mercurial distributed revision control system. It is available for Windows Explorer and GNOME Nautilus.
*; Murky:<ref>http://bitbucket.org/snej/murky/wiki/Home</ref> A Mac OS X GUI in Objective-C 2.0, runs on Mac OS X 10.5 and later.
*; Murky:<ref>http://bitbucket.org/snej/murky/wiki/Home</ref> A Mac OS X GUI in Objective-C 2.0, runs on Mac OS X 10.5 and later.
*; MacMercurial:<ref>http://www.jwwalker.com/pages/macmerc.html</ref> A Mac OS X GUI "not intended to completely replace command line use of Mercurial, only to ease the most common Mercurial operations," for Mac OS X 10.4 or later.
*; MacMercurial:<ref>http://www.jwwalker.com/pages/macmerc.html</ref> A Mac OS X GUI "not intended to completely replace command line use of Mercurial, only to ease the most common Mercurial operations," for Mac OS X 10.4 or later.
⚫
*; MacHg:<ref>http://jasonfharris.com/machg/</ref> MacHg is a free and fast multithreaded front end for Mac OS X 10.6 and later.
⚫
*; SourceTree:<ref>http://www.sourcetreeapp.com/</ref> A [[freeware]] Mac OS X and Windows GUI client that works with both Mercurial and Git.
*; hgtui:<ref>http://code.google.com/p/hgtui/</ref> A [[freeware]] [[Text user interface|TUI]] client for Linux and Windows (using cygwin).
*; hgtui:<ref>http://code.google.com/p/hgtui/</ref> A [[freeware]] [[Text user interface|TUI]] client for Linux and Windows (using cygwin).
* Related tools for merging include ''(h)gct'' ([[Qt toolkit|Qt]]) and Meld.<ref>http://meld.sourceforge.net/</ref>
* Related tools for merging include ''(h)gct'' ([[Qt toolkit|Qt]]) and Meld.<ref>http://meld.sourceforge.net/</ref>

Revision as of 12:30, 23 April 2014

This article is about the revision control software. For the metallic element after which it is named, see Mercury (element). For the unrelated corporation, see Mercurial Communications.
Mercurial
Developer(s)Matt Mackall
Initial release19 April 2005 (2005-04-19)[1]
Stable release
2.9.2[2] / 1 April 2014 (2014-04-01)
Repository
Written inPython and C
Operating systemUnix-like, MS Windows, Mac OS X
TypeRevision control
LicenseGNU GPL v2+
Websitemercurial.selenic.com

Mercurial is a cross-platform, distributed revision control tool for software developers. It is mainly implemented using the Python programming language, but includes a binary diff implementation written in C. It is supported on MS Windows and Unix-like systems, such as FreeBSD, Mac OS X and Linux. Mercurial is primarily a command line program but graphical user interface extensions are available. All of Mercurial's operations are invoked as arguments to its driver program hg, a reference to the chemical symbol of the element mercury.

Mercurial's major design goals include high performance and scalability, decentralized, fully distributed collaborative development, robust handling of both plain text and binary files, and advanced branching and merging capabilities, while remaining conceptually simple.[3] It includes an integrated web interface. Mercurial has also taken steps to ease the transition for SVN users.

The creator and lead developer of Mercurial is Matt Mackall. Mercurial is released as free software under the terms of the GNU GPL v2 (or any later version[4]).

Technical information

Mercurial uses SHA-1 hashes to identify revisions. For repository access via a network, Mercurial uses an HTTP-based protocol that seeks to reduce round-trip requests, new connections and data transferred. Mercurial can also work over ssh where the protocol is very similar to the HTTP-based protocol. By default it uses a 3-way merge before calling external merge tools.

History

Mackall first announced Mercurial on 19 April 2005.[1] The impetus for this was the announcement earlier that month by Bitmover that they were withdrawing the free version of BitKeeper.

BitKeeper had been used for the version control requirements of the Linux kernel project. Mackall decided to write a distributed version control system as a replacement for use with the Linux kernel. This project started a few days after another project called Git, initiated by Linus Torvalds with similar aims.[5]

The Linux kernel project decided to use Git rather than Mercurial, but Mercurial is now used by many other projects (see below).

In an answer on the Mercurial mailing list, Matt Mackall explained how the name "Mercurial" was chosen:[6]

Shortly before the first release, I read an article about the ongoing Bitkeeper debacle that described Larry McVoy as mercurial (in the sense of 'fickle'). Given the multiple meanings, the convenient abbreviation, and the good fit with my pre-existing naming scheme (see my email address), it clicked instantly. Mercurial is thus named in Larry's honor. I do not know if the same is true of Git.

Usage

Figure 1 shows some of the most important operations in Mercurial and their relations to Mercurial's concepts.

Figure 1: Some important operations of Mercurial and their relations.
Screenshot of hgk in action
Screenshot of TortoiseHg client history
  • GUI interfaces for Mercurial include:
    TortoiseHg
    TortoiseHg is a cross-platform GUI for Mercurial. Most Mercurial operations can be invoked from the graphical interface. It can be used stand-alone on Windows, Mac OS X, or Linux.[7] It can also be integrated with Windows Explorer[8] and GNOME Nautilus[9]. On Windows, the TortoiseHg installer bundles Mercurial and Python, making it a complete environment.
    MacHg
    [10] MacHg is a free and fast multithreaded front end for Mac OS X 10.6 and later.
    SourceTree
    [11] A freeware Mac OS X and Windows GUI client that works with both Mercurial and Git.
    Hgk (tcl/tk)
    This is implemented as a Mercurial extension, and is part of the official version. This viewer displays the directed acyclic graph of the changesets of a Mercurial repository. This viewer can be invoked via the command hg view, if the extension is enabled. hgk was originally based on a similar tool for Git called gitk. There is an hgk replacement named hgview[12] that is written in pure Python and provides both gtk and qt interfaces.
    Murky
    [13] A Mac OS X GUI in Objective-C 2.0, runs on Mac OS X 10.5 and later.
    MacMercurial
    [14] A Mac OS X GUI "not intended to completely replace command line use of Mercurial, only to ease the most common Mercurial operations," for Mac OS X 10.4 or later.
    hgtui
    [15] A freeware TUI client for Linux and Windows (using cygwin).
  • Related tools for merging include (h)gct (Qt) and Meld.[16]
  • The convert extension allows import from CVS, Darcs, Git, GNU Arch, Monotone, Perforce, Bazaar and Subversion repositories.
  • Microsoft Visual Studio supports Mercurial with the VisualHG[17] and HgSccPackage[18] plugins.
  • NetBeans supports Mercurial from Version 6.
  • Eclipse supports Mercurial with the MercurialEclipse[19] plugin.

Adoption

Source code hosting

See also: Comparison of open source software hosting facilities

The following websites provide free source code hosting for Mercurial repositories:

Projects using Mercurial

Some projects using the Mercurial distributed RCS:[24]

See also

References

  1. ^ a b Mackall, Matt (20 April 2005). "Mercurial v0.1 - a minimal scalable distributed SCM". Linux kernel (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  2. ^ "What's news", Mercurial (wiki) (2.9.2 ed.), Selenic.
  3. ^ Mackall, Matthew ‘Matt’ (2006), "Towards a Better SCM: Revlog and Mercurial" (PDF), Linux Symposium Proceedings, Ottawa: Selenic {{citation}}: |format= requires |url= (help).
  4. ^ "Relicensing", Mercurial (wiki), Selenic.
  5. ^ Mackall, Matt (29 April 2005). "Re: Mercurial 0.4b vs git patchbomb benchmark". Linux kernel (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  6. ^ Mackall, Matt (15 February 2012). "Why did Matt choose the name Mercurial?". Mercurial (Mailing list). Retrieved 8 March 2012. {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  7. ^ "Introduction". TortoiseHg Documentation. Retrieved 23 April 2014.
  8. ^ "Windows Explorer Integration". TortoiseHg Documentation. Retrieved 23 April 2014.
  9. ^ "GNOME desktop integration". TortoiseHg Documentation. Retrieved 23 April 2014.
  10. ^ http://jasonfharris.com/machg/
  11. ^ http://www.sourcetreeapp.com/
  12. ^ http://www.logilab.org/project/hgview
  13. ^ http://bitbucket.org/snej/murky/wiki/Home
  14. ^ http://www.jwwalker.com/pages/macmerc.html
  15. ^ http://code.google.com/p/hgtui/
  16. ^ http://meld.sourceforge.net/
  17. ^ http://visualhg.codeplex.com/
  18. ^ http://bitbucket.org/zzsergant/hgsccpackage/
  19. ^ http://www.javaforge.com/project/HGE
  20. ^ "CodePlex now supporting native Mercurial". CodePlex (Weblog). Microsoft. 22 January 2010.
  21. ^ "Mercurial Now Available to All Open Source Projects". Code (blog). Google. 28 May 2009.
  22. ^ "Git, Mercurial & Subversion hosting". Features. Codebase HQ. 4 March 2013.
  23. ^ "Hosting", Mercurial (wiki), Selenic.
  24. ^ "Some projects that use Mercurial", Mercurial (wiki), Selenic.
  25. ^ "Source", Adblock+.
  26. ^ "Source code repositories migrated from Subversion to Mercurial". Coin3D (news). 27 February 2010.
  27. ^ Sirainen, Timo (19 May 2007). "CVS to Mercurial switch". news (Mailing list). Dovecot. {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  28. ^ "Scaling Mercurial at Facebook". Retrieved 7 January 2014.
  29. ^ "Mercurial Work Flow" (wiki). Illumos. 13 March 2011.
  30. ^ Gordon, Ryan C (11 May 2010). "Lugaru goes open source!". Icculus.
  31. ^ Reed, J Paul (12 April 2007). "Version Control System Shootout Redux Redux".
  32. ^ "Switch to hg.netbeans.org completed". Net beans. January 2008.
  33. ^ "Mercurial". Developers. OGRE – Open Source 3D Graphics Engine. 4 April 2010.
  34. ^ James Gosling (2006). "Open Sourcing Sun's Java Platform Implementations, Part 1" (Interview). Interviewed by Robert Eckstein. Sun. {{cite interview}}: Unknown parameter |month= ignored (help)
  35. ^ "Source Repositories". OpenIndiana. 13 March 2011.
  36. ^ "RawTherapee". 4 January 2010.
  37. ^ Wood, David (6 April 2009). "We decided in the end to use Mercurial rather than Git". Symbian. Archived from the original on 14 April 2009. Retrieved 7 May 2009.
  38. ^ "Distributed VCS: On git and mercurial, a transition from SVN". Larroy.

Retrieved from "https://en.wikipedia.org/w/index.php?title=Mercurial&oldid=605445247"