Mercurial > hg
changeset 44156:414249be0362
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 24 Jan 2020 11:05:42 -0500 |
| parents | d1c0f239193f (current diff) 854607bf88a1 (diff) |
| children | 161958ebf73c |
| files | |
| diffstat | 7 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Wed Jan 15 15:08:42 2020 -0800 +++ b/.hgsigs Fri Jan 24 11:05:42 2020 -0500 @@ -190,3 +190,4 @@ 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
--- a/.hgtags Wed Jan 15 15:08:42 2020 -0800 +++ b/.hgtags Fri Jan 24 11:05:42 2020 -0500 @@ -203,3 +203,4 @@ a50fecefa691c9b72a99e49aa6fe9dd13943c2bf 5.2.1 b4c82b70418022e67cc0e69b1aa3c3aa43aa1d29 5.2.2 84a0102c05c7852c8215ef6cf21d809927586b69 5.3rc0 +e4344e463c0c888a2f437b78b5982ecdf3f6650a 5.3rc1
--- a/contrib/packaging/hgpackaging/py2exe.py Wed Jan 15 15:08:42 2020 -0800 +++ b/contrib/packaging/hgpackaging/py2exe.py Fri Jan 24 11:05:42 2020 -0500 @@ -45,7 +45,7 @@ ('doc/*.html', 'doc/'), ('doc/style.css', 'doc/'), ('mercurial/helptext/**/*.txt', 'helptext/'), - ('mercurial/defaultrc/*.rc', 'hgrc.d/'), + ('mercurial/defaultrc/*.rc', 'defaultrc/'), ('mercurial/locale/**/*', 'locale/'), ('mercurial/templates/**/*', 'Templates/'), ('COPYING', 'Copying.txt'), @@ -232,7 +232,7 @@ # Write out a default editor.rc file to configure notepad as the # default editor. - with (staging_dir / 'hgrc.d' / 'editor.rc').open( + with (staging_dir / 'defaultrc' / 'editor.rc').open( 'w', encoding='utf-8' ) as fh: fh.write('[ui]\neditor = notepad\n')
--- a/contrib/packaging/hgpackaging/wix.py Wed Jan 15 15:08:42 2020 -0800 +++ b/contrib/packaging/hgpackaging/wix.py Fri Jan 24 11:05:42 2020 -0500 @@ -37,7 +37,7 @@ EXTRA_INSTALL_RULES = [ ('contrib/packaging/wix/COPYING.rtf', 'COPYING.rtf'), - ('contrib/win32/mercurial.ini', 'hgrc.d/mercurial.rc'), + ('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'), ] STAGING_REMOVE_FILES = [
--- a/contrib/packaging/inno/mercurial.iss Wed Jan 15 15:08:42 2020 -0800 +++ b/contrib/packaging/inno/mercurial.iss Fri Jan 24 11:05:42 2020 -0500 @@ -51,7 +51,7 @@ [UninstallDelete] Type: files; Name: {app}\Mercurial.url -Type: filesandordirs; Name: {app}\hgrc.d +Type: filesandordirs; Name: {app}\defaultrc [Icons] Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
--- a/contrib/packaging/wix/mercurial.wxs Wed Jan 15 15:08:42 2020 -0800 +++ b/contrib/packaging/wix/mercurial.wxs Fri Jan 24 11:05:42 2020 -0500 @@ -99,7 +99,7 @@ <ComponentRef Id='MainExecutable' /> <ComponentRef Id='ProgramMenuDir' /> <ComponentGroupRef Id="hg.group.ROOT" /> - <ComponentGroupRef Id="hg.group.hgrc.d" /> + <ComponentGroupRef Id="hg.group.defaultrc" /> <ComponentGroupRef Id="hg.group.helptext" /> <ComponentGroupRef Id="hg.group.lib" /> <ComponentGroupRef Id="hg.group.templates" />
--- a/mercurial/utils/resourceutil.py Wed Jan 15 15:08:42 2020 -0800 +++ b/mercurial/utils/resourceutil.py Fri Jan 24 11:05:42 2020 -0500 @@ -33,6 +33,7 @@ if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app': # executable version (py2exe) doesn't support __file__ datapath = os.path.dirname(pycompat.sysexecutable) + _rootpath = os.path.dirname(datapath) else: datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__))) _rootpath = os.path.dirname(datapath)