- Dec 08, 2011
-
-
kiilerix authored
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.
-
- Jan 15, 2012
-
-
Matt Zuba authored
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.
-
- Jan 16, 2012
-
-
Matt Mackall authored
-
- Jan 11, 2012
-
-
Jordi Gutiérrez Hermoso authored
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
-
- Jan 13, 2012
-
-
Pierre-Yves David authored
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.
-
Pierre-Yves David authored
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.
-
Pierre-Yves David authored
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.
-
Pierre-Yves David authored
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.
-
- Jan 12, 2012
-
-
Pierre-Yves David authored
This apply the redefined stronger semantic of secret. Secret changeset can still leak in various way. Those leak will need to be fixed individualy
-
- Jan 11, 2012
-
-
Pierre-Yves David authored
This is achieved by denying copy clone when any secret changeset exist.
-
- Jan 13, 2012
-
-
kiilerix authored
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.
-
kiilerix authored
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.
-
kiilerix authored
The unstable hashes did for other reasons not show up in the test output.
-
kiilerix authored
- it was left over from the refactoring in d01e28657429.
-
- Jan 11, 2012
-
-
kiilerix authored
-
kiilerix authored
It seems like something that missed the refactoring in 97b734fb9c6f.
-
kiilerix authored
Before the code optimistically relied on savedirty not being called a cancelled transaction. If it was called it could save incorrect data. Instead we now start using the invalidate method introduced in b169ba60eebe.
-
kiilerix authored
It wasn't obvious from the code how qsave mocked around with .hg/patches and .hg/patches.? and what was going on. This makes it more explicit so it will survive future refactorings.
-
kiilerix authored
-
kiilerix authored
-
- Jan 13, 2012
- Jan 11, 2012
-
-
kiilerix authored
-
- Jan 15, 2012
-
-
Christian Ebert authored
-
Christian Ebert authored
Analogous to 012b285cf643.
-
- Jan 11, 2012
-
-
Jim Hague authored
Inadvertently support is currently only for https. For some reason I thought xmlrpclib.SafeTransport did http and https, but it is https only. So create http and https XMLRPC transports that retain cookies. Decide which to use by inspecting the Bugzilla URL.
-
- Jan 13, 2012
-
-
Matt Mackall authored
-
Matt Mackall authored
-
- Jan 12, 2012
-
-
Andrei Polushin authored
-
- Jan 11, 2012
-
-
Andrei Polushin authored
* * * i18n-ru: editorial for 'diff'
-
Andrei Polushin authored
-
- Jan 10, 2012
-
-
Andrei Polushin authored
-
Andrei Polushin authored
See http://ru.wikipedia.org/wiki/МБ
-
- Jan 11, 2012
-
-
Olav Reinert authored
The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
-
Olav Reinert authored
The default width of field lists is changed from 12 to 14 to align minirst with the rst2html tool. Shrinking the width of the left column to fit the content is removed, to keep formatting simple and uniform.
-
Na'Tosha Bard authored
There is a bug in the merge process where, if a new largefile is introduced in a merge and the user does not have that largefile in his repo's local store nor in his system cache, the working copy will retain the old largefile. Upon the commit of the merge, the standin is re-written to contain the hash of the old largefile, and the lfdirstate retains a "Modified" status for the file. The end result is that the largefile can show up in the merge commit as "Modified", but the standin has no diff. This is wrong in two ways: 1) Such a "wedged" history with a nonsense change in a commit should not be possible 2) It effectively reverts a largefile to an old version when doing a merge This is caused by the fact that the updatelfiles() command always checks the current largefile's hash against the hash stored in the current node's standin. This is correct behavior in every case except for a merge. When merging, we must assume that the standin in the working copy contains the correct hash, because the original hg.merge() has already updated it for us. This patch fixes the issue by patching the repo object to carry a "_ismerging" attribute, that the updatelfiles() command checks for. When this attribute is found, it checks against the working copy's standin, rather than the standin in the current node.
-
Markus Zapke-Gründemann authored
-
- Jan 12, 2012
-
-
Matt Mackall authored
-