Mads Kiilerich
337e489bbe
convert: cleanup of filemap help text
...
Clarify that:
- Specified paths are matched by comparing name of file or directory.
- Line order (thus) doesn't matter.
- Rename doesn't imply include.
2010-07-08 15:44:14 +02:00
Martin Geisler
59385f10e8
check-code: add test for callable
2010-07-09 14:01:55 +02:00
Dan Villiom Podlaski Christiansen
11602a3741
extensions: add a few assertions to wrapfunction() and wrapcommand().
...
Specifically, assert that the given wrapper is callable in both
functions, and assert that the original was also callable in
wrapfunction().
2010-07-09 11:04:00 +02:00
Dan Villiom Podlaski Christiansen
50d47676be
extensions: improve language for wrapfunction() docstring.
2010-07-09 11:13:45 +02:00
Dan Villiom Podlaski Christiansen
5987e4e005
extensions: add docstring for wrapcommand().
2010-07-09 10:57:57 +02:00
Arnab Bose
a9ac0e99d7
commands: mention "hg status -C" in addremove help
2010-07-09 13:31:37 +02:00
Martin Geisler
9d15ddb59c
test-merge-closedheads: test 8579fd645006
2010-07-07 14:13:23 +02:00
Robert Bauck Hamar
d6a84c6ef2
commands: only warn when reopening the workdir's branch
...
When commiting, a check is made to see if one of the parents is a
closed head. However this did not check that the branch of the commit
is the same as the closed head, so one could get a warning message on
the sequence
hg commit --close-branch
hg branch new-branch
hg commit
or when merging in a closed head.
2010-07-07 14:11:59 +02:00
Yuya Nishihara
adbae861a8
mq: fixed ENOENT when qrename to new/directory.patch
...
MQ patch name can contain slashes, e.g. 'foo/bar.patch'.
Currently "qnew foo/bar.patch" works, but
"qrename foo/bar.patch new/dir.patch" fails with
"No such file or directory".
Also added test case for "qnew foo/bar.patch"
2010-03-28 15:23:11 +09:00
Julian Cowley
270cd1a3b9
mercurial.spec: rename docutils to python-docutils in BuildRequires
...
Even though the name of the project is Docutils, most packagers use
the package name python-docutils to fit into the naming scheme of
other packages written in Python. The name is used by Fedora, EPEL,
DAG, Mandriva, and a few other distributions.
2010-07-02 14:14:30 -10:00
Renato Cunha
9116007193
glossary: fixed typo in "Directory, working" description
...
The term "Directory, working" referenced a non-existant term named "Parents,
working directory". This patch fixes the typo.
2010-07-06 13:10:16 -03:00
Martin Geisler
bdb1598077
test-log: also test "log -p -R" case
2010-07-04 14:14:29 +02:00
Yuya Nishihara
910c40b6b6
log: fix missing diff output for hg log -p in sub directory
...
prep(ctx, fns) receives paths relative to repository root, not cwd.
2010-07-02 23:49:06 +09:00
Nicolas Dumazet
1624d50ea1
commands: document return values of add and paths commands
2010-07-04 17:05:17 +09:00
Martin Geisler
7b12009341
zeroconf: small fixes in docstring
...
Use reST role for consistency, import small part of Debian's
proposed_upstream__correct-zeroconf-doc patch from
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
2010-07-03 01:56:09 +02:00
Martin Geisler
93a9c977a3
hgweb: add link to wiki
2010-07-03 02:03:55 +02:00
Martin Geisler
6ae5a495d7
hgweb.wsgi: add a URL to the corresponding wiki documentation
...
Imported for_upstream__add_doc_url_in_example_files.patch from
Debian's patch queue:
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
2010-07-03 01:48:50 +02:00
Steve Borho
3f177d32a4
wix: generate a new GUID for the help folder
...
A GUID change is recommended after changes like 857ab17725c0
2010-07-01 19:13:23 -05:00
Steve Borho
a10936e8ce
wix: pick up new help topics added between 1.5 and 1.6
...
These files are not included the 1.6.0 installer, but will be picked up by
nightly builds as soon as this makes it to the stable branch.
2010-07-01 12:53:37 -05:00
Matt Mackall
a122c72ac2
Added signature for changeset f02da4369319
2010-07-01 12:06:31 -05:00
Mads Kiilerich
812bb21f4d
log: follow filenames through renames (issue647)
...
In commands.log a displayer was initialized from
cmdutil.show_changeset() with the initial matchfn (which designates
the specified files which only is correct in the highest revision in
the range). prep() is handed the correct list of files, but
displayer.show() didn't use that list but keept using the original
matchfn.
The matchfn argument to cmdutil.show_changeset() wasn't specified in
other places and is only used in .show(), so now we give the matchfn
as an optional parameter to .show().
We do however still have to detect --patch and --stat from opts in
show_changeset() and let it imply a matchall, but that can now be
overruled with the new .show() matchfn parameter.
2010-06-29 12:12:34 +02:00
Wagner Bruna
823a43755f
i18n-pt_BR: synchronized with 0e0766597ca6
2010-07-01 13:26:08 -03:00
Matt Mackall
5e9649ad3b
commit: add missing _()
2010-07-01 11:22:56 -05:00
Matt Mackall
5e2b0ca2ab
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
2010-07-01 11:20:13 -05:00
Matt Mackall
1e4d813ec5
Merge with i18n
2010-07-01 11:20:08 -05:00
Martin Geisler
c1edcf8c26
i18n-da: translated eol extension and various small strings
2010-07-01 15:25:29 +02:00
Matt Mackall
49d11c6847
subrepo: correctly handle update -C with modified subrepos (issue2022)
...
(based on a patch by Saint Germain)
2010-06-30 23:56:35 -05:00
Maxim Khitrov
1cf52a2e29
http: deliver hook output to client
2010-06-30 18:15:23 -05:00
FUJIWARA Katsunori
d104612a44
i18n-ja: synchronized with ff5cef3a14fd
2010-06-30 13:03:48 +09:00
Wagner Bruna
f5f990e986
i18n-pt_BR: synchronized with 4d89143d74b5
2010-06-29 12:27:08 -03:00
Wagner Bruna
cf24f5af64
merge with stable
2010-06-29 12:18:42 -03:00
Jens Bäckman
2e29ea532c
i18n-sv: synchronized with ff5cef3a14fd
2010-06-29 09:11:55 +02:00
Mads Kiilerich
d28bbb7fca
test-acl: don't use $PWD
...
solaris ....
2010-06-28 23:23:55 +02:00
Mads Kiilerich
5adb9bace1
test-alias: don't use the environment variable PWD
...
solaris ...
2010-06-28 23:16:11 +02:00
Mads Kiilerich
07f64c28d2
revert: Make it clearer when not to use revert
2010-06-28 15:08:01 +02:00
Augie Fackler
be26c0a474
progress: check stderr.isatty() before each print
...
This prevents writing progress information to a non-tty stderr if one is
swapped in after startup, which happens in `hg serve`.
2010-06-27 22:20:47 -05:00
Wagner Bruna
c9753c0aa2
i18n-pt_BR: synchronized with 0e823c849647
2010-06-26 21:37:10 -03:00
Wagner Bruna
a0bce5f7f7
Merge with stable
2010-06-26 21:29:39 -03:00
Mads Kiilerich
107eb37856
http digest auth: reset redirect counter on new requests (issue2255)
...
This fixes a regression introduced in d5b57915925b when Mercurial reuses the
auth handler for several requests and the redirect counter never is reset.
2010-06-26 23:00:58 +02:00
Matt Mackall
d4380e872d
revset: deal with empty sets in range endpoints
...
(spotted by Julian Cowley <julian@lava.net>)
2010-06-28 11:07:27 -05:00
Matt Mackall
43cb4cbcf4
subrepo: fix silent push failure for SVN (issue2241)
2010-06-27 18:20:49 -05:00
Matt Mackall
80fcc54f22
bookmarks: fix in/out return values
2010-06-26 12:26:03 -05:00
Matt Mackall
ae9cea9fad
bookmarks: fix bogus cut and paste for outgoing
2010-06-26 12:24:55 -05:00
Matt Mackall
e4cf775b71
addchangegroup: pass in lock to release it before changegroup hook is called
...
Currently, callers of addchangegroup first acquire the repository
lock, usually to check that an unbundle request isn't racing. This
means that changegroup hook actions that might write to a repo get
stuck waiting for a lock. Here, we add a new optional lock parameter
and update all the callers. Post-1.6 we may make it non-optional.
2010-06-25 13:47:28 -05:00
Simon Howkins
f313e6ccd4
cmdutil: only output style header once in non-buffered mode (issue2130)
2010-06-24 15:18:47 +01:00
Wagner Bruna
2959609e80
i18n-pt_BR: glossary.txt translation
2010-06-23 17:54:59 -03:00
Matt Mackall
526f8c09e9
bookmarks: touch changelog on write to force hgweb reload
2010-06-23 13:38:52 -05:00
Christian Boos
400df6f4a9
setup: ignore failures to build optional inotify extension
2010-06-23 13:44:07 +02:00
Matt Mackall
63b3d97fcf
revset: make negate work for sort specs
2010-06-30 17:44:36 -05:00
Matt Mackall
e02c6fa5ff
update: synchronize permissions in the dirstate (issue1473)
...
fix by Benoit, updated by mpm to not affect all clean files
2010-06-30 17:34:20 -05:00
