Show More
@@ -33,7 +33,6 b' import mercurial.node' | |||
|
33 | 33 | import simplejson as json |
|
34 | 34 | |
|
35 | 35 | from vcsserver import exceptions, subprocessio, settings |
|
36 | from vcsserver.hgcompat import get_ctx | |
|
37 | 36 | |
|
38 | 37 | log = logging.getLogger(__name__) |
|
39 | 38 | |
@@ -184,6 +183,7 b' def _extras_from_ui(ui):' | |||
|
184 | 183 | |
|
185 | 184 | |
|
186 | 185 | def _rev_range_hash(repo, node, check_heads=False): |
|
186 | from vcsserver.hgcompat import get_ctx | |
|
187 | 187 | |
|
188 | 188 | commits = [] |
|
189 | 189 | revs = [] |
@@ -203,6 +203,7 b' def _rev_range_hash(repo, node, check_he' | |||
|
203 | 203 | |
|
204 | 204 | |
|
205 | 205 | def _check_heads(repo, start, end, commits): |
|
206 | from vcsserver.hgcompat import get_ctx | |
|
206 | 207 | changelog = repo.changelog |
|
207 | 208 | parents = set() |
|
208 | 209 | |
@@ -393,6 +394,7 b' def post_push_ssh(ui, repo, node, **kwar' | |||
|
393 | 394 | |
|
394 | 395 | |
|
395 | 396 | def key_push(ui, repo, **kwargs): |
|
397 | from vcsserver.hgcompat import get_ctx | |
|
396 | 398 | if kwargs['new'] != '0' and kwargs['namespace'] == 'bookmarks': |
|
397 | 399 | # store new bookmarks in our UI object propagated later to post_push |
|
398 | 400 | ui._rc_pushkey_branches = get_ctx(repo, kwargs['key']).bookmarks() |
General Comments 0
You need to be logged in to leave comments.
Login now