equal
deleted
inserted
replaced
88 """ |
88 """ |
89 |
89 |
90 |
90 |
91 import collections |
91 import collections |
92 import contextlib |
92 import contextlib |
93 import errno |
|
94 import functools |
93 import functools |
95 import logging |
94 import logging |
96 import os |
95 import os |
97 import random |
96 import random |
98 import re |
97 import re |
1305 fp.close() |
1304 fp.close() |
1306 storebundle(op, part.params, bundlefile) |
1305 storebundle(op, part.params, bundlefile) |
1307 finally: |
1306 finally: |
1308 try: |
1307 try: |
1309 os.unlink(bundlefile) |
1308 os.unlink(bundlefile) |
1310 except OSError as e: |
1309 except FileNotFoundError: |
1311 if e.errno != errno.ENOENT: |
1310 pass |
1312 raise |
|
1313 |
1311 |
1314 return 1 |
1312 return 1 |
1315 |
1313 |
1316 |
1314 |
1317 def _maybeaddpushbackpart(op, bookmark, newnode, oldnode, params): |
1315 def _maybeaddpushbackpart(op, bookmark, newnode, oldnode, params): |