| indygreg |
| hg-reviewers |
The inhibit extension lives in hg-experimental and is not a core extension.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/infinitepush/__init__.py (18 lines) |
| if bookmark not in fetchedbookmarks: | if bookmark not in fetchedbookmarks: | ||||
| raise error.Abort('remote bookmark %s not found!' % | raise error.Abort('remote bookmark %s not found!' % | ||||
| bookmark) | bookmark) | ||||
| scratchbookmarks[bookmark] = fetchedbookmarks[bookmark] | scratchbookmarks[bookmark] = fetchedbookmarks[bookmark] | ||||
| revs.append(fetchedbookmarks[bookmark]) | revs.append(fetchedbookmarks[bookmark]) | ||||
| opts['bookmark'] = bookmarks | opts['bookmark'] = bookmarks | ||||
| opts['rev'] = revs | opts['rev'] = revs | ||||
| try: | |||||
| inhibitmod = extensions.find('inhibit') | |||||
| except KeyError: | |||||
| # Ignore if inhibit is not enabled | |||||
| pass | |||||
| else: | |||||
| # Pulling revisions that were filtered results in a error. | |||||
| # Let's inhibit them | |||||
| unfi = repo.unfiltered() | |||||
| for rev in opts.get('rev', []): | |||||
| try: | |||||
| repo[rev] | |||||
| except error.FilteredRepoLookupError: | |||||
| node = unfi[rev].node() | |||||
| inhibitmod.revive([repo.unfiltered()[node]]) | |||||
| except error.RepoLookupError: | |||||
| pass | |||||
| if scratchbookmarks or unknownnodes: | if scratchbookmarks or unknownnodes: | ||||
| # Set anyincoming to True | # Set anyincoming to True | ||||
| extensions.wrapfunction(discovery, 'findcommonincoming', | extensions.wrapfunction(discovery, 'findcommonincoming', | ||||
| _findcommonincoming) | _findcommonincoming) | ||||
| try: | try: | ||||
| # Remote scratch bookmarks will be deleted because remotenames doesn't | # Remote scratch bookmarks will be deleted because remotenames doesn't | ||||
| # know about them. Let's save it before pull and restore after | # know about them. Let's save it before pull and restore after | ||||
| remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, source) | remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, source) | ||||