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

diff: add experimental support for "merge diffs"...

diff: add experimental support for "merge diffs" The way this works is it re-runs the merge and "stores" conflicts, and then diffs against the conflicted result. In a normal merge, you should only see diffs against conflicted regions or in cases where there was a semantic conflict but not a textual one. This makes it easier to detect "evil merges" that contain substantial new work embedded in the merge commit. Differential Revision: https://phab.mercurial-scm.org/D8504

Augie Fackler - - Load All Authors

File last commit:

r46554:89a2afe3 default


                r47177:1a7d12c8

default

Download file

             python-hook-examples.py
        
                    27 lines
            
             | 633 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
            
        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Alexander Solovyov
    
diffstat hook example

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

        Augie Fackler
    
formating: upgrade to black 20.8b1...

              r46554
            
          """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

        Augie Fackler
    
formating: upgrade to black 20.8b1...

              r46554
            
          """

        Alexander Solovyov
    
diffstat hook example

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

        Martin von Zweigbergk
    
repo: don't look up context for tip node if it's not needed...

              r39931
            
              last = repo.changelog.tip()

        Alexander Solovyov
    
diffstat hook example

              r7917
            
          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
Augie Fackler formatting: blacken the codebase...	r43346
Alexander Solovyov diffstat hook example	r7917	def diffstat(ui, repo, **kwargs):
Augie Fackler formating: upgrade to black 20.8b1...	r46554	"""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
Augie Fackler formating: upgrade to black 20.8b1...	r46554	"""
Alexander Solovyov diffstat hook example	r7917	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:
Martin von Zweigbergk repo: don't look up context for tip node if it's not needed...	r39931	last = repo.changelog.tip()
Alexander Solovyov diffstat hook example	r7917	else:
		last = node
		diff = patch.diff(repo, first, last)
		ui.write(patch.diffstat(util.iterlines(diff)))