Commit Graph

9929 Commits

Author SHA1 Message Date
Patrick Mezard
f77706b8eb Add test for relink extension 2010-01-08 22:30:07 +01:00
Mads Kiilerich
3b9db3f9d9 Update test and man page for multiple matching encode/decode filters 2010-01-05 03:20:45 +01:00
Greg Ward
bfaf5baac2 commands: fix help string for pull -u and unbundle -u.
They update to new branch head, not new tip -- same as 'hg update'.
2010-01-05 15:07:38 -05:00
Pascal Quantin
9e8542ebfd Update copyright year to 2010 2010-01-04 23:45:45 +01:00
Martin Geisler
cc5314a970 commands: update copyright year to 2010 2010-01-04 01:09:23 +01:00
Patrick Mezard
c6da65973e patch: explicitely close input patch files when leaving
If applydiff() raises an exception, the opened patch file is kept alive in the
exception context. If it is a temporary file (for instance supplied by import
command with stdin input), Windows cannot clean it up.
2010-01-03 19:47:07 +01:00
Patrick Mezard
9c67b65ee1 hgweb: improve IIS PATH_INFO fix 0aba3cc1ee81 (issue1580)
Copy PHP IIS detection.
2010-01-03 17:26:39 +01:00
Matt Mackall
d70bec539b Added signature for changeset fda41d7227d5 2010-01-01 17:58:35 -06:00
Patrick Mezard
e9130008f6 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.
2010-01-01 19:53:05 +01:00
Patrick Mezard
a9ef9386bc 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.
2010-01-01 19:53:05 +01:00
Patrick Mezard
f07dfd4d40 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.
2010-01-01 19:53:05 +01:00
Patrick Mezard
62d346efa4 copies: don't report copies with unrelated branch 2010-01-01 13:58:30 +01:00
Wagner Bruna
7c27b0d8e0 i18n: update po files for b225423f0599 and 4d3e9efff438 2009-12-30 20:39:59 -02:00
Martin Geisler
3d16c09ae7 Merge with i18n-stable 2009-12-30 20:36:48 +01:00
Martin Geisler
00cbba8f99 i18n-da: import strings from default branch 2009-12-30 03:26:49 +01:00
Wagner Bruna
1f5640533e run-tests.py: clears http_proxy for all tests 2009-12-29 19:02:26 -02:00
Mads Kiilerich
daf0018117 test-bisect: test handling of invalid commands without relying on sh 2009-12-29 01:03:10 +01:00
Wagner Bruna
47ad42f2f3 i18n-it: removed extraneous '\r' from message 2009-12-28 15:01:10 -02:00
Wagner Bruna
eef8d993d0 i18n-pt_BR: synchronized with 0b3b7e793bb0 2009-12-28 14:59:14 -02:00
Johan Samyn
80ecfaa26f monoblue: fix title for branches page 2009-12-24 11:40:39 +01:00
Sune Foldager
afbe5c8543 hook: fix bug (reuse of variable) introduced in 4f2cae90dd77
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.
2009-12-21 16:12:43 +01:00
Brendan Cully
9c496e1d92 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 /
2009-12-19 22:55:33 -08:00
Greg Ward
b7fda83054 glog: fix "incompatible option" error message.
Options like 'only_branch' should be presented to the user as
'--only-branch'.
2009-12-18 15:05:42 -05:00
Mads Kiilerich
30c9ad5ebc 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).
2009-12-16 23:59:50 +01:00
Matt Mackall
2487655eb4 convert: make hg sink cleanup safer 2009-12-16 16:42:58 -06:00
Nicolas Dumazet
a7b35aa08b 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.
2009-12-11 15:25:33 +09:00
Mads Kiilerich
058474b7b1 test-hook: Don't use extended regular expressions with grep
Using egrep fixes failure on Solaris
2009-12-16 12:10:21 +01:00
Matt Mackall
adcb803e06 Merge -stable heads 2009-12-15 10:44:10 -06:00
Patrick Mezard
ceda6d3ffc convert/svn: better handling of hg recursive call failure 2009-12-14 22:09:49 +01:00
Matt Mackall
4387f67807 subrepo: add default path to new clones 2009-12-14 15:01:13 -06:00
Alexander Solovyov
023880fae9 schemes: url parts are counted from 1 2009-12-14 21:21:34 +02:00
Greg Onufer
5056bcbd9e 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.
2009-12-09 16:56:00 -08:00
Martin Geisler
cbf73c1303 win32text: do not mention hgext in warning 2009-12-23 20:31:35 +01:00
Martin Geisler
577446318e 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.
2009-12-23 19:11:37 +01:00
Christian Ebert
2db60e73ce 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.
2009-12-23 18:40:21 +01:00
Patrick Mezard
9499717be0 convert/svn: make sink recover gracefully from empty changeset
Otherwise when processing a changeset that in fact changes no files
(perhaps due to bug in import from CVS) can get something like:
  unexpected svn output:
  abort: unable to cope with svn output

Bug report and patch draft by Jesse Glick <jesse.glick@sun.com>
2009-12-07 12:44:15 -05:00
Nicolas Dumazet
6afdc121ac mq: qpop: remove added files before re-adding removed files
We need to do this to avoid file/directories conflicts.
This causes patches removing a committed file and replacing it
with a directory to be "unpoppable".
2009-12-11 15:09:52 +09:00
Greg Ward
d9c710d107 revlog: rewrite several method docstrings
- methods: findmissing(), nodesbetween(), descendants(), ancestors()
- the goal is precise, concise, accurate, grammatical, understandable,
  consistently formatted docstrings
2009-12-10 09:35:43 -05:00
Martin Geisler
46bbcdcea6 config: raise ConfigError on non-existing include files
Before, an %include directive for a non-existing file resulted in an
IOError and a traceback.
2009-12-12 16:46:16 +01:00
Dirkjan Ochtman
0513f13503 cmdutil: copy auth section in remoteui
This allows me to specify an auth section in a .hg/hgrc instead of just
a global or user-level hgrc.
2009-12-10 12:31:21 +01:00
Sune Foldager
0bec7f7de3 patchbomb: fix bug introduced in a6a075e49b19 and add test
Thanks to Augie Fackler for reporting this.
2009-12-08 23:23:59 +01:00
Sune Foldager
d262a88c75 patchbomb: handle repository#rev URLs correctly 2009-12-06 23:22:17 +01:00
Steve Borho
e46cd0e296 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.
2009-12-05 14:18:31 -06:00
Christian Ebert
dd907fdefb 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.
2009-12-23 12:04:17 +00:00
Christian Ebert
cbc3638bed 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.
2009-12-23 12:04:04 +00:00
timeless
7f202fbf9b mq: qnew -f should reject merge working directories 2009-12-23 13:09:11 +01:00
Martin Geisler
70de345b15 hgext: enable extensions without "hgext." prefix in help texts 2009-12-22 00:50:03 +01:00
Sune Foldager
0d1feca701 handle file URIs correctly, according to RFC 2396 (issue1153)
The new code aims to implement the RFC correctly for file URIs.
Previously they were handled incorrectly in several ways, which
could cause problem on Windows in particular.
2009-12-03 11:06:55 +01:00
Sune Foldager
1a664ccf10 transplant: fix small bug when a patch fails while using --filter 2009-12-03 11:06:44 +01:00
Nicolas Dumazet
686db2d57f alias: do not crash when aliased command has no usage help text 2009-12-03 14:14:44 +09:00