Show More
@@ -791,24 +791,6 b' def _pull(orig, ui, repo, source="defaul' | |||||
791 | opts['bookmark'] = bookmarks |
|
791 | opts['bookmark'] = bookmarks | |
792 | opts['rev'] = revs |
|
792 | opts['rev'] = revs | |
793 |
|
793 | |||
794 | try: |
|
|||
795 | inhibitmod = extensions.find('inhibit') |
|
|||
796 | except KeyError: |
|
|||
797 | # Ignore if inhibit is not enabled |
|
|||
798 | pass |
|
|||
799 | else: |
|
|||
800 | # Pulling revisions that were filtered results in a error. |
|
|||
801 | # Let's inhibit them |
|
|||
802 | unfi = repo.unfiltered() |
|
|||
803 | for rev in opts.get('rev', []): |
|
|||
804 | try: |
|
|||
805 | repo[rev] |
|
|||
806 | except error.FilteredRepoLookupError: |
|
|||
807 | node = unfi[rev].node() |
|
|||
808 | inhibitmod.revive([repo.unfiltered()[node]]) |
|
|||
809 | except error.RepoLookupError: |
|
|||
810 | pass |
|
|||
811 |
|
||||
812 | if scratchbookmarks or unknownnodes: |
|
794 | if scratchbookmarks or unknownnodes: | |
813 | # Set anyincoming to True |
|
795 | # Set anyincoming to True | |
814 | extensions.wrapfunction(discovery, 'findcommonincoming', |
|
796 | extensions.wrapfunction(discovery, 'findcommonincoming', |
General Comments 0
You need to be logged in to leave comments.
Login now