upstream/mercurial-mirror Files · contrib/plan9/proto

simplemerge: move printing of merge result to extension...

simplemerge: move printing of merge result to extension The `mercurial.simplemerge` module still has some command-lines processing that doesn't belong in such a low-level module. This patch moves the handling of `hg simplemerge --print` to the extension by having `mercurial.simplemerge.simplemerge()` return the merged text. Differential Revision: https://phab.mercurial-scm.org/D12148

Steven Stallion - - Load All Authors

File last commit:

r16489:cf137319 stable


                r49599:6ae3c97a

default

Download file

             proto
        
                    24 lines
            
             | 478 B
            
                | text/plain
            
             |
                ProtoBufLexer
            
             / contrib / plan9 / proto
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Steven Stallion
    
plan9: initial support for plan 9 from bell labs...

              r16383
            
      lib	- sys sys

      	mercurial	- sys sys

      		hgrc.d	- sys sys

      			9diff.rc	- sys sys

      			factotum.rc	- sys sys

      rc	- sys sys

      	bin	- sys sys

      		9diff	- sys sys

      		hg	- sys sys

      sys	- sys sys

      	lib	- sys sys

      		python	- sys sys

      			lib	- sys sys

      				python2.5	- sys sys

      					site-packages	- sys sys

      						hgext	- sys sys

      							+	- sys sys

      						mercurial	- sys sys

      							+	- sys sys

        Steven Stallion
    
plan9: finalize documentation for next release

              r16442
            
      						mercurial-VERSION-py2.5.egg-info	- sys sys

      	src	- sys sys

      		cmd	- sys sys

        Steven Stallion
    
plan9: add missing source entries to proto

              r16489
            
      			hg	- sys sys

      				+	- sys sys

	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

Steven Stallion plan9: initial support for plan 9 from bell labs...	r16383	lib - sys sys
		mercurial - sys sys
		hgrc.d - sys sys
		9diff.rc - sys sys
		factotum.rc - sys sys
		rc - sys sys
		bin - sys sys
		9diff - sys sys
		hg - sys sys
		sys - sys sys
		lib - sys sys
		python - sys sys
		lib - sys sys
		python2.5 - sys sys
		site-packages - sys sys
		hgext - sys sys
		+ - sys sys
		mercurial - sys sys
		+ - sys sys
Steven Stallion plan9: finalize documentation for next release	r16442	mercurial-VERSION-py2.5.egg-info - sys sys
		src - sys sys
		cmd - sys sys
Steven Stallion plan9: add missing source entries to proto	r16489	hg - sys sys
		+ - sys sys