Mercurial > hg
comparison hgext/largefiles/lfcommands.py @ 17299:e51d4aedace9 stable
check-code: indent 4 spaces in py files
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 31 Jul 2012 03:30:42 +0200 |
| parents | 88ff28bcd980 |
| children | e7cfe3587ea4 1572fd8af69d |
comparison
equal
deleted
inserted
replaced
| 17298:59c14bf5a48c | 17299:e51d4aedace9 |
|---|---|
| 119 if not success: | 119 if not success: |
| 120 # we failed, remove the new directory | 120 # we failed, remove the new directory |
| 121 shutil.rmtree(rdst.root) | 121 shutil.rmtree(rdst.root) |
| 122 | 122 |
| 123 def _addchangeset(ui, rsrc, rdst, ctx, revmap): | 123 def _addchangeset(ui, rsrc, rdst, ctx, revmap): |
| 124 # Convert src parents to dst parents | 124 # Convert src parents to dst parents |
| 125 parents = _convertparents(ctx, revmap) | 125 parents = _convertparents(ctx, revmap) |
| 126 | 126 |
| 127 # Generate list of changed files | 127 # Generate list of changed files |
| 128 files = _getchangedfiles(ctx, parents) | 128 files = _getchangedfiles(ctx, parents) |
| 129 | 129 |
| 504 if state == 'n': | 504 if state == 'n': |
| 505 # When rebasing, we need to synchronize the standin and the largefile, | 505 # When rebasing, we need to synchronize the standin and the largefile, |
| 506 # because otherwise the largefile will get reverted. But for commit's | 506 # because otherwise the largefile will get reverted. But for commit's |
| 507 # sake, we have to mark the file as unclean. | 507 # sake, we have to mark the file as unclean. |
| 508 if getattr(repo, "_isrebasing", False): | 508 if getattr(repo, "_isrebasing", False): |
| 509 lfdirstate.normallookup(lfile) | 509 lfdirstate.normallookup(lfile) |
| 510 else: | 510 else: |
| 511 lfdirstate.normal(lfile) | 511 lfdirstate.normal(lfile) |
| 512 elif state == 'r': | 512 elif state == 'r': |
| 513 lfdirstate.remove(lfile) | 513 lfdirstate.remove(lfile) |
| 514 elif state == 'a': | 514 elif state == 'a': |