Mercurial > hg
comparison hgext/largefiles/overrides.py @ 45682:d2e1dcd4490d
errors: name arguments to Abort constructor
Differential Revision: https://phab.mercurial-scm.org/D9179
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 08 Oct 2020 13:37:31 -0700 |
parents | 2c86b9587740 |
children | 89a2afe31e82 |
comparison
equal
deleted
inserted
replaced
45681:a736ab681b78 | 45682:d2e1dcd4490d |
---|---|
732 | 732 |
733 with extensions.wrappedfunction(scmutil, b'match', normalfilesmatchfn): | 733 with extensions.wrappedfunction(scmutil, b'match', normalfilesmatchfn): |
734 try: | 734 try: |
735 result = orig(ui, repo, pats, opts, rename) | 735 result = orig(ui, repo, pats, opts, rename) |
736 except error.Abort as e: | 736 except error.Abort as e: |
737 if pycompat.bytestr(e) != _(b'no files to copy'): | 737 if e.message != _(b'no files to copy'): |
738 raise e | 738 raise e |
739 else: | 739 else: |
740 nonormalfiles = True | 740 nonormalfiles = True |
741 result = 0 | 741 result = 0 |
742 | 742 |
849 util.copyfile(repo.wjoin(srclfile), repo.wjoin(destlfile)) | 849 util.copyfile(repo.wjoin(srclfile), repo.wjoin(destlfile)) |
850 | 850 |
851 lfdirstate.add(destlfile) | 851 lfdirstate.add(destlfile) |
852 lfdirstate.write() | 852 lfdirstate.write() |
853 except error.Abort as e: | 853 except error.Abort as e: |
854 if pycompat.bytestr(e) != _(b'no files to copy'): | 854 if e.message != _(b'no files to copy'): |
855 raise e | 855 raise e |
856 else: | 856 else: |
857 nolfiles = True | 857 nolfiles = True |
858 finally: | 858 finally: |
859 wlock.release() | 859 wlock.release() |