hgext/largefiles/overrides.py
changeset 36653 2f7a3c90c0d7
parent 36400 7b86aa31b004
child 36736 5c72b52d3dd0
equal deleted inserted replaced
36652:8381126bf43c 36653:2f7a3c90c0d7
   596     nolfiles = False
   596     nolfiles = False
   597     installnormalfilesmatchfn(repo[None].manifest())
   597     installnormalfilesmatchfn(repo[None].manifest())
   598     try:
   598     try:
   599         result = orig(ui, repo, pats, opts, rename)
   599         result = orig(ui, repo, pats, opts, rename)
   600     except error.Abort as e:
   600     except error.Abort as e:
   601         if str(e) != _('no files to copy'):
   601         if pycompat.bytestr(e) != _('no files to copy'):
   602             raise e
   602             raise e
   603         else:
   603         else:
   604             nonormalfiles = True
   604             nonormalfiles = True
   605         result = 0
   605         result = 0
   606     finally:
   606     finally:
   703                                   repo.wjoin(destlfile))
   703                                   repo.wjoin(destlfile))
   704 
   704 
   705                 lfdirstate.add(destlfile)
   705                 lfdirstate.add(destlfile)
   706         lfdirstate.write()
   706         lfdirstate.write()
   707     except error.Abort as e:
   707     except error.Abort as e:
   708         if str(e) != _('no files to copy'):
   708         if pycompat.bytestr(e) != _('no files to copy'):
   709             raise e
   709             raise e
   710         else:
   710         else:
   711             nolfiles = True
   711             nolfiles = True
   712     finally:
   712     finally:
   713         restorematchfn()
   713         restorematchfn()