Matt Mackall
65a15abb1d
merge with tonfa-experimental
2006-07-19 14:22:08 -05:00
Vadim Gelfer
c70a1efd28
fix tests.
2006-07-19 07:56:40 -07: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
Vadim Gelfer
3d71c97061
merge
2006-07-19 07:51:56 -07:00
Christian Ebert
4ba2e89317
fix logfile option for HGFinishCommit
2006-07-19 13:37:05 +02:00
Mathieu Clabaut ext:(%22)
a37037fb18
HGcommand.vim : the status was read for the wrong file as we changed the current directory before
2006-07-19 09:28:59 +02:00
Mathieu Clabaut ext:(%22)
ecaae60190
Do not try to get revision and branch information for file which are not tracked
2006-07-18 18:35:47 +02:00
Mathieu Clabaut ext:(%22)
7717e8ded9
Correction of commit with a log message in a file
2006-07-18 18:35:47 +02:00
Mathieu Clabaut ext:(%22)
b092ebbad7
Test if file is below an HG root before doing anything
2006-07-18 18:35:47 +02: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
Vadim Gelfer
a5035ce98c
update test-backout.out
2006-07-15 09:19:40 -07: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
6a496db429
merge.
2006-07-14 23:20:08 -07: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
Rafael Villar Burke
92d2c1c1b7
contrib: add sample.hgrc
2006-07-14 22:38:21 -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
Lee Cantey
9582336ca9
Add merge to list of required tools.
2006-07-13 09:50:51 -07:00
Lee Cantey
a4ca3efd13
Fix sed expression for OS X and Solaris 2.6.
...
Matches previous fixes in other tests.
2006-07-13 11:19:35 -07:00
Chris Mason
e09c656d7d
util.parsedate should understand dates from hg export
2006-07-13 09:40:01 -07:00
Vadim Gelfer
40666b2d59
merge with mathieu clabaut.
2006-07-12 15:47:12 -07:00
Vadim Gelfer
1ff90c4c47
contrib/hgsh: make to work with remote clone over ssh.
2006-07-12 15:44:51 -07:00
Mathieu Clabaut ext:(%22)
5d30b8769c
HGcommand.vim : HGCommandEnableBufferSetup on by default
2006-07-13 00:02:26 +02:00
Mathieu Clabaut ext:(%22)
1a1ab9fc77
HGcommand.vim : HGGetStatusLine accept to display an empty 'branch' value
2006-07-12 23:52:13 +02:00
Mathieu Clabaut ext:(%22)
466ef383a7
HGcommand.vim : suppress CVS relief
2006-07-12 23:52:13 +02:00
Mathieu Clabaut ext:(%22)
ec047764fb
HGcommand.vim : doc review.
2006-07-12 23:52:08 +02:00
Mathieu Clabaut ext:(%22)
be0be5d475
HGcommand.vim : doc integration
2006-07-12 23:50:34 +02: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
e99c2d8c39
Added tests for local and remote init.
...
This tests the changes done in 974850ade4a1 and 53c61ee4b42e.
2006-07-12 09:01:10 +02: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
