Commit Graph

1741 Commits

Author SHA1 Message Date
Matt Mackall
65a15abb1d merge with tonfa-experimental 2006-07-19 14:22:08 -05:00
Brendan Cully
3bc42b81ce Add an option '-C|--copies' to hg status to show the source of copied files.
Copied files are displayed in the form:
A newname
  oldname
2006-07-19 07:52:16 -07:00
Benoit Boissinot
8ef31fb9ac codingstyle: use spaces instead of tabs 2006-07-18 00:32:18 +02:00
Matt Mackall
a283a1d83d Merge with tonfa 2006-07-17 11:30:33 -05:00
Vadim Gelfer
1cb83d1991 fix problem with uncompressed clone and python 2.3. 2006-07-17 07:43:15 -07:00
Benoit Boissinot
d60f8ed3b2 fix 'hg cat' broken by 4a8ffef5657f 2006-07-17 02:09:35 +02:00
Benoit Boissinot
8f3a7d352c allow specifying a file to hg parents, change the syntax to use -r/--rev 2006-07-17 02:00:49 +02:00
Benoit Boissinot
bb31345eb8 fix filectxt to really work
- use a context instead of changelog.read
- changectx._id is not necessary
2006-07-17 01:59:06 +02:00
Benoit Boissinot
490a3977ae correct the handling of linkrev with nullid 2006-07-17 01:58:59 +02:00
Benoit Boissinot
c0ceee40fc lookup should allow -1 to represent nullid (if passed an int as arg) 2006-07-17 01:58:50 +02:00
Vadim Gelfer
a7bbf7d88f rename stream hgrc option to compressed. 2006-07-16 10:04:16 -07:00
Benoit Boissinot
788bbdea72 context.py: various fixes
- use a normal changeset instead of a context
- define _filenode instead of _node to match the else clause
2006-07-16 16:40:24 +02:00
Benoit Boissinot
fe197b5f4f context.py: filectxs was using a keyword arg, add it to filectx 2006-07-16 16:39:03 +02:00
Benoit Boissinot
d9acb13f0c context.py: self.repo is not defined, change to self._repo 2006-07-16 16:39:02 +02:00
Benoit Boissinot
e1bf7a348f walkchangerevs: fix race in fast path
do not yield revs if the corresponding cl entry does not exists,
it avoids a race in the fastpath (where we walk in the filelog) with
an ongoing transaction.
2006-07-16 11:32:37 +02:00
Vadim Gelfer
f7b6882acb clone: disable stream support on server side by default.
enable in hgrc like this:
[server]
stream=True
2006-07-15 16:06:35 -07:00
Vadim Gelfer
cd5c830faf clone: change name of --stream to --uncompressed.
mpm asked for this.
2006-07-15 16:06:05 -07:00
Benoit Boissinot
65aa1b6db0 mention the bts for bug reporting in traceback message 2006-07-16 00:02:05 +02:00
Benoit Boissinot
2be128d29b expand the path if destination is not a directory 2006-07-16 00:01:41 +02:00
Benoit Boissinot
be0b94a2da merge with crew 2006-07-15 17:01:01 +02:00
Benoit Boissinot
eecc3711ff fix bug introduced in 12d40eda94ae 2006-07-15 17:00:23 +02:00
Vadim Gelfer
895f59ec1c backout: allow backout of merge changeset with --parent option.
--parent allows to choose which parent of merge to revert to.
2006-07-14 23:19:15 -07:00
Vadim Gelfer
4bc0558c57 clone: do not make streaming default. add --stream option instead. 2006-07-14 14:51:36 -07:00
Vadim Gelfer
9ea4436262 add support for streaming clone.
existing clone code uses pull to get changes from remote repo.  is very
slow, uses lots of memory and cpu.

new clone code has server write file data straight to client, client
writes file data straight to disk.  memory and cpu used are very low,
clone is much faster over lan.

new client can still clone with pull, can still clone from older servers.
new server can still serve older clients.
2006-07-14 11:17:22 -07:00
Chris Mason
e09c656d7d util.parsedate should understand dates from hg export 2006-07-13 09:40:01 -07:00
Vadim Gelfer
a7c3b963b0 move most of tag code to localrepository class. 2006-07-12 08:59:20 -07:00
Vadim Gelfer
e0b0ae3431 clean up trailing white space. 2006-07-12 08:28:00 -07:00
Thomas Arendsen Hein
56e267824a Add ui method to set --ssh/--remotecmd, use it in init/clone/pull/push/in/out.
The only user visible change is that 'hg init' now accepts this options, too.
2006-07-12 08:57:18 +02:00
Vadim Gelfer
5f404bd1f9 clone: move code into hg module. make doc better.
api in commands module is still same, but version in hg is best for
calling within python now.
2006-07-11 16:18:53 -07:00
Vadim Gelfer
67dc7a0949 merge with crew. 2006-07-11 15:52:56 -07:00
Vadim Gelfer
8a2a795f3f parse url schemes more strictly.
previous code mistook repo named "hg" for scheme named "hg".
2006-07-11 15:52:36 -07:00
Thomas Arendsen Hein
51f1e8f0e0 Additional information about URLs in pull/push/clone/init:
- clone to ssh://
- init via ssh://
- example for pull from an absolute directory via ssh://
- push to http:// and https://
2006-07-11 22:36:52 +02:00
Aurelien Jacobs ext:(%22)
3128936ebe disambiguate help about url syntax 2006-07-11 22:19:49 +02:00
Benoit Boissinot
1433da063e merge with crew 2006-07-09 14:42:18 +02:00
Valentino Volonghi aka dialtone
1caa939c7d adding local_hostname option to smtp configuration 2006-07-09 14:12:19 +02:00
Alexis S. L. Carvalho
39d9875f38 Respect "Connection: close" headers sent by HTTP clients.
A HTTP client can indicate that it doesn't support (or doesn't want)
persistent connections by sending this header.

This not only makes the server more compliant with the RFC, but also
reduces the run time of test-http-proxy when run with python 2.3 from
~125s to ~5s (it doesn't affect it with python 2.4, which was already
~5s).
2006-07-07 14:33:51 -03:00
Benoit Boissinot
be9e8c572e allow use of extensions in python hooks
extensions are loaded with hgext_ prefix, try to use them if
the module is not found in the normal path
2006-07-09 11:10:11 +02:00
Vadim Gelfer
8f588d6d9a merge with mpm. 2006-07-06 15:04:10 -07:00
Vadim Gelfer
348b3e116e fix problems with external module handling. found by benoit boissinot.
first fix is to not store module objects in commands.external dict,
instead use module names for key into sys.modules.  this prevents circular
reference during cleanup of aborted transaction.

second is to get name right during import of external module.
2006-07-06 15:03:34 -07:00
Matt Mackall
cbe34cd629 Fix annotate breakage 2006-07-06 14:15:24 -05:00
Vadim Gelfer
832c369ab0 tests: add timeouts, make run-tests.py clean up dead daemon processes
test timeout feature is needed for test with python 2.5 beta.  if test
does not complete in time (30 seconds is default), it is killed.

some times daemon process used in test can be alive after the test
is killed by user or by timeout.  tests now record daemon pids into
$DAEMON_PIDS and run-tests.py kills all living daemons after every test.

final little change is to add newline to end of pid file printed by
"hg serve", else "cat hg.pid >> $DAEMON_FILES" gives garbage.
2006-07-06 11:45:34 -07:00
Alexis S. L. Carvalho
40dca7e9cd HTTPS: fix python2.3, persistent connections, don't explode if SSL is not available
The urllib2 differences between python 2.3 and 2.4 are hidden by
using keepalive.py, which also gives us support for persistent
connections.

Support for HTTPS is enabled only if there's a HTTPSHandler class in
urllib2.

It's not possible to have separate classes as handlers for HTTP and
HTTPS:  to support persistent HTTPS connections, we need a class that
inherits from both keepalive.HTTPHandler and urllib2.HTTPSHandler.  If
we try to pass (an instance of) this class and (an instance of) the
httphandler class to urllib2.build_opener, this function ends up getting
confused, since both classes are subclasses of the HTTPHandler default
handler, and raises an exception.
2006-07-06 03:14:55 -03:00
Matt Mackall
ae5d801274 Merge context patches 2006-07-05 13:28:25 -05:00
Brendan Cully
40833b0f4d templater.firstline should handle empty strings 2006-07-04 15:36:05 -07:00
Alexis S. L. Carvalho
741f652c36 hgweb: fix unbundle.
After the WSGI changes, even if a push over HTTP succeeds, apache
complains about "Premature end of script headers: hgwebdir.cgi" and
returns a "HTTP Error 500: Internal Server Error", making the local hg
abort.

The change to either of the files touched by this patch is enough to fix
this, but I think changing both is a more robust solution.
2006-07-03 00:33:19 -03:00
Alexis S. L. Carvalho
26477ce2c8 Fix push over https.
Without this patch, python gives me a
TypeError: write() argument 1 must be string or read-only buffer, not file
2006-07-03 00:23:58 -03:00
Alexis S. L. Carvalho
00abec0ffe Allow http://user@example.com URLs (i.e. without passwords) 2006-07-03 00:23:56 -03:00
Alexis S. L. Carvalho
fd806fb861 hg.py: move exception handling code to try to avoid hiding errors 2006-07-02 22:39:39 -03:00
Vadim Gelfer
4538f9a28f help: make "hg help EXTENSION" work 2006-07-03 14:30:24 -07:00
Vadim Gelfer
95fcf73027 merge with crew. 2006-07-03 10:19:09 -07:00