@@ 28,11 28,11 @@ Returns a tuple with revision (as int) a
# Code for Mercurial
hg_output = subprocess.check_output(["hg", "summary"])
- hg_output = hg_output.decode("latin1")
+ hg_output = hg_output.decode("utf-8")
for line in hg_output.splitlines():
- m = re.match(r"parent:\s*(\d+):([0-9a-zA-Z]+)\s+.*", line)
+ m = re.match(r"(parent|förälder):\s*(\d+):([0-9a-zA-Z]+)\s+.*", line)
if m:
- return (int(m.group(1)), m.group(2))
+ return (int(m.group(2)), m.group(3))
# Code for Git
#current_branch = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).decode("utf-8").strip()