Commit Graph

5579 Commits

Author SHA1 Message Date
Matt Mackall
e777df13c0 copy: simplify inner copy
- save dirstate lookup and exists check
- do all fs work inside a single dryrun clause
- move unlinking into inner copy section
- move target dir creation
- eliminate undelete mess
- fix a bug on mv a -> b -> a after merge
2007-12-07 02:01:13 -06:00
Matt Mackall
7ccba02a77 copy: minor cleanups
- add after and dryrun variables
- add some comments
2007-12-07 02:01:10 -06:00
Matt Mackall
5078c44417 copy: propagate errors properly 2007-12-06 15:15:47 -06:00
Matt Mackall
6d83b8c76f copy: refactor okaytocopy into walkpat
- rename core copy function to copyfile
- move origsrc details into copyfile
- turn okaytocopy loop into walkpat
2007-12-06 14:58:57 -06:00
Matt Mackall
60b67b58aa copy: fix copying back with -A (issue836) 2007-12-02 18:41:22 -06:00
Matt Mackall
87c040230a move commands.docopy to cmdutil.copy 2007-12-02 18:11:59 -06:00
Matt Mackall
7d8a71a539 churn: avoid division by zero 2007-12-02 17:04:16 -06:00
Matt Mackall
1d88526edb update test output 2007-12-02 16:26:56 -06:00
Matt Mackall
2e547ddf4b doc: add repo/ to .hgignore and .hgtags
These names were disappearing in the asciidoc output and no form of
escaping seems to help. Let's just add repo/ to make it explicit that
they're in the repository root.
2007-12-02 15:52:36 -06:00
Matt Mackall
e03c4beef0 imported patch rollback-help 2007-12-02 15:26:01 -06:00
Matt Mackall
4c9c6fbda6 imported patch rev-help 2007-12-02 15:25:37 -06:00
Patrick Mezard
30d1cd81b7 hgwebdir: test virtual paths leading or trailing separators are stripped 2007-12-02 19:39:29 +01:00
Patrick Mezard
65e701f1ae Merge with crew-stable 2007-12-02 19:45:38 +01:00
Patrick Mezard
9421498212 hgwebdir: normalize virtual paths before stripping the separator
It is not even clear that virtual paths should be normalized as normal paths at all, we could expect slash to be the natural separator.
2007-12-02 19:39:27 +01:00
Steve Borho
6d589928ab win32: read system rcpath from registry
Using the module name was not always helpful.  It breaks down
when Mercurial is installed as source and when the Mercurial
libs are used by external applications.

This patch allows Mercurial installers to store the system wide
rcpath in the registry, where it can always be found.  HGRCPATH
is a poor option for storing the system wide rcpath, since it
overrides both the system and user rcpaths.
2007-12-02 17:15:03 +01:00
Patrick Mezard
e7dc152912 Merge with crew-stable 2007-12-02 14:06:10 +01:00
Patrick Mezard
4bd17cf5de mq: missing target files do not make qpush to fail immediately (issue 835)
Reported and explained by Peter Arrenbrecht <peter.arrenbrecht@gmail.com>.
Following file additions were skipped but empty files were still created. This situation could lead to qrefresh losing patch information.
2007-12-02 13:53:29 +01:00
Dirkjan Ochtman
857b34f4d7 Fix style nit and add some comments to tests. 2007-12-02 10:12:26 +01:00
Dirkjan Ochtman
a20c52b449 Use SCRIPT_NAME and PATH_INFO instead of REQUEST_URI. This is required by WSGI (fixes issue846). 2007-12-01 19:19:08 +01:00
Dirkjan Ochtman
2aa00c9c81 Add tests for hgwebdir repository names with slashes in them. 2007-12-01 19:10:00 +01:00
Dirkjan Ochtman
9851dc942e CGI compatibility fix for 77bd163fb48d. 2007-12-01 18:26:27 +01:00
Dirkjan Ochtman
eb63af80e4 Less indirection in the WSGI web interface. This simplifies some code, and makes it more compliant with WSGI. 2007-11-30 18:23:18 +01:00
Bryan O'Sullivan
4fa397a600 Drop a bad import that snuck in. 2007-11-28 13:58:31 -08:00
Bryan O'Sullivan
43a520697c hgweb: account for Python 2.4 in one test 2007-11-28 11:54:39 -06:00
Bryan O'Sullivan
9ae1a2c354 hgweb: fix breaking tests on Python < 2.5 2007-11-28 09:39:17 -08:00
Bryan O'Sullivan
acbe5bb17e Merge with crew 2007-11-28 08:39:05 -08:00
Bryan O'Sullivan
e19dabc11f hgweb: return meaningful HTTP status codes instead of nonsense 2007-11-28 08:38:42 -08:00
Bryan O'Sullivan
53b644c083 hgweb: make notfound templates more informative 2007-11-28 08:38:06 -08:00
Bryan O'Sullivan
adfac2beda hgweb: flesh out raw templates 2007-11-28 08:37:33 -08:00
Bryan O'Sullivan
d32d6fb57f make LookupError more detailed 2007-11-28 08:36:55 -08:00
Patrick Mezard
b09b0b3dcf Merge with crew-stable 2007-11-28 00:11:55 +01:00
Patrick Mezard
7d72f53113 hgweb.server: flush log files after every access 2007-11-27 23:55:03 +01:00
Bryan O'Sullivan
314630c85c convert: some tidyups, doc improvements, and test fixes
The various back end options are now documented.
The hg source can now be configured not to hand out a revision ID.
2007-11-27 09:44:09 -08:00
Bryan O'Sullivan
a364fef5fb Merge with crew 2007-11-26 17:24:21 -08:00
Bryan O'Sullivan
eff109c7b0 convert: tell the source repository when a rev has been converted
This lets us roundtrip changes between svn and hg.
2007-11-26 17:23:20 -08:00
Bryan O'Sullivan
d991d10d66 convert: save hg revision during a convert
This breaks hg->hg hash roundtripping, but that was fragile, didn't work
reliably, and hence arguably of little value.
2007-11-26 14:01:31 -08:00
Bryan O'Sullivan
3367073b9e Merge with mpm. 2007-11-26 12:25:55 -08:00
Patrick Mezard
eeff34ef5f Merge with crew-stable 2007-11-25 12:42:06 +01:00
Patrick Mezard
f280a41d83 test-import: test fuzziness, ambiguous patch locations 2007-11-25 12:17:30 +01:00
Jim Hague
5ef18ea71f patch: fix sort() comparator argument
'hg import' fails under Python 2.3. The name of the compare function parameter in the call to list.sort() is 'cmpfunc' in Python 2.3 and
'cmp' in Python 2.4+. Passing the compare function as a named parameter is therefore problematic.
2007-11-25 11:49:34 +01:00
Patrick Mezard
cbf322b12c cmdutil: make "files" list all files, add "file_mods" for modified files 2007-11-24 20:16:59 +01:00
Matt Mackall
21ee8a4e42 Merge with crew 2007-11-24 12:35:02 -06:00
Matt Mackall
93267d50c5 revlog: make revlogv0 loading more robust against corruption 2007-11-24 12:13:32 -06:00
Patrick Mezard
8f3f01adea cmdutil: always expose "files_add", "files_del" and "manifest" templater properties 2007-11-24 17:56:15 +01:00
Matt Mackall
c1ac09f205 push/pull: abort if we try to visit a missing or empty revlog 2007-11-21 13:26:18 -06:00
Matt Mackall
ad28be7c23 i18n: fix complaints from pygettext 2007-11-20 15:54:25 -06:00
Matt Mackall
a93c9d4d89 verify: improve handling of empty or missing files
- explicitly notice empty or missing changeset, manifest or file
  revlogs
- shortcircuit warnings relating to missing changeset or manifest
  revlogs
- fix changeset/manifest crosscheck swapped variables
- properly sort crosscheck messages
2007-11-20 15:46:20 -06:00
Patrick Mezard
80735bf58c Merge with crew-stable 2007-11-20 14:41:47 +01:00
Patrick Mezard
8ae803be30 mq: avoid qnew committing everything on invalid paths (issue 803)
If paths are supplied but resolve to nothing, localrepo.commit() is called with an empty set and commits the whole dirstate. Avoid this by passing the match function to commit.
2007-11-20 14:31:58 +01:00
Patrick Mezard
a9e1f119ec convert: read CVS files in chunks (issue 800)
socket.makefile() fails on large read requests (more than 10MB) with MemoryError.
2007-11-18 17:25:28 +01:00