traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove hg support from patchcheck (GH-7440) 

(cherry picked from commit b8c0845fee)

Co-authored-by: Benjamin Peterson <benjamin@python.org>
This commit is contained in:
Miss Islington (bot) 2018-06-05 23:00:20 -07:00 committed by GitHub
parent d59f97c832
commit 08c03cca59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Tools/scripts/patchcheck.py
View File

@ -45,16 +45,6 @@ def status(message, modal=False, info=None):
return decorated_fxn return decorated_fxn
def mq_patches_applied():
"""Check if there are any applied MQ patches."""
cmd = 'hg qapplied'
with subprocess.Popen(cmd.split(),
stdout=subprocess.PIPE,
stderr=subprocess.PIPE) as st:
bstdout, _ = st.communicate()
return st.returncode == 0 and bstdout
def get_git_branch(): def get_git_branch():
"""Get the symbolic name for the current git branch""" """Get the symbolic name for the current git branch"""
cmd = "git rev-parse --abbrev-ref HEAD".split() cmd = "git rev-parse --abbrev-ref HEAD".split()
@ -99,16 +89,8 @@ def get_base_branch():
@status("Getting the list of files that have been added/changed", @status("Getting the list of files that have been added/changed",
info=lambda x: n_files_str(len(x))) info=lambda x: n_files_str(len(x)))
def changed_files(base_branch=None): def changed_files(base_branch=None):
"""Get the list of changed or added files from Mercurial or git.""" """Get the list of changed or added files from git."""
if os.path.isdir(os.path.join(SRCDIR, '.hg')): if os.path.exists(os.path.join(SRCDIR, '.git')):
if base_branch is not None:
sys.exit('need a git checkout to check PR status')
cmd = 'hg status --added --modified --no-status'
if mq_patches_applied():
cmd += ' --rev qparent'
with subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) as st:
filenames = [x.decode().rstrip() for x in st.stdout]
elif os.path.exists(os.path.join(SRCDIR, '.git')):
# We just use an existence check here as: # We just use an existence check here as:
# directory = normal git checkout/clone # directory = normal git checkout/clone
# file = git worktree directory # file = git worktree directory
@ -130,7 +112,7 @@ def changed_files(base_branch=None):
filename = filename.split(' -> ', 2)[1].strip() filename = filename.split(' -> ', 2)[1].strip()
filenames.append(filename) filenames.append(filename)
else: else:
sys.exit('need a Mercurial or git checkout to get modified files') sys.exit('need a git checkout to get modified files')
filenames2 = [] filenames2 = []
for filename in filenames: for filename in filenames: