backout: make help more explicit about what backout does The help for backout explains: The backout command merges the reverse effect of the reverted changeset into the working directory. Unfortunately, that does not make it obvious to a newcomer what the backout command does. Since it performs a 3-way merge, what is the common ancestor? Will the result be automatically committed? What is this reverted changeset --- is it the rev passed with -r on the command line or its inverse? So try to clarify the description, avoiding jargon and being explicit about what happens from the user's perspective. Thanks to Gilles Moris, Steve Borho, Kevin Bullock, and timeless for help.

subrepo: fix pruning of subrepo filenames in dirstate (issue2619)

merge with self

merge with stable

Added signature for changeset 2b2155623ee2

Added tag 1.7.5 for changeset 2b2155623ee2

merge with crew

Merge with stable

subrepo: fix update -C with svn subrepos when cwd != repo.root

test-subrepo-git.t: make compatible with old git

win32mbcs: Fix typo in documentation extention -> extension

merge with stable

url: add --insecure option to bypass verification of ssl certificates If --insecure specified, it behaves in the same way as no web.cacerts configured. Also shows hint for --insecure option when _verifycert() failed. But currently the hint isn't displayed on SSLError, because it needs a certain level of changes.

mq: factor out push conditions checks Some extensions (e.g. hgsubversion) completely override push command. Because extensions load order is unspecified, if hgsubversion loads before mq, mq checks about not pushing applied patches will be bypassed. Short of finding a way to fix load order, extracting the checking logic will allow hgsubversion-like extensions to run the check themselves.

test-subrepo-mq-svn.t: correct comment This fixes the description of a helper function in the test.

subrepo: clarify comments in dirty() methods Just a little change to bring the comments in the dirty() methods of the various subrepo classes into a uniform structure. This clarifies the meaning of the states checked.

subrepo: make update -C clean the working directory for git subrepos This makes 'hg update --clean' behave the same way for all three kinds of subrepositories [hg, svn, git]. Before git subrepos did not take the clean parameter into account, but just updated to the given revision and merged uncommitted changes into that.

merge with stable

subrepo: make update -C clean the working directory for svn subrepos This makes 'hg update --clean' behave the same way for both kinds of subrepositories. Before Subversion subrepos did not take the clean parameter into account, but just updated to the given revision and merged uncommitted changes into that.

Added signature for changeset a6c855c32ea0

Added tag 1.7.4 for changeset a6c855c32ea0

i18n-pt_BR: messages from crew a939f08fae9c

merge with i18n stable

i18n-pt_BR: messages from crew 8dc488dfcdb4, some small fixes

util: delay loading of textwrap

merge with stable

url: 'ssh known host'-like checking of fingerprints of HTTPS certificates Known fingerprints of HTTPS servers can now be configured in the hostfingerprints section. That makes it possible to verify the identify of web servers without configuring and trusting the CA chain. Limitations: * Portnumbers are ignored, just like with ordinary certificates. * Host name matching is case sensitive.

merge with stable

merge with i18n

i18n-merge stable heads

i18n-de: translated some rebase strings.

i18n-de: translated missing strings for progress extension.

i18n-pt_BR: synchronized with 75d0c38a0bca

bookmarks: respect rollbacks dryrun parameter

bookmarks: always write undo file Always write the undo file. Otherwise, rollback will not work for the initial bookmark as undo.bookmarks doesn't exists. In this case undo.bookmarks needs already be empty.

opener: force copy on 'a'ppend if nlinks() returns 0 (issue1922) If pywin32 is not installed, 'os.lstat(pathname).st_nlink' is used for nlinks(), which is always zero for all files on Windows. To make sure we break up hardlinks if pywin32 is missing, we force nlink = 2 if nlinks() returns < 1. (this completely fixes issue1922)

help: ssh urls don't allow passwords

commit: use the term SCM instead of RCS for consistency. see also fc4a3931e608

backout of 613b8bd2284e Matt and a majority of crew did not like this approach.

check-code: do not complain about 'ls x | foo -v' Such a line was introduced in test-subrepo-git.t in 5dda6c708138, which made check-code confused.

subrepo: separate out mq+svn subrepo tests Having the mq+subrepo+svn tests in a separate file lets them be skipped without skipping the other mq+subrepo tests.

keyword: move repo.__class__ assignment out of monkeypatch context A cosmetic change to improve readability.

keyword: inform user about current keywordset in kwdemo The kwdemo --default output now looks roughly like this: configuration using default cvs keywordset [extensions] keyword = [keyword] demo.txt = [keywordset] * section added with this change svn = False [keywordmaps] ...

specify C indention style using Emacs file local variables

Ignore pax_global_header that some tar versions write as a file.

record: do not include files into changes count This turns the prompt sequence from something like: $ examine changes to foo? $ record change 1/4 to foo? $ record change 2/4 to foo? $ examine changes to bar? $ record change 4/4 to bar? into: $ examine changes to foo? $ record change 1/3 to foo? $ record change 2/3 to foo? $ examine change to bar? $ record change 3/3 to bar?

record: simplify header methods with util.any

record: refactor the prompt loop The previous loop was iterating over a mixed header/hunk stream. It may have been more generic in the sense every item in the stream could trigger a prompt but it required more work to skip items properly. It can be rewritten in a more intuitive way by looping on files then looping on hunks.