Commit Graph

1180 Commits

Author SHA1 Message Date
Brendan Cully
428ac5338a mq: heavy rearrangement of qnew to make it recover reliably from errors.
Closes issue1269.
2008-10-18 21:52:22 -07:00
Brendan Cully
c935fe6e01 mq: abort qnew -f if any file in an explicit list cannot be read 2008-10-18 20:45:53 -07:00
Brendan Cully
eeb6237595 mq: make qimport -f work properly. Closes issue1255.
From Bernhard Leiner.
2008-10-18 17:29:45 -07:00
Brendan Cully
08cb02aa5a mq: let qimport read patches from URLs 2008-10-18 16:40:01 -07:00
Brendan Cully
cc98fdf26c mq: do not invoke editor until just before patch creation. Closes issue1346. 2008-10-18 16:33:10 -07:00
Benoit Boissinot
56d9a3258b merge with crew 2008-10-18 23:20:23 +02:00
Benoit Boissinot
3babcafb3e inotify: fix status not showing "clean" files (issue907)
The inotify server uses 'c' for clean, not 'n'.
2008-10-18 23:06:29 +02:00
Brendan Cully
203e3723e8 Prevent import over an applied patch (closes issue795) 2008-10-18 13:22:29 -07:00
Stefano Tortarolo
7658d9947c rebase: disable rollback after rebasing 2008-10-18 17:00:28 +02:00
Martin Geisler
657a408af8 churn: corrected help output 2008-10-18 16:51:26 +02:00
Dirkjan Ochtman
c5e3760e1d help: better documentation intro for a few extensions 2008-10-18 16:56:39 +02:00
Christian Ebert
5cbc9e210a highlight: convert text to local before passing to pygmentize (issue1341)
Example case:
Display file written in iso-8859-1 with current HGENCODING utf-8.
At the moment only an Error page appears because pygmentize
chokes on the replacement chars.

Alternatives:
1) Turn off highlighting and avoid UnicodeDecodeError
   for files that are not in HGENCODING.
2) [this patch] use util.tolocal to display these files.

Alternative 2) seems ok, as this only concerns display and
readability.

See also: c5f1a58b8b9a, apparently put aside during refactor of
highlight.

Add test for UnicodeDecodeError with iso-8859-1 file contents.
2008-10-17 12:12:33 +02:00
Christian Ebert
586a27bcb7 notify: mime-encode messages
- addresses will be properly encoded
- message bodies will also be encoded as we are not sending
  patches that are meant to be applied
- update test output
- adapt test-keyword to ignore the new headers
2008-07-12 19:12:18 +01:00
Christian Ebert
626bb525a0 patchbomb: mime-encode headers and parts not containing patches
Do nothing for "hg email --test" to preserve display.
2008-07-12 19:12:10 +01:00
Mads Kiilerich
552c248fa5 mq: Allow qrefresh --silent to take parameters
'hg qrefresh --short file.txt' now adds changes made to file.txt to current
patch.

This builds on a patch for implementing --amend by Kirill Smelkov as discussed
in issue933.

FIXME: Why do mq refresh have two matchers if we only need one?
2008-10-17 21:26:39 +02:00
Dirkjan Ochtman
67bd09df5b python2.6: use subprocess if available 2008-10-05 21:35:26 +02:00
Patrick Mezard
71877ea8d9 convert: make built-in cvsps the default
Reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>
2008-10-15 20:14:28 +02:00
Patrick Mezard
8e45917fce convert: fix builtin cvsps under Windows
Drafted and reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>.
2008-10-13 17:31:03 +01:00
Christian Ebert
53abba7e41 patchbomb: consistently use opts.get 2008-10-07 13:57:00 +02:00
Matt Mackall
37121b48f9 zeroconf: advertise a proper hostname for _hg services 2008-10-12 15:21:08 -05:00
Matt Mackall
84b350fc7d zeroconf: use only first part of hostname for building local name 2008-10-12 15:21:08 -05:00
Matt Mackall
d9f96e12e7 inotify: avoid status getting out of sync
Always looking up oldstatus keeps us from failing to update our state
when we disagree with the dirstate.
2008-10-12 15:21:08 -05:00
Matt Mackall
ad08a5e361 inotify: fixup rebuilding ignore 2008-10-12 15:21:08 -05:00
Matt Mackall
84505139dc inotify: skip deactivation message 2008-10-10 11:29:57 -05:00
Matt Mackall
894d30e88b inotify: fix confusion on files in lookup state 2008-10-10 11:29:30 -05:00
Alexander Solovyov
79c547d51d churn: py2.3 compatibility fix
- generator expressions appeared in py2.4
 - sort doesn't have any arguments except sorting function
2008-10-10 15:53:49 +03:00
Patrick Mezard
f8f73e46ef Merge with crew-stable 2008-10-10 13:20:40 +02:00
Patrick Mezard
3eb95e081f convert: properly encode subversion URLs (issue 1224) 2008-10-10 11:36:02 +02:00
Patrick Mezard
0107794fd2 convert: tolerate embedded spaces in filemap source revisions 2008-10-10 11:32:38 +02:00
Matt Mackall
dd40e6aca7 zeroconf: initial implementation
This is a basic, hopefully portable, zeroconf extension.

Enabling it will allow hg paths/pull/push/clone/etc. to automatically
discover services advertised as "_hg".

And naturally, running hg serve will advertise itself as a "_hg"
service as well as a "_http" service for use by browsers.
2008-10-08 19:58:35 -05:00
Alexander Solovyov
dfa7272d1d churn and stats commands merged 2008-10-09 00:14:20 +03:00
Alexander Solovyov
0d41308ed2 churn: generalisation, now it is possible to see statistics grouped by custom template 2008-10-03 00:07:38 +03:00
Dirkjan Ochtman
a3c364ffd3 convert: fixed python2.3 incompatibility in bzr source (generator expression) 2008-10-02 15:48:57 +02:00
Patrick Mezard
c4a9b7abb7 convert: improve convert_source documentation 2008-09-29 09:30:36 +02:00
Marek Kubica
0f790a60a5 convert: add bzr source 2008-09-26 20:33:47 +02:00
Martin Geisler
9eb8225664 i18n, churn: mark string for translation 2008-09-23 22:01:40 +02:00
Sune Foldager
1465c20864 fetch: use dirstate branch instead of first parents 2008-09-24 13:22:11 +02:00
Benoit Boissinot
bb6f34eb86 inotify: add client code for long pathname handling 2008-09-07 15:10:11 +02:00
Benoit Boissinot
6600c99d5a inotify: workaround ENAMETOOLONG by using symlinks
If we can't create the unix socket because the path is too long
we create the socket in a temporary directory and symlink it into
the repo.

Fix issue1208
2008-09-06 14:11:33 +02:00
Benoit Boissinot
5b0f8d909f inotify: deactivate inotify status on failure
workaround issue1208, add test
fix traceback handling (socket.error is a singleton in this case)
2008-09-06 12:49:20 +02:00
Benoit Boissinot
9849809bc7 inotify: fix traceback when the server has been already started 2008-09-06 12:48:52 +02:00
Benoit Boissinot
9ceefedcef merge with -stable 2008-09-10 23:20:04 +02:00
Jim Hague
788364de51 Add support for Bugzilla 3.0 series to bugzilla hook.
The only difference is 'fieldid' in table 'fielddefs' got renamed
to 'id' for 3.0.
2008-08-29 20:36:55 +01:00
Martin Geisler
63784c935a i18n, record: improve use of translated docstring in prompts
The old code would confuse the user if the translator actually
translated the letters "Ynsfdaq?" in the prompt, since the user input
would be matched against the English string, despite the translation.

The new code fixes this, but the translator must be 100% consistent.
Also, the translation of single character strings is problematic if
they are used differently by different pieces of code.
2008-09-09 21:32:39 +02:00
Sune Foldager
71dc05b36f fetch: added support for named branches
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
2008-09-08 12:55:46 +02:00
Martin Geisler
ce59efd5c2 i18n, mq: mark command line options for translation 2008-09-06 17:44:03 +02:00
Martin Geisler
43bddfde19 i18n, imerge: mark command line for translation 2008-09-06 17:44:02 +02:00
Martin Geisler
b8d2a11cdc i18n, hgk: mark command line options for translation 2008-09-06 17:44:01 +02:00
Martin Geisler
4ca32a1fdf i18n, convert: mark command line options for translation 2008-09-06 17:43:59 +02:00
Benoit Boissinot
ebcbcef11c merge with -stable 2008-09-06 17:04:01 +02:00