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

mergestate: determine if active without looking for state files on disk...

mergestate: determine if active without looking for state files on disk I couldn't think of a reason that we need to check state files on disk to determine if a merge is active. I could imagine them being for there for detecting broken state files that would then be cleaned up by some later command, but we always delete the entire `.hg/merge/` tree, so that doesn't seem to be it. The checks were added in (resolve: abort when not applicable (BC), 2014-04-18). Perhaps there were needed for that and then made obsolete by (resolve: don't abort resolve -l even when no merge is in progress, 2014-05-23). The reason I want to delete the checks is that I think `ms = mergestate.read(repo); ms.active() and ms.local` should be a valid pattern, but it crashes when the merge state file is an empty file if we consider mere presence of the file as "active". Differential Revision: https://phab.mercurial-scm.org/D8118

Gregory Szorc - - Load All Authors

File last commit:

r35587:96421278 default


                r44878:5e3402a0

default

Download file

             Cargo.toml
        
                    35 lines
            
             | 898 B
            
                | text/plain
            
             |
                TOMLLexer
            
             / rust / hgcli / Cargo.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      [package]

      name = "hgcli"

      version = "0.1.0"

      authors = ["Gregory Szorc <gregory.szorc@gmail.com>"]

      license = "GPL-2.0"

      build = "build.rs"

      [[bin]]

      name = "hg"

      path = "src/main.rs"

      [features]

      # localdev: detect Python in PATH and use files from source checkout.

      default = ["localdev"]

      localdev = []

      [dependencies]

      libc = "0.2.34"

      # We currently use a custom build of cpython and python27-sys with the

      # following changes:

      # * GILGuard call of prepare_freethreaded_python() is removed.

      # TODO switch to official release when our changes are incorporated.

      [dependencies.cpython]

      version = "0.1"

      default-features = false

      features = ["python27-sys"]

      git = "https://github.com/indygreg/rust-cpython.git"

      rev = "c90d65cf84abfffce7ef54476bbfed56017a2f52"

      [dependencies.python27-sys]

      version = "0.1.2"

      git = "https://github.com/indygreg/rust-cpython.git"

      rev = "c90d65cf84abfffce7ef54476bbfed56017a2f52"

	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

				[package]
				name = "hgcli"
				version = "0.1.0"
				authors = ["Gregory Szorc <gregory.szorc@gmail.com>"]
				license = "GPL-2.0"

				build = "build.rs"

				[[bin]]
				name = "hg"
				path = "src/main.rs"

				[features]
				# localdev: detect Python in PATH and use files from source checkout.
				default = ["localdev"]
				localdev = []

				[dependencies]
				libc = "0.2.34"

				# We currently use a custom build of cpython and python27-sys with the
				# following changes:
				# * GILGuard call of prepare_freethreaded_python() is removed.
				# TODO switch to official release when our changes are incorporated.
				[dependencies.cpython]
				version = "0.1"
				default-features = false
				features = ["python27-sys"]
				git = "https://github.com/indygreg/rust-cpython.git"
				rev = "c90d65cf84abfffce7ef54476bbfed56017a2f52"

				[dependencies.python27-sys]
				version = "0.1.2"
				git = "https://github.com/indygreg/rust-cpython.git"
				rev = "c90d65cf84abfffce7ef54476bbfed56017a2f52"