upstream/mercurial-mirror Files · mercurial/thirdparty/cbor/README.rst

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels...

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972

Pulkit Goyal - - Load All Authors

File last commit:

r37144:4bd73a95 default


                r49387:18a01dce

default

Download file

             README.rst
        
                    24 lines
            
             | 1.1 KiB
            
                | text/x-rst
            
             |
                RstLexer
            
             / mercurial / thirdparty / cbor / README.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pulkit Goyal
    
thirdparty: vendor cbor2 python library...

              r37144
            
      .. image:: https://travis-ci.org/agronholm/cbor2.svg?branch=master

        :target: https://travis-ci.org/agronholm/cbor2

        :alt: Build Status

      .. image:: https://coveralls.io/repos/github/agronholm/cbor2/badge.svg?branch=master

        :target: https://coveralls.io/github/agronholm/cbor2?branch=master

        :alt: Code Coverage

      This library provides encoding and decoding for the Concise Binary Object Representation (CBOR)

      (`RFC 7049`_) serialization format.

      There exists another Python CBOR implementation (cbor) which is faster on CPython due to its C

      extensions. On PyPy, cbor2 and cbor are almost identical in performance. The other implementation

      also lacks documentation and a comprehensive test suite, does not support most standard extension

      tags and is known to crash (segfault) when passed a cyclic structure (say, a list containing

      itself).

      .. _RFC 7049: https://tools.ietf.org/html/rfc7049

      Project links

      -------------

      * `Documentation <http://cbor2.readthedocs.org/>`_

      * `Source code <https://github.com/agronholm/cbor2>`_

      * `Issue tracker <https://github.com/agronholm/cbor2/issues>`_

	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

Pulkit Goyal thirdparty: vendor cbor2 python library...	r37144	.. image:: https://travis-ci.org/agronholm/cbor2.svg?branch=master
		:target: https://travis-ci.org/agronholm/cbor2
		:alt: Build Status
		.. image:: https://coveralls.io/repos/github/agronholm/cbor2/badge.svg?branch=master
		:target: https://coveralls.io/github/agronholm/cbor2?branch=master
		:alt: Code Coverage

		This library provides encoding and decoding for the Concise Binary Object Representation (CBOR)
		(`RFC 7049`_) serialization format.

		There exists another Python CBOR implementation (cbor) which is faster on CPython due to its C
		extensions. On PyPy, cbor2 and cbor are almost identical in performance. The other implementation
		also lacks documentation and a comprehensive test suite, does not support most standard extension
		tags and is known to crash (segfault) when passed a cyclic structure (say, a list containing
		itself).

		.. _RFC 7049: https://tools.ietf.org/html/rfc7049

		Project links
		-------------

		* `Documentation <http://cbor2.readthedocs.org/>`_
		* `Source code <https://github.com/agronholm/cbor2>`_
		* `Issue tracker <https://github.com/agronholm/cbor2/issues>`_