Modified: trunk/Tools/ChangeLog (288718 => 288719)
--- trunk/Tools/ChangeLog 2022-01-28 01:23:39 UTC (rev 288718)
+++ trunk/Tools/ChangeLog 2022-01-28 01:51:09 UTC (rev 288719)
@@ -1,3 +1,15 @@
+2022-01-27 Jonathan Bedard <[email protected]>
+
+ [git-webkit] Respect EMAIL_ADDRESS environment variable during setup
+ https://bugs.webkit.org/show_bug.cgi?id=235748
+ <rdar://problem/88161757>
+
+ Reviewed by Ryan Haddad.
+
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+ (Setup.git): Prefer EMAIL_ADDRESS variable over git config email.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
+
2022-01-26 Jonathan Bedard <[email protected]>
[EWS] Differentiate UAT and production PR processing
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py (288718 => 288719)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py 2022-01-28 01:23:39 UTC (rev 288718)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py 2022-01-28 01:51:09 UTC (rev 288719)
@@ -83,7 +83,7 @@
global_config = local.Git.config()
result = 0
- email = global_config.get('user.email')
+ email = os.environ.get('EMAIL_ADDRESS') or global_config.get('user.email')
log.info('Setting git user email for {}...'.format(repository.root_path))
if not email or args.defaults is False or (not args.defaults and Terminal.choose(
"Set '{}' as the git user email".format(email),
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py (288718 => 288719)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py 2022-01-28 01:23:39 UTC (rev 288718)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py 2022-01-28 01:51:09 UTC (rev 288719)
@@ -24,7 +24,7 @@
import os
import sys
-from webkitcorepy import Editor, OutputCapture, testing
+from webkitcorepy import Editor, OutputCapture, testing, mocks as wkmocks
from webkitcorepy.mocks import Terminal as MockTerminal
from webkitscmpy import local, program, mocks
@@ -64,7 +64,9 @@
)
def test_git(self):
- with OutputCapture(level=logging.INFO) as captured, mocks.local.Git(self.path) as repo, mocks.local.Svn():
+ with OutputCapture(level=logging.INFO) as captured, mocks.local.Git(self.path) as repo, \
+ mocks.local.Svn(), wkmocks.Environment(EMAIL_ADDRESS=''):
+
self.assertEqual(0, program.main(
args=('setup', '--defaults', '-v'),
path=self.path,
@@ -97,7 +99,8 @@
def test_github_checkout(self):
with OutputCapture(level=logging.INFO) as captured, mocks.remote.GitHub() as remote, \
MockTerminal.input('n', '[email protected]', 'n', 'Committer', 'n', '1', 'y', 'y'), \
- mocks.local.Git(self.path, remote='https://{}.git'.format(remote.remote)) as repo:
+ mocks.local.Git(self.path, remote='https://{}.git'.format(remote.remote)) as repo, \
+ wkmocks.Environment(EMAIL_ADDRESS=''):
self.assertEqual('https://github.example.com/WebKit/WebKit.git', local.Git(self.path).url())
