upstream/mercurial-mirror Files · rust/chg/src/lib.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

Yuya Nishihara - - Load All Authors

File last commit:

r40013:74da9d99 default


                r44878:5e3402a0

default

Download file

             lib.rs
        
                    23 lines
            
             | 535 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / chg / src / lib.rs
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
rust-chg: add wrapper around C function

              r40006
            
      // Copyright 2018 Yuya Nishihara <yuya@tcha.org>

      //

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

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

        Yuya Nishihara
    
rust-chg: add parser for request messages sent to "S" channel...

              r40007
            
      extern crate bytes;

        Yuya Nishihara
    
rust-chg: add future that handles "attachio" request...

              r40008
            
      #[macro_use]

      extern crate futures;

        Yuya Nishihara
    
rust-chg: add wrapper around C function

              r40006
            
      extern crate libc;

        Yuya Nishihara
    
rust-chg: add future that handles "attachio" request...

              r40008
            
      extern crate tokio;

        Yuya Nishihara
    
rust-chg: add parser for request messages sent to "S" channel...

              r40007
            
      extern crate tokio_hglib;

        Yuya Nishihara
    
rust-chg: add callback to handle pager and shell command requests...

              r40010
            
      extern crate tokio_process;

        Yuya Nishihara
    
rust-chg: add wrapper around C function

              r40006
            
        Yuya Nishihara
    
rust-chg: add Client extensions to run cHg-specific requests...

              r40013
            
      mod attachio;

      mod clientext;

        Yuya Nishihara
    
rust-chg: port basic socket path handling from cHg of C...

              r40012
            
      pub mod locator;

        Yuya Nishihara
    
rust-chg: add parser for request messages sent to "S" channel...

              r40007
            
      pub mod message;

        Yuya Nishihara
    
rust-chg: add wrapper around C function

              r40006
            
      pub mod procutil;

        Yuya Nishihara
    
rust-chg: add Client extensions to run cHg-specific requests...

              r40013
            
      mod runcommand;

        Yuya Nishihara
    
rust-chg: add callback to handle pager and shell command requests...

              r40010
            
      mod uihandler;

        Yuya Nishihara
    
rust-chg: add Client extensions to run cHg-specific requests...

              r40013
            
      pub use clientext::ChgClientExt;

        Yuya Nishihara
    
rust-chg: add callback to handle pager and shell command requests...

              r40010
            
      pub use uihandler::{ChgUiHandler, SystemHandler};

	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 wrapper around C function	r40006	// Copyright 2018 Yuya Nishihara <yuya@tcha.org>
		//
		// This software may be used and distributed according to the terms of the
		// GNU General Public License version 2 or any later version.

Yuya Nishihara rust-chg: add parser for request messages sent to "S" channel...	r40007	extern crate bytes;
Yuya Nishihara rust-chg: add future that handles "attachio" request...	r40008	#[macro_use]
		extern crate futures;
Yuya Nishihara rust-chg: add wrapper around C function	r40006	extern crate libc;
Yuya Nishihara rust-chg: add future that handles "attachio" request...	r40008	extern crate tokio;
Yuya Nishihara rust-chg: add parser for request messages sent to "S" channel...	r40007	extern crate tokio_hglib;
Yuya Nishihara rust-chg: add callback to handle pager and shell command requests...	r40010	extern crate tokio_process;
Yuya Nishihara rust-chg: add wrapper around C function	r40006
Yuya Nishihara rust-chg: add Client extensions to run cHg-specific requests...	r40013	mod attachio;
		mod clientext;
Yuya Nishihara rust-chg: port basic socket path handling from cHg of C...	r40012	pub mod locator;
Yuya Nishihara rust-chg: add parser for request messages sent to "S" channel...	r40007	pub mod message;
Yuya Nishihara rust-chg: add wrapper around C function	r40006	pub mod procutil;
Yuya Nishihara rust-chg: add Client extensions to run cHg-specific requests...	r40013	mod runcommand;
Yuya Nishihara rust-chg: add callback to handle pager and shell command requests...	r40010	mod uihandler;

Yuya Nishihara rust-chg: add Client extensions to run cHg-specific requests...	r40013	pub use clientext::ChgClientExt;
Yuya Nishihara rust-chg: add callback to handle pager and shell command requests...	r40010	pub use uihandler::{ChgUiHandler, SystemHandler};