# HG changeset patch # User Alessio Caiazza # Date 1268927980 -3600 # Node ID d3fcc54339600b6cf660cc9394672c51d3720c84 # Parent 7f692581605fef75ca01e31c87730e22e706cb77 guards enabled for patching marutosi's work or not. Traing to fix LANG issue. diff -r 7f692581605fef75ca01e31c87730e22e706cb77 -r d3fcc54339600b6cf660cc9394672c51d3720c84 fix_localization_issue.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fix_localization_issue.diff Thu Mar 18 16:59:40 2010 +0100 @@ -0,0 +1,20 @@ +# HG changeset patch +# Parent 23317322ebedf761be70f30f4dede0d71a98f0bd +if regexp fail try asking to python + +diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb +--- a/lib/redmine/scm/adapters/mercurial_adapter.rb ++++ b/lib/redmine/scm/adapters/mercurial_adapter.rb +@@ -52,6 +52,12 @@ + + def hgversion_from_command_line + %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1] ++ rescue NoMethodError ++ hgversion_from_python ++ end ++ ++ def hgversion_from_python ++ %x{python -c "from mercurial import util; print util.version()"}.strip + end + + def template_path diff -r 7f692581605fef75ca01e31c87730e22e706cb77 -r d3fcc54339600b6cf660cc9394672c51d3720c84 fix_mercurial_localization_issue.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fix_mercurial_localization_issue.diff Thu Mar 18 16:59:40 2010 +0100 @@ -0,0 +1,20 @@ +# HG changeset patch +# Parent 0dc60afda5722afecf6f7fc5c13552d3f008bdf2 +if regexp fail try asking to python + +diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb +--- a/lib/redmine/scm/adapters/mercurial_adapter.rb ++++ b/lib/redmine/scm/adapters/mercurial_adapter.rb +@@ -45,6 +45,12 @@ + + def hgversion_from_command_line + %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1] ++ rescue NoMethodError ++ hgversion_from_python ++ end ++ ++ def hgversion_from_python ++ %x{python -c "from mercurial import util; print util.version()"}.strip + end + + def template_path diff -r 7f692581605fef75ca01e31c87730e22e706cb77 -r d3fcc54339600b6cf660cc9394672c51d3720c84 series --- a/series Wed Mar 17 21:21:02 2010 +0100 +++ b/series Thu Mar 18 16:59:40 2010 +0100 @@ -1,5 +1,7 @@ -# Placed by Bitbucket -marutosi.diff -add_ini_support.diff -mercurial_hgrc_support.diff -mercurial_helper_hgrc_support.diff +fix_mercurial_localization_issue.diff #-hg-overhaul +marutosi.diff #+hg-overhaul +add_ini_support.diff #+hg-overhaul +mercurial_hgrc_support.diff #+hg-overhaul +mercurial_helper_hgrc_support.diff #+hg-overhaul +fix_localization_issue.diff #+hg-overhaul +