equal
deleted
inserted
replaced
85 |
85 |
86 import mercurial |
86 import mercurial |
87 from mercurial import util |
87 from mercurial import util |
88 from mercurial import repair |
88 from mercurial import repair |
89 |
89 |
90 try: |
90 from mercurial import obsolete |
91 from mercurial import obsolete |
91 if not obsolete._enabled: |
92 if not obsolete._enabled: |
92 obsolete._enabled = True |
93 obsolete._enabled = True |
|
94 from mercurial import wireproto |
|
95 gboptslist = getattr(wireproto, 'gboptslist', None) |
|
96 gboptsmap = getattr(wireproto, 'gboptsmap', None) |
|
97 except (ImportError, AttributeError): |
|
98 gboptslist = gboptsmap = None |
|
99 |
93 |
100 # Flags for enabling optional parts of evolve |
94 # Flags for enabling optional parts of evolve |
101 commandopt = 'allnewcommands' |
95 commandopt = 'allnewcommands' |
102 |
96 |
103 from mercurial import ( |
97 from mercurial import ( |
3682 common = findcommonobsmarkers(repo.ui, repo, remote, revs) |
3676 common = findcommonobsmarkers(repo.ui, repo, remote, revs) |
3683 return {'heads': pullop.pulledsubset, 'common': common} |
3677 return {'heads': pullop.pulledsubset, 'common': common} |
3684 |
3678 |
3685 @eh.uisetup |
3679 @eh.uisetup |
3686 def addgetbundleargs(self): |
3680 def addgetbundleargs(self): |
3687 gboptsmap['evo_obscommon'] = 'nodes' |
3681 wireproto.gboptsmap['evo_obscommon'] = 'nodes' |
3688 |
3682 |
3689 @eh.wrapfunction(exchange, '_pullbundle2extraprepare') |
3683 @eh.wrapfunction(exchange, '_pullbundle2extraprepare') |
3690 def _addobscommontob2pull(orig, pullop, kwargs): |
3684 def _addobscommontob2pull(orig, pullop, kwargs): |
3691 ret = orig(pullop, kwargs) |
3685 ret = orig(pullop, kwargs) |
3692 if ('obsmarkers' in kwargs and |
3686 if ('obsmarkers' in kwargs and |