Mercurial > hg > easyhg

comparison hgrunner.cpp @ 336:4229b6a8e9c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Mon, 14 Mar 2011 10:00:29 +0000
parents dff8ec43c86d
children bb189827f6d1
comparison
equal deleted inserted replaced
335:aa852b477e4d 336:4229b6a8e9c6
421 env.insert("PATH", m_myDirPath + ";" + env.value("PATH")); 421 env.insert("PATH", m_myDirPath + ";" + env.value("PATH"));
422 } 422 }
423 #endif 423 #endif
424 424
425 #ifdef Q_OS_MAC 425 #ifdef Q_OS_MAC
426 // On OS/X 10.6, Python is 64-bit by default but our Hg extension 426 if (settings.value("python32", false).toBool()) {
427 // is only available in 32-bit
428 if (settings.value("python32", true).toBool()) {
429 env.insert("VERSIONER_PYTHON_PREFER_32_BIT", "1"); 427 env.insert("VERSIONER_PYTHON_PREFER_32_BIT", "1");
430 } 428 }
431 #endif 429 #endif
432 430
433 env.insert("LANG", "en_US.utf8"); 431 env.insert("LANG", "en_US.utf8");