Commit Graph

9507 Commits

Author SHA1 Message Date
Patrick Mezard
fd35df4182 Merge with crew-stable 2009-10-04 23:16:54 +02:00
Patrick Mezard
0ee3fec16c convert/darcs: handle directory renaming 2009-10-04 23:06:14 +02:00
Patrick Mezard
e3432a31a9 convert/darcs: fix file renaming (issue1853) 2009-10-04 22:23:11 +02:00
Martin Geisler
8b8fb723b7 help: un-indent help topics
The help topics are reused in the HTML documentation, and there it
looks odd that whole sections are indented. We now only indent it for
output on the terminal.
2009-10-04 12:18:43 +02:00
Martin Geisler
524b665b54 help: move help topics from mercurial/help.py to help/*.txt
The help topics are loaded on demand so we wont hit the disk unless we
really have to.
2009-10-04 09:59:13 +02:00
Martin Geisler
3550fb27d7 i18n: remove unnecessary os.path.normpath call 2009-10-03 18:58:25 +02:00
Martin Geisler
cb4bdf9a1e commands: simpler sort of help topic names 2009-10-04 10:17:01 +02:00
Mads Kiilerich
8ff24147fd cmdutil: templating keywords latesttag and latesttagdistance
This can be used for referring to revisions in a reasonable
meaningful, stable and monotonically increasing way, suitable for
releases or builds directly from a repository.

The latest tag is found by searching through untagged ancestors and
finding the latest tagged ancestor based on tag date. The distance is
found from the length of the longest path to the tagged revision.

For example:
  hg log -l1 --template '{latesttag}+{latesttagdistance}\n'
can return
  1.3.1+197

This is mostly work by Gilles Moris <gilles.moris@free.fr>
2009-10-03 18:31:20 +02:00
Benoit Boissinot
b0e2f2aa9e merge with mpm 2009-10-03 23:38:10 +02:00
Benoit Boissinot
3978618d04 bdiff: gradually enable the popularity hack
Patch from Jason Orendorff

The lower the threshold, the stronger the popularity hack's
influence. So at 3999 lines, the hack is disabled; and at 4000 lines,
the hack is enabled at maximum strength (t=4).

No source file in mercurial/crew is over 4000 lines. But there are, oh,
a few such files in Mozilla.  I can testify that this hack causes hg to
generate some correct but eyebrow-raising patches.

I think the hack should phase in gradually. The threshold should be high
for small files where we don't need it so much.  Like this:

        t = (bn < 31000) ? 1000000 / bn : bn / 1000;

That would leave the popularity hack disabled for small files, then
gradually phase it in:

    bn <   1000   --   t > bn    (popularity hack is completely disabled)
    bn ==  1000   --   t = 1000  (still effectively disabled)
    bn ==  2000   --   t =  500  (only hits unusual files)
    bn == 10000   --   t =  100  (only hits especially common lines)
    bn == 31000   --   t =   31  (hack is at maximum power)
    bn == 32000   --   t =   32  (hack could backfire, ease off)
2009-10-03 23:36:08 +02:00
Matt Mackall
13b406f027 Merge with -stable 2009-10-03 14:39:57 -05:00
Matt Mackall
3a921c1e6f notify: update test 2009-10-03 14:39:46 -05:00
Greg Ward
0957bc4d5c dirstate: add/improve method docstrings.
- add doc to __init__(), _map(), status()
- enhance for __getitem__()
- fix inaccurate doc for walk() (described wrong return type)
2009-10-01 15:36:45 -04:00
Brendan Cully
d911a1a256 convert: unbreak non-svn engines 2009-09-30 14:43:22 -07:00
Alexander Solovyov
cfac00d6dc zeroconf: read actual description for repos in hgwebdir 2009-09-26 00:17:55 +03:00
Alexander Solovyov
d31948f8ad zeroconf: code cleanup, fixing variable names to be meaningful 2009-09-26 00:17:02 +03:00
Bryan O'Sullivan
c2ccd4cd98 Merge with crew 2009-09-28 13:21:41 -07:00
Martin Geisler
1d1318a176 test-gendoc: add tests for all languages
This ensures that we catch errors in the reST syntax early and for all
languages. The only change needed in gendoc.py was to correct the
computation of section underlines for Asian languages.
2009-09-27 10:12:02 +02:00
Martin Geisler
7b90d8d58a gendoc: do not wrap encoded string
- it breaks multi-byte characters
- it is not needed since Docutils will take care of wrapping the
  strings as necessary
2009-09-27 10:04:51 +02:00
Martin Geisler
b4069f8766 test-encoding: make test output easier to follow 2009-09-27 09:39:57 +02:00
Martin Geisler
42c594dc7e Merge with crew-stable 2009-09-27 09:38:53 +02:00
Martin Geisler
4288299450 test-extension: update test output to match d111a22f5fd2 2009-09-27 09:34:40 +02:00
Martin Geisler
72cc7c5356 util: do not corrupt multi-byte characters in wrap 2009-09-27 01:44:46 +02:00
Sune Foldager
30958eab97 push: fix subtle bug in prepush logic
A test case demonstrating the bug has been added.
Contributed by Henrik Stuart and Sune Foldager.
2009-09-23 18:56:09 +02:00
Brodie Rao
b2c79b09c7 color: mark --no-color as deprecated (--color=never has the same effect)
This should've been marked deprecated when --color was first introduced, but
it was something I overlooked.
2009-09-23 15:58:07 +02:00
Adrian Buehlmann
d88b8724c3 mention overlay bundle file in global --repository option
see http://mercurial.selenic.com/wiki/LookingIntoBundles

Drop mentioning symbolic path names for the sake of brevity. This is
a common feature of path options anyway.
2009-09-23 15:57:25 +02:00
Dirkjan Ochtman
a023094f1f merge with crew-stable 2009-09-23 15:54:43 +02:00
Sune Foldager
362c2022cc localrepo: fix bugs in branchheads and add docstring
- The call to reverse() reversed the list in place in the global branchmap.
- The nodesbetween function doesn't preserve ordering.
2009-09-23 15:51:36 +02:00
Peter Ingebretson
4cb46e6c5b convert: fix marshalling in P4 convert extension to use a binary stream
The Perforce convert extension uses the p4 -G command line option and
marshal.load to obtain information about the history of a Perforce depot.

The method marshal.load must be provided with a binary stream (mode='rb') in
order to function reliably. Certain changelist descriptions or other elements
in a depot history could trigger a premature EOFError, causing the conversion
process to fail.

This may resolve the issue discussed in the following thread:
http://www.selenic.com/pipermail/mercurial/2009-July/026813.html
2009-09-23 15:36:51 +02:00
Dirkjan Ochtman
6e68e45c6f merge with mpm 2009-09-23 15:19:26 +02:00
Matt Mackall
3ce19e6ce6 convert: disable SVN support due to library license incompatibility 2009-09-23 00:23:50 -05:00
Patrick Mezard
6e34e060d6 convert/cvs: update debugcvsps documentation 2009-09-22 13:30:32 +02:00
Mads Kiilerich
097282895a util.system: Use subprocess instead of os.system
subprocess allows the environment and working directory to be specified
directly, so the hacks for making temporary changes while forking is no longer
necessary.

This also fixes failures on solaris where the temporary changes can't be undone
because there is no unsetenv.
2009-09-20 22:19:18 +02:00
David Champion
93e20c18e6 notify: permit suppression of merge changeset notification
In some environments merges occur regularly but with no conflicts, and
committers find merge notifications more of a bother than a help.

By setting merge=False in [notify], merge notifications are suppressed.
This works both for incoming and for changegroup hooks.
2009-09-23 02:31:09 -05:00
Martin Geisler
969ff27288 Merge with crew-stable 2009-09-19 13:55:18 +02:00
Martin Geisler
af0872c777 dispatch: catch ConfigError while constructing ui 2009-09-19 13:52:54 +02:00
Stuart W Marks
928c430865 hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
2009-09-17 22:39:38 -07:00
Martin Geisler
9f1896c083 do not attempt to translate ui.debug output 2009-09-19 01:15:38 +02:00
Martin Geisler
b946928cc3 Merge with crew-stable (again)
I had pulled 2cdbd1d2263a into my local clone and accidentially
rebased it after pulling a new changeset from crew.
2009-09-18 17:37:51 +02:00
Martin Geisler
6f2fefabf6 Merge with crew-stable 2009-09-18 17:23:02 +02:00
Shun-ichi GOTO
719493016e win32mbcs: util.normpath should be wrapped.
It is because util.normpath() finally calls windows.pconvert()
which is not wrapped (by changeset:7f85efa178c8).
2009-09-18 21:25:47 +09:00
Shun-ichi GOTO
a63337a60d win32mbcs: util.normpath should be wrapped.
It is because util.normpath() finally calls windows.pconvert()
which is not wrapped (by changeset:7f85efa178c8).
2009-09-18 21:25:47 +09:00
Steve Borho
136a6eb1d4 demandimport: blacklist gtk
Demandimport breaks gtk.  You get a meaningless error about
'failed loading gobject\_gobject.pyd'.  Mercurial does not use gtk,
but this trips up many extension writers.
2009-09-17 17:39:43 -05:00
Martin Geisler
74a6226f22 Merge with crew-stable 2009-09-17 21:52:08 +02:00
Martin Geisler
abc0021b82 Merge with main 2009-09-17 21:51:55 +02:00
Martin Geisler
eb95e5f9c1 commands: expand -c and -C in update error message 2009-09-17 21:50:12 +02:00
Stuart W Marks
fd1368d11d commands: forbid 'hg update --check --clean' 2009-09-17 21:34:05 +02:00
Matt Mackall
f1cc50d927 Merge with stable 2009-09-16 16:01:37 -05:00
Steve Borho
68d79882b6 windows: provide filename in IOError exceptions
This brings the Windows posixfile errors in line with the errors
on other platforms.
2009-09-14 19:53:43 -05:00
Matt Mackall
641c3945ad Merge with crew 2009-09-14 17:32:55 -05:00