Since this means moving the function into a subdirectory, we have to
compensate by adding another layer of os.path.dirname().
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/util.py (8 lines) | |||
| M | mercurial/utils/resourceutil.py (9 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| b.reverse() | b.reverse() | ||||
| while a and b and a[-1] == b[-1]: | while a and b and a[-1] == b[-1]: | ||||
| a.pop() | a.pop() | ||||
| b.pop() | b.pop() | ||||
| b.reverse() | b.reverse() | ||||
| return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.' | return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.' | ||||
| # the location of data files matching the source code | datapath = resourceutil.datapath | ||||
| if resourceutil.mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app': | |||||
| # executable version (py2exe) doesn't support __file__ | |||||
| datapath = os.path.dirname(pycompat.sysexecutable) | |||||
| else: | |||||
| datapath = os.path.dirname(pycompat.fsencode(__file__)) | |||||
| i18n.setdatapath(datapath) | i18n.setdatapath(datapath) | ||||
| def checksignature(func): | def checksignature(func): | ||||
| '''wrap a function with code to check for calling errors''' | '''wrap a function with code to check for calling errors''' | ||||
| def check(*args, **kwargs): | def check(*args, **kwargs): | ||||
| try: | try: | ||||
| # resourceutil.py - utility for looking up resources | # resourceutil.py - utility for looking up resources | ||||
| # | # | ||||
| # Copyright 2005 K. Thananchayan <thananck@yahoo.com> | # Copyright 2005 K. Thananchayan <thananck@yahoo.com> | ||||
| # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||||
| # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import imp | import imp | ||||
| import os | |||||
| import sys | import sys | ||||
| from .. import ( | from .. import ( | ||||
| pycompat, | pycompat, | ||||
| ) | ) | ||||
| def mainfrozen(): | def mainfrozen(): | ||||
| """return True if we are a frozen executable. | """return True if we are a frozen executable. | ||||
| The code supports py2exe (most common, Windows only) and tools/freeze | The code supports py2exe (most common, Windows only) and tools/freeze | ||||
| (portable, not much used). | (portable, not much used). | ||||
| """ | """ | ||||
| return ( | return ( | ||||
| pycompat.safehasattr(sys, "frozen") | pycompat.safehasattr(sys, "frozen") | ||||
| or pycompat.safehasattr(sys, "importers") # new py2exe | or pycompat.safehasattr(sys, "importers") # new py2exe | ||||
| or imp.is_frozen("__main__") # old py2exe | or imp.is_frozen("__main__") # old py2exe | ||||
| ) # tools/freeze | ) # tools/freeze | ||||
| # the location of data files matching the source code | |||||
| if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app': | |||||
| # executable version (py2exe) doesn't support __file__ | |||||
| datapath = os.path.dirname(pycompat.sysexecutable) | |||||
| else: | |||||
| datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__))) | |||||