Mercurial (as of 2.1) Now Has Phases

In my last post I pondered (ranted?) on the reluctance of Mercurial people to edit repository history, especially as compared to git people. Today I noticed that Mercurial 2.1 has been released, and it has a new feature that makes editing your local repository much safer, phases (more detail here).

To me this looks like a really cool idea. Phases explicitly mark changesets as either public (have been pushed or pulled, and should not be edited) or draft (still local to your repository and can be freely edited). Changesets are given a phase automatically behind the scenes (though you can override this, of course), and history editing tools respect phases so that now it is even harder to shoot yourself in the foot when editing your repository history with tools like rebase or mq.

There is also one more phase, secret, that can be enabled for use with patches in your Mercurial Queues. Secret changesets will not be pushed, pulled, or cloned (or even show up in the output of incoming or outgoing). That's a nice touch too.

I wonder if git will ever pick this idea up? Git users seem to already be pretty comfortable with history editing procedures, but I have also read (old?) debates about when it is a good idea and when it is definitely a bad idea to use rebase with git repositories. It seems like phases could clear up confusion in the git world too.

Comments

Ryan said…
In git, phases would probably be implicit, with any change upstream of a remote ref being considered public.
February 6, 2012 at 3:36 PM
Bryan said…
I'm not sure exactly what you mean by "implicit." I hope I didn't make it sound like phases in mercurial are something you have to manage yourself. From the mercurial wiki:

---

Phase movements are automatic and transparent; most users don't have to care much about them. The base rule is very simple:

"Any changesets seen in a remote repository are public"

---

Of course git would be the same.
February 6, 2012 at 3:47 PM
Ryan said…
What I mean by implicit is similar to how membership of commits in a branch are determined in git vs mercurial. In hg, the branch is explicity written into the commit (changeset?). In git, a branch is a pointer to a commit, and that branch is considered to contain the pointed-to commit and all of that commit's ancestors, even though none of those commits explicitly reference the branch in any way.

If the Git developers were to implement a similar feature for treating public and private commits differently, I think Git would probably not explicitly keep track of the status of each commit, but rather regard any commit as public if it is pointed to by a remote ref or is an ancestor of such a commit.
May 10, 2012 at 3:29 PM
Bryan said…
Ryan, I understand what you meant by implicit now, thanks for the explanation. I do need to clarify what you said about mercurial branches though.

In mercurial, you can do an hg update to any revision in the history and then create a new commit as a child of that revision. If the parent of this new commit was not already a head in the directed acyclic graph, you now have a new branch. If that's all you do then the branch does not have a name, but it won't ever be garbage collected or anything like that (you can always find it by running hg heads).

If you want to use git-style (implicit, as you say) branching, you can now use the hg bookmark command to create a bookmark for this branch, which is a named reference or pointer just like git branches are. Of course you can create the bookmark first too if that's more intuitive.

You can also use the original style of mercurial branches that you mention, where before committing you run the hg branch command to create a branch name, and then all commits along that branch in the DAG will have a branch name associated with them.

This is getting a little bit out of date (bookmarks have evolved to be even more like git branches), but I think it's still the best description of mercurial branches out there:

http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/#branching-with-bookmarks
May 10, 2012 at 8:31 PM
Bryan said…
sorry, here's a link to the beginning of the blog entry:

http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/
May 10, 2012 at 8:33 PM
Post a Comment

Popular posts from this blog

SystemVerilog Fork Disable "Gotchas"

This is a long post with a lot of SystemVerilog code. The purpose of this entry is to hopefully save you from beating your head against the wall trying to figure out some of the subtleties of SystemVerilog processes (basically, threads). Subtleties like these are commonly referred to in the industry as "Gotchas" which makes them sound so playful and fun, but they really aren't either. I encourage you to run these examples with your simulator (if you have access to one) so that a) you can see the results first hand and better internalize what's going on, and b) you can tell me in the comments if this code works fine for you and I'll know I should go complain to my simulator vendor. OK, I'll start with a warm-up that everyone who writes any Verilog or SystemVerilog at all should be aware of, tasks are static by default. If you do this: module top; task do_stuff ( int wait_time); #wait_time $display ( "waited %0d, then did stuff" , wa
Read more

'git revert' Is Not Equivalent To 'svn revert'

I just learned that if you have some changes in your working tree that you want to get rid of, you don't type 'git revert' like you might guess. No, that's what cvs, subversion, mercurial, and bazaar (to name a few) use revert to mean, but not git. With git, revert is used to undo actual commits. Thankfully, you can undo your revert with another 'git revert', I just learned. So let me repeat to be clear, if you have changes to your working files that you want to abandon, DO NOT do this: git revert HEAD That will undo your last commit. Do this instead: git reset --hard HEAD I'm glad I have that straightened out now. I'm wondering if /etc was really a good place for me to start out playing with git. UPDATE: Nearly two years later and I'm still getting comments on this. I'm glad I've been able to help people out this way. The discussion in the comments is good, and one thing I'd like to point out is that I now always use
Read more

Git Rebase Explained

Image
Introduction Rebase is a helpful git command that can be used to turn a branchy two-headed version history into an easy to follow linear one. A linear history is much easier for a human eye to follow and a human brain to understand. Rebase is a very safe command to use, despite some fear that people have about it. This post should explain how rebase works and clear up any misunderstandings about it. Rebase Basics The short summary of rebase is that it cuts commits out of the git history and reconnects them somewhere else. Let's say the common scenario comes up: you commit a change to the main branch of a repository, you then run  git fetch , and in come a couple changes that other people made on the main branch. If your commit is version 46f and the others that just came in on the fetch are versions ef9 and 4a2, your version history might look like this: The main branch now has two heads, 46f and 4a2. You can run  git rebase  to disconnect your commit from version d88 and connect i
Read more