Dirkjan Ochtman
2f149e4634
replace usage of os.popen() with util.popen()
...
To make this possible, I added a mode parameter to both implementations of
util.popen(), defaulting to 'r' (as it does in the Python stdlib).
2008-04-14 14:34:38 +02:00
Dirkjan Ochtman
c60b0f560c
Merge with crew-stable.
2008-04-10 14:25:50 +02:00
Benoit Allard
81977fe9ba
highlight: backward compatibility with pygments 0.5.1
2008-04-10 14:24:27 +02:00
Dirkjan Ochtman
b639f42f79
win32text: actually import util so util.binary() can be used
2008-04-10 14:08:38 +02:00
Bryan O'Sullivan
324c60f864
Get rid of reimplementations of util.binary
2008-04-09 15:49:20 -07:00
Thomas Arendsen Hein
657d20646f
Fix spacing error introduced in d44685e2377e
2008-04-08 18:39:02 +02:00
Christian Ebert
0051fba0c0
keyword: check for '\0' in entire data before acting
...
util.binary might not be safe enough, as it fails eg. on certain
pdf files (issue1066).
2008-04-09 14:12:32 +02:00
Christian Ebert
65d5e4ac26
keyword: make overwrite() arguments mandatory
2008-04-09 14:05:57 +02:00
Christian Ebert
7567765ad1
keyword: compact setting of optional arguments
2008-04-09 14:05:57 +02:00
Christian Ebert
4f367170f4
keyword: privatize remaining monkeypatches by moving them into reposetup
...
Make it more transparent if and when monkeypatches are needed.
2008-04-09 14:05:57 +02:00
Christian Ebert
3064a91343
keyword: collect filename patterns, wrap dispatch._parse in uisetup
...
Store [keyword] config in kwtools.
hgcmd defaults to empty string.
2008-04-09 14:05:56 +02:00
Patrick Mezard
4f5e5e015a
Merge with crew-stable
2008-04-07 13:16:11 +02:00
Patrick Mezard
7d3027f767
convert: check svn branches are directories
2008-04-07 11:59:20 +02:00
Isaac Jurado
ec51524d45
highlight: Generate pygments style sheet dynamically
...
This patch allows a per-repository (for example, within a hgwebdir) selection
of pygments_style web option. No static .css files required.
Test edited by pmezard (compatibility fixes)
2008-04-05 21:29:02 +02:00
Patrick Mezard
6cb37d1b54
Merge with macencode branch
2008-04-05 19:33:34 +02:00
Patrick Mezard
5cbeea721c
win32text: rename forbidcrlforcr() function
2008-04-05 19:06:16 +02:00
Christian Ebert
76fba4c66a
patchbomb: fix cStringIO import (spotted by pychecker)
2008-04-05 17:48:10 +02:00
Patrick Mezard
08903ce085
Merge with crew-stable
2008-04-04 23:18:03 +02:00
Patrick Mezard
8fd2c54773
Merge backout
2008-04-04 23:13:32 +02:00
Patrick Mezard
db062e7060
Backed out changeset 86e4750e16d8
...
util.binary heuristic cannot be trusted when decoding working directory files.
2008-04-04 23:09:54 +02:00
Dirkjan Ochtman
ea3191d104
mq: add --force option to strip
2008-04-04 17:44:31 +02:00
Christian Ebert
87c730b788
pager: make config info accessible with "hg help pager"
2008-04-03 13:47:05 +02:00
OHASHI Hideya
3cdbbe36e4
win32text: Add macencode/macdecode
2008-04-03 20:41:31 +09:00
Dirkjan Ochtman
c31920c8cc
Merge from crew-stable.
2008-04-03 11:16:07 +02:00
Gilles Moris
5b548b29f2
Pager extension: switch it off if --debugger is set
...
The pager is preventing the debugger prompt and much of the
debugger output to be refreshed. Moreover the pager does not
make sense when debugging line by line.
(This supersedes the similar ui.debugflag patch. Disabling
the pager for debug output doesn't make that much sense,
as this is actually when the pager might be useful.)
2008-04-03 11:11:31 +02:00
David Soria Parra ext:(%20php.net%3E)
daf7ac79da
Pager extension: switch it off if --debugger is set
...
The pager is preventing the debugger prompt and much of the
debugger output to be refreshed. Moreover the pager does not
make sense when debugging line by line (Thanks to Gilles Moris).
2008-04-03 10:49:42 +02:00
Benoit Boissinot
d2251dcfd9
patchbomb: Fix mangling of lines beginning with From
...
we should mangle the lines beginning with From only when writing
to mbox format.
2008-04-02 01:49:29 +02:00
Matt Mackall
74e8b50e35
Merge with stable
2008-03-31 21:49:26 -05:00
Dirkjan Ochtman
61daef971b
convert: fix trailing space introduced in d44685e2377e
2008-03-31 13:10:47 +02:00
David Soria Parra ext:(%20php.net%3E)
b9cec105a4
pager: Add a configuration to enable/disable the pager for certain commands
...
Add the configuration options pager.ignore and pager.attend.
You can disable the pager on certain commands by adding them to the
pager.ignore setting. To whitelist commands, you can add them to pager.attend.
To disable or enable global commands like 'hg version' or 'hg help'
you have to use your global .hgrc. (thanks, Matt Mackall)
2008-03-29 19:41:50 +01:00
Christian Ebert
8d6395cf2d
keyword: regroup monkey patch code, underscore prefix private vars
2008-03-31 11:08:52 +02:00
Patrick Mezard
a01f6bda6d
Merge with crew-stable
2008-03-29 17:27:35 +01:00
Patrick Mezard
664a12a36c
convert: allow tags detection to be disabled
...
Tags calculation becomes more reliable but slower, measurable on frequent
synchronizations.
2008-03-29 17:16:18 +01:00
Patrick Mezard
686a0f8465
convert: follow svn tags history (issue953)
2008-03-29 17:15:45 +01:00
Patrick Mezard
f6b95792a5
convert: avoid svn log retrieval process cleanup
...
With huge history (like kdelibs), the process termination suddenly consumes a
lot of memory (from 700M to 1.3G+). Since the job is done, clean termination is
not required, just exit.
2008-03-29 17:14:53 +01:00
Dirkjan Ochtman
5e4724ae4e
highlight: some small cleanups
2008-03-28 17:31:50 +01:00
Dirkjan Ochtman
ef391be22f
hgweb: refactor hgweb code
2008-03-28 19:40:44 +01:00
Kirill Smelkov
b3208d45a6
churn: allow whitespaces as delimiter in aliases
...
it was exactly on space character before.
2008-03-28 11:17:10 +03:00
Bryan O'Sullivan
776bc63f5b
commit: when committing the results of a merge, it's all or nothing
...
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do. This fixes issue 1049.
2008-03-24 15:36:56 -07:00
Alexis S. L. Carvalho
7b6fc87ed3
mq: use repo.changelog.tip() instead of the "tip" tag
2008-03-24 18:07:07 -03:00
Alexis S. L. Carvalho
e3b08ba721
qclone: do not abort if remote hasn't enabled mq (issue1040)
2008-03-24 16:17:19 -03:00
Patrick Mezard
d098a6938d
convert: record deleted files in monotone source
2008-03-24 17:02:08 +01:00
Patrick Mezard
e54f2a771f
imerge: replace "merge" with "internal:merge" when non-interactive
2008-03-23 20:37:02 +01:00
Patrick Mezard
449fc02367
Make churn an official extension
2008-03-22 18:01:46 +01:00
Matt Mackall
dc1cdafff7
mq: warn when applying a patch to somewhere other than tip
2008-03-21 15:44:11 -05:00
Thomas Arendsen Hein
f0f68949d5
tab/space cleanup
2008-03-21 00:39:39 +01:00
Patrick Mezard
df0cbbb71a
convert: allow missing tools not to stop source type detection
2008-03-20 23:32:43 +01:00
Matt Mackall
a0ccc8000c
pager: further simplify code, clean up comments
2008-03-20 11:12:35 -05:00
David Soria Parra
190db7278a
Use the pager given by the environment to display long output
...
Unix systems usually have a PAGER environment variable set.
If it is set, mercurial will use the pager application to display
output.
Two configuration variables are available to influence the
behaviour of the pager:
pager.application
sets the application to be used
pager.quiet
silences Broken Pipe errors that might occur when the user
quits the pager before mercurial finished to write the output
2008-03-20 00:57:14 +01:00
Christian Ebert
054ab4657a
win32text: use util.binary to detect \0
2008-03-13 10:42:46 +01:00
