Mercurial > hg
comparison hgext/largefiles/overrides.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 | eac3f9c2f9c5 |
| children | e7cfe3587ea4 a0ee6d846185 98d6a10bc401 |
comparison
equal
deleted
inserted
replaced
| 17298:59c14bf5a48c | 17299:e51d4aedace9 |
|---|---|
| 665 revsprepull = len(repo) | 665 revsprepull = len(repo) |
| 666 if opts.get('rebase', False): | 666 if opts.get('rebase', False): |
| 667 repo._isrebasing = True | 667 repo._isrebasing = True |
| 668 try: | 668 try: |
| 669 if opts.get('update'): | 669 if opts.get('update'): |
| 670 del opts['update'] | 670 del opts['update'] |
| 671 ui.debug('--update and --rebase are not compatible, ignoring ' | 671 ui.debug('--update and --rebase are not compatible, ignoring ' |
| 672 'the update flag\n') | 672 'the update flag\n') |
| 673 del opts['rebase'] | 673 del opts['rebase'] |
| 674 cmdutil.bailifchanged(repo) | 674 cmdutil.bailifchanged(repo) |
| 675 origpostincoming = commands.postincoming | 675 origpostincoming = commands.postincoming |
| 676 def _dummy(*args, **kwargs): | 676 def _dummy(*args, **kwargs): |
| 677 pass | 677 pass |