Thu, 16 Sep 2010 16:12:26 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:12:26 -0500] rev 12315
merge with stable
Sun, 12 Sep 2010 18:05:53 -0500 merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org> [Sun, 12 Sep 2010 18:05:53 -0500] rev 12314
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge.
Thu, 16 Sep 2010 16:00:29 +0200 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 16 Sep 2010 16:00:29 +0200] rev 12313
transplant: maintain list of transplants in dict
Wed, 15 Sep 2010 22:18:46 +0200 tests: unify test-hgignore
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 22:18:46 +0200] rev 12312
tests: unify test-hgignore
Thu, 16 Sep 2010 11:36:38 +0200 win32: update build instructions with correct CRT version
Pascal Quantin <pascal.quantin@gmail.com> [Thu, 16 Sep 2010 11:36:38 +0200] rev 12311
win32: update build instructions with correct CRT version As stated in http://msdn.microsoft.com/en-us/library/cc664727.aspx, when you compile an application with MSVC 2008 SP1 it is bound by default to the original CRT version (9.0.21022.8). This is the case for Python 2.6 up to 3.1. If the wrong CRT version is embedded in the Inno Setup installer, with a PC that does not have the MSVC 2008 redistributable package installed, hg will refuse to launch with an error: "the system cannot execute the specified program".
Thu, 16 Sep 2010 16:07:22 -0500 merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:07:22 -0500] rev 12310
merge with crew
Thu, 16 Sep 2010 16:05:00 -0500 merge with crew stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:05:00 -0500] rev 12309
merge with crew
Wed, 15 Sep 2010 17:48:03 -0500 Merge with stable
Steve Borho <steve@borho.org> [Wed, 15 Sep 2010 17:48:03 -0500] rev 12308
Merge with stable
Wed, 15 Sep 2010 17:46:51 -0500 eol: setup the repo.ui in reposetup() stable
Steve Borho <steve@borho.org> [Wed, 15 Sep 2010 17:46:51 -0500] rev 12307
eol: setup the repo.ui in reposetup() This fixes problems some have reported using the eol extension together with TortoiseHg. It ensures the ui associated with the repository has the preupdate.eol hook configured.
Wed, 15 Sep 2010 20:41:14 +0200 tests: unify test-hardlinks-safety
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 20:41:14 +0200] rev 12306
tests: unify test-hardlinks-safety
Wed, 15 Sep 2010 18:00:09 +0200 tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 18:00:09 +0200] rev 12305
tests: unify test-extra-filelog-entry
Wed, 15 Sep 2010 16:27:39 +0200 tests: unify test-extdiff
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 16:27:39 +0200] rev 12304
tests: unify test-extdiff
Tue, 14 Sep 2010 22:26:43 -0500 tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net> [Tue, 14 Sep 2010 22:26:43 -0500] rev 12303
tests: add test for bookmark push/pull
Tue, 14 Sep 2010 21:45:43 -0500 bookmarks: set VALUE in push/pull
Will Maier <willmaier@ml1.net> [Tue, 14 Sep 2010 21:45:43 -0500] rev 12302
bookmarks: set VALUE in push/pull
Tue, 14 Sep 2010 16:52:32 +0200 tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 16:52:32 +0200] rev 12301
tests: unify test-username-newline
Tue, 14 Sep 2010 16:42:02 +0200 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 16:42:02 +0200] rev 12300
tests: unify test-url-rev
Tue, 14 Sep 2010 15:37:10 +0200 tests: unify test-update-renames
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 15:37:10 +0200] rev 12299
tests: unify test-update-renames
Tue, 14 Sep 2010 13:43:05 +0200 tests: unify test-rename-merge1
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 13:43:05 +0200] rev 12298
tests: unify test-rename-merge1
Wed, 15 Sep 2010 09:09:17 -0500 merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 15 Sep 2010 09:09:17 -0500] rev 12297
merge with crew
Wed, 15 Sep 2010 11:06:22 +0200 clone: only use stream when we understand the revlog format
Sune Foldager <cryo@cyanite.org> [Wed, 15 Sep 2010 11:06:22 +0200] rev 12296
clone: only use stream when we understand the revlog format This patch fixes issues with stream cloning in the presense of parentdelta, lwcopy and similar additions that change the interpretation of the revlog format, or the format itself. Currently, the stream capability is sent like this: stream=<version of changelog> But the client doesn't actually check the version number; also, it only checks the changelog and it doesn't capture the interpretation-changes and flag-changes in parentdelta and lwcopy. This patch removes the 'stream' capability whenever we use a non-basic revlog format, to prevent old clients from receiving incorrect data. In those cases, a new capability called 'streamreqs' is added instead. Instead of a revlog version, it comes with a list of revlog-format relevant requirements, which are a subset of the repository requirements, excluding things that are not relevant for stream. New clients use this to determine whether or not they can stream. Old clients only look for the 'stream' capability, as always. New servers will still send this when serving old repositories.
Wed, 15 Sep 2010 10:44:10 +0200 localrepo: factor out requirement application and write
Sune Foldager <cryo@cyanite.org> [Wed, 15 Sep 2010 10:44:10 +0200] rev 12295
localrepo: factor out requirement application and write
Tue, 14 Sep 2010 16:21:21 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 14 Sep 2010 16:21:21 -0500] rev 12294
merge with stable
Tue, 14 Sep 2010 16:21:01 -0500 merge with i18n
Matt Mackall <mpm@selenic.com> [Tue, 14 Sep 2010 16:21:01 -0500] rev 12293
merge with i18n
Tue, 14 Sep 2010 16:20:34 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Tue, 14 Sep 2010 16:20:34 -0500] rev 12292
merge with i18n
Mon, 13 Sep 2010 01:37:56 +0000 l10n: starting to unify the old translations
Christoph <christoph@webvariants.de> [Mon, 13 Sep 2010 01:37:56 +0000] rev 12291
l10n: starting to unify the old translations New status: 1525 messages complete with 135 fuzzies and 621 untranslated. Transmitted-via: Transifex (www.transifex.net).
Mon, 13 Sep 2010 00:03:26 +0000 l10n: translations: env. variables / templating system (DE)
Christoph <christoph@webvariants.de> [Mon, 13 Sep 2010 00:03:26 +0000] rev 12290
l10n: translations: env. variables / templating system (DE) New status: 1517 messages complete with 134 fuzzies and 630 untranslated. Transmitted-via: Transifex (www.transifex.net).
Sun, 12 Sep 2010 01:18:30 +0000 l10n: added some new translations
Christoph <christoph@webvariants.de> [Sun, 12 Sep 2010 01:18:30 +0000] rev 12289
l10n: added some new translations New status: 1443 messages complete with 130 fuzzies and 708 untranslated. Transmitted-via: Transifex (www.transifex.net).
Fri, 10 Sep 2010 21:05:51 -0300 i18n-pt_BR: synchronized with 0f6164806283 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 10 Sep 2010 21:05:51 -0300] rev 12288
i18n-pt_BR: synchronized with 0f6164806283
Tue, 14 Sep 2010 22:54:04 +0200 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 22:54:04 +0200] rev 12287
tests: unify test-default-push
Tue, 14 Sep 2010 18:43:24 +0200 tests: unify test-clone-update-order
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 18:43:24 +0200] rev 12286
tests: unify test-clone-update-order
Tue, 14 Sep 2010 21:41:06 +0200 tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 21:41:06 +0200] rev 12285
tests: unify test-debugrename
Tue, 14 Sep 2010 21:26:05 +0200 tests: unify test-confused-revert
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 21:26:05 +0200] rev 12284
tests: unify test-confused-revert
Tue, 14 Sep 2010 19:31:00 +0200 tests: unify test-command-template
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 19:31:00 +0200] rev 12283
tests: unify test-command-template
Tue, 14 Sep 2010 22:11:53 +0200 mq: rename strip --nobackup option to --no-backup (issue2377)
Christian Ebert <blacktrash@gmx.net> [Tue, 14 Sep 2010 22:11:53 +0200] rev 12282
mq: rename strip --nobackup option to --no-backup (issue2377) Same option name as for hg revert --no-backup. Deprecate strip --nobackup.
Tue, 14 Sep 2010 22:11:46 +0200 mq: consistently use opts.get() to prevent potential KeyError
Christian Ebert <blacktrash@gmx.net> [Tue, 14 Sep 2010 22:11:46 +0200] rev 12281
mq: consistently use opts.get() to prevent potential KeyError
Tue, 14 Sep 2010 16:03:10 +0200 tests: remove exec bit from .t files
Sune Foldager <cryo@cyanite.org> [Tue, 14 Sep 2010 16:03:10 +0200] rev 12280
tests: remove exec bit from .t files
Tue, 14 Sep 2010 12:20:51 +0200 combine tests
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 12:20:51 +0200] rev 12279
combine tests
Mon, 13 Sep 2010 16:25:13 +0200 merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 13 Sep 2010 16:25:13 +0200] rev 12278
merge with stable
Mon, 13 Sep 2010 16:12:25 +0200 color: add win32 support for non-black background stable
Sune Foldager <cryo@cyanite.org> [Mon, 13 Sep 2010 16:12:25 +0200] rev 12277
color: add win32 support for non-black background This complicates the code a bit, since attributes need to be masked together correctly before they are applied. Perhaps the code should be redesigned at some point, but this works well for now.
Mon, 13 Sep 2010 10:04:41 -0300 i18n: unmark untranslatable string
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 13 Sep 2010 10:04:41 -0300] rev 12276
i18n: unmark untranslatable string
Mon, 13 Sep 2010 15:13:30 +0200 test-subrepo-recursion: test missing subrepo
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 15:13:30 +0200] rev 12275
test-subrepo-recursion: test missing subrepo
Mon, 13 Sep 2010 13:09:31 +0200 incoming: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:31 +0200] rev 12274
incoming: recurse into subrepositories with --subrepos/-S flag As with push and outgoing, the optional source path is ignored for the subrepositories. Fixing this is Issue1852.
Mon, 13 Sep 2010 13:09:30 +0200 incoming: move code from commands to cmdutil
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:30 +0200] rev 12273
incoming: move code from commands to cmdutil This makes it easier to reuse it in a recursive fashion for subrepos.
Mon, 13 Sep 2010 13:09:26 +0200 outgoing: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:26 +0200] rev 12272
outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.
Mon, 13 Sep 2010 13:09:24 +0200 outgoing: move code from commands to cmdutil
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:24 +0200] rev 12271
outgoing: move code from commands to cmdutil This makes it easier to reuse it in a recursive fashion for subrepos.
Mon, 13 Sep 2010 13:09:20 +0200 add: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:20 +0200] rev 12270
add: recurse into subrepositories with --subrepos/-S flag
Mon, 13 Sep 2010 13:09:11 +0200 add: move main part to cmdutil to make it easier to reuse
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:11 +0200] rev 12269
add: move main part to cmdutil to make it easier to reuse
Mon, 13 Sep 2010 13:09:09 +0200 narrowmatcher: propagate bad method
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:09 +0200] rev 12268
narrowmatcher: propagate bad method The full path is propagated to the original match object since this is often used directly for printing an error to the user.
Mon, 13 Sep 2010 13:08:18 +0200 narrowmatcher: fix broken rel method
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:08:18 +0200] rev 12267
narrowmatcher: fix broken rel method
Mon, 13 Sep 2010 13:08:09 +0200 patch: break import cycle with cmdutil
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:08:09 +0200] rev 12266
patch: break import cycle with cmdutil The patch module imported cmdutil but used it only in updatedir.
Sun, 12 Sep 2010 16:10:41 +0900 patchbomb: show progress when sending emails or writing mbox
Yuya Nishihara <yuya@tcha.org> [Sun, 12 Sep 2010 16:10:41 +0900] rev 12265
patchbomb: show progress when sending emails or writing mbox
Sat, 11 Sep 2010 18:08:00 +0200 patchbomb: consistent code style in getaddrs()
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Sep 2010 18:08:00 +0200] rev 12264
patchbomb: consistent code style in getaddrs()
Sat, 11 Sep 2010 18:48:03 +0200 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com> [Sat, 11 Sep 2010 18:48:03 +0200] rev 12263
win32: 64-bit Inno Setup installer
Sat, 11 Sep 2010 09:48:10 +0200 win32: update Inno Setup build instructions with up-to-date software
Pascal Quantin <pascal.quantin@gmail.com> [Sat, 11 Sep 2010 09:48:10 +0200] rev 12262
win32: update Inno Setup build instructions with up-to-date software
Sun, 12 Sep 2010 14:00:40 +0200 merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 12 Sep 2010 14:00:40 +0200] rev 12261
merge with stable
Sun, 12 Sep 2010 12:11:39 +0200 tests: unify test-merge-remove
Adrian Buehlmann <adrian@cadifra.com> [Sun, 12 Sep 2010 12:11:39 +0200] rev 12260
tests: unify test-merge-remove
Sun, 12 Sep 2010 11:52:13 +0200 tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com> [Sun, 12 Sep 2010 11:52:13 +0200] rev 12259
tests: unify test-merge-prompt
Sat, 11 Sep 2010 21:19:12 +0200 tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 21:19:12 +0200] rev 12258
tests: unify test-merge-local
Sat, 11 Sep 2010 20:04:35 +0200 tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 20:04:35 +0200] rev 12257
tests: unify test-merge-internal-tools-pattern
Sat, 11 Sep 2010 17:58:37 +0200 tests: unify test-merge-force
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 17:58:37 +0200] rev 12256
tests: unify test-merge-force
(0) -10000 -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 +3000 +10000 +30000 tip