buildrpm: remove prompt for uncommitted changes - it was a bad idea We want a command that is useful in scripts, not an interactive command.

buildrpm: collect code for building local hg and using it in one place

buildrpm: various minor cleanup

fix_bytes: loosen blacklist matching requirements On my Linux machine, paths seen by 2to3 include the build directory. We switch from an exact to substring match to allow 2to3 to work in more environments.

convert: only consider shamap revisions converted if they still exists Rollback or strip could leave a Mercurial repo with a shamap with revisions no longer in the repository. To ensure reliable conversions we now check that the commit actually exists and consider it non-existing if it doesn't exist.

convert: introduce hascommitfrommap sink method Mercurial has stable revision identifiers and rollback and strip. Revisions referenced in the shamap are thus not necessarily still present but we can easily check for it. Subversion do not have stable identifiers and no rollback or strip(?). We must thus assume that all revisions referenced from a shamap still must be present. This method is similar to hascommitforsplicemap but different ...

convert: rename sink hascommit to hascommitforsplicemap The name 'hascommit' sounds like something generic ... but it might also throw exceptions in specific cases and it is thus (apparently) only useful for splicemap.

tests: better tests for two-way convert

mergetools.hgrc: add minimal configuration for editmerge The ``editmerge`` script is shipped in contrib and opens an editor on every conflicting file. It needs minimal configuration to inject the config marker in the file before opening. Otherwise it behaves the same as ``internal:local`` and bad things happen.

merge with stable