bookmark: fix invalidation of localrepo._bookmarkcurrent

subrepo: show the source that git clones

check-code: catch "echo > $HGRCPATH" too Make error message consistent with the other error messages.

merge with stable

check-code: better check for overwriting $HGRCPATH Suggested by Mads Kiilerich on IRC.

test-eol-*: remove unused config settings

mq: forbid commit of merge involving mq patches

tests: don't overwrite HGRCPATH Overwriting instead of appending to the file removes the [defaults] section put into the file by run-tests.py. It also defeats the --inotify option to run-tests.py. (Nothing was broken yet, but the lack of -d "0 0" cause changeset hashes to change unexpectedly in a test case I was editing.)

merge with stable

Added signature for changeset 2616325766e3

Added tag 1.8 for changeset 2616325766e3

contrib: update tcsh_completion for Mercurial 1.8 Added the following commands: bookmarks debugignore. Fix the tcsh parse script for the current help text layout.

merge with i18n

i18n-ja: synchronized with 0a6bca3d5273

i18n-pt_BR: synchronized with 9b617c56eb65

zsh completion: complete bookmarks where they are accepted This used to work because bookmarks were pseudo-tags, but broke once bookmarks became their own first-class object.

tests: test-mq-subrepo.t Solaris 10 sh compliance Solaris 10 sh do apparently not like temporary environment variable assignment before a function call. There is no problem with commands.

bash_completion: complete bookmarks Since bookmarks moved into core and are no longer merged with the list of tags (d012d95499f7), they don't get completed in bash_completion along with other revision specifiers. This adds a new function to provide the list of bookmarks for completion, and another, _hg_labels(), to list all tags, branches, and bookmarks. It further modifies completion for all commands where '_hg_tags; _hg_branches' was used to use '_hg_labels' instead.

mq: fix qpush recursion in _findtags when status file is wrong (issue2664) test from timeless to guard against regressing this

mq: gracefully handle malformated status file This patch prevent mq to crash when .hg/patches/status contains Malformed lines (without ":"). Blank lines are ignored and other malformed lines issue a warning.

revset: fix typo when assigning weight to reverse and limit

eol: do not abort on parse error Handle parse errors in the .hgeol similarly to how parse errors in the .hgtags file are handled: by issuing a warning. This allows the user to revert the file using 'hg revert' or 'hg update -C'.

eol: fix test typos introduced in 5007ff32f356

eol: test win32text compatible encode/decode filters

eol: be explicit about how to enable hook (issue2661)

eol: stop after first matched rule in hook (issue2660) When matching a file against the rules in .hgeol, the eol extension's hook should stop after the first matching rule is encountered. Otherwise, if this rule is contradicted by other more general rule (for example a catch-all at the end of .hgeol), some files are simply impossible to push. Trivial example: **.bat = CRLF ** = LF If all matching rules were applied, a .bat file would be rejected either because it has LFs (first rule) or because it has CRLFs (second rule).

merge with i18n

i18n-pt_BR: synchronized with 3178aca36b0f

help: document branch template keyword The branch keyword was added in d79fdff55627

merge with i18n

i18n-sv: started translation of mq and patchbomb

i18n-sv: synchronized with 95b0d4c1c9e1

convert.svn: branch name which equals trunk means `default' branch (issue2653) Converting from subversion specifying config.svn.trunk results in storing trunk under branch named as config.svn.trunk, where `default' brunch is expected. Submission contains patch and test.

ui: always report untrusted hgrc files when debug enabled It was suggested in IRC that people disabling the reporting of unstructed hgrc files can masquerade as problems. This makes sure untrusted hgrc files are always reported if --debug is used.

tests: test renaming a file added on two branches (issue2089) The issue was fixed by d100702326d5 .

merge with i18n

i18n-ja: synchronized with 16725043a6fc

i18n-de: translate some bookmark strings

i18n-de: synchronized with 703717eb112c

i18n-da: translate some small strings

i18n-pt_BR: synchronized with 9f2c407caf34

i18n-da: synchronize with 14a699ed774b

i18n: merge with main

i18n-ja: synchronized with 7458b7e0d8d5

i18n-ja: synchronized with ba50f1600131

context: be even more careful about result order in ancestors() (issue2642) The earlier patch could be confused by more complicated topologies.

convert/svn: abort operation when python bindings are not available Subversion python bindings check was not present in svn_sink source class which made it fail while using svn as destination repository. Added a more maintainble svn bindings check for svn_source and svn_sink classes.

convert/svn: handle MissingTool exception from converter_sink class The converter_sink class had no way of handling MissingTool exception. This change makes it to abort when there is a MissingTool exception.

bookmarks: restrict moving a bookmark to its descendants (issue1502) A bookmark can only move to a descendant on commit, pull or unbundle. Bookmarks cannot jump between heads anymore. This fixese issue 1502. We explicitly use new.node(), to emphasise that we are updating the current bookmark to the new node.

id: add bookmarks to id Since bookmarks are no longer merged with repo.tags() as of d012d95499f7, they don't show up in `hg id` as they used to. This adds them back into the summary that `hg id` prints, and adds a -B/--bookmarks flag alongside the -t/--tags and -b/--branch options. Note this introduces a slight backwards-incompatibility: the summary printed by `hg id` now separates bookmarks from tags with a space, as seen below, instead of running it into the tags list. Default summary output: $ hg id db815d6d32e6 tip/tag1 bm1/bm2 Output with --bookmarks: $ hg id --bookmarks bm1 bm2 See also afc84a879ac8 which adds bookmarks back into `hg summary`.

workingctx: overload bookmarks() to return parents' bookmarks This implements workingctx.bookmarks() parallel to workingctx.tags(), overloading the implementation from changectx.

eol: handle LockUnavailable error (issue2569) If the repository is not locked when clearing the dirstate, then running test-eol.t in a loop fails sooner or later with: ERROR: /home/mg/src/mercurial-crew/tests/test-eol.t output changed --- /home/mg/src/mercurial-crew/tests/test-eol.t +++ /home/mg/src/mercurial-crew/tests/test-eol.t.err @@ -343,6 +343,7 @@ % hg status (eol activated) M win.txt % hg commit + nothing changed % hg status $ testmixed CRLF However, if we cannot lock the repository, then we can also not make a commit and so we can simply ignore a LockUnavailable error.

tests: check if the bookmarks extension is ignored

backout: clarify which changesets are new in help text Plus another wording tweak ("default behavior -> "behavior without --merge"). Suggested by Kevin Bullock.

commands: update year to 2011 in version string

eol: clarify where the .hgeol file is located

commands: mark strings for translation

tests: remove bookmark extension configuration

context: generate file ancestors in reverse revision order (issue2642) The related() function in copies assumes that revisions are generated in reverse revision order, so it was getting confused in some situations.

export: only close files which export itself has opened

subrepo: only attempt pulling from git's origin git fetch does not accept repository URLs as arguments, and the intended logic of this code was not actually doing anything.

subrepo: disallow all unknown git ref types

sshrepo: catch passwords in ssh urls see also e4b02eb825b1

hgk: display bookmark in commit diff window

hgk: display bookmarks as gray labels in the commitline

hgk: read bookmarks

subrepo: expand relative sources for git subrepos

changegroup: fix typo introduced in 9f2c407caf34

changegroup: don't accept odd chunk headers

changegroup: verify all stream reads Mercurial often failed with struct.error or mpatch.mpatchError if incomplete data was received from a server. Now we validate all changegroup reads and aborts with abort: stream ended unexpectedly (got %d bytes, expected %d) if less than requested was read.

changegroup: don't accept streams without proper termination Streams should be terminated with a zero size changegroup, and read should never be permitted to return less than requested.

rollback, i18n: avoid parameterized message

summary: add bookmarks to summary

bookmarks: issue a warning if remote doesn't support comparing bookmarks We want to issue a warning and abort comparing bookmarks if remote doesn't support it. Otherwise hg out -B will list you outgoing bookmarks that cannot be pushed to the remote repository using hg push -B.

merge with i18n

i18n-pt_BR: synchronized with ed720c7cc97d

wireproto: catch possible cast error in pushkey The server can return an unexpected answer like 'ssl required'. We catch those possible cast errors and abort the operation.

test-push-http: use killdaemons.py instead of kill to avoid test unreliability

bookmarks: mark new bookmark as current if it points to the current dirstate hg bookmark -r ancestorrev X will not mark X as the current bookmark anymore. If you want to point a bookmark to a ancestor rev you will use hg update to move to it. This will set the current bookmark.

introduce new RequirementError (issue2649) This improves the misleading error message $ hg identify abort: there is no Mercurial repository here (.hg not found)! to the more explicit $ hg identify abort: requirement 'fake' not supported! for all commands in commands.optionalrepo, which includes the identify and serve commands in particular. This is for the case when a new entry in .hg/requires will be defined in a future Mercurial release.

rollback: clarifies the message about the reverted state (issue2628) Previously, when rolling back a transaction, some users could be confused between the level to which the store is rolled back, and the new parents of the working directory. $ hg rollback rolling back to revision 4 (undo commit) With this change: $ hg rollback repository tip rolled back to tip revision 4 (undo commit) working directory now based on revision 2 and 1 So now the user can realize that the store has been rolled back to an older tip, but also that the working directory may not on the tip (here we are rolling back the merge of the heads 2 and 1)

hgweb: handle invalid requests with both form data and querystring Invalid requests could give an unhandled ErrorResponse. Now this ErrorResponse is handled like other ErrorResponses so the client gets an error message which also is logged on the server.

hgweb: give ErrorResponse a descriptive string/Exception representation Very handy if the exception should appear in output.

serve: catch and log all Exceptions, not only StandardException Other exceptions than StandardExceptions were left to the default error handler which was muted when running in daemon mode. Now all Exceptions are handled and logged to the log file.

test-i18n: make test conditional on msgfmt availability

match: fix subtle error in _buildmatch The trailing comma was causing a ValueError. See https://bitbucket.org/tortoisehg/thg/issue/132

statichttprepo: don't modify localrepo class variables This happened to crash in subrepo setups when the base class variable was modified twice. Now we don't modify the class variable but an instance copy.

util: flush stdout before calling external processes stdout could have content in its buffer while a subprocess ran and emitted output. Flushing stdout ensures that output now comes in the right order.

tests: update test-https.t output I must have lost the insecure cert warning in a last minute patch series cleanup of 08f9c587141f.

Do not allow merging with uncommitted changes in a subrepo

hgwebdir: reduce memory usage for index generation The archive list generator was holding a reference to each temporary ui copy passed by rawentries(), so the memory usage for index generation growed proportionally to the ui object size and the amount of repositories. By returning a list instead, the temporary reference is dropped immediately.

pure: fix index parsing on empty repositories

alias: add test cases for $ escaping in shell aliases

bookmarks: verify switching bookmarks works properly

subrepo: break long line found by check-code

test-convert: update output to match 0079fb98e8d0

dispatch: fix typo in debug message

convert: fix typos in docstring

subrepos: print short git changeset ids This changes the prompts on git subrepos to show only the first seven digits of git changeset IDs (as git's command line does): $ hg update subrepository sources for s differ (in checked out version) use (l)ocal source (32a3438) or (r)emote source (da5f5b1)?

merge default into stable for 1.8 code freeze

store: remove pointless pathjoiner parameter We can stop pretending that we have to support anything else than '/' for concatenating path elements anywhere. Windows deals just fine with '/' in file paths and we already have plenty of places which produce paths containing '/' anyway when running on Windows.

bookmarks: forbid \0 \r \n : in bookmark names (BC) We restrict : to 1. make it easer to convert bookmarks to git branches, 2. use : later for a syntax to push a local bookmark to a remote bookmark of a different name. \0, \n, \r are fobbidden they are used to separate bookmarks in the bookmark file. This change breaks backward compatbility as ':' was an allowed character in previous versions.

url: merge BetterHTTPS with httpsconnection to get some proxy https validation

tests: test https through http proxy These tests fails for me with Python 2.6(.nothing)

url: always create BetterHTTPS connections the same way

url: refactor BetterHTTPS.connect

url: refactor _gen_sendfile

url: remove test for self.ui in BetterHTTPS We use self.ui unconditionally anyway so we would have noticed if it in some cases wasn't set.

tests: update ssl requirement for test-https.t hgweb requires OpenSSL for serving https.

subrepos: prompt on conflicts on update with dirty subrepos Consider a repository with a single subrepository. The changesets in the main repository reference the subrepository changesets like this: m0 -> s0 m1 -> s1 m2 -> s2 Starting from a state (m1, s0), doing 'hg update m2' in the main repository will yield a conflict: the subrepo is at revision s0 but the target revision says it should be at revision s2. Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus ignore the conflict between the working copy and the target revision. With this change, the user is prompted to resolve the conflict by choosing which revision he wants. This is consistent with 'hg merge', which also prompts the user when it detects conflicts in the merged .hgsubstate files. The prompt looks like this: $ hg update tip subrepository sources for my-subrepo differ use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?

bookmarks: make track.current=True default behaviour and remove option (BC)

update: preserve possible bookmark name to set current bookmark correctly

test-i18n: test translations

subrepo: remove argument introduced by mistake in c19b9282d3a7

remove unnecessary list comprehensions These result lists were only built for the side effects, and so a normal loop is just as good and more straight-forward.

commit: abort if a subrepo is modified and ui.commitsubrepos=no The default behaviour is to commit subrepositories with uncommitted changes. In my experience this is usually undesirable: - Changes to dependencies are often debugging leftovers - Real changes should generally be applied on the source project directly, tested then committed. This is not always possible, subversion subrepos may include only a small part of the source project, without the tests. Setting ui.commitsubrepos=no will now abort commits containing such modified subrepositories like: $ hg --config ui.commitsubrepos=no ci -m msg abort: uncommitted changes in subrepo sub I ruled out the hook solution because it does not easily take --include/exclude options in account. Also, my main concern is whether this flag could cause problems with extensions. If there are legitimate reasons for callers to override this behaviour (I could not find any), they might either override at ui level, or we could add an argument to localrepo.commit() later. v2: - Renamed ui.commitsubs to ui.commitsubrepos - Mention the configuration entry in hg help subrepos

tests: fixes for svn 1.4.2

mq: remove undo after a qimport

transaction: use posixfile and unlink from util instead of open() and os.unlink() Avoids potential issues with file access on Windows (e.g. AV-scanners).

bookmarks: update help text since moving into core Clarifies the help text for the bookmarks command regarding the requirements for pushing or pulling bookmarks.