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

ui: check for progress singleton when clearing progress bar (issue5684)...

ui: check for progress singleton when clearing progress bar (issue5684) A combination of wrapping `ui` and progress bars interrupted by exceptions can lead to the progress bar not being cleared when the exception error is printed. This results in corrupted-looking output like this: ``` updating [===============================> ] 1/2u nresolved conflicts (see hg resolve, then hg rebase --continue) ``` This is because in `ui._progclear`, we only check the local reference to the progress bar, not whether or not there is an instance of the singleton. When a progress bar is interrupted by an exception, the exception printing in `scmutil.callcatch` uses the original instance of the `ui` object, not the wrapped copy that has `_progbar` set. When consider whether or not to clear the progress bar, check for the existence of the singleton, rather than just whether or not we have a local reference to it. Differential Revision: https://phab.mercurial-scm.org/D743

Yuya Nishihara - - Load All Authors

File last commit:

r32506:2dcb3d52 default


                r34346:0e4bed5c

stable

Download file

             mpatchbuild.py
        
                    35 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cffi / mpatchbuild.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()

      mpatch_c = os.path.join(os.path.join(os.path.dirname(__file__), '..',

                                           'mpatch.c'))

        Yuya Nishihara
    
cffi: put compiled modules into mercurial.cffi package...

              r32506
            
      ffi.set_source("mercurial.cffi._mpatch", open(mpatch_c).read(),

        Yuya Nishihara
    
cffi: rename build scripts...

              r32505
            
                     include_dirs=["mercurial"])

      ffi.cdef("""

      struct mpatch_frag {

             int start, end, len;

             const char *data;

      };

      struct mpatch_flist {

             struct mpatch_frag *base, *head, *tail;

      };

      extern "Python" struct mpatch_flist* cffi_get_next_item(void*, ssize_t);

      int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist** res);

      ssize_t mpatch_calcsize(size_t len, struct mpatch_flist *l);

      void mpatch_lfree(struct mpatch_flist *a);

      static int mpatch_apply(char *buf, const char *orig, size_t len,

                              struct mpatch_flist *l);

      struct mpatch_flist *mpatch_fold(void *bins,

                             struct mpatch_flist* (*get_next_item)(void*, ssize_t),

                             ssize_t start, ssize_t end);

      """)

      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()
		mpatch_c = os.path.join(os.path.join(os.path.dirname(__file__), '..',
		'mpatch.c'))
Yuya Nishihara cffi: put compiled modules into mercurial.cffi package...	r32506	ffi.set_source("mercurial.cffi._mpatch", open(mpatch_c).read(),
Yuya Nishihara cffi: rename build scripts...	r32505	include_dirs=["mercurial"])
		ffi.cdef("""

		struct mpatch_frag {
		int start, end, len;
		const char *data;
		};

		struct mpatch_flist {
		struct mpatch_frag base, head, *tail;
		};

		extern "Python" struct mpatch_flist* cffi_get_next_item(void*, ssize_t);

		int mpatch_decode(const char bin, ssize_t len, struct mpatch_flist* res);
		ssize_t mpatch_calcsize(size_t len, struct mpatch_flist *l);
		void mpatch_lfree(struct mpatch_flist *a);
		static int mpatch_apply(char buf, const char orig, size_t len,
		struct mpatch_flist *l);
		struct mpatch_flist mpatch_fold(void bins,
		struct mpatch_flist* (get_next_item)(void, ssize_t),
		ssize_t start, ssize_t end);
		""")

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