| indygreg |
| hg-reviewers |
I decided to grep around for \sstr\( and see what low-hanging fruit
that showed me. This was part of that hunt. That grep pattern still
has some things worth exploring.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/exchange.py (4 lines) | |||
| M | mercurial/obsolete.py (2 lines) | |||
| M | mercurial/patch.py (2 lines) | |||
| M | mercurial/progress.py (2 lines) |
| pushop.stepsdone.add('phases') | pushop.stepsdone.add('phases') | ||||
| # filter heads already turned public by the push | # filter heads already turned public by the push | ||||
| outdated = [c for c in outdated if c.node() not in pheads] | outdated = [c for c in outdated if c.node() not in pheads] | ||||
| # fallback to independent pushkey command | # fallback to independent pushkey command | ||||
| for newremotehead in outdated: | for newremotehead in outdated: | ||||
| r = pushop.remote.pushkey('phases', | r = pushop.remote.pushkey('phases', | ||||
| newremotehead.hex(), | newremotehead.hex(), | ||||
| str(phases.draft), | ('%d' % phases.draft), | ||||
| str(phases.public)) | ('%d' % phases.public)) | ||||
| if not r: | if not r: | ||||
| pushop.ui.warn(_('updating %s to public failed!\n') | pushop.ui.warn(_('updating %s to public failed!\n') | ||||
| % newremotehead) | % newremotehead) | ||||
| def _localphasemove(pushop, nodes, phase=phases.public): | def _localphasemove(pushop, nodes, phase=phases.public): | ||||
| """move <nodes> to <phase> in the local source repo""" | """move <nodes> to <phase> in the local source repo""" | ||||
| if pushop.trmanager: | if pushop.trmanager: | ||||
| phases.advanceboundary(pushop.repo, | phases.advanceboundary(pushop.repo, | ||||
| addedmarkers = transaction.changes.get('obsmarkers') | addedmarkers = transaction.changes.get('obsmarkers') | ||||
| if addedmarkers is not None: | if addedmarkers is not None: | ||||
| addedmarkers.update(new) | addedmarkers.update(new) | ||||
| self._addmarkers(new, data) | self._addmarkers(new, data) | ||||
| # new marker *may* have changed several set. invalidate the cache. | # new marker *may* have changed several set. invalidate the cache. | ||||
| self.caches.clear() | self.caches.clear() | ||||
| # records the number of new markers for the transaction hooks | # records the number of new markers for the transaction hooks | ||||
| previous = int(transaction.hookargs.get('new_obsmarkers', '0')) | previous = int(transaction.hookargs.get('new_obsmarkers', '0')) | ||||
| transaction.hookargs['new_obsmarkers'] = str(previous + len(new)) | transaction.hookargs['new_obsmarkers'] = '%d' % (previous + len(new)) | ||||
| return len(new) | return len(new) | ||||
| def mergemarkers(self, transaction, data): | def mergemarkers(self, transaction, data): | ||||
| """merge a binary stream of markers inside the obsstore | """merge a binary stream of markers inside the obsstore | ||||
| Returns the number of new markers added.""" | Returns the number of new markers added.""" | ||||
| version, markers = _readmarkers(data) | version, markers = _readmarkers(data) | ||||
| return self.add(transaction, markers) | return self.add(transaction, markers) | ||||
| if self.maxsize < 0 or (len(data) + self.size) <= self.maxsize: | if self.maxsize < 0 or (len(data) + self.size) <= self.maxsize: | ||||
| self.data[fname] = (data, mode, copied) | self.data[fname] = (data, mode, copied) | ||||
| self.size += len(data) | self.size += len(data) | ||||
| else: | else: | ||||
| if self.opener is None: | if self.opener is None: | ||||
| root = tempfile.mkdtemp(prefix='hg-patch-') | root = tempfile.mkdtemp(prefix='hg-patch-') | ||||
| self.opener = vfsmod.vfs(root) | self.opener = vfsmod.vfs(root) | ||||
| # Avoid filename issues with these simple names | # Avoid filename issues with these simple names | ||||
| fn = str(self.created) | fn = '%d' % self.created | ||||
| self.opener.write(fn, data) | self.opener.write(fn, data) | ||||
| self.created += 1 | self.created += 1 | ||||
| self.files[fname] = (fn, mode, copied) | self.files[fname] = (fn, mode, copied) | ||||
| def getfile(self, fname): | def getfile(self, fname): | ||||
| if fname in self.data: | if fname in self.data: | ||||
| return self.data[fname] | return self.data[fname] | ||||
| if not self.opener or fname not in self.files: | if not self.opener or fname not in self.files: | ||||
| for indicator in self.order: | for indicator in self.order: | ||||
| add = '' | add = '' | ||||
| if indicator == 'topic': | if indicator == 'topic': | ||||
| add = topic | add = topic | ||||
| elif indicator == 'number': | elif indicator == 'number': | ||||
| if total: | if total: | ||||
| add = b'%*d/%d' % (len(str(total)), pos, total) | add = b'%*d/%d' % (len(str(total)), pos, total) | ||||
| else: | else: | ||||
| add = str(pos) | add = b'%d' % pos | ||||
| elif indicator.startswith('item') and item: | elif indicator.startswith('item') and item: | ||||
| slice = 'end' | slice = 'end' | ||||
| if '-' in indicator: | if '-' in indicator: | ||||
| wid = int(indicator.split('-')[1]) | wid = int(indicator.split('-')[1]) | ||||
| elif '+' in indicator: | elif '+' in indicator: | ||||
| slice = 'beginning' | slice = 'beginning' | ||||
| wid = int(indicator.split('+')[1]) | wid = int(indicator.split('+')[1]) | ||||
| else: | else: | ||||