Home
About
Blog
Products
Forum
Support
Contact
Sunbelt Computer Software
PL/B Language Development and Support
Home
About
Blog
Products
Forum
Support
Contact
pre-commit/pre_commit/git.py at master · FeodorFitsner/pre-commit · GitHub
Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
BY COMPANY SIZE
Enterprises
Small and medium teams
Startups
Nonprofits
BY USE CASE
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
BY INDUSTRY
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
EXPLORE BY TOPIC
AI
Software Development
DevOps
Security
View all topics
EXPLORE BY TYPE
Customer stories
Events & webinars
Ebooks & reports
Business insights
GitHub Skills
SUPPORT & SERVICES
Documentation
Customer support
Community forum
Trust center
Partners
View all resources
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search
/
Sign in
Sign up
Appearance settings
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
FeodorFitsner
/
pre-commit
Public
forked from
pre-commit/pre-commit
Notifications
You must be signed in to change notification settings
Fork
0
Star
0
Code
Pull requests
0
Actions
Projects
Wiki
Security and quality
0
Insights
Additional navigation options
Code
Pull requests
Actions
Projects
Wiki
Security and quality
Insights
Files
Expand file tree
master
Breadcrumbs
pre-commit
/
pre_commit
/
git.py
Copy path
Blame
More file actions
Blame
More file actions
Latest commit
History
History
History
95 lines (74 loc) · 2.82 KB
master
Breadcrumbs
pre-commit
/
pre_commit
/
git.py
Copy path
Top
File metadata and controls
Code
Blame
95 lines (74 loc) · 2.82 KB
Raw
Copy raw file
Download raw file
Open symbols panel
Edit and raw actions
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
from
__future__
import
unicode_literals
import
functools
import
logging
import
os
import
os
.
path
import
re
from
pre_commit
.
errors
import
FatalError
from
pre_commit
.
util
import
cmd_output
from
pre_commit
.
util
import
memoize_by_cwd
logger
=
logging
.
getLogger
(
'pre_commit'
)
def
get_root
():
path
=
os
.
getcwd
()
while
path
!=
os
.
path
.
normpath
(
os
.
path
.
join
(
path
,
'../'
)):
if
os
.
path
.
exists
(
os
.
path
.
join
(
path
,
'.git'
)):
return
path
else
:
path
=
os
.
path
.
normpath
(
os
.
path
.
join
(
path
,
'../'
))
raise
FatalError
(
'Called from outside of the gits. '
'Please cd to a git repository.'
)
def
is_in_merge_conflict
():
return
(
os
.
path
.
exists
(
os
.
path
.
join
(
'.git'
,
'MERGE_MSG'
))
and
os
.
path
.
exists
(
os
.
path
.
join
(
'.git'
,
'MERGE_HEAD'
))
)
def
parse_merge_msg_for_conflicts
(
merge_msg
):
# Conflicted files start with tabs
return
[
line
.
lstrip
(
'#'
).
strip
()
for
line
in
merge_msg
.
splitlines
()
# '#\t' for git 2.4.1
if
line
.
startswith
((
'
\t
'
,
'#
\t
'
))
]
@
memoize_by_cwd
def
get_conflicted_files
():
logger
.
info
(
'Checking merge-conflict files only.'
)
# Need to get the conflicted files from the MERGE_MSG because they could
# have resolved the conflict by choosing one side or the other
merge_msg
=
open
(
os
.
path
.
join
(
'.git'
,
'MERGE_MSG'
)).
read
()
merge_conflict_filenames
=
parse_merge_msg_for_conflicts
(
merge_msg
)
# This will get the rest of the changes made after the merge.
# If they resolved the merge conflict by choosing a mesh of both sides
# this will also include the conflicted files
tree_hash
=
cmd_output
(
'git'
,
'write-tree'
)[
1
].
strip
()
merge_diff_filenames
=
cmd_output
(
'git'
,
'diff'
,
'-m'
,
tree_hash
,
'HEAD'
,
'MERGE_HEAD'
,
'--name-only'
,
)[
1
].
splitlines
()
return
set
(
merge_conflict_filenames
)
|
set
(
merge_diff_filenames
)
@
memoize_by_cwd
def
get_staged_files
():
return
cmd_output
(
'git'
,
'diff'
,
'--staged'
,
'--name-only'
)[
1
].
splitlines
()
@
memoize_by_cwd
def
get_all_files
():
return
cmd_output
(
'git'
,
'ls-files'
)[
1
].
splitlines
()
def
get_files_matching
(
all_file_list_strategy
):
@
functools
.
wraps
(
all_file_list_strategy
)
@
memoize_by_cwd
def
wrapper
(
include_expr
,
exclude_expr
):
include_regex
=
re
.
compile
(
include_expr
)
exclude_regex
=
re
.
compile
(
exclude_expr
)
return
set
(
filename
for
filename
in
all_file_list_strategy
()
if
(
include_regex
.
search
(
filename
)
and
not
exclude_regex
.
search
(
filename
)
and
os
.
path
.
exists
(
filename
)
)
)
return
wrapper
get_staged_files_matching
=
get_files_matching
(
get_staged_files
)
get_all_files_matching
=
get_files_matching
(
get_all_files
)
get_conflicted_files_matching
=
get_files_matching
(
get_conflicted_files
)
You can’t perform that action at this time.