upstream/mercurial-mirror Files · rust/hg-core/build.rs

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

Raphaël Gomès - - Load All Authors

File last commit:

r44786:d8d4fa9a default


                r44878:5e3402a0

default

Download file

             build.rs
        
                    25 lines
            
             | 548 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-core / build.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // build.rs

      //

      // Copyright 2020 Raphaël Gomès <rgomes@octobus.net>

      //

      // This software may be used and distributed according to the terms of the

      // GNU General Public License version 2 or any later version.

      #[cfg(feature = "with-re2")]

      use cc;

      #[cfg(feature = "with-re2")]

      fn compile_re2() {

          cc::Build::new()

              .cpp(true)

              .flag("-std=c++11")

              .file("src/re2/rust_re2.cpp")

              .compile("librustre.a");

          println!("cargo:rustc-link-lib=re2");

      }

      fn main() {

          #[cfg(feature = "with-re2")]

          compile_re2();

      }

	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

				// build.rs
				//
				// Copyright 2020 Raphaël Gomès <rgomes@octobus.net>
				//
				// This software may be used and distributed according to the terms of the
				// GNU General Public License version 2 or any later version.

				#[cfg(feature = "with-re2")]
				use cc;

				#[cfg(feature = "with-re2")]
				fn compile_re2() {
				cc::Build::new()
				.cpp(true)
				.flag("-std=c++11")
				.file("src/re2/rust_re2.cpp")
				.compile("librustre.a");

				println!("cargo:rustc-link-lib=re2");
				}

				fn main() {
				#[cfg(feature = "with-re2")]
				compile_re2();
				}