mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
push: add a hack to re-hide changes when pushing
This commit is contained in:
parent
04d2a4729a
commit
3130343156
@ -18,6 +18,9 @@ _remotenames = {}
|
|||||||
_remotetypes = {}
|
_remotetypes = {}
|
||||||
|
|
||||||
def expush(orig, repo, remote, *args, **kwargs):
|
def expush(orig, repo, remote, *args, **kwargs):
|
||||||
|
# hack for pushing that turns off the dynamic blockerhook
|
||||||
|
repo.__setattr__('_hackremotenamepush', True)
|
||||||
|
|
||||||
res = orig(repo, remote, *args, **kwargs)
|
res = orig(repo, remote, *args, **kwargs)
|
||||||
lock = repo.lock()
|
lock = repo.lock()
|
||||||
try:
|
try:
|
||||||
@ -37,6 +40,7 @@ def expush(orig, repo, remote, *args, **kwargs):
|
|||||||
ui.debug('remote branches for path %s not saved: %s\n'
|
ui.debug('remote branches for path %s not saved: %s\n'
|
||||||
% (path, e))
|
% (path, e))
|
||||||
finally:
|
finally:
|
||||||
|
repo.__setattr__('_hackremotenamepush', False)
|
||||||
lock.release()
|
lock.release()
|
||||||
return res
|
return res
|
||||||
|
|
||||||
@ -59,6 +63,10 @@ def expull(orig, repo, remote, *args, **kwargs):
|
|||||||
def blockerhook(orig, repo, *args, **kwargs):
|
def blockerhook(orig, repo, *args, **kwargs):
|
||||||
blockers = orig(repo)
|
blockers = orig(repo)
|
||||||
|
|
||||||
|
if util.safehasattr(repo, '_hackremotenamepush') and \
|
||||||
|
repo._hackremotenamepush:
|
||||||
|
return blockers
|
||||||
|
|
||||||
# add remotenames to blockers
|
# add remotenames to blockers
|
||||||
cl = repo.changelog
|
cl = repo.changelog
|
||||||
ns = repo.names["remotenames"]
|
ns = repo.names["remotenames"]
|
||||||
|
Loading…
Reference in New Issue
Block a user