upstream/mercurial-mirror Files · hgext/narrow/narrowrepo.py

revert: remove dangerous `parents` argument from `cmdutil.revert()`...

revert: remove dangerous `parents` argument from `cmdutil.revert()` As we found out the hard way (thanks to spectral@ for figuring it out!), `cmdutil.revert()`'s `parents` argument must be `repo.dirstate.parents()` or things may go wrong. We had an extension that passed in the target commit as the first parent. The `hg split` command from the evolve extension seems to have made the same mistake, but I haven't looked carefully. The problem is that `cmdutil._performrevert()` calls `dirstate.normal()` on reverted files if the commit to revert to equals the first parent. So if you pass in `ctx=foo` and `parents=(foo.node(), nullid)`, then `dirstate.normal()` will be called for the revert files, even though they might not be clean in the working copy. There doesn't seem to be any reason, other than a tiny performance benefit, to passing the `parents` around instead of looking them up again in `cmdutil._performrevert()`, so that's what this patch does. Differential Revision: https://phab.mercurial-scm.org/D8925

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r45935:8c466bcb

default

Download file

             narrowrepo.py
        
                    29 lines
            
             | 909 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / narrow / narrowrepo.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
      # narrowrepo.py - repository which supports narrow revlogs, lazy loading

      #

      # Copyright 2017 Google, Inc.

      #

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

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

      from __future__ import absolute_import

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
      from mercurial import wireprototypes

        Pulkit Goyal
    
narrow: move the wireprotocol narrow capability name to core...

              r39969
            
        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
      from . import narrowdirstate

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
        Martin von Zweigbergk
    
narrow: move checking for narrow requirement into _narrowmatch()...

              r36484
            
      def wraprepo(repo):

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
          """Enables narrow clone functionality on a single local repository."""

          class narrowrepository(repo.__class__):

        Kyle Lippincott
    
narrow: only wrap dirstate functions once, instead of per-reposetup...

              r38142
            
              def _makedirstate(self):

                  dirstate = super(narrowrepository, self)._makedirstate()

                  return narrowdirstate.wrapdirstate(self, dirstate)

        Martin von Zweigbergk
    
narrow: check "narrow" wire protocol capability, not bundle2 capability...

              r39564
            
              def peer(self):

                  peer = super(narrowrepository, self).peer()

        Pulkit Goyal
    
wireprotoserver: move narrow capabilities to wireprototypes.py...

              r40110
            
                  peer._caps.add(wireprototypes.NARROWCAP)

                  peer._caps.add(wireprototypes.ELLIPSESCAP)

        Martin von Zweigbergk
    
narrow: check "narrow" wire protocol capability, not bundle2 capability...

              r39564
            
                  return peer

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
          repo.__class__ = narrowrepository

	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

Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	# narrowrepo.py - repository which supports narrow revlogs, lazy loading
		#
		# Copyright 2017 Google, Inc.
		#
		# This software may be used and distributed according to the terms of the
		# GNU General Public License version 2 or any later version.

		from __future__ import absolute_import

Augie Fackler formatting: blacken the codebase...	r43346	from mercurial import wireprototypes
Pulkit Goyal narrow: move the wireprotocol narrow capability name to core...	r39969
Augie Fackler formatting: blacken the codebase...	r43346	from . import narrowdirstate

Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096
Martin von Zweigbergk narrow: move checking for narrow requirement into _narrowmatch()...	r36484	def wraprepo(repo):
Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	"""Enables narrow clone functionality on a single local repository."""

		class narrowrepository(repo.__class__):
Kyle Lippincott narrow: only wrap dirstate functions once, instead of per-reposetup...	r38142	def _makedirstate(self):
		dirstate = super(narrowrepository, self)._makedirstate()
		return narrowdirstate.wrapdirstate(self, dirstate)

Martin von Zweigbergk narrow: check "narrow" wire protocol capability, not bundle2 capability...	r39564	def peer(self):
		peer = super(narrowrepository, self).peer()
Pulkit Goyal wireprotoserver: move narrow capabilities to wireprototypes.py...	r40110	peer._caps.add(wireprototypes.NARROWCAP)
		peer._caps.add(wireprototypes.ELLIPSESCAP)
Martin von Zweigbergk narrow: check "narrow" wire protocol capability, not bundle2 capability...	r39564	return peer

Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	repo.__class__ = narrowrepository