upstream/mercurial-mirror Files · mercurial/cffi/bdiffbuild.py

namespaces: let namespaces override singlenode() definition...

namespaces: let namespaces override singlenode() definition Some namespaces have multiple nodes per name (meaning that their namemap() returns multiple nodes). One such namespace is the "topics" namespace (from the evolve repo). We also have our own internal namespace at Google (for review units) that has multiple nodes per name. These namespaces may not want to use the default "pick highest revnum" resolution that we currently use when resolving a name to a single node. As an example, they may decide that `hg co <name>` should check out a commit that's last in some sense even if an earlier commit had just been amended and thus had a higher revnum [1]. This patch gives the namespace the option to continue to return multiple nodes and to override how the best node is picked. Allowing namespaces to override that may also be useful as an optimization (it may be cheaper for the namespace to find just that node). I have been arguing (in D3715) for using all the nodes returned from namemap() when resolving the symbol to a revset, so e.g. `hg log -r stable` would resolve to *all* nodes on stable, not just the one with the highest revnum (except that I don't actually think we should change it for the branch namespace because of BC). Most people seem opposed to that. If we decide not to do it, I think we can deprecate the namemap() function in favor of the new singlenode() (I find it weird to have namespaces, like the branch namespace, where namemap() isn't nodemap()'s inverse). I therefore think this patch makes sense regardless of what we decide on that issue. [1] Actually, even the branch namespace would have wanted to override singlenode() if it had supported multiple nodes. That's because closes branch heads are mostly ignored, so "hg co default" will not check out the highest-revnum node if that's a closed head. Differential Revision: https://phab.mercurial-scm.org/D3852

Yuya Nishihara - - Load All Authors

File last commit:

r32506:2dcb3d52 default


                r38505:4c068365

@58 default

Download file

             bdiffbuild.py
        
                    32 lines
            
             | 773 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cffi / bdiffbuild.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
cffi: rename build scripts...

              r32505
            
      from __future__ import absolute_import

      import cffi

      import os

      ffi = cffi.FFI()

        Augie Fackler
    
cleanup: fix some latent open(path).read() et al calls we previously missed...

              r36966
            
      with open(os.path.join(os.path.join(os.path.dirname(__file__), '..'),

                             'bdiff.c')) as f:

          ffi.set_source("mercurial.cffi._bdiff",

                         f.read(), include_dirs=['mercurial'])

        Yuya Nishihara
    
cffi: rename build scripts...

              r32505
            
      ffi.cdef("""

      struct bdiff_line {

          int hash, n, e;

          ssize_t len;

          const char *l;

      };

      struct bdiff_hunk;

      struct bdiff_hunk {

          int a1, a2, b1, b2;

          struct bdiff_hunk *next;

      };

      int bdiff_splitlines(const char *a, ssize_t len, struct bdiff_line **lr);

      int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b, int bn,

          struct bdiff_hunk *base);

      void bdiff_freehunks(struct bdiff_hunk *l);

      void free(void*);

      """)

      if __name__ == '__main__':

          ffi.compile()

	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

Yuya Nishihara cffi: rename build scripts...	r32505	from __future__ import absolute_import

		import cffi
		import os

		ffi = cffi.FFI()
Augie Fackler cleanup: fix some latent open(path).read() et al calls we previously missed...	r36966	with open(os.path.join(os.path.join(os.path.dirname(__file__), '..'),
		'bdiff.c')) as f:
		ffi.set_source("mercurial.cffi._bdiff",
		f.read(), include_dirs=['mercurial'])
Yuya Nishihara cffi: rename build scripts...	r32505	ffi.cdef("""
		struct bdiff_line {
		int hash, n, e;
		ssize_t len;
		const char *l;
		};

		struct bdiff_hunk;
		struct bdiff_hunk {
		int a1, a2, b1, b2;
		struct bdiff_hunk *next;
		};

		int bdiff_splitlines(const char a, ssize_t len, struct bdiff_line *lr);
		int bdiff_diff(struct bdiff_line a, int an, struct bdiff_line b, int bn,
		struct bdiff_hunk *base);
		void bdiff_freehunks(struct bdiff_hunk *l);
		void free(void*);
		""")

		if __name__ == '__main__':
		ffi.compile()