upstream/mercurial-mirror Files · mercurial/thirdparty/cbor/__init__.py

merge: use merge.clean_update() when applicable...

merge: use merge.clean_update() when applicable We have had this higher-level function (higher than `merge.update()`, that is) for a while. Let's simply some callers by using it. I don't know why I didn't do this when I introduced the function. After this patch, there are no remaining callers that call `hg.updaterepo()` with `overwrite=True`. We'll clean that up soon. Differential Revision: https://phab.mercurial-scm.org/D9063

Gregory Szorc - - Load All Authors

File last commit:

r37231:3bc609bc default


                r46133:03726f5b

default

Download file

             __init__.py
        
                    10 lines
            
             | 141 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / thirdparty / cbor / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from .cbor2 import (

          CBORDecodeError,

          CBORDecoder,

          CBOREncodeError,

          CBOREncoder,

          dump,

          dumps,

          load,

          loads,

      )

	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

				from .cbor2 import (
				CBORDecodeError,
				CBORDecoder,
				CBOREncodeError,
				CBOREncoder,
				dump,
				dumps,
				load,
				loads,
				)