subrepo: work around old git's remote naming scheme Older git versions use 'origin/master' Current git uses 'remotes/origin/master'

subrepo: use environment variable instead of git commit's --date Older git versions do not have a --date flag.

subrepo: parse git status's human-readable output Older git versions do not have a machine-readable output, but the default format has not changed over time.

subrepo: use subprocess's cwd instead of git's --work-tree Some older git commands (e.g. git merge) do not properly recognize the --work-tree argument, so abstract that away from git.

test-subrepo-git.t: make gitroot pushable earlier Older git versions get confused when the git repo becomes bare.

test-subrepo-git.t: silence git output Older git versions have different ideas of what output is considered quiet, so the tests can be more version-blind.

bdiff: Fix bogus NULL return

bdiff: dynamically allocate hunks Make the hunk list a singly-linked list rather than a large array.

merge with stable

subrepo: lazily update git's local tracking branches This continues the strategy of separation between hg pull and hg update in git subrepos by only dealing with git's branches on an update. This behavior tries to cover the bare essentials of the semantics of git pull in the subrepo when the parent repo does hg pull and hg update.

subrepo: return both mapping directions from gitbranchmap

subrepo: strip gitcommand output

sshrepo: don't use readline() on the stderr pipe For some reason, the stat/readline dance suppressed lines following the first in PyPy 1.4.

test-demandimport.py: PyPy support The stringification of sys.stderr is different in PyPy: $ pypy -c 'import sys; print sys.stderr' <open file '<fdopen>', mode 'w' at 0x00a42080> $ python -c 'import sys; print sys.stderr' <open file '<stderr>', mode 'w' at 0x10025a270> The test will now ignore the exact value between the angle brackets.

demandimport: change default for level from None to -1 The Python default for this function is -1, indicating both relative and absolute imports should be used.[1] Previously, we relied on the Python VM not passing level when such semantics were requisted. This is not the case for PyPy, however, where a level of -1 is always passed to __import__. [1] <http://docs.python.org/library/functions.html#__import__>

export: flush the file pointer between patches

test-clone-failure.t: fix unification oversight Prior to unification, the test contained an 'echo $?' line. This line was removed during unification, but the 'echo 255' line that faked it when FIFO support is absent was not.

keyword: make kwfiles show deleted files configured for expansion

keyword: colorize hg kwfiles output

coding style: fix yield used as a function

check-code: single check for Python keywords used as a function This replaces the specific checks for del/and/or/not/except and additionally checks other Python keywords.

coding style: fix gratuitous whitespace after Python keywords

check-code: check for gratuitous whitespace after Python keywords

i18n-pt_BR: synchronized with 9696954415db

merge with stable

Added signature for changeset 6aff4f144ad3

Added tag 1.7.2 for changeset 6aff4f144ad3

keyword: copy: when copied source is a symlink, follow it 1) hg cp symlink copy -> copy is a symlink. 2) cp symlink copy; hg cp -A symlink copy -> copy is a regular file. In the second case we have to follow the symlink to its target to find out whether we have to unexpand keywords in the copy. Add test covering the case where the copied link's target is ignored by keyword but has content which would match the regex for expanded keywords to check whether we indeed leave the destination alone.

makedirs: abort if parent == name (issue2531) catches unknown drive letters on Windows

win32mbcs: use extsetup() to wrap functions only once. Using reposetup() may cause multiple-wrap issue in some situation like "hg serve".

hgwebdir: fix incorrect index generation for invalid paths (issue2023) edd07be943dd moved the subdirectory match inside the repository match loop. A virtual path existing/path/invalid/path would then match existing/path, and generate a wrong index page.

serve: fix doc typo

mq: fix failing qrefresh test Additions to test-mq-qrefresh.t in f08df4d38442 (mq: ignore subrepos (issue2499)) were originally based on a version prior to d0e21c5fde41 (subrepo: handle missing subrepo spec file as removed). This fixes a test failure that resulted from the former being applied after the latter, noticed by abuehl.

makedate: abort on negative timestamps (issue2513) catches weird clock settings

parsedate: abort on negative dates (issue2513) catches "hg commit -d '-7654321 3600'" (example)

merge with i18n

i18n-pt_BR: synchronized with f08df4d38442

merge with stable

test-clone.t: add basic cases for destination '' The case $ hg clone a '' already aborted before 2649be11ab0b, whereas $ hg clone --pull a '' tripped the fixed issue2528. Both basic cases are expected to fail with an abort.

hgrc.5: expand introduction for [web] section

hgrc.5: describe what the [auth] section is for

merge with stable

runrst: add RSTARGS Makefile variable to allow customization In particular, we can ask users to run make RSTARGS='--traceback' doc when we need debugging information

util: do not recurse in makedirs if name is '' (issue2528)

convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.

encoding: fix typo in variable name The typo had no real effect, except for an unnecessary UTF-8 encoding.

pushkey: use UTF-8

wireproto: use proper UTF-8 handling for key lookup Lookups happen in the local encoding space, but the wire protocol should be using UTF-8 for interoperability.