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

debugmergestate: make templated...

debugmergestate: make templated Our IntelliJ team wants to be able to read the merge state in order to help the user resolve merge conflicts. They had so far been reading file contents from p1() and p2() and their merge base. That is not ideal for several reasons (merge base is not necessarily the "graft base", renames are not handled, commands like `hg update -m` is not handled). It will get especially bad as of my D7827. This patch makes the output s a templated. I haven't bothered to make it complete (e.g. merge driver states are not handled), but it's probably good enough as a start. I've done a web search for "debugmergestate" and I can't find any indication that any tools currently rely on its output. If it turns out that we get bug reports for it once this is released, I won't object to backing this patch out on the stable branch (and then perhaps replace it by a separate command, or put it behind a new flag). The changes in test-backout.t are interesting, in particular this: ``` - other path: foo (node not stored in v1 format) + other path: (node foo) ``` I wonder if that means that we actually read v1 format incorrectly. That seems to be an old format that was switched away from in 2014, so it doesn't matter now anyway. Differential Revision: https://phab.mercurial-scm.org/D8120

Yuya Nishihara - - Load All Authors

File last commit:

r40013:74da9d99 default


                r44880:acbfa31c

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