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

bookmarks: use recordchange instead of writing if transaction is active...

bookmarks: use recordchange instead of writing if transaction is active Before this patch, 'bmstore.write()' always write in-memory bookmark changes into '.hg/bookmarks' regardless of transaction activity. If 'bmstore.write()' is invoked inside a transaction and it writes changes into '.hg/bookmarks', then: - original bookmarks aren't restored at failure of that transaction This breaks "all or nothing" policy of the transaction. BTW, "hg rollback" can restore bookmarks successfully even before this patch, because original bookmarks are saved into '.hg/journal.bookmarks' at the beginning of the transaction, and it (actually renamed as '.hg/undo.bookmarks') is used by "hg rollback". - uncommitted bookmark changes are visible to other processes This is a kind of "dirty read" For example, 'rebase.rebase()' implies 'bmstore.write()', and it may be executed inside the transaction of "hg unshelve". Then, intentional aborting at the end of "hg unshelve" transaction doesn't restore original bookmarks (this is obviously a bug). This patch uses 'bmstore.recordchange()' instead of actual writing by 'bmstore._writerepo()', if any transaction is active This patch also removes meaningless restoring bmstore explicitly at the end of "hg shelve". This patch doesn't choose fixing each 'bmstore.write()' callers as like below, because writing similar code here and there is very redundant. before: bmstore.write() after: tr = repo.currenttransaction() if tr: bmstore.recordchange(tr) else: bmstore.write() Even though 'bmstore.write()' itself may have to be discarded by putting bookmark operations into transaction scope, this patch chose fixing it to implement "transactional dirstate" at first.

Augie Fackler - - Load All Authors

File last commit:

r25186:80c5b266 default


                r26520:46dec89f

default

Download file

             children.py
        
                    55 lines
            
             | 1.8 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)

      # Note for extension authors: ONLY specify testedwith = 'internal' for

      # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should

      # be specifying the version(s) of Mercurial they are tested with, or

      # leave the attribute unspecified.

      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_:

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

              childctxs = [fcctx.changectx() for fcctx in fctx.children()]

          else:

              ctx = repo[rev]

              childctxs = ctx.children()

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

          for cctx in childctxs:

              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)
				# Note for extension authors: ONLY specify testedwith = 'internal' for
				# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
				# be specifying the version(s) of Mercurial they are tested with, or
				# leave the attribute unspecified.
				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_:
				fctx = repo.filectx(file_, changeid=rev)
				childctxs = [fcctx.changectx() for fcctx in fctx.children()]
				else:
				ctx = repo[rev]
				childctxs = ctx.children()

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