Take the 2-minute tour ×
Programmers Stack Exchange is a question and answer site for professional programmers interested in conceptual questions about software development. It's 100% free, no registration required.

This is a question about the internal workings of Mercurial.

I vaguely remember a fellow programmer explaining to me how mercurial works out which changesets differ between two repositories and that it had a speedy solution to the problem.

Does anyone know how this works or can point me towards a document describing the details?

share|improve this question
    
please accept the answer by tonfa so I can delete my answer. –  Martin Geisler Sep 1 '13 at 16:06
add comment

1 Answer

up vote 6 down vote accepted

Algorithm works in the following way. You have two repository: local and remote. They both contains a DAG of changelists.

The goal of the discovery protocol is to find one set of node common, the set of nodes shared by local and remote.

One of the issue with the original protocol was latency, it could potentially require lots of roundtrips to discover that the local repo was a subset of remote (which is a very common case, you usually have few changes compared to upstream, while upstream probably had lots of development).

The new protocol only requires one interface for the remote repo: known(), which given a set of changelists tells you if they are present in the DAG.

The algorithm then works as follow:

  • We will be using three sets, common, missing, unknown. Originally all nodes are in unknown.
  • Take a sample from unknown, call remote.known(sample)
    • For each node that remote knows, move it and all its ancestors to common
    • For each node that remote doesn't know, move it and all its descendants to missing
  • Iterate until unknown is empty

There are a couple optimizations, first is instead of starting with a random sample of missing, start by sending all heads, in the case where the local repo is a subset, you computed the answer in one round trip.

Then you can do something similar to the bisecting strategy used when finding faulty changesets. Instead of random samples, you can try picking nodes that will maximize the number of nodes that will be classified with it (since all ancestors or descendants will be marked as well).

The end result worked pretty well.

The code is pretty readable if you're curious: http://selenic.com/hg/file/tip/mercurial/setdiscovery.py

share|improve this answer
    
This makes sense to me, thanks. I assume remote.missing(sample) was meant to be remote.known(sample), and after the first few optimised queries one can binary chop the unknowns paths. –  Robin Sep 2 '13 at 8:43
    
Oh yeah, let me fix the typos. –  tonfa Sep 3 '13 at 7:45
add comment

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.