Wed, 18 Jan 2012 14:19:43 +0100 largefiles: check if largefile could be found when archiving (issue3193)
Na'Tosha Bard <natosha@unity3d.com> [Wed, 18 Jan 2012 14:19:43 +0100] rev 15914
largefiles: check if largefile could be found when archiving (issue3193)
Wed, 18 Jan 2012 13:41:03 +0100 largefiles: refactor lfutil.findfiles to be more logical
Na'Tosha Bard <natosha@unity3d.com> [Wed, 18 Jan 2012 13:41:03 +0100] rev 15913
largefiles: refactor lfutil.findfiles to be more logical
Tue, 17 Jan 2012 19:10:59 -0500 forget: fix subrepo recursion for explicit path handling
David M. Carr <david@carrclan.us> [Tue, 17 Jan 2012 19:10:59 -0500] rev 15912
forget: fix subrepo recursion for explicit path handling When support for handling explicit paths in subrepos was added to the forget command (95174c381525), subrepo recursion wasn't taken into account. This change fixes that by pulling the majority of the logic of commands.forget into cmdutil.forget, which can then be called from both there and subrepo.forget.
Tue, 17 Jan 2012 19:10:58 -0500 add: fix subrepo recursion for explicit path handling
David M. Carr <david@carrclan.us> [Tue, 17 Jan 2012 19:10:58 -0500] rev 15911
add: fix subrepo recursion for explicit path handling When support for handling explicit paths in subrepos was added to the add command (9e99d2bbb1b1), subrepo recursion wasn't taken into account. This change adds an explicitonly argument to cmdutil.add to allow controlling which levels of recursion should include only explicit paths versus all matched paths.
Tue, 17 Jan 2012 19:10:54 -0500 tests: add subrepo recursion tests for add/forget with explicit paths
David M. Carr <david@carrclan.us> [Tue, 17 Jan 2012 19:10:54 -0500] rev 15910
tests: add subrepo recursion tests for add/forget with explicit paths When support for handling add/forget of explicit paths within subrepos was added (9e99d2bbb1b1/95174c381525), nested subrepos weren't handled properly. This change adds test coverage to expose the broken behavior, which will be fixed in later patches.
Wed, 18 Jan 2012 15:07:15 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 18 Jan 2012 15:07:15 -0600] rev 15909
merge with stable
Wed, 18 Jan 2012 14:56:52 -0600 bookmarks: backout locking change in 12dea4d998ec
Matt Mackall <mpm@selenic.com> [Wed, 18 Jan 2012 14:56:52 -0600] rev 15908
bookmarks: backout locking change in 12dea4d998ec Repo lock only applies to data in .hg/store/
Tue, 17 Jan 2012 20:23:23 +0100 changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 17 Jan 2012 20:23:23 +0100] rev 15907
changeset_printer: display changeset phase on debug level Backward compatibility make it hard to display it on higher level
Tue, 17 Jan 2012 20:43:41 +0100 phase: report phase movement
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 17 Jan 2012 20:43:41 +0100] rev 15906
phase: report phase movement When used in "set" mode, the phase command now display the number of changeset who changed phase.
Mon, 16 Jan 2012 19:45:35 +0100 largefiles: correctly handle newly added largefile on other side of merge
Na'Tosha Bard <natosha@unity3d.com> [Mon, 16 Jan 2012 19:45:35 +0100] rev 15905
largefiles: correctly handle newly added largefile on other side of merge
Tue, 17 Jan 2012 02:55:55 +0100 rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com> [Tue, 17 Jan 2012 02:55:55 +0100] rev 15904
rebase: write series file without removed mq patches Rebase will remove empty changesets and will also completely remove the mq patch file for rebased empty patches. Starting with b28004513977 (1.9) it would preserve guards by writing the old series file back. That would however also reintroduce removed patch files in the series file and the inconsistency would make qpop + qpush fail. This patch backs out most of b28004513977 and makes sure guards are preserved without reintroducing removed patches.
Tue, 17 Jan 2012 17:48:59 -0600 revset: roots needs to be computed on full set
Matt Mackall <mpm@selenic.com> [Tue, 17 Jan 2012 17:48:59 -0600] rev 15903
revset: roots needs to be computed on full set
Wed, 18 Jan 2012 16:46:15 +0100 phases: use nodemap to check for missing nodes
Sune Foldager <cryo@cyanite.org> [Wed, 18 Jan 2012 16:46:15 +0100] rev 15902
phases: use nodemap to check for missing nodes
Wed, 18 Jan 2012 14:50:17 +0100 repair: move phases code after invalidation code
Henrik Stuart <henrik.stuart@edlund.dk> [Wed, 18 Jan 2012 14:50:17 +0100] rev 15901
repair: move phases code after invalidation code
Tue, 17 Jan 2012 11:29:32 +0100 largefiles: remove empty directories upon update (issue3202) stable
Patrick Mezard <pmezard@gmail.com> [Tue, 17 Jan 2012 11:29:32 +0100] rev 15900
largefiles: remove empty directories upon update (issue3202)
Mon, 16 Jan 2012 01:21:30 -0600 revset: optimize roots and children
Matt Mackall <mpm@selenic.com> [Mon, 16 Jan 2012 01:21:30 -0600] rev 15899
revset: optimize roots and children
Mon, 16 Jan 2012 01:21:22 -0600 revset: optimize building large lists in formatrevspec
Matt Mackall <mpm@selenic.com> [Mon, 16 Jan 2012 01:21:22 -0600] rev 15898
revset: optimize building large lists in formatrevspec The large or-expressions we used to build required a substantial amount of subset filtering in orset() which was inefficient. Instead we build a single string which we process in one go with a special internal predicate.
Thu, 08 Dec 2011 16:28:18 +0100 hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com> [Thu, 08 Dec 2011 16:28:18 +0100] rev 15897
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND The Mercurial ssh protocol is defined as if it was ssh-ing to a shell account on an ordinary ssh server, and where hg was available in $PATH and it executed the command "hg -R REPOPATH serve --stdio". The Mercurial ssh client can in most cases just pass REPOPATH to the shell, but if it contains unsafe characters the client will have to quote it so the shell will pass the right -R value to hg. Correct quoting of repopaths was introduced in d8fa35c28335 and tweaked in 86fc364ca5f8. hg-ssh doesn't create the command via a shell and used a simple parser instead. It worked fine for simple paths without any quoting, but if any kind of quoting was used it failed to parse the command like the shell would do it. This makes hg-ssh behave more like a normal shell with hg in the path would do.
Sun, 15 Jan 2012 13:50:12 -0700 hooks: prioritize run order of hooks
Matt Zuba <matt.zuba@goodwillaz.org> [Sun, 15 Jan 2012 13:50:12 -0700] rev 15896
hooks: prioritize run order of hooks As of Mercurial 1.3, hooks are sorted in the order they are read into Mercurial. There are many instances when someone may want the hooks sorted in a specific order; this patch allows prioritizing hooks, while maintaining the existing enumeration for hooks without a priority.
Sun, 15 Jan 2012 18:00:01 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 15 Jan 2012 18:00:01 -0600] rev 15895
merge with stable
Wed, 11 Jan 2012 15:53:42 -0500 merge: report all files in _checkunknown
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Wed, 11 Jan 2012 15:53:42 -0500] rev 15894
merge: report all files in _checkunknown When doing hg up, if there is a file conflict with untracked files, currently only the first such conflict is reported. With this patch, all of them are listed. With this patch error message is now reported as a: untracked file differs b: untracked file differs abort: untracked files in working directory conflict with files in requested revision instead of abort: untracked file in working directory differs from file in requested revision: 'a' This is a follow up to an old attempt to do this here: http://selenic.com/pipermail/mercurial-devel/2011-August/033625.html
Fri, 13 Jan 2012 22:16:01 +0100 discovery: fix prepush documentation
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 13 Jan 2012 22:16:01 +0100] rev 15893
discovery: fix prepush documentation The prepush documentation claim that when we refuse to push, the second element of the returng tuple is an "outgoing" integer. value should be 0 when no outgoing changeset and 1 otherwise. In pratice if there are no outgoing changeset, "outgoing" value is alway 1 and util.Abort is raised on other error. the stable branch also include this error so it wasn't introduced by a recent refactoring.
Fri, 13 Jan 2012 02:04:16 +0100 phases: simplify phase exchange and movement over pushkey
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 13 Jan 2012 02:04:16 +0100] rev 15892
phases: simplify phase exchange and movement over pushkey The code now only exchange draft root and only care about movement related to public//draft boundary. There is multiple reason to simplify this code: * Secret are never discovered anymore * We decided to not support more the three existing phase Removing phase index from pushkey (if ever decided) will be made in another commit.
Fri, 13 Jan 2012 01:42:47 +0100 phases: move phase according what was pushed not only what was added added
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 13 Jan 2012 01:42:47 +0100] rev 15891
phases: move phase according what was pushed not only what was added added This fix the lack phase movement when a locally secret changeset without added children was pushed to the repository. In such case, this changeset would be present in the bundle source, but not in the ``added`` variable.
Fri, 13 Jan 2012 01:29:03 +0100 revlog: make addgroup returns a list of node contained in the added source
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 13 Jan 2012 01:29:03 +0100] rev 15890
revlog: make addgroup returns a list of node contained in the added source This list will contains any node see in the source, not only the added one. This is intended to allow phase to be move according what was pushed by client not only what was added.
Thu, 12 Jan 2012 01:25:57 +0100 phases: make secret changeset undiscoverable in all case
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 12 Jan 2012 01:25:57 +0100] rev 15889
phases: make secret changeset undiscoverable in all case This apply the redefined stronger semantic of secret. Secret changeset can still leak in various way. Those leak will need to be fixed individualy
Wed, 11 Jan 2012 17:26:27 +0100 phases: exclude secret when doing a local clone
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jan 2012 17:26:27 +0100] rev 15888
phases: exclude secret when doing a local clone This is achieved by denying copy clone when any secret changeset exist.
Fri, 13 Jan 2012 02:30:43 +0100 bookmarks: primarily use repo lock, not wlock
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 02:30:43 +0100] rev 15887
bookmarks: primarily use repo lock, not wlock Bookmarks are repository data, not working directory data. Only the current bookmark is working directory data. Some lock shuffling is required to avoid lockout between the initial mock lock and locking of the localrepo instance that is created after copying.
Fri, 13 Jan 2012 02:29:38 +0100 localrepo: update branchcache in a more reliable way
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 02:29:38 +0100] rev 15886
localrepo: update branchcache in a more reliable way test-mq-cache.t did apparently look at stale cache content. Testing with different locking mechanism happened to update the cache more frequently and thus caused a test failure.
Fri, 13 Jan 2012 01:19:08 +0100 tests: make qnew in test-mq-caches.t stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 01:19:08 +0100] rev 15885
tests: make qnew in test-mq-caches.t stable The unstable hashes did for other reasons not show up in the test output.
Fri, 13 Jan 2012 01:19:08 +0100 localrepo: remove spurious updatebranchcache return value
Mads Kiilerich <mads@kiilerich.com> [Fri, 13 Jan 2012 01:19:08 +0100] rev 15884
localrepo: remove spurious updatebranchcache return value - it was left over from the refactoring in d01e28657429.
Wed, 11 Jan 2012 02:29:56 +0100 mq: only save dirty files once when savedirty is called multiple times
Mads Kiilerich <mads@kiilerich.com> [Wed, 11 Jan 2012 02:29:56 +0100] rev 15883
mq: only save dirty files once when savedirty is called multiple times
(0) -10000 -3000 -1000 -300 -100 -50 -32 +32 +50 +100 +300 +1000 +3000 +10000 +30000 tip