upstream/mercurial-mirror Files · contrib/debian/control

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.

av6 - - Load All Authors

File last commit:

r30873:dc22729b stable


                r31225:749b057b

default

Download file

             control
        
                    53 lines
            
             | 1.6 KiB
            
                | text/plain
            
             |
                DebianControlLexer
            
             / contrib / debian / control
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
debian: switch to using debhelper and dh_python2 to build debs...

              r26148
            
      Source: mercurial

        Augie Fackler
    
builddeb: new script for building a deb package...

              r24971
            
      Section: vcs

      Priority: optional

        av6
    
debian: update mailing list address

              r30873
            
      Maintainer: Mercurial Developers <mercurial-devel@mercurial-scm.org>

        Augie Fackler
    
debian: switch to using debhelper and dh_python2 to build debs...

              r26148
            
      Build-Depends:

        Sean Farley
    
debian: fix lintian warning about debhelper...

              r29047
            
       debhelper (>= 9),

        Augie Fackler
    
debian: switch to using debhelper and dh_python2 to build debs...

              r26148
            
       dh-python,

        Sean Farley
    
debian: add missing netbase dependency...

              r28985
            
       netbase,

        Sean Farley
    
debian: add missing python-all-dev dependency

              r28982
            
       python-all,

        Sean Farley
    
debian: add missing python-docutils dependency

              r28983
            
       python-all-dev,

        Sean Farley
    
debian: add missing zip/unzip dependencies

              r28984
            
       python-docutils,

        Sean Farley
    
debian: alphabetize build deps

              r29048
            
       unzip,

       zip

        Augie Fackler
    
debian: switch to using debhelper and dh_python2 to build debs...

              r26148
            
      Standards-Version: 3.9.4

      X-Python-Version: >= 2.6

      Package: mercurial

      Depends:

       python,

       ${shlibs:Depends},

       ${misc:Depends},

       ${python:Depends},

       mercurial-common (= ${source:Version})

      Architecture: any

      Description: fast, easy to use, distributed revision control tool.

       Mercurial is a fast, lightweight Source Control Management system designed

       for efficient handling of very large distributed projects.

       .

       Its features include:

        * O(1) delta-compressed file storage and retrieval scheme

        * Complete cross-indexing of files and changesets for efficient exploration

          of project history

        * Robust SHA1-based integrity checking and append-only storage model

        * Decentralized development model with arbitrary merging between trees

        * Easy-to-use command-line interface

        * Integrated stand-alone web interface

        * Small Python codebase

      Package: mercurial-common

        Augie Fackler
    
builddeb: new script for building a deb package...

              r24971
            
      Architecture: all

        Augie Fackler
    
debian: switch to using debhelper and dh_python2 to build debs...

              r26148
            
      Depends:

       ${misc:Depends},

       ${python:Depends},

      Recommends: mercurial (= ${source:Version}), ca-certificates

        Sean Farley
    
debian: add wish to suggests...

              r29091
            
      Suggests: wish

        Augie Fackler
    
debian: switch to using debhelper and dh_python2 to build debs...

              r26148
            
      Breaks: mercurial (<< ${source:Version})

      Replaces: mercurial (<< 2.6.3)

      Description: easy-to-use, scalable distributed version control system (common files)

       Mercurial is a fast, lightweight Source Control Management system designed

       for efficient handling of very large distributed projects.

       .

       This package contains the architecture independent components of Mercurial,

       and is generally useless without the mercurial package.

	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

Augie Fackler debian: switch to using debhelper and dh_python2 to build debs...	r26148	Source: mercurial
Augie Fackler builddeb: new script for building a deb package...	r24971	Section: vcs
		Priority: optional
av6 debian: update mailing list address	r30873	Maintainer: Mercurial Developers <mercurial-devel@mercurial-scm.org>
Augie Fackler debian: switch to using debhelper and dh_python2 to build debs...	r26148	Build-Depends:
Sean Farley debian: fix lintian warning about debhelper...	r29047	debhelper (>= 9),
Augie Fackler debian: switch to using debhelper and dh_python2 to build debs...	r26148	dh-python,
Sean Farley debian: add missing netbase dependency...	r28985	netbase,
Sean Farley debian: add missing python-all-dev dependency	r28982	python-all,
Sean Farley debian: add missing python-docutils dependency	r28983	python-all-dev,
Sean Farley debian: add missing zip/unzip dependencies	r28984	python-docutils,
Sean Farley debian: alphabetize build deps	r29048	unzip,
		zip
Augie Fackler debian: switch to using debhelper and dh_python2 to build debs...	r26148	Standards-Version: 3.9.4
		X-Python-Version: >= 2.6

		Package: mercurial
		Depends:
		python,
		${shlibs:Depends},
		${misc:Depends},
		${python:Depends},
		mercurial-common (= ${source:Version})
		Architecture: any
		Description: fast, easy to use, distributed revision control tool.
		Mercurial is a fast, lightweight Source Control Management system designed
		for efficient handling of very large distributed projects.
		.
		Its features include:
		* O(1) delta-compressed file storage and retrieval scheme
		* Complete cross-indexing of files and changesets for efficient exploration
		of project history
		* Robust SHA1-based integrity checking and append-only storage model
		* Decentralized development model with arbitrary merging between trees
		* Easy-to-use command-line interface
		* Integrated stand-alone web interface
		* Small Python codebase

		Package: mercurial-common
Augie Fackler builddeb: new script for building a deb package...	r24971	Architecture: all
Augie Fackler debian: switch to using debhelper and dh_python2 to build debs...	r26148	Depends:
		${misc:Depends},
		${python:Depends},
		Recommends: mercurial (= ${source:Version}), ca-certificates
Sean Farley debian: add wish to suggests...	r29091	Suggests: wish
Augie Fackler debian: switch to using debhelper and dh_python2 to build debs...	r26148	Breaks: mercurial (<< ${source:Version})
		Replaces: mercurial (<< 2.6.3)
		Description: easy-to-use, scalable distributed version control system (common files)
		Mercurial is a fast, lightweight Source Control Management system designed
		for efficient handling of very large distributed projects.
		.
		This package contains the architecture independent components of Mercurial,
		and is generally useless without the mercurial package.