Commit Graph

1370 Commits

Author SHA1 Message Date
Matt Mackall
e0735a1762 error: move repo errors
rename NoCapability to CapabilityError
2009-01-12 10:42:31 -06:00
Matt Mackall
d3bf622cc2 error: move ParseError 2009-01-11 23:04:24 -06:00
Matt Mackall
c25ea87091 kill imerge.py
It's been broken for a while.
2009-01-11 23:00:09 -06:00
Matt Mackall
d15d559b7c errors: move revlog errors
- create error.py for exception classes to reduce demandloading
- move revlog exceptions to it
- change users to import error and drop revlog import if possible
2009-01-11 22:48:28 -06:00
Dirkjan Ochtman
fbafb6374b transplant: move docstrings before imports (see issue1466) 2009-01-13 13:43:42 +01:00
Martin Geisler
dc4fd3bf46 mq: lowercase output
This extension produces quite a lot of informational messages during
its normal operation and it is hard to say which strings can be
changed and which cannot.
2009-01-03 17:15:21 +01:00
Martin Geisler
03c8c2c928 churn: lowercase output
This changes the continuously updated progress bar -- not something a
script would rely on.
2009-01-03 17:15:21 +01:00
Dirkjan Ochtman
574603a8c0 use dict.iteritems() rather than dict.items()
This should be faster and more future-proof. Calls where the result is to be
sorted using util.sort() have been left unchanged. Calls to .items() on
configparser objects have been left as-is, too.
2009-01-12 09:16:03 +01:00
Dirkjan Ochtman
aabce1d60c mq: allow qpop if popped revisions are not working dir parents 2009-01-12 09:07:02 +01:00
Dirkjan Ochtman
59115793ee mq: refactor the pop code to be more readable and allow more changes 2009-01-12 09:53:55 +01:00
Dirkjan Ochtman
b62067242a merge with crew-stable 2009-01-12 09:13:45 +01:00
Bernhard Leiner
bf4052120f mq: make qnew patch format consistent with qrefresh (issue1457) 2009-01-12 09:12:35 +01:00
Jim Hague
14ec6b1413 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail.
During 2.17, Bugzilla ditched the old 'processmail' script. With 2.18
contrib/sendbugmail.pl arrived in its place.

For notification emails to work properly, sendbugmail.pl requires as
its second parameter the Bugzilla user who made the commit. Otherwise
the user will not be recognised as the committer, and will receive
notification emails about the commit regardless of their preference
about being notified on their own commits. This parameter should be given
to processmail also, but wasn't for historical reasons.

Add new config with the local Bugzilla install directory, and provide
defaults for the notify string which should work for most setups.
Still permit notify string to be specified, and for backwards
compatibility with any extant notify strings try first interpolating
notify string with old-style single bug ID argument. Add new 2.18
support version to introduce sendbugmail.pl.

In other words, this update should be backwards-compatible with existing
installations, but offers simplified setup in most cases. And as a bonus
Bugzilla notification emails will be dispatched correctly; notifiers will
not receive an email unless configured to do so.
2009-01-09 22:15:08 +00:00
Benoit Boissinot
552f29178b use enumerate instead of zip 2009-01-09 01:37:54 +01:00
Benoit Boissinot
11526cacc9 patch: export shouldn't close files received as a parameter
We rely on __del__ to close the fd instead. Patchbomb was relying
on this behaviour, fix it.
Thanks to Manuel Barkhau for reporting it.
2009-01-09 01:36:35 +01:00
Patrick Mezard
92c099fb7a convert: display child command output if --debug (fix febd034db218) 2009-01-08 14:26:30 +01:00
Bryan O'Sullivan
886d5dda85 convert: print darcs error messages iff --debug 2009-01-07 17:33:29 -08:00
Bryan O'Sullivan
693c273256 convert: check for darcs-2-compatible path 2009-01-07 17:33:07 -08:00
Dirkjan Ochtman
7898fef4da merge with crew-stable 2009-01-06 10:33:57 +01:00
Jason Orendorff
500c43b1e4 mq: don't warn about ambiguous patch name when using patch index (issue1439) 2009-01-06 10:30:22 +01:00
David Soria Parra
d577bf3e66 zeroconf: add extension documentation 2009-01-05 20:49:12 +01:00
Benjamin Pollack
3d7cb92dd9 1 file changed, 7 insertions(+), 9 deletions(-)
hgext/purge.py |   16 +++++++---------


purge: clarify behavior with regard to ignored files

The purge documentation previously said that purge would delete ignored
files.  This is only true if purge is passed the --all option, which is
now stated explicitly.  A few trivial grammar errors were also fixed.
2009-01-05 12:48:20 -05:00
Patrick Mezard
cdcf39e446 Merge with crew-stable 2009-01-05 14:37:46 +01:00
Patrick Mezard
cfa7c44e4c convert/gnuarch: fix switched copy source and destination
Reported by Edouard Gomez <ed.gomez@free.fr>
2009-01-05 14:34:20 +01:00
Benoit Boissinot
722aaa1329 merge with crew 2009-01-04 21:49:37 +01:00
Patrick Mezard
93125a20b3 Merge with crew-stable 2009-01-04 21:44:06 +01:00
Patrick Mezard
c8f0bb9bb7 mq: drop copy records when refreshing regular patches (issue1441)
Copy information was saved in a common loop, then refined in a git-only block.
The problem was the latter did filter out renames occuring in the current
patch and irrelevant to commit. In the non-git case, copy records still existed
in the dirstate, referencing removed files, making the commit to fail. Git and
non-git copy handling paths are now separated for simplicity.

Reported by Gary Bernhardt
2009-01-04 21:32:40 +01:00
David Champion
f484d83337 cvsps: cvs log loop uses lookahead to avoid misleading text
Changes cvsps.py's cvs log reader to use a one-line lookahead, so
that possibly misleading log messages can be disambiguated.  In
particular I have past committers who used cvs log's 28-character
row of hyphens within commit messages; this throws cvsps and disrupts
conversion.  The only alternative in this case is to edit the cvs
,v file by hand, which bloodies mercurial's "don't change history"
principle.
2009-01-04 01:43:12 -06:00
Edouard Gomez
ab724af676 convert/gnuarch: recode cat-log parts to utf-8 to be hg.description friendly 2009-01-04 18:44:39 +01:00
Edouard Gomez
d7aad5cf36 convert/gnuarch: add cat-log payload to commit description 2009-01-04 18:44:30 +01:00
Dirkjan Ochtman
0d446da451 convert/gnuarch: correct indentation 2009-01-04 19:12:42 +01:00
Benoit Boissinot
f1393e61f3 merge with crew 2009-01-04 13:52:28 +01:00
Edouard Gomez
778729ff46 convert/gnuarch: follow continuation-of revisions
Built on top of previous patches:
 - continuation-of parsing
 - registered archives retrieval
 - use of fully qualified revisions

This allows the converter scanning for more source revisions
following the tree versions 'leaked' through the continuation-of
informations. Coupled with the registered archives retrieval, this
makes possible to decide to follow such a hint or stop scanning for
more revisions.

This also implies some changes in the retrieval of some base-0
revisions when they're continuation-of other revisions, in that
case a 'replay' will work where a simple 'get' fails because the
dir exists already. I found the code dealing with 'replay' quite
good as it has already a fallback to 'get' in the error path.
2009-01-04 02:36:48 +01:00
Edouard Gomez
4ea7ad0c50 convert/gnuarch: retrieve known archive names list
This will make possible in a followup patch to prevent
following history that is not reachable because an archive
is unknown to the user.
2009-01-04 02:36:48 +01:00
Edouard Gomez
dd0c6f737a convert/gnuarch: parse continuation-of revisions in gnuarch source
In GNU Arch, continuation-of was often used for:
 - tagging revisions
 - continue working on a project in a new archive, because arch
   was scaling poorly in revision numbers (cat-logs were slow
   to be parsed and scanned through)
 - very similar to the previous point, fork his own branch of
   a project.

Parsing this header information will allow to 'follow' new history
because it often hints at older/forked/personal revision trees.

This patch however just implements the parsing of the
continuation-of header. A followup patch will implement the proper
use of this new information.
2009-01-04 02:36:48 +01:00
Edouard Gomez
0c747d809d convert/gnuarch: use fully qualified revisions
There is no need loosing information in the conversion process. This could
lead to wrong shamap mappings if different archives used the same 'version'
naming.
2009-01-04 02:36:48 +01:00
Edouard Gomez
44d6dc97e7 convert/gnuarch: keep track of original revision in extra headers
It seems to be standard to populate the .rev attribute of a commit
to keep track of original SCM revision names.

Just do it(tm).
2009-01-04 02:36:48 +01:00
Edouard Gomez
d2bfa6d72f convert/gnuarch: robustify cat-log retrieval
GNU Arch used to scale very poorly when revision number was
increasing. This was mostly caused by the huge amount of
cat-log it has to scan/read through to keep track of all
patches that were merged in a given revision.

In order to improve things, cat-log prunning was a common
admin task that would accelerate cat-log parsing at the expense
of unreachabe locally stored cat-logs.

However, these missing cat-logs are still available in the archive.
So try to get them from the archive as a fallback solution.
2009-01-04 02:36:48 +01:00
Edouard Gomez
65ccb5e0de convert/gnuarch: set prefered locale for str conversions
Seems necessary, as a test on my archives goes further with this.
2009-01-04 02:36:48 +01:00
Edouard Gomez
1e555765a3 convert/gnuarch: fix cat-log parsing
cat-log parsing was very wrong. It assumed the Summary header
was comming last, which is wrong. Plus the code was buggy because
it was concatenating all headers in the summary.

As parsing GNU Arch isn't trivial, and python email code does it
so well... just use that ;-)
2009-01-04 02:36:48 +01:00
Edouard Gomez
d5da3e53f1 convert/gnuarch: remove unused code
Debug stuff ? Wipe it.
2009-01-04 02:36:48 +01:00
Dirkjan Ochtman
19267d8a4d cvsps: kill some more trailing whitespace 2009-01-03 21:25:19 +01:00
Martin Geisler
bcc3bda9f7 lowercase prompts
The prompts are interactive and not meant for scripts.
2009-01-03 17:15:21 +01:00
Martin Geisler
cbcd677f60 lowercase ui.debug and assert output
This does not effect the log or status commands and should be okay
according to the compatibility rules.
2009-01-03 17:15:21 +01:00
Martin Geisler
23608038bf lowercase help output
Changes docstrings to begin with a lowercase word. Only docstrings
used in help output is changed.

Scripts are not expected to grep the output of 'hg help' so this
change should pose no problem with regard to the compatibility rules.
2009-01-03 17:15:15 +01:00
Martin Geisler
a88ad2d84e mq, i18n: mark strings for translation 2009-01-03 16:15:11 +01:00
Martin Geisler
336bd98e22 use repo.wjoin(f) instead of os.path.join(repo.root, f) 2009-01-02 22:53:33 +01:00
Benoit Boissinot
e2908a6b20 merge bookmarks 2008-12-31 15:04:18 +01:00
Alexander Solovyov
c1774bb6c3 python implementation of diffstat
Implemented as two functions: diffstat, which yields lines of text,
formatted as a usual diffstat output, and diffstatdata, which is called
inside diffstat to do real performing and yield file names with
appropriate data (numbers of added and removed lines).
2008-12-25 10:48:24 +02:00
Gilles Moris
5483cf6270 color: fix colorization of the 'old mode' git diff metadata 2008-12-19 22:32:08 +01:00