projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git]
/
tools
/
patman
/
gitutil.py
diff --git
a/tools/patman/gitutil.py
b/tools/patman/gitutil.py
index
dce7fa2
..
770a051
100644
(file)
--- a/
tools/patman/gitutil.py
+++ b/
tools/patman/gitutil.py
@@
-2,17
+2,17
@@
# Copyright (c) 2011 The Chromium OS Authors.
#
# Copyright (c) 2011 The Chromium OS Authors.
#
-import command
import re
import os
import re
import os
-import series
import subprocess
import sys
import subprocess
import sys
-import terminal
-import checkpatch
-import settings
-import tools
+from patman import checkpatch
+from patman import command
+from patman import series
+from patman import settings
+from patman import terminal
+from patman import tools
# True to use --no-decorate - we check this in Setup()
use_no_decorate = True
# True to use --no-decorate - we check this in Setup()
use_no_decorate = True
@@
-23,7
+23,7
@@
def LogCmd(commit_range, git_dir=None, oneline=False, reverse=False,
Args:
commit_range: Range expression to use for log, None for none
Args:
commit_range: Range expression to use for log, None for none
- git_dir: Path to git reposit
i
ory (None to use default)
+ git_dir: Path to git repository (None to use default)
oneline: True to use --oneline, else False
reverse: True to reverse the log (--reverse)
count: Number of commits to list, or None for no limit
oneline: True to use --oneline, else False
reverse: True to reverse the log (--reverse)
count: Number of commits to list, or None for no limit
@@
-166,7
+166,7
@@
def CountCommitsInRange(git_dir, range_expr):
git_dir: Directory containing git repo
range_expr: Range to check
Return:
git_dir: Directory containing git repo
range_expr: Range to check
Return:
- Number of patches that exist in the supplied range
m
or None if none
+ Number of patches that exist in the supplied range or None if none
were found
"""
pipe = [LogCmd(range_expr, git_dir=git_dir, oneline=True)]
were found
"""
pipe = [LogCmd(range_expr, git_dir=git_dir, oneline=True)]