Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:29:38 -0600] rev 13334
merge with crew
Patrick Mezard <pmezard@gmail.com> [Tue, 01 Feb 2011 21:59:07 +0100] rev 13333
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Tue, 01 Feb 2011 21:39:28 +0100] rev 13332
subrepo: fix update -C with svn subrepos when cwd != repo.root
Eric Eisner <ede@mit.edu> [Mon, 31 Jan 2011 19:19:56 -0500] rev 13331
test-subrepo-git.t: make compatible with old git
Javi Merino <cibervicho@gmail.com> [Tue, 01 Feb 2011 07:29:11 +0000] rev 13330
win32mbcs: Fix typo in documentation
extention -> extension
Mads Kiilerich <mads@kiilerich.com> [Tue, 01 Feb 2011 01:55:45 +0100] rev 13329
merge with stable
Yuya Nishihara <yuya@tcha.org> [Sat, 29 Jan 2011 23:23:24 +0900] rev 13328
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.
Patrick Mezard <pmezard@gmail.com> [Mon, 31 Jan 2011 22:16:33 +0100] rev 13327
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.
Kevin Bullock <kbullock@ringworld.org> [Thu, 27 Jan 2011 15:51:26 -0600] rev 13326
test-subrepo-mq-svn.t: correct comment
This fixes the description of a helper function in the test.
Kevin Bullock <kbullock@ringworld.org> [Tue, 04 Jan 2011 10:42:00 -0600] rev 13325
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.
Erik Zielke <ez@aragost.com> [Mon, 31 Jan 2011 13:40:05 +0100] rev 13324
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.
Martin Geisler <mg@aragost.com> [Mon, 31 Jan 2011 13:38:00 +0100] rev 13323
merge with stable
Erik Zielke <ez@aragost.com> [Mon, 31 Jan 2011 13:33:41 +0100] rev 13322
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.
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:08:49 -0600] rev 13321
Added signature for changeset a6c855c32ea0
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:08:46 -0600] rev 13320
Added tag 1.7.4 for changeset a6c855c32ea0
Wagner Bruna <wbruna@yahoo.com> [Tue, 01 Feb 2011 10:15:50 -0200] rev 13319
i18n-pt_BR: messages from crew a939f08fae9c
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 28 Jan 2011 21:01:57 -0200] rev 13318
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 28 Jan 2011 13:31:17 -0200] rev 13317
i18n-pt_BR: messages from crew 8dc488dfcdb4, some small fixes
Matt Mackall <mpm@selenic.com> [Fri, 28 Jan 2011 17:02:29 -0600] rev 13316
util: delay loading of textwrap
Mads Kiilerich <mads@kiilerich.com> [Fri, 28 Jan 2011 03:09:22 +0100] rev 13315
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 28 Jan 2011 02:57:59 +0100] rev 13314
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.
Matt Mackall <mpm@selenic.com> [Thu, 27 Jan 2011 17:22:37 -0600] rev 13313
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 27 Jan 2011 17:21:23 -0600] rev 13312
merge with i18n
Martin Geisler <mg@aragost.com> [Mon, 24 Jan 2011 11:27:56 +0100] rev 13311
i18n-merge stable heads
Arne Babenhauserheide <bab@draketo.de> [Fri, 24 Dec 2010 15:10:24 +0100] rev 13310
i18n-de: translated some rebase strings.
Arne Babenhauserheide <bab@draketo.de> [Thu, 23 Dec 2010 15:51:14 +0100] rev 13309
i18n-de: translated missing strings for progress extension.
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 19 Jan 2011 17:49:06 -0200] rev 13308
i18n-pt_BR: synchronized with 75d0c38a0bca
David Soria Parra <dsp@php.net> [Thu, 27 Jan 2011 02:58:48 +0100] rev 13307
bookmarks: respect rollbacks dryrun parameter
David Soria Parra <dsp@php.net> [Thu, 27 Jan 2011 02:55:11 +0100] rev 13306
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.
Adrian Buehlmann <adrian@cadifra.com> [Wed, 26 Jan 2011 19:14:30 +0100] rev 13305
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)
Matt Mackall <mpm@selenic.com> [Thu, 27 Jan 2011 13:29:21 -0600] rev 13304
help: ssh urls don't allow passwords
Adrian Buehlmann <adrian@cadifra.com> [Tue, 18 Jan 2011 14:16:27 +0100] rev 13303
commit: use the term SCM instead of RCS
for consistency.
see also fc4a3931e608