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)

Stop patch description import at diff -r -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Stop patch description import at diff -r manifest hash: cc269f69c26ad4fba1fdaeefe2dc8191a0669fe0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyZmyywK+sNU5EO8RAkODAJ9d/JYpBOZiOcQxlz0n2VtIPtK/IgCgl2Lj caGbq4yn4RxzBQqqIoQzOTQ= =9fHy -----END PGP SIGNATURE-----

Demand-load most modules in the commands and ui modules. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 059c6e42fc4221816e26a72bef8cf780891989ca # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Demand-load most modules in the commands and ui modules. This improves response times for a number of simple commands, as the Python interpreter doesn't end up loading modules that it never uses. There's less benefit to demand-loading in other modules.

On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: # HG changeset patch # User Alecs King <alecsk@gmail.com> On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: > On Sun, Jul 03, 2005 at 12:49:27AM +0800, Alecs King wrote: > > Hg is really very nice. The only feature i miss from git is the > > whatchanged -p, which shows a diff along with a changeset. > > python before, i just dig into the mercurial/commands.py a while and > > see what diff(), dodiff(), export(), show_changeset(), log() would > > normally do. There might be one thing or two missed or wrong. But here > > it is: a '-d' option to 'hg log' showing the diff info. You can use 'hg > > log -d' to show the whole history with the diff or 'hg log -d <file>' to > > show that info of a particular file. And also works with the '-r' > > option. > > Let's use -p. We're going to be combining the global and per command > switch namespace shortly and the global -p will disappear. Okay. '-d' changed to '-p'. Just like 'whatchanged -p', now we have 'hg log -p'. > Also, the argument list for show_changeset is getting a bit unwieldy. This time i remain show_changeset untouched at all. Only changed some bits of log().

* clean up error handling when user requests to use a non file object # HG changeset patch # User shaleh@speakeasy.net # Node ID 1ae21732349f5b6dba2941609a044d9c365a6fb2 # Parent 94744f6fe0e7c19b10fab7eb24249f3eeaa5489a * clean up error handling when user requests to use a non file object - use os.path.exists() to verify the item exists - use os.path.isfile() to check whether the item is a file or not diff -r 94744f6fe0e7 -r 1ae21732349f mercurial/hg.py

check export options for changeset before running # HG changeset patch # User shaleh@speakeasy.net # Node ID 0cc64f4312540b2081c76dc589cc825d734676d8 # Parent f7bfe827ea381afc89f486b2d93d7f4fe86de04d check export options for changeset before running diff -r f7bfe827ea38 -r 0cc64f431254 mercurial/commands.py

[PATCH] hg tag: local tag support in file .hg/localtags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] hg tag: local tag support in file .hg/localtags From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> Support local tags in .hg/localtags Also minor cleanups in related functions manifest hash: 553b2e896fed3c9055ed18482ce15cfaa4fc41ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyYdJywK+sNU5EO8RAhohAKC2I3U44EXi+k4ofo5AWHBOg+94bgCfcbzs VQ2yWkPPHZycjtswOBmepa8= =v5AX -----END PGP SIGNATURE-----

Add username/merge/editor to .hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add username/merge/editor to .hgrc These take priority over the equivalent environment vars Deprecate HGMERGE, HGUSER, and HGEDITOR in docs Add ui section to docs Remove undocumented HG_OPTS Raise username code out of changelog class Make tests ignore ~/.hgrc manifest hash: d127ef02bc5266036b4c77a55319519e91bd475b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyM5NywK+sNU5EO8RAuU7AJ9zKk1TFrJXHM04jOOJJeBSp8jlTgCeP+tr qwGFd+WaNqTepZ0wun5g9Uc= =QEBu -----END PGP SIGNATURE-----

[PATCH] Parse and use header data from an hg export'ed changeset -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Parse and use header data from an hg export'ed changeset From: Andrew Thompson <andrewkt@aktzero.com> This should make it easier to import changesets that are hg export'ed from other Mercurial users: Add a routine to catch the user from an hg export'ed changeset. Add user to commit call. Add trap for changelog snippet, which is promoted to the beginning of the commit text. manifest hash: cf5b068f4cec411ff8b9fa3db324ab44ed012778 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyMXAywK+sNU5EO8RAqk5AJ9rC4ZwzcpDfxrNqIBrrTj6eL2mzQCgmZ5O wSkis2J9Xz2wOZAhjVcxIgQ= =32D+ -----END PGP SIGNATURE-----

[PATCH] Fix thinko in "serve" man page entry. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Fix thinko in "serve" man page entry. From: Bryan O'Sullivan <bos@serpentine.com> manifest hash: 38873ef90d0a418810fe6bb9d4b8357b63e88cc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyMCZywK+sNU5EO8RAhKuAKCjqdqGs1OiU+urYjYGC+nVYFpIygCfd/UC Ln4/JF5J87nN/bHPKKQ2uh4= =wFAq -----END PGP SIGNATURE-----

[PATCH] Get "hg serve" to optionally log accesses and errors to files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Get "hg serve" to optionally log accesses and errors to files From: Bryan O'Sullivan <bos@serpentine.com> Get "hg serve" to log accesses and errors to files. manifest hash: 573ef524d84cc7d2777f5fd982f2ef47f4bcf668 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyMA5ywK+sNU5EO8RAp1eAJoD6Qqy6XcGInzZKdo0Qp7gLttYzACfRywL fSGapmCAIaZPoBvoxXTk8Zo= =ZicU -----END PGP SIGNATURE-----

Split wrapped demandload line -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Split wrapped demandload line manifest hash: e562d8b7e2c66c83dfc8a09c503edb1dac0fe997 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyL/sywK+sNU5EO8RApE9AJwKG7SYhyT3uDteHecQKJPMm+nuAgCglKNp MDDX+bOSNQMhCyAH83CuzRw= =MpjC -----END PGP SIGNATURE-----

[PATCH] Get "hg serve" to print the URL being served -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Get "hg serve" to print the URL being served From: Bryan O'Sullivan <bos@serpentine.com> If invoked with verbosity, print the URL at which we are serving. Useful if you bind to any port with "-p 0", and need to know what port the server is listening on. manifest hash: d317225606fbd2ec5819e1f266575b0485dfba79 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyL9hywK+sNU5EO8RAjFQAJoDBRl5VoGIklxA1PdFGCt8Jb3iMQCeILeD XAwnnSCy/IQ/MDfYf6z7oWI= =FNVC -----END PGP SIGNATURE-----

Various HTML cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Various HTML cleanups From: Edouard Gomez <ed.gomez@free.fr> Cleaned up the changeset summary table differentiating title cells from data cells using th and td. Added semantic classes. Changed the big pre tag into a div that mimics pre tag style (that is monospace font and white space preformated). This is required because pre is an inline element, and thus cannot be the parent of block elements as div (diffblock). I replaced all these div blocks by a series ul lists as patches can be seen as lists of changes in versioned files. If someone has a better semantic to propose, i'd be pleased he drops me an email about this patch. - -- Cleaned up the filediff summary table differentiating title cells from data cells using th and td. Added semantic classes. - -- Keep style unchanged for changeset template As promised no changes in style. This one got through my eyes + brain checking... sorry. manifest hash: 68dd5c1ac71aa6a5932fb209d48df5fc0c78643b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyLwfywK+sNU5EO8RAtE9AJ0cxl80eF3zpBWLn8OkoSs7dkZOTgCgtYto j7T/iRk0Hq4Q0mjdos7FvYU= =KOP2 -----END PGP SIGNATURE-----

Add globals to templater/fixup RSS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add globals to templater/fixup RSS This removes a bunch of duplicate header() and footer() bits and makes url and reponame available to all templates. Fix up RSS bits to use url Fix strftime call manifest hash: 63e616e4c7f517a630d80429336817d64e900b68 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyLlRywK+sNU5EO8RAj9IAJkBDzMQaOwRmF0q8tRmVRnzHCjShACfSTCj dbfAWg1crv/mUuRZlWL6Tc4= =Z331 -----END PGP SIGNATURE-----

Simplify RSS date generation -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Simplify RSS date generation manifest hash: 3b1628aaee450c292949f6d079b4a05ccb5ce6ab -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyLatywK+sNU5EO8RAiLMAKCqYFyzSDCU6Wm34LSWZroAHMqa4QCfSWv6 jh/vvuQS0qmXybm6Ivd7XVY= =x1Rf -----END PGP SIGNATURE-----

[PATCH] Add RSS support to hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add RSS support to hgweb From: Goffredo Baroncelli <kreijack@libero.it> with the two small patches below, now hgweb can act as feed source. Two kinds ofobjects can be tracked: the changelong and the files. This can be useful if anyone would track the changes of a file ( and because git has it, mercurial have to has ). To check the changelog the url is http://127.0.0.1:8000/pippo.pluto?cmd=changelog;style=rss To check a file ( the mercurial/hgweb.py for examples ) the url is http://127.0.0.1:8000/?cmd=filelog;file=mercurial/hgweb.py;filenode=0;style=rss The first patch adds a new filter for the template: the filter is named rfc822date, and translates the date from the touple format to a rfc822 style date. The second patch adds the templates needed to create the rss pages. Tested with akgregator ( kde ). [tweaked by mpm: add Content-type: text/xml add support for URL to header() add header with link and content type add RSS links on the normal pages] manifest hash: 170c03d50490d7160097f59abdde1a5073d2ba82 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyFmLywK+sNU5EO8RApkrAKCYF/vZ3DwdMXPBds2LxGEX8+tK5QCfTeOc ZhPN8Xjt2cD3wMbNXMcoNSo= =COlM -----END PGP SIGNATURE-----

[PATCH 4/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 4/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> Now the patch remove every use of the tag p1/p2/p1rev/p2rev from the code ( even+the ones not used ), replacing everywhere with the tag parent ( even where the previous +tag are not use ), so the information to the templates is still given. manifest hash: ede1f299e9201fdad2ecf48e63314350acbb047e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyEqxywK+sNU5EO8RAjc5AJ9o8AU6/YRuERblO/0kgWwDN4rqQQCgkVj/ UBtzW5x0yD65mK6rb4f+bQk= =07yG -----END PGP SIGNATURE-----