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

largefiles: better handling of merge of largefiles that not are available...

largefiles: better handling of merge of largefiles that not are available Before, when merging revisions with missing largefiles, the missing largefiles would be fetched as a part of the merge. If that failed (for example because the main repository temporarily was unavailable), the largefile would be left missing. However, the next commit would abort and (seemed to) fail when markcommitted tried to mark the standin file as normal and thus had to hash the largefile that didn't exist. (Actually, the commit would succeed but the largefile update that follows right after the commit transaction would abort - quite confusing.) To fix that, make sure that synclfdirstate only marks files as normal if they actually exist.

Pierre-Yves David - - Load All Authors

File last commit:

r26587:56b2bcea default


                r26627:832c98d7

default

Download file

             destutil.py
        
                    55 lines
            
             | 1.9 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / destutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # destutil.py - Mercurial utility function for command destination

      #

      #  Copyright Matt Mackall <mpm@selenic.com> and other

      #

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

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

      from .i18n import _

      from . import (

          error,

          obsolete,

      )

      def destupdate(repo):

          """destination for bare update operation

          """

          # Here is where we should consider bookmarks, divergent bookmarks, and tip

          # of current branch; but currently we are only checking the branch tips.

          node = None

          wc = repo[None]

          p1 = wc.p1()

          try:

              node = repo.branchtip(wc.branch())

          except error.RepoLookupError:

              if wc.branch() == 'default': # no default branch!

                  node = repo.lookup('tip') # update to tip

              else:

                  raise error.Abort(_("branch %s not found") % wc.branch())

          if p1.obsolete() and not p1.children():

              # allow updating to successors

              successors = obsolete.successorssets(repo, p1.node())

              # behavior of certain cases is as follows,

              #

              # divergent changesets: update to highest rev, similar to what

              #     is currently done when there are more than one head

              #     (i.e. 'tip')

              #

              # replaced changesets: same as divergent except we know there

              # is no conflict

              #

              # pruned changeset: no update is done; though, we could

              #     consider updating to the first non-obsolete parent,

              #     similar to what is current done for 'hg prune'

              if successors:

                  # flatten the list here handles both divergent (len > 1)

                  # and the usual case (len = 1)

                  successors = [n for sub in successors for n in sub]

                  # get the max revision for the given successors set,

                  # i.e. the 'tip' of a set

                  node = repo.revs('max(%ln)', successors).first()

          return repo[node].rev()

	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

				# destutil.py - Mercurial utility function for command destination
				#
				# Copyright Matt Mackall <mpm@selenic.com> and other
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from .i18n import _
				from . import (
				error,
				obsolete,
				)

				def destupdate(repo):
				"""destination for bare update operation
				"""
				# Here is where we should consider bookmarks, divergent bookmarks, and tip
				# of current branch; but currently we are only checking the branch tips.
				node = None
				wc = repo[None]
				p1 = wc.p1()
				try:
				node = repo.branchtip(wc.branch())
				except error.RepoLookupError:
				if wc.branch() == 'default': # no default branch!
				node = repo.lookup('tip') # update to tip
				else:
				raise error.Abort(_("branch %s not found") % wc.branch())

				if p1.obsolete() and not p1.children():
				# allow updating to successors
				successors = obsolete.successorssets(repo, p1.node())

				# behavior of certain cases is as follows,
				#
				# divergent changesets: update to highest rev, similar to what
				# is currently done when there are more than one head
				# (i.e. 'tip')
				#
				# replaced changesets: same as divergent except we know there
				# is no conflict
				#
				# pruned changeset: no update is done; though, we could
				# consider updating to the first non-obsolete parent,
				# similar to what is current done for 'hg prune'

				if successors:
				# flatten the list here handles both divergent (len > 1)
				# and the usual case (len = 1)
				successors = [n for sub in successors for n in sub]

				# get the max revision for the given successors set,
				# i.e. the 'tip' of a set
				node = repo.revs('max(%ln)', successors).first()
				return repo[node].rev()