Commit Graph

11989 Commits

Author SHA1 Message Date
Matt Mackall
60627b799a bundlerepo: remove duplication of bundle decompressors 2010-08-25 16:55:54 -05:00
Matt Mackall
6b94ff7674 bundle: introduce bundle class 2010-08-25 16:53:06 -05:00
Matt Mackall
ee35426eda bundle: unify/refactor unbundle/readbundle 2010-08-25 15:33:06 -05:00
Matt Mackall
35ddd7d020 bundle: factor out decompressor 2010-08-25 15:33:05 -05:00
Matt Mackall
aad5cb0594 merge with stable 2010-08-25 15:20:25 -05:00
Matt Mackall
c5711377a4 statichttprepo: disable pushkey 2010-08-24 13:13:35 -05:00
Brodie Rao
6c64db37bc alias: make shadowing behavior more consistent (issue2054)
Currently, given an alias like the following:

    [alias]
    summary = summary --remote

The alias might be executed - or it might not - depending on the order
of the cmdtable dict.

This happens because cmdalias gets assigned back to the cmdtable like so:

    cmdtable['summary'] = ...

Yet '^summary|sum' is still in the table, so which one cmdutil.findcmd()
chooses isn't deterministic.

This patch makes cmdalias assign back to '^summary|sum'. It uses the same
cmdtable key lookup that extensions.wrapcommand() does.
2010-08-21 22:48:14 -04:00
Yuya Nishihara
f2b7b3bc23 hgweb: handle exception of misconfigured path on index page
If hgweb.config contains wrong path mapping, hgweb causes internal server
error on repository index page.

This patch changes makeindex() to ignore RepoError, because it looks to be
designed to suppress configuration error.
2010-08-24 23:30:51 +09:00
Martin Geisler
e215b992dc context: mark string for translation 2010-08-25 13:29:46 +02:00
Dan Villiom Podlaski Christiansen
5e79668de4 mq: extend support for the --mq argument to extension commands
This allows commands like `purge' to accept the --mq option.
2010-08-13 16:05:08 +02:00
Patrick Mezard
6603319ceb repository: drop unused rjoin() method
This method was introduced by b0e5c3bce42a but grepping the history does not
reveal any call. Extensions may use it but the method intent is not even clear
to me.
2010-08-22 13:17:34 +02:00
Adrian Buehlmann
a612b24fe8 tests: unify test-export 2010-08-24 15:13:11 +02:00
Martin Geisler
2f9eb9bd07 revert: wrap long line 2010-08-25 16:40:49 +02:00
Martin Geisler
bfea979db3 util: remove lexists, Python 2.4 introduced os.path.lexists 2010-08-25 16:23:32 +02:00
Martin Geisler
2d00197a3e Merge with stable 2010-08-25 13:40:46 +02:00
Martin Geisler
1fa82565d6 Merge with stable 2010-08-23 22:22:05 +02:00
Martin Geisler
130528a2c3 bookmarks: guard against listing bookmarks on unsupported repos
This fixes clones and pulls from statichttprepository repos.
2010-08-23 22:16:56 +02:00
Benoit Boissinot
0a73b8e369 mdiff.patch(): add a special case for when the base text is empty
remove the special casing from revlog.addgroup()
2010-08-23 13:28:04 +02:00
Benoit Boissinot
cdd70dbbdc revlog: add rawsize(), identical to size() but not subclassed by filelog 2010-08-23 13:24:19 +02:00
Benoit Boissinot
6b8f2ae045 revlog.addrevision(): move computation of nodeid in addrevision()
The check "if node in nodemap" is already done earlier in addgroup().
2010-08-22 23:17:17 +02:00
Benoit Boissinot
2a5344e149 contrib/compress: compress should activate parentdelta 2010-08-22 19:41:04 +02:00
Benoit Boissinot
f1dc9e3787 contrib/compress: correct ordering of copying
Changelog should always be copied last, otherwise readers can see an
inconsistent repo.
2010-08-22 19:27:09 +02:00
Benoit Boissinot
b68994148f contrib/compress: refactor revlog copying 2010-08-22 19:26:07 +02:00
Benoit Boissinot
ca7a857d7d contrib/compress: use store API instead of a collector 2010-08-22 19:13:30 +02:00
Benoit Boissinot
984cffb62e contrib/compress: proper lock handling
Lock the src repo before beginning the compression and lock the destination
repo before copying the revlogs.
Proper handling of exceptions.
2010-08-22 18:29:30 +02:00
Benoit Boissinot
349b6aaab5 contrib/compress: use hg API to compute the destination path 2010-08-22 18:23:32 +02:00
Benoit Boissinot
e7a85d1ff5 contrib/compress: use repo's transaction method 2010-08-22 18:21:30 +02:00
Benoit Boissinot
75b2e19c12 contrib/compress: remove unused variables 2010-08-22 18:18:36 +02:00
Brodie Rao
bf4b0442af tests: unify test-hgrc 2010-08-21 23:24:52 -04:00
Patrick Mezard
6bd03fa85b tests: remove test-log.out, useless after unification 2010-08-22 12:04:15 +02:00
Benoit Boissinot
25c2d76480 revlog: fix docstring 2010-08-21 19:31:59 +02:00
Benoit Boissinot
70194e7582 deltaparent(): don't return nullrev for a revision containing a full snapshot
this allows us to simplify manifest.readdelta and revlog.revdiff
2010-08-21 19:30:42 +02:00
Matt Mackall
5fd0f613e6 merge with stable 2010-08-21 10:48:49 -05:00
Matt Mackall
7d97cdbd5f tests: fix up bisect test output 2010-08-21 10:44:57 -05:00
Matt Mackall
395274c87f merge: move reverse-merge logic out of filemerge (issue2342) 2010-08-21 10:41:29 -05:00
Matt Mackall
e1ce51099d bisect: add test for unrelated starting revisions 2010-08-20 21:28:14 -05:00
Matt Mackall
b09252b843 merge with stable 2010-08-20 21:23:47 -05:00
Matt Mackall
f710302a5d bisect: better message for unrelated starting revisions 2010-08-20 17:16:37 -05:00
Matt Mackall
fa11c5cbae debuginstall: report installpath 2010-08-20 15:31:05 -05:00
Adrian Buehlmann
4cdbf9aebe tests: unify test-glog 2010-08-20 18:26:20 +02:00
Matt Mackall
979717003c bookmarks: fix long line 2010-08-19 17:33:46 -05:00
Matt Mackall
73968a1cf2 merge with stable 2010-08-19 17:29:13 -05:00
David Soria Parra
ebfeb45938 bookmarks: Check if the bookmark to delete exists on the remote 2010-08-19 15:04:21 -04:00
Patrick Mezard
efbdac1e61 win32: remove useless lstat() fallback in nlinks()
The fallback was introduced by 33415b0b4e64 at the same time than
nlinks(). Apparently it only handles the case where target path
does not exist. Just raise IOError directly.
2010-08-19 22:51:09 +02:00
Patrick Mezard
5e126e9b42 win32: correctly break hardlinks on network drives (issue761)
win32.nlinks() was often returning 1 instead of the correct
hardlinks count when reading from network drives. This made
commit or push to a repository on a network share to fail
breaking the hardlinks in the datastore, possibly causing
integrity errors in repositories linked locally on the remote
side.

Here is what the MSDN says about GetFileInformationByHandle():

  Depending on the underlying network features of the operating
  system and the type of server connected to, the
  GetFileInformationByHandle function may fail, return partial
  information, or full information for the given file.

In practice, we never got the correct hardlinks count when
reading from and to many combinations of Window XP, 2003, Vista
and 7, via network drives or RDP shares. It always returned 1
instead. The only setup returning an accurate links count was a
samba on Debian.

To avoid this, Mercurial now breaks the hardlinks unconditionally
when writing to a network drive.
2010-08-19 22:51:09 +02:00
Brodie Rao
5c97a02c1e convert: use encoding.encoding instead of locale.getpreferredencoding()
The latter may not return useful results in certain OS X environments.
2010-08-18 10:53:52 -04:00
Brodie Rao
e752297abf convert: properly set encoding for gnuarch converter 2010-08-18 10:53:50 -04:00
Mads Kiilerich
b27d1fd3b8 mq: don't inherit default and default-push paths with --mq (issue2333)
Configuration from the outer repo is inherited to the patches repo when --mq is
used.

In case the patches repo only has paths.default configured but the outer repo
has paths.default-push then the inherited default-push will win. Very
confusing.

Inheriting the default paths is however wrong in all sane cases, so now we
explicitly remove them.
2010-08-18 02:43:45 +02:00
Dirkjan Ochtman
285c18754a help: document stringify templatefilter 2010-08-19 10:59:37 +02:00
Matt Mackall
6f470d1e51 merge with i18n 2010-08-17 17:40:53 -05:00