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

merge-tools: allow marking a mergetool as completely disabled...

merge-tools: allow marking a mergetool as completely disabled Very often in my life I'm finding that the only configured merge tool present on the system is vimdiff[0], and it's currently impossible (as far as I can tell) short of specifying `ui.merge = `[1] to actually *disable* a merge tool. This allows vimdiff-haters to put: [merge-tools] vimdiff.disable = yes in their ~/.hgrc and never see vimdiff again. I'm stopping short of putting this as a commented out entry in the sample new user hgrc (seen when a user runs `hg config --edit` with no ~/.hgrc) for now, but I might come back and do that later. 0: vimdiff is at an awkward intersection: it's usually installed by the vim package which is often installed as a vi substitute, so it's mere presence doesn't imply me wanting it, unlike (say) kdiff3. 1: There's a related problem I ran into today where specifying `ui.merge = :merge` failed because :merge isn't a command, which I think is a regression. I'll try and figure that out and at least file a bug.

Matt Mackall - - Load All Authors

File last commit:

r13878:a8d13ee0 default


                r26730:a1e43e85

default

Download file

             python-hook-examples.py
        
                    22 lines
            
             | 578 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / python-hook-examples.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      '''

      Examples of useful python hooks for Mercurial.

      '''

      from mercurial import patch, util

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

          '''Example usage:

          [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']

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

          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

				'''
				Examples of useful python hooks for Mercurial.
				'''
				from mercurial import patch, util

				def diffstat(ui, repo, **kwargs):
				'''Example usage:

				[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']
				first = repo[node].p1().node()
				if 'url' in kwargs:
				last = repo['tip'].node()
				else:
				last = node
				diff = patch.diff(repo, first, last)
				ui.write(patch.diffstat(util.iterlines(diff)))