equal
deleted
inserted
replaced
102 ) |
102 ) |
103 return False, None |
103 return False, None |
104 |
104 |
105 streamreqs = set(streamreqs.split(b',')) |
105 streamreqs = set(streamreqs.split(b',')) |
106 # Server requires something we don't support. Bail. |
106 # Server requires something we don't support. Bail. |
107 missingreqs = streamreqs - repo.supportedformats |
107 missingreqs = streamreqs - repo.supported |
108 if missingreqs: |
108 if missingreqs: |
109 pullop.repo.ui.warn( |
109 pullop.repo.ui.warn( |
110 _( |
110 _( |
111 b'warning: stream clone requested but client is missing ' |
111 b'warning: stream clone requested but client is missing ' |
112 b'requirements: %s\n' |
112 b'requirements: %s\n' |
479 raise error.Abort( |
479 raise error.Abort( |
480 _(b'cannot apply stream clone bundle on non-empty repo') |
480 _(b'cannot apply stream clone bundle on non-empty repo') |
481 ) |
481 ) |
482 |
482 |
483 filecount, bytecount, requirements = readbundle1header(fp) |
483 filecount, bytecount, requirements = readbundle1header(fp) |
484 missingreqs = requirements - repo.supportedformats |
484 missingreqs = requirements - repo.supported |
485 if missingreqs: |
485 if missingreqs: |
486 raise error.Abort( |
486 raise error.Abort( |
487 _(b'unable to apply stream clone: unsupported format: %s') |
487 _(b'unable to apply stream clone: unsupported format: %s') |
488 % b', '.join(sorted(missingreqs)) |
488 % b', '.join(sorted(missingreqs)) |
489 ) |
489 ) |