- Feb 09, 2014
-
-
Mads Kiilerich authored
Merge could overwrite untracked files and cause data loss. Instead we now handle the 'local side removed file and has untracked file instead' case as the 'other side added file that local has untracked' case: FILE: untracked file exists abort: untracked files in working directory differ from files in requested revision It could perhaps make sense to create .orig files when overwriting, either instead of aborting or when overwriting anyway because of force ... but for now we stay consistent with similar cases.
-
- Feb 05, 2014
-
-
Matt Mackall authored
A correct patch for this has existed in Python's BTS for 3 years (http://bugs.python.org/issue9291), so waiting for it to be fixed upstream is probably not a viable strategy. Instead, we add this horrible hack to workaround the issue in existing copies of Python 2.4-2.7.
-
- Feb 03, 2014
-
-
Siddharth Agarwal authored
hg.islocal doesn't work for paths pointing to non-repos, such as patch files.
-
Siddharth Agarwal authored
Previously we used hg.islocal, which doesn't work for paths pointing to non-repos, such as patch files.
-
Siddharth Agarwal authored
This returns True if the URL represents a path that can be opened locally, without needing to go through the entire URL open mechanism.
-
- Feb 01, 2014
-
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
- Jan 31, 2014
-
-
Wagner Bruna authored
-
Katsunori FUJIWARA authored
Before this patch, "ja.po" translation causes test-gendoc.t failure with old docutils: It fails with docutils 0.7, but not with 0.11.
-
- Jan 30, 2014
-
-
Simon Heimberg authored
I mainly did the simple cases, like removing ".. note::", changing single quotes to double quotes and adapting underlining. Unhelpful msgstr in fuzzy entries are removed. (They were suggestions by the program msgmerge.)
-
- Jan 22, 2014
-
-
Simon Heimberg authored
Do this in a separate patch for easier reviewing of the translation patch.
-
Simon Heimberg authored
Strip the locations by running msgcat [1] as the wiki [2] tells to do. Do this in a separate patch for getting a smaller one when updating from hg.pot. [1] msgcat --no-location -o de.po de.po [2] mercurial.selenic.com/wiki/TranslatingMercurial#Updating_a_Translation
-
- Jan 31, 2014
-
-
Pierre-Yves David authored
Before this patch rebase crashed badly when it happend. (not abort, crash). Fix courtesy of Matt Mackall.
-
Pierre-Yves David authored
Record was changing the current directory to `repo.root` in order to be able to feed `command.commit` file name relative to this `repo.root`. This is a bit overkill and prevent an incoming fix to rebase. This would also break multi-threaded usage. Instead we just feed `command.commit` with absolute path name. works as well as before but without chdir.
-
- Jan 29, 2014
-
-
Angel Ezquerra authored
The existing description was a bit hard to understand.
-
- Jan 30, 2014
-
-
Pierre-Yves David authored
Before this changeset local clone of a repo with hidden changeset would include then in the clone (why not) and turn them public (plain wrong). This happened because the copy clone publish by dropping the phaseroot file entirely making everything in the repo public (and therefore immune to obsolescence marker). This changeset takes the simplest fix, we deny the copy clone in the case of hidden changeset falling back to pull clone that will exclude them from the clone and therefore not turning them public. A smarter version of copy clone could be done, but I prefer to go for the simplest solution first.
-
- Jan 28, 2014
-
-
lstewart authored
The fix for issue2653 broke the ability to map the default branch of a source repository to a non-default named branch in the destination repository. Leave the default behaviour as is, but allow the branch name "None" to be used to map to a non-default named branch in the destination repository.
-
- Jan 27, 2014
-
-
Julien Cristau authored
The command server would otherwise ignore that option, since the repo object is only created once.
-
- Jan 30, 2014
-
-
Katsunori FUJIWARA authored
This fixes mistake of documentation about matching against directories in "pattern.txt" introduced by 50db996bccaf. ".hgignore" treats specified "glob:" pattern as same as one specified for "-X" option: it can match against directories, too. For reference, extra regexp string appended to specified pattern for each types are listed below: see also "match.match()" and "match._regex()" for detail. ============= ========== =============== type cmdline -I/-X ============= ========== =============== glob/relglob '$' '(?:/|$)' path/relpath '(?:/|$)' '(?:/|$)' re/relre (none) (none) ============= ========== =============== Appending '$' means that the specified pattern should match against only files.
-
- Jan 29, 2014
-
-
Katsunori FUJIWARA authored
Before this patch, shell alias may be executed by abbreviated command name unexpectedly, even if abbreviated command name matches also against the command provided by extension. For example, "rebate" shell alias is executed by "hg reba", even if rebase extension (= "rebase" command) is enabled. In this case, "hg reba" should be aborted because of command name ambiguity. This patch makes "_checkshellalias()" invoke "cmdutil.findcmd()" always with "strict=True" (default value). If abbreviated command name matches against only one shell alias even after loading extensions, such shell alias will be executed via "_parse()". This patch doesn't remove "_checkshellalias()" invocation itself, because it may prevent shell alias from loading extensions uselessly.
-
- Jan 30, 2014
-
-
Matt Mackall authored
-
Katsunori FUJIWARA authored
-
- Jan 29, 2014
-
-
Katsunori FUJIWARA authored
-
Katsunori FUJIWARA authored
-
- Jan 22, 2014
-
-
Simon Heimberg authored
When generating documentation, indentation must match for getting the same view for translated messages. Often an output is generated anyway, but it can look different. When a syntactically wrong indentation change is done, runrst will fail (this is detected by test-gendoc.t). Fix the simple places. When translation knowledge is necessary, the entry is marked as fuzzy (and therefore skipped when generating translations). A translator can fix it later.
-
Simon Heimberg authored
A test for this is in preparation.
-
Simon Heimberg authored
.. note:: is rst syntax which must not be translated. Fix this in the translations. This is not the first time this happens, so there should be a note for the translator. A later patch will change the generation of the po files to write this automatically. A test in i18n/check-translation.py could help as well.
-
- Jan 27, 2014
-
-
Leonardo Bueno Postacchini authored
-
- Nov 24, 2013
-
-
Angel Ezquerra authored
When a subrepo revision was hidden it was considered missing and mercurial was unable to update to the corresponding parent revision. Instead warn the user of the problem and let it choose what to do (the default is to udpate anyway).
-
Angel Ezquerra authored
This revision has no behaviour change. It simply removes an unnecessary else that follows an if / return block. The change looks big because a big chunk of code has been unindented one level.
-
Angel Ezquerra authored
If a subrepo revision is hidden (because it was amended, for example) it does not make sense to try to "get" it from the remote subrepository. Note that in order to avoid making the change look bigger than it is, this adds an unnecessary else clause. This will be removed on a follow up patch.
-
- Jan 23, 2014
-
-
David Soria Parra authored
On Mac OS gcc-llvm throws an -Wtautological-compare warning because flen is defined as an unsigned integer, therefore flen < 0 is always true.
-
Steve Borho authored
-
- Jan 28, 2013
-
-
Pierre-Yves David authored
Now that discovery is working on unfiltered changeset, I had a good occasion to look at that bug again. This let me realise that a trivial node vs rev comparision was the cause of this two years old bugs… Happy second birthday phases!
-
- Jan 23, 2014
-
-
Simon Heimberg authored
-
Simon Heimberg authored
Running `hg log --style compact` (or any other style) raised a traceback when no template directory was there. Now there is a message: Abort: style 'compact' not found (available styles: no templates found, try `hg debuginstall` for more info) There is no test because this would require to rename the template directory. But this would influence other tests running in parallel. And when the test would be aborted the wrong named directory would remain, especially a problem when running with -l.
-
Matt Mackall authored
-
- Jan 21, 2014
-
-
Matt Mackall authored
-
Matt Mackall authored
-