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

copies: filter invalid copies only at end of pathcopies() (issue6163)...

copies: filter invalid copies only at end of pathcopies() (issue6163) copies._filter() filters out copies whose source file does not exist in the start commit or whose target file does not exist in the end commit. We do that after chaining copies with dirstate copies or backward renames from another branch. We also do at the end of the changeset-centric copy tracing. The filtering means that we will remove copies to/from files that did not exist in some intermediate commit. That is inconsistent with what we do if a file has been deleted and then re-added (we allow updating across that). Copying the two first examples from issue6163: @ 4 'rename x to y' | o 3 'add x again' | o 2 'remove x' | | o 1 'modify x' |/ o 0 'add x' @ 4 'rename x to y' | o 3 'add x again' | | o 2 'modify x' | | | o 1 'add x' |/ o 0 'base' When doing `hg rebase -r 1 -d 4` in the first case, it succeeds, but `hg rebase -r 2 -d 4` in the second case does not. That's because we chain and filter via commit 0, which does not have file 'x' in the second case. IMO, that's clearly inconsistent. So this patch removes the filtering step so it only happens at the end. If a file was temporarily removed, whether via a merge base or not, it will now still be considered the same file. That fixes issue6163 for the changeset-centric case. Differential Revision: https://phab.mercurial-scm.org/D6603

Yuya Nishihara - - Load All Authors

File last commit:

r40013:74da9d99 default


                r42797:d013099c

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};