mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
6da17751ca
Series of steps: * Create a local "b1" branch with `repo start b1` that tracks a remote branch (totally fine) * Manually create a local "b2" branch with `git branch --track b1 b2` that tracks the local "b1" (uh-oh...) * Delete the local "b1" branch manually or via `repo prune` (....) * Try to process the "b2" branch with `repo prune` Since b2 tracks a branch that no longer exists, everything blows up at this point as we try to probe the non-existent ref. Instead, we should flag this as unknown and leave it up to the user to resolve. This probably could come up if a local branch was tracking a remote branch that was deleted from the server, and users ran something like `repo sync --prune` which cleaned up the remote refs. Bug: https://crbug.com/gerrit/11485 Change-Id: I6b6b6041943944b8efa6e2ad0b8b10f13a75a5c2 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/236793 Reviewed-by: David Pursehouse <dpursehouse@collab.net> Reviewed-by: Kirtika Ruchandani <kirtika@google.com> Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: Mike Frysinger <vapier@google.com>
67 lines
1.9 KiB
Python
67 lines
1.9 KiB
Python
# -*- coding:utf-8 -*-
|
|
#
|
|
# Copyright (C) 2008 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from __future__ import print_function
|
|
from color import Coloring
|
|
from command import PagedCommand
|
|
|
|
class Prune(PagedCommand):
|
|
common = True
|
|
helpSummary = "Prune (delete) already merged topics"
|
|
helpUsage = """
|
|
%prog [<project>...]
|
|
"""
|
|
|
|
def Execute(self, opt, args):
|
|
all_branches = []
|
|
for project in self.GetProjects(args):
|
|
all_branches.extend(project.PruneHeads())
|
|
|
|
if not all_branches:
|
|
return
|
|
|
|
class Report(Coloring):
|
|
def __init__(self, config):
|
|
Coloring.__init__(self, config, 'status')
|
|
self.project = self.printer('header', attr='bold')
|
|
|
|
out = Report(all_branches[0].project.config)
|
|
out.project('Pending Branches')
|
|
out.nl()
|
|
|
|
project = None
|
|
|
|
for branch in all_branches:
|
|
if project != branch.project:
|
|
project = branch.project
|
|
out.nl()
|
|
out.project('project %s/' % project.relpath)
|
|
out.nl()
|
|
|
|
print('%s %-33s ' % (
|
|
branch.name == project.CurrentBranch and '*' or ' ',
|
|
branch.name), end='')
|
|
|
|
if not branch.base_exists:
|
|
print('(ignoring: tracking branch is gone: %s)' % (branch.base,))
|
|
else:
|
|
commits = branch.commits
|
|
date = branch.date
|
|
print('(%2d commit%s, %s)' % (
|
|
len(commits),
|
|
len(commits) != 1 and 's' or ' ',
|
|
date))
|