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

largefiles: use "normallookup" on "lfdirstate" while reverting...

largefiles: use "normallookup" on "lfdirstate" while reverting Before this patch, largefiles gotten from revisions other than the parent of the working directory at "hg revert" become "clean" unexpectedly in steps below: 1. "repo.status()" is invoked (for status check before reverting) 1-1 "dirstate" entry for standinfile SF is "normal"-ed (1-2 "lfdirstate" entry of largefile LF (for SF) is "normal"-ed) 2. "cmdutil.revert()" is invoked 2-1 standinfile SF is updated in the working directory 2-2 "dirstate" entry for SF is NOT updated 3. "lfcommands.updatelfiles()" is invoked (by "overrides.overriderevert()") 3-1 largefile LF (for SF) is updated in the working directory 3-2 "dirstate" returns "n" and valid timestamp for SF (by 1-1 and 2-2) 3-3 "lfdirstate" entry for LF is "normal"-ed 3-4 "lfdirstate" is written into ".hg/largefiles/dirstate", and timestamp of LF is stored into "lfdirstate" file (by 3-3) (ASSUMPTION: timestamp of LF differs from one of "lfdirstate" file) Then, "hs status" treats LF as "clean", even though LF is updated by "other" revision (by 3-1), because "lfilesrepo.status()" always treats "normal"-ed files (by 3-3 and 3-4) as "clean". When largefiles are reverted, they should be "normallookup"-ed forcibly. This patch uses "normallookup" on "lfdirstate" while reverting, by passing "True" to newly added argument "normallookup". Forcible "normallookup"-ing is not so expensive, because list of target largefiles is explicitly specified in this case. This patch uses "[debug] dirstate.delaywrite" feature in the test, to ensure that timestamp of the largefile gotten from "other" revision is stored into ".hg/largefiles/dirstate" (for ASSUMPTION at 3-4)

Gregory Szorc - - Load All Authors

File last commit:

r21782:404eca1c default


                r21934:0cb34b39

stable

Download file

             graphlog.py
        
                    57 lines
            
             | 2.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / graphlog.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Joel Rosdahl
    
Add graphlog extension

              r4344
            
      # ASCII graph log extension for Mercurial

      #

      # Copyright 2007 Joel Rosdahl <joel@rosdahl.net>

        Thomas Arendsen Hein
    
Removed trailing whitespace and tabs from python files

              r4516
            
      #

        Martin Geisler
    
updated license to be explicit about GPL version 2

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

        Matt Mackall
    
Update license to GPLv2+

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

        Martin Geisler
    
add blank line after copyright notices and after header

              r8228
            
        Martin Geisler
    
graphlog: mark as deprecated

              r20118
            
      '''command to view revision graphs from a shell (DEPRECATED)

      The functionality of this extension has been include in core Mercurial

      since version 2.3.

        Alpar Juttner
    
Graphlog extension adds a --graph option to log/in/out...

              r7426
            
      This extension adds a --graph option to the incoming, outgoing and log

        Martin Geisler
    
graphlog: wrap docstrings at 70 characters

              r9259
            
      commands. When this options is given, an ASCII representation of the

      revision graph is also shown.

        Alpar Juttner
    
Graphlog extension adds a --graph option to log/in/out...

              r7426
            
      '''

        Joel Rosdahl
    
Add graphlog extension

              r4344
            
      from mercurial.i18n import _

        Patrick Mezard
    
incoming/outgoing: handle --graph in core

              r17182
            
      from mercurial import cmdutil, commands

        Steve Borho
    
graphlog: add filelog revision grapher...

              r5938
            
        Adrian Buehlmann
    
graphlog: use cmdutil.command decorator

              r14311
            
      cmdtable = {}

      command = cmdutil.command(cmdtable)

        Augie Fackler
    
hgext: mark all first-party extensions as such

              r16743
            
      testedwith = 'internal'

        Adrian Buehlmann
    
graphlog: use cmdutil.command decorator

              r14311
            
      @command('glog',

        Patrick Mezard
    
graphlog: add all log options to glog command...

              r16432
            
          [('f', 'follow', None,

           _('follow changeset history, or file history across copies and renames')),

          ('', 'follow-first', None,

           _('only follow the first parent of merge changesets (DEPRECATED)')),

          ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),

          ('C', 'copies', None, _('show copied files')),

          ('k', 'keyword', [],

           _('do case-insensitive search for a given text'), _('TEXT')),

        Adrian Buehlmann
    
graphlog: use cmdutil.command decorator

              r14311
            
          ('r', 'rev', [], _('show the specified revision or range'), _('REV')),

        Patrick Mezard
    
graphlog: add all log options to glog command...

              r16432
            
          ('', 'removed', None, _('include revisions where files were removed')),

          ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),

          ('u', 'user', [], _('revisions committed by user'), _('USER')),

          ('', 'only-branch', [],

           _('show only changesets within the given named branch (DEPRECATED)'),

           _('BRANCH')),

          ('b', 'branch', [],

           _('show changesets within the given named branch'), _('BRANCH')),

          ('P', 'prune', [],

           _('do not display revision or any of its ancestors'), _('REV')),

          ] + commands.logopts + commands.walkopts,

        Gregory Szorc
    
graphlog: define inferrepo in command decorator

              r21782
            
          _('[OPTION]... [FILE]'),

          inferrepo=True)

        Alexander Solovyov
    
graphlog: make use of graphmod's revset support

              r14043
            
      def graphlog(ui, repo, *pats, **opts):

        Peter Arrenbrecht
    
graphlog: split the actual DAG grapher out into a separate method...

              r7325
            
          """show revision history alongside an ASCII revision graph

        Martin Geisler
    
graphlog: wrap docstrings at 70 characters

              r9259
            
          Print a revision history alongside a revision graph drawn with

          ASCII characters.

        Peter Arrenbrecht
    
graphlog: split the actual DAG grapher out into a separate method...

              r7325
            
        Martin Geisler
    
graphlog: wrap docstrings at 70 characters

              r9259
            
          Nodes printed as an @ character are parents of the working

          directory.

        Peter Arrenbrecht
    
graphlog: split the actual DAG grapher out into a separate method...

              r7325
            
          """

        Patrick Mezard
    
log: support --graph without graphlog extension...

              r17181
            
          return cmdutil.graphlog(ui, repo, *pats, **opts)

	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

Joel Rosdahl Add graphlog extension	r4344	# ASCII graph log extension for Mercurial
		#
		# Copyright 2007 Joel Rosdahl <joel@rosdahl.net>
Thomas Arendsen Hein Removed trailing whitespace and tabs from python files	r4516	#
Martin Geisler updated license to be explicit about GPL version 2	r8225	# This software may be used and distributed according to the terms of the
Matt Mackall Update license to GPLv2+	r10263	# GNU General Public License version 2 or any later version.
Martin Geisler add blank line after copyright notices and after header	r8228
Martin Geisler graphlog: mark as deprecated	r20118	'''command to view revision graphs from a shell (DEPRECATED)

		The functionality of this extension has been include in core Mercurial
		since version 2.3.
Alpar Juttner Graphlog extension adds a --graph option to log/in/out...	r7426
		This extension adds a --graph option to the incoming, outgoing and log
Martin Geisler graphlog: wrap docstrings at 70 characters	r9259	commands. When this options is given, an ASCII representation of the
		revision graph is also shown.
Alpar Juttner Graphlog extension adds a --graph option to log/in/out...	r7426	'''
Joel Rosdahl Add graphlog extension	r4344
		from mercurial.i18n import _
Patrick Mezard incoming/outgoing: handle --graph in core	r17182	from mercurial import cmdutil, commands
Steve Borho graphlog: add filelog revision grapher...	r5938
Adrian Buehlmann graphlog: use cmdutil.command decorator	r14311	cmdtable = {}
		command = cmdutil.command(cmdtable)
Augie Fackler hgext: mark all first-party extensions as such	r16743	testedwith = 'internal'
Adrian Buehlmann graphlog: use cmdutil.command decorator	r14311
		@command('glog',
Patrick Mezard graphlog: add all log options to glog command...	r16432	[('f', 'follow', None,
		_('follow changeset history, or file history across copies and renames')),
		('', 'follow-first', None,
		_('only follow the first parent of merge changesets (DEPRECATED)')),
		('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
		('C', 'copies', None, _('show copied files')),
		('k', 'keyword', [],
		_('do case-insensitive search for a given text'), _('TEXT')),
Adrian Buehlmann graphlog: use cmdutil.command decorator	r14311	('r', 'rev', [], _('show the specified revision or range'), _('REV')),
Patrick Mezard graphlog: add all log options to glog command...	r16432	('', 'removed', None, _('include revisions where files were removed')),
		('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
		('u', 'user', [], _('revisions committed by user'), _('USER')),
		('', 'only-branch', [],
		_('show only changesets within the given named branch (DEPRECATED)'),
		_('BRANCH')),
		('b', 'branch', [],
		_('show changesets within the given named branch'), _('BRANCH')),
		('P', 'prune', [],
		_('do not display revision or any of its ancestors'), _('REV')),
		] + commands.logopts + commands.walkopts,
Gregory Szorc graphlog: define inferrepo in command decorator	r21782	_('[OPTION]... [FILE]'),
		inferrepo=True)
Alexander Solovyov graphlog: make use of graphmod's revset support	r14043	def graphlog(ui, repo, pats, *opts):
Peter Arrenbrecht graphlog: split the actual DAG grapher out into a separate method...	r7325	"""show revision history alongside an ASCII revision graph

Martin Geisler graphlog: wrap docstrings at 70 characters	r9259	Print a revision history alongside a revision graph drawn with
		ASCII characters.
Peter Arrenbrecht graphlog: split the actual DAG grapher out into a separate method...	r7325
Martin Geisler graphlog: wrap docstrings at 70 characters	r9259	Nodes printed as an @ character are parents of the working
		directory.
Peter Arrenbrecht graphlog: split the actual DAG grapher out into a separate method...	r7325	"""
Patrick Mezard log: support --graph without graphlog extension...	r17181	return cmdutil.graphlog(ui, repo, pats, *opts)