18b8f0d5abc7742ad49d46e2590494183831985d

Author: Robin Luckey

Date: 2009-08-11 12:20:07 -0700

[FIX] HgAdapter: Compatibility with hg 1.2.1

diff --git a/lib/scm/adapters/hg/head.rb b/lib/scm/adapters/hg/head.rb index e3c3921..9cdaf96 100644 --- a/lib/scm/adapters/hg/head.rb +++ b/lib/scm/adapters/hg/head.rb @@ -3,7 +3,14 @@ module Scm::Adapters def head_token # This only returns first 12 characters. # How can we make it return the entire hash? - run("hg id -q #{url}").strip + token = run("hg id -q #{url}").strip + + # Recent versions of Hg now somtimes append a '+' char to the token. + # I believe this signifies pending changes... but we don't care. + # Strip the trailing '+', if any. + token = token[0..-2] if token[-1..-1] == '+' + + token end def head