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

diff: extract function for getting possibly re-merged parent to diff against...

diff: extract function for getting possibly re-merged parent to diff against We'll want to reuse the logic that `hg diff --change` with `diff.merge` uses. At least `hg log -p` should reuse it. This patch therefore extracts that code to a function. Differential Revision: https://phab.mercurial-scm.org/D9957

Simon Sapin - - Load All Authors

File last commit:

r47175:1dcd9c99 default


                r47247:4a012e53

default

Download file

             mod.rs
        
                    12 lines
            
             | 455 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;

      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;
				pub use debugdata::{debug_data, DebugDataKind};
				pub use list_tracked_files::Dirstate;
				pub use list_tracked_files::{list_rev_tracked_files, FilesForRev};