upstream/mercurial-mirror Files · contrib/merge-lists/Cargo.toml

rhg: support "!" syntax for disabling extensions...

rhg: support "!" syntax for disabling extensions This makes it so that calls in test-log.t do not fall back immediately because of the disabled extension, instead going through the CLI parsing code, which breaks because of invalid UTF-8 in a flag. I *think* clap 3.x+ supports this? I'm not sure, and we have to upgrade the minimum Rust version to use clap 3.x anyway which is out of scope for this series, so let's just kick that can down the road a little bit.

Martin von Zweigbergk - - Load All Authors

File last commit:

r49874:681b25ea default


                r50372:f3cd2d6e

default

Download file

             Cargo.toml
        
                    21 lines
            
             | 599 B
            
                | application/toml
            
             |
                TOMLLexer
            
             / contrib / merge-lists / Cargo.toml
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin von Zweigbergk
    
contrib: add a partial-merge tool for sorted lists (such as Python imports)...

              r49874
            
      # A tool that performs a 3-way merge, resolving conflicts in sorted lists and

      # leaving other conflicts unchanged. This is useful with Mercurial's support

      # for partial merge tools (configured in `[partial-merge-tools]`).

      [package]

      name = "merge-lists"

      version = "0.1.0"

      edition = "2021"

      # We need https://github.com/rust-lang/rust/pull/89825

      rust-version = "1.59"

      [dependencies]

      clap = { version = "3.1.6", features = ["derive"] }

      itertools = "0.10.3"

      regex = "1.5.5"

      similar = { version="2.1.0", features = ["bytes"] }

      [dev-dependencies]

      assert_cmd = "2.0.4"

      insta = "1.13.0"

      tempdir = "0.3.7"

	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

Martin von Zweigbergk contrib: add a partial-merge tool for sorted lists (such as Python imports)...	r49874	# A tool that performs a 3-way merge, resolving conflicts in sorted lists and
		# leaving other conflicts unchanged. This is useful with Mercurial's support
		# for partial merge tools (configured in `[partial-merge-tools]`).

		[package]
		name = "merge-lists"
		version = "0.1.0"
		edition = "2021"
		# We need https://github.com/rust-lang/rust/pull/89825
		rust-version = "1.59"

		[dependencies]
		clap = { version = "3.1.6", features = ["derive"] }
		itertools = "0.10.3"
		regex = "1.5.5"
		similar = { version="2.1.0", features = ["bytes"] }

		[dev-dependencies]
		assert_cmd = "2.0.4"
		insta = "1.13.0"
		tempdir = "0.3.7"