extdiff: add labels, read diff arguments from [merge-tools] hgtk has been using these same configs since Feb. Users only have to name the tools they would like to use, ex: [extdiff] kdiff3 = meld =

patchbomb: respect HGPLAIN when piping --test output to PAGER It makes easy to use `hg email --test` from another tool.

pager: fork and exec pager as parent process With the pager as the child process instead of the parent process, the termination of the parent Mercurial process can cause the terminal to return before the pager exits. Inverting the relationship prevents that issue. Platforms without fork() will continue to use util.popen().

commit: fix complaint about branch merge creating new heads (issue2186)

Fix hg heads -r flag documentation The command arguments are "[-ac] [-r STARTREV] [REV]..."

Fix wording in hg pull documentation

merge: avoid to break the dirstate copy status on moved files In the case a file is locally tracked as copied in dirstate, and that a merge affects this file, this file should not be marked as modified in dirstate, as this will break the current copy state. Note: only affect working directory merge, not branch merge.

commands: initial audit of exit codes bisect: clarify None return bundle: return 1 on no changes clone: return result code copy: limit errors to 0/1 commit: return 1 on no changes forget: return 1 on errors grep: return 1 if no match found remove: return 1 on errors resolve: return 1 if something fails to resolve rollback: return 1 if no rollback data

hgweb: fix race in refreshing repo list (issue2188)

rollback: fix up tests

rollback: fix off-by-one in message

commit: note new branch heads rather than topological heads Move to using contexts while we're at it.

Merge with 1.5.3

Added signature for changeset fdcf80f26604

Added tag 1.5.3 for changeset fdcf80f26604

tag: strip whitespace from tag names (issue2174)

keyword: support extensions using dorecord, e.g. crecord Provide extendable keyword.recordextensions variable, so other extensions beside hgext.record which provide the dorecord function can cooperate with hgext.keyword like so (example from crecord): def extsetup(): try: keyword = extensions.find('keyword') keyword.restricted += ' crecord qcrecord' try: # use record support in keyword.py if present keyword.recordcommands += ' crecord qcrecord' keyword.recordextensions += ' crecord' except AttributeError: pass except KeyError: pass

convert/svn: fix long line

i18n: fix up bad merge

summary: show if commit will be from a closed head

commit: inform the commiter when resurrecting a closed changeset

commit: prevent closing non-head changesets

Merge with stable

Merge with i18n

Merge with i18n

i18n-da: merge with stable

i18n-da: translated various small strings

i18n-da: synchronize with d29bd98ebff6

Merge with stable

static-http: disable lazy parsing This only hits if you're crazy enough to use static-http on a repository with revlogs larger than 1M. Don't do it.

expand paths to local repository or bundle in appropriate classes This avoids problem with unexpanded paths when it's not possible to expand it at higher level (for example, if file:~/path/ is supplied as path in schemes).

push: document return values between various repo methods. This starts at localrepository.push() and seeps down to push_addchangegroup(), push_unbundle(), prepush(), addchangegroup(), and leaks out to sshrepository.unbundle(), sshrepository.addchangegroup(), and httprepository.unbundle(). Seems to cover everything you ever wanted to know about pushing but were afraid to ask.

cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Currently running 'hg rename --after foo.txt bar.typo' is a silent no-op. This patch adds a warning. It also updates the copy and rename tests. No actual functionality is changed. fixes issue 1822

slightly improve memctx api

patchbomb: Reply-To support From RFC 5322: an optional reply-to field MAY also be included, which contains the field name "Reply-To" and a comma-separated list of one or more addresses. [...] When the "Reply-To:" field is present, it indicates the address(es) to which the author of the message suggests that replies be sent. In the absence of the "Reply-To:" field, replies SHOULD by default be sent to the mailbox(es) specified in the "From:" field unless otherwise specified by the person composing the reply. Reply-To addresses may be specified either via command line with --reply-to or via the 'email' or 'patchbomb' sections of the config file.

merge: tool.check = prompt will force an interactive merge check tool.check = prompt can be used when the exit status of a merge tool is unreliable but an explicit user signoff on the merge result is acceptable.

merge: introduce tool.check parameter tool.check is a list of check options, and can be used in place of tool.checkchanged and tool.checkconflicts: Equivalences: tool.checkchanged = yes tool.checkconflicts = no tool.check = changed tool.checkchanged = no tool.checkconflicts = yes tool.check = conflicts tool.checkchanged = yes tool.checkconflicts = yes tool.check = changed, conflicts Add _toollist() wrapper for ui.configlist() to implement this consistently. checkchanged and checkconflicts are still supported, but check is preferred for implementing new check options.

give worst-case 'merge' merge-tool lowest priority Another tool had -10 already. Since 'merge' is clearly a worst-case tool (internal), lowering to -100 ensures there's plenty of room for slightly better cases.

merge: tool.premerge=keep will leave premerge markers in $local

merge with mpm

merge with stable

context: fallback function should not return None

test-subrepo-svn: fix strange svn behaviour on windows I got a full path when pusing the external like: Sending C:/foo/bar/test-subrepo-svn/sub/t/s/alpha instead of the relative path

tests: force color ansi mode on Windows

acl: improve undefined group error handling

test-acl: avoid $HGTMP on windows sed does not like colons and there are other path normalization issues.

acl: grp module is not available on windows

convert/svn: report path discovery progress When converting non-local repositories, scanning changed paths before retrieving data can be almost as slow as retrieving the data itself, thanks to HTTP calls overhead.

convert: display files data retrieval progress

convert: add progress support

convert: merge sources getmode() into getfile()

convert/svn: remove useless sort

convert/svn: list files explicitely, stop checking their type We do not care about directories when looking for recursively added or removed items, and the redundant _checkpath() call is expensive with remote repositories.

acl: clarify acl.sources, fix typo

convert/svn: remove unused variable

Merge with crew-stable

convert/svn: handle files/links replaced by dirs (issue2166)

convert/svn: do not retrieve removed files It gives us a way to not retrieve content of entries we know are no longer files. And it is faster when converting remote repositories.

convert/svn: correctly encode deleted entry paths This recode call was removed in ede2247e61aa, because it looked the encode(decode()) construct was a no-op. In fact, the first decode() call was wrong, and entries still have to be encoded before being passed to the sink.

convert/svn: remove broken but unused copy filtering code For some reason, if a copy source is deleted in the same revision it is referenced, it is filtered out. This is silly, because this happens all the time with move operations. Fortunately, the filtering code is buggy and ends being a no-op 99% of the time, since it does not delete the right key. Just remove all this nonsense.

test-convert-svn-move: test moved dirs copy records

convert/svn: tree conflicts no longer happen now we use memctx

clean up remaining generic exceptions

mq: make use of output labeling for summary

mq: mark error message for translation

mq: mark string for translation

color: add some missing background colors for win32 console

subrepo: fix 2.5ism in url parsing

acl: update test output

acl: update docstring to describe section [acl.groups]

acl: support for group definitions in section [acl.groups], which take precedence over OS-level groups

subrepo: fix test output

subrepo: print paths relative to upper repo root for push/pull/commit This makes more sense when using multiple levels of nesting. This happens to help a lot in a case where 3 projects of mine all use the same makefile helper project as a sub. A fourth project use these first three projects and current output made it very hard to figure which makefile helper was committed. it looked more like the project was committed/pushed/pulled three times in a row than dealing on three different repos.

subrepo: print pushing url

subrepo: dirtiness checks should iterate over subrepos

subrepo: normalize path part of URLs so that pulling subrepos from webdir works For a "all projects at root" repo layout eg: /main /sub Where subrepos are used such that a clone of main has this layout: ./main/ ./main/.hgsub ./main/sub/ And the .hgsub content is: sub = ../sub This allows a pull from a hgweb where main and sub are exposed at the root (or same directory level) The current code doesn't normalize the path component of a pull url. this results in trying to pull from http://server.com/hg/main/../sub Current hgweb implementation doesn't reduce the path component so this results in a 404 error though everything is setup logically. This patch adresses this 404 error on the puller side normalizing the URLs used for pulling sub repos. For this example, the URL would be reduced to http://server.com/hg/sub Fix + test

mq: fix test

mq: add a line to hg summary

changectx: change diff() to accept keyword opts

changectx: use repo.ui diffopts, allow argument override

Merge with stable

commands: explain that "hg serve" does not do authentication

commands: explain that "hg serve" is mostly for ad-hoc sharing

context: only scan unknowns when needed

context: use asserts for ignored and clean exceptions

workingctx: use member variables to store ignored and clean If some code tries to query ignored or clean files without first calling the explicit status() method to query them, it will raise an exception (indicating a software bug).

workingctx: add explicit status method, add ignored and fix clean workingctx.clean() and memctx.clean() have both been returning ignored files since their creation. This patch fixes clean() while introducing a method for querying ignored files. The new status() method can be used to explicitly override the default (fast) arguments used by the _status property.

context: add a changectx.diff() convenience function With this function, extracting diffs becomes trivial: repo = hg.repository(ui.ui(), path=root) ctx = repo['tip'] for out in ctx.diff(): print out

keyword: omit setting extra variable for record context Since dc2f37864348 the context is always retrieved in kwtemplater.overwrite().

acl: more consistent docstring

acl: fix reST syntax

acl: update test output for branch-based access control

acl: add support for branch-based access control

Merge with main

Merge with stable

grep: clarify help for -r

summary: add subrepo status

keyword: simplify record switch in kwtemplater.overwrite 1) use kwtemplater.record attribute for clarity 2) drop optional context argument; consider the speed loss by duplicating the dictionary lookup repo['.'] as negligible

Adjusted output of test-subrepo for issue1977 to 05856e682521

fix coding style

color: fix typo in w32effect for bold_background

Merge with stable

Added signature for changeset 39f725929f0c

Added tag 1.5.2 for changeset 39f725929f0c

merge with i18n stable

i18n-pt_BR: synchronized with ee5b112aa529

Merge with stable

Merge with i18n

Merge with i18n

merge with i18n stable

i18n-pt_BR: synchronized with 3b89899934a6

mq: rewrite strip docstrings This patch is joint work with ilowe.

test-issue2137: don't use $PWD; use `pwd` instead This fixes test failure on Solaris, as described on http://mercurial.selenic.com/wiki/WritingTests

test-mq-merge: quote ^ ^ is magic on Solaris and must be quoted

test-extension: changed environment variables must be exported again This fixes failure on Solaris because HGRCPATH wasn't unset.

subrepo: add test for issue1977

subrepo: update test output for issue1977 fix

subrepo: propagate and catch push failures

static-http: mimic more closely localrepo (issue2164: allow clone -r ) * httprangereader: name, __iter__ and close are needed to mimic file object * static-http opener: - disallow write/append modes - add (unused) atomictemp parameter * static-http repo: - root attribute is needed for localrepo.dirstate() - _branch* attributes are required for commitctx and branchmap calls * tags: force repo.opener.__iter__ call earlier to force httprangereader to try to read the cache early, to avoid raising IOError later.

keyword: cleanup test and make it portable - replace sed call with python command - no need to back up hgrc before record