{"id":460,"date":"2012-10-22T22:45:56","date_gmt":"2012-10-23T05:45:56","guid":{"rendered":"http:\/\/bellm.org\/blog\/?p=460"},"modified":"2012-10-22T22:45:56","modified_gmt":"2012-10-23T05:45:56","slug":"minimal-mercurial","status":"publish","type":"post","link":"http:\/\/bellm.org\/blog\/2012\/10\/22\/minimal-mercurial\/","title":{"rendered":"Minimal Mercurial"},"content":{"rendered":"

As a scientist, most of my work consists of text files: source code, data, and papers. Keeping track of changes to these files with version control helps me avoid losing work, track down bugs, reuse code, and keep records of my research. Rather than renaming files code.py.oldversion, code.py.aug01, code.py.brokendontuse<\/code>, version control gives me a single, current source file as well as a database of changes that I can use to restore any previous version at will.<\/p>\n

Older version control programs (e.g., CVS, SVN) were designed for large teams collaborating on a single code base, so they store changes in a single, centralized repository. For the solitary scientist, newer “decentralized” version control systems like Git<\/a> and Mercurial<\/a> work better: they are lightweight and easy to set up, and since the entire change history is carried with the code, it’s easy to keep your work synced across multiple computers.<\/p>\n

Among software engineers, Git is far more popular than Mercurial, thanks largely to the online repository github<\/a> [1<\/a><\/sup>]. Git is unnecessarily complicated for most of the work I do, though, so I prefer Mercurial for day-to-day use.? With either system, though, a single scientist only really needs a few simple commands to get most of the benefits of version control.? The Win-Vector blog published a guide for git<\/a>; here is mine for Mercurial.<\/p>\n

After installing Mercurial<\/a> [2<\/a><\/sup>], typing hg<\/code> at the command prompt should print a list of basic commands [3<\/a><\/sup>].? Of these, three are the most used:<\/p>\n

hg init
\nhg add <filename or pattern><\/em>
\nhg commit<\/code><\/p>\n

hg init<\/code> creates a new respository in the current directory.? You only need to run it once, when you first start tracking files for a project.? It creates a hidden directory .hg<\/code> in the current directory to store changes in.<\/p>\n

hg add <filename or pattern><\/em><\/code> tells Mercurial to track changes for the specified files.? Again, you only need to run it once for a given file [4<\/a><\/sup>].<\/p>\n

hg commit<\/code> records any changes to all tracked files and allows you to make notes on the changes you’ve made.?? You should run this frequently, particularly after any significant change in the state of the code.? I often specify the message at the command line with the -m<\/code> flag:? hg commit -m \"This is my commit message.\"<\/code><\/p>\n

That’s it!? So, a typical session might look like this:<\/p>\n

mkdir myproject
\ncd myproject
\nhg init
\nvim code.py
\nmake changes to code.py<\/em>
\nhg add code.py
\nhg commit -m \"Initial commit of code.py\"
\nvim README.txt
\nmake changes<\/em>
\nhg add README.txt
\nvim code.py
\nmore changes<\/em>
\nhg commit -m \"added README.txt; added functions to code.py\"<\/code><\/p>\n

These commands are enough to ensure you’ve got all your changes backed up, and for some projects that’s all you’ll ever need [5<\/a><\/sup>].? Eventually, you’ll probably want to list the revision history of a file (hg log<\/code>), check which files have uncommitted changes (hg status<\/code>), compare versions of the code (hg diff<\/code> or hg vimdiff<\/code>), and sync with another machine (hg clone\/push\/pull\/update\/merge<\/code>).? To learn how, you can use the command-line help system (hg help<\/code>), the official tutorials<\/a> and Definitive Guide<\/a>, and Joel Spolskly’s tutorial<\/a>.<\/p>\n

Echoing the Win-Vector Blog, though, you can learn all that when you need it<\/a>.? Starting today, you can get the benefits of version control with just three simple commands: hg init, hg add, hg commit<\/code>.<\/p>\n","protected":false},"excerpt":{"rendered":"

As a scientist, most of my work consists of text files: source code, data, and papers. Keeping track of changes to these files with version control helps me avoid losing work, track down bugs, reuse code, and keep records of my research. Rather than renaming files code.py.oldversion, code.py.aug01, code.py.brokendontuse, version control gives me a single, […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0,"footnotes":""},"categories":[14,8],"tags":[],"class_list":["post-460","post","type-post","status-publish","format-standard","hentry","category-science","category-tools"],"_links":{"self":[{"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/posts\/460","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/comments?post=460"}],"version-history":[{"count":29,"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/posts\/460\/revisions"}],"predecessor-version":[{"id":500,"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/posts\/460\/revisions\/500"}],"wp:attachment":[{"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/media?parent=460"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/categories?post=460"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/bellm.org\/blog\/wp-json\/wp\/v2\/tags?post=460"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}