upstream/mercurial-mirror Files · mercurial/pure/osutil.py

subrepos: prompt on conflicts on update with dirty subrepos...

subrepos: prompt on conflicts on update with dirty subrepos Consider a repository with a single subrepository. The changesets in the main repository reference the subrepository changesets like this: m0 -> s0 m1 -> s1 m2 -> s2 Starting from a state (m1, s0), doing 'hg update m2' in the main repository will yield a conflict: the subrepo is at revision s0 but the target revision says it should be at revision s2. Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus ignore the conflict between the working copy and the target revision. With this change, the user is prompted to resolve the conflict by choosing which revision he wants. This is consistent with 'hg merge', which also prompts the user when it detects conflicts in the merged .hgsubstate files. The prompt looks like this: $ hg update tip subrepository sources for my-subrepo differ use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?

Benoit Boissinot - - Load All Authors

File last commit:

r10651:5f091fc1 default


                r13417:0748e18b

default

Download file

             osutil.py
        
                    59 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pure / osutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # osutil.py - pure Python version of osutil.c

      #

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

      #

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

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

      import os

      import stat as statmod

      posixfile = open

      def _mode_to_kind(mode):

          if statmod.S_ISREG(mode):

              return statmod.S_IFREG

          if statmod.S_ISDIR(mode):

              return statmod.S_IFDIR

          if statmod.S_ISLNK(mode):

              return statmod.S_IFLNK

          if statmod.S_ISBLK(mode):

              return statmod.S_IFBLK

          if statmod.S_ISCHR(mode):

              return statmod.S_IFCHR

          if statmod.S_ISFIFO(mode):

              return statmod.S_IFIFO

          if statmod.S_ISSOCK(mode):

              return statmod.S_IFSOCK

          return mode

      def listdir(path, stat=False, skip=None):

          '''listdir(path, stat=False) -> list_of_tuples

          Return a sorted list containing information about the entries

          in the directory.

          If stat is True, each element is a 3-tuple:

            (name, type, stat object)

          Otherwise, each element is a 2-tuple:

            (name, type)

          '''

          result = []

          prefix = path

          if not prefix.endswith(os.sep):

              prefix += os.sep

          names = os.listdir(path)

          names.sort()

          for fn in names:

              st = os.lstat(prefix + fn)

              if fn == skip and statmod.S_ISDIR(st.st_mode):

                  return []

              if stat:

                  result.append((fn, _mode_to_kind(st.st_mode), st))

              else:

                  result.append((fn, _mode_to_kind(st.st_mode)))

          return result

	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

				# osutil.py - pure Python version of osutil.c
				#
				# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				import os
				import stat as statmod

				posixfile = open

				def _mode_to_kind(mode):
				if statmod.S_ISREG(mode):
				return statmod.S_IFREG
				if statmod.S_ISDIR(mode):
				return statmod.S_IFDIR
				if statmod.S_ISLNK(mode):
				return statmod.S_IFLNK
				if statmod.S_ISBLK(mode):
				return statmod.S_IFBLK
				if statmod.S_ISCHR(mode):
				return statmod.S_IFCHR
				if statmod.S_ISFIFO(mode):
				return statmod.S_IFIFO
				if statmod.S_ISSOCK(mode):
				return statmod.S_IFSOCK
				return mode

				def listdir(path, stat=False, skip=None):
				'''listdir(path, stat=False) -> list_of_tuples

				Return a sorted list containing information about the entries
				in the directory.

				If stat is True, each element is a 3-tuple:

				(name, type, stat object)

				Otherwise, each element is a 2-tuple:

				(name, type)
				'''
				result = []
				prefix = path
				if not prefix.endswith(os.sep):
				prefix += os.sep
				names = os.listdir(path)
				names.sort()
				for fn in names:
				st = os.lstat(prefix + fn)
				if fn == skip and statmod.S_ISDIR(st.st_mode):
				return []
				if stat:
				result.append((fn, _mode_to_kind(st.st_mode), st))
				else:
				result.append((fn, _mode_to_kind(st.st_mode)))
				return result