From 5c174dd443cfa2510e03d37f7c73a1a10c714c37 Mon Sep 17 00:00:00 2001
From: Maya Rashish <mrashish@redhat.com>
Date: Mon, 25 May 2020 08:44:15 +0300
Subject: [PATCH] Fix tab/space inconsistency
---
reposurgeon | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/reposurgeon b/reposurgeon
index 6292e2a..1e31581 100755
--- a/reposurgeon
+++ b/reposurgeon
@@ -4822,8 +4822,8 @@ class StreamParser:
if node.blobmark is None:
# An entirely new blob
node.blobmark = node.blob.set_mark(self.repo.newmark())
- announce(DEBUG_EXTRACT, "r%s: %s gets new blob '%s'"
- % (revision, node, node.blobmark))
+ announce(DEBUG_EXTRACT, "r%s: %s gets new blob '%s'"
+ % (revision, node, node.blobmark))
self.repo.addEvent(node.blob)
# Blobs generated by reposurgeon
# (e.g .gitignore content) have no
@@ -5040,8 +5040,8 @@ class StreamParser:
# the first item with the max key and we want the last
latest = max(reversed(copies),
key=lambda node: int(node.from_rev))
- announce(DEBUG_TOPOLOGY, "r%s: file copy matching %s finds %s" \
- % (newcommit.legacy_id, copies, latest))
+ announce(DEBUG_TOPOLOGY, "r%s: file copy matching %s finds %s" \
+ % (newcommit.legacy_id, copies, latest))
if latest is not None:
prev = last_relevant_commit(
latest.from_rev, latest.from_path,
@@ -5118,7 +5118,7 @@ class StreamParser:
# Now, branch analysis.
branchroots = []
if not self.branches or nobranch:
- announce(DEBUG_EXTRACT, "no branch analysis")
+ announce(DEBUG_EXTRACT, "no branch analysis")
last = None
for commit in self.repo.commits():
commit.set_branch(os.path.join("refs", "heads", "master") + os.sep)
@@ -5132,7 +5132,7 @@ class StreamParser:
#announce(DEBUG_EXTRACT, "seeking branch assignment for %s with common prefix '%s'" % (commit.mark, commit.common))
if lastbranch is not None \
and commit.common.startswith(lastbranch):
- announce(DEBUG_EXTRACT, "branch assignment for %s from lastbranch '%s'" % (commit.mark, lastbranch))
+ announce(DEBUG_EXTRACT, "branch assignment for %s from lastbranch '%s'" % (commit.mark, lastbranch))
branch = lastbranch
else:
# Prefer the longest possible branch
@@ -5140,7 +5140,7 @@ class StreamParser:
branch = next((b for b in self.branchlist()
if commit.common.startswith(b)),
None)
- announce(DEBUG_EXTRACT, "branch assignment for %s is '%s'" % (commit.mark, branch))
+ announce(DEBUG_EXTRACT, "branch assignment for %s is '%s'" % (commit.mark, branch))
if branch is not None:
commit.set_branch(branch)
for fileop in commit.operations():
@@ -5158,11 +5158,11 @@ class StreamParser:
# ...then rebuild parent links so they follow the branches
for commit in self.repo.commits():
if self.branches[commit.branch] is None:
- announce(DEBUG_EXTRACT,"commit %s branch %s is rootless" % (commit.mark, commit.branch))
+ announce(DEBUG_EXTRACT,"commit %s branch %s is rootless" % (commit.mark, commit.branch))
branchroots.append(commit)
commit.set_parents([])
else:
- announce(DEBUG_EXTRACT,"commit %s has parent %s on branch %s" % (commit.mark, self.branches[commit.branch], commit.branch))
+ ennounce(DEBUG_EXTRACT,"commit %s has parent %s on branch %s" % (commit.mark, self.branches[commit.branch], commit.branch))
commit.set_parents([self.branches[commit.branch]])
self.branches[commit.branch] = commit
# Per-commit spinner disabled because this pass is fast
--
2.25.1