diff options
| author | paugier <pierre.augier@univ-grenoble-alpes.fr> | 2021-03-18 15:05:17 +0100 |
|---|---|---|
| committer | paugier <pierre.augier@univ-grenoble-alpes.fr> | 2021-03-18 15:05:17 +0100 |
| commit | 982fee546f1eabf73354621af668f433f5c24ed2 (patch) | |
| tree | 2637fad56380989046f8d803dcc41a11bd5f7629 /src/setuptools_scm/hg_git.py | |
| parent | a2a2a2b222b0b3555b0f725bc2307e8995d4514d (diff) | |
| download | setuptools-scm-982fee546f1eabf73354621af668f433f5c24ed2.tar.gz | |
Match in hg-git describe + addre TODOs
Diffstat (limited to 'src/setuptools_scm/hg_git.py')
| -rw-r--r-- | src/setuptools_scm/hg_git.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/setuptools_scm/hg_git.py b/src/setuptools_scm/hg_git.py index 56f3ba4..3702818 100644 --- a/src/setuptools_scm/hg_git.py +++ b/src/setuptools_scm/hg_git.py @@ -78,7 +78,14 @@ class GitWorkdirHgClient(GitWorkdir, HgWorkdir): """ hg_tags, _, ret = self.do_ex( - "hg log -r reverse(ancestors(.)) -T {tags}{if(tags, ' ', '')}" + [ + "hg", + "log", + "-r", + "(reverse(ancestors(.)) and tag(r're:[0-9]'))", + "-T", + "{tags}{if(tags, ' ', '')}", + ] ) if ret: return None, None, None @@ -91,7 +98,6 @@ class GitWorkdirHgClient(GitWorkdir, HgWorkdir): git_tags[tag] = node # find the first hg tag which is also a git tag - # TODO: also check for match *[0-9]* for tag in hg_tags: if tag in git_tags: break |