try:
before, inside, after = series_conf.split(lines)
except exc.KSNotFound as err:
if filter_mode:
before = []
inside = lines
after = []
elif args.check:
# no sorted section
sys.exit(0)
else:
print("Error: %s" % (err, ), file=sys.stderr)
sys.exit(1)
try:
input_entries = lib.parse_inside(index, inside, args.upstream)
except exc.KSError as err:
print("Error: %s" % (err, ), file=sys.stderr)
sys.exit(1)
try:
sorted_entries = lib.series_sort(index, input_entries)
except exc.KSError as err:
print("Error: %s" % (err, ), file=sys.stderr)
sys.exit(1)
new_inside = lib.flatten([
lib.series_header(inside),
lib.series_format(sorted_entries),
lib.series_footer(inside),
])
print("%d commits changed section from base to remote." %
(len(moved), ))
dup_add_nb = len(local[3] & added)
dup_rem_nb = len(removed) - len(local[3] & removed)
if dup_add_nb:
print("Warning: %d commits added in remote and already present in "
"local, ignoring." % (dup_add_nb, ))
if dup_rem_nb:
print(
"Warning: %d commits removed in remote but not present in local, "
"ignoring." % (dup_rem_nb, ))
filter_set = removed | moved
inside = [line for line in local[1] if not line.strip() in filter_set]
try:
input_entries = lib.parse_inside(index, inside, False)
except exc.KSError as err:
print("Error: %s" % (err, ), file=sys.stderr)
sys.exit(1)
for name in added - local[3] | moved:
entry = lib.InputEntry("\t%s\n" % (name, ))
entry.from_patch(index, name, lib.git_sort.oot, True)
input_entries.append(entry)
try:
sorted_entries = lib.series_sort(index, input_entries)
except exc.KSError as err:
print("Error: %s" % (err, ), file=sys.stderr)
sys.exit(1)
output = lib.series_format(sorted_entries)
args = parser.parse_args()
repo_path = lib.repo_path()
repo = pygit2.Repository(repo_path)
index = lib.git_sort.SortIndex(repo)
try:
with open("series.conf") as f:
lines = f.readlines()
except IOError as err:
print("Error: could not open series file, %s" % (err,), file=sys.stderr)
sys.exit(1)
try:
before, inside, after = series_conf.split(lines)
current_entries = lib.parse_inside(index, inside, False)
except exc.KSError as err:
print("Error: %s" % (err,), file=sys.stderr)
sys.exit(1)
if list(filter(lib.tag_needs_update, current_entries)):
print("Error: Some Git-repo tags for patches currently in series.conf "
"are outdated. Please run series_sort.py first and commit the "
"result before adding new patches.", file=sys.stderr)
sys.exit(1)
current_names = set([entry.name for entry in current_entries])
current_revs = {rev : entry.name
for entry in current_entries
if entry.dest_head != git_sort.oot
for rev in entry.revs}
try:
before, inside, after = series_conf.split(lines)
except exc.KSNotFound as err:
if filter_mode:
before = []
inside = lines
after = []
elif args.check:
# no sorted section
sys.exit(0)
else:
print("Error: %s" % (err,), file=sys.stderr)
sys.exit(1)
try:
input_entries = lib.parse_inside(index, inside, args.upstream)
except exc.KSError as err:
print("Error: %s" % (err,), file=sys.stderr)
sys.exit(1)
try:
sorted_entries = lib.series_sort(index, input_entries)
except exc.KSError as err:
print("Error: %s" % (err,), file=sys.stderr)
sys.exit(1)
new_inside = lib.flatten([
lib.series_header(inside),
lib.series_format(sorted_entries),
lib.series_footer(inside),
])
repo_path = lib.repo_path()
repo = pygit2.Repository(repo_path)
index = lib.git_sort.SortIndex(repo)
try:
with open("series.conf") as f:
lines = f.readlines()
except IOError as err:
print("Error: could not open series file, %s" % (err, ),
file=sys.stderr)
sys.exit(1)
try:
before, inside, after = series_conf.split(lines)
current_entries = lib.parse_inside(index, inside)
except exc.KSError as err:
print("Error: %s" % (err, ), file=sys.stderr)
sys.exit(1)
if list(filter(lib.tag_needs_update, current_entries)):
print(
"Error: Some Git-repo tags for patches currently in series.conf "
"are outdated. Please run series_sort.py first and commit the "
"result before adding new patches.",
file=sys.stderr)
sys.exit(1)
current_names = set([entry.name for entry in current_entries])
current_revs = {
rev: entry.name
