Commit Graph

2312 Commits

Author SHA1 Message Date
Dan Villiom Podlaski Christiansen
3b0b530a9d mq: only highlight/label patch name for qseries.
Restore the behaviour introduced in 6805fe267fe5, which was
accidentally removed when labelling was introduced in af5046e50cc6.
2010-04-15 18:12:28 +02:00
Nicolas Dumazet
7f1a963829 pylint, pyflakes: remove unused or duplicate imports 2010-04-14 17:58:10 +09:00
Christian Ebert
00843e594b keyword: make the templater a local variable
After 9afcbefba307 a class attribute makes no sense.
2010-04-12 17:34:12 +02:00
Augie Fackler
8d7cb15f33 progress: fall back to indeterminate progress if position is >= total 2010-04-08 15:04:00 -05:00
Matt Mackall
e4c06cc26b mq: promote qnew, demote qinit in short help 2010-04-11 14:25:02 -05:00
Patrick Mezard
5aacf29983 Merge with crew-stable 2010-04-12 21:55:34 +02:00
Patrick Mezard
4070a4e9d2 convert/subversion: fix default URL checker prototype 2010-04-12 21:19:53 +02:00
Steve Borho
8299cbf24b rollback: add dry-run argument, emit transaction description 2010-04-09 17:23:37 -05:00
Steve Borho
c7ec998a7b localrepo: add desc parameter to transaction
All callers to localrepo.transaction() must supply a transaction description.
The description and the existing repository tip are then stored
(transactionally) into .hg/undo.desc; where rollback can later find it.
2010-04-09 17:23:35 -05:00
Matt Mackall
b0e809f105 Merge with stable 2010-04-07 14:44:51 -05:00
Henrik Stuart
c77aceb840 mq: use util.unlink instead of os.unlink and os.removedirs
If, on Windows, your repository and working copy are in a reparse point and you
use os.removedirs, you will remove non-empty reparse points, disabling the
reparse point. See @6b1369445b7b.
2010-04-07 16:55:01 +02:00
Steve Borho
bde27d9380 color: respect HGPLAIN 2010-04-06 08:54:18 -05:00
Steve Borho
898c5adf56 color: add support for Windows consoles
Introduces color.mode configurable with values 'auto', 'ansi', or 'win32'.  Any
other value disables coloring.  When 'auto' is selected, the win32 console
method will be used if the win32console Python module is detected (requires
pywin32 to be installed).
2010-04-06 08:49:19 -05:00
Steve Borho
b2f2de10b6 color: remove unused import 2010-04-06 08:44:13 -05:00
Matt Mackall
00f3284ee7 keywords: build a new templater to work around caching interaction 2010-04-05 15:25:08 -05:00
Brodie Rao
2f064ecab9 color: concatenate effects correctly and avoid printing empty effects 2010-04-04 22:53:50 -05:00
Brodie Rao
1ad67ea95f color: don't split colors across lines (which confuses less -R)
Currently, less -R doesn't support colors spanning multiple lines; only
the first line will be colorized.

Instead of allowing colors to span multiple lines, the color extension
now applies colors to each line it receives, even when ui.write() is
given multiple lines in one call.
2010-04-02 15:22:19 -05:00
Brodie Rao
e46074c7b3 color: colorize based on output labels instead of parsing output
By overriding ui.write(), ui.write_err(), ui.popbuffer(), and ui.label(),
the color extension can avoid parsing command output and simply colorize
output based on labels.

As before, the color extension provides a list of default colors for
core commands/labels. Other extensions can provide their own defaults by
specifying a colortable dict (similar to cmdtable).

In this process, --color is promoted to a global option and the deprecated
--no-color option is removed.
2010-04-02 15:22:17 -05:00
Brodie Rao
215b2d7a98 record: make use of output labeling 2010-04-02 15:22:15 -05:00
Brodie Rao
9422709db6 qseries: make use of output labeling 2010-04-02 15:22:14 -05:00
Brodie Rao
a7217d1b38 qdiff: make use of output labeling 2010-04-02 15:22:11 -05:00
Brodie Rao
28173d35ba qguard: make use of output labeling 2010-04-02 15:22:12 -05:00
Brodie Rao
f203aa2c4e churn: make use of output labeling 2010-04-02 15:22:10 -05:00
Brodie Rao
82d66d066d bookmark: make use of output labeling 2010-04-02 15:22:09 -05:00
Brodie Rao
9a7e3ba689 ui: add ui.write() output labeling API
This adds output labeling support with the following methods:

- ui.write(..., label='topic.name topic2.name2 ...')
- ui.write_err(.., label=...)
- ui.popbuffer(labeled=False)
- ui.label(msg, label)

By adding an API to label output directly, the color extension can forgo
parsing command output and instead override the above methods to insert
ANSI color codes. GUI tools can also override the above methods and use
the labels to do GUI-specific styling.

popbuffer gains a labeled argument that, when set to True, returns its
buffered output with labels handled. In the case of the color extension,
this would return output with color codes embedded. For existing users
that use this method to capture and parse output, labels are discarded
and output returned as normal when labeled is False (the default).

Existing wrappers of ui.write() and ui.write_err() should make sure to
accept its new **opts argument.
2010-04-02 15:22:00 -05:00
Matt Mackall
0726edad79 Merge with stable 2010-04-01 17:51:59 -05:00
Matt Mackall
d287a71ee7 Merge with i18n 2010-04-01 17:40:47 -05:00
Wagner Bruna
0d7a0676a9 mq: remove reference for deprecated -f option
-f is the default behaviour since a4e731b2164f
2010-04-01 19:32:08 -03:00
Martin Geisler
b9e372455e Merge with stable 2010-04-01 00:15:29 +02:00
Brendan Cully
3f85d60b3e Merge with stable 2010-03-31 15:09:59 -07:00
Martin Geisler
3e53380842 share: drop experimental label
As per mail from Matt:

  http://selenic.com/pipermail/mercurial/2010-March/030774.html
2010-04-01 00:02:12 +02:00
Michael Glassford
268693c3a0 Add missing --mq option to hg log.
Since norepo is a string, not a list, the norepo check was matching
command names against any substring in norepo. This fix splits norepo
into a list of commands.
2010-03-31 10:59:00 -04:00
Matt Mackall
c9d0f4131a Merge with stable 2010-03-30 13:09:25 -05:00
Matt Mackall
faa2c6e395 Merge with stable 2010-03-29 15:51:26 -05:00
Elifarley Callado Coelho Cruz
43acaba36c Added support for 'everybody ' (using an asterisk) in user list. 2010-03-29 09:15:08 -03:00
Mads Kiilerich
378848d5c1 convert.cvs: Initialize state variable and abort on cvs error
Fix as proposed by Frank Kingswood.

Avoids
UnboundLocalError: local variable 'mode' referenced before assignment
when cvs fails.

This alsa partially fixes issue1592.
2010-03-30 02:42:21 +02:00
Sune Foldager
8d7f484a9b merge with stable 2010-03-26 17:09:56 +01:00
Sune Foldager
7c4049acf8 localrepo: change _updatebranchcache to use a context generator 2010-03-26 17:02:23 +01:00
Benjamin Pollack
bcc53961eb schemes: add Kiln On Demand to default schemes 2010-03-24 16:42:08 -04:00
Patrick Mezard
3a9ceece66 Merge with crew-stable 2010-03-23 22:59:31 +01:00
Patrick Mezard
3e16f0baa3 rebase: fix --collapse with --keepbranches (issue2100)
This was broken in 6da9831a41d3.
2010-03-23 20:45:08 +01:00
Patrick Mezard
ff276d3f72 mq: fix qcommit documentation wrt --mq option 2010-03-23 10:18:46 +01:00
Benoit Boissinot
40a289572d mq: allow lines starting with '--- ' in patch messages 2010-03-18 19:26:56 +01:00
Cédric Duval
c0a6443df8 patchbomb: --desc implies --intro
For a single patch, an introductory text should not remain unsent
if --intro has been omitted, as the intent of --desc is clear.
2010-03-15 22:37:38 +01:00
Brendan Cully
791f92f6bd Merge with stable 2010-03-18 14:36:24 -07:00
Matt Mackall
6e515e4e5d progress: drop extra args for pos=None calls (issue2087) 2010-03-17 18:15:16 -05:00
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