From 3130343156e03bf11196d42f6a8d205e538f89d3 Mon Sep 17 00:00:00 2001 From: Sean Farley Date: Tue, 6 Jan 2015 17:19:08 -0800 Subject: [PATCH] push: add a hack to re-hide changes when pushing --- remotenames.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/remotenames.py b/remotenames.py index 3b3e8135a4..246a78d379 100644 --- a/remotenames.py +++ b/remotenames.py @@ -18,6 +18,9 @@ _remotenames = {} _remotetypes = {} 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) lock = repo.lock() try: @@ -37,6 +40,7 @@ def expush(orig, repo, remote, *args, **kwargs): ui.debug('remote branches for path %s not saved: %s\n' % (path, e)) finally: + repo.__setattr__('_hackremotenamepush', False) lock.release() return res @@ -59,6 +63,10 @@ def expull(orig, repo, remote, *args, **kwargs): def blockerhook(orig, repo, *args, **kwargs): blockers = orig(repo) + if util.safehasattr(repo, '_hackremotenamepush') and \ + repo._hackremotenamepush: + return blockers + # add remotenames to blockers cl = repo.changelog ns = repo.names["remotenames"]