upstream/mercurial-mirror Files · rust/chg/Cargo.toml

debugmergestate: make templated...

debugmergestate: make templated Our IntelliJ team wants to be able to read the merge state in order to help the user resolve merge conflicts. They had so far been reading file contents from p1() and p2() and their merge base. That is not ideal for several reasons (merge base is not necessarily the "graft base", renames are not handled, commands like `hg update -m` is not handled). It will get especially bad as of my D7827. This patch makes the output s a templated. I haven't bothered to make it complete (e.g. merge driver states are not handled), but it's probably good enough as a start. I've done a web search for "debugmergestate" and I can't find any indication that any tools currently rely on its output. If it turns out that we get bug reports for it once this is released, I won't object to backing this patch out on the stable branch (and then perhaps replace it by a separate command, or put it behind a new flag). The changes in test-backout.t are interesting, in particular this: ``` - other path: foo (node not stored in v1 format) + other path: (node foo) ``` I wonder if that means that we actually read v1 format incorrectly. That seems to be an old format that was switched away from in 2014, so it doesn't matter now anyway. Differential Revision: https://phab.mercurial-scm.org/D8120

Yuya Nishihara - - Load All Authors

File last commit:

r40323:7623199d default


                r44880:acbfa31c

default

Download file

             Cargo.toml
        
                    20 lines
            
             | 501 B
            
                | application/toml
            
             |
                TOMLLexer
            
             / rust / chg / Cargo.toml
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
rust-chg: add project skeleton...

              r40003
            
      [package]

      name = "chg"

      version = "0.1.0"

      authors = ["Yuya Nishihara <yuya@tcha.org>"]

      description = "Client for Mercurial command server with cHg extension"

      license = "GPL-2.0+"

      [dependencies]

      bytes = "0.4"

      futures = "0.1"

      libc = "0.2"

        Yuya Nishihara
    
rust-chg: depend on log and tokio_timer...

              r40323
            
      log = { version = "0.4", features = ["std"] }

        Yuya Nishihara
    
rust-chg: add project skeleton...

              r40003
            
      tokio = "0.1"

      tokio-hglib = "0.2"

      # TODO: "^0.2.3" once released. we need AsRawFd support.

      tokio-process = { git = "https://github.com/alexcrichton/tokio-process" }

        Yuya Nishihara
    
rust-chg: depend on log and tokio_timer...

              r40323
            
      tokio-timer = "0.2"

        Yuya Nishihara
    
rust-chg: add project skeleton...

              r40003
            
      [build-dependencies]

      cc = "1.0"

	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 rust-chg: add project skeleton...	r40003	[package]
		name = "chg"
		version = "0.1.0"
		authors = ["Yuya Nishihara <yuya@tcha.org>"]
		description = "Client for Mercurial command server with cHg extension"
		license = "GPL-2.0+"

		[dependencies]
		bytes = "0.4"
		futures = "0.1"
		libc = "0.2"
Yuya Nishihara rust-chg: depend on log and tokio_timer...	r40323	log = { version = "0.4", features = ["std"] }
Yuya Nishihara rust-chg: add project skeleton...	r40003	tokio = "0.1"
		tokio-hglib = "0.2"
		# TODO: "^0.2.3" once released. we need AsRawFd support.
		tokio-process = { git = "https://github.com/alexcrichton/tokio-process" }
Yuya Nishihara rust-chg: depend on log and tokio_timer...	r40323	tokio-timer = "0.2"
Yuya Nishihara rust-chg: add project skeleton...	r40003
		[build-dependencies]
		cc = "1.0"