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

rebase: respect checkunknown and checkignored in more cases...

rebase: respect checkunknown and checkignored in more cases checkunknown and checkignored are currently respected for updates and regular merges, but not for certain kinds of rebases. To be precise, they aren't respected for rebases when: (1) we're rebasing while currently on the destination commit, and (2) an untracked or ignored file F is currently in the working copy, and (3) the same file F is in a source commit, and (4) F has different contents in the source commit. This happens because rebases set force to True when calling merge.update. Setting force to True makes a lot of sense in general, but it turns out the force option is overloaded: there's a deprecated '--force' option in merge that allows you to merge in outstanding changes, including changes in untracked files. We use the 'mergeforce' parameter to tell those two cases apart. I think the behavior during rebases when checkunknown is 'abort' (the default) is wrong -- we should abort on or overwrite differing untracked files, not try to merge them in. However that currently breaks rebases by aborting in the middle -- we need better handling for that case before we can change the default.

Gregory Szorc - - Load All Authors

File last commit:

r27336:80214358 default


                r28022:e397b58c

default

Download file

             diffhelpers.py
        
                    62 lines
            
             | 1.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pure / diffhelpers.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # diffhelpers.py - pure Python implementation of diffhelpers.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.

      from __future__ import absolute_import

      def addlines(fp, hunk, lena, lenb, a, b):

          while True:

              todoa = lena - len(a)

              todob = lenb - len(b)

              num = max(todoa, todob)

              if num == 0:

                  break

              for i in xrange(num):

                  s = fp.readline()

                  c = s[0]

                  if s == "\\ No newline at end of file\n":

                      fix_newline(hunk, a, b)

                      continue

                  if c == "\n":

                      # Some patches may be missing the control char

                      # on empty lines. Supply a leading space.

                      s = " \n"

                  hunk.append(s)

                  if c == "+":

                      b.append(s[1:])

                  elif c == "-":

                      a.append(s)

                  else:

                      b.append(s[1:])

                      a.append(s)

          return 0

      def fix_newline(hunk, a, b):

          l = hunk[-1]

          # tolerate CRLF in last line

          if l.endswith('\r\n'):

              hline = l[:-2]

          else:

              hline = l[:-1]

          c = hline[0]

          if c in " +":

              b[-1] = hline[1:]

          if c in " -":

              a[-1] = hline

          hunk[-1] = hline

          return 0

      def testhunk(a, b, bstart):

          alen = len(a)

          blen = len(b)

          if alen > blen - bstart:

              return -1

          for i in xrange(alen):

              if a[i][1:] != b[i + bstart]:

                  return -1

          return 0

	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

				# diffhelpers.py - pure Python implementation of diffhelpers.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.

				from __future__ import absolute_import

				def addlines(fp, hunk, lena, lenb, a, b):
				while True:
				todoa = lena - len(a)
				todob = lenb - len(b)
				num = max(todoa, todob)
				if num == 0:
				break
				for i in xrange(num):
				s = fp.readline()
				c = s[0]
				if s == "\\ No newline at end of file\n":
				fix_newline(hunk, a, b)
				continue
				if c == "\n":
				# Some patches may be missing the control char
				# on empty lines. Supply a leading space.
				s = " \n"
				hunk.append(s)
				if c == "+":
				b.append(s[1:])
				elif c == "-":
				a.append(s)
				else:
				b.append(s[1:])
				a.append(s)
				return 0

				def fix_newline(hunk, a, b):
				l = hunk[-1]
				# tolerate CRLF in last line
				if l.endswith('\r\n'):
				hline = l[:-2]
				else:
				hline = l[:-1]
				c = hline[0]

				if c in " +":
				b[-1] = hline[1:]
				if c in " -":
				a[-1] = hline
				hunk[-1] = hline
				return 0


				def testhunk(a, b, bstart):
				alen = len(a)
				blen = len(b)
				if alen > blen - bstart:
				return -1
				for i in xrange(alen):
				if a[i][1:] != b[i + bstart]:
				return -1
				return 0