Mercurial > hg-stable
comparison mercurial/bundlerepo.py @ 18142:11d1a9143adb
merge with stable
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 28 Dec 2012 11:55:45 +0100 |
| parents | 6db318a15a12 8ab0640c3090 |
| children | 5e851ca54189 |
comparison
equal
deleted
inserted
replaced
| 18137:d8e7b3a14957 | 18142:11d1a9143adb |
|---|---|
| 350 try: | 350 try: |
| 351 if bundlename: | 351 if bundlename: |
| 352 os.unlink(bundlename) | 352 os.unlink(bundlename) |
| 353 except OSError: | 353 except OSError: |
| 354 pass | 354 pass |
| 355 return other, [], other.close | 355 return repo, [], other.close |
| 356 | 356 |
| 357 bundle = None | 357 bundle = None |
| 358 bundlerepo = None | 358 bundlerepo = None |
| 359 localrepo = other.local() | 359 localrepo = other.local() |
| 360 if bundlename or not localrepo: | 360 if bundlename or not localrepo: |