revert: improve merge advice and favor its error over all

rebase: support --detach when null is common ancestor

templater: fix variable name 'format' was renamed to 'parsed' in 0d50586a9d31

test-hardlinks: add testcase for repo copied with 'cp -al' This patch adds a case to test-hardlinks.t which demonstrates that hardlinks in the working directory are broken up (using 'hg update'). Motivation for this patch: 'hg help clone' shows copying repositories *and* the working directory using 'cp -al', creating hardlinks in the *working directory* too (not just in the store). Note that we can't use 'cp -al' since for example MacOS X doesn't support these options on cp. I'm thus using the same trick as in test-hardlinks-safety.t for creating hardlinks in the working dir.

Merge with stable

subrepo: handle missing subrepo spec file as removed Otherwise, all commands involving a dirstate walk will abort when trying to readone of them. Deleting .hgsub basically breaks a repository.

Merge with stable

subrepo: prune empty directories when removing svn subrepo

subrepo: use subprocess directly to avoid python 2.6 bug Using svn subrepos on MacOSX with native python 2.6.1 results in a lot of unexpected output caused by: http://bugs.python.org/issue5099 subprocess.Popen.__del__ causes AttributeError (os module == None) Avoiding dangling Popen instance solves the issue.

subrepo: fix removing read-only svn files on Windows

check-code: catch 'ls filename --option' case as per 6bdae8ea0b48

minirst: improved support for option lists. This enables minirst to parse and print option lists which have both long and short options. Before, we could only parse option lists with long options.

test-subrepo-git.t: portability fix. Specifying arguments after file names for 'ls' is a GNU extension.

minirst: modified minirst to also recognize empty comments. The modifies minirst to also handle empty comments. An empty comment is a block with a single line containing two dots.

merge with stable

posix: remove is-comparison between integers Comparing integers by identity relies on a CPython implementation detail of caching integers between -5 and 256.[1] [1] <http://docs.python.org/c-api/int.html#PyInt_FromLong>

httprepo: remove is-comparison with string literal An identity check between a variable and a string literal was added to the pushkey implementation in 6bd9778ae749. While CPython will normally intern strings and thus make the test safe, value identity is what should be used here.

mq: fix comment to reflect change in efbee27415ab

mq: clean up unused variable in qrefresh Removes the unused variable `aa2` that holds the list of deleted files returned from repo.status().

minirst: better interaction between comments and margins You can now split a list with a comment: * foo .. separator * bar and the two list items will no longer be run together, that is the output is * foo * bar instead of * foo * bar

run-tests: fix --debug for .t tests When --debug is given to the test runner, run() returns (retcode, None). Do not try to use None output as a string, and return directly, similarly as other testers.

merge with stable

commit: search both parents for missing copy revision (issue2484) raise a proper abort if we can't find an ancestor

context: walk both parents for workingctx.ancestors()

discovery: list new remote heads in prepush() on --debug With this patch applied, Mercurial will list the hashes of new remote heads if push --debug aborts because of new remote heads (option -f/--force not set). Example: $ hg push --debug repo1 using http://example.org/repo1 http auth: user johndoe, password not set sending between command pushing to http://example.org/repo1 sending capabilities command capabilities: changegroupsubset stream=1 lookup pushkey unbundle=HG10GZ,HG10BZ,HG10UN branchmap sending heads command searching for changes common changesets up to 609edbc7853f sending branchmap command new remote heads on branch 'default' <- new output line new remote head 5862c07f53a2 <- new output line abort: push creates new remote heads on branch 'default'! (did you forget to merge? use push -f to force) Compare to without --debug (not changed by this patch, including it here for reference purposes only): $ hg push repo1 pushing to http://example.org/repo1 searching for changes abort: push creates new remote heads on branch 'default'! (did you forget to merge? use push -f to force) Motivation for this change: 'hg outgoing' may list a whole lot of benign changesets plus an odd changeset that will trigger the "new remote heads" abort. It can be hard to spot that single unwanted changeset (it may be an old forgotten experiment, lingering in the local repo). "hg log -r 'heads(outgoing())'" might be useful, but that also lists a head that may be benign on push. Inside prepush(), we already know which heads are causing troubles on 'hg push'. Why not make that info available (at least on --debug)? This would also be helpful for doing remote support, as the supporter can ask the user to paste the output of 'hg push --debug' on error and then ask further questions about the heads listed.

discovery: remove erroneous comment in prepush() New named branches *can* be created without -f/--force by specifying --new-branch

subrepo: removing (and restoring) git subrepo state

subrepo: update and merge works with any git branch

subrepo: allow git subrepos to push and merge (master branch only) gitsubrepo based on patch from David Soria Parra: http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/

subrepo: cloning and updating of git subrepos gitsubrepo based on patch from David Soria Parra: http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/

subrepo: support for adding a git subrepo gitsubrepo based on patch from David Soria Parra: http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/

merge with stable

merge with i18n

Added signature for changeset 4438875ec01b

Added tag 1.7.1 for changeset 4438875ec01b

merge with stable

merge with i18n stable

i18n-pt_BR: synchronized with 27e4146d9241

merge with i18n

i18n-da: translate small error messages

i18n-da: synchronize with 15ca4bfecfe3

merge with stable

eol: mention the hook in the module docstring

eol: fix win32text encode/decode filter names

test-win32text: use $TESTTMP in output

test-win32text: use (esc) lines instead of Python script

merge with stable

eol: added filter aliases for backwards compatibility with win32text This makes it possible to switch most win32text configurations (i.e. those that use cleverencode and cleverdecode) to hgeol simply by disabling one and enabling the other. Any rules found in repo-specific .hgeol files will be appended to the configuration in .hgrc.

eol: exclude .hgtags file from eol translation (issue2493)

merge with stable

log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Regression from 99cafcae25d9. That previous commit is not supposed to affect log calls without --follow, so we step out of this codepath if follow is not True, and it's enough to fix the regression. When --follow is given, we fix the issue by taking into account changesets that have a rev > maxrev to build the filegraph: even if those files are not included in the final result, it's still needed to walk correctly the graph from the end of the filelog to minrev, to track accurately renames.

cmdutil: move range check outside of filerevgen Simple refactor, no logic change.

merge with stable

pushkey: force HTTP POST on push and add tests (issue2489)

merge with stable

tests: add test-hardlinks.t partially testing util.opener.__call__

win32: remove try-catch block of GetModuleFileNameEx (issue2480) According to the API document, GetModuleFileName is the preferred way to retrieve the filename of the current process. So we shouldn't try GetModuleFileName'Ex' first. Previously system_rcpath_win32() happened to return unicode paths due to GetModuleFileNameEx (issue2480). This problem is fixed as GetModuleFileName never return unicode.

gpg, commands: fixed util.abort to util.Abort typos gpg: Fixed util.abort typo after entering wrong password. commands: Fixed util.abort typo in debugindex.

check-code: using and/or/not as a function is bad style

merge with stable

bundlerepository: get rid of temporary bundle files (issue2478) This bug was introduced in 40935b59518b and 6277a9469dff.

bundlerepository: test self.tempfile field, not tempfile module This error was introduced in 680fe77ab5b8.

test-mq-qnew: handle Mac OS X error strings. On Mac OS X, opening a file called '42/' results in ENOENT and not EISDIR if the directory doesn't exist.

help: urls help should include see also for paths

minirst: link to HelpStyleGuide in docstring

util: clarify purpose of MBTextWrapper class It's easy to get confused and scared of an Unicode monster when skimming through this code: document that this is really just about column-counting.

merge with stable

run-test: fixed wrong parenthesis Fixed wrong placement of end parenthesis, from b911cb80c671

merge with crew

merge with crew

merge with stable

graphmod: safer code when a changeset has two identical parents While this situation should never under normal use, some real life repos sometimes contain such changesets (older hg versions, broken rebases, etc...) hgweb was displaying an "Internal error" in this case, and graphlog displayed a redundant branch all the way to null: it does not cost us much to just ignore this extra parent when constructing the DAG.

revlog: fix descendants() if nullrev is in revs We were not returning the correct result if nullrev was in revs, as we are checking parent(currentrev) != nullrev before yielding currentrev test-convert-hg-startrev was wrong: if we start converting from rev -1 and onwards, all the descendants of -1 (full repo) should be converted.

revlog: if start is nullrev, end is always a descendant

mq: use sets instead of lists for speed The code eventually converts data through sets to ensure unicity: do it earlier to allow faster __contains__ lookups and avoid `del l[l.index(x)]` kind of code.

context: add __repr__ methods to workingfilectx and workingctx

merge with crew

test-import: workaround for missing newline is no longer needed

merge with stable

tests: use (esc) instead of other kinds of string escaping

tests: use (esc) for all non-ASCII test output

tests: use (esc) markup for string-escape This makes test output less ambiguous. Failing test output will be escaped and marked up if necessary. A Python string-escape compatible encoding is used, but not everything is encoded - especially not \n and \t and '.

tests: (no-eol) markup for command output without trailing LF Output chunks without a trailing LF will now work but get (no-eol) appended. This change mostly moves code around so we can handle that an output line starts with data from previous command, followed by salt and the next command.

merge with stable

opener: check hardlink count reporting (issue1866) The Linux CIFS kernel driver (even in 2.6.36) suffers from a hardlink count blindness bug (lstat() returning 1 in st_nlink when it is expected to return >1), which causes repository corruption if Mercurial running on Linux pushes or commits to a hardlinked repository stored on a Windows share, if that share is mounted using the CIFS driver. This patch works around issue1866 and improves the workaround done in 50523b4407f6 to fix issue761, by teaching the opener to lazily execute a runtime check (new function checknlink) to see if the hardlink count reported by nlinks() can be trusted. Since nlinks() is also known to return varying count values (1 or >1) depending on whether the file is open or not and depending on what client and server software combination is being used for accessing and serving the Windows share, we deliberately open the file before calling nlinks() in order to have a stable precondition. Trying to depend on the precondition "file closed" would be fragile, as the file could have been opened very easily somewhere else in the program.

util: refactor opener - Don't call atomictempfile or nlinks() if the path is malformed (no basename). Let posixfile() raise IOError directly. - atomictempfile already breaks up hardlinks, no need to poke at the file with nlinks() if atomictemp. - No need to copy the file contents to break hardlinks for 'w'rite modes (w, wb, w+, w+b). Unlinking and recreating the file is faster.

revset: remove unnecessary debug statement

revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e) - Handle 'subset' argument - Stop returning the null rev from p1 and parents, as in the non-dirstate case - Order parents as in the non-dirstate case (ascending revs)

tests: handle .t files without trailing LF 9a2de8dae27b made this simple test-test.t succeed silently: $ printf ' $ true' > test-test.t but did not give a usable .err in this case: $ printf ' $ false' > test-test.t The missing LF will now be fixed in the test output and it will thus give a test failure and a solution in the .err file.

merge with stable

alias: fall back to normal error handling for ambigious commands (fixes issue2475)

merge with stable

subrepo: test & fix svn subrepo removal

revsets: let parents() return parents of working dir This patch makes the 'set' argument to revset function parents() optional. Like p1() and p2(), if no argument is given, returns the parent(s) of the working directory. Morally equivalent to 'p1()+p2()', as expected.

revsets: let p1() and p2() return parents of working dir This patch makes the 'set' argument to revset functions p1() and p2() optional. If no argument is given, p1() and p2() return the first or second parent of the working directory. If the working directory is not an in-progress merge (no 2nd parent), p2() returns the empty set. For a checkout of the null changeset, both p1() and p2() return the empty set.

util: refactor opener - Don't call atomictempfile or nlinks() if the path is malformed (no basename). Let posixfile() raise IOError directly. - atomictempfile already breaks up hardlinks, no need to poke at the file with nlinks() if atomictemp. - No need to copy the file contents to break hardlinks for 'w'rite modes (w, wb, w+, w+b). Unlinking and recreating the file is faster.

keyword: turn regexes and escaped keywords into a propertycache

commands: add revset support to most commands

convert: better ReST markup in docstring

convert: split docstring lists for easier translation

convert: use field list instead of option list in help Use field list instead of option list in convert help, because the option list format used, with defaults and type of argument is not supported by docutils.

doc/Makefile: docs now also depend on extensions After 0d09991f91ee the hg(1) manpage contains a section with help extracted from the extensions, so we should depend on them too.

keyword: function to look up changectx for expansion Similarly rename variable in kwtemplater.overwrite().

localrepo: make heads use the keyword args of the sorted builtin

import: add another line feed to message join string Changeset descriptions are not guaranteed to have a trailing carriage return.

tests: unify test-no-symlinks

patch: remove unused applydiff() sourcefile argument

patch: remove unused gitworkdone variable from iterhunks()

test-import: use printf instead of echo

import: --no-commit should update .hg/last-message.txt The patch parser goes through all of that trouble extracting the commit message from the patch file. It seems such a waste not to use it.

merge with stable after 1.7 release

Added signature for changeset 333421b9e0f9

Added tag 1.7 for changeset 333421b9e0f9

merge with i18n

i18n-pt_BR: synchronized with b19b4c1df066

dirstate: skip optimization on case-folding FS (issue2440)

url: fix https client authentication through proxy There is no tests for this, but the parameter order was obviously wrong.

merge with i18n

i18n-sv: synchronize with 13fb555677fe

i18n-zh_TW: synchronize with 15ca4bfecfe3