Commit Graph

7848 Commits

Author SHA1 Message Date
Patrick Mezard
6bbead8918 convert/mtn: handle files moved in a moved directory (issue1619/2) 2009-04-21 22:31:16 +02:00
Paul Aurich
477feb0ff9 convert/mtn: handle subsecond commit dates (issue1616) 2009-04-21 15:57:15 +02:00
Patrick Mezard
551e0cf361 convert/mtn: handle new files in moved directories (issue1619)
Reported and investigated by Paul Aurich <paul@darkrain42.org>
2009-04-21 14:17:29 +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
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
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
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
Matt Mackall
e31a8bb788 atom: fix URLs used in entry GUIDs 2009-03-16 17:21:06 -05:00
Matt Mackall
805511403b resolve: move reset to localrepo.commit
This way rebase doesn't leave a stale resolve state
2009-03-16 16:58:41 -05:00
Matt Mackall
891ec3832e resolve: keep .orig files 2009-03-16 16:58:41 -05:00
Matt Mackall
56a3a8557f Merge with crew-stable 2009-03-09 11:41:38 -05:00
Benoit Boissinot
c34938cba1 verify: find correct first corrupted cset for missing/corrupted revlogs 2009-03-07 20:16:03 +01:00
Benoit Boissinot
5ed5555a2d verify: do not abort on fully corrupted revlog 2009-03-07 20:04:56 +01:00
Benoit Boissinot
35d90d90ba hgweb: fix allow_read permissions when a user is specified
Thanks to Juan Pablo Aroztegi for reporting and debugging it.
2009-03-07 00:59:41 +01:00
Mads Kiilerich
240dc61d24 test-identify: require no-outer-repo
The test expects "There is no Mercurial repository here (.hg not found)"
2009-03-05 14:53:59 +01:00
Benoit Allard
bf86b21b09 update copyright date in version information 2009-03-05 10:38:39 +01:00
Dongsheng Song
3cab4b874a Typo fix 2009-03-05 14:44:13 +08:00
Steve Borho
270940d51c update copyright in ReadMe.html 2009-03-04 22:56:17 -06:00
Matt Mackall
81073ba20c setup.py: fix version detection for tarball
- don't do version detection if there's no .hg directory
- shrink try: clause
- don't write __version__.py if version is unknown
  (we might overwrite the real version)
2009-03-06 09:15:47 -06:00
Matt Mackall
afd0e02098 Added signature for changeset 66a06202b565 2009-03-04 19:04:21 -06:00
Frank Kingswood
a2f1d401c2 convert: Perforce source for conversion to Mercurial 2009-03-03 21:32:23 +00:00
Matt Mackall
f91e781c87 remove tests for long-gone imerge extension 2009-03-04 18:42:24 -06:00
Augie Fackler
bf90b0cbb4 merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
2009-03-04 13:06:16 -06:00