upstream/mercurial-mirror Files · contrib/python-hook-examples.py

rebase: allow aborting if last-message.txt is missing...

rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.

Pulkit Goyal - - Load All Authors

File last commit:

r28562:2b585677 default


                r31225:749b057b

default

Download file

             python-hook-examples.py
        
                    26 lines
            
             | 630 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / python-hook-examples.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Alexander Solovyov
    
diffstat hook example

              r7917
            
      '''

        Benoit Boissinot
    
Change wording in example hook

              r7918
            
      Examples of useful python hooks for Mercurial.

        Alexander Solovyov
    
diffstat hook example

              r7917
            
      '''

        Pulkit Goyal
    
contrib: python-hook-examples use absolute_import

              r28562
            
      from __future__ import absolute_import

      from mercurial import (

          patch,

          util,

      )

        Alexander Solovyov
    
diffstat hook example

              r7917
            
      def diffstat(ui, repo, **kwargs):

        Benoit Boissinot
    
Change wording in example hook

              r7918
            
          '''Example usage:

        Alexander Solovyov
    
diffstat hook example

              r7917
            
          [hooks]

          commit.diffstat = python:/path/to/this/file.py:diffstat

          changegroup.diffstat = python:/path/to/this/file.py:diffstat

          '''

          if kwargs.get('parent2'):

              return

          node = kwargs['node']

        Matt Mackall
    
misc: replace .parents()[0] with p1()

              r13878
            
          first = repo[node].p1().node()

        Alexander Solovyov
    
diffstat hook example

              r7917
            
          if 'url' in kwargs:

              last = repo['tip'].node()

          else:

              last = node

          diff = patch.diff(repo, first, last)

          ui.write(patch.diffstat(util.iterlines(diff)))

	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

Alexander Solovyov diffstat hook example	r7917	'''
Benoit Boissinot Change wording in example hook	r7918	Examples of useful python hooks for Mercurial.
Alexander Solovyov diffstat hook example	r7917	'''
Pulkit Goyal contrib: python-hook-examples use absolute_import	r28562	from __future__ import absolute_import
		from mercurial import (
		patch,
		util,
		)
Alexander Solovyov diffstat hook example	r7917
		def diffstat(ui, repo, **kwargs):
Benoit Boissinot Change wording in example hook	r7918	'''Example usage:
Alexander Solovyov diffstat hook example	r7917
		[hooks]
		commit.diffstat = python:/path/to/this/file.py:diffstat
		changegroup.diffstat = python:/path/to/this/file.py:diffstat
		'''
		if kwargs.get('parent2'):
		return
		node = kwargs['node']
Matt Mackall misc: replace .parents()[0] with p1()	r13878	first = repo[node].p1().node()
Alexander Solovyov diffstat hook example	r7917	if 'url' in kwargs:
		last = repo['tip'].node()
		else:
		last = node
		diff = patch.diff(repo, first, last)
		ui.write(patch.diffstat(util.iterlines(diff)))