Commit Graph

5868 Commits

Author SHA1 Message Date
Dirkjan Ochtman
4de316f884 hgweb: fast path for sending raw files 2008-01-18 19:53:38 +01:00
Dirkjan Ochtman
a854166262 hgweb: just return iterables instead of yielding them 2008-01-18 19:53:38 +01:00
Dirkjan Ochtman
e43716d86a hgweb: separate out start_response() calling 2008-01-18 19:53:38 +01:00
Dirkjan Ochtman
54b4ea87f1 hgweb: return iterable, add deprecation note 2008-01-18 19:53:38 +01:00
Dirkjan Ochtman
0d71615663 hgweb: remove some legacy code 2008-01-18 19:53:38 +01:00
Matt Mackall
63cc8c83c8 transform a bunch of print statements to appropriate ui calls 2008-01-18 10:48:25 -06:00
Matt Mackall
93afbf490d Merge with crew 2008-01-18 10:07:36 -06:00
Matt Mackall
d743a8c08a hooks: fix pre- and post- hooks specified in .hg/hgrc
We were looking up hooks in the wrong ui object. Also, we weren't
handling hooks to commands without a repo.
2008-01-18 09:03:17 -06:00
Nicholas Riley
05afc88692 [PATCH] zsh_completion tag/mq fixes
Been using these for almost a month now without problems, so I figured
some other people might want them.

This allows the zsh completion to work with tags and mq patch names
containing spaces, and adds support for qgoto.
2008-01-18 08:23:29 -06:00
Giorgos Keramidas
b766302801 tests: Use /bin/sh for test-journal-exists, /bin/bash may not be available 2008-01-18 03:06:05 +02:00
Patrick Mezard
f10cd30969 convert: document the subversion conversion model 2008-01-18 00:16:20 +01:00
Patrick Mezard
9dbb96c198 convert: fetch less revisions when looking for a branch parent 2008-01-17 23:46:56 +01:00
Patrick Mezard
bfc0212349 Test subversion branches conversion 2008-01-17 23:46:56 +01:00
Patrick Mezard
0f86329781 convert: make svn revision iterator interruptible 2008-01-17 23:46:56 +01:00
Patrick Mezard
77bf6d76c9 convert: fix cross-branches subversion revisions handling
The "one revision belongs to one branch" assumptions is relaxed. Branch
revisions are parsed down to the first branch copy encountered, older history
is skipped. It means the conversion is still not satisfying when dealing with
branches overwriting themselves. This issue already existed in the previous
version.
2008-01-17 23:46:56 +01:00
Matt Mackall
7a268371b0 patchbomb: prompt only once for SMTP password
- simplify mail._sendmail to be a function rather than a class
- simplify connect to return a function rather than a class
- move exception handling from mail.sendmail to mail.connect
- use a single connection for all messages in patchbomb
2008-01-17 13:51:59 -06:00
Matt Mackall
a68910fcf1 transactions: don't show a backtrace when journal exists
Now we simply print a message on how to recover.
2008-01-16 11:32:25 -06:00
Matt Mackall
df08f67213 Merge with crew 2008-01-16 11:14:51 -06:00
Matt Mackall
11423d02c7 diff: don't show function name by default
We'd mistakenly made the -p option always on, which meant there was no
way to turn it off. It also meant that we were sometimes splitting
multibyte characters in function name, which isn't a good default.
2008-01-16 11:14:24 -06:00
Thomas Arendsen Hein
d494cbe846 merge with main 2008-01-15 23:04:44 +01:00
Matt Mackall
a700f7f56c Merge with crew 2008-01-15 15:49:24 -06:00
Kostantinos Koukopoulos
9810930c5b convert should use default value when CVS_RSH is not set, that value
being 'ssh'.
2008-01-15 13:29:59 +02:00
Patrick Mezard
ba2d1c85b5 hgk: display branch name in diff header 2008-01-15 13:46:32 +01:00
Thomas Arendsen Hein
3b2b9afe52 Solaris compatibility fixes for test-keyword:
- do not use /bin/false (yields 255 instead of 1)
- do not use "cd -", simply use "cd .." instead.
2008-01-14 09:00:23 +01:00
Giorgos Keramidas
ce5f6f93a6 Display debugstate dates as '%Y-%m-%d %H:%M:%S' 2008-01-11 23:30:56 +02:00
Matt Mackall
262c766059 merge: add a bit more sanity to divergent copy checks 2008-01-14 16:28:32 -06:00
Christian Ebert
3cecc890c2 keyword: test that expansion is done filewise
Checks issue fixed in e56f3648b9a0.
2008-01-11 23:36:56 +01:00
Edouard Gomez
a51d1ef742 convert: separate trunk detection from branch layout detection
In some subversion repositories, trunk is present but no branches
are used. The current code is assuming that both trunk and branches
must exist before adding trunk's head to the heads list.

It's just better to separate the branch layout stuff from the trunk one.
2008-01-05 01:51:21 +01:00
Patrick Mezard
d1c841154d Merge with crew-stable 2008-01-12 20:49:07 +01:00
Patrick Mezard
2d2126f043 patch: handle empty vs no file in git patches (issue906) 2008-01-12 19:35:11 +01:00
Patrick Mezard
b3a11777ac patch: remove CRLF when parsing file names 2008-01-12 20:43:09 +01:00
Brendan Cully
ccd2e479d6 Merge with crew-stable 2008-01-11 18:33:10 -08:00
Brendan Cully
53f181168a Document --base null in bundle help 2008-01-11 18:31:13 -08:00
Bryan O'Sullivan
6fcd086ced Merge with mpm 2008-01-11 16:51:54 -08:00
Patrick Mezard
9cefa1b27a util_win32: implement posixfile_nt.writelines()
Used by the keyword extension.
2008-01-11 21:20:27 +01:00
Kirill Smelkov
73c5fc4e17 hg qrecord -- like record, but for mq
I'm a former Darcs user, and I've discovered that it is very convenient to
actually perform development using MQ first, and only when the patches are
'ready' move them to project's history in stone.


Usually I work on some topic, temporarily forgetting about any version control,
and just do coding, experimenting, debugging, etc.

After some time, I approach a moment, where my work should actually go to
patches/commits, and here is the problem::

    As it is now, there is no way to put part of the changes into one patch,
    and another part of the changes into second patch.

    This works, but only when changes are touching separate files, and for
    semantically different changes touching the same file(s) there is now
    pretty way to put them into separate patches.

For some time, I've tolerated the pain to run vim patches/... and move hunks
between files by hand, but I think this affects my productivity badly.


So, here is the first step towards untiing the problem:

    Let's use 'hg qrecord' for mq, like we use 'hg record' for usual commits!
2008-01-10 12:07:18 +03:00
Kirill Smelkov
c35576c935 cmdutil.commit: extract 'addremove' from opts carefully
we are going to use cmdutil.commit for qrecord, and it's brother
qrefresh does not support addremove.
2008-01-10 12:07:18 +03:00
Kirill Smelkov
e928c8fcaf dispatch: allow extensions to provide setup code
we'll need this soon, when record extension will optionally depend
on mq early -- when preparing cmdtable.

Also, if accepted, ExtensionHowto wiki should be updated as well.
2008-01-10 12:07:18 +03:00
Kirill Smelkov
e0f2ac6b4f record: refactor record into generic record driver
rationale
---------

I'd like to make MQ version of record -- qrecord.

>From the first glance it seemed to be easy -- the task in essence would be to
change call to cmdutil.commit() to something like mq.qrefresh().

As it turned out queue.refresh() and cmdutil.commit() have different semantics
-- cmdutil.commit() first scans for changes and then delegate the actual commit
to lowlevel func. On the other hand queue.refresh() do it all in once, and I am
a bit scary to change it.

Maybe the right way would be to first refactor queue.refresh() to use
cmdutil.commit() machinery, and then trivially adjust record, but I feel I'm
not competent for the task right now.

Instead, I propose we refactor record to be some sort of high-level driver, or
like a high-level decorator one can say, which will first interactively filter
changes, and then delegate commit job to high-level commiter, e.g. 'commit' or
'qrefresh'


So, this patch does just that -- refactor record to be generic driver, and
update 'hg record' code to use the driver.

'hg qrecord' will follow.
2008-01-10 12:07:13 +03:00
Kirill Smelkov
0b7c59b420 record: some docs
While studing record, I've written some docstrings and comments.
Hope they are useful.
2008-01-10 11:43:30 +03:00
Shun-ichi GOTO
d8777b5d83 New extension to support problematic MBCS on Windows.
The aim of this extension is to clear the problem related to having
0x5c in 2nd byte of encoded bytes.  So this extension is usefull for:
 * Japanese Windows user shift_jis encoding.
 * Chinese Windows user using big5 encoding.

To use this extension, simply enable it without any customization.

Note that some important python built-in functions and mercurial
functions are altered for this extension to convert argument if need
to handle MBCS.
2008-01-09 22:41:30 +09:00
Shun-ichi GOTO
da69eb2702 Fix not to use os.sep directly.
This change is intended for MBCS support.
2008-01-09 21:30:37 +09:00
Shun-ichi GOTO
fa59648c70 Add util.splitpath() and use it instead of using os.sep directly.
This change is intended to allow hooking splitpath() by win32mbcs
extension for MBCS support.
2008-01-09 21:30:36 +09:00
Shun-ichi GOTO
188e44cf4b Add endswithsep() and use it instead of using os.sep and os.altsep directly.
This change is intended to allow hooking endswithsep() by win32mbcs
extension for MBCS support.
2008-01-09 21:30:35 +09:00
Shun-ichi GOTO
478c0b9176 Use util.normpath() instead of direct path string operation.
This change is intended to allow hooking normpath() by win32mbcs
extension for MBCS support.
2008-01-09 21:30:13 +09:00
Shun-ichi GOTO
3dbc9b07a9 svn: fix copy exception 2008-01-11 14:06:05 -06:00
Matt Mackall
88e99c1e5f posixfile_nt: set closed early
Exceptions in __init__ may leave us with close undefined in __del__
2008-01-11 14:06:05 -06:00
Will Maier
213ea70ab4 Don't use the -i option with sed
This patch fixes test-keyword on platforms without GNU sed (like
OpenBSD).
2008-01-09 10:00:18 -06:00
Christian Ebert
fec93c5dc5 keyword: clean up quiet setting in kwdemo and adding of untracked kwfiles 2008-01-09 05:24:33 +01:00
Christian Ebert
4598383878 keyword: suppress keyword expansion for log commands
With previous bugfix "hg log -p" expanded keywords.
Turn off again by making log, tip nokwcommands.
2008-01-09 11:21:40 +01:00