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

graft: introduce --base option for using custom base revision while merging...

graft: introduce --base option for using custom base revision while merging The graft command usually performs an internal merge of the current parent revision with the graft revision, using p1 of the grafted revision as base for the merge. As a trivial extension of this, we introduce the --base option to allow for using another base revision. This can be used as a building block for grafting and collapsing multiple changesets at once, or for grafting the resulting change from a merge as a single simple change. (This is kind of similar to backout --parent ... only different: this graft base must be an ancestor, but is usually *not* a parent.) This is probably an advanced use case, and we do thus not show it in the non-verbose help.

Pulkit Goyal - - Load All Authors

File last commit:

r40110:f7011b44 default


                r40460:3c0d5016

default

Download file

             narrowrepo.py
        
                    33 lines
            
             | 927 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

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

              r39969
            
      from mercurial import (

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

              r40110
            
          wireprototypes,

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

              r39969
            
      )

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

              r36096
            
      from . import (

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

              r38142
            
          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

Pulkit Goyal narrow: move the wireprotocol narrow capability name to core...	r39969	from mercurial import (
Pulkit Goyal wireprotoserver: move narrow capabilities to wireprototypes.py...	r40110	wireprototypes,
Pulkit Goyal narrow: move the wireprotocol narrow capability name to core...	r39969	)

Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	from . import (
Kyle Lippincott narrow: only wrap dirstate functions once, instead of per-reposetup...	r38142	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