util: fix default termwidth() under Windows sys.stdout.write('-'*80 + '\n') or sys.stdout.write('-'*80 + '\r') do not work on Windows as they do on unix. On a 80 columns Windows console, the extra CR or LF are interpreted as if belonging to the next line, so the first command displays 2 lines (only one on unix) and the second one leave the line visible and move back to the following line. To avoid this, we sacrifice one column under Windows.

commands: better markup in "hg help paths"

Merge with stable

commands: revised documentation of 'default' and 'default-push' This patch was a collaborative effort between faheem, mg, timeless and ilowe.

wix: hgweb file renames

zeroconf: handle string hgweb config args

hgweb: unify hgweb calls in serve

serve: webdir_conf -> webconf

hgweb: synchronize fcgi and wsgi scripts

hgweb: drop hgwebdir.cgi, now unified with hgweb.cgi

hgweb: simplify hgweb.cgi, add help pointer - move important config to the top - add help pointer - drop encoding hack comment (use web.encoding) - simplify imports - use unified hgweb interface

help: add some help for hgweb.config files

help: config.txt typo

docs: document default for web.encoding

hgweb: make hgweb.hgweb a unified interface to hgweb/hgwebdir

hgweb: always clear report_untrusted and interactive

hgweb: add baseui to hgweb entrypoint

hgweb: make baseui parameter non-positional

hgweb: make top-level prototypes mirror their callees

Merge with stable

test-convert-git: be tolerant to git output variants

color: handle non-standard stdout on win32

Merge with crew-stable

convert/git: check status when reading output stream

convert/git: check status when reading the whole output

convert/git: rename gitcmd() into gitopen() for readability

minirst: support all recommended title adornments

minirst: correctly format sections containing inline markup Before, a section like ``foo`` ------- would be formatted as "foo" ------- We now recompute the length of the underline when formatting the section.

ui: support quotes in configlist (issue2147) Several places that use ui.configlist, predominantly in authentication scenarios need to interface with systems that can contain spaces in usernames (e.g. when client certificates are usernames, or Windows usernames). This changeset introduces a parser that supports quoting of strings, and escape quotation marks that get decoded into a single quotation mark that adopts the usual behavior one would expect from quoting strings. The Python library shlex module is not used, on purpose, as that raises if it cannot match quotation marks in the given input.

Merge with stable

hgrc.5: mention lists as well

Merge with stable

hgrc.5: describe form of config values

minirst: add test for sections

contrib/win32: update build instructions after cbe400a8e217

doc: add links from hgrc.5 to hg.1

doc: make links for hg role The system has a bit of smartness: :hg:`update` -> links to hg.1.html#update :hg:`help diffs` -> links to hg.1.html#diffs

Use hg role in help strings

doc, minirst: support hg interpreted text role

doc: add generic frontend to rst2man and rst2html This will allow us to easily register new roles and directives.

localrepo.commit: use explicit variables, avoid creating new contexts

context: remove parents parameter to workingctx it was needed before the refactor of commit, workingctx always uses the dirstate now.

dirstate: more explicit name, rename normaldirty() to otherparent()

keyword: monkeypatch patch so that optional args can be passed as kwargs

patch: refactor applydiff to allow for mempatching

patch: move mercurial-specific imports after stdlib imports

test-record: add hg summary to verify we update dirstate

log -b: use opts.get() instead of assuming opts is correctly filled

Merge with stable

Respect the DESTDIR variable during 'make install' The DESTDIR variable used to tell 'make install' an alternate system root to install the software to. Since setup.py supports the same via its --root parameter, it's easy to make life easier for many packagers.

commands: add more robust support for 'hg log -b' (issue2078) Fixes issue2078 and adds tests to cover various 'hg log -b' uses. This change adds a localrepo.lookupbranch(key, remote=None) function. This will look up the branch of the revision with the given key. The algorithm works like this: * If a remote repo is given and KEY is the name of a branch in that repo, return KEY. * If no remote repo is given and KEY is the name of a branch in the local repo object, return KEY. * Otherwise look up the revision with the identifier KEY in the local repo and return its branch. This change also makes 'hg log -b' use this new functionality and adds a few tests for it.

highlight: fix to work with caching templater

debugcomplete: don't list deprecated options

commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Switching to --branch makes log consistent with push/pull and make more sense given the actual behavior of the option (you can specify -b multiple times to include multiple branches). This change also adds some tests for 'hg log -b'.

bookmarks: complete the missing references from dda4ad7c9ea9 (issue2121) The fix for issue1611 left one last use of "repo" instead of "self" that has resulted in more memory leaks from push/pull operations.

Added support for 'pretxncommit', so that one can call the ACL hook at pre-commit time too. This is useful because now it's possible to avoid violating ACL permissions much sooner, at commit time, instead of waiting for a PUSH to check if there were any invalid commits.

subrepo: fix repo root path handling in svn subrepo

remoteui: copy http_proxy settings http_proxy settings of current repo's .hg/hgrc should be available on remoteui, so that the httprepo can use them when pulling via http.

dispatch: ignore if signals can not be set This happens if the code is executed in a thread. This patch allows tortoisehg to start the inotify server again.

hgweb: fix attribute error in error response (issue2060)

cvs: skip bad tags If the CVS repo somehow has a symbolic name that references a revision consisting of a single number (e.g. BAD_TAG: 1), convert will fail when attempting to find the branches, preventing the initial import from working. This patch skips those symbolic names--without warning.

document missing template variables

diffstat: use ui.plain() instead of ui.interactive() Previously, a default width of 80 is used for non-interactive sessions. This behaviour was introduced before HGPLAIN was supported.

mq: Remove -f from qnew command syntax. In 1ebba857b371 the -f option was not completely removed from the help message.

mq: toggle truncating using ui.plain() rather than ui.interactive() This enables truncated messages when using `qseries' with the `pager' extension.

merge with stable

filemerge: use working dir parent as ancestor for backward wdir merge I checked the tests, they were bogus in the first place

merge with stable

filectx: _fileid isn't normalized, use _filenode instead _fileid can be anything the lookup accepts (hex(node), node, rev, etc.), we should use something stable for comparisons (like _filenode).

Merge with stable

convert: write "working copy" instead of "wc"

convert: mark strings for translation

convert: write "repository" instead of "repo" We should strive to avoid slang in our messages to the users.

minirst: removed unnecessary initindent variable

minirst: add margin around definition items This greatly improves the output of 'hg help env'.

dirstate: remove unused variable

Merge with stable

Document 'default' and 'default-push' in paths docstring

mq: only highlight/label patch name for qseries. Restore the behaviour introduced in e37e9904bf10, which was accidentally removed when labelling was introduced in 717c35d55fb3.

keyword: replace deprecated mq commands in test

wix updates - using FileSource attribute - removed unneeded "DiskId='1'" - all guids are now in guids.wxi

merge with stable

test-git-import: better testing, check nodeids

context: fix bug introduced in fb89cd21a7a0, path should be used

merge with stable

prepush: rewrite most of the code from scratch For servers with branchmap support, the algorithm now works as follows: 1. A list of branches in outgoing changesets is created. 2. Using the remote branchmap, a check for new branches is performed. 3. A map (from branch to head list) of locally known remote heads before the push is created, and one which, after step 4, will contain the locally known remote heads after the push. 4. The post-push head map is updated with the outgoing changesets, using the branch cache update mechanism. 5. A check for new heads is performed, by comparing the length of the head list before and after push, for each branch. If there are new heads, an error depending on whether or not there are incoming changes on the branch, is returned. 6. If the push is allowed, a warning is written if there are incoming changes on any branches involved in the push. For old servers, an algorithm similar to step 4-6 above is used to check for new topological heads only. Two bugs are also fixed: 1. Sometimes you would be allowed to push new branch heads without --force. A test for this case was added. 2. You would get the "note: unsynced remote changes!" warning if there were any incoming changesets, even if they were on unrelated branches.

merge with stable

run-tests.py: can't remove from os.environ on solaris

merge with stable

workingctx: correctly compute the flag for noexec filesystems+merge This bug happens if the filesystem doesn't support exec-bit, during merges, for example in 24ed7a541f23 on the hg repo. If f is not in p1, but is in p2 and has the x-bit in p2, since the dirstate is based on p1, and the FS doesn't support the exec-bit, the dirstate can't "guess" the right bit. We instead fix it in workingcontext.flags()/manifest.

localrepo: simplify _updatebranchcache slightly

merge with stable

add +x to test-update-renames, removed by the merge on 24ed7a541f23

simplify test-issue2137, make it more portable

add documentation for revlog._prereadsize

merge with stable

revlog: fix lazyparser.__iter__() to return all revisions (issue2137) Previously, it only returned revisions that were in the revlog when it was originally opened; revisions added since then were invisible. This broke revlog._partialmatch() and therefore repo.lookup(). (Credit to Benoit Boissinot for simplifying my original test script and for the actual fix.)

revlog: factor out _maxinline global. This lets us change the threshold at which a *.d file will be split out, which should make it much easier to construct test cases that probe revlogs with a separate data file. (issue2137)

merge with stable

merge

prepush: backed out refactoring It has some problems in corner cases and will fail on a test recently introduced on stable. Will maybe be reintroduced later, in a better version.

prepush: add more test cases

prepush: fix bug in warning message selection In certain situations you would be told "you should pull and merge" even when there is nothing to pull.

merge with stable

verify: improve progress descriptions For GUIs, the progress bar is disconnected visually from the text that is output by ui.write(), so it's better to be a little bit redundant in naming the status. "checking" is redundant, since the user is running the verify command. 'changesets', 'manifests', etc, tell the user what is being checked (the entity being counted in the progress bar.

pylint, pyflakes: remove unused or duplicate imports

Fix --blacklist when --jobs > 1 in run_tests.py. The options parsing logic replaces the options.blacklist initial value, a list of filenames, with a dict of test names to filenames. When runchildren rebuilds the command line to launch child processes the dict is flattened and provided as a malformed argument when a filename is expected. Fix is to remove the blacklist option from child invocations since the filtering is handled in the parent anyway.

merge with stable

run-tests.py: reset env variables set by hooks

checklink: use an explicit prefix for the temporary file

revlog: factor out _maxinline global. This lets us change the threshold at which a *.d file will be split out, which should make it much easier to construct test cases that probe revlogs with a separate data file. (issue2137)

fix test-pull after 468876bc3885

merge with stable

revlog: put graph related functions together

checkexec: use an explicit prefix for the temporary file

check-code: add a warnings level - demote "unwrapped ui message"

keyword: make the templater a local variable After 6722ba3bf80b a class attribute makes no sense.

rollback: improve message

transaction: use newlines to separate description elements

progress: fall back to indeterminate progress if position is >= total

mq: promote qnew, demote qinit in short help

commands: improve some command summaries

progress: show approximate progress info for pull

Merge with crew-stable

localrepo: do not store URL password in undo.desc

convert/subversion: fix default URL checker prototype

Merge with stable

patch: don't look for headers in diff lines If you have a diff line that matches a header line, the patch splitter currently breaks your patch at this line. For example a line like: +key: value This can lead to "malformed patch" exceptions. Now fixed.

rollback: add dry-run argument, emit transaction description

localrepo: add desc parameter to transaction All callers to localrepo.transaction() must supply a transaction description. The description and the existing repository tip are then stored (transactionally) into .hg/undo.desc; where rollback can later find it.

merge with stable

merge default

test-hgwebdir: correctly include '-' in sed expression. '\' can't be used to escape '-' from being interpreted as a range, so put it at the end.

localrepo: refactor prepush logic Simplifies the prepush check logic and makes it a lot more direct and comprehensible. Instead of comparing the total local vs. remote head count, it compares the number of new vs. removed heads.

merge with stable

partial backout of 1e819576e926 and add tests (issue2131) The tests are due to Peter Arrenbrecht

copies: properly visit file context ancestors on working file contexts

Merge with stable

mq: use util.unlink instead of os.unlink and os.removedirs If, on Windows, your repository and working copy are in a reparse point and you use os.removedirs, you will remove non-empty reparse points, disabling the reparse point. See @fa901423ac23.

color: respect HGPLAIN

color: add support for Windows consoles Introduces color.mode configurable with values 'auto', 'ansi', or 'win32'. Any other value disables coloring. When 'auto' is selected, the win32 console method will be used if the win32console Python module is detected (requires pywin32 to be installed).

color: remove unused import

merge with stable

merge default with default

merge stable with stable

dirstate: no need to iterate twice, a dict can be updated in place

merge with stable

clone: no race possible, we can use changegroup() and have smaller urls Related to issue2126

Merge with stable

Merge with i18n

Merge with i18n

Merge with hg-i18n

i18n-da: small updates

i18n-da: synchronized with 37a5a397f150

templates: escape javascript braces

templater: drop \ when handling escaped {

templater: strip whitespace inside template methods

templater: drop raw method

templater: raise nested functions

templater: cache full tree store the parsed version of subtemplates in higher level parse lists, avoid run-time cache lookups

templater: use recursive flattening This avoids slow list operations compared to the iterative version

templater: cache self.defaults.get

templater: privatize class variables

templater: map -> mapping

templater: extend preparsing preparse filters and formats and supply functions to apply

templater: preparse templates and cache This breaks templates down into a list of literal and {} groups, with group types preidentified.

keywords: build a new templater to work around caching interaction

templater: directly parse templates, no regexes

logo: clean up source file with scour

contrib: drop rewrite-revlog

contrib: drop git-viz

merge with stable

add a test for the inprocess status dirstate race

merge with stable

dirstate: fix in memory dirstate entries for 1-second race Only the on-disk file was modified, we need to modify the in-memory dirstate as well.

commands: leftover from d7b601f1e02c

commands: small refactoring in summary

commands: retrieve tags from context object

summary: make use of output labeling The individual pieces of information use the same labels as the commands they summarize for better cohesion of commands.

color: concatenate effects correctly and avoid printing empty effects

commands: fix typo

cmdutil: do not translate trivial string

wix: refactor and new guids.wxi

color: don't split colors across lines (which confuses less -R) Currently, less -R doesn't support colors spanning multiple lines; only the first line will be colorized. Instead of allowing colors to span multiple lines, the color extension now applies colors to each line it receives, even when ui.write() is given multiple lines in one call.

color: colorize based on output labels instead of parsing output By overriding ui.write(), ui.write_err(), ui.popbuffer(), and ui.label(), the color extension can avoid parsing command output and simply colorize output based on labels. As before, the color extension provides a list of default colors for core commands/labels. Other extensions can provide their own defaults by specifying a colortable dict (similar to cmdtable). In this process, --color is promoted to a global option and the deprecated --no-color option is removed.

record: make use of output labeling

qseries: make use of output labeling

qdiff: make use of output labeling

qguard: make use of output labeling

churn: make use of output labeling

bookmark: make use of output labeling

cmdutil: make use of output labeling in changeset_printer