upstream/mercurial-mirror Files · hgext/share.py

commands: add more robust support for 'hg log -b' (issue2078)...

commands: add more robust support for 'hg log -b' (issue2078) Fixes issue2078 and adds tests to cover various 'hg log -b' uses. This change adds a localrepo.lookupbranch(key, remote=None) function. This will look up the branch of the revision with the given key. The algorithm works like this: * If a remote repo is given and KEY is the name of a branch in that repo, return KEY. * If no remote repo is given and KEY is the name of a branch in the local repo object, return KEY. * Otherwise look up the revision with the identifier KEY in the local repo and return its branch. This change also makes 'hg log -b' use this new functionality and adds a few tests for it.

Martin Geisler - - Load All Authors

File last commit:

r10798:e46c19c5 stable


                r10960:ca739acf

default

Download file

             share.py
        
                    37 lines
            
             | 1.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / share.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>

      #

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

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

      '''share a common history between several working directories'''

      from mercurial.i18n import _

      from mercurial import hg, commands

      def share(ui, source, dest=None, noupdate=False):

          """create a new shared repository

          Initialize a new repository and working directory that shares its

          history with another repository.

          NOTE: using rollback or extensions that destroy/modify history

          (mq, rebase, etc.) can cause considerable confusion with shared

          clones. In particular, if two shared clones are both updated to

          the same changeset, and one of them destroys that changeset with

          rollback, the other clone will suddenly stop working: all

          operations will fail with "abort: working directory has unknown

          parent". The only known workaround is to use debugsetparents on

          the broken clone to reset it to a changeset that still exists

          (e.g. tip).

          """

          return hg.share(ui, source, dest, not noupdate)

      cmdtable = {

          "share":

          (share,

           [('U', 'noupdate', None, _('do not create a working copy'))],

           _('[-U] SOURCE [DEST]')),

      }

      commands.norepo += " share"

	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

				# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				'''share a common history between several working directories'''

				from mercurial.i18n import _
				from mercurial import hg, commands

				def share(ui, source, dest=None, noupdate=False):
				"""create a new shared repository

				Initialize a new repository and working directory that shares its
				history with another repository.

				NOTE: using rollback or extensions that destroy/modify history
				(mq, rebase, etc.) can cause considerable confusion with shared
				clones. In particular, if two shared clones are both updated to
				the same changeset, and one of them destroys that changeset with
				rollback, the other clone will suddenly stop working: all
				operations will fail with "abort: working directory has unknown
				parent". The only known workaround is to use debugsetparents on
				the broken clone to reset it to a changeset that still exists
				(e.g. tip).
				"""

				return hg.share(ui, source, dest, not noupdate)

				cmdtable = {
				"share":
				(share,
				[('U', 'noupdate', None, _('do not create a working copy'))],
				_('[-U] SOURCE [DEST]')),
				}

				commands.norepo += " share"