diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-01-08 10:59:07 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-01-08 10:59:07 +0000 |
| commit | 19e5e5aee9fa9a01ab1c1bebd6ce5774a22db4ae (patch) | |
| tree | 5de9d887e103346dbd85da7f2755d308633fa9cc | |
| parent | 49fd896695f7ad5c6ff8babce3750960bafcb385 (diff) | |
Revert or disable experiment rebasing support
| -rwxr-xr-x | svn-git-branch.sh | 12 | ||||
| -rw-r--r-- | svn-list-branches.awk | 20 | ||||
| -rwxr-xr-x | svn-list-branches.sh | 2 |
3 files changed, 9 insertions, 25 deletions
diff --git a/svn-git-branch.sh b/svn-git-branch.sh index 41744f4..107faa7 100755 --- a/svn-git-branch.sh +++ b/svn-git-branch.sh @@ -125,14 +125,6 @@ while [ $# -gt 0 ]; do parent="$1" shift - parent_branch=$(echo "$parent" | cut -d@ -f 1) - parent_rev=$(echo "$parent" | cut -s -d@ -f 2) - orig_parent_rev=$(echo "$parent" | cut -s -d@ -f 3) - if [ x"$orig_parent_rev" = x"" ]; then - orig_parent_rev="$parent_rev" - fi - parent="$parent_branch@$parent_rev" - set +x while true; do if [ x"$(flock -s STATUS grep -c "^FAIL:$parent\$" STATUS)" != x"0" ]; then @@ -151,13 +143,15 @@ while [ $# -gt 0 ]; do info "processed parent $parent" + parent_branch=$(echo "$parent" | cut -d@ -f 1) + parent_rev=$(echo "$parent" | cut -s -d@ -f 2) if [ ${#parents[@]} = 0 ]; then git clone --bare --shared --single-branch -b $parent --no-tags @git $spec git -C $spec update-ref refs/remotes/svn/$spec $parent - git -C $spec update-ref refs/remotes/svn/$branch@$orig_parent_rev $parent parents+=("^refs/heads/$parent") fetch_revmap "$spec" "svn/$parent" "svn/$spec" + fetch_revmap "$spec" "svn/$parent" "svn/$branch@$parent_rev" fetch_authors_map "$parent" "$spec" git_cache "$spec" "$branch" "$rev" diff --git a/svn-list-branches.awk b/svn-list-branches.awk index 6681380..e108fbd 100644 --- a/svn-list-branches.awk +++ b/svn-list-branches.awk @@ -159,30 +159,20 @@ function print_entry(pathrev_, branch_rev, entry) { } parent_ = parents[path][range_] - if (DEBUG) - print "PARENT: " parent_ if (parent_ != "") { entry = entry " " parent_ - split(parent_, parent, "@") - if (length(parent) == 3) - parent_ = parent[1] "@" parent[2] - if (!(parent_ in printed)) print_entry(parent_, range[1]) } if (pathrev_ in merges) - for (merge_ in merges[pathrev_]) { - entry = entry " " merge_ - - split(merge_, merge, "@") - if (length(merge) == 3) - merge_ = merge[1] "@" merge[2] - - if (!(merge_ in printed)) { - print_entry(merge_, merge[2]) + for (mergepath in merges[pathrev_]) { + entry = entry " " mergepath + if (!(mergepath in printed)) { + split(mergepath, merge, "@") + print_entry(mergepath, merge[2]) } } diff --git a/svn-list-branches.sh b/svn-list-branches.sh index 1e561d1..f76fe34 100755 --- a/svn-list-branches.sh +++ b/svn-list-branches.sh @@ -60,7 +60,7 @@ if [ x"$reparent" != x"" ]; then new_parent="${entry[5]#/}" new_parent_rev="${entry[6]}" - sed -i -e "s#DUMP: $branch@$branch_rev@\([0-9]\+\) $old_parent@$old_parent_rev#DUMP: $branch@$branch_rev@\1 $new_parent@$new_parent_rev@$old_parent_rev#" "$dumpfile" + #sed -i -e "s#DUMP: $branch@$branch_rev@\([0-9]\+\) $old_parent@$old_parent_rev#DUMP: $branch@$branch_rev@\1 $new_parent@$new_parent_rev@$old_parent_rev#" "$dumpfile" done < "$reparent" fi |