mpm@selenic.com
6b8940724b
Fix copy in subdirectories
...
Spotted by Chad Netzer
2005-07-27 10:05:12 -08:00
mpm@selenic.com
185e6a4945
Add changegroup hook for push/pull
2005-07-27 09:07:28 -08:00
mpm@selenic.com
3823d6eace
Make pull count jargon less confusing
...
revisions are now synonymous with changesets, and not file changes
2005-07-25 12:02:29 -05:00
mpm@selenic.com
9520e62074
Fix local file changes being ignored after non-branch merge
...
Bug introduced in 45dd84ebbed8
Spotted by TAH
2005-07-23 10:00:56 -05:00
mpm@selenic.com
f8e53b93db
Hack to fix missing '/' problem in URLs
2005-07-22 20:07:14 -05:00
mpm@selenic.com
8e0881ad8a
Don't mark files with 'm'erge unless we're actually merging branches
...
For 3-way merges, we were marking files as 'm', which should only be
used for branch merges. This was causing files to show up in 'hg
status' that aren't actually modified.
2005-07-22 19:23:00 -05:00
mpm@selenic.com
1f521ec7c5
Check protocol versions
...
This also allows the old unidentified protocol
2005-07-21 18:20:13 -05:00
mpm@selenic.com
e16b6ba2ce
Simplify content type checking
2005-07-21 18:19:20 -05:00
Muli Ben-Yehuda
0bf14d0d7e
When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg )
...
you geta pretty obscure error (zlib: uknown compression type). The
attached patch modifies hgweb.py and hg.py to supply and check a
'Content-type: application/hg-0.1' HTTP header for the branches,
between and changegroup commands, so that we know it's a proper hg
repo before snarfing the input. Comments appreciated!
2005-07-21 18:18:43 -05:00
mpm@selenic.com
f70080b8c0
Fix some line wrapping
...
manifest hash: 43af5dafa55e01f89727096f4d6784317f3eb0d6
2005-07-20 20:11:23 -05:00
Bryan O'Sullivan
6e8461ae49
Merge with Matt's tip.
2005-07-20 03:52:06 -08:00
Bryan O'Sullivan
89e035ebd1
An empty .hgignore file must cause us to ignore nothing, not everything!
2005-07-20 03:37:01 -08:00
Bryan O'Sullivan
e5a5499cf6
Only walk over files that match our criteria.
2005-07-20 02:57:20 -08:00
mpm@selenic.com
59b4a46202
Fix verify error reporting bug
...
Spotted by Chris Mason
manifest hash: d5a6e5cb65d2de65a68d1f85c8692e79622844d3
2005-07-19 15:09:04 -05:00
Bryan O'Sullivan
fc2a7aae7c
Add a source designator to the walk methods.
...
If the source is 'f' (the filesystem), the file definitely exists in
the filesystem. If 'm' (a rev or dirstate manifest), the file may not
still exist with the given name.
2005-07-19 07:15:59 -08:00
Bryan O'Sullivan
b9dc9cad21
Merge with Matt's tip.
2005-07-19 07:00:03 -08:00
Bryan O'Sullivan
4e963737e8
Get add and locate to use new repo and dirstate walk code.
...
They use a walk function that abstracts out the irritating details, so
that there's a higher likelihood of commands behaving uniformly.
2005-07-18 06:54:21 -08:00
Bryan O'Sullivan
f3838c3254
Work on walk code.
2005-07-16 15:13:40 -08:00
Thomas Arendsen Hein
8734e61b04
Added missing newline after two error messages.
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Added missing newline after two error messages.
manifest hash: c730cdf92c66ee5b44a4cd9b67f72deb844e4010
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC2B0mW7P1GVgWeRoRAjXJAJ48fbg6jXN65pBPGW/YmWn9OtKakACgjnr9
DPySaeLr3/bU7KhFdZPI7/4=
=Lvsx
-----END PGP SIGNATURE-----
2005-07-15 21:31:35 +01:00
Thomas Arendsen Hein
061a741620
merge program setting from hgrc wasn't used.
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge program setting from hgrc wasn't used.
manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd
Xr+Tb86zo+xFhHq7YkDvLak=
=+BY9
-----END PGP SIGNATURE-----
2005-07-14 17:28:19 +01:00
mpm@selenic.com
09e51635fb
HG environment variables take precedence over hgrc
...
manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810
2005-07-13 01:48:03 -08:00
mpm@selenic.com
437dd476b1
Minor merge fixups
...
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
2005-07-13 01:46:50 -08:00
Matt Mackall
6219c06395
Reapply startswith() changes that got lost with stale edit
...
manifest hash: 16d7feedd561591a21727a4c13a1223019d802a7
2005-07-12 00:51:49 -08:00
Matt Mackall
68b8829c92
Sort files for removal
2005-07-11 15:07:04 -08:00
Matt Mackall
bfd9f3d6ab
Handle undeletion of files when checking out old revisions
...
Spotted by Marc Singer
2005-07-11 15:06:32 -08:00
Matt Mackall
7235bde6be
Actually move .hg into ignore
2005-07-11 10:28:20 -08:00
chad.netzer@gmail.com
899bc83dfc
Make consistent use of str.startswith() in conditionals.
...
# HG changeset patch
# User chad.netzer@gmail.com
# Node ID 45db196de89a15fd045cd789f701b0180fd276f1
# Parent 852adf9ffa4dd2cb1a504bd207f0cad178ac4024
Make consistent use of str.startswith() in conditionals.
2005-07-10 16:14:56 -08:00
Matt Mackall
5fb8ca60d2
Move .hg into ignore()
2005-07-10 16:13:39 -08:00
mwilli2@localhost.localdomain
f2f576fe2c
.hgignore speedups patch incorporating Matt's feedback.
...
# HG changeset patch
# User mwilli2@localhost.localdomain
# Node ID c78a9d4398c63b6bc689e456e1cab3850a846c8a
# Parent 5155a0b6300820be38eb7e04d26525be39307df2
.hgignore speedups patch incorporating Matt's feedback.
2005-07-10 16:03:20 -08:00
mark.williamson@cl.cam.ac.uk
7d47f35832
A number of minor fixes to problems that pychecker found.
...
# HG changeset patch
# User mark.williamson@cl.cam.ac.uk
# Node ID 55d38977b7f2e73b8c1090179928ac96c8922b90
# Parent 0bda45294416406d4c6fbaf1cb643dd0bf6b3a16
A number of minor fixes to problems that pychecker found.
2005-07-10 16:01:11 -08:00
Matt Mackall
2156cc914b
Move commit hook after commit completes
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Move commit hook after commit completes
manifest hash: bc65b570af67ee4748efaba2ff8a6cddf91b8a14
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0ZwSywK+sNU5EO8RAuAjAJsHGTXsOCnxq+xbq/Q0H+ayGnzaiQCfdWn6
or+IWK3sjYILYncTxMFZJdE=
=mQb7
-----END PGP SIGNATURE-----
2005-07-10 14:07:14 -08:00
Matt Mackall
bc958d41d5
Whitespace cleanup
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Whitespace cleanup
manifest hash: 7abcbe23247dd5b7dea6fa44fb80d9f909cf6829
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0ZvmywK+sNU5EO8RAhhDAJ0YXOx5B2F/3NjFB+5YcUtkHqVyuQCgnNyp
tWbRrjDz/SbKz/tFAsxJDqo=
=xB66
-----END PGP SIGNATURE-----
2005-07-10 14:06:30 -08:00
Matt Mackall
c4c7a27643
Generate a friendlier except for failed lookups
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Generate a friendlier except for failed lookups
manifest hash: 1a4384b791bba2107604e56168166dfcbfb54086
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0Ws6ywK+sNU5EO8RArBGAJ9EA0mCNGqO+w6LaO358sVe19o7lQCdGffF
MmQ/ZIvxoJOjYTo+PLBWMqI=
=4VIg
-----END PGP SIGNATURE-----
2005-07-10 10:38:50 -08:00
Matt Mackall
2b45be3873
dirstate.forget() takes a list
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
dirstate.forget() takes a list
manifest hash: e444474a5ac76d3562ee8c0211e1a88ec53155ef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0WO+ywK+sNU5EO8RAlmYAJ9pcSgpvvuqLzfUkeApXZyOb3j6pQCgi9Te
e8ZI236WNWfyrwEASxFIeLM=
=yDVZ
-----END PGP SIGNATURE-----
2005-07-10 10:06:54 -08:00
Matt Mackall
9f4ad36efb
Warn about bogus ignore expressions
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Warn about bogus ignore expressions
manifest hash: 7beb33a1f0879a1d2457953187a523417bc7a101
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0IPqywK+sNU5EO8RAsOdAJ0bFxZoUjSk/BxWZ9C50SlxlDBlBQCeKbu0
QVzZZKIFlDRVWOsi8zfamHA=
=zAVL
-----END PGP SIGNATURE-----
2005-07-09 18:11:54 -08:00
Matt Mackall
ad29857686
Non-grouping regex for ignore
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Non-grouping regex for ignore
Suggested by Mark Williamson
manifest hash: dfd4686e7ac9f96e79da600edf299ed64213e05d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzjX3ywK+sNU5EO8RAnc1AJ4/sKzyZJiRs6UzE3uksE2U9rOkVQCeJsZf
PhHsNtEt/WyL+v44mBfk8Mk=
=e+Qy
-----END PGP SIGNATURE-----
2005-07-08 00:14:47 -08:00
Matt Mackall
e4ed038d5b
Fix bug in reverting deleted files
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix bug in reverting deleted files
Force updates and reverts wouldn't restore deleted files in the
working dir. This should fix that.
manifest hash: e14809399bbc63da42e8c8f694cc8acf31e537f7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzjOJywK+sNU5EO8RAqVLAKCC1BF6JhNiO6n4LJGvy9RBTgOelwCdF9Tr
sADRnovYt9xSnUGmd1Om9JQ=
=SdcP
-----END PGP SIGNATURE-----
2005-07-08 00:04:25 -08:00
Matt Mackall
b9a708f99a
Experimental ignore regex speed-up
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Experimental ignore regex speed-up
manifest hash: c6922086fb78201b60ba8cbde5b51512225ebcc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzWkvywK+sNU5EO8RAohzAJ9BwkFJQzs0QRH71r1Y1Wm0QCSmEwCgrESQ
Ej3Kt/y0JdhOJzQLsAiufqk=
=SPjY
-----END PGP SIGNATURE-----
2005-07-07 09:41:03 -08:00
Matt Mackall
cbe4c5f492
Attempt to read all remaining remote output at close
...
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Attempt to read all remaining remote output at close
manifest hash: e1eda33686726559849388b048a838933862fe89
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzM60ywK+sNU5EO8RAudsAJwPW/MPUBXFV13UbYmZyiwdzSr8QwCfYJqc
l1ZDWPZPTN5UGUlfs0CCu7Y=
=2Tat
-----END PGP SIGNATURE-----
2005-07-06 22:41:56 -08:00
Matt Mackall
d35c78a55f
Show remote client output with "remote:"
2005-07-06 22:30:00 -08:00
mason@suse.com
5cc69df211
Performance enhancements for manifest.add()
...
# HG changeset patch
# User mason@suse.com
Performance enhancements for manifest.add()
Improve manifest.add performance by using bisect to insert/remove
changed items into the manifest list. This also generates the
manifest delta directly based on the changes being made.
2005-07-06 22:28:35 -08:00
Matt Mackall
073fa93171
Add addchangegroup to the ssh protocol
2005-07-06 22:23:57 -08:00
Matt Mackall
8cf75f2dfd
Add a scheme for handling remote locking
...
This adds an object that remembers to unlock the remote repo on
destruction and lock/unlock functions for the ssh protocol. The remote
repository should also unlock itself when the connection goes down.
2005-07-06 22:23:27 -08:00
Matt Mackall
46871ef83d
Fix up the broken bits in findoutgoing
2005-07-06 22:21:23 -08:00
Matt Mackall
f8a8da4071
Move the empty changeset detection out of findincoming to pull
...
This lets us reuse findincoming for findoutgoing
2005-07-06 22:20:56 -08:00
Matt Mackall
e873216620
Protocol switch from using generators to stream-like objects.
...
This allows the the pull side to precisely control how much data is
read so that another encapsulation layer is not needed.
An http client gets a response with a finite size. Because ssh clients
need to keep the stream open, we must not read more data than is sent
in a response. But due to the streaming nature of the changegroup
scheme, only the piece that's parsing the data knows how far it's
allowed to read.
This means the generator scheme isn't fine-grained enough. Instead we
need file-like objects with a read(x) method. This switches everything
for push/pull over to using file-like objects rather than generators.
2005-07-06 22:20:12 -08:00
Matt Mackall
e16fdada85
Add a repo method to report repo device
...
This is used to establish whether repos are on the same device for
hard linking. Remote repos all return -1.
2005-07-06 22:14:10 -08:00
Bryan O'Sullivan
39b21b4b72
Add locate command.
...
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID ebf5eba347a17a5c09000b3342caf350cd060a1b
# Parent 4309b0a5a6010dd2e5811b77d2bc29a51acf290f
Add locate command.
Used for finding files with names that match specific patterns,
such as "*.c".
This patch also introduces localrepository.getcwd, which returns the
current directory relative to the repository root.
2005-07-05 18:19:01 -08:00
Matt Mackall
5dd4f6c486
Add an sshrepository class and hg serve --stdio
2005-07-05 17:55:22 -08:00
Matt Mackall
3cc4e98ed3
Change remote repository to httprepository
2005-07-05 17:50:43 -08:00