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
Martin Geisler <mg@aragost.com> [Thu, 27 Jan 2011 11:15:08 +0100] rev 13302
backout of 613b8bd2284e
Matt and a majority of crew did not like this approach.
Martin Geisler <mg@aragost.com> [Wed, 26 Jan 2011 12:35:02 +0100] rev 13301
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.
Kevin Bullock <kbullock@ringworld.org> [Mon, 10 Jan 2011 16:02:41 -0500] rev 13300
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.
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Jan 2011 03:15:44 +0100] rev 13299
keyword: move repo.__class__ assignment out of monkeypatch context
A cosmetic change to improve readability.
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Jan 2011 03:15:39 +0100] rev 13298
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]
...
Martin Geisler <mg@aragost.com> [Wed, 26 Jan 2011 12:05:01 +0100] rev 13297
specify C indention style using Emacs file local variables
Lee Cantey <lcantey@embarcadero.com> [Tue, 25 Jan 2011 16:33:46 -0800] rev 13296
Ignore pax_global_header that some tar versions write as a file.
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Jan 2011 23:25:46 +0100] rev 13295
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?
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 15:21:56 +0100] rev 13294
record: simplify header methods with util.any
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 15:21:37 +0100] rev 13293
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.
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 15:21:34 +0100] rev 13292
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 13:01:17 +0100] rev 13291
record: turn prompt() into a pure function
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 12:44:05 +0100] rev 13290
record: turn consumefile() into a pure function
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 12:30:15 +0100] rev 13289
hghave: remove unused hotshot check
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Jan 2011 16:29:10 +0100] rev 13288
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Jan 2011 16:15:40 +0100] rev 13287
subrepo: compare svn subrepo state to last committed revision
A subversion project revisions are a subset of the repository revisions, you
can ask subversion to update a working directory from one revision to another
without changing anything. Unfortunately, Mercurial will think the
subrepository has changed and will commit it again. To avoid useless commits,
we compare the subrepository state to its actual "parent" revision. To ensure
ascending compatibility with existing subrepositories which might reference
fake revisions, we also keep comparing with the subrepo working directory
revision.
NOTE: not sure if this should go in stable or not.
Steve Borho <steve@borho.org> [Sat, 22 Jan 2011 09:13:04 -0600] rev 13286
merge with stable
Steve Borho <steve@borho.org> [Fri, 21 Jan 2011 14:42:15 -0600] rev 13285
win32: win32console.GetStdHandle() can return None
When the Mercurial Python libraries are used within a Windows application with
no console, there is no stderr file handle.
Matt Mackall <mpm@selenic.com> [Fri, 21 Jan 2011 16:26:01 -0600] rev 13284
revlog: remove stray test in rev()