Commit Graph

8057 Commits

Author SHA1 Message Date
Christian Ebert
510a4bc8a5 test-highlight: adapt output to latest pygments keeping backwards compatibility 2009-04-19 13:27:03 +01:00
Benoit Boissinot
4114ea7f05 merge with stable 2009-04-18 22:54:37 +02:00
Greg Ward
524e44bf0e cvsps: make debugging easier by adding __repr__() methods. 2009-04-18 09:43:21 -04:00
Greg Ward
53ff712654 cvsps: update docstring for changeset class. 2009-04-18 09:44:51 -04:00
Benoit Boissinot
8ca5d6ee82 merge with crew 2009-04-18 16:44:24 +02:00
Greg Ward
fd1580418a manifest: improve error message about newlines in filenames
Include the offending filenames in the error message.  Now this error message
is consistent with the same error issued by dirstate.py (although there is
still duplicate code).
2009-04-18 09:48:59 -04:00
Martin Geisler
52ce98c9a8 help texts: write command line switches as -a/--abc 2009-04-18 14:40:21 +02:00
David Frey
feea6494c8 Update qimport help explaining how to read a patch from stdin (Issue371) 2009-04-18 00:21:11 -07:00
Henrik Stuart
c1e6537e5f strip: make repair.strip transactional to avoid repository corruption
Uses a transaction instance from the local repository to journal the
truncation of revlog files, such that if a strip only partially completes,
hg recover will be able to finish the truncate of all the files.

The potential unbundling of changes that have been backed up to be restored
later will, in case of an error, have to be unbundled manually. The
difference is that it will be possible to recover the repository state so
the unbundle can actually succeed.
2009-04-16 15:34:03 +02:00
Henrik Stuart
e8d7a7c8ef transaction: support multiple, separate transactions
Solves that committed (closed) transactions may linger and be returned
on subsequent transaction calls, even though a new transaction should
be made, rather than a new nested transaction.

This also fixes a race condition with the use of weakref.
2009-04-15 19:54:22 +02:00
Henrik Stuart
c57f2e28ee transaction: only delete journal on successful abort/commit
This solves that the journal file was always deleted when the transaction
was deleted, no matter whether the abort (rollback) succeeded or not.
Thus, never supporting a hg recover. The journal file is now only deleted
on close (commit) or a successful abort.
2009-04-16 15:41:25 +02:00
Tobias Bell
b783216f45 i18n-de: synchronised with hg.pot 2009-04-14 18:16:04 +02:00
Nicolas Dumazet
93ddede9f9 inotify: Do not raise TypeError when client.query returns None
When something went wrong in client.query, it returns None.
If inotify.debug=True, we will attempt in this case a zip(A, None, B), which
would raise a TypeError.
2009-04-08 14:15:18 +09:00
Nicolas Dumazet
d788ab8874 inotify: Simplifying init code
simplifying

retry = False
try:
    try:
        doA()
        retry = True
    except X:
        doB()
        retry = True
except:
    doC()
    pass
if retry:
    doD()

 -- into --

try:
    try:
        doA()
    except X:
        doB()
except:
    doC()
    pass
else:
    doD()
2009-04-08 13:29:51 +09:00
Nicolas Dumazet
2a759b6b22 inotify: files is always a list: 'files or []' is redundant
files comes from match.files() : it always returns a list.
2009-04-08 13:27:28 +09:00
Patrick Mezard
cd3505dbbc Merge with crew-stable 2009-04-13 21:57:17 +02:00
Patrick Mezard
0d13db37f7 extdiff: preserve execute-bit across copies (issue1562)
Bug report and test by Mads Kiilerich <mads@kiilerich.com>
2009-04-09 14:32:44 +02:00
Patrick Mezard
de41b9ace4 extdiff: merge node and working dir snapshot modes 2009-04-13 21:21:01 +02:00
Patrick Mezard
b3f0d7b5b8 convert/p4: win32 fixes
* cmd.exe does not know single quotes
* win32 does not like trailing whitespace very much. Trade test coverage for
  maintenance time and drop the trailing whitespaces tests.
2009-04-13 16:15:45 +02:00
Patrick Mezard
3ca6ee213a test-issue1438: make executable 2009-04-13 21:18:53 +02:00
Patrick Mezard
4764779700 context: fix workingctx.__contains__ 2009-04-13 19:47:11 +02:00
Patrick Mezard
b41a06764a httprepo: hide password in debug traces too 2009-04-13 14:33:47 +02:00
Steve Borho
7d99d0a5a5 hide passwords in httprepo error messages 2009-04-11 18:34:21 -05:00
Patrick Mezard
0dbcb77e35 convert/mtn: record changes from directory renames (issue1587)
Bug report and initial path by Pavel Volkovitskiy <int@mtx.ru>
2009-04-11 23:12:42 +02:00
Nicolas Dumazet
36eacb3699 run-tests: detect when hghave fails to check for a feature and fail test
hghave exitcode != 0 might mean that hghave failed to check for feature
avaibility. Detect those cases, and fail the test, instead of skipping it.
2009-04-08 02:38:23 +09:00
Nicolas Dumazet
f5d17ae79b hghave: checking that all targets are Exception-free 2009-04-08 02:34:00 +09:00
Pascal Quantin
a962927931 Add Python 2.6 support to win32 installer
With Python 2.6, win32 installer should try to package MSVC9.0 dlls instead of
MSVC7.1 dlls
2009-04-11 21:58:28 +02:00
Augie Fackler
00f768d1f1 test-convert-svn-sink: rewrite output for svn compatibility
Addition by Patrick Mezard <pmezard@gmail.com>:
* drop 'kind=' lines from svn 1.6 output
2009-04-04 20:39:46 -05:00
Patrick Mezard
2ae17cf19b convert/bzr: fix file rename replaced by a dir case (issue1583)
We were not checking entry types, and getting file content was working with
directories instead of raising IOError.
2009-04-11 20:18:51 +02:00
Patrick Mezard
692471cd12 Fix manifest default rev doc when no rev is checked out (issue1603) 2009-04-10 13:00:28 +02:00
Patrick Mezard
1e07615a4a test-convert-bzr: check renamed files are removed (issue1505) 2009-04-08 23:17:33 +02:00
Xavier ALT
82ecb55fcf convert: remove renamed source files (issue1505) 2009-04-08 22:59:02 +02:00
Benoit Boissinot
e5ea532970 raise RevlogError when parser can't parse the revlog index
Initial patch and test thanks to Nicolas Dumazet.
2009-04-06 19:48:11 +02:00
Simon Heimberg
5ebb56cc6d error: import LockError from correct module 2009-03-31 07:56:28 +02:00
Greg Ward
47d2411255 issue1577: fix broken test by assuming less about CVS output.
Specifically, output of "cvs ci" varies unpredictably across CVS versions,
so any test that includes the output of "cvs ci" is doomed to fail
some of the time.  This fixes that by discarding the output of "cvs ci".
2009-03-28 12:24:53 -04:00
Brodie Rao
cb9a8632f9 hgweb: fix undefined name RepoError 2009-03-27 11:17:46 -04:00
Dirkjan Ochtman
fe39d83f68 cleanup: remove all trailing whitespace 2009-03-23 13:11:11 +01:00
Peter Arrenbrecht
b1f5d67640 keepalive: fix reference to IncompleteRead 2009-03-23 11:12:01 +01:00
Pascal Quantin
79f2ac527a merge tools: fix typo in Beyond Compare's 3 command line
Fix a typo error preventing 'base' to be displayed properly.
2009-03-23 10:48:45 +01:00
Matt Mackall
1fca17b321 Fix new CVS test output 2009-03-20 18:49:44 -05:00
Matt Mackall
4ccf2f5c68 Added signature for changeset e2c1048c9faf 2009-03-20 17:58:11 -05:00
Greg Ward
c9426abe07 cvsps: recognize and eliminate CVS' synthetic "file added" revisions. 2009-03-18 09:15:38 -04:00
Steve Borho
1495d07855 demandimport: blacklist pythoncom
win32com.shell would segfault at import time if pythoncom
was demand loaded.
2009-03-09 21:00:37 -05:00
Matt Mackall
02f3d06343 diffstat: use width 80 by default and avoid division by zero 2009-03-20 14:38:50 -05:00
Dirkjan Ochtman
0027b7f5ed convert: honor 2.3 compatibility (rsplit) 2009-03-18 17:49:11 +01:00
Benjamin Pollack
022828a7a5 regression test for issue1552
Ensures that fetch correctly infers what to merge when pulling a
repository with inactive branches.
2009-03-17 11:34:40 -04:00
Benjamin Pollack
206a106a49 fetch: do not count inactive branches when inferring a merge
The fetch extension would erroneously consider inactive branches when
inferring which branches to merge.  It now considers only active
branches.
2009-03-17 11:47:40 -04:00
Matt Mackall
7d51e0b1f6 bundlerepo: reintroduce dirstate 2009-03-17 13:43:11 -05:00
Michael Springmann
10782daaf2 exporting patch:
Fixed behavior of revsplit for branch names including the @-symbol.
2009-03-13 21:14:57 +01:00
Augie Fackler
526bbde326 bisect: fix --command for me. 2009-03-09 17:13:12 -05:00