- May 12, 2012
-
-
Yuya Nishihara authored
Since 2b1ec74c961f, if a chunk starts with "@@ -0,1", oldstart turns into a negative value. Because diffhelpers.testhunk() doesn't expect negative bstart, it bypasses "alen > blen - bstart" condition and segfaults at "PyList_GET_ITEM(b, i + bstart)".
-
Steven Stallion authored
-
- May 08, 2012
-
-
Bryan O'Sullivan authored
Previously, we would not use more than half of a SHA-1 hash when constructing and searching the tree.
-
- May 09, 2012
-
-
Patrick Mézard authored
-
- May 10, 2012
-
-
Jesse Glick authored
-
- May 11, 2012
-
-
Na'Tosha Bard authored
-
Levi Bard authored
-
Na'Tosha Bard authored
-
Patrick Mézard authored
-
Patrick Mézard authored
qpush help says the following about --force: 1- When -f/--force is applied, all local changes in patched files will be lost. 2- Apply on top of local changes In practice, qpush --force will attempt to apply the patch on top of local changes, and on success will merge them in the pushed patch. On failure, patched files will contain a mix of local changes (where the patch could not apply) and a mix of patch changes (were it applied). So, local changes are less lost than entangled with a mass of other changes. This patch makes qpush --force backup all locally modified files touched by the next patch being applied. When multiple patches are being pushed, this logic is repeated for each patch. Note that modified but successfully patched files are preserved as well.
-
Patrick Mézard authored
-
David Soria Parra authored
With the pager running as a child process, exiting the pager doesn't result in a broken pipe message. To distinguish the exit broken pipe code from a mercurial abort we register the default action for SIGPIPE. This results in a 141 exit code instead of a 255. On windows SIGPIPE doesn't exists and a ValueError will be thrown.
-
Brodie Rao authored
This changes how the pager extension invokes the pager. Prior to this change, the extension would fork Hg and exec the pager in the parent process. This loses Hg exit code, and it doesn't work on Windows. Now the pager is invoked using the subprocess library, and an atexit handler is registered that makes Hg wait for the pager to exit before it exits itself. Note that if you exit the pager before Hg is done running, you'll get an exit code of 255, which is caused by Python blowing up due to a broken pipe. If you set pager.quiet=True, you'll get the OS-level return code of 141.
-
Idan Kamara authored
-
Bryan O'Sullivan authored
-
Bryan O'Sullivan authored
This ensures that an out-of-process hook can see an incoming changegroup.
-
- May 08, 2012
-
-
Nikolaj Sjujskij authored
Since docutils 0.9, `roman` module has been moved from module directory root (i.e. `site-packages/roman.py`) to `docutils.utils` module. Therefore `import roman` statement should be wrapped in `try: ... except ImportError: ...` block to handle importing correctly.
-
- May 05, 2012
-
-
Patrick Mézard authored
Commands working without a repository, like "init", are listed in commands.norepo. Commands optionally using a repository, like "showconfig", are listed in commands.optionalrepo. Command aliases were inheriting the former but not the latter.
-
- May 06, 2012
- May 08, 2012
-
-
Adrian Buehlmann authored
As detailed on http://docs.python.org/extending/newtypes.html (quote): "In this case, we can just use the default implementation provided by the API function PyType_GenericNew(). We’d like to just assign this to the tp_new slot, but we can’t, for portability sake. On some platforms or compilers, we can’t statically initialize a structure member with a function defined in another C module, so, instead, we’ll assign the tp_new slot in the module initialization function just before calling PyType_Ready()." Fixes "gcc (GCC) 3.4.5 (mingw-vista special r3)" complaining with: mercurial/parsers.c:1096: error: initializer element is not constant mercurial/parsers.c:1096: error: (near initialization for `indexType.tp_new')
-
- May 07, 2012
-
-
Patrick Mézard authored
brendan mentioned on IRC that b64decode raises a TypeError too, but while the previous exception type may be better in general, it is much easier to make it behave like the related C code and changes nothing for mercurial itself.
-
Matt Mackall authored
When we encounter a corrupt index, we "fail" the init but our destructor still gets called. On some systems, this was causing us to attempt to decref a dangling to self->data.
-
- May 04, 2012
-
-
Patrick Mézard authored
Note that aborting in subrepo.state() prevents "repairing" commands like revert to be issued. The user will have to edit the .hgsubstate manually (but he probably had already otherwise this would not be failing). The same behaviour already happens with invalid .hgsub entries.
-
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.
-