123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223 |
- #!/usr/bin/env python
- # vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
- # Copyright (c) 2020 Kevin B. Hendricks, Stratford Ontario Canada
- #
- # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
- # General Public License as public by the Free Software Foundation; version 2.0
- # or (at your option) any later version. You can redistribute it and/or
- # modify it under the terms of either of these two licenses.
- #
- # 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.
- #
- # You should have received a copy of the licenses; if not, see
- # <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
- # and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
- # License, Version 2.0.
- """Implementation of merge-base following the approach of git."""
- from heapq import heappop, heappush
- from .lru_cache import LRUCache
- # priority queue using builtin python minheap tools
- # why they do not have a builtin maxheap is simply ridiculous but
- # liveable with integer time stamps using negation
- class WorkList:
- def __init__(self):
- self.pq = []
- def add(self, item):
- dt, cmt = item
- heappush(self.pq, (-dt, cmt))
- def get(self):
- item = heappop(self.pq)
- if item:
- pr, cmt = item
- return -pr, cmt
- return None
- def iter(self):
- for pr, cmt in self.pq:
- yield (-pr, cmt)
- def _find_lcas(lookup_parents, c1, c2s, lookup_stamp, min_stamp=0):
- cands = []
- cstates = {}
- # Flags to Record State
- _ANC_OF_1 = 1 # ancestor of commit 1
- _ANC_OF_2 = 2 # ancestor of commit 2
- _DNC = 4 # Do Not Consider
- _LCA = 8 # potential LCA (Lowest Common Ancestor)
- def _has_candidates(wlst, cstates):
- for dt, cmt in wlst.iter():
- if cmt in cstates:
- if not ((cstates[cmt] & _DNC) == _DNC):
- return True
- return False
- # initialize the working list states with ancestry info
- # note possibility of c1 being one of c2s should be handled
- wlst = WorkList()
- cstates[c1] = _ANC_OF_1
- wlst.add((lookup_stamp(c1), c1))
- for c2 in c2s:
- cflags = cstates.get(c2, 0)
- cstates[c2] = cflags | _ANC_OF_2
- wlst.add((lookup_stamp(c2), c2))
- # loop while at least one working list commit is still viable (not marked as _DNC)
- # adding any parents to the list in a breadth first manner
- while _has_candidates(wlst, cstates):
- dt, cmt = wlst.get()
- # Look only at ANCESTRY and _DNC flags so that already
- # found _LCAs can still be marked _DNC by lower _LCAS
- cflags = cstates[cmt] & (_ANC_OF_1 | _ANC_OF_2 | _DNC)
- if cflags == (_ANC_OF_1 | _ANC_OF_2):
- # potential common ancestor if not already in candidates add it
- if not (cstates[cmt] & _LCA) == _LCA:
- cstates[cmt] = cstates[cmt] | _LCA
- cands.append((dt, cmt))
- # mark any parents of this node _DNC as all parents
- # would be one generation further removed common ancestors
- cflags = cflags | _DNC
- parents = lookup_parents(cmt)
- if parents:
- for pcmt in parents:
- pflags = cstates.get(pcmt, 0)
- # if this parent was already visited with no new ancestry/flag information
- # do not add it to the working list again
- if (pflags & cflags) == cflags:
- continue
- pdt = lookup_stamp(pcmt)
- if pdt < min_stamp:
- continue
- cstates[pcmt] = pflags | cflags
- wlst.add((pdt, pcmt))
- # walk final candidates removing any superseded by _DNC by later lower _LCAs
- # remove any duplicates and sort it so that earliest is first
- results = []
- for dt, cmt in cands:
- if not ((cstates[cmt] & _DNC) == _DNC) and (dt, cmt) not in results:
- results.append((dt, cmt))
- results.sort(key=lambda x: x[0])
- lcas = [cmt for dt, cmt in results]
- return lcas
- # actual git sorts these based on commit times
- def find_merge_base(repo, commit_ids):
- """Find lowest common ancestors of commit_ids[0] and *any* of commits_ids[1:].
- Args:
- repo: Repository object
- commit_ids: list of commit ids
- Returns:
- list of lowest common ancestor commit_ids
- """
- cmtcache = LRUCache(max_cache=128)
- parents_provider = repo.parents_provider()
- def lookup_stamp(cmtid):
- if cmtid not in cmtcache:
- cmtcache[cmtid] = repo.object_store[cmtid]
- return cmtcache[cmtid].commit_time
- def lookup_parents(cmtid):
- commit = None
- if cmtid in cmtcache:
- commit = cmtcache[cmtid]
- # must use parents provider to handle grafts and shallow
- return parents_provider.get_parents(cmtid, commit=commit)
- if not commit_ids:
- return []
- c1 = commit_ids[0]
- if not len(commit_ids) > 1:
- return [c1]
- c2s = commit_ids[1:]
- if c1 in c2s:
- return [c1]
- lcas = _find_lcas(lookup_parents, c1, c2s, lookup_stamp)
- return lcas
- def find_octopus_base(repo, commit_ids):
- """Find lowest common ancestors of *all* provided commit_ids.
- Args:
- repo: Repository
- commit_ids: list of commit ids
- Returns:
- list of lowest common ancestor commit_ids
- """
- cmtcache = LRUCache(max_cache=128)
- parents_provider = repo.parents_provider()
- def lookup_stamp(cmtid):
- if cmtid not in cmtcache:
- cmtcache[cmtid] = repo.object_store[cmtid]
- return cmtcache[cmtid].commit_time
- def lookup_parents(cmtid):
- commit = None
- if cmtid in cmtcache:
- commit = cmtcache[cmtid]
- # must use parents provider to handle grafts and shallow
- return parents_provider.get_parents(cmtid, commit=commit)
- if not commit_ids:
- return []
- if len(commit_ids) <= 2:
- return find_merge_base(repo, commit_ids)
- lcas = [commit_ids[0]]
- others = commit_ids[1:]
- for cmt in others:
- next_lcas = []
- for ca in lcas:
- res = _find_lcas(lookup_parents, cmt, [ca], lookup_stamp)
- next_lcas.extend(res)
- lcas = next_lcas[:]
- return lcas
- def can_fast_forward(repo, c1, c2):
- """Is it possible to fast-forward from c1 to c2?
- Args:
- repo: Repository to retrieve objects from
- c1: Commit id for first commit
- c2: Commit id for second commit
- """
- cmtcache = LRUCache(max_cache=128)
- parents_provider = repo.parents_provider()
- def lookup_stamp(cmtid):
- if cmtid not in cmtcache:
- cmtcache[cmtid] = repo.object_store[cmtid]
- return cmtcache[cmtid].commit_time
- def lookup_parents(cmtid):
- commit = None
- if cmtid in cmtcache:
- commit = cmtcache[cmtid]
- # must use parents provider to handle grafts and shallow
- return parents_provider.get_parents(cmtid, commit=commit)
- if c1 == c2:
- return True
- # Algorithm: Find the common ancestor
- min_stamp = lookup_stamp(c1)
- lcas = _find_lcas(lookup_parents, c1, [c2], lookup_stamp, min_stamp=min_stamp)
- return lcas == [c1]
|