Commit Graph

5348 Commits

Author SHA1 Message Date
Patrick Mezard
755593a7fa Merge with crew-stable 2007-10-04 14:26:34 +02:00
Thomas Arendsen Hein
245381e916 test-convert-git: support older git client (1.4.4.4) 2007-10-04 14:23:28 +02:00
Patrick Mezard
01d91ed943 Merge with crew-stable 2007-10-03 21:08:37 +02:00
Christian Ebert
aa9b7d6cfb test-convert-cvs: handle older cvs client 2007-10-03 21:01:47 +02:00
Bryan O'Sullivan
417886f00a Merge with crew 2007-10-02 21:01:00 -07:00
Bryan O'Sullivan
028f525b88 convert: fix a few residual bugs in darcs importer 2007-10-02 21:00:38 -07:00
Bryan O'Sullivan
5e33599d0f Merge with crew. 2007-10-02 13:49:36 -07:00
Bryan O'Sullivan
ecdd764817 convert: support darcs as a source repo 2007-10-02 13:49:11 -07:00
Bryan O'Sullivan
3ba6252dc7 convert: fail properly if we can't read a source hg repository 2007-10-02 13:48:52 -07:00
Bryan O'Sullivan
65b17f114c util: add default argument to strdate 2007-10-02 13:46:59 -07:00
Bryan O'Sullivan
57e084bf32 convert: add before/after hooks for converter sources 2007-10-02 13:46:17 -07:00
Benoit Boissinot
7cf891935c merge with -stable 2007-10-02 20:25:35 +02:00
Steve Borho
9f12241241 set_exec: do not chmod a symlink 2007-10-02 20:22:33 +02:00
Patrick Mezard
2b0b08ada6 Merge with crew-stable 2007-09-30 16:38:42 +02:00
Patrick Mezard
1ae2852b6f Test debugindexdot 2007-09-30 16:36:22 +02:00
Patrick Mezard
091596b961 Merge with crew-stable 2007-09-30 12:36:11 +02:00
Patrick Mezard
298631f312 Test mercurial convert sink removes empty directories. 2007-09-30 12:08:33 +02:00
Patrick Mezard
12ec5fa979 convert: fix missing import 2007-09-30 12:08:33 +02:00
Bryan O'Sullivan
cfd6f17898 Merge with crew-stable. 2007-09-29 21:10:54 -07:00
Bryan O'Sullivan
4f30385a85 convert: delete empty directories if deleting a file (bug 754) 2007-09-29 21:08:14 -07:00
Bryan O'Sullivan
cf0914fc76 Merge with crew. 2007-09-29 20:55:36 -07:00
Alexis S. L. Carvalho
07df6adfb5 revlog: fix revlogio.packentry corner case
We want to store version information about the revlog in the first
entry of its index.  The code in packentry was using some heuristics
to detect whether this was the first entry, but these heuristics could
fail in some cases (e.g. rev 0 was empty; rev 1 descends directly from
the nullid and is stored as a delta).

We now give the revision number to packentry to avoid heuristics.
2007-09-26 01:58:45 -03:00
Dirkjan Ochtman
7b9cb3b6fc Don't try to determine interactivity if ui() called with interactive=False.
WSGI applications are not supposed to refer to sys.stdin. In af5aceab19f4,
hgweb and hgwebdir were fixed to pass interactive=False to their ui()'s, but
sys.stdin.isatty() was still called by the ui objects. This change makes sure
only the ui.fixconfig() method will call ui.isatty() (by making the
ui._readline() method, which is currently only called from ui.prompt(),
private). ui.fixconfig() is changed to let config files override the initial
interactivity setting, but not check isatty() if interactive=False was
specified in the creation of the ui.
2007-09-25 19:05:34 +02:00
Alexis S. L. Carvalho
ddf41e005d Merge with crew-stable 2007-09-24 19:14:18 -03:00
Alexis S. L. Carvalho
6f75c91b5f convert_git: avoid returning two entries for the same file in getchanges
This could happen in merge changesets if the merged file was different
from both parents.
2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
38a7ae7001 mq: fix qrefresh -e with no patches applied 2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
4b5f93a4e8 Push over HTTP: really tell the user the size of the bundle 2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
6cc4435607 hgwebdir: ignore hgrc parse errors while building the index page
An error in the .hg/hgrc file from a repository would prevent the
following repos from being shown in the index page.

The IOError handling was unnecessary - it's already handled in
readconfig.

This should fix issue731.

The error in the .hg/hgrc file will still prevent the repo from
being exported with hgweb.
2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
e23adec251 hgweb: don't raise an exception when displying empty repos
The nullid node claims it's in the default branch, but the branch dict
is empty.  This fixes the main symptom from issue696, but we may want
to set branchtags()['default'] = nullid somewhere for empty repos.
2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
bef764be98 make identify an optionalrepo command
Fixes issue726.
2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
bcee2981c6 copy: if destination ends with "/", make sure it's a directory
Fixes issue724.
2007-09-24 19:00:11 -03:00
Matt Mackall
28d6a9f074 manifest: minor performance tweak 2007-09-24 12:42:25 -05:00
Matt Mackall
b7b5c1ade9 dirstate: speed up read and write
read:
- single call to len(st)
- fewer assignments for position tracking
- don't split apart tuple from unpack
- use a literal for the unpack spec

write:
- localize variables and functions
- avoid copied function call
- use % for string concatenation
2007-09-24 12:41:54 -05:00
Matt Mackall
c79b6cded5 dirstate: make dir collision logic faster
- shortcircuit decpath if we haven't built the _dirs map
- increment only for leafnodes of directory tree
  (this should make construction more like O(nlog n) than O(n^2))
2007-09-24 12:36:38 -05:00
Matt Mackall
1e7f28023a Merge with crew 2007-09-24 12:34:26 -05:00
Patrick Mezard
327e3eb360 revlog: fix inlined revision transaction extra data (issue 749) 2007-09-23 18:24:19 +02:00
Patrick Mezard
c6d86b7b87 Merge with crew-stable 2007-09-23 15:29:58 +02:00
Patrick Mezard
d611888360 Test renaming files brought by merge second parent (issue 746) 2007-09-23 14:40:44 +02:00
Patrick Mezard
58988c1395 localrepo: fix undelete() on merge working directory (issue 746) 2007-09-23 14:40:44 +02:00
Patrick Mezard
e735e01dae bisect: remove useless try/except 2007-09-22 19:05:36 +02:00
Patrick Mezard
f770ac70cd Merge with crew-stable 2007-09-22 18:56:36 +02:00
Patrick Mezard
091a0db4eb Test static-http calls on '/' URI (issue 747) 2007-09-22 18:52:26 +02:00
Paul Bx
ab0ccce138 statichttprepo: fix calls on '/' URI (issue 747) 2007-09-22 18:37:35 +02:00
Benoit Boissinot
2c52922666 bisect: don't write data on failure 2007-09-22 18:35:53 +02:00
Benoit Boissinot
5d47e0ef5a bisect: do silent init if necessary 2007-09-22 18:23:56 +02:00
Matt Mackall
e8a1dfd594 convert-cvs: update test to pass on Linux 2007-09-21 17:25:25 -05:00
Matt Mackall
e38e06ffb3 verify: report first bad changeset
- add linkrev and file arguments to err
- track lowest reported linkrev in err
- find linkrev in a couple cases
- sort linkrevs when reporting a bunch of errors against a file
- tidy up lots of messages
- make more robust against damaged indexes
- report first bad changeset if an error is encountered
2007-09-21 17:18:06 -05:00
Matt Mackall
ccc415d026 revlog: more robust for damaged indexes
- fix flag reporting
- make broken length reporting smarter
2007-09-21 17:14:39 -05:00
Matt Mackall
44c4641c5d debugindex: more robust for damaged indexes 2007-09-21 17:13:38 -05:00
Patrick Mezard
f54216b36e debuginstall: stop looking for patch utility, just test it 2007-09-15 16:07:05 +02:00