- May 04, 2012
-
-
Patrick Mézard authored
Reported by Sebastian Krysmanski <infomail@lordb.de>
-
hlian authored
Let R be a repo served by an hg daemon on a machine with an empty largefiles cache. Pushing a largefiles repo to R will result in a no-such-file-or-directory OSError because putlfile will attempt to create a temporary file in R/.hg/largefiles, which does not yet exist. This patch also adds a regression test for this scenario.
-
- May 03, 2012
-
-
Bryan O'Sullivan authored
This prevents an external command being run during a bisect from querying stale data.
-
- May 06, 2012
-
-
Yuya Nishihara authored
-
Patrick Mézard authored
largefiles status implementation attemps to rewrite the input match objects to match the "standins" as well as the regular files. When fixing the directories listed in match.files(), if there was related standin entry, it was kept and the original path discarded. But directories can appear both as regular and standin entries.
-
Adrian Buehlmann authored
Since version 1.8 (released on 2011-03-01), Mercurial doesn't use pywin32 any more. The old fallback mechanism to use C:\Mercurial\Mercurial.ini if pywin32 is not installed was removed in 244772f67ac1.
-
- May 04, 2012
-
-
Steven Stallion authored
-
Martin Geisler authored
The links were to "foo#123" instead of "foo#l123". The gitweb and spartan templates were already producing the correct links.
-
- May 03, 2012
-
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
This fixes a regression from 1.7
-
- May 02, 2012
-
-
Bryan O'Sullivan authored
This is most easily verified using valgrind on a long-running process, as the leak has no visible consequences during normal one-shot command usage. In one window: valgrind --leak-check=full --suppressions=valgrind-python.supp \ python ./hg serve In another: for ((i=0;i<100;i++)); do curl -s http://localhost:8000/file/tip/README >/dev/null done valgrind should report no leaks.
-
- May 03, 2012
-
-
Na'Tosha Bard authored
This bug was caused by some old code that should have been removed long ago.
-
- May 02, 2012
-
-
Paul Boddie authored
The collapse configuration setting for hgweb was recently introduced, but the help text was unfortunately omitted from the patch concerned. This patch provides a suitable help text.
-
- May 01, 2012
-
-
A. S. Budden authored
There is currently no clear link between the help for log and the help on templates. The log option is --template but the template help is 'help templating' or 'help templates'. This patch makes 'hg help template' work and also adds a note into the log help explaining where to find more info.
-
Matt Mackall authored
-
Matt Mackall authored
-
Katsunori FUJIWARA authored
-
Wagner Bruna authored
-
- Apr 30, 2012
-
-
Matt Mackall authored
-
- Apr 29, 2012
-
-
Katsunori FUJIWARA authored
-
Michael Tjørnemark authored
-
Steven Stallion authored
This patch deals with an unnecessary backslash in 9diff and improper quoting in the contrib mkfile.
-
- Apr 30, 2012
-
-
Patrick Mézard authored
-
Patrick Mézard authored
The initial version was to take the "Revision" field from svn info. It works but produces false positive when parent paths are being moved or unrelated changes are being committed, causing it to change while the svn checkout itself remains the same. To avoid spurious commit, we took "Revision" and "Last Changed Rev" for general comparison and kept the latter to answer "what is your revision?" question. This is better but fails when the subrepo path exists at "Revision" but not at "Last Changed Rev". This patch adds a check for this, and returns "Revision" if the path does not exist. We try to avoid doing this as much as possible at it implies an extra, *remote* call.
-
Patrick Mézard authored
Messing with the dirstate before the intermediate commit seems error prone. Instead, commit and recompute the copies with copies.pathcopies(), then use that with commitctx(). Since copies.pathcopies() does not support file replacement very well, the whole .renamed() condition in samefile() is removed and the "file replacement caused by differing copy source" effect is discarded. Test shamelessly stolen from Idan Kamara <idankk86@gmail.com>
-
Patrick Mézard authored
The weirdness is --amend let you replace one file with another with same data and flags if the new file copy record differ from the one in the parent revision. In theory, there is no problem with this kind of thing, subversion supports it, but here we see log and status disagree. The reason is log reads the copy record from the filelog, while status calls copies.pathcopies() which eventually invokes some expensiveness argument to discard this case (copies.py, _forwardcopies(), line 132). Since the next patch will side with pathcopies(), I prefer to call this behaviour a bug.
-
- Apr 29, 2012
-
-
Patrick Mézard authored
The fix introduced in eab9119c5dee was only partially successful. It is correct to turn dirstate 'm' merge records into normal/dirty ones but copy records are lost in the process. To adjust them as well, we need to look in the first parent manifest to know which files were added and preserve only related records. But the dirstate does not have access to changesets, the logic has to moved at another level, in localrepo.
-
Patrick Mézard authored
- --source and revset - --base and revset - --rev and revset - --rev and --source combination - --rev and --base combination
-
- Apr 30, 2012
-
-
Martin Geisler authored
Brifly explain why rewriting subrepository paths can be necessary. Explain that relative subrepository paths are made absolute before rewrite rules are applied.
-
Martin Geisler authored
I sometimes look at a piece of software and if the man page says "Copyright 2004", then I'm inclined to think that the project is stale or that the authors are lazy. Neither is good publicity for us :-)
-
Martin Geisler authored
-
- Apr 28, 2012
-
-
Matt Mackall authored
-
Wagner Bruna authored
-
Wagner Bruna authored
-
Katsunori FUJIWARA authored
-
Patrick Mézard authored
The original issue was something like: $ hg init repo $ cd repo $ mkdir D $ echo a > D/a $ hg ci -Am adda adding D/a $ mv D temp $ mv temp d $ echo b > d/b $ hg add d/b adding D/b $ hg ci -m addb $ hg mv d/b d/c moving D/b to d/c $ hg st A d/c R D/b Here we expected: A D/c R D/b the logic being we try to preserve case of path components already known in the dirstate. This is fixed by the current patch. Note the following stories are not still not supported: Changing directory case $ hg mv D d moving D/a to D/D/a moving D/b to D/D/b $ hg st A D/D/a A D/D/b R D/a R D/b or: $ hg mv D/* d D/a: not overwriting - file exists D/b: not overwriting - file exists And if they were, there are probably similar issues with diffing/patching.
-
kiilerix authored
Don't depend on $environmentvariableexpansion and 'quote' handling in system()
-
- Apr 27, 2012