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

commit: reorder if-else conditional to give mergestate info priority...

commit: reorder if-else conditional to give mergestate info priority Looking at the code now, I was unable to find a good reason as why we only rely on mergestate extras info after checking whether a filelog parent is ancestor of other or not. I mean if we have stored in mergestate that `other` was chosed, we should blindly pick that one. This cleanup will also help introduce more cases when both `fparent1` and `fparent2` are non-null but using info from mergestate, we can fastpath. Differential Revision: https://phab.mercurial-scm.org/D10116

Simon Sapin - - Load All Authors

File last commit:

r47344:a687a7f2 default


                r47403:39be29fa

default

Download file

             config.rs
        
                    16 lines
            
             | 429 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-core / src / config.rs
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Raphaël Gomès
    
hg-core: add basic config module...

              r46803
            
      // config.rs

      //

      // Copyright 2020

      //      Valentin Gatien-Baron,

      //      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.

      //! Mercurial config parsing and interfaces.

      mod config;

      mod layer;

        Simon Sapin
    
rust: Move config value parsing functions to a new module...

              r47344
            
      mod values;

        Simon Sapin
    
rust: Add a `ConfigValueParseError` variant to common errors...

              r47340
            
      pub use config::{Config, ConfigValueParseError};

        Simon Sapin
    
rust: Parse system and user configuration...

              r47212
            
      pub use layer::{ConfigError, ConfigParseError};

	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

Raphaël Gomès hg-core: add basic config module...	r46803	// config.rs
		//
		// Copyright 2020
		// Valentin Gatien-Baron,
		// 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.

		//! Mercurial config parsing and interfaces.

		mod config;
		mod layer;
Simon Sapin rust: Move config value parsing functions to a new module...	r47344	mod values;
Simon Sapin rust: Add a `ConfigValueParseError` variant to common errors...	r47340	pub use config::{Config, ConfigValueParseError};
Simon Sapin rust: Parse system and user configuration...	r47212	pub use layer::{ConfigError, ConfigParseError};