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

copies: don't filter out copy targets created on other side of merge commit...

copies: don't filter out copy targets created on other side of merge commit If file X is copied to Y on one side of merge and the other side creates Y (no copy), we would not mark that as copy. In the changeset-centric pathcopies() version, that was done by checking if the copy target existed on the other branch. Even though merge commits are pretty uncommon, it still turned out to be too expensive to load the manifest of the parents of merge commits. In a repo of mozilla-unified converted to storing copies in changesets, about 2m30s of `hg debugpathcopies FIREFOX_BETA_59_END FIREFOX_BETA_60_BASE` is spent on this check of merge commits. I tried to think of a way of storing more information in the changesets in order to cheaply detect these cases, but I couldn't think of a solution. So this patch simply removes those checks. For reference, these extra copies are reported from the aforementioned command after this patch: browser/base/content/sanitize.js -> browser/modules/Sanitizer.jsm testing/mozbase/mozprocess/tests/process_normal_finish_python.ini -> testing/mozbase/mozprocess/tests/process_normal_finish.ini testing/mozbase/mozprocess/tests/process_waittimeout_python.ini -> testing/mozbase/mozprocess/tests/process_waittimeout.ini testing/mozbase/mozprocess/tests/process_waittimeout_10s_python.ini -> testing/mozbase/mozprocess/tests/process_waittimeout_10s.ini Since these copies were created on one side of some merge, it still seems reasonable to include them, so I'm not even sure it's worse than filelog pathcopies(), just different. Differential Revision: https://phab.mercurial-scm.org/D6420

Yuya Nishihara - - Load All Authors

File last commit:

r42684:f305f1d7 default


                r42686:35d674a3

default

Download file

             files.rs
        
                    19 lines
            
             | 509 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-core / src / utils / files.rs
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Raphaël Gomès
    
rust-filepatterns: use bytes instead of String...

              r42630
            
      use std::path::Path;

      pub fn get_path_from_bytes(bytes: &[u8]) -> &Path {

          let os_str;

          #[cfg(unix)]

          {

              use std::os::unix::ffi::OsStrExt;

              os_str = std::ffi::OsStr::from_bytes(bytes);

          }

          #[cfg(windows)]

          {

        Yuya Nishihara
    
rust-filepatterns: add comment about Windows path handling...

              r42684
            
              // TODO: convert from Windows MBCS (ANSI encoding) to WTF8.

              // Perhaps, the return type would have to be Result<PathBuf>.

        Raphaël Gomès
    
rust-filepatterns: use bytes instead of String...

              r42630
            
              use std::os::windows::ffi::OsStrExt;

              os_str = std::ffi::OsString::from_wide(bytes);

          }

          Path::new(os_str)

      }

	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

Raphaël Gomès rust-filepatterns: use bytes instead of String...	r42630	use std::path::Path;

		pub fn get_path_from_bytes(bytes: &[u8]) -> &Path {
		let os_str;
		#[cfg(unix)]
		{
		use std::os::unix::ffi::OsStrExt;
		os_str = std::ffi::OsStr::from_bytes(bytes);
		}
		#[cfg(windows)]
		{
Yuya Nishihara rust-filepatterns: add comment about Windows path handling...	r42684	// TODO: convert from Windows MBCS (ANSI encoding) to WTF8.
		// Perhaps, the return type would have to be Result<PathBuf>.
Raphaël Gomès rust-filepatterns: use bytes instead of String...	r42630	use std::os::windows::ffi::OsStrExt;
		os_str = std::ffi::OsString::from_wide(bytes);
		}

		Path::new(os_str)
		}