copy: do not copy file if name is disallowed anyway

util: new function checkfilename checkfilename checks for restrictions on filenames imposed by Mercurial itself, irrespective of on what platform it is run.

opener: use %r in format string for abort

wireproto: allow unbundle with hashed heads parameter (issue2126) Current wire protocol of unbundle sends the list of all heads in the remote repository to avoid race condition. This causes "URL too long" error on HTTP server when the repository has many heads. This change allows clients to send SHA1 hash of sorted head hashes instead. Also, this introduces "unbundlehash" capability to inform them that the server accepts hashed heads parameter.

merge with stable

encoding: avoid localstr when a string can be encoded losslessly (issue2763) localstr's hash method exists to prevent bogus matching on lossy local encodings. For instance, we don't want 'caf?' to match 'café' in an ASCII locale. But when café can be losslessly encoded in the local charset, we can simply use a normal string and avoid the hashing trick. This avoids using localstr's hash method, which would prevent a match between

merge with stable

revset: optimize stringset when subset == entire repo if range(len(repo)) is passed to stringset and x is a valid rev (checked before) then x is guaranteed to be in subset, we can check for that by comparing the lengths of the sets

help/revset: fix grammar

qrecord: provide help when mq is not enabled

record: improve help test coverage

paper: preserve whitespace on description instead of adding breaks This preserves the indentation of text in the changeset description. This is useful for example for descriptions containing command line use case examples like: $ hg -q heads 13934:648a834cca14 13912:71ea5b2b9517 Without this patch, such space-char indented text was just left aligned.

compact style: show bookmarks in the same manner as tags

revsets: preserve ordering with the or operator This is valuable because now revsets like 'bookmarks() or tip' will always show tip after bookmarks unless tip was itself a bookmark. This is a somewhat contrived example, but this behavior is useful for "where am I" type aliases that use log and revsets.

hgweb: set minimum number of revision to display to 1 when revcount is 0 When revcount goes to 0 nothing is displayed in hgweb. This patch sets revcount to max(revcount, 1).

zeroconf: clean up naked exceptions

localrepo: don't add deleted files to list of modified/added files (issue2761) If a file is deleted (rm, not 'hg rm') from the working dir an attempt to run 'hg diff -r X', with the file being present in X will cause an abort. We didn't check if the file has been deleted from the working dir and later on tried to open it to compare with the one from X, causing the abort. This fix adds that check. Consequently, no output will be returned.

path_auditor: eliminate local function 'check' in __call__

subrepo: trailing whitespace cleanup

util: move checkosfilename call from path_auditor to opener path_auditor is used for checking patterns too, but a pattern is not a valid filename. This patch fixes 98ee3dd5bab4, which introduced the bug: $ hg log -l3 glob:**.py abort: filename contains '*', which is reserved on Windows: mercurial\**.py

tests: add tests for non-existant branch/tag/bookmark

hgweb: add bookmarks listing to summary page of gitweb/monoblue styles

hgweb: remove useless notip handling from bookmarks listing

hgweb: sort bookmarks in the same manner as console command

hgweb: add bookmarks listing to raw style with test case

grep: don't print data from binary files for matches (issue2614)

color: reset win32 console color in a finally block

tests: better output on timeouts Formerly, timeouts would generate huge scrollback-destroying diffs and weird -15 return codes in the summary. Now we simply report "timed out".

acl: add branch tests for the current behavior of acl extension Adds simple tests for the acl.allow.branches and acl.deny.branches configuration options of the acl extension.

path_auditor: check filenames for basic platform validity (issue2755) Example (on Windows): $ hg parents $ hg manifest tip con.xml $ hg update abort: filename contains 'con', which is reserved on Windows: con.xml Before this patch, update produced (as explained in issue2755): $ hg update abort: No usable temporary filename found I've added the new function checkwinfilename to util.py and not to windows.py, so that we can later call it when running on posix platforms too, for when we decide to implement a (configurable) warning message on 'hg add'. As per this patch, checkwinfilename is currently only used when running on Windwows. path_auditor calls checkosfilename, which is a NOP on posix and an alias for checkwinfilename on Windows.

revset: rearrange code so functions are sorted alphabetically

revset: abort when tag or bookmark doesn't exist

merge with stable

subrepo: prevent url normalization from removing // in ssh paths (issue2556)

bookmarks: change error messages to match those given by 'hg tag' commands

audit: improve nested repo message

tags: remove another check for valid nodes see 1aea86673dee

revset: replace for-loop with list comprehension

subrepo: fix up svn test output

merge with stable

hgweb: fix inconsistant display of graphlog (issue1706)

hgrc.5: drop 'hgext.' prefix when talking about extensions The first paragraph apply to all extensions, not just those in hgext. The second paragraph can just use the simpler form to load mq.

merge with crew

merge with stable

merge with crew

url: use a regex to hide unsupported ssh passwords (issue2754)

commit: note when files are missing Before, you could experience the following strange interaction: $ hg commit nothing changed $ hg merge abort: outstanding uncommitted changes which confused at least one user in #mercurial.

relink: correct unusual indentation

hg: make parseurl() consistently return normalised path Before this the path was only normalised when a fragment was used.

bugzilla: more documentation formatting fixups Correct typo in numbering list of access methods. Convert a section reference and a template parameter reference into literal text, for consistency with other use.

merge with stable

rebase: don't mark file as removed if missing in parent's manifest (issue2725)

tags: no need to check for valid nodes _findtags in localrepo checks that nodes exist in the revlog so we can't get a LookupError here. The output of 'hg tags' stays the same since tags to unknown nodes didn't get printed before anyway due to ae3089cefaab.

localrepo: ignore tags to unknown nodes (issue2750)

merge: added info that hg help merge-tools shows the options for --tool

util: move checklink() to posix.py and return False on Windows Python added support for Windows 6.0 (Vista) symbolic links in 3.2 [1], but even these symbolic links aren't what we can expect from a canonical symbolic link, since creation requires SeCreateSymbolicLinkPrivilege, which typically only admins have. So we can safely assume that we don't have symbolic links on Windows. [1] http://docs.python.org/py3k/library/os.html#os.symlink

util: make 'hg log -d --2' abort (issue2734)

help: sort help topics to make the output more readable (issue2751)

merge with stable

help/dates: use DATE as place-holder in help and abort texts The use of "{datetime}" was unfortunate since I as a user never knew if I was expected to do hg log -d '>{2011-04-01}' or hg log -d '>2011-04-01' The word "datetime" is also confusing -- calling it a date it much simpler.

keyword: convert a verbatim block to a field list

bugzilla: convert a verbatim block to a field list

bugzilla: fix reST error introduced in 22d200e49b10 All blocks must be indented. Here we can use a field list instead of a verbatim block for a real list layout.

help/dates: rephrase explanation of internal format The old explanation referred to the two numbers as "unixtime" and "offset" without really defining those terms.

rebase: drop ancestor import

rebase: drop unused p2 arg from rebasenode

util: move checkexec() to posix.py and return False on Windows

misc: replace .parents()[0] with p1()

filectx: introduce p1/p2 convenience methods

dirstate: add p1/p2 convenience methods

rebase: use merge's ancestor parameter

merge: add ancestor to the update function This makes it easier to do rebase-like operations.

revset: teach optimizer that closed is slowish

localrepo: tighten except clause when looking rev

bugzilla: more documentation fixes Correct formatting of the possible values of bugzilla.version. Fix typo and polish XMLRPC/email mode description.

bugzilla: correct sample configurations Use consistent sample domains and wording in all configuration examples. Add missing template and strip parameters to XMLRPC examples and correct Bugzilla URL key in XMLRPC+email.

date: fixup breakage from ">" fix

merge with stable

log: abort for -d '>' or -d '<' (issue2749)

convert: add hg source bookmark test

hgweb: add missing bookmarks definition to coal/map It shares most templates with paper style.

hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

hgweb: add bookmark labels to gitweb theme (based on 270f57d35525)

hgweb: format page_nav of gitweb/error.tmpl and add missing links

hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help

hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)

hgweb: fix typo in page-header of monoblue's help template

hgweb: add missing bookmarks templates to atom/rss styles It's already referenced from paper style.

subrepo: process merge substate in sorted order in submerge() This ensures that subrepositories are pulled in a well defined order when cloning the parent repository. BEFORE: $ hg clone http://hg.gerg.ca/allextensions destination directory: allextensions requesting all changes adding changesets adding manifests adding file changes added 10 changesets with 20 changes to 6 files updating to branch default pulling subrepo caseguard from http://bitbucket.org/alexandru/caseguard real URL is https://bitbucket.org/alexandru/caseguard requesting all changes adding changesets adding manifests adding file changes added 81 changesets with 100 changes to 13 files pulling subrepo hg-prompt from http://bitbucket.org/sjl/hg-prompt real URL is https://bitbucket.org/sjl/hg-prompt requesting all changes adding changesets adding manifests adding file changes added 114 changesets with 176 changes to 35 files pulling subrepo hgpaste from http://bitbucket.org/birkenfeld/hgpaste real URL is https://bitbucket.org/birkenfeld/hgpaste requesting all changes adding changesets adding manifests adding file changes added 18 changesets with 18 changes to 2 files ... AFTER: $ hg clone http://hg.gerg.ca/allextensions destination directory: allextensions requesting all changes adding changesets adding manifests adding file changes added 10 changesets with 20 changes to 6 files updating to branch default pulling subrepo Artemis from http://hg.mrzv.org/Artemis requesting all changes adding changesets adding manifests adding file changes added 55 changesets with 108 changes to 47 files ...

rebase: add --tool argument for specifying merge tool

revert: note that added files are left as is

bugzilla: fix documentation typo

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 8d960240faac

hgweb: add base link to file log for paper and coal styles (issue2452)

HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT This makes it possible to gain the benefits of HGPLAIN for scripting while preserving different behaviors like internationalization.

url: be stricter about detecting schemes While the URL parser is very forgiving about what characters are allowed in each component, it's useful to be strict about the scheme so we don't accidentally interpret local paths with colons as URLs. This restricts schemes to containing alphanumeric characters, dashes, pluses, and dots (as specified in RFC 2396).

Added signature for changeset b032bec2c0a6

Added tag 1.8.2 for changeset b032bec2c0a6

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 794f4476b974

bugzilla: fix bad reST markup The indented second line turned the first line into a description header.

bugzilla: markup literal text as such

merge with stable

help/hgweb: add pointer to hgrc(5) location

patchbomb, help/hgweb: do not refer to config files as hgrc files

bugzilla: refer to hgrc(5) man page with normal notation

bugzilla: markup section names as literal text

bugzilla: show usermap syntax more clearly

bugzilla: use standard section.name notation

bugzilla: prefix each config option with section

bugzilla: fix reStructuredText errors introduced in 60256f7f30c1

changegroup: introduce bundler objects This makes the bundler pluggable at lower levels.

changegroup: combine lookup functions

changegroup: unnest flookup

changegroup: unnest clookup and mlookup like changegroupsubset

url: nuke some newly-introduced underbars in identifiers

url: refactor util.drop_scheme() and hg.localpath() into url.localpath() This replaces util.drop_scheme() with url.localpath(), using url.url for parsing instead of doing it on its own. The function is moved from util to url to avoid an import cycle. hg.localpath() is removed in favor of using url.localpath(). This provides more consistent behavior between "hg clone" and other commands. To preserve backwards compatibility, URLs like bundle://../foo still refer to ../foo, not /foo. If a URL contains a scheme, percent-encoded entities are decoded. When there's no scheme, all characters are left untouched. Comparison of old and new behaviors: URL drop_scheme() hg.localpath() url.localpath() === ============= ============== =============== file://foo/foo /foo foo/foo /foo file://localhost:80/foo /foo localhost:80/foo /foo file://localhost:/foo /foo localhost:/foo /foo file://localhost/foo /foo /foo /foo file:///foo /foo /foo /foo file://foo (empty string) foo / file:/foo /foo /foo /foo file:foo foo foo foo file:foo%23bar foo%23bar foo%23bar foo#bar foo%23bar foo%23bar foo%23bar foo%23bar /foo /foo /foo /foo Windows-related paths on Windows: URL drop_scheme() hg.localpath() url.localpath() === ============= ============== =============== file:///C:/foo C:/C:/foo /C:/foo C:/foo file:///D:/foo C:/D:/foo /D:/foo D:/foo file://C:/foo C:/foo C:/foo C:/foo file://D:/foo C:/foo D:/foo D:/foo file:////foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar \\foo\bar //foo/bar //foo/bar \\foo\bar Windows-related paths on other platforms: file:///C:/foo C:/C:/foo /C:/foo C:/foo file:///D:/foo C:/D:/foo /D:/foo D:/foo file://C:/foo C:/foo C:/foo C:/foo file://D:/foo C:/foo D:/foo D:/foo file:////foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar \\foo\bar //foo/bar //foo/bar \\foo\bar For more information about file:// URL handling, see: http://www-archive.mozilla.org/quality/networking/testing/filetests.html Related issues: - issue1153: File URIs aren't handled correctly in windows This patch should preserve the fix implemented in 2770d03ae49f. However, it goes a step further and "promotes" Windows-style drive letters from being interpreted as host names to being part of the path. - issue2154: Cannot escape '#' in Mercurial URLs (#1172 in THG) The fragment is still interpreted as a revision or a branch, even in paths to bundles. However, when file: is used, percent-encoded entities are decoded, so file:test%23bundle.hg can refer to test#bundle.hg ond isk.

url: use url.url in ui.expandpath()

hg: use url.url to parse branch names in parseurl()

hg: look up schemes using url.url

schemes: prevent one letter schemes from being interpreted as drive letters To allow one letter schemes, this makes the extension override url.has_drive_letter() to return False for any schemes defined. On Windows, the extension will raise util.Abort for any schemes that conflict with existing drive letters.

hgweb: use url.url when setting CGI environment variables

url: use url.url in proxyhandler

httprepo/sshrepo: use url.url Like the previous patch to getauthinfo(), this also makes username/password parsing more forgiving for SSH URLs. This also opens up the possibility of allowing non-numeric ports, since the URL parser has no problem handling them. Related issues: - issue851: @ in password in http url - issue2055: nonnumeric port bug with https protocol

url: use url.url in url.open()

url: abort on file:// URLs with non-localhost hosts

url: special case bundle URL parsing to preserve backwards compatibility This allows bundle://../foo to continue to refer to the relative path ../foo (bundle URLs do not take host names).

url: add trailing slashes to URLs with hostnames that don't have one This works around a potential issue in Python 2.4 where cloning a repo with a URL like http://foo:8080 would cause urllib2 to query on http://foo:8080?cmd=capabilities instead of http://foo:8080/?cmd=capabilities. In the past, this issue has been masked by the fact that url.getauthinfo() added a trailing slash when it was missing.

url: move drive letter checking into has_drive_letter() for extensions This will let the schemes extension override drive letter detection to allow single letter schemes.

changegroup: unnest some lookup functions

changegroup: minor ordering and renaming changes for similarity This eliminates some needless differences between the two changegroup variants

changegroup: remove nodeiter temporary

changegroup: refactor prune as a filter

changegroup: add first logic to send file header This will allow us to later change how we filter needed file nodes

url: fix tests

url: deal with drive letters

bookmarks: do not forward merged bookmark (issue1877)

merge with stable

pull: new output message when there are multiple branches Pull outputs a slightly new message when there are multiple branches and the current branch has many heads: (run 'hg heads .' to see heads, 'hg merge' to merge) This message adds the "." in hg heads to encourage you to consider only the current branch's heads.

pull: don't suggest running hg merge when new heads are on different branches After a pull when new heads are added but no head is added on the current branch, the "run 'hg merge'" message can be misleading. This patch doesn't output the merge message in that scenario.

bugzilla: add modified XMLRPC mode that uses email to send bug comments. If Bugzilla has its email interface configured, an email can be used to update bugs. If the From: address in the email matches a valid user email, Bugzillas make the update as that user. So comments attached to a bug appear under the name of the user making the change, and the user does not receive email about the change, exactly as if they had made the change via the web interface. So add a modified XMLRPC mode that uses email to modify bugs. The format of the mails is documented in the Bugzilla email_in.pl specification. Briefly, initial non-blank lines in the message body starting '@<field> = <value> modify bug fields. A blank line signals the end of the command lines, and the rest of the message is used as bug comment. Invoke the same Mercurial user to Bugzilla user email mapping currently used in the MySQL mode. All other processing - checking the bug numbers, checking user ids, etc. continues to be done via XMLRPC.

bugzilla: add XMLRPC interface. Add support for access to Bugzilla via the XMLRPC interface. This requires a single username and password used to log in to Bugzilla, plus the URL of the Bugzilla installation. Commit messages are added to bugs as before, but security only permits them to be added as the username used to log in.

bugzilla: localise all MySQL direct access inside access class. Prepare for the addition of other Bugzilla access methods by localising direct MySQL database access inside an access class. Provide a base access class largely to document the methods required for a class implementing a particular access method. Rename the 'bugzilla_<version>' classes to 'bzmysql_<version>' to emphasise that they are doing access via direct manipulation of a MySQL database.

bugzilla: keep bug IDs in set. Bug IDs are collected into a set, and then silently converted in filter_real_bug_ids() into a list. For consistency, keep them in a set throughout and update the docstrings to say that.

bugzilla: rename filter_unknown_bug_ids to reflect its actual purpose. The method really removes from the list of bugs any that already have comment text referencing the changeset in question. Rename it to filter_cset_known_bug_ids().

test-paths.t: 'file:' disables [paths] entries for clone dest

hgwebdir: handle IOErrors from localrepo while enumerating Repository() raises a number of IOErrors in addition to RepoErrors. these are just as uninteresting as RepoErrors and should be ignored The easiest case of this is a repo whose .hg/ directory is -rx

set NOT_CONTENT_INDEXED on .hg dir (issue2694) when running on Windows

hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)

merge with stable

convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04) "mtn automate stdio" will break output larger than 32kB into several packets. This ensures that we are processing all the output on the main stream and not only the last packet.

mq: fix qselect help for qguard

Fix transplant error message to correspond with test

transplant: fix crash if filter script munges log file This fixes an UnboundLocalError crash if the filter script removes the 'User' or 'Date' lines from the log file.

changegroup: fold linkrev helper into lookup functions

changegroup: fold filenode collector into mlookup

changegroup: roll changegroup.collector into lookup functions

changegroup: add revlog to the group callback

changegroup: move sorting down into group

changegroup: fold progress meter into callbacks progress meters now start at 1 rather than 0

changegroup: combine infocollect and lookup callbacks

changegroup: drop unused fullrev This is unfinished and unused and complicates expanding the wire protocol.

util: dates cannot consist entirely of whitespace (issue2732)

convert/mtn: convert suspended branches as closed branches Monotone treats branch closing ("suspending") in a similar manner to how we do in mercurial - a cert is added to a revision that marks the branch to be hidden. If a subsequent commit is made, the branch is effectively reopened.

rebase: don't mark file as removed if missing in parent's manifest (issue2725)

windows: use win32.unlink in unlinkpath() os.unlink fails to remove files with READONLY attribute

win32: remove READONLY attribute on unlink

windows: move unlink to win32.py no code change

ui: label prompts, default to yellow prompts

record: replace poor man's if-statement with real if-statement

url: use url.url in hidepassword() and removeauth()

subrepos: use url.url when normalizing repo paths This works around an issue in older versions of Python that would strip double slashes from SSH URLs when using urlunparse() on a parsed URL. Related issues: - issue1755: WinXP: cmd line hg 1.3 clone of subrepo fails, due to %5C '\'? (originally fixed by f783bb979fb3).

url: provide url object This adds a url object that re-implements urlsplit() and unsplit(). The implementation splits out usernames, passwords, and ports. The implementation is based on the behavior specified by RFC 2396[1]. However, it is much more forgiving than the RFC's specification; it places no specific restrictions on what characters are allowed in each segment of the URL other than what is necessary to split the URL into its constituent parts. [1]: http://www.ietf.org/rfc/rfc2396.txt

cmdutil: fix mode handling in make_file

revlog: change variable name to avoid reuse

debugstate: add new --datesort option sorts the output lines by mtime, then by filename

rebase: restore mq guards after rebasing (issue2107) Guards on rebased mq patches were lost. This patch restores them after the qimporting step.

tests: no need to explicitly export HOME in test files the test runner ensures that HOME is set to a temp dir

tests: set HOME to the test temp dir (issue2707)

dirstate: eliminate _lastnormal set We can get rid of the _lastnormal set by using the filesystem mtimes to identify the problematic "lastnormal" files on status(), forcing a file content-comparison if the file's mtime timeslot is equal to _lastnormaltime.

test-extdiff: fix 5c0e1222e7c0 temporary dir output

convert/mtn: avoid unnecessary initial test of mtn repo As soon as before() is called, we'll know if there is a problem (and get a better error message).

convert/mtn: add support for using monotone's "automate stdio" when available Currently the convert extension spawns a new mtn process for each operation. For a large repository, this ends up being hundreds of thousands of processes. The following enables usage of monotone's "automate stdio" functionality - documented at: http://www.monotone.ca/docs/Automation.html#index-mtn-automate-stdio-188 The effect is that (after determining that a new enough mtn executable is available) a single long-running mtn process is used for all the operations, using stdin/stdout to send commands and read output. This has a pretty significant effect on the performance of some parts of the conversion process.

convert: add support to common commandline to access stdin of the process

extdiff: use absolute paths for any temporary files This allows the use of p4merge amongst possible other external tools.

convert: add bookmark support to hg source

convert: add bookmarks reading support to git backend

ssh: fix password test We don't support passwords in ssh URLs, and neither do some versions of Python's urllib. Since we don't actually care much here, punt with a glob in the test.

dirstate: check mtime when adding to _lastnormal - consistently use mtime as mapped to dirstate granularity (needed for filesystems like NTFS, which have sub-second resolution) - no need to add files with mtime < _lastnormaltime - improve comments

subrepo: simplify hgsubrepo._get a little

Fix expected url to match test.

patch: deprecate ui.patch / external patcher feature Why? - Mercurial internal patcher works correctly for regular patches and git patches, is much faster at least on Windows and is more extensible. - In theory, the external patcher can be used to handle exotic patch formats. I do not know any and have not heard about any such use in years. - Most patch programs cannot handle git format patches, which makes the API caller to decide either to ignore ui.patch by calling patch.internalpatch() directly, or take the risk of random failures with valid inputs. - One thing a patch program could do Mercurial patcher cannot is applying with --reverse. Apparently several shelve like extensions try to use that, including passing the "reverse" option to Mercurial patcher, which has been removed mid-2009. I never heard anybody complain about that, and would prefer reimplementing it anyway. And from the technical perspective: - The external patcher makes everything harder to maintain and implement. EOL normalization is not implemented, and I would bet file renames, if supported by the patcher, are not correctly recorded in the dirstate. - No tests. How? - Remove related documentation - Clearly mark patch.externalpatch() as private - Remove the debuginstall check. This deprecation request was actually triggered by this last point. debuginstall is the only piece of code patching without a repository. When migrating to an integrated patch() + updatedir() call, this was really a showstopper, all workarounds were either ugly or uselessly complicated to implement. If we do not support external patcher anymore, the debuginstall check is not useful anymore. - Remove patch.externalpatch() after 1.9 release.

# User Dan Villiom Podlaski Christiansen <danchr@gmail.com> # Date 1289564504 -3600 # Node ID b75264c15cc888cf38c3c7b8f619801e3c2589c7 # Parent 89b2e5d940f669e590096c6be70eee61c9172fff revsets: overload the branch() revset to also take a branch name. This should only change semantics in the specific case of a tag/branch conflict where the tag wasn't done on the branch with the same name. Previously, branch(whatever) would resolve to the branch of the tag in that case, whereas now it will resolve to the branch of the name. The previous behaviour, while documented, seemed very counter-intuitive to me. An alternate approach would be to introduce a new revset such as branchname() or namedbranch(). While this would retain backwards compatibility, the distinction between it and branch() would not be readily apparent to users. The most intuitive behaviour would be to have branch(x) require 'x' to be a branch name, and something like branchof(x) or samebranch(x) do what branch(x) currently does. Unfortunately, our backwards compatibility guarantees prevent us from doing that. Please note that while 'hg tag' guards against shadowing a branch, 'hg branch' does not. Besides, even if it did, that wouldn't solve the issue of conversions with such tags and branches...

test-commit-multiple.t: improve committwice.py - fix bug in replacebyte: parameter fn wasn't used (no harm done) - remove unneeded matcher - remove unused local n - increase test coverage a bit with a second file and some sleeping - show files changed in revisions - move print statements out of racy path to make sure it's as racy as possible

osutil: replace #import with #include, and add a check for it

code indentation fixes

convert: add bookmark support to the hg sink

convert: add bookmark support to main command During conversion, read bookmarks from source repo, filter them and push the resulting set of bookmarks to destination sink.

convert: add bookmark support to common sink/source implementation

dirstate: reset _lastnormal and _lastnormaltime on write, invalidate, and clear

discovery: avoid discovery when local graph is a subset of remote Immediately sends local's heads to the server to check whether the server knows them all. If it does, we can call getbundle immediately. Interesting test output changes are: - added 1 changesets with 0 changes to 1 files (+1 heads) + added 1 changesets with 0 changes to 0 files (+1 heads) -> The new getbundle() actually fixes a bug vs. changegroupsubset() in that it no longer returns unnecessary files when file revs are reused. warning: repository is unrelated + requesting all changes -> The new use of common instead of bases correctly indicates that an unrelated pull gets all changes from the server.

wireproto: add getbundle() function getbundle(common, heads) -> bundle Returns the changegroup for all ancestors of heads which are not ancestors of common. For both sets, the heads are included in the set. Intended to eventually supercede changegroupsubset and changegroup. Uses heads of common region to exclude unwanted changesets instead of bases of desired region, which is more useful and easier to implement. Designed to be extensible with new optional arguments (which will have to be guarded by corresponding capabilities).

merge with stable

i18n-pt_BR: synchronized with 6783f47d90dd

merge with i18n

i18n-it: synchronized with adf3c4401c5d

osutil: fix up check-code issues

dirstate: flush _lastnormal when we see newer filesystem times

util: add Mac-specific check whether we're in a GUI session (issue2553) The previous test assumed that 'os.name' was "mac" on Mac OS X. This is not the case; 'mac' was classic Mac OS, whereas Mac OS X has 'os.name' be 'posix'. Please note that this change will break Mercurial on hypothetical non-Mac OS X deployments of Darwin. Credit to Brodie Rao for thinking of CGSessionCopyCurrentDictionary() and Kevin Bullock for testing.

rebase: allow for rebasing descendants onto ancestors on different named branches So far we've been denying rebasing descendants onto ancestors, but there are situations in which this kind of operation makes perfect sense to me. Let's say we have made a commit (or more), that belongs to branch 'dev', on top of the named branch 'stable': ... a (stable) - b (dev) but then we realize that b should belong to branch 'stable'. In these cases a rebase means: "move these csets from named branch A to named branch B" and there isn't a valid reason to deny it. This patch basically doesn't block it, if source and destination are on different named branches. The old behaviour still applies for rebases across the same named branch. Can you think of any tricky corner cases in which this new behaviour could lead to problems? (I bet there are tons of them...) By the way, I created a brand new .t because I feel there should be more tests I can't think of at the moment.

bdiff.c: rename all variables which hold a hash value to "hash"

bdiff.c: use unsigned arithmetic for hash computation Signed integer overflow is undefined in C.

bdiff.c: cast to unsigned char when computing hash value

bdiff.c: make all local functions static

merge with stable

debugbundle: fix up long line caught by check-code

wireproto: avoid naked excepts

mq: fix typo in docstring

commands: add debugbundle command Lists ids contained in a bundle file. Useful for testing bundle-related commands.

wireproto: add known([id]) function known([Node]) -> [1/0] Returns 1/0 for each node, indicating whether it's known by the server. Needed for new discovery protocols introduced in later patches.

wireproto: fix decodelist to properly return empty list Needed by tests for next patch introducing known().

wireproto: fix handling of '*' args for HTTP and SSH

debug: add debugwireargs to test argument passing over the wire Tests argument passing locally, via HTTP, and via SSH. This is mainly preparation for the next patch.

sshserver: drop unnecessary line

merge: avoid unlinking destination of merge when case changes (issue2715)

dirstate: introduce a public case normalizing method

changegroup: minor cleanups

repair: revlog has an iterator

changegroup: fix leftover from delta read

changegroup: drop expensive redundant usage of readdelta for progress

changegroupsubset: use manifest.readfast to simplify collector

manifest: add readfast method

changegroupsubset: simplify filenode_collector

changegroupsubset: more renaming

changegroupsubset: simplify prune Ancestors of nodes linked to commonrevs can be expected to be linked to commonrevs. Walking graphs of each revlog looking for rare/nonexistent outliers is overkill.

changegroupsubset: more minor cleanups - remove more excessive comments - simplify some sorting operations - rename some variables - replace identity with a lambda

changegroupsubset: minor cleanups - move some variable declarations - drop some excessive comments - use standard variable naming