resolve: accepts walkopts (-I and -X)

help: better formatting in "Date Formats" section

log-like commands now use -G for --graph, -g for --git

add --git option to commands supporting --patch (log, incoming, history, tip) No short -g form, since it would conflict with -g from the graphlog extension.

i18n: add python-format comments to Japanese translation

i18n: add Japanese translation

tests: fix for test-identify returning 255

extdiff: add --change option to display single changeset diff This is the counterpart for extdiff of 9c6ae2e09e11.

identify: have consistent output for local repositories Also, add some extensive testing for it (hardly any in the suite so far).

i18n: wrapped long lines in Italian translation

i18n: add Italian translation

record: minimize number of status calls

patch: no need to instantiate a match catch-all in diff()

close sockets on httprepository deletion (issue1487) With this destructor in place, I no longer see tracebacks on the server after using win32 clients for pull, push, etc.

i18n: updated Chinese translation

hgweb: add guid to rss items

hgweb: add atom error template

hgweb: add rss error template

hgk: added explanation to .hgk for background colour

hgk: added colour settings for different colours in diff view

hgk: added setting of foreground colour Added the fgcolor setting read by hgk to change the text colour in the diff output and the file list. The colours for diff highlighting remains unchanged.

transplant: wrapped long lines

commands: fix paths command docstring indention

hgweb: commit forgotten update to a3d7f99c23c0

hgweb: support custom http headers in ErrorResponse

hgweb: pass ErrorResponses directly into req.respond()

merge with mpm

hgk: Add background colour setting Adds the bgcolor config variable, that sets the background colour of the text and canvas frames.

commands: removed unnecessary string concatenation

patch: turned strings with backslashes into raw strings In Python, the backslash in an unrecognized escape sequence is left behind, which makes '\.' the same as r'\.'. Relying on this feature is quite brittle, IMHO. Removed unnecessary string concatenation as well.

convert: marked string for translation

reset mergestate after commit

warn if --repository provided for norepo commands

Make util.find_exe alway returns existing file, fixing issue1459 It seems like the old behaviour with different handling for commands with and without path was intended, but I think this behaviour of util.find_exe is better: * Always returns existing file * or None if command not found - no default * Windows: Returned file thus always ends with extension from PATHEXT This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might fix other unintended behaviour too.

test-merge-tools Some tests of merge-tools configuration and selection, mostly excercising filemerge.py

Account for symlinks when setting up HGTMP. On Mac OS X, several top-level directories are actually symlinks into /private. When setting up HGTMP, expand the symlinks so that later comparisons to or substituations with the actual path work as expected.

mq: allow qclone's -p option to use path alias Add support for running 'hg qclone -p foo bar' where foo is a path alias defined in the [paths] section of an hgrc file.

branch closing: permit closing the default branch There was no good reason to special case the 'default' branch. Allow the 'default' branch to be closed if the user wants it. If you're uncomfortable about mistakenly closing the default branch, you can always reopen the branch by commiting a "normal" changeset onto the closed branch.

demandimport: patch __builtin__ instead of __builtins__ This helps on implementations other than CPython, where __builtins__ isn't necessarily defined (as it's an implementation detail for CPython).

notify: use contexts more pervasively

coal/paper: switch to XHTML 1.1

i18n: updated Danish translation Now with 379 translated and 1396 untranslated messages.

run-tests: add --pure flag for using pure Python modules

add --pure flag to setup.py This flag will make the build_py step install the pure Python modules in mercurial/pure/ into mercurial/ and furthermore prevent building the C extensions.

setup: get version number using pure Python modules

setup: do not use -c with msgfmt on Solaris (issue1489)

merge with crew

record: do not lose permission changes on commit

hgweb: expose sibling branches to templater

graphlog: extract large parts of repeated code from incoming/outgoing

graphlog: reuse cmdutil.loglimit() instead of redefining

graphlog: some testing for incoming and outgoing graphs

graphlog: import util module rather than selected functions

i18n: check format strings when building xx.mo files

i18n: add python-format comments to da.po

i18n: extract strings with xgettext The xgettext program knows about Python string formatting and will mark messages with a special "#, python-format" comment in the hg.pot file. When msgfmt compiles the file, it can check these messages to ensure that the translated string uses the same conversion specifiers as the original string. The pygettext program is still used to extract the docstrings.

Merge with stable

wire protocol: avoid infinite loop (issue1483)

fix up tests for paths and urls help

use PURE option in Makefile

notify: remove subfunctions that are called only once

move mercurial.osutil to mercurial.pure.osutil

pure Python implementation of bdiff.c

pure Python implementation of diffhelpers.c

Pure python base85 fallback Encoding takes about 100x longer than native on a large binary.

pure Python implementation of parsers.c

pure Python implementation of mpatch.c

i18n: sort Danish translation by file

i18n: strip string locations from Danish translation

simplify colwidth a bit

Also find correct column width of wide characters. Use unicodedata.east_asian_width() to determine wide/full width characters if available. Otherwise, return character count as before.

added information to patchbomb help pointing users to hgrc(5) to configure the [smtp] section in order to send patchbombs

consolidated url help into urls help topic and added information about path aliases

i18n: updated Danish translation This fixes a crash due to a bad string interpolation, fixes a bunch of typos and adds more translated strings.

Clarified 'hg paths' command help

Merge with crew-stable

Fix a corner case when committing a rename after a merge (issue1476)

i18n: Starting Chinese Translation of Mercurial

i18n: sort by file when generating hg.pot This will make the order more stable and give smaller patches when translations merge in new and deleted strings from the hg.pot file.

Do not install executable man pages Default mode of install might be 755, therefore specify 644.

patchbomb: respect diff settings

status: make options optional (issue1481)

Retrieve Beyond Compare's path from registry Switch from a hardcoded path to registry key to find Beyond Compare's executable. Calling BCompare.exe works fine with version 3.0.14.

templater: fix age filter to state the obvious on future timestamps

tests: fix issue in test-audit-path with HGTMP on OS X

tests: eliminate use of sed -i (which fails on NetBSD)

tests: fix up tests to cope with 6a0bc2dc9da6

help: some improvements for the templating topic

help: add a topic about some of the templating features

Merge with stable

verify: don't trip over binary files starting with 01 0a

Merge with stable

notify: fix neglect of custom headers set via template e981725da3fe introduced a bug that discarded all custom headers. Add custom header to test template.

Give a useful message about PYTHONPATH if startup fails

hgweb: simplify parents/children generation code

kill some trailing whitespace

merge with crew-stable

coal/paper: add missing spaces in changeset child formatting

cmdutil.logmessage: options should be optional

bookmarks: work around missing posixfile_nt.readline()

Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.

diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>

Package hgk Tcl/Tk script in win32 installer hgk script will be copied to Contrib/hgk.tcl

Update mercurial.ini file packaged in win32 installer Update contrib/win32/mercurial.ini file with contrib/sample.hgrc content and append contrib/mergetools.hgrc content during installation

Merge with crew-stable

Document how HTML documentation is built under Windows

Add Lee Cantey's installer icon to win32 installer Add Lee Cantey's installer icon to contrib/win32 and update mercurial.iss accordingly

notify: fix neglect of custom headers set via template e981725da3fe introduced a bug that discarded all custom headers. Add custom header to test template.

branch closing: add test for branch closing (and reopening)

branch closing: referencing open and closed branches/heads Treat fully closed branches similarly to "inactive" in the output of 'hg branches'. They will be suffixed with "(closed)" where inactive branches are marked with "(inactive)". If the -a/--active option is given both inactive and closed branches will not be shown. Partially closed branches (multiple heads, at least one not closed) will display the next (tipmost) open head. Add -a/--active option to "hg heads" which will hide closed heads iff the option is specified. In other hg commands, when multiple branch heads exist the branch name will refer to the tipmost open head, and if none exist, then the tipmost closed head.

branch closing: mark closed branches with a 'close' extra Adds a --close-branch option to commit. When --close-branch is present the commit will mark the changeset with close=1 in the changeset extras field. If a regular changeset is added on top of a closed head the branch is no longer considered closed, and thus re-opened.

store all heads of a branch in the branch cache All heads of branches will be stored in a new cache file 'branchheads.cache' within the .hg directory. The old 'branch.cache' file from older versions will be ignored. The new cache contents are formatted line-by-line as '{node} {branchtag}\n'. This is the same as the previous format. Now, every head is recorded in an oldest -> tipmost order. The localrepo.branchheads function is reworked to use the data from the cache.

i18n: make local now builds .mo files

i18n: beginnings of a Danish translation

i18n: encode output in user's local encoding This makes the translated output obey the HGENCODING environment variable or the preferred encoding as set by the LANG or LC_ALL environment variables. Python 2.4 has a lgettext method which is similar, except that it doesn't know about HGENCODING or the settings in .hgrc.

i18n: lookup .mo files in private locale/ directory This default is to look for /usr/share/locale/xx/LC_MESSAGES/hg.mo for language xx, but this code will instead do the lookup from locale/ or mercurial/locale/ relative to the root of the Mercurial source tree.

i18n: new build_mo command for setup.py This command will generate .mo files under locale/ for the .po files found under i18n/.

i18n: let Makefile generate i18n/hg.pot The target update-pot extracts strings using pygettext and updates the i18n/hg.pot file. The translators can then use msgmerge to merge the new strings in hg.pot with their xx.po file when they want to. The setup.py file now includes files under both templates/ and i18n/ as data files.

recover when no version information is available

error: move SignatureError

dispatch: sort exception handlers

error: move SignalInterrupt now derived from KeyboardInterrupt to simplify catches

error: move UnknownCommand and AmbiguousCommand

sshrepo: change raise_ to abort

error: move UnexpectedOutput (now ResponseError)

error: move lock errors rename LockException to LockError

mq: remove import of revlog

bookmarks; clean up imports and function wrapping

error: move repo errors rename NoCapability to CapabilityError

error: move ParseError

kill imerge.py It's been broken for a while.

revlog: kill from-style imports They're slow.

errors: move revlog errors - create error.py for exception classes to reduce demandloading - move revlog exceptions to it - change users to import error and drop revlog import if possible

refactor version code - simplify version detection code - move detection code into setup.py - move version reading function into util.py - drop version.py code This makes hg more closely follow its own recommendation of how to deal with versioning your builds: use hg id in your build script.

Merge with crew-stable

merge: fix execute bit update issue introduced by 89207edf3973

transplant: move docstrings before imports (see issue1466)

diff: add --change option to display single changeset diff (issue1420)

mq: lowercase output This extension produces quite a lot of informational messages during its normal operation and it is hard to say which strings can be changed and which cannot.

churn: lowercase output This changes the continuously updated progress bar -- not something a script would rely on.

bdiff: add comment about normalization

Improved hgweb test. The hgweb fix in 069b29656401 aimed at restoring the "back" link in hgweb's filelog that has been lost in 62e0bb41e682. However, the previous version of this test ran the filelog command on a file with only a single filelog entry. In this case, the previous hgweb version did not exhibit the bug. The error condition is now correctly tested with a filelog of 2 entries.

tests: use killdaemons.py in test-highlight

use dict.iteritems() rather than dict.items() This should be faster and more future-proof. Calls where the result is to be sorted using util.sort() have been left unchanged. Calls to .items() on configparser objects have been left as-is, too.

mq: allow qpop if popped revisions are not working dir parents

mq: refactor the pop code to be more readable and allow more changes

merge with crew-stable

Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. During 2.17, Bugzilla ditched the old 'processmail' script. With 2.18 contrib/sendbugmail.pl arrived in its place. For notification emails to work properly, sendbugmail.pl requires as its second parameter the Bugzilla user who made the commit. Otherwise the user will not be recognised as the committer, and will receive notification emails about the commit regardless of their preference about being notified on their own commits. This parameter should be given to processmail also, but wasn't for historical reasons. Add new config with the local Bugzilla install directory, and provide defaults for the notify string which should work for most setups. Still permit notify string to be specified, and for backwards compatibility with any extant notify strings try first interpolating notify string with old-style single bug ID argument. Add new 2.18 support version to introduce sendbugmail.pl. In other words, this update should be backwards-compatible with existing installations, but offers simplified setup in most cases. And as a bonus Bugzilla notification emails will be dispatched correctly; notifiers will not receive an email unless configured to do so.

merge with -stable

use enumerate instead of zip

patch: export shouldn't close files received as a parameter We rely on __del__ to close the fd instead. Patchbomb was relying on this behaviour, fix it. Thanks to Manuel Barkhau for reporting it.

mq: make qnew patch format consistent with qrefresh (issue1457)

monoblue: fix child revision display in file diff page

web: use the correct filectx in filelog

convert: display child command output if --debug (fix 878466138b57)

convert: print darcs error messages iff --debug

convert: check for darcs-2-compatible path

merge with -stable

merge with crew-stable

zeroconf: add extension documentation

1 file changed, 7 insertions(+), 9 deletions(-) hgext/purge.py | 16 +++++++--------- purge: clarify behavior with regard to ignored files The purge documentation previously said that purge would delete ignored files. This is only true if purge is passed the --all option, which is now stated explicitly. A few trivial grammar errors were also fixed.

tests: shrink wait interval for test-convert-bzr-merges

Merge with crew-stable

tests: try to prevent different ordering in test-convert-bzr-merges

merge with crew

lowercase prompts The prompts are interactive and not meant for scripts.

lowercase ui.debug and assert output This does not effect the log or status commands and should be okay according to the compatibility rules.

lowercase help output Changes docstrings to begin with a lowercase word. Only docstrings used in help output is changed. Scripts are not expected to grep the output of 'hg help' so this change should pose no problem with regard to the compatibility rules.

mq, i18n: mark strings for translation

commands: remove redundant paragraph from tags help

Merge with crew-stable

test: added testcase for cvsps log message lookahead

cvsps: cvs log loop uses lookahead to avoid misleading text Changes cvsps.py's cvs log reader to use a one-line lookahead, so that possibly misleading log messages can be disambiguated. In particular I have past committers who used cvs log's 28-character row of hyphens within commit messages; this throws cvsps and disrupts conversion. The only alternative in this case is to edit the cvs ,v file by hand, which bloodies mercurial's "don't change history" principle.

convert/gnuarch: recode cat-log parts to utf-8 to be hg.description friendly

convert/gnuarch: add cat-log payload to commit description

bisect: improve hg bisect -c (relative paths, error handling) hg bisect -c failed with a relative path or when the executable wasn't found. Use util.find_exe()+os.spawnl() instead of os.spawnlp() and improve the handling of errors (killed process, exe not found). Thanks to Georg Brandl for reporting it.

merge with crew-stable

convert/gnuarch: correct indentation

merge with crew

test-audit-path: add one more test (issue 1450)

convert/gnuarch: follow continuation-of revisions Built on top of previous patches: - continuation-of parsing - registered archives retrieval - use of fully qualified revisions This allows the converter scanning for more source revisions following the tree versions 'leaked' through the continuation-of informations. Coupled with the registered archives retrieval, this makes possible to decide to follow such a hint or stop scanning for more revisions. This also implies some changes in the retrieval of some base-0 revisions when they're continuation-of other revisions, in that case a 'replay' will work where a simple 'get' fails because the dir exists already. I found the code dealing with 'replay' quite good as it has already a fallback to 'get' in the error path.

convert/gnuarch: retrieve known archive names list This will make possible in a followup patch to prevent following history that is not reachable because an archive is unknown to the user.

convert/gnuarch: parse continuation-of revisions in gnuarch source In GNU Arch, continuation-of was often used for: - tagging revisions - continue working on a project in a new archive, because arch was scaling poorly in revision numbers (cat-logs were slow to be parsed and scanned through) - very similar to the previous point, fork his own branch of a project. Parsing this header information will allow to 'follow' new history because it often hints at older/forked/personal revision trees. This patch however just implements the parsing of the continuation-of header. A followup patch will implement the proper use of this new information.

convert/gnuarch: use fully qualified revisions There is no need loosing information in the conversion process. This could lead to wrong shamap mappings if different archives used the same 'version' naming.

convert/gnuarch: keep track of original revision in extra headers It seems to be standard to populate the .rev attribute of a commit to keep track of original SCM revision names. Just do it(tm).

convert/gnuarch: robustify cat-log retrieval GNU Arch used to scale very poorly when revision number was increasing. This was mostly caused by the huge amount of cat-log it has to scan/read through to keep track of all patches that were merged in a given revision. In order to improve things, cat-log prunning was a common admin task that would accelerate cat-log parsing at the expense of unreachabe locally stored cat-logs. However, these missing cat-logs are still available in the archive. So try to get them from the archive as a fallback solution.

convert/gnuarch: set prefered locale for str conversions Seems necessary, as a test on my archives goes further with this.

convert/gnuarch: fix cat-log parsing cat-log parsing was very wrong. It assumed the Summary header was comming last, which is wrong. Plus the code was buggy because it was concatenating all headers in the summary. As parsing GNU Arch isn't trivial, and python email code does it so well... just use that ;-)

convert/gnuarch: remove unused code Debug stuff ? Wipe it.

Merge with crew-stable

hgweb: fix long line lengths introduced in 2dc868712dcc

tests: use killdaemons.py in test-pull-http

cvsps: kill some more trailing whitespace

merge with crew-stable

Merge with crew-stable

use repo.wjoin(f) instead of os.path.join(repo.root, f)

correctly update dirstate after update+mode change (issue1456)

mq: don't warn about ambiguous patch name when using patch index (issue1439)

convert/gnuarch: fix switched copy source and destination Reported by Edouard Gomez <ed.gomez@free.fr>

mq: drop copy records when refreshing regular patches (issue1441) Copy information was saved in a common loop, then refined in a git-only block. The problem was the latter did filter out renames occuring in the current patch and irrelevant to commit. In the non-git case, copy records still existed in the dirstate, referencing removed files, making the commit to fail. Git and non-git copy handling paths are now separated for simplicity. Reported by Gary Bernhardt

hgweb: fix problems with empty repositories

localrepo: fix bad manifest delta generation (issue1433) The issue came from the 720ae5085ee3 fix for issue586 working only for manifest.add() fast path, where the incorrect removed file set was ignored. This path was no longer taken after 716a1296e182 refactoring.

hgweb: send HTTP unauthorized error when denying pull

hgweb: allow static content when deny_read denies access

patch: kill some trailing whitespace

hgwebdir_mod: fix a performance issue with static files

Merge with -stable

setup: warn about missing standard Python components

Circumvent removal of valid bisect candidates due to previously skipped ones As reported in issue 1445: A valid candidate revision for a bisect test is not considered for testing due to its skipped ancestor. If this revision is the only untested one left an assertion error occurs.

Added signature for changeset 11a4eb81fb4f

Added tag 1.1.2 for changeset 11a4eb81fb4f

test-audit-path: add more tests (issue 1450)

audit: reject paths with .hg (issue 1450) Spotted by Peter Arrenbrecht

merge bookmarks

bookmarks: tests for track.current option

bookmarks: set the current bookmark to the new name if we rename the current bookmark If we rename the current bookmark, we have to set the current bookmark to the new name.

merge with crew-stable

monoblue: add less/more links to graph page

python implementation of diffstat Implemented as two functions: diffstat, which yields lines of text, formatted as a usual diffstat output, and diffstatdata, which is called inside diffstat to do real performing and yield file names with appropriate data (numbers of added and removed lines).

add a comment about the need of hg._update()

merge with -stable

test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py Note that other sed replacement commands are also filtering get-with-headers.py, but they seem to be more test specific, hence not handled here.

Merge crew and stable

merge with stable

Merge with stable

merge with stable

color: fix colorization of the 'old mode' git diff metadata

merge with -stable

merge with crew-stable

merge with crew-stable (again)

merge with crew-stable

keyword: simplify repo.local and bundle check (as in 2f4a399a8787)

Merge with crew-stable

Added signature for changeset 3773e510d433

Added tag 1.1.1 for changeset 3773e510d433

resolve: clarify and simplify help

tests: fix no-diffs option

archive: fix bogus error message with no working directory

resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer

fix typo