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

narrow: fix commits of empty files...

narrow: fix commits of empty files The problem is that when committing a new file with empty contents (or in general empty file with filelog p1 = -1), hg commit with narrow doesn't create a filelog revision at all, which causes failures in further commands. The problem seems to be that: - hg thinks that instead of creating a new filelog revision, it can use the filelog's p1 (the nullrev) - because it thinks the file contents is the same in that revision and in p1 - because `narrowfilelog.cmp(nullrev, b'')` is True (unlike with `filelog.cmp`) It's not clear to me which `cmp` behaves better. But I think it makes sense to change the commit code to not to "reuse" the null rev when adding an empty file with filelog p1 == filelog p2 == -1. This is consistent with never writing the null rev in the manifest, which `hg verify` claims is an invariant: ``` inside/c@4: manifest refers to unknown revision ``` Differential Revision: https://phab.mercurial-scm.org/D11400

Simon Sapin - - Load All Authors

File last commit:

r47478:b1f2c2b3 default


                r48770:5b9de38a

stable

Download file

             mod.rs
        
                    12 lines
            
             | 468 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-core / src / operations / mod.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      //! A distinction is made between operations and commands.

      //! An operation is what can be done whereas a command is what is exposed by

      //! the cli. A single command can use several operations to achieve its goal.

      mod cat;

      mod debugdata;

      mod dirstate_status;

      mod list_tracked_files;

      pub use cat::{cat, CatOutput};

      pub use debugdata::{debug_data, DebugDataKind};

      pub use list_tracked_files::Dirstate;

      pub use list_tracked_files::{list_rev_tracked_files, FilesForRev};

	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

				//! A distinction is made between operations and commands.
				//! An operation is what can be done whereas a command is what is exposed by
				//! the cli. A single command can use several operations to achieve its goal.

				mod cat;
				mod debugdata;
				mod dirstate_status;
				mod list_tracked_files;
				pub use cat::{cat, CatOutput};
				pub use debugdata::{debug_data, DebugDataKind};
				pub use list_tracked_files::Dirstate;
				pub use list_tracked_files::{list_rev_tracked_files, FilesForRev};