- Oct 23, 2013
-
-
Mads Kiilerich authored
-
- Oct 24, 2013
-
-
Mads Kiilerich authored
-
Mads Kiilerich authored
We used to get like: $ hg up -r 2 foo has been turned into a normal file keep as (l)argefile or use (n)ormal file? l getting changed largefiles 0 largefiles updated, 0 removed 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ cat foo cat: foo: No such file or directory [1] - which both asked the wrong question and did the wrong thing. Instead, skip this conflict resolution when the local conflicting file has been scheduled for removal and there thus is no conflict.
-
Mads Kiilerich authored
-
Mads Kiilerich authored
-
- Oct 23, 2013
-
-
Mads Kiilerich authored
-
- Oct 17, 2013
-
-
Mads Kiilerich authored
-
- Oct 23, 2013
-
-
Mads Kiilerich authored
-
- Oct 21, 2013
-
-
Mads Kiilerich authored
-
- Oct 23, 2013
-
-
Mads Kiilerich authored
Warnings should always end with \n. The warning message might contain or end with \n, so better show it with repr encoding.
-
- Oct 21, 2013
-
-
Pascal Quantin authored
-
Javi Merino authored
-
- Oct 22, 2013
-
-
Yuya Nishihara authored
Problem occurs if "hg cat -o" is invoked more than once in the same process. The output of "hg cat" will be appended because of modemap[fn] = 'ab'.
-
Takumi IINO authored
revertfiles are relative to the repository root. not paths relative to the cwd.
-
- Oct 21, 2013
-
-
Matt Mackall authored
-
Matt Mackall authored
-
- Oct 13, 2013
-
-
David Soria Parra authored
If paging is configured for a command all it's internal defined aliases will be paged as well. This will make attend=log cause 'hg history' to run the pager. However custom aliases will not be paged by default.
-
- Oct 20, 2013
-
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
- Oct 03, 2013
-
-
Katsunori FUJIWARA authored
This patch revises hint message from "for detail about" introduced by changeset b00ba31313c3 to "for details about", to unify it with the hint message introduced by proceeding patch.
-
Katsunori FUJIWARA authored
This patch adds more detailed explanation about "--force" to online help document of "hg push" to prevent novice users to execute "push --force" easily without understanding about problems of multiple branch heads in the repository.
-
Katsunori FUJIWARA authored
"use push -f to force" in the hint at abortion of "hg push" may cause novice users to execute "push -f" easily without understanding about problems of multiple branch heads in the repository. This patch hides description about "-f" in the hint, and leads into seeing "hg help push" for details about pushing new heads.
-
- Oct 04, 2013
-
-
Katsunori FUJIWARA authored
Before this patch, python modules of each extensions can't import another one in own extension by absolute name, because root modules of each extensions are loaded with "hgext_" prefix. For example, "import extroot.bar" in "extroot/foo.py" of "extroot" extension fails, even though "import bar" in it succeeds. Installing extensions into site-packages of python library path can avoid this problem, but this solution is not reasonable in some cases: using binary package of Mercurial on Windows, for example. This patch retries to import with "hgext_" prefix after ImportError, if the module in the extension may try to import another one in own extension. This patch doesn't change some "_import()"/"_origimport()" invocations below, because ordinary extensions shouldn't cause such invocations. - invocation of "_import()" when root module imports sub-module by absolute path without "fromlist" for example, "import a.b" in "a.__init__.py". extensions are loaded with "hgext_" prefix, and this causes execution of another (= fixed by this patch) code path. - invocation of "_origimport()" when "level != -1" with "fromlist" for example, importing after "from __future__ import absolute_import" (level == 0), or "from . import b" or "from .a import b" (0 < level), for portability between python versions and environments, extensions shouldn't cause "level != -1".
-
Katsunori FUJIWARA authored
Before this patch, demandimport of Mercurial may fail to load external libraries using "from __future__ import absolute_import": for example, importing "foo" in "bar.baz" module will load "bar.foo" if it exists, even though "absolute_import" is enabled in "bar.baz" module. So, extensions for Mercurial can't use such external libraries. This patch saves "level" of import request for on-demand module loading in the future: default value of level is -1, and level is 0 when "absolute_import" is enabled. "level" value is passed to built-in import function in "_demandmod._load()" and it should load target module correctly. This patch changes only one "_demandmod" construction case other than cases below: - construction in "_demandmod._load()" this code path should be used only in relative sub-module loading case - constructions other than patched one in"_demandimport()" these code paths shouldn't be used in "level != -1" case
-
Katsunori FUJIWARA authored
This patch adds "py3k" feature to check whether test runs with Python 3.x. This check is needed for portability of test code: for example, in the default, modules are imported relatively first with python 2.x, but imported absolutely with Python 3.x.
-
Katsunori FUJIWARA authored
This patch adds "absimport" feature to check whether "absolute_import" exists in __future__, which means supporting module loading by absolute name. This check is needed for portability of test code using "absolute_import", because Python earlier than 2.5 doesn't support it.
-
- Oct 02, 2013
-
-
Siddharth Agarwal authored
hg update . (or equivalents) are effectively no-ops in just about all circumstances. These sorts of updates can be especially common in a bookmark-oriented workflow. This saves us a status check and a manifest decompression, which means that on a repo with over 210,000 files, this brings hg update . down from 2.5 seconds to 0.15. There is one change in behavior: a file that was added, not committed, and then deleted but not removed used to be removed from the dirstate. With this patch it isn't. This is what causes the change in test-mq-qpush-exact.t. This seems like it's enough of an edge case to not be worth handling. The output of test-empty.t changes because those files are not yet created.
-
- Oct 17, 2013
-
-
Katsunori FUJIWARA authored
Before this patch, each feature setup functions for localrepository class should examine whether corresponding extension is enabled or not by themselves. This patch invokes only feature setup functions defined in module of enabled extensions, and it makes implementation of feature setup functions easier and simpler.
-
- Oct 02, 2013
-
-
Yuya Nishihara authored
readlock may raise IOError if the system does not support symlink.
-
- Oct 14, 2013
-
-
Pierre-Yves David authored
Now that the working directory parent is preserved, we can preserve the active bookmark too.
-
Pierre-Yves David authored
Prior to this changeset, rebase always left the working directory as a parent of the last rebased changeset. The is dubious when, before the rebase, the working directory was not a parent of the tip most rebased changeset. With this changeset, we move the working directory back to its original parent. If the original parent was rebased, we use it's successors. This is a step toward solving issue3813 (rebase loses active bookmark if it's not on a head)
-
Pierre-Yves David authored
In the way to solving issue3813 we'll preserve the working directory parent after the rebase. Multiple rebases test expect the working directory parent to be tip after rebase. We patches them before the actual change to prevent confusion.
-
- Oct 18, 2013
-
-
Simon Heimberg authored
This would triggered when the variable would be set wrong again.
-
Simon Heimberg authored
The variable LC_ALL did not work, use LANGUAGE instead. Before this patch, the original language C was generated (and tested) in every run.
-
Simon Heimberg authored
Fix syntax errors like wrong indentation and invalid quotation. All errors preventing to generate valid html documentation (by gendoc.py) are fixed.
-
- Oct 20, 2013
-
-
Matt Mackall authored
Having this at the default value caused some versions of msgfmt to give fatal errors.
-
- Oct 10, 2013
-
-
Mads Kiilerich authored
-
Mads Kiilerich authored
-
Mads Kiilerich authored
Before the hack would replace 'heads' with 'lheads' no matter where it occured in a batch command string. Instead we will use a regexp to more carefully only match the 'heads' commands.
-