aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2016-08-27 06:42:35 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2016-08-27 13:42:35 +0300
commitae126565559bd9053a2f254767094b49d3e69ca4 (patch)
treeaf6f6fc7267867674188d128b70a5880a142411b
parent4e050c3d9b545a8c8e136d5c8e7eb9cee988fbc6 (diff)
downloadmeson-ae126565559bd9053a2f254767094b49d3e69ca4.zip
meson-ae126565559bd9053a2f254767094b49d3e69ca4.tar.gz
meson-ae126565559bd9053a2f254767094b49d3e69ca4.tar.bz2
Use global id instead of local for hg tag. (#710)
-rw-r--r--mesonbuild/mesonlib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index 332ecf0..b5b5339 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -114,7 +114,7 @@ def exe_exists(arglist):
def detect_vcs(source_dir):
vcs_systems = [
dict(name = 'git', cmd = 'git', repo_dir = '.git', get_rev = 'git describe --dirty=+', rev_regex = '(.*)', dep = '.git/logs/HEAD'),
- dict(name = 'mercurial', cmd = 'hg', repo_dir = '.hg', get_rev = 'hg id -n', rev_regex = '(.*)', dep = '.hg/dirstate'),
+ dict(name = 'mercurial', cmd = 'hg', repo_dir = '.hg', get_rev = 'hg id -i', rev_regex = '(.*)', dep = '.hg/dirstate'),
dict(name = 'subversion', cmd = 'svn', repo_dir = '.svn', get_rev = 'svn info', rev_regex = 'Revision: (.*)', dep = '.svn/wc.db'),
dict(name = 'bazaar', cmd = 'bzr', repo_dir = '.bzr', get_rev = 'bzr revno', rev_regex = '(.*)', dep = '.bzr'),
]