upstream/mercurial-mirror Files · rust/chg/src/lib.rs

mergestate: store about files resolved in favour of other...

mergestate: store about files resolved in favour of other Committing a merge sometimes wrongly creates a new filenode where it can re-use an existing one. This happens because the commit code does it's own calculation and does not know what happened on merge. This starts storing information in mergestate about files which were automatically merged and the other/remote version of file was used. We need this information at commit to pick the filenode parent for the new commit. This issue was found by Pierre-Yves David and idea to store the relevant parts in mergestate is also suggested by him. Somethings which can be further investigated are: 1) refactoring of commit logic more to depend on this information 2) maybe a more generic solution? Differential Revision: https://phab.mercurial-scm.org/D8392

Yuya Nishihara - - Load All Authors

File last commit:

r45161:bb936e25 default


                r45178:1b8fd4af

default

Download file

             lib.rs
        
                    26 lines
            
             | 592 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: spawn server process if not running...

              r45161
            
      #[macro_use]

      extern crate log;

        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: spawn server process if not running...

              r45161
            
      extern crate tokio_timer;

        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: spawn server process if not running...	r45161	#[macro_use]
		extern crate log;
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: spawn server process if not running...	r45161	extern crate tokio_timer;
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};