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
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      extern crate bytes;

      #[macro_use]

      extern crate futures;

      extern crate libc;

      #[macro_use]

      extern crate log;

      extern crate tokio;

      extern crate tokio_hglib;

      extern crate tokio_process;

      extern crate tokio_timer;

      mod attachio;

      mod clientext;

      pub mod locator;

      pub mod message;

      pub mod procutil;

      mod runcommand;

      mod uihandler;

      pub use clientext::ChgClientExt;

      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

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

				extern crate bytes;
				#[macro_use]
				extern crate futures;
				extern crate libc;
				#[macro_use]
				extern crate log;
				extern crate tokio;
				extern crate tokio_hglib;
				extern crate tokio_process;
				extern crate tokio_timer;

				mod attachio;
				mod clientext;
				pub mod locator;
				pub mod message;
				pub mod procutil;
				mod runcommand;
				mod uihandler;

				pub use clientext::ChgClientExt;
				pub use uihandler::{ChgUiHandler, SystemHandler};