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

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Gregory Szorc - - Load All Authors

File last commit:

r21780:2d3fb847 default


                r22287:f3ac9677

default

Download file

             children.py
        
                    49 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / children.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Mercurial extension to provide the 'hg children' command

      #

      # Copyright 2007 by Intevation GmbH <intevation@intevation.de>

      #

      # Author(s):

      # Thomas Arendsen Hein <thomas@intevation.de>

      #

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

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

      '''command to display child changesets (DEPRECATED)

      This extension is deprecated. You should use :hg:`log -r

      "children(REV)"` instead.

      '''

      from mercurial import cmdutil

      from mercurial.commands import templateopts

      from mercurial.i18n import _

      cmdtable = {}

      command = cmdutil.command(cmdtable)

      testedwith = 'internal'

      @command('children',

          [('r', 'rev', '',

           _('show children of the specified revision'), _('REV')),

          ] + templateopts,

          _('hg children [-r REV] [FILE]'),

          inferrepo=True)

      def children(ui, repo, file_=None, **opts):

          """show the children of the given or working directory revision

          Print the children of the working directory's revisions. If a

          revision is given via -r/--rev, the children of that revision will

          be printed. If a file argument is given, revision in which the

          file was last changed (after the working directory revision or the

          argument to --rev if given) is printed.

          """

          rev = opts.get('rev')

          if file_:

              ctx = repo.filectx(file_, changeid=rev)

          else:

              ctx = repo[rev]

          displayer = cmdutil.show_changeset(ui, repo, opts)

          for cctx in ctx.children():

              displayer.show(cctx)

          displayer.close()

	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

				# Mercurial extension to provide the 'hg children' command
				#
				# Copyright 2007 by Intevation GmbH <intevation@intevation.de>
				#
				# Author(s):
				# Thomas Arendsen Hein <thomas@intevation.de>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				'''command to display child changesets (DEPRECATED)

				This extension is deprecated. You should use :hg:`log -r
				"children(REV)"` instead.
				'''

				from mercurial import cmdutil
				from mercurial.commands import templateopts
				from mercurial.i18n import _

				cmdtable = {}
				command = cmdutil.command(cmdtable)
				testedwith = 'internal'

				@command('children',
				[('r', 'rev', '',
				_('show children of the specified revision'), _('REV')),
				] + templateopts,
				_('hg children [-r REV] [FILE]'),
				inferrepo=True)
				def children(ui, repo, file_=None, **opts):
				"""show the children of the given or working directory revision

				Print the children of the working directory's revisions. If a
				revision is given via -r/--rev, the children of that revision will
				be printed. If a file argument is given, revision in which the
				file was last changed (after the working directory revision or the
				argument to --rev if given) is printed.
				"""
				rev = opts.get('rev')
				if file_:
				ctx = repo.filectx(file_, changeid=rev)
				else:
				ctx = repo[rev]

				displayer = cmdutil.show_changeset(ui, repo, opts)
				for cctx in ctx.children():
				displayer.show(cctx)
				displayer.close()