upstream/mercurial-mirror Files · mercurial/ancestor.py

largefiles: handle merges between normal files and largefiles (issue3084)...

largefiles: handle merges between normal files and largefiles (issue3084) The largefiles extension prevents users from adding a normal file named 'foo' if there is already a largefile with the same name. However, there was a loop-hole: when merging, it was possible to bring in a normal file named 'foo' while also having a '.hglf/foo' file. This patch fixes this by extending the manifest merge to deal with these kinds of conflicts. If there is a normal file 'foo' in the working copy, and the other parent brings in a '.hglf/foo' file, then the user will be prompted to keep the normal file or the largefile. Likewise for the symmetric case where a normal file is brought in via the second parent. The prompt looks like this: $ hg merge foo has been turned into a largefile use (l)argefile or keep as (n)ormal file? After the merge, either the '.hglf/foo' file or the 'foo' file will have been deleted. This would cause status to return output like: $ hg status M foo R foo To fix this, the lfiles_repo.status method is changed so that a removed normal file isn't shown if there is largefile with the same name, and vice versa for largefiles.

Martin Geisler - - Load All Authors

File last commit:

r14494:1ffeeb91 default


                r15663:9036c7d1

stable

Download file

             ancestor.py
        
                    91 lines
            
             | 2.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / ancestor.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # ancestor.py - generic DAG ancestor algorithm for mercurial

      #

      # Copyright 2006 Matt Mackall <mpm@selenic.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      import heapq

      def ancestor(a, b, pfunc):

          """

          Returns the common ancestor of a and b that is furthest from a

          root (as measured by longest path) or None if no ancestor is

          found. If there are multiple common ancestors at the same

          distance, the first one found is returned.

          pfunc must return a list of parent vertices for a given vertex

          """

          if a == b:

              return a

          a, b = sorted([a, b])

          # find depth from root of all ancestors

          # depth is stored as a negative for heapq

          parentcache = {}

          visit = [a, b]

          depth = {}

          while visit:

              vertex = visit[-1]

              pl = pfunc(vertex)

              parentcache[vertex] = pl

              if not pl:

                  depth[vertex] = 0

                  visit.pop()

              else:

                  for p in pl:

                      if p == a or p == b: # did we find a or b as a parent?

                          return p # we're done

                      if p not in depth:

                          visit.append(p)

                  if visit[-1] == vertex:

                      # -(maximum distance of parents + 1)

                      depth[vertex] = min([depth[p] for p in pl]) - 1

                      visit.pop()

          # traverse ancestors in order of decreasing distance from root

          def ancestors(vertex):

              h = [(depth[vertex], vertex)]

              seen = set()

              while h:

                  d, n = heapq.heappop(h)

                  if n not in seen:

                      seen.add(n)

                      yield (d, n)

                      for p in parentcache[n]:

                          heapq.heappush(h, (depth[p], p))

          def generations(vertex):

              sg, s = None, set()

              for g, v in ancestors(vertex):

                  if g != sg:

                      if sg:

                          yield sg, s

                      sg, s = g, set((v,))

                  else:

                      s.add(v)

              yield sg, s

          x = generations(a)

          y = generations(b)

          gx = x.next()

          gy = y.next()

          # increment each ancestor list until it is closer to root than

          # the other, or they match

          try:

              while True:

                  if gx[0] == gy[0]:

                      for v in gx[1]:

                          if v in gy[1]:

                              return v

                      gy = y.next()

                      gx = x.next()

                  elif gx[0] > gy[0]:

                      gy = y.next()

                  else:

                      gx = x.next()

          except StopIteration:

              return None

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# ancestor.py - generic DAG ancestor algorithm for mercurial
				#
				# Copyright 2006 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				import heapq

				def ancestor(a, b, pfunc):
				"""
				Returns the common ancestor of a and b that is furthest from a
				root (as measured by longest path) or None if no ancestor is
				found. If there are multiple common ancestors at the same
				distance, the first one found is returned.

				pfunc must return a list of parent vertices for a given vertex
				"""

				if a == b:
				return a

				a, b = sorted([a, b])

				# find depth from root of all ancestors
				# depth is stored as a negative for heapq
				parentcache = {}
				visit = [a, b]
				depth = {}
				while visit:
				vertex = visit[-1]
				pl = pfunc(vertex)
				parentcache[vertex] = pl
				if not pl:
				depth[vertex] = 0
				visit.pop()
				else:
				for p in pl:
				if p == a or p == b: # did we find a or b as a parent?
				return p # we're done
				if p not in depth:
				visit.append(p)
				if visit[-1] == vertex:
				# -(maximum distance of parents + 1)
				depth[vertex] = min([depth[p] for p in pl]) - 1
				visit.pop()

				# traverse ancestors in order of decreasing distance from root
				def ancestors(vertex):
				h = [(depth[vertex], vertex)]
				seen = set()
				while h:
				d, n = heapq.heappop(h)
				if n not in seen:
				seen.add(n)
				yield (d, n)
				for p in parentcache[n]:
				heapq.heappush(h, (depth[p], p))

				def generations(vertex):
				sg, s = None, set()
				for g, v in ancestors(vertex):
				if g != sg:
				if sg:
				yield sg, s
				sg, s = g, set((v,))
				else:
				s.add(v)
				yield sg, s

				x = generations(a)
				y = generations(b)
				gx = x.next()
				gy = y.next()

				# increment each ancestor list until it is closer to root than
				# the other, or they match
				try:
				while True:
				if gx[0] == gy[0]:
				for v in gx[1]:
				if v in gy[1]:
				return v
				gy = y.next()
				gx = x.next()
				elif gx[0] > gy[0]:
				gy = y.next()
				else:
				gx = x.next()
				except StopIteration:
				return None