Sat, 30 Aug 2014 11:56:33 +0200 debugdag: stop wrongly sorting parents
Henrik Stuart <hg@hstuart.dk> [Sat, 30 Aug 2014 11:56:33 +0200] rev 22310
debugdag: stop wrongly sorting parents The dag being dumped is not in a format that allows us to reconstruct the original dag as the parent revisions are normalised.
Fri, 29 Aug 2014 18:00:44 +0200 obsolete: avoid slow, generic date parsing
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 29 Aug 2014 18:00:44 +0200] rev 22309
obsolete: avoid slow, generic date parsing Simple profiling of `hg log -r .` revealed ~18,000 calls to mercurial.i18n.gettext() on the author's repository. The culprit was 3 _() calls in util.parsedate() multiplied by ~6000 obsmarkers originating from the parsing of obsmarkers. Changing the obsmarker code to parse the stored format of dates instead of going through a generic path eliminates these gettext() lookups and makes `hg log -r .` execute ~10% faster on the author's repo. The performance gain is proportional to the number of obsmarkers. The author attempted to patch util.parsedate() to avoid the gettext() lookups. However, that code is whacky and the author is jet lagged, so the approach was not attempted.
Fri, 29 Aug 2014 12:06:31 +0200 build: don't use -s flag for `which`
Kevin Bullock <kbullock@ringworld.org> [Fri, 29 Aug 2014 12:06:31 +0200] rev 22308
build: don't use -s flag for `which` `which -s` is a BSDism that doesn't exist on other versions of `which`. That means that even on Mac OS X, `make osx` breaks if you have another utils package installed (e.g. debianutils installed thru fink). Redirect output to /dev/null instead.
Fri, 29 Aug 2014 17:15:49 +0200 contrib: drop obsolete sample.hgrc
Matt Mackall <mpm@selenic.com> [Fri, 29 Aug 2014 17:15:49 +0200] rev 22307
contrib: drop obsolete sample.hgrc This was full of bad suggestions and is obsoleted by hg config --edit.
Fri, 29 Aug 2014 17:14:45 +0200 contrib: drop old convert-repo script
Matt Mackall <mpm@selenic.com> [Fri, 29 Aug 2014 17:14:45 +0200] rev 22306
contrib: drop old convert-repo script This has been obsolete since 2007.
Wed, 27 Aug 2014 18:35:34 +0200 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 27 Aug 2014 18:35:34 +0200] rev 22305
merge with stable
Sat, 23 Aug 2014 21:23:02 +0900 templater: enable alias predicates to be used in "revset()" function
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 23 Aug 2014 21:23:02 +0900] rev 22304
templater: enable alias predicates to be used in "revset()" function Before this patch, predicates defined in "[revsetalias]" can't be used in the query specified to template function "revset()", because: - "revset()" uses "localrepository.revs()" to get query result, but - "localrepository.revs()" passes "None" as "ui" to "revset.match()", then - "revset.match()" can't recognize any alias predicates To enable alias predicates to be used in "revset()" function, this patch invokes "revset.match()" directly with "repo.ui". This patch doesn't make "localrepository.revs()" pass "self.ui" to "revset.match()", because this may be intentional implementation to prevent alias predicates from shadowing built-in ones and breaking functions internally using "localrepository.revs()". Even if it isn't intentional one, the check for shadowing should be implemented (maybe on default branch) before fixing it for safety.
Wed, 27 Aug 2014 23:10:06 +0900 import: show the warning message for failure of merging stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 27 Aug 2014 23:10:06 +0900] rev 22303
import: show the warning message for failure of merging Before this patch, no message is shown for failure of merging at "hg import". In such case, merging patch is imported as a normal revision silently, and it may confuse users. For simplicity, this patch recommends just using "--exact", even though importing the merging patch itself is possible without it if: - the hash of the 1st parent in the patch is equal to one of the patch imported just before (or the parent of the working directory, for the 1st patch of the series), and - the hash of the 2nd parent in the patch is known in the local repository
Wed, 27 Aug 2014 15:30:09 +0200 graft: fix collision detection with origin revisions that are missing stable
Mads Kiilerich <madski@unity3d.com> [Wed, 27 Aug 2014 15:30:09 +0200] rev 22302
graft: fix collision detection with origin revisions that are missing When grafting something with a matching origin, it would normally be skipped: skipping already grafted revision 123 (23 also has origin 12) But after stripping a graft origin, graft could fail with a reference to the origin that no longer exists: abort: unknown revision '5c095ad7e90f871700f02dd1fa5012cb4498a2d4'! Instead, detect that the origin is unknown and skip it anyway, like: skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)
Sat, 23 Aug 2014 17:03:08 -0500 log: use correct phase info for parent field (issue4347) stable
Sean Farley <sean.michael.farley@gmail.com> [Sat, 23 Aug 2014 17:03:08 -0500] rev 22301
log: use correct phase info for parent field (issue4347) Previously, there was a copy / paste error with using the current changeset's phase information. We now look up the parent context explicitly. The line was too long so it is stored into a variable first.
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip