equal
deleted
inserted
replaced
833 pullop.repo.ui.status(_("no changes found\n")) |
833 pullop.repo.ui.status(_("no changes found\n")) |
834 pullop.cgresult = 0 |
834 pullop.cgresult = 0 |
835 else: |
835 else: |
836 if pullop.heads is None and list(pullop.common) == [nullid]: |
836 if pullop.heads is None and list(pullop.common) == [nullid]: |
837 pullop.repo.ui.status(_("requesting all changes\n")) |
837 pullop.repo.ui.status(_("requesting all changes\n")) |
|
838 if obsolete._enabled: |
|
839 remoteversions = bundle2.obsmarkersversion(remotecaps) |
|
840 if obsolete.commonversion(remoteversions) is not None: |
|
841 kwargs['obsmarkers'] = True |
|
842 pullop.todosteps.remove('obsmarkers') |
838 _pullbundle2extraprepare(pullop, kwargs) |
843 _pullbundle2extraprepare(pullop, kwargs) |
839 if kwargs.keys() == ['format']: |
844 if kwargs.keys() == ['format']: |
840 return # nothing to pull |
845 return # nothing to pull |
841 bundle = pullop.remote.getbundle('pull', **kwargs) |
846 bundle = pullop.remote.getbundle('pull', **kwargs) |
842 try: |
847 try: |