Commits

Author Commit Message Labels Comments Date
Matt Mackall
merge with stable
Matt Mackall
context: add copies method with caching
Matt Mackall
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall
graft: remark on empty graft
Matt Mackall
filectx: make ancestor require actx When grafting or rebasing, we need to know the target ancestor.
Patrick Mézard
pure/base85: align exception type/msg on base85.c 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.
Branches
stable
Matt Mackall
parsers: fix refcount bug on corrupt index 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.
Branches
stable
Patrick Mézard
subrepo: do not traceback on .hgsubstate parsing errors 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.
Branches
stable
Patrick Mézard
subrepo: ignore blank lines in .hgsubstate (issue3424) Reported by Sebastian Krysmanski <infomail@lordb.de>
Branches
stable
hlian
largefiles: in putlfile, ensure tempfile's directory exists prior to creation 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.
Branches
stable
Bryan O'Sullivan
bisect: save current state before running a command This prevents an external command being run during a bisect from querying stale data.
Branches
stable
Martin Geisler
merge with stable
Yuya Nishihara
commands: parse ui.strict config item as bool
Branches
stable
Martin Geisler
check-code: catch unnecessary s.strip().split() calls
Martin Geisler
tags: line.rstrip().split() can be replaced with line.split() The line looks like "123 <node> <node>" and does not start with whitespace: it was therefore not significant that rstrip was used instead of strip. Furthermore, the first part is fed to int, which will itself strip away whitespace before converting the string to an integer.
Martin Geisler
phases: line.strip().split() == line.split()
Martin Geisler
merge with stable
Patrick Mézard
largefiles: fix "hg status dir" missing regular files (issue3421) 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.
Branches
stable
Adrian Buehlmann
help/config: remove outdated false claim about pywin32 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.
Branches
stable
Martin Geisler
merge with stable
Kevin Bullock
revert: don't re-create changeset context
Steven Stallion
factotum: add man reference to help output
Branches
stable
Martin Geisler
test-largefiles: better formatting of comments
Martin Geisler
test-largefiles: sort output to ensure test stability
Martin Geisler
merge with stable
Matt Harbison
largefiles: make archive -S store largefiles instead of standins This is essentially a copy of largefile's override of archive() in the archival class, adapted for overriding hgsubrepo's archive(). That means decoding isn't taken into consideration, nor is .hg_archival.txt generated (the same goes for regular subrepos). Unlike subrepos, but consistent with largefile's handling of the top repo, ui.progress() is *not* called. This should probably be refactored…
Martin Geisler
paper, monoblue: link correctly to lines in annotate view The links were to "foo#123" instead of "foo#l123". The gitweb and spartan templates were already producing the correct links.
Branches
stable
ToadJamb
branches: quiet option observes other parameters
Branches
fix-quiet-output-for-hg-branches
Matt Mackall
merge with stable
Matt Mackall
Added signature for changeset 5983de86462c
Branches
stable
  1. Prev
  2. Next