Commits

Show all
Author Commit Message Labels Comments Date
Patrick Mézard
mq: preserve --git flag when folding patches Without this, folding a git patch into a regular one downgrades the resulting patch to a regular patch.
Tags
1.4.2
Branches
stable
Patrick Mézard
mq: preserve --git flag when merging patches Without this, merging a patch queue without diff.git=1 downgrades all git patches to regular patches, losing data in the process.
Branches
stable
Patrick Mézard
mq: stop caching and sharing diff options Several mq commands mutate the shared options which causes hard to track bugs when multiple calls are combined.
Branches
stable
Patrick Mézard
copies: don't report copies with unrelated branch
Branches
stable
Wagner Bruna
i18n: update po files for 703db37d186b and 0ddbc0299742
Branches
stable
Martin Geisler
Merge with i18n-stable
Branches
stable
Martin Geisler
i18n-da: import strings from default branch
Branches
stable
Wagner Bruna
i18n-it: removed extraneous '\r' from message
Branches
stable
Wagner Bruna
i18n-pt_BR: synchronized with 37679dbf2ee3
Branches
stable
Wagner Bruna
run-tests.py: clears http_proxy for all tests
Branches
stable
kiilerix
test-bisect: test handling of invalid commands without relying on sh
Branches
stable
Johan Samyn
monoblue: fix title for branches page
Branches
stable
gco
patch: better handling of sequence of offset patch hunks (issue1941) The built-in patch implementation applied the hunks to the wrong lines of the file if the file in the repo has been modified to skew the patch line numbers and the file contains repetitive sequences of lines.
Branches
stable
Martin Geisler
win32text: do not mention hgext in warning
Branches
stable
Martin Geisler
setup.py: keep Python 2.3 compatibility Though we only support Python 2.4 or greater, we should keep setup.py compatible with earlier versions on the syntactic level. Otherwise people will simply get a SyntaxError when trying to install Mercurial with an old version of Python. With this change, the setup.py file can be imported with Python 2.3 and we then issue a friendly error message when we detect that Python is too old.
Branches
stable
Christian Ebert
extensions help: make disabling example analogous to enabling example The example for enabling an extension in the module search path is: foo = foo can only be disabled by: foo = ! and not by: hgext.foo = ! As the examples now omit "hgext." the example hgext.bar = ! is misleading.
Branches
stable
Steve Borho
setup: ignore 'not importing' warnings during version detection Python will issue an ImportWarning when seeing 'import locale' if there is a locale/ directory present without a __init__.py file. The warning is silent by default, but it somehow shows up anyway on Windows when setup.py executed hg. The warning causes runcmd to panic since it sees output on stderr. This patch ignores warnings on stderr about not importing a package.
Branches
stable
Christian Ebert
keyword: go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.
Branches
stable
Christian Ebert
keyword: do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.
Branches
stable
timeless
mq: qnew -f should reject merge working directories
Branches
stable
Martin Geisler
hgext: enable extensions without "hgext." prefix in help texts
Branches
stable
Sune Foldager
hook: fix bug (reuse of variable) introduced in 872d49dd577a For binary installs, the 'name' argument would be reused as a local variable, destroying its original value. The patch fixes that, and also avoids copying sys.path when it's not necessary.
Branches
stable
Brendan Cully
share: use defaultdest to compute unspecified destination This harmonizes with clone, and avoids creating a .hg in the current directory if the source ends with a /
Branches
stable
Greg Ward
glog: fix "incompatible option" error message. Options like 'only_branch' should be presented to the user as '--only-branch'.
Branches
stable
kiilerix
doc/Makefile: Fix rst2html detection Displaying the output from the failing call to "which" didn't prevent make from doing stupid things later. We now only search for "rst2html" and fallback to "rst2html.py". If neither name is found, make will eventually abort when we try to use $(RST2HTML).
Branches
stable
Matt Mackall
convert: make hg sink cleanup safer
Branches
stable
Nicolas Dumazet
graphlog: fix output when both a limit and a path are provided Limit was interpreted as absolute, from the topmost revision, without counting the number of revisions matching a given file. Which caused "glog -lN file" to show sometimes less than N csets if the file was not modified in all of the N previous csets. glog will now match the behavior of log.
Branches
stable
kiilerix
test-hook: Don't use extended regular expressions with grep Using egrep fixes failure on Solaris
Branches
stable
Matt Mackall
Merge -stable heads
Branches
stable
Patrick Mézard
convert/svn: better handling of hg recursive call failure
Branches
stable
  1. Prev
  2. Next