upstream/mercurial-mirror Files · rust/hg-core/src/operations/debugdata.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:

r47166:b274aa2f default


                r48770:5b9de38a

stable

Download file

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

      // debugdata.rs

      //

      // Copyright 2020 Antoine Cezar <antoine.cezar@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::repo::Repo;

      use crate::revlog::revlog::{Revlog, RevlogError};

      /// Kind of data to debug

      #[derive(Debug, Copy, Clone)]

      pub enum DebugDataKind {

          Changelog,

          Manifest,

      }

      /// Dump the contents data of a revision.

      pub fn debug_data(

          repo: &Repo,

          revset: &str,

          kind: DebugDataKind,

      ) -> Result<Vec<u8>, RevlogError> {

          let index_file = match kind {

              DebugDataKind::Changelog => "00changelog.i",

              DebugDataKind::Manifest => "00manifest.i",

          };

          let revlog = Revlog::open(repo, index_file, None)?;

          let rev =

              crate::revset::resolve_rev_number_or_hex_prefix(revset, &revlog)?;

          let data = revlog.get_rev_data(rev)?;

          Ok(data)

      }

	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

				// debugdata.rs
				//
				// Copyright 2020 Antoine Cezar <antoine.cezar@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::repo::Repo;
				use crate::revlog::revlog::{Revlog, RevlogError};

				/// Kind of data to debug
				#[derive(Debug, Copy, Clone)]
				pub enum DebugDataKind {
				Changelog,
				Manifest,
				}

				/// Dump the contents data of a revision.
				pub fn debug_data(
				repo: &Repo,
				revset: &str,
				kind: DebugDataKind,
				) -> Result<Vec<u8>, RevlogError> {
				let index_file = match kind {
				DebugDataKind::Changelog => "00changelog.i",
				DebugDataKind::Manifest => "00manifest.i",
				};
				let revlog = Revlog::open(repo, index_file, None)?;
				let rev =
				crate::revset::resolve_rev_number_or_hex_prefix(revset, &revlog)?;
				let data = revlog.get_rev_data(rev)?;
				Ok(data)
				}