mq: make 'qdelete <patchidx>' work again. This just backs out 1abd9442727c (a minor code cleanup that accidentally broke qdelete) and adds a test.

bdiff.c: Added support for py3k. This patch adds support for py3k in bdiff.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

diffhelpers.c: Added support for py3k. This patch adds support for py3k in diffhelpers.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

base85.c: Added support for py3k. This patch adds support for py3k in base85.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

parsers.c: Added support for py3k. This patch adds support for py3k in parsers.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

mpatch.c: Added preliminary support for py3k. This is done by including the util.h header file, that defines appropriate macros according to the current python version.

osutil.c: Support for py3k added. This patch adds support for py3k in osutil.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3. listdir_stat_type is also changed in the following way: A previous call to PyObject_HEAD_INIT is substituted to a call to PyVarObject_HEAD_INIT, which makes the object buildable in both python 2.x and 3.x without weird warnings. After testing on windows, some modifications were also made in the posixfile function, as it calls PyFile_FromFile and PyFile_SetBufSize, which are gone in py3k. In py3k the PyFile_* API is, actually a wrapper over the io module, and code has been adapted accordingly to fit py3k.

util.h: Utility macros for handling different Python APIs. If we are in py3k, a IS_PY3K symbol is defined. Apart from that, byte strings use the API defined in Python 2.6+ (_?PyBytes_.*). For Python < 2.6, the bytes API is defined accordingly for mercurial usage (shameless copy from bytesobject.h from Python's code). Some macros were backported from 2.6, as inspired by rPath's pycompat.h.

relink: ensure deterministic directory walk in collect

help: add "glossary" topic Joint work with Vishakh Harikumar, Pradeepkumar Gayam, David Champion, Mark Booth, timeless, Matt Mackall, Heinrik Stuart, Greg Ward, and Martin Geisler.

relink/progress: Adding progress for collecting stage

relink/progress: Adding progress for pruning stage

merge: when current branch has 1 or > 2 heads, actually abort. Currently merge just prints abort-like messages to stderr and then exits with a misleading status 0 (cleverly disguised as "False"). With this change it raises Abort, just like every other fatal error.

tags: remove inactive debugging code. It was left in just in case things went wrong with the tag cache in Mercurial 1.4, so we could easily crank up the verbosity with a one-line change. There have been no problems in 1.4 or 1.5, so it should be safe to drop this now.

tags: remove the old non-caching implementation of findglobaltags(). It was left behind just in case the tag cache blew up in Mercurial 1.4, so we could easily revert to the non-caching code. There have been no problems with the tag cache in 1.4 or 1.5, so it should be safe to get rid of this code now.

keyword: postpone manifest calculation in kwtemplater.overwrite We can check for file existence in the working directory (needed in case of recording) by simply using the given context and calculate the manifest only when there are in fact candidates for expansion/shrinking.

revset: fix call to ctx.extra() in closed()

p4: fix long line and bad spacing around %

Fix shell quoting on p4 conversion

tests: rename test-merge3 to test-add-remove. It tests that 'hg commit' does not crash if the user removes a newly added file, which has nothing to do with merging.

check-code: reformat long lines

dagparser: replace format with str

check-code: catch format(), introduced in Python 2.6

commands: get rid of generic exception in debugbuilddag

check-code: fix check for any/all function The old check would only detect any/all at the beginning of a line. The regexp was probably just modeled after the preceding regexp which (correctly) finds the 'with' keyword at the beginning of a line. We now complain about 'any(' and 'all(' anywhere in a line, unless it is preceded by 'def'. This allows us to define our own compatibility wrapper in util and use 'util.any(' in the code.

hgext/zeroconf/__init__.py: Separate relative and absolute imports. 2to3 complains when relative and absolute imports are mixed, this fix just separates them on the zeroconf extension. According to 2to3, the other modules are fine.

revset: improve filter argument handling

commands: format is a Python2.6 function

debugbuilddag: build a changelog dag from a concise description Useful in tests to quickly build a complex DAG in an empty repo. Handles local tags and named branches. Options to, at each rev, - create a new file, - overwrite the same file, - append to the same file, - write to a specific line in a mergeable file. Can run shell commands during DAG buildup.

debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Mainly useful for reusing DAGs somewhere else, for example for attaching them to a bug report, or for importing them into other environments (like my test environment for incoming/outgoing discovery).

dagparser: parses and formats DAGs as concise text As discussed during the sprint. See the doc comment and doctests for specification and examples. This is used in subsequent patches to export revlog and changelog DAGs, and to generate a repo with a given changelog DAG.

tests: fix up webraw encoding

strip: backup bundles should use the .hg extension

hgweb: specify a charset when sending raw text files Gets the charset from encoding.encoding parameter.

summary: report copies and renames

provide pre- and post- hooks with parsed command line arguments. python hooks are passed two new keyword arguments: - opts: a dict of options; unsepcified options are set to their default - pats: a list of arguments shell hooks receive two new variables containing string representations of the above data: - $HG_OPTS - $HG_PATS for example, the opts and pats for 'hg -f v1.1' would be: {'force': True, 'message': '', 'rev': '', 'user': '', 'date': '', 'local': None, 'remove': None, 'mq': None} ['v1.1']

tests: fix some branch head fallout

pager: set ui.formatted() prior to redirecting stdout.

mq: use ui.formatted() instead of ui.plain().

color: use ui.formatted().

ui: document the formatted(), interactive() & plain() functions.

ui: add ui.formatted configuration variable and accessor function. This new configuration variable is similar in nature `ui.interactive', but applying to output instead of input. This allows as to support non-interactive sessions where formatted should be enabled, such as when using the pager extension. The variable itself is left undocumented; it is not intended for use outside Mercurial and its extensions.

revlog: fix inconsistent comment formatting

improve --branch processing (and differentiate from # syntax) Previously #foo and --branch foo were handled identically. The behavior of #foo hasn't changed, but --branch now works like this: 1) If branchmap is not supported on the remote, the operation fails. 2) If branch is '.', substitute with branch of the working dir parent. 3) If branch exists remotely, its heads are expanded. 4) Otherwise, the operation fails. Tests have been added for the new cases.

help: show value requirement and multiple occurrence of options this helps users to know what kind of option is: - no value is required(flag option) - value is required - value is required, and multiple occurrences are allowed each kinds are shown as below: -f --force force push -e --ssh CMD specify ssh command to use -b --branch BRANCH [+] a specific branch you would like to push if one or more 3rd type options are shown, explanation for '[+]' mark is also shown as footnote.

keyword: pass context to kwtemplater.overwrite Now that we have retrieved the context in every calling function except commit, pass it as argument to kwtemplater.overwrite to avoid looking it up twice. Reorder arguments to kwtemplater.overwrite to reflect their importance. Turn node argument into a simple boolean and rename it to iswctx.

parser: fix missing param in _match

commit: add tests for the 'created new head' message

commit: fix display of 'created new head' message (issue2186) To avoid recurrent fixes for the display of this message, a summary table with all case combinations has been added to the code. Basically, there is two condition for the message to be printed: * this is not an initial (named branch or topo) root * none of the parents are in the current branch heads

rebase: --abort doesn't strip away the target changeset (issue2220) When a changeset is skipped, rebase keeps the previous target as next target and if the skipped cset is the first one, the recorded target is actually the original target. --abort did not detect this situation but simply stripped away the cset.

test-branch-option: Updated output to match rev 3f1409082720

Merge with mpm

discovery: fix description line

Merge with stable

Merge backout

Backed out changeset: e1dde7363601

ui: handle leading newlines/spaces/commas in configlist Thanks to Greg Ward for spotting the problem introduced in 0a548640e012 and for supplying the test case.

mergetools: add configuration for Ultra Compare (issue2226) Initial config provided by Tim Pietzcker

mq: use hg reST role some more

fix encoding bug in 05ac42e56452

cleanups: undefined variables

cleanups: unused variables

move working dir/dirstate methods from localrepo to workingctx

color: labeled text should be passed to ui.write() as ui.labeled Some implementations of ui.label() (HTML versions in particular) must escape the provided text and then markup the text with their tags. When this marked up text is then passed to ui.write(), we must label the text as 'ui.labeled' so the implementation knows not to escape it a second time (exposing the initial markup). This required the addition of a 'ui.plain' label for text that is purposefully not marked up. I was a little pedantic here, passing even ' ' strings to ui.label() when it would be included with other labeled text in a ui.write() call. But it seemed appropriate to lean to the side of caution.

move discovery methods from localrepo into new discovery module

merge with stable

push/pull: fix bug in "--branch ." handling The branch wasn't expanded, so only the tip was operated on.

shrink-repo: wrong variable name

replace Python standard textwrap by MBCS sensitive one for i18n text Mercurial has problem around text wrapping/filling in MBCS encoding environment, because standard 'textwrap' module of Python can not treat it correctly. It splits byte sequence for one character into two lines. According to unicode specification, "east asian width" classifies characters into: W(ide), N(arrow), F(ull-width), H(alf-width), A(mbiguous) W/N/F/H can be always recognized as 2/1/2/1 bytes in byte sequence, but 'A' can not. Size of 'A' depends on language in which it is used. Unicode specification says: If the context(= language) cannot be established reliably they should be treated as narrow characters by default but many of class 'A' characters are full-width, at least, in Japanese environment. So, this patch treats class 'A' characters as full-width always for safety wrapping. This patch focuses only on MBCS safe-ness, not on writing/printing rule strict wrapping for each languages MBCS sensitive textwrap class is originally implemented by ITO Nobuaki <daydream.trippers@gmail.com>.

keyword: use context to detect uncommitted merge

tests: use --debug on test-clone

shrink-revlog: use util.mktempcopy() to preserve mode of index file. (There's still a chmod() call to manually preserve the mode of the data file.)

revset: delay import of hg to avoid start-up import loops

error: fix up test-hgrc

error: update test-trusted.py

revset: fix test failure with qfinish

revset: raise ParseError exceptions

error: add new ParseError for various parsing errors

error: change ParseError to CommandError

hgrc: improve docs for the trusted section

rebase: use usual util.abort rather than error.ParseError

revset: sort the predicate list

revset: fix - handling in the optimizer

revset: fix up tests

walkchangerevs: allow empty query sets

revset: add tagged predicate

revset: optimize the parse tree directly Rather than dynamically optimize in methods, we pre-optimize the parse tree directly. This also lets us do some substitution on some of the symbols like - and ::.

revset: add support for prefix and suffix versions of : and ::

revset: hook into revrange

revset: add a debugrevspec command

revset: introduce revset core

revset: introduce basic parser

remoteui: move from cmdutil to hg

mq: better qqueue test for troublesome names

mq: prevent the creation of a queue whose name is already taken Each check is moved under the code handling the relevant option, and a new one is added for --create. This fixes duplicated entries being added to the queues list.

mq: fix naming issues for qqueue directories

win32text: mark this extension as deprecated

Merge with stable

shrink-revlog: preserve mode of the shrunken index and data file. Otherwise, the shrunken index file always has mode 0600 thanks to mkstemp(). This is annoying on a server, where multiple users may need to read/write the manifest. chmod()ing the data file is not strictly necessary, but it's nice for consistency.

Fixed a bashism with the use of $RANDOM in hgeditor. The variable $RANDOM is not POSIX so a portable /bin/sh may not define it. When creating a directory with a random name it's better to use mktemp, which, even though is not POSIX, exists in common Unixes including Linux, OpenBSD, FreeBSD and MacOS X.

churn: add possibility to include/exclude paths

churn: support spaces in aliases (issue2222)

Merge with stable

Merge with i18n

Added signature for changeset 24fe2629c6fd

Added tag 1.5.4 for changeset 24fe2629c6fd

Merge with i18n

merge with i18n stable

i18n-pt_BR: synchronized with 0bb67503ad4b

Merge with stable

clone: save hardlink state of util.copyfiles() When trying to do hardlink-cloning, the os_link() call of the first file tried already fails on Windows, if the source is on a UNC path. This change avoids calling os_link() for the rest of files, leaving us with a *single* failed os_link() call per clone operation, if the source can't do hardlinks.

util.copyfiles: don't try os_link() again if it failed before If the os_link() call on the first file in the directory fails [1], we switch mode to using shutil.copy() for all remaining files. [1] happens for example on Windows for every file when cloning from a UNC path without specifying --pull.

keyword: retrieve added and modified files from commitctx

keyword: force dirstate normal when all changes in a file are recorded Before this bugfix a file whose changes were entirely recorded was still considered modified by "hg status". Note: the test must use hg record -l/--logfile, because this is not reproducible with hg record -m/--message.

clone: print number of linked/copied files on --debug

Merge with stable

eol: extension for managing file EOLs

Merge with stable

Merge with i18n

Merge with i18n

merge with i18n stable

i18n-pt_BR: added message from 1b8aa9ffa7dc

merge with i18n stable

i18n-pt_BR: synchronized with ed71cb07d7b2

Merge with stable

pager: exec pager using /bin/sh -c This mimics the behavior of popen() and ensures setting the pager to something like "LESS=FSRX less" will work.

hgweb: fix race in refreshing repo list (issue2188)

Merge with stable

record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.

record: better way to find help in docstring This outputs only the lines in the verbatim block without relying on the translator to have translated the little 'y - record this change' string.

record: docstring typo

mq: mention qqueue in module docstring

clone: save hardlink state of util.copyfiles() When trying to do hardlink-cloning, the os_link() call of the first file tried already fails on Windows, if the source is on a UNC path. This change avoids calling os_link() for the rest of files, leaving us with a *single* failed os_link() call per clone operation, if the source can't do hardlinks.

util.copyfiles: don't try os_link() again if it failed before If the os_link() call on the first file in the directory fails [1], we switch mode to using shutil.copy() for all remaining files. [1] happens for example on Windows for every file when cloning from a UNC path without specifying --pull.

cmdutil: cleanup imports

make transactions work on non-refcounted python implementations

mq: support multiple patch queues using qqueue

Merge with stable

status: avoid performance regression when no .hgsub is present (introduced by 24ce8f0c0a39)

doc: document expansion of %include and ui.username

ui.username(): expand environment variables in username configuration value. note: expansion of config variables must be handled on a case-by-case basis because they can contain arbitrary data that may not be desirable to expand.

config: expand hgrc %include paths

rename: make --after work if source is already in R state I routinely want to use `hg addrem` and then fix up missed renames manually using `hg mv -A`. This patch allows me to record such renames from a source in state R to a target in state A.

Merge with stable

doc: clarify that sections can be split

doc: clarify that keys can be overridden

commands: document --new-branch flag for push

Merge with stable

commands: updates to push docstring. With contributions from mg, hstuart, timeless, and vsh.

mq: remove unneeded local variable in delete

pager: exec pager using /bin/sh -c This mimics the behavior of popen() and ensures setting the pager to something like "LESS=FSRX less" will work.

keyword: offer svn-like default keywordmaps svn-like default keywords can be set in a new configuration section called [keywordset] -- thanks to timeless for the name. Move setup of default keywordmaps into dedicated function used by kwtemplater.__init__ and demo. HeadURL/URL is not supported (by default).

keyword: add 2 svn-like date filters svnisodate yields the format the date in svn's Id keyword expands to. svnutcdate yields the format svn's Date/LastChangedDate expands to. http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html

util: give appropriate default args to atomictempfile() mode='w+b' is the default of python's TemporaryFile().

push: add --new-branch option to allow intial push of new branches Compare this to --force which allows anything to be pushed. With --new-branch, only changesets to named branches not present on the and changesets not introducing additional heads on existing branches are allowed. Developed by Henrik Stuart <henrik.stuart@edlund.dk> Sune Foldager <cryo@cyanite.org>

check-code: add check for 'source'

Merge with stable

tests: fix bashism to load helpers.sh `source` isn't available at POSIX sh.

color: bring back colors with pager It's introduced by 3c368a1c962d, but missing in merge changeset at a890cc501501.

dispatch: include Python version in traceback

rebase: add error codes Suggested by Dirk Hasselbalch

rebase: improve --abort failure message

rebase: only show "rebase completed" message with -v

strip: hide unbundle messages by default Unbundling is an internal implementation detail for strip, only show them with --verbose.

Fix up rebase's handling of strip backups

strip: improve full backup message

strip: drop deprecated -b from synopsis

rebase: use helpers.sh in tests

strip: be quiet about temporary internal bundle

Merge with crew-stable

convert/svn: close gettags() log stream (issue2196)

convert/svn: remove useless try/catch While the try/catch was reintroduced in 2f0f9528e77b, it was made useless by the tags/ existence check in getheads().

Use our custom hg reStructuredText role some more I missed these occurrences on my first scan through the source.

minirst: handle line breaks in hg role

extdiff: fix reST syntax in module docstring

Fixed a bashism with trap numbers in hgeditor. When using trap in a shell script, it's more portable to use signal names, instead of numbers. Signal names (INT, KILL,...) are defined in POSIX, whereas its corresponding numbers aren't.

Merge with stable

rebase: stress that only local changesets should be rebased

minirst: fix debug code

Merge with stable

tag: add -e/--edit option for modifying the commit message

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.