Show More
@@ -1151,8 +1151,8 b' def _pushsyncphase(pushop):' | |||
|
1151 | 1151 | for newremotehead in outdated: |
|
1152 | 1152 | r = pushop.remote.pushkey('phases', |
|
1153 | 1153 | newremotehead.hex(), |
|
1154 |
|
|
|
1155 |
|
|
|
1154 | ('%d' % phases.draft), | |
|
1155 | ('%d' % phases.public)) | |
|
1156 | 1156 | if not r: |
|
1157 | 1157 | pushop.ui.warn(_('updating %s to public failed!\n') |
|
1158 | 1158 | % newremotehead) |
@@ -656,7 +656,7 b' class obsstore(object):' | |||
|
656 | 656 | self.caches.clear() |
|
657 | 657 | # records the number of new markers for the transaction hooks |
|
658 | 658 | previous = int(transaction.hookargs.get('new_obsmarkers', '0')) |
|
659 |
transaction.hookargs['new_obsmarkers'] = |
|
|
659 | transaction.hookargs['new_obsmarkers'] = '%d' % (previous + len(new)) | |
|
660 | 660 | return len(new) |
|
661 | 661 | |
|
662 | 662 | def mergemarkers(self, transaction, data): |
@@ -566,7 +566,7 b' class filestore(object):' | |||
|
566 | 566 | root = tempfile.mkdtemp(prefix='hg-patch-') |
|
567 | 567 | self.opener = vfsmod.vfs(root) |
|
568 | 568 | # Avoid filename issues with these simple names |
|
569 |
fn = |
|
|
569 | fn = '%d' % self.created | |
|
570 | 570 | self.opener.write(fn, data) |
|
571 | 571 | self.created += 1 |
|
572 | 572 | self.files[fname] = (fn, mode, copied) |
General Comments 0
You need to be logged in to leave comments.
Login now