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

revert: properly back up added files with local modification...

revert: properly back up added files with local modification These files were previously not backed up because the backup mechanism was not smart enough. This leads to data lose for the user since uncommitted contents were discarded. We now properly move the modified version to <filename>.orig before deleting it. We have to use a small hack to do a different action if "--no-backup" is specified. This is needed because the backup process is actually a move (not a copy) so the file is already missing when we backup. The internet kitten is a bit disapointed about that, but such is life. This patch concludes the "lets refactor revert" phases. We can now open the "Lets find stupid bug with renames and merge" phases. I'm sure that now that the code is clearer we could do it in another simpler way, but I consider the current improvement good enough for now.

Siddharth Agarwal - - Load All Authors

File last commit:

r18894:ed46c2b9 default


                r22611:2ff28e07

default

Download file

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

      # dicthelpers.py - helper routines for Python dicts

      #

      # Copyright 2013 Facebook

      #

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

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

      def diff(d1, d2, default=None):

          '''Return all key-value pairs that are different between d1 and d2.

          This includes keys that are present in one dict but not the other, and

          keys whose values are different. The return value is a dict with values

          being pairs of values from d1 and d2 respectively, and missing values

          treated as default, so if a value is missing from one dict and the same as

          default in the other, it will not be returned.'''

          res = {}

          if d1 is d2:

              # same dict, so diff is empty

              return res

          for k1, v1 in d1.iteritems():

              v2 = d2.get(k1, default)

              if v1 != v2:

                  res[k1] = (v1, v2)

          for k2 in d2:

              if k2 not in d1:

                  v2 = d2[k2]

                  if v2 != default:

                      res[k2] = (default, v2)

          return res

      def join(d1, d2, default=None):

          '''Return all key-value pairs from both d1 and d2.

          This is akin to an outer join in relational algebra. The return value is a

          dict with values being pairs of values from d1 and d2 respectively, and

          missing values represented as default.'''

          res = {}

          for k1, v1 in d1.iteritems():

              if k1 in d2:

                  res[k1] = (v1, d2[k1])

              else:

                  res[k1] = (v1, default)

          if d1 is d2:

              return res

          for k2 in d2:

              if k2 not in d1:

                  res[k2] = (default, d2[k2])

          return res

	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

				# dicthelpers.py - helper routines for Python dicts
				#
				# Copyright 2013 Facebook
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				def diff(d1, d2, default=None):
				'''Return all key-value pairs that are different between d1 and d2.

				This includes keys that are present in one dict but not the other, and
				keys whose values are different. The return value is a dict with values
				being pairs of values from d1 and d2 respectively, and missing values
				treated as default, so if a value is missing from one dict and the same as
				default in the other, it will not be returned.'''
				res = {}
				if d1 is d2:
				# same dict, so diff is empty
				return res

				for k1, v1 in d1.iteritems():
				v2 = d2.get(k1, default)
				if v1 != v2:
				res[k1] = (v1, v2)

				for k2 in d2:
				if k2 not in d1:
				v2 = d2[k2]
				if v2 != default:
				res[k2] = (default, v2)

				return res

				def join(d1, d2, default=None):
				'''Return all key-value pairs from both d1 and d2.

				This is akin to an outer join in relational algebra. The return value is a
				dict with values being pairs of values from d1 and d2 respectively, and
				missing values represented as default.'''
				res = {}

				for k1, v1 in d1.iteritems():
				if k1 in d2:
				res[k1] = (v1, d2[k1])
				else:
				res[k1] = (v1, default)

				if d1 is d2:
				return res

				for k2 in d2:
				if k2 not in d1:
				res[k2] = (default, d2[k2])

				return res