| krbullock |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/patchbomb.py (4 lines) | |||
| M | mercurial/bundle2.py (2 lines) | |||
| M | mercurial/dispatch.py (2 lines) |
| if outgoing: | if outgoing: | ||||
| revs = _getoutgoing(repo, dest, revs) | revs = _getoutgoing(repo, dest, revs) | ||||
| if bundle: | if bundle: | ||||
| opts['revs'] = [str(r) for r in revs] | opts['revs'] = [str(r) for r in revs] | ||||
| # check if revision exist on the public destination | # check if revision exist on the public destination | ||||
| publicurl = repo.ui.config('patchbomb', 'publicurl') | publicurl = repo.ui.config('patchbomb', 'publicurl') | ||||
| if publicurl: | if publicurl: | ||||
| repo.ui.debug('checking that revision exist in the public repo') | repo.ui.debug('checking that revision exist in the public repo\n') | ||||
| try: | try: | ||||
| publicpeer = hg.peer(repo, {}, publicurl) | publicpeer = hg.peer(repo, {}, publicurl) | ||||
| except error.RepoError: | except error.RepoError: | ||||
| repo.ui.write_err(_('unable to access public repo: %s\n') | repo.ui.write_err(_('unable to access public repo: %s\n') | ||||
| % publicurl) | % publicurl) | ||||
| raise | raise | ||||
| if not publicpeer.capable('known'): | if not publicpeer.capable('known'): | ||||
| repo.ui.debug('skipping existence checks: public repo too old') | repo.ui.debug('skipping existence checks: public repo too old\n') | ||||
| else: | else: | ||||
| out = [repo[r] for r in revs] | out = [repo[r] for r in revs] | ||||
| known = publicpeer.known(h.node() for h in out) | known = publicpeer.known(h.node() for h in out) | ||||
| missing = [] | missing = [] | ||||
| for idx, h in enumerate(out): | for idx, h in enumerate(out): | ||||
| if not known[idx]: | if not known[idx]: | ||||
| missing.append(h) | missing.append(h) | ||||
| if missing: | if missing: | ||||
| tr = op.gettransaction() | tr = op.gettransaction() | ||||
| markerdata = inpart.read() | markerdata = inpart.read() | ||||
| if op.ui.config('experimental', 'obsmarkers-exchange-debug'): | if op.ui.config('experimental', 'obsmarkers-exchange-debug'): | ||||
| op.ui.write(('obsmarker-exchange: %i bytes received\n') | op.ui.write(('obsmarker-exchange: %i bytes received\n') | ||||
| % len(markerdata)) | % len(markerdata)) | ||||
| # The mergemarkers call will crash if marker creation is not enabled. | # The mergemarkers call will crash if marker creation is not enabled. | ||||
| # we want to avoid this if the part is advisory. | # we want to avoid this if the part is advisory. | ||||
| if not inpart.mandatory and op.repo.obsstore.readonly: | if not inpart.mandatory and op.repo.obsstore.readonly: | ||||
| op.repo.ui.debug('ignoring obsolescence markers, feature not enabled') | op.repo.ui.debug('ignoring obsolescence markers, feature not enabled\n') | ||||
| return | return | ||||
| new = op.repo.obsstore.mergemarkers(tr, markerdata) | new = op.repo.obsstore.mergemarkers(tr, markerdata) | ||||
| op.repo.invalidatevolatilesets() | op.repo.invalidatevolatilesets() | ||||
| if new: | if new: | ||||
| op.repo.ui.status(_('%i new obsolescence markers\n') % new) | op.repo.ui.status(_('%i new obsolescence markers\n') % new) | ||||
| op.records.add('obsmarkers', {'new': new}) | op.records.add('obsmarkers', {'new': new}) | ||||
| if op.reply is not None: | if op.reply is not None: | ||||
| rpart = op.reply.newpart('reply:obsmarkers') | rpart = op.reply.newpart('reply:obsmarkers') | ||||
| env = {'HG_ARGS': ' '.join((self.name,) + args)} | env = {'HG_ARGS': ' '.join((self.name,) + args)} | ||||
| def _checkvar(m): | def _checkvar(m): | ||||
| if m.groups()[0] == '$': | if m.groups()[0] == '$': | ||||
| return m.group() | return m.group() | ||||
| elif int(m.groups()[0]) <= len(args): | elif int(m.groups()[0]) <= len(args): | ||||
| return m.group() | return m.group() | ||||
| else: | else: | ||||
| ui.debug("No argument found for substitution " | ui.debug("No argument found for substitution " | ||||
| "of %i variable in alias '%s' definition." | "of %i variable in alias '%s' definition.\n" | ||||
| % (int(m.groups()[0]), self.name)) | % (int(m.groups()[0]), self.name)) | ||||
| return '' | return '' | ||||
| cmd = re.sub(br'\$(\d+|\$)', _checkvar, self.definition[1:]) | cmd = re.sub(br'\$(\d+|\$)', _checkvar, self.definition[1:]) | ||||
| cmd = aliasinterpolate(self.name, args, cmd) | cmd = aliasinterpolate(self.name, args, cmd) | ||||
| return ui.system(cmd, environ=env, | return ui.system(cmd, environ=env, | ||||
| blockedtag='alias_%s' % self.name) | blockedtag='alias_%s' % self.name) | ||||
| self.fn = fn | self.fn = fn | ||||
| return | return | ||||