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

histedit: suggest "histedit --abort" for inconsistent histedit state...

histedit: suggest "histedit --abort" for inconsistent histedit state Mercurial earlier than 2.7 allows users to do anything other than starting new histedit, even though current histedit is not finished or aborted yet. So, unfinished (and maybe inconsistent now) histedit states may be left and forgotten in repositories. Before this patch, histedit extension shows the message below, when it detects such inconsistent state: abort: REV is not an ancestor of working directory (update to REV or descendant and run "hg histedit --continue" again) But this message is incorrect, unless old Mercurial is re-installed, because Mercurial 2.7 or later disallows users to update the working directory to another revision. This patch changes the hint message to suggest "hg histedit --abort".

Pierre-Yves David - - Load All Authors

File last commit:

r18267:5bb610f8 default


                r19847:45c30868

stable

Download file

             graphlog.py
        
                    55 lines
            
             | 2.0 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
            
        Dirkjan Ochtman
    
extensions: change descriptions for extensions providing a few commands

              r8934
            
      '''command to view revision graphs from a shell

        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,

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

        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)

        Siddharth Agarwal
    
commands: don't infer repo for commands like update (issue2748)...

              r17773
            
      commands.inferrepo += " glog"

	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
Dirkjan Ochtman extensions: change descriptions for extensions providing a few commands	r8934	'''command to view revision graphs from a shell
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,
		_('[OPTION]... [FILE]'))
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)
Siddharth Agarwal commands: don't infer repo for commands like update (issue2748)...	r17773
		commands.inferrepo += " glog"