##// END OF EJS Templates
mergestate: add a constructor that sets up a clean merge state...
mergestate: add a constructor that sets up a clean merge state Eventually, we'll move the read call out of the constructor. This will: - avoid unnecessary reads when we're going to nuke the merge state anyway - avoid raising an exception if there's an unsupported merge record 'clean' seems like a good name for it because I wanted to avoid anything with the word 'new' in it, and 'reset' is more an action performed on a merge state than a way to get a new merge state. Thanks to Martin von Zweigbergk for feedback about naming this.

File last commit:

r26073:5ef327e9 default
r26987:416b2b7d default
Show More
progress.py
17 lines | 705 B | text/x-python | PythonLexer
Augie Fackler
Progress bar extension
r10434 # progress.py show progress bars for some actions
#
# Copyright (C) 2010 Augie Fackler <durin42@gmail.com>
#
Augie Fackler
progress: Use the same GPL boilerplate as most hg files
r15772 # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Augie Fackler
Progress bar extension
r10434
Pierre-Yves David
progress: deprecate the progress extension...
r25522 """show progress bars for some actions (DEPRECATED)
Augie Fackler
Progress bar extension
r10434
Pierre-Yves David
progress: deprecate the progress extension...
r25522 This extension has been merged into core, you can remove it from your config.
See hg help config.progress for configuration options.
Augie Fackler
Progress bar extension
r10434 """
Augie Fackler
progress: restore testedwith to the stub...
r26073 # Note for extension authors: ONLY specify testedwith = 'internal' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = 'internal'