Skip to content
Snippets Groups Projects
Commit fbb869b9 authored by Kevin Bullock's avatar Kevin Bullock
Browse files

compat: drop phases.advanceboundary compatibility check

parent 4c827a9d
No related branches found
No related tags found
No related merge requests found
from mercurial import (
context,
phases,
templatekw,
ui,
url,
......@@ -46,13 +45,6 @@
# compat with hg < 3.9
return url.passwordmgr(ui)
def advancephaseboundary(repo, tr, targetphase, nodes):
# hg 3.2 - advanceboundary uses transaction
try:
phases.advanceboundary(repo, tr, targetphase, nodes)
except TypeError:
phases.advanceboundary(repo, targetphase, nodes)
# hg 4.3 - osutil moved, but mercurial.util re-exports listdir
if hgutil.safehasattr(hgutil, 'listdir'):
listdir = hgutil.listdir
......
......@@ -340,8 +340,8 @@
lock = self.repo.lock()
try:
tr = self.repo.transaction("phase")
compat.advancephaseboundary(self.repo, tr, phases.public,
blist)
phases.advanceboundary(self.repo, tr, phases.public,
blist)
tr.close()
finally:
if tr is not None:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment