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

Fix 3-way-merge of original parent, workdir and new parent....

Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.

mpm@selenic.com - - Load All Authors

File last commit:

r262:3db70014 default


                r862:d70c1c31

default

Download file

             demandload.py
        
                    15 lines
            
             | 384 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / demandload.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      def demandload(scope, modules):

          class d:

              def __getattr__(self, name):

                  mod = self.__dict__["mod"]

                  scope = self.__dict__["scope"]

                  scope[mod] = __import__(mod, scope, scope, [])

                  return getattr(scope[mod], name)

          for m in modules.split():

              dl = d()

              dl.mod = m

              dl.scope = scope

              scope[m] = dl

	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

				def demandload(scope, modules):
				class d:
				def __getattr__(self, name):
				mod = self.__dict__["mod"]
				scope = self.__dict__["scope"]
				scope[mod] = __import__(mod, scope, scope, [])
				return getattr(scope[mod], name)

				for m in modules.split():
				dl = d()
				dl.mod = m
				dl.scope = scope
				scope[m] = dl