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

mergetools: don't let meld open all changed files on startup...

mergetools: don't let meld open all changed files on startup In meld 3.16, a multi-file change with option '-a' results in an overview list being opened. In meld 3.20, a multi-file change with option '-a' results in an overview list AND every changed file being opened. Simply removing '-a' seems to work fine for both cases and also behaves the same as before for single-file changes. As per the release notes, this is due to the following change in meld 3.19.0: "Make the --auto-compare command line flag work again (Kai Willadsen)" See also https://gitlab.gnome.org/GNOME/meld/-/issues/516

Arseniy Alekseyev - - Load All Authors

File last commit:

r50334:b07465ad default


                r50398:a6efc1f1

default

Download file

             dirstate.rs
        
                    50 lines
            
             | 1.1 KiB
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-core / src / dirstate.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // dirstate module

      //

      // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>

      //

      // This software may be used and distributed according to the terms of the

      // GNU General Public License version 2 or any later version.

      use crate::dirstate_tree::on_disk::DirstateV2ParseError;

      use crate::revlog::node::NULL_NODE;

      use crate::revlog::Node;

      use crate::utils::hg_path::HgPath;

      use bytes_cast::BytesCast;

      pub mod dirs_multiset;

      pub mod entry;

      pub mod parsers;

      pub mod status;

      pub use self::entry::*;

      #[derive(Debug, PartialEq, Copy, Clone, BytesCast)]

      #[repr(C)]

      pub struct DirstateParents {

          pub p1: Node,

          pub p2: Node,

      }

      impl DirstateParents {

          pub const NULL: Self = Self {

              p1: NULL_NODE,

              p2: NULL_NODE,

          };

          pub fn is_merge(&self) -> bool {

              return !(self.p2 == NULL_NODE);

          }

      }

      pub type StateMapIter<'a> = Box<

          dyn Iterator<

                  Item = Result<(&'a HgPath, DirstateEntry), DirstateV2ParseError>,

              > + Send

              + 'a,

      >;

      pub type CopyMapIter<'a> = Box<

          dyn Iterator<Item = Result<(&'a HgPath, &'a HgPath), DirstateV2ParseError>>

              + Send

              + 'a,

      >;

	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

				// dirstate module
				//
				// Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
				//
				// This software may be used and distributed according to the terms of the
				// GNU General Public License version 2 or any later version.

				use crate::dirstate_tree::on_disk::DirstateV2ParseError;
				use crate::revlog::node::NULL_NODE;
				use crate::revlog::Node;
				use crate::utils::hg_path::HgPath;
				use bytes_cast::BytesCast;

				pub mod dirs_multiset;
				pub mod entry;
				pub mod parsers;
				pub mod status;

				pub use self::entry::*;

				#[derive(Debug, PartialEq, Copy, Clone, BytesCast)]
				#[repr(C)]
				pub struct DirstateParents {
				pub p1: Node,
				pub p2: Node,
				}

				impl DirstateParents {
				pub const NULL: Self = Self {
				p1: NULL_NODE,
				p2: NULL_NODE,
				};

				pub fn is_merge(&self) -> bool {
				return !(self.p2 == NULL_NODE);
				}
				}

				pub type StateMapIter<'a> = Box<
				dyn Iterator<
				Item = Result<(&'a HgPath, DirstateEntry), DirstateV2ParseError>,
				> + Send
				+ 'a,
				>;

				pub type CopyMapIter<'a> = Box<
				dyn Iterator<Item = Result<(&'a HgPath, &'a HgPath), DirstateV2ParseError>>
				+ Send
				+ 'a,
				>;