Commit Graph

10774 Commits

Author SHA1 Message Date
Christian Ebert
8900ee1dd7 keyword: do not bother about detecting extension path in demo
Detecting and showing the path to a keyword extension in a
non-standard place only made sense while keyword.py was not
shipped with Mercurial.

The test output has changed because we do not have a spurious
space at eol anymore.
2010-03-16 22:29:16 +01:00
Christian Ebert
4d1049dc50 keyword: make kwdemo less verbose
1) Set the branchname always silently with
   dirstate.setbranch().
   We create a branch so that testing the {branches} template
   does not come up empty. But kwdemo is hardly the place to
   inform the user by inference why {branches} is empty on the
   default branch.
   "demobranch" is ascii and cannot be changed, so using the
   internal command instead of commands.branch() is safe.
2) Do not show full path to temporary directory
   (distracting long lines on Mac OS X).
3) No special debug output. Output only related to keyword,
   no internals like unsetting of commit hooks etc.
2010-03-16 22:28:58 +01:00
Christian Ebert
c477dea549 keyword: 1 variable name for overwriting candidates 2010-03-16 22:28:23 +01:00
Christian Ebert
5180c9f434 keyword: do not customize ui.note() when overwriting
Behaviour change:
hg commit --verbose now prints out the names of the files
which are overwritten.
2010-03-16 22:27:22 +01:00
Benoit Boissinot
f11d48adc1 help: it's not necessary to escape quotes 2010-03-16 16:41:22 +01:00
Benoit Boissinot
57712fa835 check-code: remove simple quotes first 2010-03-16 16:39:17 +01:00
Benoit Boissinot
aa7653dcd6 merge with stable 2010-03-16 01:16:19 +01:00
Benoit Boissinot
67b2142e44 filelog: no need to optimize an uncommon case, assume meta = {} 2010-03-16 01:16:04 +01:00
Benoit Boissinot
3c5670f245 filelog: text is stored modified when it starts with '\1\n' 2010-03-16 01:12:46 +01:00
Matt Mackall
07c0edbc5d Merge with stable 2010-03-15 16:36:32 -05:00
Augie Fackler
9105fced5e util.termwidth: check stderr first as it's least likely to be redirected 2010-03-15 14:53:34 -05:00
Augie Fackler
eeb8822ee1 progress: use stderr instead of stdout; check stderr.isatty()
This means that progress bars will continue to show on the terminal
when both stdin and stdout are redirected.
2010-03-29 16:44:24 -05:00
Cédric Duval
130a94036a mq: test for init --mq with a destination argument 2010-03-15 20:52:22 +01:00
Adrian Buehlmann
3e93d70483 contrib/wix: fix product name to include version
Without this, Mercurial is registered under the installed programs
on Windows as just 'Mercurial', which is unusual for a program to do
on Windows.

Including the version in the registered product name registers the
software in the Windows control panel of installed programs as, for
example, 'Mercurial 1.5' (for 1.5), or as

  'Mercurial 1.5.1032' for a stable 1.5+32-d9a6645d6d9b
  'Mercurial 1.5.5080' for a unstable 1.5+80-1119076dd3e8

when using http://bitbucket.org/tortoisehg/thg-winbuild to create
daily builds.

Furthermore, the install UI texts in the built installer database (MSI
file) are more clear on what the user is about to install, as, for example,
the text in the initial installer dialog now reads

  "The Setup Wizard will install Mercurial 1.5 on your computer"

instead of just

  "The Setup Wizard will install Mercurial on your computer"
2010-03-16 17:39:12 +01:00
Benoit Boissinot
12b6faccfd cvsps: fix traceback involving 'synthetic'
https://bugzilla.redhat.com/show_bug.cgi?id=573666
Reported by Sjoerd Mullender
2010-03-15 19:55:52 +01:00
Martin Geisler
f3b2ed5d56 progress: use a verb (+noun) in present participle 2010-03-15 18:33:39 +01:00
Edouard Gomez
8969d04970 subrepo: fix hgrc paths section during subrepo pulling
There are two bugs in current subrepo ctor:
 - hgrc paths were using parent repo (ctx._repo) instead of self._repo
 - it was joined with local extract path, not its source repo path

Fixed both bugs using _abssource on self once it is fully initialized.
It gets the job done perfectly for pull and push urls.
2010-03-14 00:28:10 +01:00
Matt Mackall
36aa3dd390 check-code: add check for any/all 2010-03-12 16:16:47 -06:00
Martin Geisler
652e04c99c progress: use a verb in present participle 2010-03-15 18:40:00 +01:00
Martin Geisler
7dc53bec4e Merge with stable 2010-03-15 18:36:11 +01:00
Patrick Mezard
4f9677b2a3 Merge with crew-stable 2010-03-14 23:18:50 +01:00
Martin Geisler
74b4c06343 record: separate each hunk with a blank line
This makes it easier for the eye to find the beginning of a hunk when
scrolling up in the terminal.
2010-03-14 23:10:52 +01:00
Benoit Boissinot
f39aa4fcb7 mq: do not try to delete non-existent files (regression from 5f2a56be1e3e) 2010-03-14 22:17:10 +01:00
Martin Geisler
4936f759eb Merge with stable 2010-03-14 22:21:48 +01:00
Benoit Boissinot
5337e0f1bd mq: don't use regexp when not necessary 2010-03-14 19:09:55 +01:00
Cédric Duval
5526bbffdb mq: fix init with nonexistent or non-local repository 2010-03-14 18:46:38 +01:00
Cédric Duval
f7452aeef3 mq: no longer refer to deprecated qinit -c command 2010-03-14 19:21:24 +01:00
Cédric Duval
b91592cdc4 mq: don't mention qinit as a "common task"
Without -c, it is a no-op (the queue is implicitly initialized by all
relevant commands if needed), and queue repositories with -c are an
advanced usage of mq, and not otherwise required.
2010-03-14 19:17:06 +01:00
Benoit Boissinot
79921b5a72 mq: use xrange/enumerate instead of += 1 2010-03-14 14:53:20 +01:00
Benoit Boissinot
9be5c5ce37 mq: don't use len(list) unless necessary 2010-03-14 14:45:01 +01:00
Benoit Boissinot
8b8c0315c4 mq: find_series() simplify and don't use regexps 2010-03-14 12:08:14 +01:00
Benoit Boissinot
4f9affc968 mq: fix coding style (missing space) 2010-03-14 11:12:51 +01:00
Benoit Boissinot
cea219ac52 mq: qsave creates entries with the left part empty (':patchname') 2010-03-14 11:12:07 +01:00
Benoit Boissinot
18dd3c4c26 mq: simplify statusentry(), fix restore broken by 6099aebf81d9 2010-03-14 01:35:54 +01:00
Benoit Boissinot
2aba9d3b98 mq: use context API 2010-03-14 01:06:58 +01:00
Benoit Boissinot
2d9b1f0eb3 mq: simplify qparents calculation 2010-03-14 01:01:17 +01:00
Benoit Boissinot
d5eca3183b mq: simplify commit message generation 2010-03-14 00:53:55 +01:00
Benoit Boissinot
4b556a742a mq: avoid many hex/bin conversions, keep the binary node when possible 2010-03-14 00:36:10 +01:00
Yuya Nishihara
d47b557fd8 hgweb: make code to join url path simpler
Now SCRIPT_NAME never contains http://host:port part,
we don't need to care about '://'.
2010-03-11 00:28:31 +09:00
Yuya Nishihara
a626e66806 hgweb: fix broken URLs of RSS/Atom feeds (issue1772)
This fixes doubled URL, e.g. http://example.orghttp://example.org/...,
which appears on RSS/Atom feeds served by hgwebdir.

It splits baseurl to update SERVER_NAME, SERVER_PORT and SCRIPT_NAME,
according to RFC 3875.

Updated the test output since SCRIPT_NAME becomes not to contain
http://host:port part.
2010-03-11 00:28:27 +09:00
Yuya Nishihara
568a1350a5 hgweb: introduce helper method to update req.env 2010-03-11 00:25:46 +09:00
Mathieu Clabaut
14e6714bd1 convert: teach cvsps to handle . repository (issue1649)
For a CVS repository checked out with "cvs co .", the prefix used to strip of
what we get from CVS was previously erroneously set to "repopath/.".
We now prevent the dot to be added.

Test folded in test-convert-cvs and simplified by Patrick Mézard
<pmezard@gmail.com>.
2010-03-09 12:09:57 +01:00
Martin Geisler
15b06379f2 Merge with stable 2010-03-06 10:02:45 +01:00
Martin Geisler
6159a1856b l10n: Updates to Danish (da) translation
Transmitted-via: Transifex (www.transifex.net)
2010-03-06 08:58:03 +00:00
Matt Mackall
4ad7bbe193 Added signature for changeset 5de69f546cce 2010-03-05 18:26:13 -06:00
Matt Mackall
84afa4dd8f mq: drop -Q in favor of --mq only 2010-03-05 17:24:52 -06:00
Sune Foldager
12da123bee mq: correct test output 2010-03-05 12:27:23 +01:00
Sune Foldager
533ddd28b6 mq: disallow : in patch names (issue2065) 2010-03-05 10:49:56 +01:00
Sune Foldager
868689388b mq: disallow # (and : on Windows) in patch names (issue2065) 2010-03-04 14:23:54 +01:00
Sune Foldager
2600e9adfd Merge with stable 2010-03-04 13:11:29 +01:00