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

Don't mark files with 'm'erge unless we're actually merging branches...

Don't mark files with 'm'erge unless we're actually merging branches For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.

mpm@selenic.com - - Load All Authors

File last commit:

r262:3db70014 default


                r764:eea96285

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