Commit Graph

9947 Commits

Author SHA1 Message Date
Matt Mackall
525da95fd6 copies: speed up copy detection
On some large repos, copy detection could spend > 10min using
fctx.ancestor() to determine if file revisions were actually related.
Because ancestor must traverse history to the root to determine the
GCA, it was doing a lot more work than necessary. With this
replacement, same status -r a:b takes ~3 seconds.
2010-01-19 22:20:05 -06:00
Nicolas Dumazet
92d5d992fc hgweb: request: strip() form values
Entering "<correct_cset_hash> " in the search form was not returning anything.
This happens relatively often, due to HTML formatting: when copy/pasting a cset
hash from the web, selection might contain surrounding spaces.
2009-12-28 12:14:26 +09:00
Wagner Bruna
8129240dc9 i18n-pt_BR: synchronized with c1cc73a6382d 2010-01-18 15:37:45 -02:00
Greg Ward
c0a5547680 share: be more explicit about the dangers of rollback. 2010-01-13 22:05:06 -05:00
Mads Kiilerich
2c377a4b1c mercurial.spec: Alignment with AIX spec by Jim Hague
* Require Python 2.4 or later
* Note that hgk uses tk - but don't require it
* Remove bashism to support ksh
* Install mq.el
* Handle uncompressed man pages
2010-01-06 03:27:15 +01:00
Jim Hague
ab2b905e27 Work around AIX shell builtin printf not handling \NNN.
On AIX, ksh builtin printf does not understand \NNN. Some tests use this
to generate test data, and so fail on AIX. Rework these tests to use python
to generate the correct characters. This fixes the tests on AIX and should
be more generally portable.
2010-01-06 18:03:33 +00:00
Benoit Boissinot
8fa7d00586 subrepo: fix merging of already merged subrepos (issue1986)
This fixes a bug seen when merging a main repo which contains a subrepo when
both repos have been merged before. Each repo (main and sub) has two
branches, both of which have been merged before.

In a subrepo, if the revision to merge to is an ancestor of the current rev,
then the merge should be a noop.

Test provided by Steve Losh.
2010-01-15 21:08:04 +01:00
Patrick Mezard
b5602adbcc cmdutil: expand style paths (issue1948)
Fix suggested by Andrea Riciputi <andrea.riciputi@gmail.com>
2010-01-15 09:50:52 +01:00
Dirkjan Ochtman
b176d4360e ui: just return it if it's already a bool 2010-01-13 11:53:55 +01:00
Dirkjan Ochtman
8fec18223e demandimport: ignore _winreg (used in python-2.7 mimetypes) 2010-01-13 11:57:32 +01:00
Benoit Boissinot
0dda8d19a9 merge stable together 2010-01-11 22:41:02 +01:00
Benoit Boissinot
e70eea1089 shrink-revlog: avoid cryptic error when used as an extension
When shrink-revlog is used as an extension, it would produce an error when
switching back to stable because the script will try to execute itself.
2010-01-11 21:44:04 +01:00
Benoit Boissinot
8265d7b666 transaction: initialize self.journal to None after deletion
This avoid a warning when having an empty transaction, where hg would try to
delete the journal twice.
2010-01-11 21:40:19 +01:00
Martin Geisler
d19ed4f0b8 relink: ensure consistent candidate order 2010-01-09 23:16:36 +01:00
Jens Bäckman
482c7ff3a6 commands: fix typo in help text 2010-01-09 23:03:33 +01:00
Patrick Mezard
f8872c1d27 ui: display progress with decimal notation 2010-01-08 23:15:24 +01:00
Patrick Mezard
be67c8a241 win32: close file when leaving _getfileinfo() 2010-01-08 23:15:22 +01:00
Siddharth Agarwal
eab3968819 Add support for relinking on Windows.
Test and minor code change by Patrick Mézard <pmezard@gmail.com>
2010-01-08 18:48:39 +05:30
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