Remove debug print from locate code. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 5240abb57899b745f2e6465be29d9d54c4777364 # Parent 13b74665cbdf735a91f231956d0fe73e446340ea Remove debug print from locate code. Index: hg/mercurial/commands.py ===================================================================

Clarify man page entry for locate a little. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 13b74665cbdf735a91f231956d0fe73e446340ea # Parent fb74eaa2b5b763ad5591b2e51dbb377bf8342064 Clarify man page entry for locate a little.

Use repo.getcwd() in a few obvious places. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID fb74eaa2b5b763ad5591b2e51dbb377bf8342064 # Parent ebf5eba347a17a5c09000b3342caf350cd060a1b Use repo.getcwd() in a few obvious places.

Add locate command. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID ebf5eba347a17a5c09000b3342caf350cd060a1b # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 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.

Fix quoting for RSS links Spotted by Mikael Berthe <mikael.berthe@lilotux.net>

Cleanups for repo.pull Use repo.pull in pull and clone commands Teach clone about ssh:// (temporarily) Fix up shutil issue on failed pull

Add an sshrepository class and hg serve --stdio

Change remote repository to httprepository

Add generic repo commands for pull and push

Add a function to calculate the outgoing changegroup

Attempt to handle RSS URIs properly -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attempt to handle RSS URIs properly manifest hash: 1546939c11a8640ca56f0b0f5c7bdc878b4faa67 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCycliywK+sNU5EO8RAukgAJ9eoJdqTiTQ8xSsSeHMIBmHnnQk9QCfQpFL SAJKUYknvv4IJDUyHjQc61k= =zGdJ -----END PGP SIGNATURE-----

update tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update tests manifest hash: 70079385599132ca8f90582e1f9317ca46167532 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyaISywK+sNU5EO8RApnGAJ0blIxE0tKPzcRQUDAHCLe5KmUSNgCgjGoA kV4Os9FG1NmGaCysPIsKwts= =Ee67 -----END PGP SIGNATURE-----

Handle unrecognised options correctly. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 837a023781a0228e5791e8e278129d2d54d13f99 # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Handle unrecognised options correctly.

open .hgtags as binary # HG changeset patch # User thananck@yahoo.com # Node ID 2bd20bb06f817796d76b8e126f4a685426c4faf4 # Parent 7a240687674e6cf5a8dfd45973d7e3978b89af79 open .hgtags as binary The '.hgtags' file, in tag command, is opened as binary for interoperability with the other OS

Fix zombie files in merge # HG changeset patch # User maf46@burn.cl.cam.ac.uk # Node ID 57667c9b93a5a743e4629d15a0e6bd76699130c3 # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Fix zombie files in merge Keir Fraser observed the following: > I made a small test case that illustrates the bug in merging changesets > with 'hg remove's in them: > > 1. Create a repository A containing files foo & bar. > 2. Create clone called B. > 3. A removes file bar, and commits this removal. > 4. B edits file foo, and commits this edit. > > Now, if B: > # hg pull ../A; hg update -m; hg commit > Then bar remains deleted. > > If A: > # hg pull ../B; hg update -m; hg commit > Then bar is resurrected! > > It looks as though, when you merge across a branch, any deletions in > your own branch are forgotten. > ... > Fixing this is a must, as zombie files are a real pain. :-) Keir later patched our local copy of hg as shown below, which fixes the problem. I've also enclosed a test which captures the test Keir outlined... Files deleted on a branch should not automatically reappear in a merge Patch notes: 1. The first chunk does not change behaviour, but cleans up the code to more closely match check of 'force' in the second chunk. I think it makes the code clearer. 2. The second chunk fixes two bugs -- i. If we choose to keep a remotely-changed locally-deleted file, then we need to 'get' that file. If we choose to delete it then no action need be taken (it is already deleted in the working manifest). Without this fix, choosing to delete would get a Python traceback. ii. The test for whether the file was remotely-created is insufficient. It is only true if f is not in the common ancestor. Otherwise the file was deleted locally, and should remain deleted. (this is the most important fix!) Index: hg/tests/test-merge6 ===================================================================

Output file of 'export' is opened as binary (other OS) # HG changeset patch # User thananck@yahoo.com # Node ID 7a240687674e6cf5a8dfd45973d7e3978b89af79 # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Output file of 'export' is opened as binary (other OS)