Commit Graph

12528 Commits

Author SHA1 Message Date
Mads Kiilerich
11c8cc29c9 init: expand destination url as a configured paths
Most commands expands configured paths when repositories are specified, just as
the urls help says. Clone also expands the destination path. Clone is morally
equivalent to init + push/pull, so init should also expand the destination path
- and that is what this patch makes it do.

There is no really good usecases for this and in most cases it doesn't matter,
but consistency is nice, and otherwise we would have to document the exception.
2010-09-29 01:32:51 +02:00
Mads Kiilerich
bf24a5099a mq: explain qpush -f better 2010-09-29 01:32:50 +02:00
Mads Kiilerich
afaab15e7e serve: let --web-conf help reference hgweb 2010-09-29 01:32:50 +02:00
Juan Pablo Aroztegi
ddaf681e52 transplant: add the transplanted revset predicate
This adds support to identify a particular transplanted changeset or set
of changesets. The argument is optional. Examples:

hg log -r 'transplanted(1234 or 2345)'
hg log -r 'transplanted()'
2010-09-28 19:36:05 +02:00
Mads Kiilerich
982aefe1cc test-convert-cvs-branch: add sleep so cvs notices changes 2010-09-28 03:01:35 +02:00
Mads Kiilerich
edf2794bd1 graphlog: style with header and footer (issue2395)
The glog command didn't emit header and footer from the style, as demonstrated
by "hg glog --style xml". Asciiart combined with xml markup hardly makes sense,
but header and footer might however be useful for adding for example html pre
tags around the graph.
2010-09-28 02:58:00 +02:00
Mads Kiilerich
a9146eb8c4 test-serve: use service that works on more platforms
Follow-up to 40a2055abf6d: echo is ambiguous on OS/X, and Solaris have neither
http nor gopher. daytime seems to be available everywhere.
2010-09-28 02:57:59 +02:00
Patrick Mezard
df877501f1 Merge with stable 2010-09-28 01:11:24 +02:00
Patrick Mezard
a8f024ef25 patch: test and document a bit binary to regular file upgrade 2010-09-28 00:41:08 +02:00
Patrick Mezard
a9686ec545 patch: upgrade to git patch when removing binary file
Otherwise it may cause data loss when removing binary files in mq with
--git=auto.
2010-09-28 00:41:07 +02:00
Thomas Arendsen Hein
a05671580d tests: show skip reason instead of "irrelevant" with unified tests, too
parsehghaveoutput expects just the test output, not the merged test/output,
so for skipped unified tests e.g.:
Skipped test-convert-darcs.t: missing feature: irrelevant
was shown instead of:
Skipped test-convert-darcs.t: missing feature: darcs client
2010-09-27 22:49:30 +02:00
Patrick Mezard
5468157807 patch: fix rename text to binary file (issue2400) 2010-09-27 22:47:10 +02:00
Matt Mackall
e06b83d527 merge with stable 2010-09-27 10:48:50 -05:00
Matt Mackall
ab716e0166 merge with iin 2010-09-27 10:48:21 -05:00
Matt Mackall
288057df25 merge with iin 2010-09-27 10:47:36 -05:00
Wagner Bruna
075446028b i18n-pt_BR: update to new Portuguese ortography 2010-09-25 22:53:31 -03:00
Wagner Bruna
3ca87d4d14 i18n-pt_BR: minor rewording 2010-09-25 22:53:27 -03:00
Wagner Bruna
a0f99df980 i18n-pt_BR: assorted typo fixes 2010-09-25 22:53:21 -03:00
Wagner Bruna
fb5d965861 merge with i18n 2010-09-24 19:47:50 -03:00
Wagner Bruna
a79dd2c6ef i18n-pt_BR: synchronized with 55aa9de513df 2010-09-24 19:47:00 -03:00
Wagner Bruna
edd561ea42 merge with i18n stable 2010-09-24 19:26:01 -03:00
Matt Mackall
51b3b09c8f backout most of 26e0b9a8ce0d 2010-09-24 12:46:54 -05:00
Erik Zielke
ddbd88fdcf incoming/outgoing: Fix recursion on sub repositories
Incoming and outgoing are fixed so they go through the whole three of
repositories instead of only visiting first level of sub repositories.
2010-09-24 12:00:55 +02:00
Martin Geisler
3d112b3042 tests: added a short description to issue numbers
Many tests already had a short line to describe what IssueXXX is
about. I find that quite useful when reading a test.
2010-09-24 10:13:49 +02:00
Mads Kiilerich
4f78ca6825 merge with stable 2010-09-24 03:04:14 +02:00
Mads Kiilerich
d6040e08e1 test-gendoc: mute gendoc stderr
Solaris had problems with zh_CN and warned "couldn't set locale correctly" on
stderr. We don't care.
2010-09-24 02:57:15 +02:00
Mads Kiilerich
8e2068d8b4 test-mq-symlinks: fix symlink handling on solaris
It seems like ln -s gets confused if an existing symlink is dangling:
$ rm -f a b; ln -s a b; ln -sf b b
ln: cannot create b: File exists

We now rely on rm instead of on ln -sf.
2010-09-24 02:52:12 +02:00
Mads Kiilerich
5f130ba1ac test-archive: fix touch datestamps
Backport ac3a256cdaf4 and cd415c06acaf to stable.
2010-09-24 02:49:09 +02:00
Christoph Mewes
40a42c2dc0 i18n-de: parentrevspec extension 2010-09-24 02:17:54 +02:00
Christoph Mewes
7397097548 i18n-de: pager extension and missing parts of extdiff 2010-09-24 02:08:26 +02:00
Christoph Mewes
bc800fa0ba i18n-de: added missing strings in acl 2010-09-24 01:41:56 +02:00
Patrick Mezard
bb3259c957 Merge with stable 2010-09-24 00:17:04 +02:00
Patrick Mezard
42663f256e convert/darcs: improve unsupported format detection (issue2172) 2010-09-24 00:04:07 +02:00
Patrick Mezard
bc1ff8ebda bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016)
_bookmarks is loaded lazily and calls super.lookup(). Unfortunately, branch and
tags caches initializations also recurse in lookup() and end up trying to
access _bookmarks again. Massive confusion ensues.

I considered fixing all branches and tags cache loading to avoid recursing in
lookup() but it would add complexity to otherwise working code provided lookups
are performed on nodes or revnums.
2010-09-24 00:03:58 +02:00
Christian Ebert
3fb88c8dbb Use more note admonitions in help texts 2010-09-23 16:31:38 +02:00
Erik Zielke
9f22da182d mq: removed return from callers to patchheader.qseries
Some callers to patchheader.qseries returned the value
further, but pathcheader.qseries does not explicitly
return anything. It was confusing this was returned
further
2010-09-23 15:18:10 +02:00
Erik Zielke
f65e38950f mq: added return 0 on success
I have added return 0 on success in docstrings of
the different not deprecated mq commands.
2010-09-23 16:56:32 +02:00
Adrian Buehlmann
057c054947 tests: fix tabs/indentation in test-strip-cross.t 2010-09-26 23:48:30 +02:00
Alexandre Fayolle
55241e7f70 Fix memory leak when using hg commands over http repositories
When using hg commands over an http repository in a long running process, a
httphandler instance is leaked for each command, because of a loop
handler.parent -> OpenerDirector and OpenerDirector.handlers -> handler which
is not handled by Python's gc. Discussion on #mercurial concluded that removing
the __del__ method solved the problem.
2010-09-23 11:41:27 +02:00
Brodie Rao
20c102ca36 grep: only catch re.error when compiling regular expressions 2010-09-22 19:15:27 -05:00
Anthony Foiani
5a82d7f2a7 doc: clarify smtp.password usage 2010-09-23 00:27:04 -06:00
Mads Kiilerich
48773bdeed log: include unmodified-in-merge files in log diff/stat (issue2383)
f02da4369319 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.

This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...
2010-09-23 01:23:16 +02:00
Mads Kiilerich
b0f0118486 tests: fix unzip -l variability fix
01-01-1980 slipped through the grep.
2010-09-23 01:51:17 +02:00
Christoph Mewes
0a328256f3 i18n-de: minor changes 2010-09-23 01:19:40 +02:00
Christoph Mewes
6ce20c2bdd i18n-de: notify extension 2010-09-23 01:09:09 +02:00
Christoph Mewes
e1c1bdfe7d i18n-de: mq extension 2010-09-23 00:28:45 +02:00
Matt Mackall
0e166af1f9 tests: fix unzip -l variability 2010-09-22 17:13:49 -05:00
Patrick Mezard
23ced90ea0 mq: always require --force when pushing patches (issue2363)
--force was not necessary when passing --rev since cb494d252290, but this
behaviour is usually harmful when branch names are passed instead of explicit
revisions.
2010-09-22 23:51:10 +02:00
Erik Zielke
c732a9771b Use note admonition 2010-09-22 16:23:55 +02:00
Erik Zielke
208cfeec63 minirst: Support for admonitions
The old asciidoc format supported something like this,
this is why there is NOTE: scattered here and there.
2010-09-22 15:51:59 +02:00