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

merge: don't auto-pick destination with `hg merge 'wdir()'`...

merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996

Gregory Szorc - - Load All Authors

File last commit:

r35587:96421278 default


                r44638:1850066f

default

Download file

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

        Gregory Szorc
    
rust: implementation of `hg`...

              r35587
            
      [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

Gregory Szorc rust: implementation of `hg`...	r35587	[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"